From 3fee4c1152a794eeccb63b8ee277ca109bcf3b12 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 23 Apr 2022 09:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=9B=91=E5=90=AC=EF=BC=8C?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E9=A2=86=E7=94=A8=EF=BC=8C=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AD=89bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiInfoselectErpUdi.vue  |   13 +-
 src/views/basic/basicCompanyProducts.vue |   28 +-
 src/views/basic/invWarehouse.vue         |   33 +-
 src/views/thrsys/ThrOrdedrReceiveAdd.vue |    1 +
 src/views/thrsys/thrOrderNew.vue         | 2040 +++++++++++-----------
 src/views/warehouse/addHosOrder.vue      |   17 +-
 src/views/warehouse/addOrder.vue         |    2 +-
 src/views/warehouse/stockOrderEdit.vue   |   18 +-
 8 files changed, 1099 insertions(+), 1053 deletions(-)

diff --git a/src/views/basic/UdiInfoselectErpUdi.vue b/src/views/basic/UdiInfoselectErpUdi.vue
index 5cb378c..9e28a10 100644
--- a/src/views/basic/UdiInfoselectErpUdi.vue
+++ b/src/views/basic/UdiInfoselectErpUdi.vue
@@ -343,7 +343,12 @@ export default {
     supEnable: {
       type: Object,
       required: true,
+    },
+    intentThirdId: {
+      type: Object,
+      required: true,
     }
+
   },
 
   data() {
@@ -522,13 +527,13 @@ export default {
                     })
                     .catch(() => {
                       this.combineLoading = false;
-                      this.combineQuery.thirdIds=[];
+                      this.combineQuery.thirdIds = [];
                       this.$emit("closeUdi", false);
 
                     });
               })
               .catch(() => {
-                this.combineQuery.thirdIds=[];
+                this.combineQuery.thirdIds = [];
               });
         } else {
           addErp(this.combineQuery)
@@ -620,6 +625,8 @@ export default {
             if (this.defaultSys != null) {
               this.thirdSysFk = this.defaultSys;
             }
+            this.searchErpList();
+
           })
           .catch(() => {
             this.loading = false;
@@ -630,6 +637,8 @@ export default {
   created() {
     console.log("-------------" + this.uuid);
     this.getBasicThirdSys();
+    this.erpQuery.code = this.intentThirdId;
+
   },
 };
 </script>
diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue
index 3aaa065..48699cf 100644
--- a/src/views/basic/basicCompanyProducts.vue
+++ b/src/views/basic/basicCompanyProducts.vue
@@ -75,11 +75,11 @@
                             >选入产品
                             </el-button
                             >
-                            <el-button type="primary" icon="search" @click="intentImportErp"
-                            >添加产品信息
-                            </el-button
-                            >
-<!--                            <el-button type="primary" @click="addProductVisible=true">新增产品信息</el-button>-->
+<!--                            <el-button type="primary" icon="search" @click="intentImportErp"-->
+<!--                            >添加产品信息-->
+<!--                            </el-button-->
+<!--                            >-->
+                            <!--                            <el-button type="primary" @click="addProductVisible=true">新增产品信息</el-button>-->
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -137,7 +137,7 @@
                         {{ lockStatusMap[scope.row.lockStatus] }}
                     </template>
                 </el-table-column>
-                <el-table-column width="200" label="操作" fixed="right">
+                <el-table-column width="180" label="操作" fixed="right">
                     <template slot-scope="scope">
 
                         <el-button
@@ -181,7 +181,14 @@
                             @click.native.stop="sumitLockStatus(scope.row)"
                         >提交审核
                         </el-button>
-
+                        <el-button
+                            v-if="isSpCombine"
+                            type="text"
+                            size="small"
+                            :disabled="scope.row.thirdId==scope.row.nameCode"
+                            @click.native.stop="intentImportErp(scope.row)"
+                        >拆分产品
+                        </el-button>
 
                         <el-button type="text" size="small"
                                    @click.native.stop="deleteCompanyProductRelevance(scope.row)"
@@ -1276,6 +1283,7 @@
                     :closeDialog="closeDialog"
                     :uuid="uuid"
                     :relId="relId"
+                    :intentThirdId="intentThirdId"
                     :isImport="isImport"
                     :data="thisData"
                     :defaultSys="defaultSys"
@@ -1391,6 +1399,7 @@ export default {
             productType: null,
             defaultSys: null,
             isImport: false,
+            intentThirdId: null,
             isSpCombine: false,
             isImportUdi: false,
             isUploadSmp: false,
@@ -1611,11 +1620,12 @@ export default {
         },
 
         intentImportErp(val) {
-            this.defaultSys = null,
-                this.uuid = val.uuid;
+            this.defaultSys = null;
+            this.uuid = val.uuid;
             this.relId = val.rlId;
             this.isImport = true;
             this.thisData = val;
+            this.intentThirdId = val.thirdId;
             this.selectErpDialogVisible = true;
         },
         uploadSMP() {
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index a8047d5..e93530f 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -104,14 +104,14 @@
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
 
-<!--                        <el-button-->
-<!--                            type="text"-->
-<!--                            size="small"-->
-<!--                            :disabled="scope.row.pid!=0"-->
-<!--                            @click.native.stop="handleSubForm(node, scope.row, 'add')"-->
-<!--                        >添加货位-->
-<!--                        </el-button-->
-<!--                        >-->
+                        <!--                        <el-button-->
+                        <!--                            type="text"-->
+                        <!--                            size="small"-->
+                        <!--                            :disabled="scope.row.pid!=0"-->
+                        <!--                            @click.native.stop="handleSubForm(node, scope.row, 'add')"-->
+                        <!--                        >添加货位-->
+                        <!--                        </el-button-->
+                        <!--                        >-->
                         <el-button
                             type="text"
                             size="small"
@@ -181,7 +181,8 @@
                                 type="text"
                                 size="small"
                                 @click.native="updateDirector(scope.row)">
-                                设为主管
+
+                                {{ directorMap[scope.row.director] }}
                             </el-button>
                             <el-button
                                 type="text"
@@ -479,7 +480,8 @@
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="12" class="el-col">
                         <div class="text item">
-                            <el-checkbox v-model="formData.spUse" :disabled="formData.level!='1'">是否允许供应商使用</el-checkbox>
+                            <el-checkbox v-model="formData.spUse" :disabled="formData.level!='1'">是否允许供应商使用
+                            </el-checkbox>
                         </div>
                     </el-col>
                 </el-row>
@@ -609,6 +611,7 @@ export default {
                 children: "children",
                 label: "name"
             },
+            setDictor: "设为主管",
             treeList: [],
             fileList: [],
             pCodes: [],
@@ -629,6 +632,10 @@ export default {
                 true: "是",
                 false: "否",
             },
+            directorMap: {
+                true: "取消主管",
+                false: "设为主管",
+            },
             formLoading: false,
             subFormVisible: false,
             formVisible: false,
@@ -937,7 +944,7 @@ export default {
                 const eleLink = document.createElement('a');
                 var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
                 // eleLink.download = "仓库信息导出" + timestamp + ".udi";
-                eleLink.download =  "BaseWarehouse_" + timestamp + ".LowerIn";
+                eleLink.download = "BaseWarehouse_" + timestamp + ".LowerIn";
                 eleLink.style.display = 'none';
                 eleLink.href = url;
                 document.body.appendChild(eleLink)
@@ -1136,8 +1143,8 @@ export default {
             }
         },
         updateDirector(row) {
-            let params = {id: row.id};
-            updateDirector(params).then((res) => {
+            row.director = !row.director;
+            updateDirector(row).then((res) => {
                 this.$message.success("设置成功");
                 //重新加载表格数据
                 let loadParam = {
diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
index 752b347..5c8cd91 100644
--- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
@@ -412,6 +412,7 @@ export default {
         getBusType() {
             let query = {
                 enabled: true,
+                corpType:1,
             };
             getLocalJoinBusType(query)
                 .then((response) => {
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 7276b12..596c2d7 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -1,350 +1,350 @@
 <template>
-    <div>
+  <div>
 
-        <el-form :model="formData" :rules="formRules" ref="dataForm">
-            <el-row type="flex" justify="end">
-                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-                    <el-button
-                        type="primary"
-                        @click.native="saveOrder('1')"
-                        :loading="loading"
-                    >草稿保存
-                    </el-button
-                    >
-                    <el-button
-                        type="primary"
-                        @click.native="saveOrder('0')"
-                        :loading="loading"
-                    >提交单据
-                    </el-button
-                    >
-                </el-button-group>
-            </el-row>
+    <el-form :model="formData" :rules="formRules" ref="dataForm">
+      <el-row type="flex" justify="end">
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+          <el-button
+              type="primary"
+              @click.native="saveOrder('1')"
+              :loading="loading"
+          >草稿保存
+          </el-button
+          >
+          <el-button
+              type="primary"
+              @click.native="saveOrder('0')"
+              :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-input v-model="formData.billdate" auto-complete="off"></el-input>-->
-                            <el-date-picker
-                                v-model="formData.billdate"
-                                type="date"
-                                placeholder="选择日期"
-                                style="width: 100%"
-                                :clearable="false"
-                            >
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                </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-input v-model="formData.billdate" auto-complete="off"></el-input>-->
+              <el-date-picker
+                  v-model="formData.billdate"
+                  type="date"
+                  placeholder="选择日期"
+                  style="width: 100%"
+                  :clearable="false"
+              >
+              </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="billType">
-                            <el-select v-model="formData.billType" placeholder="请选择业务类型"
-                                       @change="actionChange" clearable>
-                                <el-option
-                                    v-for="item in busTypes"
-                                    :key="item.thirdAction"
-                                    :label="item.thirdName"
-                                    :value="item.thirdAction">
-                                    <span style="float: left">{{ item.thirdName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
+        <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="请选择业务类型"
+                         @change="actionChange" clearable>
+                <el-option
+                    v-for="item in busTypes"
+                    :key="item.thirdAction"
+                    :label="item.thirdName"
+                    :value="item.thirdAction">
+                  <span style="float: left">{{ item.thirdName }}</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 class="query-form-item" prop="corpName"
-                                      v-if="curAction.corpType ==0 || curAction.corpType == 3 || (curAction.corpType == 2 && !curAction.genUnit)">
-                            <el-select
-                                v-model="formData.corpName"
-                                filterable
-                                remote
-                                clearable="true"
-                                reserve-keyword
-                                placeholder="请输入往来单位"
-                                :remote-method="findMethod"
-                                :loading="loading"
-                                @change="selectOne"
-                            >
-                                <el-option
-                                    v-for="item in fromOptions"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item"
-                                >
-                                    <span style="float: left">{{ item.name }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item class="query-form-item" prop="fromCorp"
-                                      v-if="curAction.corpType ==1">
-                            <el-select
-                                v-model="formData.corpName"
-                                filterable
-                                remote
-                                clearable="true"
-                                reserve-keyword
-                                placeholder="请输入仓库信息"
-                                :remote-method="findStorageMethod"
-                                :loading="loading"
-                                @change="storageChange"
-                            >
-                                <el-option
-                                    v-for="item in fromStorageOptions"
-                                    :key="item.value"
-                                    :label="item.code"
-                                    :value="item">
-                                    <span style="float: left">{{ item.name }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{
-                                            item.code
-                                        }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item class="query-form-item" prop="fromCorp"
-                                      v-if="curAction.corpType ==2 && curAction.genUnit">
-                            <el-input v-model="formData.corpName" auto-complete="off"
-                                      clearable
-                                      placeholder="请输入病人住院号"
-                            ></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 class="query-form-item" prop="corpName"
+                          v-if="curAction.corpType ==0 || curAction.corpType == 3 || (curAction.corpType == 2 && !curAction.genUnit)">
+              <el-select
+                  v-model="formData.corpName"
+                  filterable
+                  remote
+                  clearable="true"
+                  reserve-keyword
+                  placeholder="请输入往来单位"
+                  :remote-method="findMethod"
+                  :loading="loading"
+                  @change="selectOne"
+              >
+                <el-option
+                    v-for="item in fromOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item class="query-form-item" prop="fromCorp"
+                          v-if="curAction.corpType ==1">
+              <el-select
+                  v-model="formData.corpName"
+                  filterable
+                  remote
+                  clearable="true"
+                  reserve-keyword
+                  placeholder="请输入仓库信息"
+                  :remote-method="findStorageMethod"
+                  :loading="loading"
+                  @change="storageChange"
+              >
+                <el-option
+                    v-for="item in fromStorageOptions"
+                    :key="item.value"
+                    :label="item.code"
+                    :value="item">
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.code
+                    }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item class="query-form-item" prop="fromCorp"
+                          v-if="curAction.corpType ==2 && curAction.genUnit">
+              <el-input v-model="formData.corpName" auto-complete="off"
+                        clearable
+                        placeholder="请输入病人住院号"
+              ></el-input>
+            </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-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"
-                                       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-form-item>
-                    </el-col>
+          <el-col :span="7">
+            <el-form-item prop="locStorageCode">
+              <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
+                         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-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="type" style="margin-right: 20px;"
-                                      v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
-                            <el-checkbox v-model="formData.noInvOut">允许无库存出库</el-checkbox>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span></span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="type" style="margin-right: 20px;"
+                          v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
+              <el-checkbox v-model="formData.noInvOut">允许无库存出库</el-checkbox>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row :gutter="20" style="margin-top: -10px;">
+        <el-row :gutter="20" style="margin-top: -10px;">
 
-                </el-row>
+        </el-row>
 
-            </el-card>
+      </el-card>
 
-            <el-card>
-                <el-button-group style="display: flex">
-                    <el-button
-                        type="primary"
-                        size="small"
-                        @click.native.stop="selectProductFunction()"
-                        style="margin: 0px 60px 10px auto; height: 35px"
-                        :loading="loading"
-                    >产品录入
-                    </el-button
-                    >
-                </el-button-group>
+      <el-card>
+        <el-button-group style="display: flex">
+          <el-button
+              type="primary"
+              size="small"
+              @click.native.stop="selectProductFunction()"
+              style="margin: 0px 60px 10px auto; height: 35px"
+              :loading="loading"
+          >产品录入
+          </el-button
+          >
+        </el-button-group>
 
-                <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 width="150"
-                                     label="产品通用名"
-                                     prop="productName"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column width="150"
-                                     label="规格型号"
-                                     prop="spec"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column width="150" label="批次号">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.batchNo"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      ref='inputBatchNoRef'
-                                      placeholder="请输入批次号" style="width: 80%"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="180" label="生产日期(yyMMdd)">
-                        <template slot-scope="scope">
+        <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 width="150"
+                           label="产品通用名"
+                           prop="productName"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="规格型号"
+                           prop="spec"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150" label="批次号">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.batchNo"
+                        :disabled="scope.row.index !== selectedIndex"
+                        ref='inputBatchNoRef'
+                        placeholder="请输入批次号" style="width: 80%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="180" label="生产日期(yyMMdd)">
+            <template slot-scope="scope">
 
-                            <el-input v-model="scope.row.productDate" auto-complete="off"
-                                      oninput="if(value.length>6)value=value.slice(0,6)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      type="number"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="180" label="失效日期(yyMMdd)">
-                        <template slot-scope="scope">
+              <el-input v-model="scope.row.productDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        type="number"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="180" label="失效日期(yyMMdd)">
+            <template slot-scope="scope">
 
-                            <el-input v-model="scope.row.expireDate" auto-complete="off"
-                                      oninput="if(value.length>6)value=value.slice(0,6)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      type="number"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="150" label="单据数量">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.count"
-                                      placeholder="请输入数量" style="width: 80%"
-                                      type='number'
-                                      @change="tableCountChange(scope.row)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="150" label="价格">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.price"
-                                      type='number'
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      placeholder="请输入价格" style="width: 80%"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
+              <el-input v-model="scope.row.expireDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        type="number"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="单据数量">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.count"
+                        placeholder="请输入数量" style="width: 80%"
+                        type='number'
+                        @change="tableCountChange(scope.row)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="价格">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.price"
+                        type='number'
+                        :disabled="scope.row.index !== selectedIndex"
+                        placeholder="请输入价格" style="width: 80%"
+              ></el-input>
+            </template>
+          </el-table-column>
 
-                    <el-table-column width="150"
-                                     label="注册/备案凭证号"
-                                     prop="zczbhhzbapzbh"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column width="150"
-                                     label="生产厂家"
-                                     prop="ylqxzcrbarmc"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column label="操作" fixed="right" width="150">
-                        <template slot-scope="scope">
+          <el-table-column width="150"
+                           label="注册/备案凭证号"
+                           prop="zczbhhzbapzbh"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="生产厂家"
+                           prop="ylqxzcrbarmc"
+                           show-overflow-tooltip
+          ></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="copyDetail(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-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="copyDetail(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>
+    <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>
 
-        <el-dialog
-            title="库存产品录入"
-            :visible.sync="selectInvProductVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="85%"
-            v-if="selectInvProductVisible"
-            :append-to-body='true'
-        >
-            <dialogInvProduct
-                :closeDialog="closeDialogC2"
-                :data="thisData"
-                :invQueryData="invQueryData"
-            ></dialogInvProduct>
-        </el-dialog>
-    </div>
+    <el-dialog
+        title="库存产品录入"
+        :visible.sync="selectInvProductVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectInvProductVisible"
+        :append-to-body='true'
+    >
+      <dialogInvProduct
+          :closeDialog="closeDialogC2"
+          :data="thisData"
+          :invQueryData="invQueryData"
+      ></dialogInvProduct>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    stockOrderDetail,
-    submitStockOrder,
-    stockOrderGenerateBillNo,
-    getStockOrderDetailInstrument,
-    insertStockOrderWeb,
-    deleteStockOrderDetailById,
-    addStockOrderDetailFromCode,
-    uploadStockOrderDetail,
-    stockOrderDetailQueryProduct,
-    getStockOrderDetailInstrumentById, stockOrderDetail2, generateBillNoInt
+  stockOrderDetail,
+  submitStockOrder,
+  stockOrderGenerateBillNo,
+  getStockOrderDetailInstrument,
+  insertStockOrderWeb,
+  deleteStockOrderDetailById,
+  addStockOrderDetailFromCode,
+  uploadStockOrderDetail,
+  stockOrderDetailQueryProduct,
+  getStockOrderDetailInstrumentById, stockOrderDetail2, generateBillNoInt
 } from "../../api/warehouse/stockOrder";
 import draggable from "vuedraggable";
 import {saveAs} from "file-saver";
@@ -361,755 +361,757 @@ import {inserThrOrderWeb} from "@/api/thrsys/thrOrderReceive";
 import {getThrOrderDetails} from "@/api/thrsys/thrOrder";
 
 export default {
-    name: "idQuery",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        idQuery: {
-            type: Object,
-            required: true,
-        },
-        closeConfirmFunction: {
-            type: Function,
-            required: true,
-        },
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            code: "",
-            query: {
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-            },
-            formData: {noInvOut: false, locStorageCode: null},
-            formRules: {
-                corpName: [
-                    {required: true, message: "请输入供应商", trigger: "blur"}
-                ],
-                billdate: [
-                    {required: true, message: "请输入单据日期", trigger: "blur"}
-                ],
-                billType: [
-                    {required: true, message: "请选择业务类型", trigger: "blur"}
-                ],
-                locStorageCode: [
-                    {required: true, message: "请选择当前仓库", trigger: "blur"}
-                ],
-                // type: [
-                //     {required: true, message: "请选择采购类型", trigger: "blur"}
-                // ],
-            },
-            codeArray: [],
-            fromOptions: [],
-            fromStorageOptions: [],
-            total: 0,
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            statusMap: {
-                101: "未处理",
-                102: "已处理",
-                201: "未配货",
-                202: "已配货",
-                301: "已打印",
-                401: "异常",
-                501: "未提交",
-                502: "已提交",
-            },
-            typeMap: {
-                1: "预入库",
-                2: "普通采购",
-            },
-            curAction: {
-                corpType: 0,
-                genUnit: false,
-            },
-            orderEditor: true,
-            iCount: 0,
-            sOptions: [],
-            sValue: [],
-            sList: [],
-            sLoading: false,
-            busTypes: [],
-            currentRow: {},
-            selectedIndex: "",
-            selectProductVisible: false,
-            selectInvProductVisible: false,
-            thisData: {},
-            storageList: [],
-            invQueryData: {},
-
-        };
+    idQuery: {
+      type: Object,
+      required: true,
     },
-    components: {
-        draggable,
-        stockOrderNewSelectProduct,
-        dialogInvProduct,
+    closeConfirmFunction: {
+      type: Function,
+      required: true,
     },
-    methods: {
-        saveOrder(status) {
-
-            this.code = "";
-            this.$refs.multipleTable.setCurrentRow();
-            this.currentRow = {};
-            this.selectedIndex = "";
-            this.iCount = 0;
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
-                    if (this.codeArray.length < 1) {
-                        this.$message.warning('未添加产品');
-                        return;
-                    }
+  },
+  data() {
+    return {
+      code: "",
+      query: {
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+      formData: {noInvOut: false, locStorageCode: null},
+      formRules: {
+        corpName: [
+          {required: true, message: "请输入供应商", trigger: "blur"}
+        ],
+        billdate: [
+          {required: true, message: "请输入单据日期", trigger: "blur"}
+        ],
+        billType: [
+          {required: true, message: "请选择业务类型", trigger: "blur"}
+        ],
+        locStorageCode: [
+          {required: true, message: "请选择当前仓库", trigger: "blur"}
+        ],
+        // type: [
+        //     {required: true, message: "请选择采购类型", trigger: "blur"}
+        // ],
+      },
+      codeArray: [],
+      fromOptions: [],
+      fromStorageOptions: [],
+      total: 0,
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      statusMap: {
+        101: "未处理",
+        102: "已处理",
+        201: "未配货",
+        202: "已配货",
+        301: "已打印",
+        401: "异常",
+        501: "未提交",
+        502: "已提交",
+      },
+      typeMap: {
+        1: "预入库",
+        2: "普通采购",
+      },
+      curAction: {
+        corpType: 0,
+        genUnit: false,
+      },
+      orderEditor: true,
+      iCount: 0,
+      sOptions: [],
+      sValue: [],
+      sList: [],
+      sLoading: false,
+      busTypes: [],
+      currentRow: {},
+      selectedIndex: "",
+      selectProductVisible: false,
+      selectInvProductVisible: false,
+      thisData: {},
+      storageList: [],
+      invQueryData: {},
 
-                    for (let i = 0; i < this.codeArray.length; i++) {
-                        if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) {
-                            return this.$message.error('生产日期格式错误');
-                        }
-                        if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
-                            return this.$message.error('失效日期格式错误');
-                        }
+    };
+  },
+  components: {
+    draggable,
+    stockOrderNewSelectProduct,
+    dialogInvProduct,
+  },
+  methods: {
+    saveOrder(status) {
 
-                    }
+      this.code = "";
+      this.$refs.multipleTable.setCurrentRow();
+      this.currentRow = {};
+      this.selectedIndex = "";
+      this.iCount = 0;
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (this.codeArray.length < 1) {
+            this.$message.warning('未添加产品');
+            return;
+          }
 
-                    if (status === '0') {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
-                                return this.$message.error('单据数量不能为0');
-                            }
-                            if (this.$isBlank(this.codeArray[i].batchNo)) {
-                                return this.$message.error('批次号不能为空');
-                            }
-                            if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
-                                return this.$message.error('生产日期与失效日期不能全部为空');
-                            }
-                            // if (this.$isBlank(this.codeArray[i].expireDate)) {
-                            //     return this.$message.error('失效日期不能为空');
-                            // }
+          for (let i = 0; i < this.codeArray.length; i++) {
+            if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) {
+              return this.$message.error('生产日期格式错误');
+            }
+            if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
+              return this.$message.error('失效日期格式错误');
+            }
 
+          }
 
-                        }
-                    }
-                    if (status === '0') {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
-                                return this.$message.error('单据数量不能为0');
-                            }
-                        }
-                    }
+          if (status === '0') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
+              if (this.$isBlank(this.codeArray[i].batchNo)) {
+                return this.$message.error('批次号不能为空');
+              }
+              if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+                return this.$message.error('生产日期与失效日期不能全部为空');
+              }
+              // if (this.$isBlank(this.codeArray[i].expireDate)) {
+              //     return this.$message.error('失效日期不能为空');
+              // }
 
-                    if (status == "1") {
-                        this.submitFunction(status);
-                    } else {
-                        let tip = "是否确定提交订单?";
-                        this.$confirm(tip, "提示", {
-                            confirmButtonText: "确定",
-                            cancelButtonText: "取消",
-                            type: "warning",
-                        }).then(() => {
-                            this.submitFunction(status);
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-                    }
 
+            }
+          }
+          if (status === '0') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
+            }
+          }
 
-                }
+          if (status == "1") {
+            this.submitFunction(status);
+          } else {
+            let tip = "是否确定提交订单?";
+            this.$confirm(tip, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(() => {
+              this.submitFunction(status);
+            }).catch(() => {
+              this.loading = false;
             });
-        },
-        storageChange(row) {
-            console.log(row);
-            this.formData.corpId = row.code;
-            this.formData.corpName = row.name;
-        },
-        getStorage(event) {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
+          }
 
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].advanceType;
-                }
-            }
-        },
-        findStorageMethod(query) {
-            console.log(query);
-            if (this.formData.locStorageCode == null)
-                return;
-            this.fromStorageOptions = [];
-            let cQuery = {
-                locInvCode: this.formData.locStorageCode,
-            };
-            filterAllByLoc(cQuery)
-                .then((response) => {
-                    let temp = response.data || [];
-                    for (let i = 0; i < temp.length; i++) {
-                        if (temp[i].code != this.formData.locStorageCode) {
-                            this.fromStorageOptions.push(temp[i]);
-                        }
-                    }
 
-                })
-                .catch(() => {
-                });
-        },
-        submitFunction(status) {
-            let tMessage = status === '501' ? '保存' : '提交';
-            this.loading = true;
-            let tQuery = this.formData;
-            tQuery.editStatus = status;
-            tQuery.subErpOrders = this.codeArray;
-            // tQuery.billType = this.formData.bi;
-            console.log(tQuery);
-            inserThrOrderWeb(tQuery)
-                .then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success(tMessage + "成功");
-                        this.closeDialog(true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                })
-        },
-        selectProductFunction(event) {
+        }
+      });
+    },
+    storageChange(row) {
+      console.log(row);
+      this.formData.corpId = row.code;
+      this.formData.corpName = row.name;
+    },
+    getStorage(event) {
+      this.storageList = [];
+      filterAllByUser()
+          .then((response) => {
+            this.storageList = response.data || [];
+          })
+          .catch(() => {
+          });
+    },
 
-            if (event == null) {
-                // this.$refs.inputRef.focus();
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].advanceType;
+        }
+      }
+    },
+    findStorageMethod(query) {
+      console.log(query);
+      if (this.formData.locStorageCode == null)
+        return;
+      this.fromStorageOptions = [];
+      let cQuery = {
+        locInvCode: this.formData.locStorageCode,
+      };
+      filterAllByLoc(cQuery)
+          .then((response) => {
+            let temp = response.data || [];
+            for (let i = 0; i < temp.length; i++) {
+              if (temp[i].code != this.formData.locStorageCode) {
+                this.fromStorageOptions.push(temp[i]);
+              }
+            }
+
+          })
+          .catch(() => {
+          });
+    },
+    submitFunction(status) {
+      let tMessage = status === '501' ? '保存' : '提交';
+      this.loading = true;
+      let tQuery = this.formData;
+      tQuery.editStatus = status;
+      tQuery.subErpOrders = this.codeArray;
+      // tQuery.billType = this.formData.bi;
+      console.log(tQuery);
+      inserThrOrderWeb(tQuery)
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success(tMessage + "成功");
+              this.closeDialog(true);
             } else {
-                event.target.select();
+              this.$message.error(response.message);
             }
