同步设置修改

src/views/sync/SysUdimsConfig.vue

@@ -50,7 +50,7 @@
                     style="margin-left: 20px"
                     :disabled="configQuery.downstreamEnable"
                     :loading="testLoading"
-                    >测试连通
+                    >连通性测试
                   </el-button>
                 </div>
               </el-col>

src/views/thirdSys/inv/index.vue

@@ -55,7 +55,7 @@
           label="部门名称"
         >
         </el-table-column>
-<!--        <el-table-column-->
+        <!--        <el-table-column-->
         <!--          prop="advanceType"-->
         <!--          label="仓库类型">-->
         <!--          <template slot-scope="scope">-->
@@ -165,7 +165,6 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :visible.sync="formVisible"
-      :before-close="hideForm"
       width="45%"
       top="5vh"
     >
@@ -182,12 +181,12 @@
             auto-complete="off"
           ></el-input>
         </el-form-item>
-<!--        <el-form-item class="query-form-item" prop="advanceType" label="仓库类型" label-width="100px">-->
+        <!--        <el-form-item class="query-form-item" prop="advanceType" label="仓库类型" label-width="100px">-->
-<!--          <el-select v-model="formData.advanceType" placeholder="仓库类型" clearable style="width: 80%">-->
+        <!--          <el-select v-model="formData.advanceType" placeholder="仓库类型" clearable style="width: 80%">-->
-<!--            <el-option label="寄售" :value='true'></el-option>-->
+        <!--            <el-option label="寄售" :value='true'></el-option>-->
-<!--            <el-option label="仓库" :value='false'></el-option>-->
+        <!--            <el-option label="仓库" :value='false'></el-option>-->
-<!--          </el-select>-->
+        <!--          </el-select>-->
-<!--        </el-form-item>-->
+        <!--        </el-form-item>-->
         <el-form-item class="query-form-item" prop="thirdSysFk" label="第三方系统" label-width="100px">
           <el-select v-model="formData.thirdSysFk" placeholder="请选择第三方系统" clearable style="width: 80%">
             <el-option
@@ -218,7 +217,7 @@
         >
       </div>
     </el-dialog>
-    <!-- 分库弹窗编辑页面-->
+    <!-- 仓库弹窗编辑页面-->
     <el-dialog
       :title="subMap[subFromName]"
       :close-on-click-modal="false"
@@ -244,13 +243,13 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="分库编码" prop="title" class="query-form-item">
+        <el-form-item label="仓库编码" prop="title" class="query-form-item">
           <el-input
             v-model="subData.code" style="width: 80%"
             auto-complete="off"
           ></el-input>
         </el-form-item>
-        <el-form-item label="分库名称" prop="name" class="query-form-item">
+        <el-form-item label="仓库名称" prop="name" class="query-form-item">
           <el-input
             v-model="subData.name" style="width: 80%"
             auto-complete="off"
@@ -315,8 +314,8 @@ export default {
         parentId: null,
         thirdSysFk: null,
       },
-      mainThirdSys:'',
+      mainThirdSys: '',
-      ThirdSysName:"",
+      ThirdSysName: "",
       mergeList: [],
       subList: [],
       subData: {},
@@ -331,9 +330,9 @@ export default {
       index: null,
       formName: null,
       formMap: {
-        addTop: "仓库信息-新增",
+        addTop: "部门信息-新增",
         add: "添加货位",
-        edit: "仓库信息-编辑"
+        edit: "部门信息-编辑"
       },
       subMap: {
         add: "仓库信息-添加",
@@ -409,8 +408,8 @@ export default {
       this.query = {
         name: "",
         status: "",
-        page:1,
+        page: 1,
-        limit:20,
+        limit: 20,
         thirdSysFk: this.mainThirdSys
       };
       this.getList();
@@ -453,10 +452,10 @@ export default {
       // 更改值
       this.formVisible = false;
       this.subFormVisible = false;
-      let Item = JSON.parse(localStorage.getItem('obj'))
+      // let Item = JSON.parse(localStorage.getItem('obj'))
-      this.subData=Item;
+      // this.subData = Item;
-      this.getSubList();
+      // this.getSubList();
-      return true;
+      // return true;
     },
     // 显示表单
     handleForm(node, data, formName) {
@@ -483,7 +482,7 @@ export default {
       if (data && data.id) {
         this.index = this.mergeList.findIndex((d) => d.id === data.id);
       }
-      this.ThirdSysName=this.formData.thirdSysFk
+      this.ThirdSysName = this.formData.thirdSysFk
     },
 
     handleSubForm(data, formName) {
@@ -502,7 +501,7 @@ export default {
 
     handleSubDel(row) {
       if (row.id) {
-        this.$confirm("确认删除该分库吗?", "提示", {
+        this.$confirm("确认删除该仓库吗?", "提示", {
           type: "warning",
         })
           .then(() => {
@@ -532,14 +531,14 @@ export default {
       }
     },
 
-    //添加分库
+    //添加仓库
     forSubSubmit() {
       if (this.$isBlank(this.subData.code)) {
-        this.$message.error("分库编码不能为空！");
+        this.$message.error("仓库编码不能为空！");
         return;
       }
       if (this.$isBlank(this.subData.name)) {
-        this.$message.error("分库名称不能为空！");
+        this.$message.error("仓库名称不能为空！");
         return;
       }
 
@@ -557,7 +556,7 @@ export default {
           this.subFormVisible = false;
         }
       }).catch(() => {
-        this.subData.code=JSON.parse(localStorage.getItem("code"));
+        this.subData.code = JSON.parse(localStorage.getItem("code"));
         this.subFormVisible = false;
       });
       this.resetForm();
@@ -613,7 +612,7 @@ export default {
             .catch(() => {
               this.formLoading = false;
 
-              this.formData.thirdSysFk=this.ThirdSysName;
+              this.formData.thirdSysFk = this.ThirdSysName;
             });
         }
       });
@@ -663,8 +662,8 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          for(var i=0;i<this.thirdSys.length;i++){
+          for (var i = 0; i < this.thirdSys.length; i++) {
-            if(this.thirdSys[i].mainSys){
+            if (this.thirdSys[i].mainSys) {
               this.query.thirdSysFk = this.thirdSys[i].thirdId;
               this.mainThirdSys = this.thirdSys[i].thirdId;
             }