去掉单据类型与第三方单据类型关联，更改为在第三方接口设置关联

src/views/basic/busType/bussinessTypeModify.vue

@@ -111,30 +111,30 @@
         </el-col>
       </el-row>
 
-      <el-row type="flex">
-        <el-col :span="11">
-          <el-form-item label="第三方单据类型" prop="prefix">
-            <el-select v-model="inputQuery.originAction"
-                       size="small"
-                       clearable
-                       style="width: 90%"
-                       filterable
-                       placeholder="请选择第三方系统单据类型"
-            >
-              <el-option
-                v-for="item in originTypes"
-                :key="item.id"
-                :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.thirdSysName
-                  }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+<!--      <el-row type="flex">-->
+      <!--        <el-col :span="11">-->
+      <!--          <el-form-item label="第三方单据类型" prop="prefix">-->
+      <!--            <el-select v-model="inputQuery.originAction"-->
+      <!--                       size="small"-->
+      <!--                       clearable-->
+      <!--                       style="width: 90%"-->
+      <!--                       filterable-->
+      <!--                       placeholder="请选择第三方系统单据类型"-->
+      <!--            >-->
+      <!--              <el-option-->
+      <!--                v-for="item in originTypes"-->
+      <!--                :key="item.id"-->
+      <!--                :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.thirdSysName-->
+      <!--                  }}</span>-->
+      <!--              </el-option>-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
 
       <el-row type="flex">
         <el-col :span="23" type="flex">

src/views/inout/DialogSelectThrOrder.vue

@@ -9,29 +9,35 @@
             <el-col :span="6">
               <el-form-item class="query-form-item" label="单据号:">
                 <el-input
-                    v-model="listQuery.billNo"
-                    placeholder="单据号"
-                    clearable
+                  v-model="listQuery.billNo"
+                  placeholder="单据号"
+                  clearable
                 ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item class="query-form-item" label="往来单位:">
-                <el-input
-                    v-model="listQuery.corpName"
-                    placeholder="往来单位"
-                    clearable
-                ></el-input>
+              <el-form-item label="外部系统:">
+                <el-select v-model="listQuery.thirdSysFk" style="width: 90%" placeholder="请选择第三方系统"
+                           clearable="true" @change="thirdSysChange">
+                  <el-option
+                    v-for="item in thirdSys"
+                    :key="item.thirdId"
+                    :label="item.thirdName"
+                    :value="item.thirdId">
+                    <span style="float: left;font-size: 13px">{{ item.thirdName }}</span>
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
+
             <el-col :span="6">
               <el-form-item class="query-form-item" label="单据类型:">
                 <el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" filterable clearable="true">
                   <el-option
-                      v-for="item in originTypes"
-                      :key="item.name"
-                      :label="item.name"
-                      :value="item.action">
+                    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.thirdSysName
@@ -45,14 +51,14 @@
             <el-col :span="6">
               <el-form-item class="query-form-item" label="单据日期:">
                 <el-date-picker
-                    :picker-options="pickerOptions"
-                    v-model="actDateRange"
-                    type="daterange"
-                    format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -64,9 +70,9 @@
             <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
 
             <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onReset"
+              type="primary"
+              icon="el-icon-refresh"
+              @click="onReset"
             >重置
             </el-button>
             <el-button type="primary" icon="el-icon-search" @click="submitFind">查询</el-button>
@@ -78,13 +84,13 @@
         </div>
         <el-divider style="margin: 15px"></el-divider>
         <el-table
-            :data="dataList"
-            style="width: 100%"
-            highlight-current-row="true"
-            v-loading="loading"
-            border
-            :row-class-name="tableRowClassName"
-            @current-change="handleChange"
+          :data="dataList"
+          style="width: 100%"
+          highlight-current-row="true"
+          v-loading="loading"
+          border
+          :row-class-name="tableRowClassName"
+          @current-change="handleChange"
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="单据号" prop="billNo"></el-table-column>
@@ -95,11 +101,11 @@
           <el-table-column label="单据日期" prop="billdate"></el-table-column>
         </el-table>
         <el-pagination
-            :page-size="listQuery.limit"
-            @current-change="handleErpPageChange"
-            layout="prev, pager, next"
-            :total="pageTotal"
-            :current-page="listQuery.page"
+          :page-size="listQuery.limit"
+          @current-change="handleErpPageChange"
+          layout="prev, pager, next"
+          :total="pageTotal"
+          :current-page="listQuery.page"
         ></el-pagination>
       </div>
     </el-card>
@@ -119,17 +125,17 @@
 
 
     <el-dialog
-        v-if="storageVisible"
-        title="请选择单据所属仓库信息"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        append-to-body
-        :visible.sync="storageVisible">
+      v-if="storageVisible"
+      title="请选择单据所属仓库信息"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      :visible.sync="storageVisible">
 
       <selectInvDialog