-            if (this.$isBlank(event)) {
+          })
+          .catch(() => {
+            this.loading = false;
+          })
+    },
+    selectProductFunction(event) {
 
-                if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) {
-                    this.$message.error("往来信息和单据类型不能为空！")
-                    return;
-                }
-                this.code = "";
-                this.$refs.multipleTable.setCurrentRow();
-                this.currentRow = {};
-                this.selectedIndex = "";
-                this.iCount = 0;
-                this.thisData.code = "";
-                this.thisData.orderEditor = this.orderEditor;
-                this.thisData.orderId = "";
-                if (this.orderEditor) {
-                    this.thisData.orderId = this.formData.id
-                }
-                this.curAction = this.getActionItem(this.formData.billType);
-                this.thisData.stockOrderLists = this.codeArray;
-                this.thisData.formData = this.formData;
-                this.thisData.formData.thirdSysFk = this.curAction.thirdSys;
-                this.thisData.billType = this.curAction.localAction;
+      if (event == null) {
+        // this.$refs.inputRef.focus();
+      } else {
+        event.target.select();
+      }
+      if (this.$isBlank(event)) {
 
-                // this.thisData.formData.billType = this.curAction.localAction;
-                if (this.curAction.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
-                    this.invQueryData = {
-                        locStorageCode: this.formData.locStorageCode,
-                    };
-                    this.selectInvProductVisible = true;
-                } else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
+        if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) {
+          this.$message.error("往来信息和单据类型不能为空！")
+          return;
+        }
+        this.code = "";
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+        this.iCount = 0;
+        this.thisData.code = "";
+        this.thisData.orderEditor = this.orderEditor;
+        this.thisData.orderId = "";
+        if (this.orderEditor) {
+          this.thisData.orderId = this.formData.id
+        }
+        this.curAction = this.getActionItem(this.formData.billType);
+        this.thisData.stockOrderLists = this.codeArray;
+        this.thisData.formData = this.formData;
+        this.thisData.formData.thirdSysFk = this.curAction.thirdSys;
+        this.thisData.billType = this.curAction.localAction;
 
