领用单据相关bug修改，第三方业务单据修改

src/api/thrsys/thrOrder.js

@@ -24,6 +24,15 @@ export function delThrOrders(query) {
     });
 }
 
+export function delOrderDetail(query) {
+    return axios({
+        url: "/udiwms/thrsys/delOrderDetail",
+        method: "post",
+        data: query
+    });
+}
+
+
 export function delAll(query) {
     return axios({
         url: "/udiwms/thrsys/order/delAll",

src/views/inventory/DialogInvProduct.vue

@@ -1,82 +1,86 @@
 <template>
-  <div>
-    <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.nameCode" placeholder="产品标识DI"></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
+    <div>
+        <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.nameCode" placeholder="产品标识DI"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
+                    </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="combine">确定</el-button>
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
 
-              <el-button type="primary" icon="search" @click="onSubmit"
-              >查询
-              </el-button
-              >
-              <el-button type="primary" icon="search" @click="combine">确定</el-button>
-            </el-button-group>
-          </el-form-item>
-        </el-row>
-      </el-form>
+            <el-table v-loading="loading" :data="list" style="width: 100%"
+                      highlight-current-row="false"
+                      ref="multipleTable">
+                <el-table-column
+                    type="selection"
+                    width="55">
+                </el-table-column>
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column label="产品标识" prop="nameCode"></el-table-column>
+                <el-table-column label="产品名称" prop="cpmctymc">
+                </el-table-column>
+                <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" prop="productionDate"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+                <el-table-column label="入库数量" prop="inCount"></el-table-column>
+                <el-table-column label="出库数量" prop="outCount"></el-table-column>
+                <el-table-column label="结余数量" prop="reCount">
+                    <template slot-scope="scope">
+                        {{ (scope.row.inCount - scope.row.outCount) }}
+                    </template>
+                </el-table-column>
 
-      <el-table v-loading="loading" :data="list" style="width: 100%"
-                highlight-current-row="false"
-                ref="multipleTable">
-        <el-table-column
-            type="selection"
-            width="55">
-        </el-table-column>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="产品标识" prop="nameCode"></el-table-column>
-        <el-table-column label="产品名称" prop="cpmctymc">
-        </el-table-column>
-        <el-table-column label="规格型号" prop="ggxh"></el-table-column>
-        <el-table-column label="批次号" prop="batchNo"></el-table-column>
-        <el-table-column label="生产日期" prop="productionDate"></el-table-column>
-        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-        <el-table-column label="入库数量" prop="inCount"></el-table-column>
-        <el-table-column label="出库数量" prop="outCount"></el-table-column>
-        <el-table-column label="结余数量" prop="reCount">
-          <template slot-scope="scope">
-            {{ (scope.row.inCount - scope.row.outCount) }}
-          </template>
-        </el-table-column>
+            </el-table>
+        </el-card>
 
-      </el-table>
-    </el-card>
-
-    <el-dialog
-        title="库存码详情"
-        :visible.sync="codeDetailVisible"
-        width="85%"
-        v-if="codeDetailVisible"
-    >
-      <codeDetail
-          :idQuery="idQuery"
-          v-on:closeDetailDialog="closeDetailDialog"
-      ></codeDetail>
-    </el-dialog>
-    <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="total"
-        :current-page="filterQuery.page"
-    ></el-pagination>
-  </div>
+        <el-dialog
+            title="库存码详情"
+            :visible.sync="codeDetailVisible"
+            width="85%"
+            v-if="codeDetailVisible"
+        >
+            <codeDetail
+                :idQuery="idQuery"
+                v-on:closeDetailDialog="closeDetailDialog"
+            ></codeDetail>
+        </el-dialog>
+        <el-pagination
+            :page-size="filterQuery.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="total"
+            :current-page="filterQuery.page"
+        ></el-pagination>
+    </div>
 </template>
 
 <script>
 import {
-  filterProducts,
-  filterDetailProducts,
-  deleteProducts,
+    filterProducts,
+    filterDetailProducts,
+    deleteProducts,
 } from "../../api/inventory/InvProducts";
 import draggable from "vuedraggable";
 import codeDetail from "./InvProductsDetail";
@@ -87,255 +91,255 @@ import {getStockOrderDetailInstrumentById} from "@/api/warehouse/stockOrder";
 
 
 export default {
-  name: "DialogInvProduct",
-  props: {
-    data: {
-      type: Object,
-      required: true,
-    },
-    closeDialog: {
-      type: Function,
-      required: true,
-    },
-    invQueryData: {
-      type: Object,
-      required: true,
-    }
-  },
-  data() {
-    return {
-      filterQuery: {
-        cpmctymc: null,
-        nameCode: null,
-        relIdFk: null,
-        batchNo: null,
-        page: 1,
-        limit: 10,
-        customerId: null,
-        supId: null,
-        unitFk: null,
-        invStorageCode: null,
-        invWarehouseCode: null,
-      },
-      detailQuery: {
-        code: null,
-        productIdFk: null,
-        page: 1,
-        limit: 20,
-      },
-      list: [],
-      codeDetailVisible: false,
-      total: 0,
-      loading: true,
-      index: null,
-      dialogTableVisible: false,
-      formLoading: false,
-      dialogVisible: false,
-      deleteLoading: false,
-      busTypes: [],
-      idQuery: null,
-      showSup: false,
-      fromOptions: [],
-    };
-  },
-  components: {
-    draggable,
-    codeDetail,
-  },
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        cpmctymc: null,
-        nameCode: null,
-        relIdFk: null,
-        batchNo: null,
-        customerId: null,
-        unitFk: null,
-        supId: null,
-        page: 1,
-        limit: 10,
-      };
-      this.getList();
-    },
-    onSubmit() {
-      this.loading = true;
-      this.filterQuery.page = 1;
-      this.getList();
-    },
-    handleSizeChange(val) {
-      this.filterQuery.limit = val;
-      this.getList();
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
+    name: "DialogInvProduct",
+    props: {
+        data: {
+            type: Object,
+            required: true,
+        },
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+        invQueryData: {
+            type: Object,
+            required: true,
+        }
     },
-    handleUnitClick(row) {
-      this.curIndex = row.id;
-      this.dialogTableVisible = true;
+    data() {
+        return {
+            filterQuery: {
+                cpmctymc: null,
+                nameCode: null,
+                relIdFk: null,
+                batchNo: null,
+                page: 1,
+                limit: 10,
+                customerId: null,
+                supId: null,
+                unitFk: null,
+                invStorageCode: null,
+                invWarehouseCode: null,
+            },
+            detailQuery: {
+                code: null,
+                productIdFk: null,
+                page: 1,
+                limit: 20,
+            },
+            list: [],
+            codeDetailVisible: false,
+            total: 0,
+            loading: true,
+            index: null,
+            dialogTableVisible: false,
+            formLoading: false,
+            dialogVisible: false,
+            deleteLoading: false,
+            busTypes: [],
+            idQuery: null,
+            showSup: false,
+            fromOptions: [],
+        };
     },
-    closeDetailDialog(val) {
-      this.codeDetailVisible = false;
+    components: {
+        draggable,
+        codeDetail,
     },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                cpmctymc: null,
+                nameCode: null,
+                relIdFk: null,
+                batchNo: null,
+                customerId: null,
+                unitFk: null,
+                supId: null,
+                page: 1,
+                limit: 10,
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.loading = true;
+            this.filterQuery.page = 1;
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleUnitClick(row) {
+            this.curIndex = row.id;
+            this.dialogTableVisible = true;
+        },
+        closeDetailDialog(val) {
+            this.codeDetailVisible = false;
+        },
 
-    getList() {
-      this.loading = true;
-      this.filterQuery.customerId = store.getters.customerId;
-      filterProducts(this.filterQuery)
-          .then((response) => {
-            this.showSup = response.data.showSup;
-            this.loading = false;
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
-    },
+        getList() {
+            this.loading = true;
+            this.filterQuery.customerId = store.getters.customerId;
+            filterProducts(this.filterQuery)
+                .then((response) => {
+                    this.showSup = response.data.showSup;
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
 
-    deleteOrders(data) {
-      this.loading = true;
-      let query = {
-        id: data,
-      }
-      deleteProducts(query)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.getList();
-              this.$message({
-                type: "success",
-                message: "删除成功！",
-              });
-            } else {
-              this.$message.error(response.message);
+        deleteOrders(data) {
+            this.loading = true;
+            let query = {
+                id: data,
             }
+            deleteProducts(query)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.getList();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else {
+                        this.$message.error(response.message);
+                    }
 
-          })
-          .catch(() => {
-          });
-    },
+                })
+                .catch(() => {
+                });
+        },
 
-    deleteDialog(rowId) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-          .then(() => {
-            this.deleteOrders(rowId);
-          })
-          .catch(() => {
-          });
-    },
-    findMethod(query) {
-      this.fromOptions = [];
-      let cQuery = {
-        key: query,
-      };
-      getBasicUnitMaintains(cQuery)
-          .then((response) => {
-            this.loading = false;
-            this.fromOptions = response.data.page.list || [];
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-    },
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
+                })
+                .catch(() => {
+                });
+        },
+        findMethod(query) {
+            this.fromOptions = [];
+            let cQuery = {
+                key: query,
+            };
+            getBasicUnitMaintains(cQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.fromOptions = response.data.page.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
 
-    intentDetail(row) {
+        intentDetail(row) {
 
-      this.idQuery = row;
-      // this.idQuery.supId = null;
-      this.idQuery.customerId = null;
-      this.codeDetailVisible = true;
-    },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getBussinessType(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.filterQuery.billAction = this.busTypes[0].action;
-            // this.getList();
-          })
-          .catch(() => {
-          });
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
-    },
-    combine() {
-      let selection = this.$refs.multipleTable.selection;
-      if (selection.length < 1) {
-        this.$message.error('未选择产品');
-        return;
-      }
-      let ids = [];
-      selection.forEach((obj, index) => {
-        let data = {
-          relId: obj.relIdFk,
-          batchNo: obj.batchNo,
-          productDate: obj.productionDate,
-          expireDate: obj.expireDate,
-        }
-        ids.push(data);
-      });
+            this.idQuery = row;
+            // this.idQuery.supId = null;
+            this.idQuery.customerId = null;
+            this.codeDetailVisible = true;
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+        },
+        combine() {
+            let selection = this.$refs.multipleTable.selection;
+            if (selection.length < 1) {
+                this.$message.error('未选择产品');
+                return;
+            }
+            let ids = [];
+            selection.forEach((obj, index) => {
+                let data = {
+                    relId: obj.relIdFk,
+                    batchNo: obj.batchNo,
+                    productDate: obj.productionDate,
+                    expireDate: obj.expireDate,
+                }
+                ids.push(data);
+            });
 
-      this.loading = true;
-      let tQuery = {
-        datas: ids,
-        stockOrderLists: this.data.stockOrderLists,
-      };
-      getStockOrderDetailInstrumentById(tQuery).then((response) => {
-        this.loading = false;
-        if (response.code === 20000) {
-          this.closeDialog(response.data);
-        } else {
-          this.$message.error(response.message);
-        }
-      }).catch(() => {
-        this.loading = false;
-      });
+            this.loading = true;
+            let tQuery = {
+                datas: ids,
+                stockOrderLists: this.data.stockOrderLists,
+            };
+            getStockOrderDetailInstrumentById(tQuery).then((response) => {
+                this.loading = false;
+                if (response.code === 20000) {
+                    this.closeDialog(response.data);
+                } else {
+                    this.$message.error(response.message);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
     },
-  },
-  filters: {
-    statusFilterType(status) {
-      const statusMap = {
-        false: "success",
-        true: "danger",
-      };
-      return statusMap[status];
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "success",
+                true: "danger",
+            };
+            return statusMap[status];
+        },
     },
-  },
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-  },
-  created() {
-    this.getBusType();
-    let query = this.$route.query;
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+        this.getBusType();
+        let query = this.$route.query;
 
-    this.filterQuery = Object.assign(this.filterQuery, query);
+        this.filterQuery = Object.assign(this.filterQuery, query);
 
 
-    this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
-    this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode;
-    this.filterQuery.limit = parseInt(this.filterQuery.limit);
-    // 加载表格数据
-    this.getList();
-  },
+        this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
+        this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode;
+        this.filterQuery.limit = parseInt(this.filterQuery.limit);
+        // 加载表格数据
+        this.getList();
+    },
 };
 </script>
 

src/views/thrsys/ThrOrdedrReceiveAdd.vue

@@ -54,9 +54,9 @@
                     <el-form-item>
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                            <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
                             <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
-                                新增订单
+                                新增单据
                             </el-button>
 
 
@@ -69,12 +69,11 @@
             <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
                       @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="往来单位ID" prop="corpId"></el-table-column>
                 <el-table-column label="往来单位" prop="corpName"
                                  show-overflow-tooltip="true"></el-table-column>
-                <!--                <el-table-column label="单据状态" prop="billFlag"></el-table-column>-->
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
@@ -113,7 +112,7 @@
         </el-card>
 
         <el-dialog
-            title="编辑"
+            :title="formMap[formName]"
             :visible.sync="newSpDistributionVisible"
             width="80%"
             v-if="newSpDistributionVisible"
@@ -158,6 +157,12 @@ export default {
                 type: 1,
                 editStatus: 1,
             },
+            formName: null,
+            formMap: {
+                add: "新增领用单据",
+                update: "编辑领用单据",
+            },
+
             idQuery: {},
             total: 0,
             thirdSys: [],
@@ -231,6 +236,11 @@ export default {
             this.getList();
         },
 
+        onSubmitFind() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
+
         getList() {
             if (this.filterQuery.thirdSysFk == null) {
                 this.$message.warning("请先选择第三方系统！")
@@ -445,7 +455,9 @@ export default {
             if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
                 this.idQuery.id = row.id;
                 this.idQuery.formData = row;
-            }
+                this.formName = "update";
+            } else
+                this.formName = "add";
             this.newSpDistributionVisible = true;
         },
 
@@ -461,6 +473,7 @@ export default {
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
         this.actDateRange = [start, end];
+        this.getList();
     },
 };
 </script>

src/views/thrsys/ThrOrdedrReceiveSearch.vue

@@ -1,500 +1,438 @@
 <template>
-    <div>
-        <el-card class="el-card">
+  <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="单据号"
+                clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-input
+                v-model="filterQuery.corpName"
+                placeholder="往来单位"
+                clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
 
+            <el-select v-model="filterQuery.billAction" 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.thirdSysName
+                  }}</span>
+              </el-option>
 
