From d247ebb68e3a68429128aa321a960bea56ecb3f1 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Fri, 20 May 2022 12:08:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BB=93=E5=BA=93=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogSelectErpOrder.vue | 707 ++++++++++++-----------
 src/views/inout/IOCheckWaitOrder.vue     |   3 +
 src/views/thrsys/ThrInvWarehouse.vue     |  14 +-
 3 files changed, 368 insertions(+), 356 deletions(-)

diff --git a/src/views/inout/DialogSelectErpOrder.vue b/src/views/inout/DialogSelectErpOrder.vue
index 24f1af4..ae2d461 100644
--- a/src/views/inout/DialogSelectErpOrder.vue
+++ b/src/views/inout/DialogSelectErpOrder.vue
@@ -1,153 +1,153 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form
-                :inline="true"
-                :model="filterQuery"
-                class="query-form"
-                size="mini"
-            >
-                <el-row>
-                    <el-form-item class="query-form-item">
-                        <el-input
-                            v-model="filterQuery.billNo"
-                            placeholder="单据号"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.localAction" placeholder="请选择业务类型">
-                            <el-option
-                                v-for="item in busTypes"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.action">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
+  <div>
+    <el-card class="el-card">
+      <el-form
+          :inline="true"
+          :model="filterQuery"
+          class="query-form"
+          size="mini"
+      >
+        <el-row>
+          <el-form-item class="query-form-item">
+            <el-input
+                v-model="filterQuery.billNo"
+                placeholder="单据号"
+            ></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-select v-model="filterQuery.localAction" placeholder="请选择业务类型">
+              <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="query-form-item">
             <span style="color: #000; margin-left: 10px; margin-right: 6px"
             >单据日期:</span
             >
-                        <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="结束日期"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button-group>
-                            <el-button
-                                type="primary"
-                                icon="el-icon-refresh"
-                                @click="onReset"
-                            ></el-button>
-                            <el-button type="primary" icon="search" @click="onSubmit"
-                            >查询
-                            </el-button
-                            >
-                            <el-button type="primary" icon="search" @click="importErps"
-                            >导入比对
-                            </el-button
-                            >
-
-                            <!-- <el-button type="primary" icon="search" @click="combineErps"
-                              >合并下载</el-button
-                            > -->
-                        </el-button-group>
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <el-table
-                v-loading="loading"
-                :data="list"
-                highlight-current-row="true"
-                @selection-change="handleSelectionChange"
-                @row-click="getOrderDetail"
-                style="width: 100%"
+            <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="结束日期"
             >
-                <el-table-column type="selection" width="55"></el-table-column>
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column
-                    label="订单ID"
-                    prop="billNo"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <!--                <el-table-column-->
-                <!--                    label="客户ID"-->
-                <!--                    prop="corpId"-->
-                <!--                    :show-overflow-tooltip="true"-->
-                <!--                ></el-table-column>-->
-                <el-table-column
-                    label="客户名称"
-                    prop="corpName"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="单据日期"
-                    show-overflow-tooltip
-                    prop="billdate"
-                ></el-table-column>
-                <el-table-column label="业务单据类型" prop="billType"></el-table-column>
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  @click="onReset"
+              ></el-button>
+              <el-button type="primary" icon="search" @click="onSubmit"
+              >查询
+              </el-button
+              >
+              <el-button type="primary" icon="search" @click="importErps"
+              >导入比对
+              </el-button
+              >
 