-                    this.invQueryData = {
-                        locStorageCode: this.formData.corpId,
+        // this.thisData.formData.billType = this.curAction.localAction;
+        if (this.curAction.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
+          this.invQueryData = {
+            locStorageCode: this.formData.locStorageCode,
+          };
+          this.selectInvProductVisible = true;
+        } else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
 
-                    };
-                    console.log("his.invQueryData " + this.invQueryData.locStorageCode);
-                    this.selectInvProductVisible = true;
-                } else {
-                    this.selectProductVisible = true;
-                }
+          this.invQueryData = {
+            locStorageCode: this.formData.corpId,
 
+          };
+          console.log("his.invQueryData " + this.invQueryData.locStorageCode);
+          this.selectInvProductVisible = true;
+        } else {
+          this.selectProductVisible = true;
+        }
 
-                return;
-            }
-            // this.code = this.code.trim();
-            //
-            // if (this.code.length > 13) {
-            //     let tStr = this.code.substring(0, 2);
-            //     tStr = tStr.replace('m', 'M');
-            //     tStr = tStr.replace('a', 'A');
-            //     if (tStr.indexOf("MA") !== -1) {
-            //         this.code = tStr + this.code.substring(2, this.code.length);
-            //     }
-            // }
-            //
-            // this.loading = true;
-            // let tQuery = {
-            //     code: this.code,
-            //     customerId: store.getters.customerId,
-            // };
-            //
-            // stockOrderDetailQueryProduct(tQuery).then((response) => {
-            //     this.loading = false;
-            //     console.log(response)
-            //     if (response.code === 20000) {
-            //         if (response.data.getType === "1") {
-            //             this.loading = true;
-            //
-            //             let ids = [response.data.getId];
-            //             let tQuery2 = {
-            //                 ids: ids,
-            //                 udiEntity: response.data
-            //             };
-            //             getStockOrderDetailInstrumentById(tQuery2).then((response) => {
-            //                 this.loading = false;
-            //                 if (response.code === 20000) {
-            //                     this.closeDialogC2(response.data);
-            //                 } else {
-            //                     this.$message.error(response.message);
-            //                 }
-            //             }).catch(() => {
-            //                 this.loading = false;
-            //             });
-            //         } else {
-            //             this.thisData = response.data;
-            //             this.thisData.code = this.code;
-            //             this.thisData.orderEditor = this.orderEditor;
-            //             this.thisData.orderId = "";
-            //             if (this.orderEditor) {
-            //                 this.thisData.orderId = this.formData.id
-            //             }
-            //             this.thisData.stockOrderLists = this.codeArray;
-            //             this.selectProductVisible = true;
-            //         }
-            //     } else {
-            //         this.$message.warning(response.message);
-            //         // this.focusNext('inputRef');
-            //         if (this.$isNotBlank(event)) {
-            //             event.target.select();
-            //         }
-            //         // event.target.select();
-            //         // event.currentTarget.select();
-            //     }
-            // });
 
