第三方业务单据类型，第三方仓库修改

public/config.json

@@ -1,6 +1,6 @@
 {
-    "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9995/",
+    "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
-    "BASE_URL":"http://127.0.0.1:9991/",
+    "BASE_URL":"http://192.168.0.109:9991/",
-    "SERVER_IP": "http://127.0.0.1:9991/",
+    "SERVER_IP": "http://192.168.0.109:9991/",
-    "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/"
+    "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
 }

src/views/basic/BussinessTypeLocl.vue

@@ -91,7 +91,7 @@
             </el-dialog>
 
             <el-dialog
-                title="编辑业务类型关联"
+                title="编辑业务单据类型关联"
                 :visible.sync="modifyDialogVisible"
                 width="70%"
                 :close-on-click-modal="false"

src/views/basic/BussinessTypeLoclModify.vue

@@ -36,7 +36,27 @@
                         <span>第三方单据类型:&nbsp;</span>
                     </div>
 
-                    <el-select v-model="inputQuery.originAction" placeholder="请选择第三方系统单据类型" clearable="true">
+<!--                    <el-select v-model="inputQuery.originAction" placeholder="请选择第三方系统单据类型" clearable="true">-->
+                    <!--                        <el-option-->
+                    <!--                            v-for="item in originTypes"-->
+                    <!--                            :key="item.name"-->
+                    <!--                            :label="item.name"-->
+                    <!--                            :value="item.action">-->
+                    <!--                            <span style="float: left;font-size: 13px">{{ item.name }}</span>-->
+                    <!--                            <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
+                    <!--                                    item.action-->
+                    <!--                                }}</span>-->
+                    <!--                        </el-option>-->
+                    <!--                    </el-select>-->
+                    <el-select
+                        v-model="inputQuery.originAction"
+                        filterable
+                        remote
+                        clearable="true"
+                        reserve-keyword
+                        placeholder="请选择第三方系统单据类型"
+                        :loading="loading"
+                    >
                         <el-option
                             v-for="item in originTypes"
                             :key="item.name"
@@ -44,11 +64,12 @@
                             :value="item.action">
                             <span style="float: left;font-size: 13px">{{ item.name }}</span>
                             <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
-                                    item.thirdSysName
+                                    item.action
                                 }}</span>
                         </el-option>
                     </el-select>
 
+
                 </div>
             </el-col>
 
@@ -101,7 +122,8 @@
             <el-col :span="4" class="el-col">
                 <div class="text item">
                     <el-checkbox v-model="inputQuery.preIn" @change="preInChange"
-                                 :disabled="inputQuery.mainAction=='WareHouseOut' || inputQuery.mainAction==null">预验收</el-checkbox>
+                                 :disabled="inputQuery.mainAction=='WareHouseOut' || inputQuery.mainAction==null">预验收
+                    </el-checkbox>
                 </div>
             </el-col>
 
@@ -269,6 +291,7 @@ export default {
             },
             changeList: [],
             visibleChange: false,
+            loading: false,
         }
     },
     methods: {
@@ -299,8 +322,11 @@ export default {
                 .catch(() => {
                 });
         },
-        getTypes() {
+        getTypes(query) {
-            getOriginBusType()
+            let tQuery = {
+                key: query,
+            }
+            getOriginBusType(tQuery)
                 .then((response) => {
                     this.originTypes = response.data.list || [];
                 })
@@ -308,6 +334,17 @@ export default {
                 });
             this.getBusTypes();
         },
+        findMethod(query){
+            let tQuery = {
+                key: query,
+            }
+            getOriginBusType(tQuery)
+                .then((response) => {
+                    this.originTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
         preInChange() {
             if (this.inputQuery.preIn) {
                 this.inputQuery.changeEnable = false;

src/views/basic/BussinessTypeThird.vue

@@ -6,7 +6,7 @@
             <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
                     <el-input
-              v-model="filterQuery.name"
+                        v-model="filterQuery.key"
                         placeholder="业务类型"
                         style="width: 400px"
                     ></el-input>
@@ -42,7 +42,12 @@
                 <el-table-column label="序号" type="index" width="55"></el-table-column>
                 <el-table-column label="单据类型名称" prop="name"></el-table-column>
                 <el-table-column label="单据类型代码" prop="action"></el-table-column>
-        <el-table-column label="第三方系统" prop="thirdSys"></el-table-column>
+
+                <el-table-column prop="thirdName" label="第三方系统名称">
+                    <template slot-scope="scope">
+                        <span>{{ getThirdSysFkName(scope.row.thirdSys) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="备注" prop="remark"></el-table-column>
                 <el-table-column label="操作" width="100" fixed="right">
                     <template slot-scope="scope">
@@ -129,7 +134,7 @@ export default {
     data() {
         return {
             filterQuery: {
-        name: "",
+                key: "",
                 page: 1,
                 limit: 20,
             },
@@ -298,7 +303,6 @@ export default {
                         .catch(() => {
                         });
 
-
                 })
                 .catch(() => {
                 });
@@ -307,6 +311,13 @@ export default {
         thirdSysChange() {
             this.getList();
         },
+        getThirdSysFkName(thirdSys) {
+            for (let i = 0; i < this.thirdSys.length; i++) {
+                if (this.thirdSys[i].thirdId === thirdSys) {
+                    return this.thirdSys[i].thirdName;
+                }
+            }
+        },
 
         init() {
             axios.get("./config.json").then(res => {

src/views/basic/invWarehouse.vue

@@ -511,7 +511,7 @@
             <el-form :inline="true" :model="query" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
                     <el-input
-                        v-model="thirdQuery.name"
+                        v-model="thirdQuery.key"
                         clearable
                         placeholder="仓库名称"
                         style="width: 400px"
@@ -682,7 +682,7 @@ export default {
             thirdSysVisible: false,
             total: 0,
             thirdQuery: {
-                name:null,
+                key:null,
                 page: 1,
                 limit: 10
                 , thirdSysFk: "thirdId",

src/views/thrsys/ThrInvWarehouse.vue

@@ -4,9 +4,9 @@
             <el-form :inline="true" :model="query" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
                     <el-input
-                        v-model="query.name"
+                        v-model="query.key"
                         clearable
-                        placeholder="仓库名称"
+                        placeholder="关键字搜索"
                         style="width: 400px"
                     ></el-input>
                 </el-form-item>
@@ -388,7 +388,6 @@ export default {
             })
         },
         getThirdSysFkName(thirdSys) {
-
             for (let i = 0; i < this.thirdSys.length; i++) {
                 if (this.thirdSys[i].thirdId === thirdSys) {
                     return this.thirdSys[i].thirdName;