Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/aftersales/aftersalesWorkOrderTemp.vue

@@ -425,19 +425,6 @@ const appeal = ref({
 });
 const appealruleFormRef = ref();
 const columnListName = ref('columnList');
-const columnLists = [
-  'columnList',
-  'columnList1',
-  'columnList2',
-  'columnList3',
-  'columnList4',
-  'columnList5',
-  'columnList6',
-  'columnList7',
-  'columnList8',
-  'columnList9',
-  'columnList10',
-];
 /**
  * 人身份
  * Warehouse_customer_service  仓库客服
@@ -917,9 +904,8 @@ const timesc = (index, row) => {
     delete details.query[row.prop];
   }
 };
-
 /** 表格表头下拉框选择 */
-const selectsc = async(index, row) => {
+const selectsc = async (index, row) => {
   console.log(index, row);
   let _Obj = MatchCurrentMenu(); //匹配出当前菜单
   _Obj.request = true; //更新请求状态
@@ -1096,17 +1082,6 @@ const GetWarehouse = () => {
     });
   });
 };
-// 处理角色下拉选择状态码
-const ProcessingStatusCode = row => {
-  // 全部筛选
-  console.log(row);
-  if (UserPermissions.value == Useridentity.Headquarters_Manager) {
-    // 如果是总部客服经理待审核状态改成500
-    row.checkarr.find(item => item.value == '40').value = '500';
-  } else {
-    row.checkarr.find(item => item.value == '40').value = '40';
-  }
-};
 /**
  *页面初始化函数，包含字典，等必要请求
  */

src/views/basic/material/basicMaterial.vue

@@ -141,6 +141,7 @@
           ref="formNodeRef"
           :disabled="details.handleMaterialOption.isView"
           :model="details.handleMaterialOption.form"
+          v-loading="details.loadingObj.pageLoading"
         >
           <el-form-item
             style="flex: 1; min-width: 45%; margin: 10px"
@@ -241,7 +242,7 @@
           </el-button>
 
           <!-- 提交 -->
-          <el-button type="primary" icon="Position" @click="handleSubmit">提 交</el-button>
+          <el-button type="primary" icon="Position" @click="handleSubmit" :disabled="details.loadingObj.pageLoading">提 交</el-button>
         </div>
       </el-dialog>
     </div>
@@ -684,7 +685,7 @@ const handleSubmit = () => {
   formNodeRef.value.validate(async (valid, fields) => {
     if (valid) {
       console.log('submit!');
-      details.popUpShow.addMaterial = false;
+
       try {
         details.loadingObj.pageLoading = true;
 
@@ -695,6 +696,7 @@ const handleSubmit = () => {
         const res = await postMaterialSubmit(submitData);
         const { code, msg } = res.data;
         if (code !== 200) return;
+        details.popUpShow.addMaterial = false;
         ElMessage.success(msg);
         onLoad();
       } catch (error) {

src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

@@ -1311,13 +1311,14 @@ const newlyaddSubmit = () => {
                 message: res.data.msg,
                 type: 'success',
               });
+              newlyaddload.value = false; //关闭新增弹窗
             }
           })
           .catch(error => {
             console.log(error);
           })
           .finally(() => {
-            newlyaddload.value = false; //关闭新增弹窗
+
           });
       } else {
         // 新增
@@ -1330,13 +1331,14 @@ const newlyaddSubmit = () => {
                 message: res.data.msg,
                 type: 'success',
               });
+              newlyaddload.value = false; //关闭新增弹窗
             }
           })
           .catch(error => {
             console.log(error);
           })
           .finally(() => {
-            newlyaddload.value = false; //关闭新增弹窗
+
           });
       }
     }