+        return;
+      }
+      // this.code = this.code.trim();
+      //
+      // if (this.code.length > 13) {
+      //     let tStr = this.code.substring(0, 2);
+      //     tStr = tStr.replace('m', 'M');
+      //     tStr = tStr.replace('a', 'A');
+      //     if (tStr.indexOf("MA") !== -1) {
+      //         this.code = tStr + this.code.substring(2, this.code.length);
+      //     }
+      // }
+      //
+      // this.loading = true;
+      // let tQuery = {
+      //     code: this.code,
+      //     customerId: store.getters.customerId,
+      // };
+      //
+      // stockOrderDetailQueryProduct(tQuery).then((response) => {
+      //     this.loading = false;
+      //     console.log(response)
+      //     if (response.code === 20000) {
+      //         if (response.data.getType === "1") {
+      //             this.loading = true;
+      //
+      //             let ids = [response.data.getId];
+      //             let tQuery2 = {
+      //                 ids: ids,
+      //                 udiEntity: response.data
+      //             };
+      //             getStockOrderDetailInstrumentById(tQuery2).then((response) => {
+      //                 this.loading = false;
+      //                 if (response.code === 20000) {
+      //                     this.closeDialogC2(response.data);
+      //                 } else {
+      //                     this.$message.error(response.message);
+      //                 }
+      //             }).catch(() => {
+      //                 this.loading = false;
+      //             });
+      //         } else {
+      //             this.thisData = response.data;
+      //             this.thisData.code = this.code;
+      //             this.thisData.orderEditor = this.orderEditor;
+      //             this.thisData.orderId = "";
+      //             if (this.orderEditor) {
+      //                 this.thisData.orderId = this.formData.id
+      //             }
+      //             this.thisData.stockOrderLists = this.codeArray;
+      //             this.selectProductVisible = true;
+      //         }
+      //     } else {
+      //         this.$message.warning(response.message);
+      //         // this.focusNext('inputRef');
+      //         if (this.$isNotBlank(event)) {
+      //             event.target.select();
+      //         }
+      //         // event.target.select();
+      //         // event.currentTarget.select();
+      //     }
+      // });
 
