Merge remote-tracking branch 'origin/master'

src/components/orderInfo/index.vue

@@ -565,20 +565,17 @@ function init(data) {
   ];
   //图片放大位置
   srcList = [
-    data?.orderInfoExt?.customerPositiveImageUrl,
-    data?.orderInfoExt?.customerNegativeImageUrl,
-    data?.orderInfoExt?.positiveImageUrl,
-    data?.negativeImageUrl,
-    data?.orderInfoExt?.agentPosImgUrl,
-    data?.orderInfoExt?.agentNegImgUrl,
-    data?.orderInfoExt?.proxyUrl,
+    data?.unitInfo?.proxyUrl,
+    data?.unitInfo?.unitImageUrl,
+    data?.agentInfo?.agentNegImgUrl,
+    data?.agentInfo?.agentPosImgUrl,
+    data?.carInfo?.vehBodyUrl,
+    data?.carInfo?.vehNegImgUrl,
+    data?.carInfo?.vehPosImgUrl,
     data?.carOwnerInfo?.ownerPosImgUrl,
     data?.carOwnerInfo?.ownerNegImgUrl,
     data?.carOwnerInfo?.proxyUrl,
-    data?.orderInfoExt?.vehPosImgUrl,
-    data?.orderInfoExt?.vehNegImgUrl,
-    data?.orderInfoExt?.vehBodyUrl,
-    data?.roadTransportPermitPicUrl,
+    // data?.roadTransportPermitPicUrl,
   ].filter((item) => {
     return item;
   });

src/utils/baseService.ts

@@ -123,27 +123,27 @@ export default {
       console.log('这是生产环境')
       urls = '/ndev'
     }
-    //hasPathInArray(paths, url) ? : url /newDev
+    // hasPathInArray(paths, url) ? : url /newDev
     // 连本地用的