-                <!-- <el-table-column label="下载状态" prop="isDownload"></el-table-column> -->
-            </el-table>
-            <el-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-            ></el-pagination>
-        </el-card>
+              <!-- <el-button type="primary" icon="search" @click="combineErps"
+                >合并下载</el-button
+              > -->
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-table
+          v-loading="loading"
+          :data="list"
+          highlight-current-row="true"
+          @selection-change="handleSelectionChange"
+          @row-click="getOrderDetail"
+          style="width: 100%"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+            label="订单ID"
+            prop="billNo"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <!--                <el-table-column-->
+        <!--                    label="客户ID"-->
+        <!--                    prop="corpId"-->
+        <!--                    :show-overflow-tooltip="true"-->
+        <!--                ></el-table-column>-->
+        <el-table-column
+            label="客户名称"
+            prop="corpName"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="单据日期"
+            show-overflow-tooltip
+            prop="billdate"
+        ></el-table-column>
+        <el-table-column label="业务单据类型" prop="billType"></el-table-column>
 
-        <el-card class="el-card">
-            <el-table
-                v-loading="detailLoading"
-                :data="detailList"
-                style="width: 100%"
-            >
-                <el-table-column label="序号" type="index"></el-table-column>
+        <!-- <el-table-column label="下载状态" prop="isDownload"></el-table-column> -->
+      </el-table>
+      <el-pagination
+          :page-size="filterQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+      ></el-pagination>
+    </el-card>
+
+    <el-card class="el-card">
+      <el-table
+          v-loading="detailLoading"
+          :data="detailList"
+          style="width: 100%"
+      >
+        <el-table-column label="序号" type="index"></el-table-column>
 
-                <el-table-column
-                    label="产品ID"
-                    prop="productId"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
+        <el-table-column
+            label="产品ID"
+            prop="productId"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
 
-                <el-table-column
-                    label="产品名称"
-                    prop="productName"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="批号"
-                    prop="batchNo"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="规格型号"
-                    prop="spec"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column label="单据数量" prop="reCount"></el-table-column>
-                <el-table-column label="实际数量" prop="count">
-                </el-table-column>
-            </el-table>
-        </el-card>
-    </div>
+        <el-table-column
+            label="产品名称"
+            prop="productName"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="批号"
+            prop="batchNo"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="规格型号"
+            prop="spec"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column label="单据数量" prop="reCount"></el-table-column>
+        <el-table-column label="实际数量" prop="count">
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
 </template>
 
 <script>
 import {
-    combineErpOrder,
-    selectErpOrder,
-    getCloudErp,
+  combineErpOrder,
+  selectErpOrder,
+  getCloudErp,
 } from "../../api/inout/erpOrder";
 
 import {stockListDetail} from "../../api/inout/stockOrder"
@@ -155,248 +155,253 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {getLocalBusType, filterByBus} from "../../api/basic/busLocalType";
 
 export default {
-    name: "orderId",
-    props: {
-        orderId: {
-            type: Object,
-            required: true,
-        },
-        orderAction: {
-            type: Object,
-            required: true,
-        }
+  name: "orderId",
+  props: {
+    orderId: {
+      type: Object,
+      required: true,
     },
-    data() {
-        return {
-            filterQuery: {
-                billcode: "",
-                billFlag: null,
-                localAction: null,
-                startDate: null,
-                endDate: null,
-                status: 3,
-                page: 1,
-                limit: 5,
-            },
-            value: "",
-            total: 0,
-            list: [],
-            busTypes:[],
-            loading: false,
-            detailLoading: false,
-            detailList: [],
-            actDateRange: [],
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
+    orderAction: {
+      type: Object,
+      required: true,
+    },
+    curLocInv: {
+      type: Object,
+      required: true,
+    }
+  },
+  data() {
+    return {
+      filterQuery: {
+        billcode: "",
+        billFlag: null,
+        localAction: null,
+        startDate: null,
+        endDate: null,
+        status: 3,
+        page: 1,
+        limit: 5,
+      },
+      value: "",
+      total: 0,
+      list: [],
+      busTypes: [],
+      loading: false,
+      detailLoading: false,
+      detailList: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            multipleSelection: [],
-            postQuery: {
-                orderId: "",
-                purchaseinResponses: [],
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            idQuery: {
-                id: "",
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-        };
-    },
+          },
+        ],
+      },
+      multipleSelection: [],
+      postQuery: {
+        orderId: "",
+        purchaseinResponses: [],
+      },
+      idQuery: {
+        id: "",
+      },
+    };
+  },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                billNo: "",
-                billFlag: null,
-                localAction: null,
-                startDate: null,
-                endDate: null,
-                page: 1,
-                limit: 5,
-                status: 3,
-            };
-            this.actDateRange = [];
-            this.getList();
-        },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        billFlag: null,
+        localAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 5,
+        status: 3,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
 