-        },
-        closeDialogC2(rData) {
-            this.selectProductVisible = false;
-            this.selectInvProductVisible = false;
-            this.thisData = {};
 
-            if (this.$isNotBlank(rData)) {
-                this.codeArray = [];
-                rData.forEach((obj, index) => {
-                    this.codeArray.unshift(obj);
-                });
-                console.log(this.codeArray);
-                this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                this.currentRow = this.codeArray[0];
-                this.selectedIndex = 0;
-                this.focusNext('iCount');
-                this.closeConfirmFunction(true);
-            }
-        },
-        rowChange(val) {
-            this.currentRow = val;
-            this.selectedIndex = val.index;
-            this.iCount = val.count;
+    },
+    closeDialogC2(rData) {
+      this.selectProductVisible = false;
+      this.selectInvProductVisible = false;
+      this.thisData = {};
 
-            this.focusNext('iCount');
+      if (this.$isNotBlank(rData)) {
+        this.codeArray = [];
+        rData.forEach((obj, index) => {
+          this.codeArray.unshift(obj);
+        });
+        console.log(this.codeArray);
+        this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+        this.currentRow = this.codeArray[0];
+        this.selectedIndex = 0;
+        this.focusNext('iCount');
+        this.closeConfirmFunction(true);
+      }
+    },
+    rowChange(val) {
+      this.currentRow = val;
+      this.selectedIndex = val.index;
+      this.iCount = val.count;
 
-            // let sc = this.selectedIndex + 'reCount';
-            // const _this = this;
-            // this.$nextTick(() => {
-            //     setTimeout(function() {
-            //         console.log(sc);
-            //         console.log(_this.$refs[sc]);
-            //         console.log(_this.$refs[sc].focus());
-            //         _this.$refs[sc].focus();
-            //     }, 1)
-            //     // this.$refs['inputBatchNoRef'][0].focus()
-            // })
-        },
-        iCountChange() {
-            // console.log(this.iCount)
-            // this.currentRow.count = this.iCount;
-            // this.currentRow.reCount = this.iCount;
-        },
-        iCountEnterFunction() {
-            if (this.$isNotBlank(this.currentRow)) {
-                this.currentRow.count = this.iCount;
-                // this.currentRow.reCount = this.iCount;
-            }
-            this.focusNext('inputRef');
-        },
-        tableCountChange(row) {
-            if (this.$isNotBlank(row)) {
-                // row.count = row.reCount;
-            }
-        },
-        tableRowClassName({row, rowIndex}) {
-            row.index = rowIndex;
-        },
-        focusNext(nextRef) {
-            this.$refs[nextRef].focus()
-        },
-        focusNextToTable(nextRef) {
-            this.$refs[nextRef][0].focus()
-        },
+      this.focusNext('iCount');
+
+      // let sc = this.selectedIndex + 'reCount';
+      // const _this = this;
+      // this.$nextTick(() => {
+      //     setTimeout(function() {
+      //         console.log(sc);
+      //         console.log(_this.$refs[sc]);
+      //         console.log(_this.$refs[sc].focus());
+      //         _this.$refs[sc].focus();
+      //     }, 1)
+      //     // this.$refs['inputBatchNoRef'][0].focus()
+      // })
+    },
+    iCountChange() {
+      // console.log(this.iCount)
+      // this.currentRow.count = this.iCount;
+      // this.currentRow.reCount = this.iCount;
+    },
+    iCountEnterFunction() {
+      if (this.$isNotBlank(this.currentRow)) {
+        this.currentRow.count = this.iCount;
+        // this.currentRow.reCount = this.iCount;
+      }
+      this.focusNext('inputRef');
+    },
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+        // row.count = row.reCount;
+      }
+    },
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+    focusNext(nextRef) {
+      this.$refs[nextRef].focus()
+    },
+    focusNextToTable(nextRef) {
+      this.$refs[nextRef][0].focus()
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
         // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
-            }
-        },
-        addCode() {
-            this.code = this.code.trim();
-            if (this.$isBlank(this.code)) {
-                this.$message.warning('请输入条码');
-                return;
-            }
-            if (this.iCount <= 0) {
-                this.$message.warning('请输入数量');
-                return;
-            }
-            this.loading = true;
-            let tQuery = {
-                orderId: this.formData.id,
-                count: this.iCount,
-                code: this.code,
-            };
-            if (this.orderEditor) {
-                addStockOrderDetailFromCode(tQuery).then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.getStockOrderDetailList();
-                    } else {
-                        this.$alert(response.message, '提示', {
-                            confirmButtonText: '确定',
-                            type: 'warning',
-                            closeOnClickModal: true,
-                            callback: action => {
-                                this.$refs.inputRef.focus();
-                            }
-                        });
-                    }
-                });
-            } else {
-                getStockOrderDetailInstrument(tQuery).then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.codeArray[i].productId === response.data.productId) {
-                                this.$alert("已添加", '提示', {
-                                    confirmButtonText: '确定',
-                                    type: 'warning',
-                                    closeOnClickModal: true,
-                                    callback: action => {
-                                        this.$refs.inputRef.focus();
-                                    }
-                                });
-                                break;
-                            }
-                            if (i + 1 === this.codeArray.length) {
-                                this.codeArray.push(response.data);
-                            }
-                        }
-                        if (this.codeArray.length === 0) {
-                            this.codeArray.push(response.data);
-                        }
-                    } else {
-                        this.$alert(response.message, '提示', {
-                            confirmButtonText: '确定',
-                            type: 'warning',
-                            closeOnClickModal: true,
-                            callback: action => {
-                                this.$refs.inputRef.focus();
-                            }
-                        });
-                    }
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    addCode() {
+      this.code = this.code.trim();
+      if (this.$isBlank(this.code)) {
+        this.$message.warning('请输入条码');
+        return;
+      }
+      if (this.iCount <= 0) {
+        this.$message.warning('请输入数量');
+        return;
+      }
+      this.loading = true;
+      let tQuery = {
+        orderId: this.formData.id,
+        count: this.iCount,
+        code: this.code,
+      };
+      if (this.orderEditor) {
+        addStockOrderDetailFromCode(tQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.getStockOrderDetailList();
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+              }
+            });
+          }
+        });
+      } else {
+        getStockOrderDetailInstrument(tQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.codeArray[i].productId === response.data.productId) {
+                this.$alert("已添加", '提示', {
+                  confirmButtonText: '确定',
+                  type: 'warning',
+                  closeOnClickModal: true,
+                  callback: action => {
+                    this.$refs.inputRef.focus();
+                  }
                 });
+                break;
+              }
+              if (i + 1 === this.codeArray.length) {
+                this.codeArray.push(response.data);
+              }
             }