-    // if(url.startsWith('/userw')){
-    //   console.log('===>userw本地')
-    //   return httpN({
-    //     url: 'http://localhost:9083' + url,
-    //     method: 'post',
-    //     timeout: 60000,
-    //     headers: {
-    //       'Content-Type': 'application/json;charset=UTF-8',
-    //       ...headers,
-    //     },
-    //     data: encryptionN(
-    //         {
-    //           ...body,
-    //         },
-    //         2,
-    //         hasPathInArray(paths, url)
-    //     ),
-    //   })
-    // }else{
+    if(url.startsWith('/invw')){
+      console.log('===>userw本地')
+      return httpN({
+        url: 'http://localhost:9085' + url,
+        method: 'post',
+        timeout: 60000,
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8',
+          ...headers,
+        },
+        data: encryptionN(
+            {
+              ...body,
+            },
+            2,
+            hasPathInArray(paths, url)
+        ),
+      })
+    }else{
       return httpN({
         url: urls + url,
         method: 'post',
@@ -160,7 +160,7 @@ export default {
           hasPathInArray(paths, url)
         ),
       })
-    // }
+    }
   },
   get(
     url: string | number,

src/utils/httpN.ts

@@ -137,6 +137,7 @@ httpN.interceptors.response.use(
                 ElMessage.error(msg);
                 setTimeout(resetErrorPermission, 1000); // 1秒后允许再次显示错误
             }
+            return Promise.reject(msg);
         }
         // 其他非 200 错误（添加防抖）
         else if (code !== 200) {

src/views/inventoryControl/newInventory/allocationManagement/addOrUpdate.vue

@@ -393,8 +393,8 @@ const rules = reactive({
   // brand: [{ required: true, message: "请选择申请单类型", trigger: "blur" }],
   receiveStoreCode: [{required: true, message: "请选择收货仓库", trigger: "blur"}],
   sendStoreCode: [{required: true, message: "请选择发货仓库", trigger: "blur"}],
-  // cardType: [{ required: true, message: "请选择卡类型", trigger: "blur" }],
-  // obuType: [{ required: true, message: "请选择签类型", trigger: "blur" }],
+  cardType: [{ required: true, message: "请选择卡类型", trigger: "blur" }],
+  obuType: [{ required: true, message: "请选择签类型", trigger: "blur" }],
 })
 const props2 = {
   value: "code",

src/views/inventoryControl/newInventory/warehouseManagement/index.vue

@@ -50,7 +50,7 @@ const widthBase = '120px';
 const crudRef = ref()
 const value1 = ref()
 let tableData: any = ref([])
-const itemStartValue = ref("1")
+const itemStartValue = ref(1)
 //查询参数
 const searchForm = ref({ agencyId: '' })
 const agencyIdList = ref([])
@@ -207,28 +207,30 @@ function getList() {
 
 const Adds = () => {
   itemStartValue.value = 1
+  console.log("type111====>", itemStartValue.value)
 }
 //表单编辑按钮
 function itemEdit(idx: any, row: any) {
   itemStartValue.value = 2
+  console.log("type====>", itemStartValue.value)
 }
 
 // 添加
 const submitAdd = (data: any) => {
-  request(data, itemStartValue.value)
+  console.log("type====>", typeOption.value)
+  // request(data, itemStartValue.value)
 }
 
 const request = (data: any, type: any) => {
-  data.optType = type //操作类型 1新增 2修改 
-  BaseService.postN(itemStartValue.value == 1 ? '/invw/api/warehouse/add' : '/invw/api/warehouse/edit', data).then((res: any) => {
+  //操作类型 1新增 2修改
+  console.log("type====>",type,"---->", itemStartValue.value)
+  BaseService.postN(type == 1 ? '/invw/api/warehouse/add' : '/invw/api/warehouse/edit', data).then((res: any) => {
     if (res && res.code === 0) {
       getList()
       getAgenCy()
       getUpperWarehouseIdList()
       crudRef.value.reset();
       crudRef.value.dialogFormVisible = false;
-    } else {
-      ElMessage.error(res.message)
     }
   })
 }

src/views/inventoryControl/putInstorage/addOrUpdate.vue

@@ -12,10 +12,12 @@
           <el-form-item label="备货单号" prop="applyNo" v-if="typeOption !== 'add'">
             <el-input maxlength="60" v-trim clearable v-model="addForm.applyNo" :disabled="true"/>
           </el-form-item>
-          <el-form-item label="入库仓库名称" prop="storeCodeList">
-            <el-cascader v-model="addForm.storeCodeList"
-                         :disabled="typeOption === 'view' || typeOption === 'sure'" :options="interfaceLowerListArr"
-                         :props="props2" clearable @change="handleChange"/>
+          <el-form-item label="入库仓库名称" prop="storeCode">
+            <el-select clearable v-model="addForm.storeCode" placeholder="请选择仓库名称"
+                       :disabled="typeOption === 'view' || typeOption === 'sure'">
+              <el-option v-for="item in interfaceLowerListArr" :key="item.code" :label="item.name"
+                         :value="item.code"/>
+            </el-select>
           </el-form-item>
           <el-form-item label="产权" prop="ownType">
             <el-select clearable v-model="addForm.ownType" placeholder="请选择产权"
@@ -284,7 +286,7 @@ const obuType = computed(() => {
 })
 const {addForm, warrantyList, allList, treeData, btnLoding, summary}: any = toRefs(state)
 const rules = reactive({
-  storeCodeList: [{required: true, message: "请选择入库仓库", trigger: "blur"}],
+  storeCode: [{required: true, message: "请选择入库仓库", trigger: "blur"}],
   ownType: [{required: true, message: "请选择产权", trigger: "blur"}],
   version: [{required: true, message: "请选择设备型号", trigger: "blur"}],
   inventoryType: [{required: true, message: "请选择设备类型", trigger: "blur"}],
@@ -643,8 +645,8 @@ function exportHandle(list: IObject[]) {
 function saveHandle() {
   btnLoding.value = true;
   if (typeOption.value === "add") {
-    if (addForm.value.storeCodeList !== undefined && addForm.value.storeCodeList !== null && addForm.value.storeCodeList.length !== 0) {
-      addForm.value.storeCode = addForm.value.storeCodeList[addForm.value.storeCodeList.length - 1]
+    if (addForm.value.storeCode !== undefined && addForm.value.storeCode !== null && addForm.value.storeCode.length !== 0) {
+      addForm.value.storeCode = addForm.value.storeCode[addForm.value.storeCode.length - 1]
     }
   }
   dataFormRef.value.validate((valid) => {

src/views/inventoryControl/putInstorage/index.vue

@@ -2,27 +2,27 @@
   <div class="page-home">
     <div class="search-wrap" v-if="IsPermission(route, 'QUERY_BASE')">
       <el-select clearable v-model="searchForm.inventoryType" style="width: 200px" placeholder="请选择设备类型">
-        <el-option v-for="item in inventoryTypeList" :key="item.value" :label="item.label" :value="item.value" />
+        <el-option v-for="item in inventoryTypeList" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
       <el-select clearable v-model="searchForm.brand" style="width: 260px" placeholder="请选择设备厂商（先选设备类型）">
         <template v-slot="scope">
           <span v-if="searchForm.inventoryType == 'CARD'">
-            <el-option v-for="item in cardManufacturerList" :key="item.value" :label="item.label" :value="item.value" />
+            <el-option v-for="item in cardManufacturerList" :key="item.value" :label="item.label" :value="item.value"/>
           </span>
           <span v-if="searchForm.inventoryType == 'OBU'">
-            <el-option v-for="item in manufacturerList" :key="item.value" :label="item.label" :value="item.value" />
+            <el-option v-for="item in manufacturerList" :key="item.value" :label="item.label" :value="item.value"/>
           </span>
         </template>
       </el-select>
       <el-select clearable v-model="searchForm.version" style="width: 200px" placeholder="请选择设备型号">
-        <el-option v-for="item in modelList" :key="item.value" :label="item.label" :value="item.value" />
+        <el-option v-for="item in modelList" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
       <el-select clearable v-model="searchForm.applyStatus" style="width: 200px" placeholder="请选择申请状态">
-        <el-option v-for="item in resultList" :key="item.value" :label="item.label" :value="item.value" />
+        <el-option v-for="item in resultList" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
       <el-date-picker unlink-panels v-model="value1" type="daterange" range-separator="到" start-placeholder="开始日期"
-        end-placeholder="结束日期" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-        @change="dateChangeHandle" />
+                      end-placeholder="结束日期" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+                      @change="dateChangeHandle"/>
       <el-button type="success" icon="search" @click="btnSearch">
         搜索
       </el-button>
@@ -34,15 +34,15 @@
       <el-button v-if="IsPermission(route, 'STORAGE_EQUIPMENT')" type="primary" @click="addHandle" icon="Plus">
         设备入库-备货
       </el-button>
-      <el-button v-if="IsPermission(route, 'BATCH_CONFIRM_WAREHOUSEING')" type="success" @click="sureMoreHandle"
-        v-loading="btnLoading">
+      <el-button v-if="IsPermission(route, 'CONFIRM_WAREHOUSEING')" type="success" @click="sureMoreHandle"
+                 v-loading="btnLoading">
         批量确认入库
       </el-button>
     </div>
     <div class="table-list">
       <!--  table-layout="auto" -->
       <el-table :data="tableData" @selection-change="selectionChangeHandle" :border="true" row-key="id"
-        v-loading="tableLoding" show-overflow-tooltip>
+                v-loading="tableLoding" show-overflow-tooltip size="small">
         <!-- <el-table-column type="expand">
           <template #default="props">
             <div class="table-wrap">
@@ -100,7 +100,7 @@
         <!-- <el-table-column prop="agencyId" label="产权归属"></el-table-column> -->
         <el-table-column label="操作" width="340" fixed="right">
           <template v-slot="scope">
-            <el-button type="primary" class="op-btn" @click="editHandle(scope.row)" v-if="
+            <el-button size="small" type="primary" class="op-btn" @click="editHandle(scope.row)" v-if="
               // (scope.row.applyStatus === 'SUPPLY' ||
               //   scope.row.applyStatus === 'INSTORAGE') &&
               (scope.row.applyStatus === 'NEW') &&
@@ -108,13 +108,13 @@
             ">
               修改备货
             </el-button>
-            <el-button type="primary" class="op-btn" @click="deleteHandleShow(scope.row)" v-if="
+            <el-button size="small" type="primary" class="op-btn" @click="deleteHandleShow(scope.row)" v-if="
               (scope.row.applyStatus === 'NEW') &&
               IsPermission(route, 'DEL_STOCK_UP')
             ">
               取消备货
             </el-button>
-            <el-button type="primary" class="op-btn" @click="sureHandle(scope.row)" v-if="
+            <el-button size="small" type="primary" class="op-btn" @click="sureHandle(scope.row)" v-if="
               (scope.row.applyStatus === 'NEW') &&
               IsPermission(route, 'CONFIRM_WAREHOUSEING')
             ">
@@ -124,7 +124,7 @@
               scope.row.applyStatus === 'DONE' &&
               IsPermission(route, 'INFO_LIST')
             " -->
-            <el-button type="primary" class="op-btn" @click="viewHandle(scope.row)">
+            <el-button size="small" type="primary" class="op-btn" @click="viewHandle(scope.row)">
               详情
             </el-button>
             <!-- <el-button type="primary" class="op-btn" @click="restoreHandle(scope.row)" v-if="
@@ -139,11 +139,11 @@
     </div>
     <div class="page-wrap">
       <el-pagination :page-size="paging.pageSize" layout="prev, pager, next" :current-page="paging.currentPage"
-        :total="paging.total" @size-change="pagesizeChangeHandle" @current-change="handleCurrentChange" />
+                     :total="paging.total" @size-change="pagesizeChangeHandle" @current-change="handleCurrentChange"/>
     </div>
     <el-dialog v-model="dialogVisible" :title="dialogTitle" width="80%" :show-close="false">
       <AddOrUpdate :ref="(el) => (addUpdateRef = el)" @refreshDataList="getList" @closeHandle="handleClose"
-        :device-type-list="typeList" :device-model-list="modelList" :manufacturer-list="manufacturerList" />
+                   :device-type-list="typeList" :device-model-list="modelList" :manufacturer-list="manufacturerList"/>
     </el-dialog>
     <el-dialog v-model="cancelOrderDialog" width="30%" title="取消订单">
       <el-form ref="cancelOrderFormRef" :model="cancelOrderForm" :rules="{
@@ -153,7 +153,7 @@
       }" label-width="80px">
         <el-form-item label="取消原因" prop="cancelReason">
           <el-input v-trim clearable type="textarea" rows="5" v-model="cancelOrderForm.cancelReason"
-            :placeholder="`取消原因`" maxlength="200" show-word-limit></el-input>
+                    :placeholder="`取消原因`" maxlength="200" show-word-limit></el-input>
         </el-form-item>
 
       </el-form>
@@ -177,11 +177,11 @@ import {
   nextTick,
   computed,
 } from 'vue'
-import { ElNotification, ElMessage, ElCard, ElMessageBox } from 'element-plus'
+import {ElNotification, ElMessage, ElCard, ElMessageBox} from 'element-plus'
 import Cookies from 'js-cookie'
-import { useDebounce, getDictLabel } from '@/utils/utils'
+import {useDebounce, getDictLabel} from '@/utils/utils'
 import BaseService from '@/utils/baseService'
-import { IObject } from '@/types/interface'
+import {IObject} from '@/types/interface'
 import AddOrUpdate from './addOrUpdate.vue'
 import {
   queryApi,
@@ -196,13 +196,13 @@ import {
   deviceModelApi,
 } from '@/api/inventoryControl/deviceApply'
 import $storeinitData from '@/store/initData' //引入tab vuex
-import { useRoute } from 'vue-router'
-import { IsPermission } from '@/router/routerUtil'
+import {useRoute} from 'vue-router'
+import {IsPermission} from '@/router/routerUtil'
 //或取路由传入过来的对象数据
 const route = useRoute()
 const tableLoding = ref(false)
 const cancelOrderForm = ref({
-  cancelReason:''
+  cancelReason: ''
 })
 const addUpdateRef = ref()
 const state = reactive({
@@ -244,22 +244,26 @@ const modelList = computed(() => {
 })
 const resultList = computed(() => {
   return (
-    // $storeinitData.state.dictData['INITIAL_EQUIPMENT_PUT_STATUS_TYPE'] || []
-    $storeinitData.state.dictData['INV_APPLY_STATUS'] || []
+      // $storeinitData.state.dictData['INITIAL_EQUIPMENT_PUT_STATUS_TYPE'] || []
+      $storeinitData.state.dictData['INV_APPLY_STATUS'] || []
   )
 })
-const { tableData, searchForm, selectList, paging, btnLoading } = toRefs(state)
+const {tableData, searchForm, selectList, paging, btnLoading} = toRefs(state)
+
 function handleCurrentChange(val: number) {
   paging.value.currentPage = val
   getList()
 }
+
 // 搜索按钮
 function btnSearch() {
   paging.value.currentPage = 1
   getList()
 }
+
 const cancelOrderDialog = ref(false)
 const rowData = ref()
+
 function deleteHandleShow(row: any) {
   cancelOrderDialog.value = true
   rowData.value = row
@@ -281,6 +285,7 @@ function getLowerList() {
     }
   })
 }
+
 // 搜索重置
 function refreshLeft() {
   paging.value.currentPage = 1
@@ -288,6 +293,7 @@ function refreshLeft() {
   value1.value = null
   getList()
 }
+
 //pagesize修改
 function pagesizeChangeHandle(val: number) {
   paging.value.currentPage = 1
@@ -301,7 +307,7 @@ function getList() {
     pageNo: paging.value.currentPage,
     pageSize: paging.value.pageSize,
   }
-  let searchFormList = { ...searchForm.value }
+  let searchFormList = {...searchForm.value}
   for (let key in searchFormList) {
     if (searchFormList[key]) {
       params[key] = searchFormList[key]
@@ -309,21 +315,22 @@ function getList() {
   }
   tableData.value = []
   BaseService.postN('/invw/api/enterApply/page', params).then(
-    (res: any) => {
-      if (res && res.code === 0) {
-        let bizContent = res.data
-        let data = bizContent.result || []
-        tableData.value = data
-        // console.log('bizContent12222', data, tableData.value)
-        tableLoding.value = false
-        paging.value.total = bizContent.totalCount
-      } else {
-        tableLoding.value = false
-        ElMessage.error(res.message)
+      (res: any) => {
+        if (res && res.code === 0) {
+          let bizContent = res.data
+          let data = bizContent.result || []
+          tableData.value = data
+          // console.log('bizContent12222', data, tableData.value)
+          tableLoding.value = false
+          paging.value.total = bizContent.totalCount
+        } else {
+          tableLoding.value = false
+          ElMessage.error(res.message)
+        }
       }
-    }
   )
 }
+
 function dateChangeHandle(val: any) {
   if (val) {
     searchForm.value.applyTimeStart = val[0]
@@ -333,6 +340,7 @@ function dateChangeHandle(val: any) {
     searchForm.value.applyTimeEnd = ''
   }
 }
+
 // 获取设备厂商
 function getManufacturerList() {
   BaseService.postN('/invw/dict/businessmendict').then((res: any) => {
@@ -352,6 +360,7 @@ function getManufacturerList() {
     }
   })
 }
+
 //获取设备类型
 function getDeviceTypeList() {
   BaseService.postN('/invw/dict/devicetypedict').then((res: any) => {
@@ -371,6 +380,7 @@ function getDeviceTypeList() {
     }
   })
 }
+
 //获取设备型号
 function getDeviceModelList() {
   BaseService.postN('/invw/dict/deviceversiontypedict').then((res: any) => {
@@ -390,6 +400,7 @@ function getDeviceModelList() {
     }
   })
 }
+
 //获取申领状态
 function getStatus() {
   BaseService.postN('/invw/dict/inventorystatusdict').then((res: any) => {
@@ -409,6 +420,7 @@ function getStatus() {
     }
   })
 }
+
 // 设备入库-备货
 function addHandle() {
   dialogVisible.value = true
@@ -418,6 +430,7 @@ function addHandle() {
     addUpdateRef.value.init()
   })
 }
+
 // 修改设备入库-备货
 function editHandle(row: IObject) {
   dialogVisible.value = true
@@ -427,6 +440,7 @@ function editHandle(row: IObject) {
     addUpdateRef.value.init(row)
   })
 }
+
 // 确认入库
 function sureHandle(row: IObject) {
   dialogVisible.value = true
@@ -436,6 +450,7 @@ function sureHandle(row: IObject) {
     addUpdateRef.value.init(row)
   })
 }
+
 //详情
 function viewHandle(row: IObject) {
   dialogVisible.value = true
@@ -445,6 +460,7 @@ function viewHandle(row: IObject) {
     addUpdateRef.value.init(row)
   })
 }
+
 // 删除
 function deleteHandle(row: IObject) {
   ElMessageBox.confirm('确定要取消备货么？', '', {
@@ -452,23 +468,27 @@ function deleteHandle(row: IObject) {
     cancelButtonText: '取消',
     type: 'error',
   })
-    .then(() => {
-      BaseService.postN('/invw/api/enterApply/cancel', { id: rowData.value.id, reason: cancelOrderForm.value.cancelReason }).then(
-        (res: any) => {
-          if (res && res.code === 0) {
-            getList()
-            cancelOrderDialog.value = false
-            ElMessage.success('取消备货成功')
-          } else {
-            ElMessage.error(res.message)
-          }
-        }
-      )
-    })
-    .catch(() => {
-      console.log('取消')
-    })
+      .then(() => {
+        BaseService.postN('/invw/api/enterApply/cancel', {
+          id: rowData.value.id,
+          reason: cancelOrderForm.value.cancelReason
+        }).then(
+            (res: any) => {
+              if (res && res.code === 0) {
+                getList()
+                cancelOrderDialog.value = false
+                ElMessage.success('取消备货成功')
+              } else {
+                ElMessage.error(res.message)
+              }
+            }
+        )
+      })
+      .catch(() => {
+        console.log('取消')
+      })
 }
+
 // 恢复备货
 function restoreHandle(row: IObject) {
   ElMessageBox.confirm('确定要恢复备货么？', '', {
@@ -476,22 +496,23 @@ function restoreHandle(row: IObject) {
     cancelButtonText: '取消',
     type: 'error',
   })
-    .then(() => {
-      BaseService.postN('/invw/inventory/inventoryback', { id: row.id }).then(
-        (res: any) => {
-          if (res && res.code === 0) {
-            getList()
-            ElMessage.success('恢复成功')
-          } else {
-            ElMessage.error(res.message)
-          }
-        }
-      )
-    })
-    .catch(() => {
-      console.log('====取消')
-    })
+      .then(() => {
+        BaseService.postN('/invw/inventory/inventoryback', {id: row.id}).then(
+            (res: any) => {
+              if (res && res.code === 0) {
+                getList()
+                ElMessage.success('恢复成功')
+              } else {
+                ElMessage.error(res.message)
+              }
+            }
+        )
+      })
+      .catch(() => {
+        console.log('====取消')
+      })
 }
+
 //批量确认入库
 function sureMoreHandle() {
   btnLoading.value = true
@@ -502,26 +523,31 @@ function sureMoreHandle() {
     return
   }
   let ids = list.map((item) => item.id)
-  BaseService.postN('/invw/api/enterApply/batchConfirm', { ids: ids }).then(
-    (res: any) => {
-      if (res && res.code === 0) {
-        ElMessage.success(res.message)
-      } else {
-        ElMessage.error(res.message)
+  BaseService.postN('/invw/api/enterApply/batchConfirm', {ids: ids}).then(
+      (res: any) => {
+        if (res && res.code === 0) {
+          ElMessage.success(res.message)
+        } else {
+          ElMessage.error(res.message)
+        }
       }
-    }
-  )
+  ).catch(() => {
+    btnLoading.value = false;
+  });
 }
+
 // 关闭弹窗
 function handleClose() {
   dialogVisible.value = false
   dialogTitle.value = ''
   typeDialog.value = ''
 }
+
 // 表格选中
 function selectionChangeHandle(val: any) {
   selectList.value = val
 }
+
 const interfaceLowerListArr = ref([]);
 onMounted(() => {
   // getStatus();

src/views/onlineBusinessHall/orderManagement/index.vue

@@ -942,8 +942,8 @@
       >
         <!-- 申请信息 -->
         <el-descriptions-item label="订单编号">{{ changeQueryInfo.orderNo }}</el-descriptions-item>
-        <el-descriptions-item label="签号">{{ changeQueryInfo.obuId }}</el-descriptions-item>
-        <el-descriptions-item label="卡号">{{ changeQueryInfo.cardId }}</el-descriptions-item>
+        <el-descriptions-item label="发出签号">{{ changeQueryInfo.obuId }}</el-descriptions-item>
+        <el-descriptions-item label="发出卡号">{{ changeQueryInfo.cardId }}</el-descriptions-item>
         <el-descriptions-item label="申请时间">{{ changeQueryInfo.applyTime }}</el-descriptions-item>
         <el-descriptions-item label="换货原因">{{ changeQueryInfo.reason }}</el-descriptions-item>
         <el-descriptions-item label="退换方式">{{ changeQueryInfo.rechangeMode === 1 ? '线上' : '线下' }}</el-descriptions-item>
@@ -984,7 +984,7 @@
         <el-descriptions-item label="物流单号">{{ changeQueryInfo.logisticsNumber }}</el-descriptions-item>
 
       </el-descriptions>
-
+      <div style="color:red;margin-top: 10pxc; " >注意核对退回设备是否与发出设备一致!</div>
       <el-form ref="changeQueryRef" :model="changeQueryForm" :rules="changeQueryRules" label-width="140px">
         <h3>发货信息</h3>
         <el-form-item v-if="changeQueryInfo.rechangeMode === 1" label="收件人姓名" prop="consignee">
@@ -1097,8 +1097,8 @@
       >
         <!-- 退货信息 -->
         <el-descriptions-item label="订单编号">{{ orderReturnInfo.orderNo }}</el-descriptions-item>
-        <el-descriptions-item label="签号">{{ orderReturnInfo.obuId }}</el-descriptions-item>
-        <el-descriptions-item label="卡号">{{ orderReturnInfo.cardId }}</el-descriptions-item>
+        <el-descriptions-item label="发出签号">{{ orderReturnInfo.obuId }}</el-descriptions-item>
+        <el-descriptions-item label="发出卡号">{{ orderReturnInfo.cardId }}</el-descriptions-item>
         <el-descriptions-item label="申请时间">{{ orderReturnInfo.applyTime }}</el-descriptions-item>
         <el-descriptions-item label="退货原因">{{ orderReturnInfo.reason }}</el-descriptions-item>
         <el-descriptions-item label="退货方式">{{ orderReturnInfo.rechangeMode === 1 ? '线上' : '线下' }}</el-descriptions-item>
@@ -1110,10 +1110,11 @@
         <el-descriptions-item label="状态">{{ orderReturnInfo.rechangeStatus === 'NEW' ? '新申请' : orderReturnInfo.rechangeStatus === 'SUCCESS' ? '审核通过' : '审核失败' }}</el-descriptions-item>
       </el-descriptions>
 
+      <div style="color:red;margin-top: 10pxc;" >注意核对退回设备是否与发出设备一致!</div>
 
       <el-form ref="orderReturnRef" :model="orderReturnForm" :rules="orderReturnRules" label-width="140px">
         <h3>审核信息</h3>
-        <el-form-item label="审核状态" prop="rechangeStatus">
+        <!-- <el-form-item label="审核状态" prop="rechangeStatus">
           <el-select
               clearable
               v-model="orderReturnForm.rechangeStatus"
@@ -1122,7 +1123,7 @@
             <el-option label="审核通过" key="SUCCESS" value="SUCCESS"/>
             <el-option label="审核失败" key="FAIL" value="FAIL"/>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <!-- 备注 -->
         <el-form-item label="审核信息" prop="auditInfo">
@@ -1135,9 +1136,9 @@
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button type="danger" @click="orderReturnSubmit(orderReturnRef)">拒绝退货</el-button>
+        <el-button type="danger" @click="orderReturnSubmit(orderReturnRef,false)">拒绝退货</el-button>
         <el-button @click="orderReturnDialog = false">取 消</el-button>
-        <el-button type="primary" @click="orderReturnSubmit(orderReturnRef)">确 定</el-button>
+        <el-button type="primary" @click="orderReturnSubmit(orderReturnRef,true)">确 定</el-button>
       </template>
     </el-dialog>
     <!-- 完成退货，已加入业务审核该地方不使用 -->
@@ -2043,8 +2044,14 @@ function changeQuerySubmit(form,flag: boolean) {
 }
 
 //退货
-function orderReturnSubmit(form) {
+function orderReturnSubmit(form,flag) {
   if (timer) return;
+
+  if(flag){
+    orderReturnForm.value.rechangeStatus = "SUCCESS"
+  }else{
+    orderReturnForm.value.rechangeStatus = "FAIL"
+  }  
   timer = setTimeout(() => {
     form.validate((valid: any) => {
       if (valid) {
@@ -2061,6 +2068,7 @@ function orderReturnSubmit(form) {
         timer = null;
       }
     })
+
     timer = null;
   }, 1000);
 }

src/views/onlineBusinessHall/orderManagement/orderReview/index.vue

@@ -43,11 +43,11 @@
           start-placeholder="订单创建开始日期" end-placeholder="订单创建结束日期" format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss" />
       </template>
-      <template #CustomButton>
+      <!-- <template #CustomButton>
         <el-button v-if="IsPermission(route, 'GET_ORDER_LIST')" type="primary" @click="getOrderFn(1)">
           <span style="font-family: '微软雅黑', 'KaiTi', serif;">批量领取订单</span>
         </el-button>
-      </template>
+      </template> -->
       <template #tableOperation>
         <el-tabs @tab-click="handleClick" v-model="activeName">
           <el-tab-pane v-for="(item, index) in tageList" :key="index" :label="item.label"
@@ -126,7 +126,8 @@
   import moment from 'moment'
   import { getCache } from '@/utils/cache'
   import { getAudit, getOrderInfo } from '@/api/onlineBusinessHall/orderManagement'
-  import orderInfo from './orderInfo.vue'
+  // import orderInfo from './orderInfo.vue'
+  import orderInfo from "@/components/orderInfo/index.vue";
 
   //或取路由传入过来的对象数据
   const route = useRoute()
@@ -378,21 +379,21 @@
           return getLabel(ORDER_STAGE_TYPE, money);
         },
       },
-      {
-        width: '180px',
-        prop: 'orderType', //
-        label: '订单类型',
-        listData: ORDER_TYPE
-      },
       // {
       //   width: '180px',
-      //   prop: 'artificialStatus', //
-      //   label: '审核类型',
-      //   funRuleStarts: true,
-      //   funRule: (value: any) => {
-      //     return value == '1' ? '人工审核' : '系统审核'
-      //   },
+      //   prop: 'orderType', //
+      //   label: '订单类型',
+      //   listData: ORDER_TYPE
       // },
+      {
+        width: '180px',
+        prop: 'artificialStatus', //
+        label: '审核类型',
+        funRuleStarts: true,
+        funRule: (value: any) => {
+          return value == '1' ? '人工审核' : '系统审核'
+        },
+      },
       {
         width: '180px',
         prop: 'auditPerson', //

src/views/onlineBusinessHall/orderManagement/orderReview/orderInfo.vue

@@ -178,6 +178,8 @@
  
     init(data.value)
     function init(data) {
+        console.log("详情数据：" ,data);
+
         if (data && data.userType) IsUnit.value = data.userType != 'PERSONAL_USER'
         if (data) IsSelf.value = data.agentName ? true : false
         // if (!data) return
@@ -358,7 +360,7 @@
                 data: userInfoList
             }, {
                 title: '经办人信息',
-                visible: IsUnit.value && IsSelf.value,
+                visible: IsUnit.value,
                 foldIs: true, //是否需要折叠
                 foldStart: true, //折叠状态默认打开
                 data: agentInfoList

src/views/system/agency/index.vue

@@ -327,19 +327,10 @@ const field = ref({
         {
             prop: "issuerId",
             label: "发行方编号",
+          hide: true,
             width: "80px"
         },
-        {
-            prop: "name",
-            label: "渠道名称",
-            width: "200px",
-            form: {
-                width: '45%',
-                formLabelWidth: formLabelWidth,
-                type: 'input',
-                required: true,
-            }
-        },
+
         {
             prop: "agencyId",
             label: "渠道编号",
@@ -352,9 +343,20 @@ const field = ref({
                 disabled: false
             }
         },
+      {
+        prop: "name",
+        label: "渠道名称",
+        width: "200px",
+        form: {
+          width: '45%',
+          formLabelWidth: formLabelWidth,
+          type: 'input',
+          required: true,
+        }
+      },
         {
             prop: "mapAgencyId",
-            label: "中心渠道编号",
+            label: "中心渠道",
             width: "120px",
             listData: getCenterAgencyIdList,
             form: {
@@ -381,6 +383,7 @@ const field = ref({
         {
             prop: "contact",
             label: "联系人姓名",
+          width: '100',
             form: {
                 width: '45%',
                 formLabelWidth: formLabelWidth,
@@ -389,6 +392,7 @@ const field = ref({
         }, {
             prop: "tel",
             label: "联系电话",
+        width: '100',
             form: {
                 width: '45%',
                 formLabelWidth: formLabelWidth,
@@ -425,6 +429,7 @@ const field = ref({
         {
             prop: 'address',
             label: '地址',
+          width: '100',
             form: {
                 width: '45%',
                 formLabelWidth: formLabelWidth,
@@ -474,6 +479,7 @@ const field = ref({
         {
             prop: 'email',
             label: 'email',
+          width: '100',
             form: {
                 width: '45%',
                 formLabelWidth: formLabelWidth,
@@ -486,18 +492,6 @@ const field = ref({
             slotSet: true,
             slotSetName: "status",
         },
-        {
-            prop: "info",
-            label: "备注",
-            span: 3,
-            form: {
-                width: '95%',
-                formLabelWidth: formLabelWidth,
-                type: 'input',
-                itemType: 'textarea',
-                rows: 5
-            }
-        },
         {
             hide: true,
             prop: "agencyModels",
@@ -521,7 +515,19 @@ const field = ref({
                 }
                 return val
             },
+        },
+      {
+        prop: "info",
+        label: "备注",
+        span: 3,
+        form: {
+          width: '95%',
+          formLabelWidth: formLabelWidth,
+          type: 'input',
+          itemType: 'textarea',
+          rows: 5
         }
+      },
     ]
 });
 // 搜索按钮

src/views/system/branch/index.vue

@@ -16,7 +16,7 @@
           添加一级网点
         </el-button> -->
         <el-button type="success" @click="getItmeLiet()">
-          中心网点管理
+          报备部中心网点管理
         </el-button>
       </template>
       <template #operation="{ scope }">
@@ -175,7 +175,7 @@
     </crud-template>
 
 
-    <el-dialog title="中心网点管理" v-model="vShowDoalog">
+    <el-dialog title="报备部中心网点管理" v-model="vShowDoalog">
       <crud-template ref="crudRefTwo" :home-data="zxqdFind" @submit="itemAdd" @handleEdit="itemEdit" @add="Adds"
         :searchForm="searchForm2" @btnSearch="btnSearch2" @CurrentChange="handleCurrentChangeTwo" @handleDelete="itemDelete"
         :tableData="tableItemData" @refreshLeft="refreshLeft2">