-        onSubmit() {
-            if (this.actDateRange != null) {
-                this.filterQuery.startDate = this.actDateRange[0];
-                this.filterQuery.endDate = this.actDateRange[1];
+    onSubmit() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.filterQuery.locStorageCode = this.curLocInv;
+      getCloudErp(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code == 20000) {
+              this.list = response.data.list || [];
+              this.detailList = [];
+              this.total = response.data.total || 0;
             } else {
-                this.filterQuery.startDate = null;
-                this.filterQuery.endDate = null;
+              this.$message.error(response.message);
             }
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            getCloudErp(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.detailList = [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-
-        //业务明细表
-        getOrderDetail(row) {
-
-            this.detailList = row.subErpOrders;
-        },
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
 
-        importErps() {
-            var selectData = this.multipleSelection;
+    //业务明细表
+    getOrderDetail(row) {
 
-            selectData.forEach((obj, index) => {
-                this.postQuery.purchaseinResponses.push(obj);
-            });
+      this.detailList = row.subErpOrders;
+    },
 
-            if (this.postQuery.purchaseinResponses.length < 1) {
-                this.$message.warning("选择的订单需大于1");
-                return;
-            }
-            this.postQuery.orderId = this.orderId;
-            selectErpOrder(this.postQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.loading = false;
-                        this.$emit("closeManuDialog", true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.$emit("closeManuDialog", false);
-                });
-        },
-        combineErps() {
-            var selectData = this.multipleSelection;
+    importErps() {
+      var selectData = this.multipleSelection;
 
-            selectData.forEach((obj, index) => {
-                this.postQuery.docids.push(obj.docid);
-            });
+      selectData.forEach((obj, index) => {
+        this.postQuery.purchaseinResponses.push(obj);
+      });
 
-            if (this.postQuery.docids.length < 1) {
-                this.$message.warning("选择的订单需大于1");
-                return;
+      if (this.postQuery.purchaseinResponses.length < 1) {
+        this.$message.warning("选择的订单需大于1");
+        return;
+      }
+      this.postQuery.orderId = this.orderId;
+      selectErpOrder(this.postQuery)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.loading = false;
+              this.$emit("closeManuDialog", true);
+            } else {
+              this.$message.error(response.message);
             }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.$emit("closeManuDialog", false);
+          });
+    },
+    combineErps() {
+      var selectData = this.multipleSelection;
 
-            combineErpOrder(this.postQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.loading = false;
-                        this.$emit("closeManuDialog", true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.$emit("closeManuDialog", false);
-                });
-        },
-
-        handleSizeChange(val) {
-            this.filterQuery.limit = val;
-            this.getList();
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        handleSelectionChange(val) {
-            console.log(val);
-            this.multipleSelection = val;
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getLocalBusType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    // this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
-                    this.getCurBillAction();
-                })
-                .catch(() => {
-                });
-
+      selectData.forEach((obj, index) => {
+        this.postQuery.docids.push(obj.docid);
+      });
 
-        },
+      if (this.postQuery.docids.length < 1) {
+        this.$message.warning("选择的订单需大于1");
+        return;
+      }
 
-        getCurBillAction() {
-            let tQuery = {
-                action: this.orderAction
+      combineErpOrder(this.postQuery)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.loading = false;
+              this.$emit("closeManuDialog", true);
+            } else {
+              this.$message.error(response.message);
             }
-            filterByBus(tQuery)
-                .then((response) => {
-                    this.filterQuery.localAction = response.data;
-                    this.getList();
-                })
-                .catch(() => {
-                });
-        }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.$emit("closeManuDialog", false);
+          });
     },