-        },
-        saveCodeArray(index, row) {
-            if (this.$isBlank(row.batchNo)) {
-                return this.$message.error('批次号不能为空');
+            if (this.codeArray.length === 0) {
+              this.codeArray.push(response.data);
             }
-            // if (this.$isBlank(row.productDate)) {
-            //     return this.$message.error('生产日期不能为空');
-            // }
-            // if (this.$isBlank(row.expireDate)) {
-            //     return this.$message.error('失效日期不能为空');
-            // }
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+              }
+            });
+          }
+        });
+      }
+    },
+    saveCodeArray(index, row) {
+      if (this.$isBlank(row.batchNo)) {
+        return this.$message.error('批次号不能为空');
+      }
+      // if (this.$isBlank(row.productDate)) {
+      //     return this.$message.error('生产日期不能为空');
+      // }
+      // if (this.$isBlank(row.expireDate)) {
+      //     return this.$message.error('失效日期不能为空');
+      // }
 
-            this.$refs.multipleTable.setCurrentRow();
-            this.currentRow = {};
-            this.selectedIndex = "";
-            this.iCount = 0;
+      this.$refs.multipleTable.setCurrentRow();
+      this.currentRow = {};
+      this.selectedIndex = "";
+      this.iCount = 0;
 
-            this.detailLoading = true;
-            // row.count = row.reCount;
-            let tQuery = row;
-            uploadStockOrderDetail(tQuery).then((response) => {
-                this.detailLoading = false;
-                if (response.code === 20000) {
-                    this.$message.success("修改完成");
-                    this.getStockOrderDetailList();
-                    this.$refs.inputRef.focus();
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-        },
-        deleteCodeArray(index, row) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.$refs.multipleTable.setCurrentRow();
-                this.currentRow = {};
-                this.selectedIndex = "";
-                this.iCount = 0;
+      this.detailLoading = true;
+      // row.count = row.reCount;
+      let tQuery = row;
+      uploadStockOrderDetail(tQuery).then((response) => {
+        this.detailLoading = false;
+        if (response.code === 20000) {
+          this.$message.success("修改完成");
+          this.getStockOrderDetailList();
+          this.$refs.inputRef.focus();
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
+    deleteCodeArray(index, row) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+        this.iCount = 0;
 
-                if (this.orderEditor) {
-                    this.detailLoading = true;
-                    if (this.$isNotBlank(row.id)) {
-                        deleteStockOrderDetailById({id: 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('删除成功');
+        if (this.orderEditor) {
+          this.detailLoading = true;
+          if (this.$isNotBlank(row.id)) {
+            deleteStockOrderDetailById({id: row.id})
+                .then(response => {
+                  this.detailLoading = false;
+                  if (response.code === 20000) {
+                    this.$message.success(response.data);
+                    // this.getStockOrderDetailList();
                     this.codeArray.splice(index, 1);
-                }
-            }).catch(() => {
-
-            });
-        },
-        copyDetail(row) {
-            this.$confirm("是否复制该记录?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                let rData = JSON.parse(JSON.stringify(row));
-                rData.id = null;
-                if (this.codeArray.length === 0) {
-                    this.codeArray.push(rData);
-                    this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                    this.currentRow = this.codeArray[0];
-                    this.selectedIndex = 0;
-                } else {
-                    this.codeArray.unshift(rData);
-                    this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                    this.currentRow = this.codeArray[0];
-                    this.selectedIndex = 0;
-                }
-                this.$message.success("复制成功");
-                this.iCount = this.currentRow.count;
-                this.focusNext('iCount');
-            }).catch(() => {
-            });
-        },
-        getInputFocus(event) {
-            event.currentTarget.select();
-        },
-        tableSelection() {
-            this.$refs.multipleTable.clearSelection();
-            this.$refs.multipleTable.toggleAllSelection();
-        },
-        handleSizeChange(val) {
-            this.query.limit = val;
-            this.getStockOrderDetailList();
-        },
-        handleCurrentChange(val) {
-            this.query.page = val;
-            this.getStockOrderDetailList();
-        },
-        getStockOrderDetailList() {
-            this.loading = true;
-            getThrOrderDetails(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
+                  } else {
+                    this.$message.error(response.message);
+                  }
                 })
                 .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        intentBack() {
-            this.$router.go(-1);
-        },
-        generateBillNo() {
-            let tQuery = {
-                action: this.formData.billType
-            }
-            this.loading = true;
-            generateBillNoInt(tQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.formData.billNo = response.data;
-                        // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
-                        this.formData.billdate = new Date();
-                    } else {
-                        this.closeDialog(true);
-                    }
-                });
-        },
-        getBusType(invCode) {
-            let query = {
-                enabled: true,
-                // code: invCode,
-            };
-            getOriginJoinBusType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
+                  this.detailLoading = false;
                 })
-                .catch(() => {
-                });
-        },
-        selectOne(event) {
+          } else {
+            this.$message.success('删除成功');
+            this.codeArray.splice(index, 1);
+          }
+        } else {
+          this.$message.success('删除成功');
+          this.codeArray.splice(index, 1);
+        }
+      }).catch(() => {
+
+      });
+    },
+    copyDetail(row) {
+      this.$confirm("是否复制该记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let rData = JSON.parse(JSON.stringify(row));
+        rData.id = null;
+        if (this.codeArray.length === 0) {
+          this.codeArray.push(rData);
+          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+          this.currentRow = this.codeArray[0];
+          this.selectedIndex = 0;
+        } else {
+          this.codeArray.unshift(rData);
+          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+          this.currentRow = this.codeArray[0];
+          this.selectedIndex = 0;
+        }
+        this.$message.success("复制成功");
+        this.iCount = this.currentRow.count;
+        this.focusNext('iCount');
+      }).catch(() => {
+      });
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    tableSelection() {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleAllSelection();
+    },
+    handleSizeChange(val) {
+      this.query.limit = val;
+      this.getStockOrderDetailList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getStockOrderDetailList();
+    },
+    getStockOrderDetailList() {
+      this.loading = true;
+      getThrOrderDetails(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;
+          });
+    },
+    intentBack() {
+      this.$router.go(-1);
+    },
+    generateBillNo() {
+      let tQuery = {
+        action: this.formData.billType
+      }
+      this.loading = true;
+      generateBillNoInt(tQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.formData.billNo = response.data;
+              // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
+              this.formData.billdate = new Date();
+            } else {
+              this.closeDialog(true);
+            }
+          });
+    },
+    getBusType(invCode) {
+      let query = {
+        enabled: true,
+        corpType: 1,
+        // code: invCode,
+      };
+      getOriginJoinBusType(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.curAction = this.busTypes[0];
+          })
+          .catch(() => {
+          });
+    },
+    selectOne(event) {
 
-            this.formData.corpName = event.name;
-            this.formData.corpId = event.erpId;
-            this.formData.unitIdFk = event.erpId;
-            // console.log("this.inputQuery.companyId" + item);
-            console.log("this.inputQuery.companyId" + event.erpId);
-        },
-        findMethod(query) {
-            console.log(query);
-            this.fromOptions = [];
-            let cQuery = {
-                key: query,
-                corpType: null,
-                outType: null,
-            };
-            if (this.curAction.corpType == 3) {//特殊往来
-                cQuery.corpType = 4;
-                this.formData.corpId = this.curAction.defaultUnit;
-            } else if (this.curAction.corpType == 2)//客户
-            {
-                cQuery.corpType = 4;
-                cQuery.outType = 2;
+      this.formData.corpName = event.name;
+      this.formData.corpId = event.erpId;
+      this.formData.unitIdFk = event.erpId;
+      // console.log("this.inputQuery.companyId" + item);
+      console.log("this.inputQuery.companyId" + event.erpId);
+    },
+    findMethod(query) {
+      console.log(query);
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: null,
+        outType: null,
+      };
+      if (this.curAction.corpType == 3) {//特殊往来
+        cQuery.corpType = 4;
+        this.formData.corpId = this.curAction.defaultUnit;
+      } else if (this.curAction.corpType == 2)//客户
+      {
+        cQuery.corpType = 4;
+        cQuery.outType = 2;
 
-            } else if (this.curAction.corpType == 0) {
-                cQuery.corpType = 2;
-            } else return;
+      } else if (this.curAction.corpType == 0) {
+        cQuery.corpType = 2;
+      } else return;
 