-          :closeInvDialog="closeInvDialog"
-          :billData="currentRow"
-          :closeSubmitDialog="closeSubmitDialog"
+        :closeInvDialog="closeInvDialog"
+        :billData="currentRow"
+        :closeSubmitDialog="closeSubmitDialog"
       ></selectInvDialog>
 
     </el-dialog>
@@ -142,6 +148,7 @@ import store from "../../store";
 import {getOriginBusType} from "@/api/basic/busOriginType";
 import {filterAllByUser} from "@/api/system/invWarehouse";
 import selectInvDialog from "./DialogSelectInv";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
 
 export default {
   name: "closeDialog",
@@ -269,23 +276,23 @@ export default {
       }
       this.listQuery.customerId = store.getters.customerId;
       getCloudErp(this.listQuery)
-          .then((response) => {
-            console.log(response)
-            this.loading = false;
-            if (response.code === 20000) {
-              this.dataList = response.data.list || [];
-              this.pageTotal = response.data.total || 0;
-            } else {
-              this.$message.error(response.message);
-              this.dataList = [];
-              this.pageTotal = 0;
-            }
-          })
-          .catch(() => {
-            this.loading = false;
+        .then((response) => {
+          console.log(response)
+          this.loading = false;
+          if (response.code === 20000) {
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
             this.dataList = [];
             this.pageTotal = 0;
-          });
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
     },
     intentBack() {
       this.closeDialog();
@@ -304,15 +311,15 @@ export default {
           invWarehouseCode: this.currentRow.invWarehouseCode,
         }
         addStockOrder(tQuery)
-            .then((response) => {
-              if (response.code === 20000) {
-                this.closeDialog();
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-            });
+          .then((response) => {
+            if (response.code === 20000) {
+              this.closeDialog();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
       }
     },
     hideSearch() {
@@ -329,16 +336,16 @@ export default {
         locStorageCode: this.curLocInv,
       }
       addStockOrder(tQuery)
-          .then((response) => {
-            if (response.code === 20000) {
-              this.storageVisible = false;
-              this.closeDialog();
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          if (response.code === 20000) {
+            this.storageVisible = false;
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
     },
 
     handleSelectionUdiChange(val) {
@@ -348,25 +355,26 @@ export default {
     getBusType() {
       let query = {
         enabled: true,
+        thirdSys: this.listQuery.thirdSysFk,
       };
       getOriginBusType(query)
-          .then((response) => {
-            this.originTypes = response.data.list || [];
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.originTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
     },
     getStorage(event) {
       this.storageList = [];
       filterAllByUser()
-          .then((response) => {
-            this.storageList = response.data || [];
-            if (this.storageList.length == 1) {
-              this.curLocInv = this.storageList[0].code;
-            }
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.storageList = response.data || [];
+          if (this.storageList.length == 1) {
+            this.curLocInv = this.storageList[0].code;
+          }
+        })
+        .catch(() => {
+        });
     },
 
 
@@ -374,15 +382,41 @@ export default {
       this.storageVisible = false;
     },
 
+    thirdSysChange() {
+      this.listQuery.billAction = "";
+      this.getBusType();
+    },
+
     closeSubmitDialog() {
       this.storageVisible = false;
       this.combine();
     },
+
+
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.listQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          this.uploadData.thirdSys = this.listQuery.thirdSysFk;
+          this.selectSysParam();
+          this.getBusType();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+
+
   },
   created() {
-    this.getBusType();
+
+    this.getBasicThirdSys();
     this.getStorage();
-    this.getList();
   },
   components: {selectInvDialog}
 

src/views/thirdSys/order/thrOrder.vue

@@ -9,12 +9,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="往来单位:">
-              <el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来单位" clearable></el-input>
+            <el-form-item label="外部系统:">
+              <el-select v-model="filterQuery.thirdSysFk" style="width: 90%" placeholder="请选择第三方系统"
+                         clearable="true" @change="thirdSysChange">
+                <el-option
+                  v-for="item in thirdSys"
+                  :key="item.thirdId"
+                  :label="item.thirdName"
+                  :value="item.thirdId">
+                  <span style="float: left;font-size: 13px">{{ item.thirdName }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="外部系统:">
+            <el-form-item label="单据类型:">
               <el-select v-model="filterQuery.billAction" style="width: 90%" placeholder="请选择第三方系统单据类型"
                          clearable="true">
                 <el-option
@@ -30,12 +39,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="单据日期:">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
-                style="width: 90%"
                 type="daterange"
                 format="yyyy 年 MM 月 dd 日"
                 value-format="yyyy-MM-dd"
@@ -316,6 +328,8 @@ export default {
     thirdSysChange() {
       this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
       this.getThirdSysDetail();
+      this.filterQuery.billAction = "";
+      this.getBusType();
     },
     getThirdSysDetail() {
       let query = {
@@ -363,6 +377,7 @@ export default {
     getBusType() {
       let query = {
         enabled: true,
+        thirdSys: this.filterQuery.thirdSysFk,
       };
       getBussinessType(query)
         .then((response) => {