-            <el-form :inline="true" :model="filterQuery"
-                     class="query-form" size="mini">
-                <el-row>
+            </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 style="display:flex;">
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
 
-                    <el-form-item class="query-form-item">
-                        <el-input
-                            v-model="filterQuery.billNo"
-                            placeholder="单据号"
-                            clearable
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input
-                            v-model="filterQuery.corpName"
-                            placeholder="往来单位"
-                            clearable
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-
-                        <el-select v-model="filterQuery.billAction" 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.thirdSysName
-                                    }}</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 class="query-form-item">-->
-                    <!--<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">-->
-                    <!--<el-option-->
-                    <!--v-for="item in thirdSys"-->
-
-
-                    <!--:key="item.value"-->
-                    <!--:label="item.thirdName"-->
-                    <!--:value="item.thirdId">-->
-                    <!--<span style="float: left">{{ item.thirdName }}</span>-->
-                    <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
-                    <!--</el-option>-->
-                    <!--</el-select>-->
-                    <!--</el-form-item>-->
-                    <el-form-item>
-                        <el-button-group style="display:flex;">
-                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                            <!--<el-button type="primary" icon="search" @click="clearAll">清空全部</el-button>-->
-                            <!--<el-upload-->
-                            <!--v-if="!this.thirdSysDetail.enabled"-->
-                            <!--:action="uploadFileUrl"-->
-                            <!--multiple-->
-                            <!--:limit="3"-->
-                            <!--:data="uploadData"-->
-                            <!--:show-file-list="false"-->
-                            <!--:on-success="handleChange"-->
-                            <!--:file-list="fileList"-->
-                            <!--&gt;-->
-                            <!--<el-button size="mini" type="primary">导入业务单据</el-button>-->
-                            <!--</el-upload>-->
-                            <!--<el-button type="primary" icon="search" @click="downloadDatas"-->
-                            <!--v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.itrCache">导入业务单据-->
-                            <!--</el-button>-->
-                        </el-button-group>
-                    </el-form-item>
-                </el-row>
-            </el-form>
-
-            <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
-                      @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="billNo"></el-table-column>
-                <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
-                <el-table-column label="往来单位" prop="corpName"
-                                 show-overflow-tooltip="true"></el-table-column>
-<!--                <el-table-column label="单据状态" prop="billFlag"></el-table-column>-->
-                <el-table-column label="单据日期" prop="billdate"></el-table-column>
-
-
-                <!--        <el-table-column label="扫码单据类型" prop="billType">-->
-                <!--          <template slot-scope="scope">-->
-                <!--            <span>{{ getActionName(scope.row.billType) }}</span>-->
-                <!--          </template>-->
-                <!--        </el-table-column>-->
-                <!--        <el-table-column label="目标单据类型" prop="billType">-->
-                <!--          <template slot-scope="scope">-->
-                <!--            <span>{{ getlocalName(scope.row.billType) }}</span>-->
-                <!--          </template>-->
-                <!--        </el-table-column>-->
-                <el-table-column label="操作" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
-                        >删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <el-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-                :current-page="filterQuery.page"
-            ></el-pagination>
-        </el-card>
-        <el-card class="el-card">
-            <el-table v-loading="loading" :data="detailList" style="width: 100%">
-                <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
-                <el-table-column label="产品通用名" prop="productName" 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="batchNo"></el-table-column>
-                <el-table-column label="生产日期" prop="productDate"></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate"></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 v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
+                @current-change="handleDetail">
+        <el-table-column label="序号" type="index" width="60"></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="往来单位ID" prop="corpId"></el-table-column>
+        <el-table-column label="往来单位" prop="corpName"
+                         show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="单据日期" prop="billdate"></el-table-column>
+        <el-table-column label="操作" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+          :page-size="filterQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+          :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%">
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="产品编码" prop="productId"></el-table-column>
+        <el-table-column label="产品通用名" prop="productName" 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="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></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 {
-    delThrOrders, delAll, downloadAll
+  delThrOrders, delAll, downloadAll
 } from "../../api/thrsys/thrOrder";
-import {getBussinessType} from "../../api/basic/bussinessType";
 import {getLocalJoinBusType} from "../../api/basic/busLocalType";
 import {getOriginBusType} from "../../api/basic/busOriginType";
 
 import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
 import {selectIp} from "../../api/param/systemParamConfig";
 import {
-    getCloudErp,
+  getCloudErp,
 } from "../../api/inout/erpOrder";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                billAction: null,
-                billNo: "",
-                originType:null,
-                thirdSysFk: "",
-                page: 1,
-                limit: 10,
-                corpName: null,
-                type: 1,
-                editStatus: 0,
+  data() {
+    return {
+      filterQuery: {
+        billAction: null,
+        billNo: "",
+        originType: null,
+        thirdSysFk: "",
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 0,
+      },
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      uploadFileUrl: null,
+      fileList: [],
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      loading: false,
+      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]);
             },
-            total: 0,
-            thirdSys: [],
-            thirdSysDetail: null,
-            busTypes: [],
-            originTypes:[],
-            list: [],
-            detailList: [],
-            uploadFileUrl: null,
-            fileList: [],
-            uploadData: {
-                thirdSys: "thirdId",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            loading: false,
-            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]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-        };
-    },
-
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                billNo: "",
-                thirdSysFk: "",
-                billFlag: null,
-                billAction: null,
-                startDate: null,
-                endDate: null,
-                page: 1,
-                limit: 10,
-                corpName: null,
-                type: 1,
-                editStatus: 0,
-            };
-            this.actDateRange = [];
-            this.getList();
-        },
+          },
+        ],
+      },
+    };
+  },
 