-            getBasicUnitMaintains(cQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.fromOptions = response.data.page.list || [];
-                    if (this.curAction.corpType == 3) {
-                        for (let i = 0; i < this.fromOptions.length; i++) {
-                            if (this.fromOptions[i].erpId == this.formData.corpId) {
-                                this.formData.corpName = this.fromOptions[i].name;
-                            }
-                        }
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
-        },
-        getActionItem(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].thirdAction === action) {
-                    return this.busTypes[i];
+      getBasicUnitMaintains(cQuery)
+          .then((response) => {
+            this.loading = false;
+            this.fromOptions = response.data.page.list || [];
+            if (this.curAction.corpType == 3) {
+              for (let i = 0; i < this.fromOptions.length; i++) {
+                if (this.fromOptions[i].erpId == this.formData.corpId) {
+                  this.formData.corpName = this.fromOptions[i].name;
                 }
+              }
             }
-        },
-        actionChange(item) {
-            console.log(item);
-            this.curAction = this.getActionItem(item);
-            // this.formData.locStorageCode = this.curAction.storageCode;
-            console.log(this.curAction.corpType + "---" + "-----" + this.curAction.action);
-            this.findMethod();
-            // }
-
-        },
-        locInChange(item) {
-            console.log(item);
-            this.formData.locStorageCode = item;
-            this.$forceUpdate();
-            this.getBusType(item);
-            this.findStorageMethod();
-        }
-    },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
+          })
+          .catch(() => {
+            this.loading = false;
+          });
     },