-    components: {},
-    mounted() {
+
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
     },
-    created() {
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
+    handleSelectionChange(val) {
+      console.log(val);
+      this.multipleSelection = val;
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getLocalBusType(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            // this.filterQuery.billAction = this.busTypes[0].action;
+            // this.getList();
+            this.getCurBillAction();
+          })
+          .catch(() => {
+          });
+
 
-        this.getBusType();
     },
+
+    getCurBillAction() {
+      let tQuery = {
+        action: this.orderAction
+      }
+      filterByBus(tQuery)
+          .then((response) => {
+            this.filterQuery.localAction = response.data;
+            this.getList();
+          })
+          .catch(() => {
+          });
+    }
+  },
+  components: {},
+  mounted() {
+  },
+  created() {
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+
+    this.getBusType();
+  },
 };
 </script>
 
 <style scoped>
 
 .el-card {
-    margin-right: 20px;
-    /*transition: all .5s;*/
+  margin-right: 20px;
+  /*transition: all .5s;*/
 }
 
 </style>
diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue
index 3d9e1e0..d29ce4b 100644
--- a/src/views/inout/IOCheckWaitOrder.vue
+++ b/src/views/inout/IOCheckWaitOrder.vue
@@ -284,6 +284,7 @@
                 v-on:closeManuDialog="closeManuDialog"
                 :orderId="orderId"
                 :orderAction="billAction"
+                :curLocInv="curLocInv"
             ></selectErpOrder>
         </el-dialog>
 
@@ -370,6 +371,7 @@ export default {
             unitlist: [],
             list: [],
             billAction: null,
+            curLocInv:null,
             detailList: [],
             unitUpdateQuery: {
                 id: "",
@@ -778,6 +780,7 @@ export default {
         importOrder(row) {
             this.orderId = row.id;
             this.billAction = row.action;
+            this.curLocInv = row.locStorageCode;
             this.addDialogVisible = true;
         },
         getBusType() {
diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index 475c55f..d9c47ad 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -18,7 +18,8 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item class="query-form-item">
-                    <el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统" @change="thirdSysFkChange(query.thirdSysFk)">
+                    <el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统"
+                               @change="thirdSysFkChange(query.thirdSysFk)">
                         <el-option
                             v-for="item in thirdSys"
                             :key="item.thirdId"
@@ -206,8 +207,8 @@
                         <el-option label="仓库" :value='false'></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item class="query-form-item" label="第三方系统:">
-                    <el-select v-model="formData.thirdSysFk" placeholder="仓库类型" clearable>
+                <el-form-item class="query-form-item" prop="thirdSysFk" label="第三方系统:">
+                    <el-select v-model="formData.thirdSysFk" placeholder="请选择第三方系统" clearable>
                         <el-option
                             v-for="item in thirdSys"
                             :key="item.thirdId"
@@ -313,6 +314,9 @@ export default {
                 ],
                 code: [
                     {required: true, message: "请输入仓库货位代码", trigger: "blur"}
+                ],
+                thirdSysFk: [
+                    {required: true, message: "请选择第三方系统", trigger: "blur"}
                 ]
             },
             pidData: {},
@@ -391,14 +395,14 @@ export default {
                     this.treeList = [];
                 });
         },
-        getQueryThirdSysFk(){
+        getQueryThirdSysFk() {
             this.thirdSys.forEach((item) => {
                 if (item.thirdName == this.query.thirdSysFk) {
                     this.query.thirdSysFk = item.thirdId;
                 }
             })
         },
-        getQueryThirdSysFkName(){
+        getQueryThirdSysFkName() {
             this.thirdSys.forEach((item) => {
                 if (item.thirdId == this.query.thirdSysFk) {
                     this.query.thirdSysFk = item.thirdName;