1.修改搜索框提示信息

2.切换单据类型同步清空往来信息
3.修复点击空白处关闭弹窗的问题

src/views/basic/invWarehouse.vue

@@ -677,7 +677,7 @@
             <el-form :inline="true" :model="thirdSubQuery" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
                     <el-input
-                        v-model="thirdSubQuery.key"
+                        v-model="thirdSubQuery.name"
                         clearable
                         placeholder="分库名称"
                         style="width: 400px"
@@ -858,7 +858,7 @@ export default {
             },
             thirdSubQuery: {
                 parentId: null,
-                key: null,
+                name: null,
                 page: 1,
                 limit: 10,
                 thirdSysFk: "thirdId",
@@ -1599,10 +1599,11 @@ export default {
         },
 
         intentSubSelect(row) {
-
             if (row != null) {
                 this.thirdSubQuery.parentId = this.superRow.code;
-                this.thirdSubQuery.thirdSysFk = row.sysId;
+                if (row.sysId != null && row.sysId != undefined) {
+                    this.thirdSubQuery.thirdSysFk = row.sysId;
+                }
             }
             this.thrSubWarehouseData = [];
             this.thrSubWareHouseVisible = true;

src/views/userManage/customerManage.vue

@@ -6,7 +6,7 @@
                     <el-input
                         style="width: 400px"
                         v-model="filterQuery.companyName"
-                        placeholder="客户名称"
+                        placeholder="企业名称"
                     ></el-input>
                 </el-form-item>
 

src/views/userManage/userAccountManage.vue

@@ -96,6 +96,8 @@
             :before-close="hideForm"
             width="70%"
             top="5vh"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <el-form :model="formData" :rules="formRules" ref="dataForm">
                 <el-row :gutter="20" class="el-row" type="flex">
@@ -363,13 +365,6 @@ export default {
             }
         },
         formSubmit() {
-            console.log(
-                this.formData.userName +
-                "--222---" +
-                this.formData.employeeName +
-                this.formData.userFlag +
-                this.formData.id
-            );
             this.$refs["dataForm"].validate((valid) => {
                 if (valid) {
                     this.formLoading = true;
@@ -388,7 +383,6 @@ export default {
                         userName: this.formData.userName,
                         employeeName: this.formData.employeeName,
                     };
-                    console.log(savequery.id + "---");
                     authAdminSave(savequery, this.formName).then((response) => {
                         this.formLoading = false;
                         if (response.code !== 20000) {
@@ -410,7 +404,6 @@ export default {
                         this.resetForm();
                     });
                 } else {
-                    console.log("参数错误");
                 }
             });
         },

src/views/warehouse/addHosOrder.vue

@@ -1024,6 +1024,9 @@ export default {
             this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill);
             this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
 
+            this.formData.fromCorp = null;
+            this.formData.fromSubInvCode = null;
+
             // this.formData.vailIn = this.curAction.vailInv;
             // this.formData.preCheck = this.curAction.scanPreIn;
             // this.formData.outChangeEnable = this.curAction.ullageFill;

src/views/warehouse/addOrder.vue

@@ -833,6 +833,7 @@ export default {
             this.curAction = this.getActionItem(item);
             this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
             // this.formData.locStorageCode = this.curAction.storageCode;
+            this.formData.fromCorp = null;
         },
         //绑定数据
         bindRl(val) {