页面修改

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

@@ -68,7 +68,7 @@
             <el-col :span="12">
               <el-form-item label="发货仓库" prop="sendStoreCode">
                 <el-select v-model="addForm.sendStoreCode" placeholder="请选择" :disabled="typeOption === 'view' || typeOption === 'sure'"
-                           @change="changeStore">
+                           @change="changeStore(1)">
                   <el-option v-for="item in props.storeList" :key="item.value" :label="item.name" :value="item.code"/>
                 </el-select>
               </el-form-item>
@@ -84,7 +84,7 @@
 
             <el-col :span="12" v-if="addForm.inventoryType === 'OBU'">
               <el-form-item label="签类型" prop="obuType" v-if="addForm.inventoryType === 'OBU'">
-                <el-select clearable v-model="addForm.obuType" placeholder="请选择签类型">
+                <el-select clearable v-model="addForm.obuType" placeholder="请选择签类型" :disabled="typeOption === 'view' || typeOption === 'sure'">
                   <el-option v-for="item in obuType" :key="item.value" :label="item.label"
                              :value="item.value" :disabled="typeOption === 'view' || typeOption === 'sure'"/>
                 </el-select>
@@ -212,9 +212,7 @@
                 <el-button class="op-btn" type="primary"
                            @click="validHandle(scope.row, scope.$index)">校验
                 </el-button>
-                <el-button class="op-btn" type="primary" @click="validDetailHandle(scope.row)"
-                           v-if="scope.row.isShowBtn">校验失败明细
-                </el-button>
+<!--                <el-button class="op-btn" type="primary" @click="validDetailHandle(scope.row)" v-if="scope.row.isShowBtn">校验失败明细</el-button>-->
                 <el-button class="op-btn" type="danger" v-if="scope.$index > 0"
                            @click="deleteHandle(scope.row, scope.$index)">删除
                 </el-button>
@@ -231,12 +229,8 @@
     </el-form>
     <div class="btn-wrap">
       <el-button type="primary" @click="backHandle">关闭</el-button>
-      <el-button type="primary" v-if="typeOption === 'add' || typeOption === 'edit'" @click="saveHandle"
-                 v-loading="btnLoding">调拨保存
-      </el-button>
-      <el-button type="primary" v-if="typeOption === 'sure'" @click="sureHandle"
-                 v-loading="btnLoding">确认入库
-      </el-button>
+      <el-button type="primary" v-if="typeOption === 'add' || typeOption === 'edit'" @click="saveHandle">调拨保存</el-button>
+      <el-button type="primary" v-if="typeOption === 'sure'" @click="sureHandle">确认入库</el-button>
     </div>
   </div>
 </template>