-    created() {
-        this.getBusType("NOCODE");
-        this.getStorage();
-        this.formData = {};
-        this.codeArray = [];
-        this.closeConfirmFunction(false);
-        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 = {
-                billdate: "",
-                customerId: store.getters.customerId,
-                billType: "",
-                type: "2",
-            };
-            this.iCount = 0;
-            this.orderEditor = false;
-            this.generateBillNo();
+    getActionItem(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].thirdAction === action) {
+          return this.busTypes[i];
         }
+      }
+    },
+    actionChange(item) {
+      console.log(item);
+      this.curAction = this.getActionItem(item);
+      // this.formData.locStorageCode = this.curAction.storageCode;
+      console.log(this.curAction.corpType + "---" + "-----" + this.curAction.action);
+      this.findMethod();
+      // }
+
     },
+    locInChange(item) {
+      console.log(item);
+      this.formData.locStorageCode = item;
+      this.$forceUpdate();
+      this.getBusType(item);
+      this.findStorageMethod();
+    }
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getBusType("NOCODE");
+    this.getStorage();
+    this.formData = {};
+    this.codeArray = [];
+    this.closeConfirmFunction(false);
+    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 = {
+        billdate: "",
+        customerId: store.getters.customerId,
+        billType: "",
+        type: "2",
+      };
+      this.iCount = 0;
+      this.orderEditor = false;
+      this.generateBillNo();
+    }
+  },
 };
 </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/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index eabe514..f7126c2 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -181,11 +181,10 @@
 
             </el-row>
             <el-row :gutter="20">
-                <el-col :span="3">
+                <el-col :span="2">
                     <div class="ao-text">
-
                         <el-link
-                            @click.native.stop="scanChange()"
+                            @current-change="scanChange()"
                             target="_blank">{{ scanText }}
                         </el-link>
 
@@ -224,10 +223,13 @@
             <!--            </div>-->
             <!--            <div id="inputer" tabindex="0"></div>-->
             <el-row :gutter="20">
-                <el-col :span="16" style="margin-left: 40px">
+                <el-col :span="14" style="margin-left: 40px">
+
+                </el-col>
+                <el-col :span="2">
                     <el-checkbox v-model="sitcomScan">分段扫码</el-checkbox>
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="3">
                     <div class="text item" style="margin-left: 30px"> 条码数量：{{ total }}
                     </div>
                 </el-col>
@@ -623,13 +625,14 @@ export default {
             });
         },
 
-        scanChange() {
+        scanChange(event) {
             this.isScan = !this.isScan;
             if (this.isScan) {
                 this.scanText = "扫码录入：";
-
+               document.getElementById("inputer").focus();
             } else {
                 this.scanText = "手动录入：";
+                // this.$refs.inputRef.focus();
             }
         },
 
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 4b6939d..a1edf5e 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -474,7 +474,7 @@ export default {
                         });
                     }
                     this.corpOrderIdDisabled = true;
-                    this.$refs.inputRef.focus();
+                    // this.$refs.inputRef.focus();
                     this.getCodeList();
                 } else {
                     this.corpOrderIdDisabled = true;
diff --git a/src/views/warehouse/stockOrderEdit.vue b/src/views/warehouse/stockOrderEdit.vue
index f1b5c5f..bee8014 100644
--- a/src/views/warehouse/stockOrderEdit.vue
+++ b/src/views/warehouse/stockOrderEdit.vue
@@ -92,7 +92,7 @@
             </div>
         </el-dialog>
 
-        <el-dialog v-bind:width="'25%'" :visible.sync="firstSalesInvNoFormVisible"  append-to-body>
+        <el-dialog v-bind:width="'25%'" :visible.sync="firstSalesInvNoFormVisible" append-to-body>
             <el-form :model="batchForm">
                 <label></label>
                 <el-form-item label="销售发票第一票：" :label-width="formLabelWidth">
@@ -105,7 +105,7 @@
             </div>
         </el-dialog>
 
-        <el-dialog v-bind:width="'25%'" :visible.sync="secSalesInvNoFormVisible"  append-to-body>
+        <el-dialog v-bind:width="'25%'" :visible.sync="secSalesInvNoFormVisible" append-to-body>
             <el-form :model="batchForm">
                 <label></label>
                 <el-form-item label="销售发票第二票：" :label-width="formLabelWidth">
@@ -182,6 +182,12 @@ export default {
         },
         batchSetParams(flag, type) {
             if (flag == '1' && type == 'salesListNo') {
+
+                if (this.$isBlank(this.batchForm.secSalesListNo)) {
+                    this.$message.warning("请输入销售清单");
+                    return;
+                }
+
                 this.salesListNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {
@@ -195,6 +201,10 @@ export default {
                 //置空批量设置表单
                 Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else if (flag == '1' && type == 'firstSalesInvNo') {
+                if (this.$isBlank(this.batchForm.firstSalesInvNo)) {
+                    this.$message.warning("请输入销售发票第一票");
+                    return;
+                }
                 this.firstSalesInvNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {
@@ -207,6 +217,10 @@ export default {
                 });
                 Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else if (flag == '1' && type == 'secSalesInvNo') {
+                if (this.$isBlank(this.batchForm.secSalesInvNo)) {
+                    this.$message.warning("请输入销售发票第二票");
+                    return;
+                }
                 this.secSalesInvNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {