From 1bb8ff9ed6cb948ae1baf8cb1c10098d1d219e32 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 10 Nov 2022 11:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BussinessTypeLoclModify.vue  |   2 +-
 src/views/purchase/purPlanEditDialog.vue     |  43 +-
 src/views/purchase/pureApplyDetailDialog.vue | 989 ++++++++++---------
 src/views/thrsys/thrOrderNew.vue             |   1 +
 4 files changed, 589 insertions(+), 446 deletions(-)

diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue
index 8289850..bf3e71b 100644
--- a/src/views/basic/BussinessTypeLoclModify.vue
+++ b/src/views/basic/BussinessTypeLoclModify.vue
@@ -393,7 +393,7 @@ export default {
                 key: query,
                 onlyMain: true,
             }
-            
+
             getOriginBusType(tQuery)
                 .then((response) => {
                     this.originTypes = response.data.list || [];
diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue
index de750cc..99f3eb4 100644
--- a/src/views/purchase/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlanEditDialog.vue
@@ -54,6 +54,27 @@
                 </el-row>
 
                 <el-row :gutter="20" style="margin-top: -10px">
+
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>采购类型：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="billType">
+                            <el-select v-model="formData.billType" placeholder="请选择采购类型" style="width: 100%"
+                                       clearable>
+                                <el-option
+                                    v-for="item in busTypes"
+                                    :key="item.originAction"
+                                    :label="item.originName"
+                                    :value="item.originAction">
+                                    <span style="float: left">{{ item.originName }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>采购仓库：</span>
@@ -85,6 +106,10 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+
+                </el-row>
+
+                <el-row :gutter="20" style="margin-top: -10px">
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>采购说明：</span>
@@ -197,6 +222,7 @@ import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
 import {inserThrOrderWeb, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {getBusChange} from "@/api/basic/busTypeChange";
 
 export default {
     name: "idQuery",
@@ -371,7 +397,9 @@ export default {
                 if (this.orderEditor) {
                     this.detailLoading = true;
                     if (this.$isNotBlank(row.id)) {
-                        delApplyDetail(row.id)
+                        let delIds = [];
+                        delIds.push(row.id)
+                        delApplyDetail(delIds)
                             .then(response => {
                                 this.detailLoading = false;
                                 if (response.code === 20000) {
@@ -450,6 +478,18 @@ export default {
             this.formData.locStorageCode = item;
             this.findSubInvs();
         },
+        getBusType() {
+            let query = {
+                enable: false,
+                type: 3,
+            };
+            getBusChange(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
     },
     filters: {},
     mounted() {
@@ -480,6 +520,7 @@ export default {
             this.orderEditor = false;
         }
         this.getStorage();
+        this.getBusType();
         this.codeArray = [];
     },
 };
diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue
index 4a6e369..2be73b0 100644
--- a/src/views/purchase/pureApplyDetailDialog.vue
+++ b/src/views/purchase/pureApplyDetailDialog.vue
@@ -1,191 +1,239 @@
 <template>
-  <div>
-
-    <el-form :model="formData" :rules="formRules" ref="dataForm">
-      <el-row type="flex" justify="end" v-if="editType == 1">
-        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-          <el-button
-              type="primary"
-              @click.native="saveOrder('3')"
-              :loading="loading"
-          >审核通过
-          </el-button
-          >
-          <el-button
-              type="primary"
-              @click.native="saveOrder('4')"
-              :loading="loading"
-          >拒绝申请
-          </el-button
-          >
-        </el-button-group>
-      </el-row>
-
-      <el-card style="margin-top: -5px;">
-        <el-row :gutter="20" style="margin-top: 10px;">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>单据号：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="billNo">
-              <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>单据日期：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="billdate">
-              <el-date-picker
-                  v-model="formData.billDate"
-                  type="datetime"
-                  placeholder="选择日期"
-                  style="width: 100%" :disabled="true"
-                  :clearable="false"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20" style="margin-top: -10px">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>申购科室：</span>
-            </div>
-          </el-col>
-
-          <el-col :span="7">
-            <el-form-item prop="locStorageCode">
-              <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
-                         :disabled="true"
-                         style="width: 50%"
-                         clearable>
-                <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-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 50%"
-                         :disabled="true"
-                         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-col :span="3">
-            <div class="ao-text">
-              <span>申购说明：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="billNo">
-              <el-input v-model="formData.remark" auto-complete="off" type="textarea" :disabled="true"
-                        autosize></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>审核说明：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="billNo">
-              <el-input v-model="formData.auditRemark" auto-complete="off" type="textarea"
-                        autosize></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-
-      </el-card>
-
-      <el-card>
-
-        <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
-                  :row-class-name="tableRowClassName"
-                  max-height="300" height="300" ref="multipleTable">
-          <el-table-column label="序号" type="index" width="50"></el-table-column>
-          <el-table-column
-              label="产品通用名"
-              prop="productName"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="规格型号"
-              prop="spec"
-              show-overflow-tooltip
-          ></el-table-column>
-
-          <el-table-column
-              label="计量单位"
-              prop="measname"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="生产厂家"
-              prop="manufactory"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column width="150" label="单据数量" prop="count">
-          </el-table-column>
-
-          <el-table-column label="操作" fixed="right" width="150">
-            <template slot-scope="scope">
-              <el-button
-                  type="text"
-                  size="small"
-                  :disabled="scope.row.index === selectedIndex"
-                  @click.stop="true"
-                  @click.native="rowChange(scope.row)"
-              >编辑
-              </el-button
-              >
-              <el-button
-                  type="text"
-                  size="small"
-                  @click.stop="true"
-                  @click.native="deleteCodeArray(scope.$index, scope.row)"
-              >删除
-              </el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-card>
-    </el-form>
-
-    <el-dialog
-        title="产品录入"
-        :visible.sync="selectProductVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="85%"
-        v-if="selectProductVisible"
-        :append-to-body='true'
-    >
-      <stockOrderNewSelectProduct
-          :closeDialog="closeDialogC2"
-          :data="thisData"
-      ></stockOrderNewSelectProduct>
-    </el-dialog>
-  </div>
+    <div>
+
+        <el-form :model="formData" :rules="formRules" ref="dataForm">
+            <el-row type="flex" justify="end" v-if="editType == 1">
+                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+                    <el-button
+                        type="primary"
+                        @click.native="saveOrder('3')"
+                        :loading="loading"
+                    >审核通过
+                    </el-button
+                    >
+                    <el-button
+                        type="primary"
+                        @click.native="saveOrder('4')"
+                        :loading="loading"
+                    >拒绝申请
+                    </el-button
+                    >
+                </el-button-group>
+            </el-row>
+
+            <el-card style="margin-top: -5px;">
+                <el-row :gutter="20" style="margin-top: 10px;">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>单据号：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="billNo">
+                            <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>单据日期：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="billdate">
+                            <el-date-picker
+                                v-model="formData.billDate"
+                                type="datetime"
+                                placeholder="选择日期"
+                                style="width: 100%" :disabled="true"
+                                :clearable="false"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="20" style="margin-top: -10px">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>申购科室：</span>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="7">
+                        <el-form-item prop="locStorageCode">
+                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"
+                                       :disabled="true"
+                                       style="width: 50%"
+                                       clearable>
+                                <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-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 50%"
+                                       :disabled="true"
+                                       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-col :span="3">
+                        <div class="ao-text">
+                            <span>当前仓库：</span>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="7">
+                        <el-form-item prop="targetInv">
+                            <el-select v-model="formData.targetInv" placeholder="当前仓库信息" @change="locInChange"
+                                       style="width: 50%"
+                                       clearable>
+                                <el-option
+                                    v-for="item in targetInvList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                </el-option>
+                            </el-select>
+                            <el-select v-model="formData.targetSubInv" placeholder="当前分库信息" style="width: 50%"
+                                       clearable>
+                                <el-option
+                                    v-for="item in targetSubInvList"
+                                    :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" style="margin-top: -10px">
+
+
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>生成采购计划：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="billType">
+                            <el-select v-model="formData.targetBillType" placeholder="请选择采购类型" style="width: 100%"
+                                       clearable>
+                                <el-option
+                                    v-for="item in busTypes"
+                                    :key="item.originAction"
+                                    :label="item.originName"
+                                    :value="item.originAction">
+                                    <span style="float: left">{{ item.originName }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>审核说明：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="billNo">
+                            <el-input v-model="formData.auditRemark" auto-complete="off" type="textarea"
+                                      autosize></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+
+            </el-card>
+
+            <el-card>
+
+                <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
+                          :row-class-name="tableRowClassName"
+                          max-height="300" height="300" ref="multipleTable">
+                    <el-table-column label="序号" type="index" width="50"></el-table-column>
+                    <el-table-column
+                        label="产品通用名"
+                        prop="productName"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="规格型号"
+                        prop="spec"
+                        show-overflow-tooltip
+                    ></el-table-column>
+
+                    <el-table-column
+                        label="计量单位"
+                        prop="measname"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="生产厂家"
+                        prop="manufactory"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column width="150" label="单据数量" prop="count">
+                    </el-table-column>
+
+                    <el-table-column label="操作" fixed="right" width="150">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                :disabled="scope.row.index === selectedIndex"
+                                @click.stop="true"
+                                @click.native="rowChange(scope.row)"
+                            >编辑
+                            </el-button
+                            >
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click.stop="true"
+                                @click.native="deleteCodeArray(scope.$index, scope.row)"
+                            >删除
+                            </el-button
+                            >
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-card>
+        </el-form>
+
+        <el-dialog
+            title="产品录入"
+            :visible.sync="selectProductVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="85%"
+            v-if="selectProductVisible"
+            :append-to-body='true'
+        >
+            <stockOrderNewSelectProduct
+                :closeDialog="closeDialogC2"
+                :data="thisData"
+            ></stockOrderNewSelectProduct>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -194,288 +242,341 @@ import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
 import {delApplyDetail, listApplyDetail, auditOrder} from "@/api/purchase/purApply";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {getBusChange} from "@/api/basic/busTypeChange";
 
 export default {
-  name: "idQuery",
-  props: {
-    closeDialog: {
-      type: Function,
-      required: true,
-    },
-    idQuery: {
-      type: Object,
-      required: true,
-    },
-    editType: {
-      type: Object,
-      required: true,
+    name: "idQuery",
+    props: {
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+        idQuery: {
+            type: Object,
+            required: true,
+        },
+        editType: {
+            type: Object,
+            required: true,
+        },
+
     },
+    data() {
+        return {
+            code: "",
+            query: {
+                orderIdFk: "",
+                page: 1,
+                limit: 10,
+            },
+            formData: {
+                status: null,
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                locStorageCode: null,
+                invWarehouseCode: null,
+                targetInv: null,
+                targetSubInv: null,
+                targetBillType: null,
+            },
+            formRules: {},
+            codeArray: [],
+            total: 0,
+            loading: false,
+            index: null,
+            formLoading: false,
+            formVisible: false,
+            deleteLoading: false,
+            orderNo: null,
+            statusMap: {
+                1: "草稿",
+                2: "未审核",
+                3: "已审核",
+            },
+            typeMap: {
+                1: "预入库",
+                2: "普通采购",
+            },
+            orderEditor: true,
+            sOptions: [],
+            sValue: [],
+            sList: [],
+            sLoading: false,
+            busTypes: [],
+            currentRow: {},
+            selectedIndex: "",
+            selectProductVisible: false,
+            thisData: {},
+            storageList: [],
+            subInvList: [],
+
+
+            targetInvList: [],
+            targetSubInvList: [],
 
-  },
-  data() {
-    return {
-      code: "",
-      query: {
-        orderIdFk: "",
-        page: 1,
-        limit: 10,
-      },
-      formData: {
-        status: null,
-        id: null,
-        billNo: null,
-        billDate: "",
-        remark: "",
-        deptCode: null,
-        locStorageCode: null,
-        invWarehouseCode: null,
-      },
-      formRules: {},
-      codeArray: [],
-      total: 0,
-      loading: false,
-      index: null,
-      formLoading: false,
-      formVisible: false,
-      deleteLoading: false,
-      orderNo: null,
-      statusMap: {
-        1: "草稿",
-        2: "未审核",
-        3: "已审核",
-      },
-      typeMap: {
-        1: "预入库",
-        2: "普通采购",
-      },
-      orderEditor: true,
-      sOptions: [],
-      sValue: [],
-      sList: [],
-      sLoading: false,
-      busTypes: [],
-      currentRow: {},
-      selectedIndex: "",
-      selectProductVisible: false,
-      thisData: {},
-      storageList: [],
-      subInvList: [],
-      invQueryData: {},
-
-    };
-  },
-  components: {
-    draggable,
-    stockOrderNewSelectProduct,
-  },
-  methods: {
-    saveOrder(status) {
-      let tip = "";
-      if (status == "3") {
-        tip = "是否确定通过该申购请求？";
-      } else {
-        tip = "是否确定拒绝该申购请求？";
-      }
-      this.$confirm(tip, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.submitFunction(status);
-      }).catch(() => {
-        this.loading = false;
-      });
+            invQueryData: {},
+
+        };
+    },
+    components: {
+        draggable,
+        stockOrderNewSelectProduct,
     },
-    submitFunction(status) {
-      this.loading = true;
-      this.formData.status = status;
-      auditOrder(this.formData)
-          .then(response => {
-            this.loading = false;
-            if (response.code === 20000) {
-              this.$message.success("更新成功！");
-              this.closeDialog(true);
+    methods: {
+        saveOrder(status) {
+            let tip = "";
+            if (status == "3") {
+                tip = "是否确定通过该申购请求？";
             } else {
-              this.$message.error(response.message);
+                tip = "是否确定拒绝该申购请求？";
             }
-          })
-          .catch(() => {
-            this.loading = false;
-          })
-    },
-    selectProductFunction() {
-      this.selectProductVisible = true;
-    },
-    closeDialogC2(rData) {
-      this.selectProductVisible = false;
-      this.thisData = {};
-      if (this.$isNotBlank(rData)) {
-        this.codeArray = [];
-        rData.forEach((obj, index) => {
-          this.codeArray.unshift(obj);
-        });
-        this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-        this.currentRow = this.codeArray[0];
-        this.selectedIndex = 0;
-      }
-    },
-    rowChange(val) {
-      this.currentRow = val;
-      this.selectedIndex = val.index;
-    },
-    tableCountChange(row) {
-      if (this.$isNotBlank(row)) {
-        // row.count = row.reCount;
-      }
-    },
-    tableRowClassName({row, rowIndex}) {
-      row.index = rowIndex;
-    },
-    // 刷新表单
-    resetForm() {
-      if (this.$refs["dataForm"]) {
-        // 清空验证信息表单
-        this.$refs["dataForm"].clearValidate();
-        // 刷新表单
-        this.$refs["dataForm"].resetFields();
-        this.getList();
-      }
-    },
-    deleteCodeArray(index, row) {
-      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.$refs.multipleTable.setCurrentRow();
-        this.currentRow = {};
-        this.selectedIndex = "";
-
-        if (this.orderEditor) {
-          this.detailLoading = true;
-          if (this.$isNotBlank(row.id)) {
-            delApplyDetail(row.id)
+            this.$confirm(tip, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.submitFunction(status);
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        submitFunction(status) {
+            this.loading = true;
+            this.formData.status = status;
+            auditOrder(this.formData)
                 .then(response => {
-                  this.detailLoading = false;
-                  if (response.code === 20000) {
-                    this.$message.success(response.data);
-                    // this.getStockOrderDetailList();
+                    this.loading = false;
+                    if (response.code === 20000) {
+                        this.$message.success("更新成功！");
+                        this.closeDialog(true);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                })
+        },
+        selectProductFunction() {
+            this.selectProductVisible = true;
+        },
+        closeDialogC2(rData) {
+            this.selectProductVisible = false;
+            this.thisData = {};
+            if (this.$isNotBlank(rData)) {
+                this.codeArray = [];
+                rData.forEach((obj, index) => {
+                    this.codeArray.unshift(obj);
+                });
+                this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+                this.currentRow = this.codeArray[0];
+                this.selectedIndex = 0;
+            }
+        },
+        rowChange(val) {
+            this.currentRow = val;
+            this.selectedIndex = val.index;
+        },
+        tableCountChange(row) {
+            if (this.$isNotBlank(row)) {
+                // row.count = row.reCount;
+            }
+        },
+        tableRowClassName({row, rowIndex}) {
+            row.index = rowIndex;
+        },
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
+                this.getList();
+            }
+        },
+        deleteCodeArray(index, row) {
+            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.$refs.multipleTable.setCurrentRow();
+                this.currentRow = {};
+                this.selectedIndex = "";
+
+                if (this.orderEditor) {
+                    this.detailLoading = true;
+                    if (this.$isNotBlank(row.id)) {
+                        delApplyDetail(row.id)
+                            .then(response => {
+                                this.detailLoading = false;
+                                if (response.code === 20000) {
+                                    this.$message.success(response.data);
+                                    // this.getStockOrderDetailList();
+                                    this.codeArray.splice(index, 1);
+                                } else {
+                                    this.$message.error(response.message);
+                                }
+                            })
+                            .catch(() => {
+                                this.detailLoading = false;
+                            })
+                    } else {
+                        this.$message.success('删除成功');
+                        this.codeArray.splice(index, 1);
+                    }
+                } else {
+                    this.$message.success('删除成功');
                     this.codeArray.splice(index, 1);
-                  } else {
-                    this.$message.error(response.message);
-                  }
+                }
+            }).catch(() => {
+
+            });
+        },
+        getStockOrderDetailList() {
+            this.loading = true;
+            listApplyDetail(this.query) //查找该单号下的所有条码
+                .then((response) => {
+                    console.log(response)
+                    this.codeArray = response.data.list || [];
+                    this.total = response.data.total || 0;
+                    this.loading = false;
                 })
                 .catch(() => {
-                  this.detailLoading = false;
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+
+
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
                 })
-          } else {
-            this.$message.success('删除成功');
-            this.codeArray.splice(index, 1);
-          }
-        } else {
-          this.$message.success('删除成功');
-          this.codeArray.splice(index, 1);
-        }
-      }).catch(() => {
+                .catch(() => {
+                });
+        },
+        findSubInvs() {
+            this.subInvList = [];
+            let query = {
+                pcode: this.formData.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                    if (this.subInvList != null && this.subInvList.length == 1) {
+                        this.formData.invWarehouseCode = this.subInvList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
 
-      });
-    },
-    getStockOrderDetailList() {
-      this.loading = true;
-      listApplyDetail(this.query) //查找该单号下的所有条码
-          .then((response) => {
-            console.log(response)
-            this.codeArray = response.data.list || [];
-            this.total = response.data.total || 0;
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
-    },
 
+        getTargetStorage() {
+            this.targetInvList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.targetInvList = response.data || [];
+                    if (this.targetInvList != null && this.targetInvList.length == 1) {
+                        this.formData.targetInv = this.targetInvList[0].code;
+                    }
+                    this.findTargetSubInvs();
+
+                })
+                .catch(() => {
+                });
+        },
+        findTargetSubInvs() {
+            this.targetSubInvList = [];
+            let query = {
+                pcode: this.formData.targetInv
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.targetSubInvList = response.data || [];
+                    if (this.targetSubInvList != null && this.targetSubInvList.length == 1) {
+                        this.formData.targetSubInv = this.targetSubInvList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
 
-    getStorage() {
-      this.storageList = [];
-      filterAllByUser()
-          .then((response) => {
-            this.storageList = response.data || [];
-            if (this.storageList != null && this.storageList.length == 1) {
-              this.formData.locStorageCode = this.storageList[0].code;
+
+        locInChange(item) {
+            if (this.formData.targetSubInv != null) {
+                this.formData.targetSubInv = "";
             }
-            this.findSubInvs();
+            this.formData.targetInv = item;
+            this.findTargetSubInvs();
+        },
 
-          })
-          .catch(() => {
-          });
+        getBusType() {
+            let query = {
+                enable: false,
+                type: 3,
+            };
+            getBusChange(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
     },
-    findSubInvs() {
-      this.subInvList = [];
-      let query = {
-        pcode: this.formData.locStorageCode
-      };
-      filterSubByInv(query)
-          .then((response) => {
-            this.subInvList = response.data || [];
-            if (this.subInvList != null && this.subInvList.length == 1) {
-              this.formData.invWarehouseCode = this.subInvList[0].code;
-            }
-          })
-          .catch(() => {
-          });
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
     },
-    locInChange(item) {
-      if (this.formData.invWarehouseCode != null) {
-        this.formData.invWarehouseCode = "";
-      }
-      this.formData.locStorageCode = item;
-      this.findSubInvs();
+    created() {
+
+        if (this.$isNotBlank(this.idQuery.id)) {
+            this.query.limit = 100;
+            this.query.orderIdFk = this.idQuery.id;
+            this.formData = this.idQuery.formData;
+            this.orderEditor = true;
+            this.sValue = this.formData.corpName;
+            this.getStockOrderDetailList();
+        } else {
+            this.formData = {
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                locStorageCode: null,
+                invWarehouseCode: null,
+            };
+            this.orderEditor = false;
+        }
+        this.getStorage();
+        this.findSubInvs();
+        this.getTargetStorage();
+        this.codeArray = [];
+        this.getBusType();
     },
-  },
-  filters: {},
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-  },
-  created() {
-
-    if (this.$isNotBlank(this.idQuery.id)) {
-      this.query.limit = 100;
-      this.query.orderIdFk = this.idQuery.id;
-      this.formData = this.idQuery.formData;
-      this.orderEditor = true;
-      this.sValue = this.formData.corpName;
-      this.getStockOrderDetailList();
-    } else {
-      this.formData = {
-        id: null,
-        billNo: null,
-        billDate: "",
-        remark: "",
-        deptCode: null,
-        locStorageCode: null,
-        invWarehouseCode: null,
-      };
-      this.orderEditor = false;
-    }
-    this.getStorage();
-    this.codeArray = [];
-  },
 };
 </script>
 <style>
 
 .ao-text {
-  width: 100%;
-  font-size: 13px;
-  font-family: "Microsoft YaHei";
-  float: right;
-  text-align: right;
-  margin-top: 10px;
+    width: 100%;
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+    float: right;
+    text-align: right;
+    margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index e57713f..ed0a823 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -916,6 +916,7 @@ export default {
         },
         getBusType() {
             let query = {
+                type: 1,
                 enable: false,
             };
             getBusChange(query)