@@ -273,14 +267,14 @@ const emit = defineEmits([
   "refreshDataList"
 ])
 const handleChange = (value) => {
-  console.log(value)
+  // console.log(value)
 }
 const handleRemove = (file) => {
   const index = fileList.value.indexOf(file);
   if (index !== -1) {
     fileList.value.splice(index, 1);
     fileListData.value.splice(index, 1);
-    console.log(fileListData.value, 'fileListData.valuefileListData.value')
+    // console.log(fileListData.value, 'fileListData.valuefileListData.value')
   }
 };
 const beforeUpload = (file) => {
@@ -294,10 +288,10 @@ const beforeUpload = (file) => {
   return true;
 };
 const handleSuccess = (response: any) => {
-  console.log(fileList.value, 'fileListfileList')
-  console.log(response.data, 'response.dataresponse.data')
+  // console.log(fileList.value, 'fileListfileList')
+  // console.log(response.data, 'response.dataresponse.data')
   fileListData.value.push(response.data.ossFilePath)
-  console.log(fileListData.value, 'fileListData.valuefileListData.value')
+  // console.log(fileListData.value, 'fileListData.valuefileListData.value')
 };
 const handlePreview = (file) => {
   const isImage = file.type && file.type.includes('image');
@@ -342,7 +336,7 @@ const initForm = {
 }
 const templateDownload = () => {
   let url = import.meta.env.VITE_APP_UPLOAD_URL + 'zhywpt-issuer/template/invw/设备备货号段导入模板.xlsx';
-  console.log(url, 'bizContent.exportExcelUrlbizContent.exportExcelUrl')
+  // console.log(url, 'bizContent.exportExcelUrlbizContent.exportExcelUrl')
   BaseService.getDownload(url, '设备备货号段导入模板')
 }
 const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
@@ -424,7 +418,7 @@ const handleExceed: UploadProps['onExceed'] = (files) => {
   upload.value!.submit()
 }
 
-function changeStore(){
+function changeStore(flag){
   let code = addForm.value.sendStoreCode;
   if(code !== '' && code !== undefined && code !== null) {
     let params = {
@@ -436,7 +430,9 @@ function changeStore(){
       if (res && res.code === 0) {
         let bizContent = res.data
         receiveStoreList.value = bizContent.idNames
-        addForm.value.receiveStoreCode=null;
+        if(flag === 1){
+          addForm.value.receiveStoreCode=null;
+        }
       }
     })
   }
@@ -510,6 +506,7 @@ function getInfo(id: string) {
         ...data,
         detailList: list
       }
+      changeStore();
       // console.log(addForm.value, '=============------------==========');
 
       //addForm.value.detailList = list;
@@ -524,13 +521,13 @@ function getInfo(id: string) {
 let idex = ''
 
 function onSuccess(response: any) {
-  console.log(response)
-  BaseService.postN('/invw/api/transfer/import', {url: response.data.ossFilePath}).then((res: any) => {
+  // console.log(response)
+  BaseService.postN('/invw/api/transfer/import', {fileUrl: response.data.ossFilePath}).then((res: any) => {
     if (res && res.code === 0) {
-      let bizContent = JSON.parse(res.bizContent);
-      console.log(bizContent)
-      let info = bizContent.info || "";
-      let data = bizContent.data
+      let bizContent = res.data;
+      // console.log(bizContent)
+      let info = bizContent.transferDetails || "";
+      let data = bizContent.transferDetails
       let newarr: any = []
       data.forEach((column, index) => {
 
@@ -796,7 +793,7 @@ function saveHandle() {
       }
       list.push(tem);
     })
-    console.log(params);
+    // console.log(params);
 
     let params2 = {}
     params2.brand = params.brand;
@@ -809,7 +806,7 @@ function saveHandle() {
     params2.obuType = params.obuType;
     params2.filePath = fileListData.value[0];
     let api = '/invw/api/transfer/add';
-    console.log("typeOption.value", typeOption.value)
+    // console.log("typeOption.value", typeOption.value)
     if (typeOption.value === 'add') {
       delete params2.id
     }
@@ -826,7 +823,7 @@ function saveHandle() {
         clearData();
         emit("refreshDataList");
         emit("closeHandle");
-        ElMessage.success("备货保存成功");
+        ElMessage.success("保存成功");
       } else {
         btnLoding.value = false;
         ElMessage.error(res.message);
@@ -948,7 +945,7 @@ function getSummaries(param) {
 
 // 获取仓库状态
 function getLowerList() {
-  console.log("获取仓库列表")
+  // console.log("获取仓库列表")
   let params = {
     allType: 0
   }
@@ -965,7 +962,7 @@ function getLowerList() {
 
 // 获取仓库状态
 function getAgency() {
-  console.log("获取产权列表")
+  // console.log("获取产权列表")
   BaseService.postN('/invw/agency/list').then((res: any) => {
     if (res && res.code === 0) {
       let bizContent = res.data

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

@@ -38,7 +38,7 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column prop="inventoryType" label="采购设备类型" min-width="100">
+        <el-table-column prop="inventoryType" label="设备类型" min-width="80">
           <template v-slot="scope">
             <span>{{ getDictLabel(inventoryType, scope.row.inventoryType) }}</span>
           </template>
@@ -49,7 +49,6 @@
           </template>
         </el-table-column>
         <el-table-column prop="applyCount" label="备货数量" width="80"></el-table-column>
-        <el-table-column prop="applyTime" label="申请时间" width="170"></el-table-column>
         <el-table-column prop="applyStatus" label="状态" width="80">
           <template v-slot="scope">
             <el-tag :type="scope.row.applyStatus === 'CANCEL' ? 'danger' : scope.row.applyStatus === 'NEW'?'success':''">
@@ -57,6 +56,7 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column prop="applyTime" label="申请时间" width="170"></el-table-column>
         <el-table-column label="操作" width="250" fixed="right">
           <template v-slot="scope">
             <el-button size="small" type="success" class="op-btn" @click="editHandle(scope.row)" v-if=" (scope.row.applyStatus === 'NEW')">修改</el-button>
@@ -79,7 +79,7 @@
     <el-dialog v-model="cancelOrderDialog" width="30%" title="取消订单">
       <el-form ref="cancelOrderFormRef" :model="cancelOrderForm" :rules="{
         cancelReason: [
-          { required: true, message: '取消原因不能为空', trigger: 'change' },
+          { required: true, message: '取消原因不能为空', trigger: 'blur' },
         ],
       }" label-width="80px">
         <el-form-item label="取消原因" prop="cancelReason">
@@ -136,6 +136,7 @@ const cancelOrderForm = ref({
   cancelReason: ''
 })
 const addUpdateRef = ref()
+const cancelOrderFormRef = ref()
 const state = reactive({
   tableData: [] as IObject[],
   searchForm: {},
@@ -382,30 +383,35 @@ function viewHandle(row: IObject) {
 
 // 删除
 function deleteHandle(row: IObject) {
-  ElMessageBox.confirm('确定要取消调拨么？', '', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'error',
+  let reason = cancelOrderForm.value.cancelReason
+  cancelOrderFormRef.value.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm('确定要取消调拨么？', '', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'error',
+      }).then(() => {
+            BaseService.postN('/invw/api/transfer/cancelIn', {
+              id: rowData.value.id,
+              reason: reason
+            }).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/transfer/cancelIn', {
-          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('取消')
-      })
+
 }
 
 // 恢复备货

src/views/inventoryControl/newInventory/warehouseManagement/data.js

@@ -37,7 +37,7 @@ export const getZxqdFindConfig = (route, agencyIdList, branchIdList, upperWareho
     operateFixed: true, //操作栏是否固定(默认false)
     operateWidth: "140", //操作栏宽度
     operate: {
-        edit: true, //是否编辑(默认true) IsPermission(route, 'EDIT_LIST')
+        edit: false, //是否编辑(默认true) IsPermission(route, 'EDIT_LIST')
         info: false, //是否编辑(默认true) IsPermission(route, 'INFO_LIST')
         delete: false, //是否删除(默认true) IsPermission(route, 'DEL_LIST')
         announcement: false, // 公告

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

@@ -15,7 +15,8 @@
           end-placeholder="结束日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" @change="dateChangeHandle" style="width: 250px"/>
       </template>
       <template #operation="{scope}">
-        <el-button type="success" size="small" @click="showInfo(scope.$index, scope.row)">详情</el-button>
+        <el-button v-if="scope.row.code!=='5201010304001900000'" type="success" size="small" @click="toEdit(scope.row)">修改</el-button>
+        <el-button type="primary" size="small" @click="showInfo(scope.$index, scope.row)">详情</el-button>
       </template>
       <template #isCheck="item">
         <!-- @vue-ignore -->
@@ -33,7 +34,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, watch } from 'vue'
+import { ref, onMounted, watch, nextTick, toRaw } from 'vue'
 // @ts-ignore crudFrom模板
 import CrudTemplate from '@/crud/index.vue'
 import BaseService from '@/utils/baseService' //引入接口请求
@@ -104,8 +105,8 @@ function handleBeforeChange1(value, arg1) {
 }
 function getUpperWarehouseIdList() {
   BaseService.post('/invw/api/warehouse/getWarehouseIdNames', {
-    "id": "",
-    "type": ""
+    "id": "9999",
+    "type": "8"
   }).then((res: any) => {
     if (res && res.statusCode === 0) {
       //数据转换 .agencyQueryAllModels
@@ -134,6 +135,18 @@ function customSelectorSelection(value, title, form, item, dialogArray) {
     }
   }
 }
+// 修改
+function toEdit(row) {
+    const data: any = toRaw(row)
+    crudRef.value.dialogFormVisible = true
+    crudRef.value.title = '编辑'
+    nextTick(() => {
+      crudRef.value.form={
+        ...data
+      }
+    })
+  }
+
 //详情
 function showInfo(idx: any, row: any) {
   let labels = field.value.field

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

@@ -621,8 +621,10 @@
           if (autdis.auditStatus == 'true') {
             autdisReasonType.value = ''
             autdis.reason = ''
+            autdis.orderNo = beanData.orderNo
             // autdis.reason1 = ''
           }
+          console.log("autdis", autdis)
           BaseService.postN('/managew/api/issue/orderExamine/examine', autdis).then((res: any) => {
             if (res && res.code === 0) {
               ElMessage.success(res.message)