-        getList() {
-            if (this.filterQuery.thirdSysFk == null) {
-                this.$message.warning("请先选择第三方系统！")
-                return;
-            }
-            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.loading = true;
-            getCloudErp(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        handleDetail(row) {
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 0,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
 
-            this.detailList = row.subErpOrders;
-            // console.log(row.billNo);
-            // let query = {
-            //     orderIdFk: row.id
-            // };
-            // this.loading = true;
-            // getThrOrderDetails(query)
-            //     .then((response) => {
-            //         this.loading = false;
-            //         this.detailList = response.data.list || [];
-            //         this.total = response.data.total || 0;
-            //     })
-            //     .catch(() => {
-            //         this.loading = false;
-            //         this.list = [];
-            //         this.total = 0;
-            //     });
-        },
-        deleteDialog(row) {
-            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    let dQuery = {
-                        id: row.id,
-                    };
-                    delThrOrders(dQuery)
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                                this.getList();
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
 
-                })
-                .catch(() => {
-                });
-        },
-        clearAll() {
-            this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    delAll()
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                                this.getList();
-                            } else {
-                                this.$message.success(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
 
-                })
-                .catch(() => {
-                });
-        },
-        getBasicThirdSys() {
-            let query = {
-                enabled: true,
-            };
-            getBasicThirdSys(query)
-                .then((response) => {
-                    this.thirdSys = response.data.list || [];
-                    this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
-                    this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                    this.selectSysParam();
-                    this.getThirdSysDetail();
-                    this.getBusType();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        handleChange(response, files, fileList) {
-            console.log(response);
-            if (response.code != 20000) {
-                this.$message.error(response.message);
+    getList() {
+      if (this.filterQuery.thirdSysFk == null) {
+        this.$message.warning("请先选择第三方系统！")
+        return;
+      }
+      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.loading = true;
+      getCloudErp(this.filterQuery)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.list = response.data.list || [];
+              this.total = response.data.total || 0;
             } else {
-                console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                this.$message.success("文件上传成功,请稍后刷新查看！");
+              this.$message.error(response.message);
             }
-        },
-        selectSysParam() {
-            let query = {
-                key: "thirdIpUrl",
-                thirdSysFk: this.filterQuery.thirdSysFk
-            };
-            selectIp(query).then((response) => {
-                if (response.code == 20000) {
-                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
-                }
-            });
-        },
-        thirdSysChange() {
-            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-            this.getThirdSysDetail();
-        },
-        getThirdSysDetail() {
-            let query = {
-                thirdSysFk: this.filterQuery.thirdSysFk,
-                key: "orderQueryUrl",
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+    handleDetail(row) {
+      this.detailList = row.subErpOrders;
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            let dQuery = {
+              id: row.id,
             };
-            filterDetailByKey(query)
+            delThrOrders(dQuery)
                 .then((response) => {
-                    this.thirdSysDetail = response.data;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-
-        },
-        downloadDatas() {
-            let query = {
-                billAction: this.filterQuery.billAction
-            };
-            downloadAll(query).then((response) => {
-                if (response.code == 20000) {
-                    this.$message.success(response.data);
-                } else {
+                  this.loading = false;
+                  if (response.code == 20000) {
+                    this.$message.success("删除成功");
+                    this.getList();
+                  } else {
                     this.$message.error(response.message);
-                }
-            });
-
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].name;
-                }
-            }
-        },
-
-        getlocalName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].localName;
-                }
-            }
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getLocalJoinBusType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    // this.getList();
+                  }
                 })
                 .catch(() => {
+                  this.loading = false;
                 });
