Merge remote-tracking branch 'origin/master'

src/views/inout/DialogSelectReceiveOrder.vue

@@ -26,7 +26,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item class="query-form-item" label="领用类型">
-                <el-select v-model="listQuery.billAction" placeholder="请选择领用类型" clearable="true">
+                <el-select v-model="listQuery.billType" placeholder="请选择领用类型" clearable="true">
                   <el-option
                     v-for="item in originTypes"
                     :key="item.originAction"
@@ -86,7 +86,7 @@
           @current-change="handleDetail"
         >
           <el-table-column label="序号" type="index" width="60"></el-table-column>
-          <el-table-column label="领用类型" prop="billType"></el-table-column>
+          <el-table-column label="领用类型" prop="billTypeName"></el-table-column>
           <el-table-column label="单据号" prop="billNo"></el-table-column>
           <el-table-column label="领用仓库" prop="invName"></el-table-column>
           <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
@@ -283,11 +283,11 @@ export default {
     getList() {
       this.loading = true;
       if (this.actDateRange !== null) {
-        this.listQuery.startDate = this.actDateRange[0];
+        this.listQuery.startTime = this.actDateRange[0];
-        this.listQuery.endDate = this.actDateRange[1];
+        this.listQuery.endTime = this.actDateRange[1];
       } else {
-        this.listQuery.startDate = null;
+        this.listQuery.startTime = null;
-        this.listQuery.endDate = null;
+        this.listQuery.endTime = null;
       }
       this.listQuery.customerId = store.getters.customerId;
       getReceiveOrder(this.listQuery)
@@ -363,7 +363,7 @@ export default {
     },
     getBusType() {
       let query = {
-        enabled: false,
+        enable: true,
       };
       getBusChange(query)
         .then((response) => {

src/views/system/dept/invWarehouse.vue

@@ -565,6 +565,7 @@ export default {
     },
     //关联第三方仓库信息
     intentSubSelect(row) {
+
       if (row != null) {
         if (row.sysId != null && row.sysId != undefined) {
           this.thirdSubQuery.thirdSysFk = row.sysId;