-            getOriginBusType(query)
+          })
+          .catch(() => {
+          });
+    }
+    ,
+    clearAll() {
+      this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            delAll()
                 .then((response) => {
-                    this.originTypes = response.data.list || [];
-                    // this.filterQuery.originType = this.originTypes[0].action;
-                    // this.getList();
+                  this.loading = false;
+                  if (response.code == 20000) {
+                    this.$message.success("删除成功");
+                    this.getList();
+                  } else {
+                    this.$message.success(response.message);
+                  }
                 })
                 .catch(() => {
+                  this.loading = false;
                 });
-
-
-        },
-
+          })
+          .catch(() => {
+          });
+    }
+    ,
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+          .then((response) => {
+            this.thirdSys = response.data.list || [];
+            this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+            this.selectSysParam();
+            this.getThirdSysDetail();
+            this.getBusType();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+          });
+    }
+    ,
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    }
+    ,
+    handleChange(response, files, fileList) {
+      console.log(response);
+      if (response.code != 20000) {
+        this.$message.error(response.message);
+      } else {
+        console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+        this.$message.success("文件上传成功,请稍后刷新查看！");
+      }
+    }
+    ,
+    selectSysParam() {
+      let query = {
+        key: "thirdIpUrl",
+        thirdSysFk: this.filterQuery.thirdSysFk
+      };
+      selectIp(query).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
+        }
+      });
+    },
+    thirdSysChange() {
+      this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+      this.getThirdSysDetail();
+    },
+    getThirdSysDetail() {
+      let query = {
+        thirdSysFk: this.filterQuery.thirdSysFk,
+        key: "orderQueryUrl",
+      };
+      filterDetailByKey(query)
+          .then((response) => {
+            this.thirdSysDetail = response.data;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+          });
     },
-    components: {},
-    mounted() {
+    downloadDatas() {
+      let query = {
+        billAction: this.filterQuery.billAction
+      };
+      downloadAll(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success(response.data);
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
+    },
+
+    getlocalName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].localName;
+        }
+      }
     },
-    created() {
-        this.getBasicThirdSys();
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getLocalJoinBusType(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+          })
+          .catch(() => {
+          });
+      getOriginBusType(query)
+          .then((response) => {
+            this.originTypes = response.data.list || [];
+          })
+          .catch(() => {
+          });
     },
+  },
+  components: {},
+  mounted() {
+  },
+  created() {
+    this.getBasicThirdSys();
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    this.getList();
+  },
 };
 </script>
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
 

src/views/warehouse/DialogSelectInv.vue

@@ -0,0 +1,153 @@
+<template>
+
+
+    <el-form :model="userInfo">
+        <el-row :gutter="20">
+
+            <el-col :span="6">
+                <div class="ao-text">
+                    <span>当前仓库：</span>
+                </div>
+            </el-col>
+
+            <el-col :span="16">
+                <el-form-item prop="locStorageCode">
+                    <el-select v-model="userInfo.locInvCode" placeholder="当前仓库信息" clearable
+                               @change="locCHange"
+                    >
+                        <el-option
+
+                            v-for="item in storageList"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.code">
+                            <span style="float: left">{{ item.name }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row :gutter="20">
+            <el-col :span="6">
+                <div class="ao-text">
+                    <span>当前分库：</span>
+                </div>
+            </el-col>
+            <el-col :span="16">
+                <el-form-item prop="locInvCode">
+                    <el-select v-model="userInfo.locSubInvCode" placeholder="当前分库信息" clearable
+                    >
+                        <el-option
+
+                            v-for="item in subInvList"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.code">
+                            <span style="float: left">{{ item.name }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+            <el-button type="primary" @click="submitInv">提交</el-button>
+            <el-button type="primary" @click="closeDG">取消</el-button>
+        </div>
+    </el-form>
+
+</template>
+
+<script>
+import {filterAllByUser} from "@/api/basic/invWarehouse";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {updateInv} from "@/api/auth/authAdmin";
+
+export default {
+    name: "DialogSelectInv",
+    props: {
+        billData: {
+            type: Object,
+            required: true,
+        },
+        closeInvDialog: {
+            type: Function,
+            required: true,
+        },
+
+        closeSubmitDialog:{
+            type: Function,
+            required: true,
+        }
+    },
+
+    data() {
+        return {
+            userInfo: {
+                locInvCode: this.$store.getters.locInvCode,
+                locSubInvCode: this.$store.getters.locSubInvCode,
+            },
+            storageList: [],
+            subInvList: [],
+        }
+    },
+    methods: {
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    this.findSubInvByInv();
+                })
+                .catch(() => {
+                });
+        },
+        findSubInvByInv() {
+            this.subInvList = [];
+            let query = {
+                pcode: this.userInfo.locInvCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                    if (this.subInvList != null && this.subInvList.length == 1) {
+                        this.userInfo.locSubInvCode = this.subInvList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        locCHange() {
+
+            if (this.$isNotBlank(this.userInfo.locSubInvCode)) {
+                this.userInfo.locSubInvCode = "";
+            }
+            this.findSubInvByInv();
+        },
+
+        submitInv() {
+            if (this.$isBlank(this.userInfo.locInvCode)) {
+                this.$message.error("当前仓库不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.userInfo.locSubInvCode)) {
+                this.$message.error("当前分库不能为空！");
+                return;
+            }
+
+            this.billData.locStorageCode = this.userInfo.locInvCode;
+            this.billData.invWarehouseCode = this.userInfo.locSubInvCode;
+            this.closeSubmitDialog();
+        },
+        closeDG() {
+            this.closeInvDialog();
+        },
+    },
+    created() {
+        this.getStorage();
+    },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/warehouse/selectThrOrder.vue

@@ -20,16 +20,6 @@
                             ></el-input>
                         </el-form-item>
                         <el-form-item class="query-form-item">
-                            <!--                        <el-select v-model="listQuery.billAction" placeholder="请选择业务类型">-->
-                            <!--                            <el-option-->
-                            <!--                                v-for="item in busTypes"-->
-                            <!--                                :key="item.localName"-->
-                            <!--                                :label="item.localName"-->
-                            <!--                                :value="item.action">-->
-                            <!--                                <span style="float: left">{{ item.localName }}</span>-->
-                            <!--                                &lt;!&ndash;<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>&ndash;&gt;-->
-                            <!--                            </el-option>-->
-                            <!--                        </el-select>-->
 
                             <el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
                                 <el-option
@@ -47,20 +37,6 @@
 
 
                         </el-form-item>
-                        <!--                        <el-form-item class="query-form-item">-->
-                        <!--                            <el-select v-model="listQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">-->
-                        <!--                                <el-option-->
-                        <!--                                    v-for="item in thirdSys"-->
-                        <!--                                    :key="item.value"-->
-                        <!--                                    :label="item.thirdName"-->
-                        <!--                                    :value="item.thirdId">-->
-                        <!--                                    <span style="float: left">{{ item.thirdName }}</span>-->
-                        <!--                                    <span style="float: right; color: #8492a6; font-size: 13px">{{-->
-                        <!--                                            item.thirdId-->
-                        <!--                                        }}</span>-->
-                        <!--                                </el-option>-->
-                        <!--                            </el-select>-->
-                        <!--                        </el-form-item>-->
                     </el-row>
                     <el-row>
                         <el-form-item class="query-form-item">
@@ -81,7 +57,12 @@
                         </el-form-item>
                         <el-form-item style="display: flex">
                             <el-button-group>
-                                <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                                <el-button
+                                    type="primary"
+                                    icon="el-icon-refresh"
+                                    @click="onReset"
+                                ></el-button>
+                                <el-button type="primary" icon="search" @click="submitFind">查询</el-button>
                                 <el-button type="primary" icon="search" @click="combine"
                                 >确定
                                 </el-button
@@ -120,60 +101,31 @@
 
         <el-dialog
             v-if="storageVisible"
-            title="请选择当前仓库"
+            title="请选择单据所属仓库信息"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             append-to-body
             :visible.sync="storageVisible">
 
-            <el-table
-                :data="storageList"
-                style="width: 100%;margin-bottom: 20px;"
-                row-key="id"
-                highlight-current-row>
-
-                <el-table-column
-                    prop="code"
-                    label="仓库编码"
-                    width="120"
-                >
-                </el-table-column>
-                <el-table-column
-                    prop="name"
-                    label="仓库名称"
-                    width="250"
-                >
-                </el-table-column>
-
-
-                <el-table-column label="操作" fixed="right">
-                    <template slot-scope="scope">
-
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="selectStorage(scope.row)"
-                        >选择
-                        </el-button
-                        >
-                    </template>
-
-                </el-table-column>
-            </el-table>
+            <selectInvDialog
+                :closeInvDialog="closeInvDialog"
+                :billData="currentRow"
+                :closeSubmitDialog="closeSubmitDialog"
+            ></selectInvDialog>
 
         </el-dialog>
-
     </div>
 </template>
 
 <script>
 import {addStockOrder, getCloudErp} from "../../api/inout/erpOrder";
-import {getBussinessType} from "../../api/basic/bussinessType";
 import {getLocalJoinBusType} from "../../api/basic/busLocalType";
 import store from "../../store";
 import {getOriginBusType} from "@/api/basic/busOriginType";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 
+import selectInvDialog from "./DialogSelectInv";
+
 export default {
     name: "closeDialog",
     props: {
@@ -252,6 +204,21 @@ export default {
         };
     },
     methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.listQuery = {
+                billNo: "",
+                corpName: null,
+                billAction: null,
+                page: 1,
+                limit: 10,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+
         tableRowClassName({row}) {
             if (row.checked) return "warning-row";
             return "";
@@ -318,6 +285,7 @@ export default {
                 let tQuery = {
                     id: this.currentRow.id,
                     locStorageCode: this.curLocInv,
+                    invWarehouseCode: this.currentRow.invWarehouseCode,
                 }
                 addStockOrder(tQuery)
                     .then((response) => {
@@ -331,6 +299,10 @@ export default {
                     });
             }
         },
+        submitFind() {
+            this.listQuery.page = 1;
+            this.getList();
+        },
         selectStorage(row) {
             this.curLocInv = row.code;
             let tQuery = {
@@ -361,15 +333,12 @@ export default {
             getLocalJoinBusType(query)
                 .then((response) => {
                     this.busTypes = response.data.list || [];
-                    // this.listQuery.billAction = this.busTypes[0].action;
                 })
                 .catch(() => {
                 });
             getOriginBusType(query)
                 .then((response) => {
                     this.originTypes = response.data.list || [];
-                    // this.listQuery.billAction = this.originTypes[0].action;
-                    // this.getList();
                 })
                 .catch(() => {
                 });
@@ -386,11 +355,24 @@ export default {
                 .catch(() => {
                 });
         },
+
+
+        closeInvDialog() {
+            this.storageVisible = false;
+        },
+
+        closeSubmitDialog() {
+            this.storageVisible = false;
+            this.combine();
+        },
     },
     created() {
         this.getBusType();
         this.getStorage();
+        this.getList();
     },
+    components: {selectInvDialog}
+
 };
 </script>
 

src/views/warehouse/stockOrderEditor.vue

@@ -71,7 +71,7 @@
                             <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="selectThrOrderFunction()"
-                                       :loading="loading">选入订单
+                                       :loading="loading">选入单据
                             </el-button>
                         </el-button-group>
                     </el-form-item>
@@ -436,7 +436,7 @@
         </el-dialog>
 
         <el-dialog
-            title="选入订单"
+            title="选入单据"
             :visible.sync="selectThrOrderVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"