diff --git a/src/api/basic/busLocalType.js b/src/api/basic/busLocalType.js
index 30e40cf..01a8f9f 100644
--- a/src/api/basic/busLocalType.js
+++ b/src/api/basic/busLocalType.js
@@ -16,6 +16,17 @@ export function getLocalJoinBusType(query) {
     });
 }
 
+export function getLocalJoinNoUse(query) {
+    return axios({
+        url: "/udiwms/localBusType/filterUnUse",
+        method: "get",
+        params: query
+    });
+}
+
+
+
+
 export function filterByBus(query) {
     return axios({
         url: "/udiwms/localBusType/filterByBus",
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 28dd9bc..4bb3a65 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -70,10 +70,10 @@
                     <el-select v-model="inputQuery.localAction" placeholder="请选择" clearable>
                         <el-option
                             v-for="item in localTypes"
-                            :key="item.action"
-                            :label="item.name"
-                            :value="item.action">
-                            <span style="float: left">{{ item.name }}</span>
+                            :key="item.localAction"
+                            :label="item.localName"
+                            :value="item.localAction">
+                            <span style="float: left">{{ item.localName }}</span>
                         </el-option>
                     </el-select>
                 </div>
@@ -161,7 +161,7 @@
                 <div class="text item" style="margin-top: 6px">
                     <el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox>
                     <!--                    <el-checkbox v-model="inputQuery.innerOrder">标记为内部单据</el-checkbox>-->
-                    <!--                    <el-checkbox v-model="inputQuery.genUnit">允许手动输入信息</el-checkbox>-->
+<!--                    <el-checkbox v-model="inputQuery.genUnit">允许手动输入信息</el-checkbox>-->
                 </div>
 
 
@@ -306,7 +306,7 @@ import {
 } from "../../api/basic/basicThirdSys";
 
 import {
-    getLocalBusType,
+    getLocalBusType, getLocalJoinNoUse
 } from "../../api/basic/busLocalType";
 import {filterAll} from "@/api/basic/invWarehouse";
 import {getJoinBussinessType} from "../../api/basic/bussinessType";
@@ -356,7 +356,10 @@ export default {
                     this.loading = false;
                     this.list = [];
                 });
-            getLocalBusType(this.filterQuery)
+            let query = {
+                curAction: this.inputQuery.localAction,
+            };
+            getLocalJoinNoUse(query)
                 .then((response) => {
                     this.localTypes = response.data.list || [];
                 })
@@ -379,7 +382,7 @@ export default {
             if (!type) {
                 this.twoCheck = true;
                 this.inputQuery.secCheckEnable = false;
-            }else
+            } else
                 this.twoCheck = false;
         },
         //获取单据类型
@@ -387,7 +390,7 @@ export default {
             this.orderTypeList = [];
             let query = {
                 mainAction: this.inputQuery.mainAction,
-                curAction:this.inputQuery.supplementOrderType,
+                curAction: this.inputQuery.supplementOrderType,
             };
             getCandidateBussinessType(query).then((response) => {
                 this.orderTypeList = response.data || [];
diff --git a/src/views/basic/CorpImport.vue b/src/views/basic/CorpImport.vue
index d4891ac..8d2232d 100644
--- a/src/views/basic/CorpImport.vue
+++ b/src/views/basic/CorpImport.vue
@@ -29,8 +29,8 @@
                         >
                             <el-button size="mini" type="primary">导入往来单位信息</el-button>
                         </el-upload>
-                        <el-button type="primary" icon="search" @click="jumpDl">模板下载
-                        </el-button>
+<!--                        <el-button type="primary" icon="search" @click="jumpDl">模板下载-->
+<!--                        </el-button>-->
                     </el-button-group>
 
                 </el-form-item>
diff --git a/src/views/basic/UdiInfoImport.vue b/src/views/basic/UdiInfoImport.vue
index af1f053..17b7a9c 100644
--- a/src/views/basic/UdiInfoImport.vue
+++ b/src/views/basic/UdiInfoImport.vue
@@ -30,8 +30,8 @@
                         >
                             <el-button size="mini" type="primary">导入器械信息</el-button>
                         </el-upload>
-                        <el-button type="primary" icon="search" @click="jumpDl">模板下载
-                        </el-button>
+<!--                        <el-button type="primary" icon="search" @click="jumpDl">模板下载-->
+<!--                        </el-button>-->
                     </el-button-group>
                 </el-form-item>
             </el-row>
diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue
index 1d4d370..d03c8fb 100644
--- a/src/views/basic/basicCompanyProducts.vue
+++ b/src/views/basic/basicCompanyProducts.vue
@@ -157,14 +157,20 @@
                         <!--</el-button>-->
                         <!--:disabled="scope.row.tyshxydm == null"-->
                         <el-button
-                            v-if="isSpCombine"
+                            v-if="scope.row.lockStatus!=3"
                             type="text"
                             size="small"
                             :disabled="scope.row.lockStatus===3"
                             @click.native.stop="handleModifyClick(scope.row)"
                         >编辑
                         </el-button>
-
+                        <el-button
+                            v-if=" scope.row.lockStatus==3"
+                            type="text"
+                            size="small"
+                            @click.native.stop="handleDetailClick(scope.row)"
+                        >详情
+                        </el-button>
                         <el-button
                             v-if="isSpCombine"
                             type="text"
@@ -174,13 +180,6 @@
                         >提交审核
                         </el-button>
 
-                        <el-button
-                            v-if="!isSpCombine"
-                            type="text"
-                            size="small"
-                            @click.native.stop="handleDetailClick(scope.row)"
-                        >详情
-                        </el-button>
 
                         <el-button type="text" size="small"
                                    @click.native.stop="deleteCompanyProductRelevance(scope.row)"
@@ -649,7 +648,6 @@
                     </el-button>
                 </div>
             </el-dialog>
-
             <el-dialog
                 title="产品信息详情"
                 :visible.sync="detailDialogVisible"
@@ -660,6 +658,99 @@
             >
 
 
+                <el-card>
+                    <el-table :data="sysList" style="width: 100%" border>
+                        <el-table-column label="序号" type="index"></el-table-column>
+                        <el-table-column
+                            label="系统名称"
+                            prop="sysName"
+                            show-overflow-tooltip
+                        ></el-table-column>
+                        <el-table-column
+                            label="产品编码"
+                            prop="thirdId"
+                            show-overflow-tooltip
+                        ></el-table-column>
+                        <el-table-column
+                            label="产品名称"
+                            prop="thirdName"
+                            show-overflow-tooltip
+                        ></el-table-column>
+                        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+                        <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+                        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+
+                        <el-table-column label="操作" fixed="right">
+                            <template slot-scope="scope">
+                                <el-button
+                                    type="text"
+                                    size="small"
+                                    @click="addSelectErp(scope.row)"
+                                    disabled
+                                >关联
+                                </el-button
+                                >
+                                <el-button type="text" size="small" @click.native.stop="removeErp(scope.row)"
+                                           disabled
+                                >解绑
+                                </el-button>
+                                <!--                                :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''"-->
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-card>
+                <el-card>
+                    <div style=" float: left;
+                        text-align: left;
+                        font-weight: bold;
+                        margin-bottom: 8px"
+                    >
+                        <span>产品标识:</span>
+
+
+                    </div>
+                    <div style=" float: right;
+                        text-align: right;
+                        margin-bottom: 8px;"
+                    >
+                        <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1"
+                                   style="text-align:right" disabled
+                        >解绑DI器械信息
+                        </el-button
+                        >
+
+                    </div>
+
+                    <el-table
+                        v-loading="loading"
+                        :data="detailList"
+                        style="width: 100%; margin-top: 20px"
+                        border
+                        @current-change="handleDetail"
+                    >
+                        <el-table-column
+                            label="产品标识"
+                            prop="nameCode"
+                            show-overflow-tooltip
+                        ></el-table-column>
+
+                        <el-table-column
+                            label="产品通用名"
+                            prop="cpmctymc"
+                            show-overflow-tooltip
+                        ></el-table-column>
+                        <el-table-column
+                            label="包装级别"
+                            prop="packLevel"
+                            show-overflow-tooltip
+                        ></el-table-column>
+                        <el-table-column
+                            label="包装层级"
+                            prop="bzcj"
+                            show-overflow-tooltip
+                        ></el-table-column>
+                    </el-table>
+                </el-card>
                 <el-form
                     :model="editQuery"
                     :rules="rules"
@@ -708,7 +799,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="true"
+                                    :disabled="false"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.ggxh"
@@ -723,7 +814,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="true"
+                                    :disabled="false"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.qxlb"
@@ -739,7 +830,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="true"
+                                    :disabled="false"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.cplb"
@@ -753,7 +844,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="true"
+                                    :disabled="false"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.flbm"
@@ -770,7 +861,7 @@
                                     <span>商品条码:&nbsp;</span>
                                 </div>
                                 <el-input
-                                    style="width: 65%" :disabled="true"
+                                    style="width: 65%"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.sptm"
@@ -784,7 +875,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    size="small" :disabled="true"
+                                    size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.ybbm"
                                 ></el-input>
@@ -800,7 +891,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="true"
+                                    :disabled="false"
                                     size="small"
                                     splaceholder="ylqxzcrbarmc"
                                     v-model="editQuery.ylqxzcrbarmc"
@@ -814,7 +905,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="true"
+                                    :disabled="false"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.ylqxzcrbarywmc"
@@ -832,7 +923,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="true"
+                                    :disabled="false"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.tyshxydm"
@@ -846,7 +937,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="true"
+                                    :disabled="false"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.zczbhhzbapzbh"
@@ -960,7 +1051,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
+                                    :disabled="false"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.zxxsbzbhsydysl"
@@ -974,7 +1065,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
+                                    :disabled="false"
                                     size="small"
                                     splaceholder="请输入内容"
                                 ></el-input>
@@ -1011,7 +1102,6 @@
                 </el-form>
 
             </el-dialog>
-
             <el-dialog
                 title="关联选入器械信息"
                 :visible.sync="selectUdiDialogVisible"
@@ -1056,7 +1146,6 @@
                     @closeUdi="closeUdi"
                 ></selectLocalUdi>
             </el-dialog>
-
             <el-dialog
                 title="选入产品信息"
                 :visible.sync="selectProductVisible"
@@ -1070,7 +1159,6 @@
                     :uuid="uuid"
                 ></selectProduct>
             </el-dialog>
-
             <el-pagination
                 :page-size="filterQuery.limit"
                 @current-change="handleCurrentChange"
@@ -1128,7 +1216,7 @@ export default {
                 thirdId: "",
                 isDisable: null,
                 isUseDy: false,
-                isAdavence:null,
+                isAdavence: null,
             },
             productType: null,
             defaultSys: null,
@@ -1489,7 +1577,7 @@ export default {
                 // thirdId: row.thirdId,
                 isUseDy: row.isUseDy,
                 isDisable: row.isDisable,
-                isAdavence:row.isAdavence,
+                isAdavence: row.isAdavence,
             };
             this.checked = row.isUseDy == 1;
 
diff --git a/src/views/thrsys/ThrCorpsImport.vue b/src/views/thrsys/ThrCorpsImport.vue
index 7e6b6f4..81ed55d 100644
--- a/src/views/thrsys/ThrCorpsImport.vue
+++ b/src/views/thrsys/ThrCorpsImport.vue
@@ -44,9 +44,9 @@
                         >
                             <el-button size="mini" type="primary">导入往来单位</el-button>
                         </el-upload>
-                        <el-button type="primary" icon="search" @click="jumpDl"
-                                   v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载
-                        </el-button>
+<!--                        <el-button type="primary" icon="search" @click="jumpDl"-->
+<!--                                   v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载-->
+<!--                        </el-button>-->
                         <el-button type="primary" icon="search" @click="downloadCorps"
                                    v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
                             下载往来单位
diff --git a/src/views/thrsys/ThrOrderImport.vue b/src/views/thrsys/ThrOrderImport.vue
index 4eeb115..4d0fb24 100644
--- a/src/views/thrsys/ThrOrderImport.vue
+++ b/src/views/thrsys/ThrOrderImport.vue
@@ -44,9 +44,9 @@
                         >
                             <el-button size="mini" type="primary">导入业务单据</el-button>
                         </el-upload>
-                        <el-button type="primary" icon="search" @click="jumpDl"
-                                  >模板下载
-                        </el-button>
+<!--                        <el-button type="primary" icon="search" @click="jumpDl"-->
+<!--                                  >模板下载-->
+<!--                        </el-button>-->
                         <el-button type="primary" icon="search" @click="downloadOrderss"
                                    v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
                             下载业务单据
diff --git a/src/views/thrsys/ThrProductsImport.vue b/src/views/thrsys/ThrProductsImport.vue
index 755eaaa..843fbdf 100644
--- a/src/views/thrsys/ThrProductsImport.vue
+++ b/src/views/thrsys/ThrProductsImport.vue
@@ -43,9 +43,9 @@
                         >
                             <el-button size="mini" type="primary">导入产品信息</el-button>
                         </el-upload>
-                        <el-button type="primary" icon="search" @click="jumpDl"
-                                   >模板下载
-                        </el-button>
+<!--                        <el-button type="primary" icon="search" @click="jumpDl"-->
+<!--                                   >模板下载-->
+<!--                        </el-button>-->
                         <el-button type="primary" icon="search" @click="downloadProducts"
                                    v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
                             下载产品信息
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index e4fd729..eb56ffa 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -10,7 +10,33 @@
             >
                 <el-row style="width: 100%">
                     <el-form-item class="query-form-item">
-                        <el-input v-model="query.billNo" placeholder="单据号"></el-input>
+                        <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.localName"
+                                :label="item.localName"
+                                :value="item.localAction">
+                                <span style="float: left">{{ item.localName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
+                            <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-form-item class="query-form-item">
                         <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 1402bc0..aeed642 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -1,312 +1,338 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form
-                :inline="true"
-                :model="query"
-                class="query-form"
-                size="mini"
+  <div>
+    <el-card class="el-card">
+      <el-form
+          :inline="true"
+          :model="query"
+          class="query-form"
+          size="mini"
 
+      >
+        <el-row style="width: 100%">
+          <el-form-item class="query-form-item">
+            <el-input v-model="query.billNo" placeholder="单据号"></el-input>
+          </el-form-item>
+          <!--                    <el-form-item class="query-form-item">-->
+          <!--                        <el-select v-model="query.status" placeholder="单据状态">-->
+          <!--                            <el-option label="全部" value=""></el-option>-->
+          <!--                            <el-option label="草稿" value="1"></el-option>-->
+          <!--                            <el-option label="未配货" value="2"></el-option>-->
+          <!--                            <el-option label="待校验" value="3"></el-option>-->
+          <!--                            <el-option label="已校验" value="4"></el-option>-->
+          <!--                        </el-select>-->
+          <!--                    </el-form-item>-->
+          <el-form-item class="query-form-item">
+            <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
+              <el-option
+                  v-for="item in busTypes"
+                  :key="item.localName"
+                  :label="item.localName"
+                  :value="item.localAction">
+                <span style="float: left">{{ item.localName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item class="query-form-item">
+            <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
+              <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-form-item class="query-form-item">
+            <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+            <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
             >
-                <el-row style="width: 100%">
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="query.billNo" placeholder="单据号"></el-input>
-                    </el-form-item>
-                    <!--                    <el-form-item class="query-form-item">-->
-                    <!--                        <el-select v-model="query.status" placeholder="单据状态">-->
-                    <!--                            <el-option label="全部" value=""></el-option>-->
-                    <!--                            <el-option label="草稿" value="1"></el-option>-->
-                    <!--                            <el-option label="未配货" value="2"></el-option>-->
-                    <!--                            <el-option label="待校验" value="3"></el-option>-->
-                    <!--                            <el-option label="已校验" value="4"></el-option>-->
-                    <!--                        </el-select>-->
-                    <!--                    </el-form-item>-->
-                    <el-form-item class="query-form-item">
-                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
-                        <el-date-picker
-                            :picker-options="pickerOptions"
-                            v-model="actDateRange"
-                            type="daterange"
-                            format="yyyy 年 MM 月 dd 日"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button-group>
-                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-                        </el-button-group>
-                    </el-form-item>
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+            </el-button-group>
+          </el-form-item>
 
-                </el-row>
-            </el-form>
-            <el-table v-loading="loading"
-                      :data="list"
-                      style="width: 100%; " highlight-current-row
-                      @row-click="getStockOrderDetailList" ref="multipleTable">
-                <el-table-column
-                    type="selection"
-                    width="55">
-                </el-table-column>
-                <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
-                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="单据来源" prop="sourceType" width="150">
-                    <template slot-scope="scope">
-                        <span>{{ sourceMap[scope.row.sourceType] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="单据日期" prop="billdate"></el-table-column>
-                <el-table-column label="单据状态">
-                    <template slot-scope="scope">
-                        {{ scope.row.status | statusFilterName }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="业务类型" prop="billType">
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.billType) }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
-                    <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                    </template>
-                </el-table-column>
-<!--                <el-table-column label="采购类型">-->
-<!--                    <template slot-scope="scope">-->
-<!--                        {{ scope.row.type | typeFilterName }}-->
-<!--                    </template>-->
-<!--                </el-table-column>-->
-                <el-table-column label="操作" fixed="right" width="200">
-                    <template slot-scope="scope">
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native="qrcodeDetail(scope.row)"-->
-                        <!--                        >码详情-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native="printOrder(scope.row)"-->
-                        <!--                            v-if="haveDistributionVisible"-->
-                        <!--                        >打印订单-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
+        </el-row>
+      </el-form>
+      <el-table v-loading="loading"
+                :data="list"
+                style="width: 100%; " highlight-current-row
+                @row-click="getStockOrderDetailList" ref="multipleTable">
+        <el-table-column
+            type="selection"
+            width="55">
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="单据来源" prop="sourceType" width="150">
+          <template slot-scope="scope">
+            <span>{{ sourceMap[scope.row.sourceType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单据日期" prop="billdate"></el-table-column>
+        <el-table-column label="单据状态">
+          <template slot-scope="scope">
+            {{ scope.row.status | statusFilterName }}
+          </template>
+        </el-table-column>
+        <el-table-column label="业务类型" prop="billType">
+          <template slot-scope="scope">
+            <span>{{ getActionName(scope.row.billType) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+          <template slot-scope="scope">
+            <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+          </template>
+        </el-table-column>
+        <!--                <el-table-column label="采购类型">-->
+        <!--                    <template slot-scope="scope">-->
+        <!--                        {{ scope.row.type | typeFilterName }}-->
+        <!--                    </template>-->
+        <!--                </el-table-column>-->
+        <el-table-column label="操作" fixed="right" width="200">
+          <template slot-scope="scope">
+            <!--                        <el-button-->
+            <!--                            type="text"-->
+            <!--                            size="small"-->
+            <!--                            @click.native="qrcodeDetail(scope.row)"-->
+            <!--                        >码详情-->
+            <!--                        </el-button-->
+            <!--                        >-->
+            <!--                        <el-button-->
+            <!--                            type="text"-->
+            <!--                            size="small"-->
+            <!--                            @click.native="printOrder(scope.row)"-->
+            <!--                            v-if="haveDistributionVisible"-->
+            <!--                        >打印订单-->
+            <!--                        </el-button-->
+            <!--                        >-->
 
-                        <div v-if="scope.row.enableSupplementOrder">
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native="supplementOrder(scope.row)">
-                                补单
-                            </el-button>
-                        </div>
-                    </template>
-                </el-table-column>
-            </el-table>
+            <div v-if="scope.row.enableSupplementOrder">
+              <el-button
+                  type="text"
+                  size="small"
+                  @click.native="supplementOrder(scope.row)">
+                补单
+              </el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
 
-            <el-pagination
-                :page-size="query.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-            >
-            </el-pagination>
-        </el-card>
+      <el-pagination
+          :page-size="query.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+      >
+      </el-pagination>
+    </el-card>
 
-        <el-card class="el-card">
-            <el-table v-loading="detailLoading"
-                      :data="detailList"
-                      style="width: 100%">
-                <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="产品通用名" prop="productName"></el-table-column>
-                <el-table-column label="包装规格" prop="spec"></el-table-column>
-                <el-table-column label="批次号" prop="batchNo"></el-table-column>
-                <el-table-column label="生产日期" prop="productDate"></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-                <el-table-column label="单据数量" prop="count"></el-table-column>
-                <el-table-column label="实际数量" prop="reCount"></el-table-column>
-                <el-table-column label="价格" prop="price"></el-table-column>
-            </el-table>
+    <el-card class="el-card">
+      <el-table v-loading="detailLoading"
+                :data="detailList"
+                style="width: 100%">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="产品通用名" prop="productName"></el-table-column>
+        <el-table-column label="包装规格" prop="spec"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="单据数量" prop="count"></el-table-column>
+        <el-table-column label="实际数量" prop="reCount"></el-table-column>
+        <el-table-column label="价格" prop="price"></el-table-column>
+      </el-table>
 
-            <el-pagination
-                :page-size="detailQuery.limit"
-                @current-change="detailHandleCurrentChange"
-                layout="prev, pager, next"
-                :total="detailTotal"
-            >
-            </el-pagination>
-        </el-card>
+      <el-pagination
+          :page-size="detailQuery.limit"
+          @current-change="detailHandleCurrentChange"
+          layout="prev, pager, next"
+          :total="detailTotal"
+      >
+      </el-pagination>
+    </el-card>
 
 
-        <el-dialog
-            title="配货"
-            :visible.sync="distributionVisible"
-            width="60%"
-            v-if="distributionVisible"
-            @close='closeDialog'
-        >
-            <stockOrderDistribution
-                :closeDialog="closeDialog"
-                :idQuery="idQuery"
-            ></stockOrderDistribution>
-        </el-dialog>
+    <el-dialog
+        title="配货"
+        :visible.sync="distributionVisible"
+        width="60%"
+        v-if="distributionVisible"
+        @close='closeDialog'
+    >
+      <stockOrderDistribution
+          :closeDialog="closeDialog"
+          :idQuery="idQuery"
+      ></stockOrderDistribution>
+    </el-dialog>
 
-        <el-dialog
-            title="编辑"
-            :visible.sync="detailFormVisible"
-            :before-close="hideDetailForm"
-            width="85%"
-            top="5vh"
-        >
-            <el-form :model="detailFormData" :rules="detailFormRules" ref="dataForm">
+    <el-dialog
+        title="编辑"
+        :visible.sync="detailFormVisible"
+        :before-close="hideDetailForm"
+        width="85%"
+        top="5vh"
+    >
+      <el-form :model="detailFormData" :rules="detailFormRules" ref="dataForm">
 
-                <el-row :gutter="20">
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>产品通用名：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item prop="productName">
-                            <el-input v-model="detailFormData.productName" 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="spec">
-                            <el-input v-model="detailFormData.spec" auto-complete="off" :disabled="true"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>单据数量：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item prop="count">
-                            <el-input v-model="detailFormData.count" 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="reCount">
-                            <el-input v-model="detailFormData.reCount" auto-complete="off" :disabled="true"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>生产日期：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item prop="productDate">
-                            <el-input v-model="detailFormData.productDate" auto-complete="off"
-                                      :disabled="false"></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="expireDate">
-                            <el-input v-model="detailFormData.expireDate" auto-complete="off"
-                                      :disabled="false"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>批次号：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item prop="batchNo">
-                            <el-input v-model="detailFormData.batchNo" auto-complete="off" :disabled="false"></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="sweepCount">
-                            <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"
-                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click.native="hideDetailForm">取消</el-button>
-                <el-button
-                    type="primary"
-                    @click.native="submitUploadDetail()"
-                    :loading="detailFormLoading"
-                >提交
-                </el-button
-                >
+        <el-row :gutter="20">
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>产品通用名：</span>
             </div>
-        </el-dialog>
-
-        <el-dialog
-            title="码详情"
-            :visible.sync="qrcodeDetailVisible"
-            width="70%"
-            v-if="qrcodeDetailVisible"
-            @close='closeQRCodeDetailDialog'
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="productName">
+              <el-input v-model="detailFormData.productName" 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="spec">
+              <el-input v-model="detailFormData.spec" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>单据数量：</span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="count">
+              <el-input v-model="detailFormData.count" 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="reCount">
+              <el-input v-model="detailFormData.reCount" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>生产日期：</span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="productDate">
+              <el-input v-model="detailFormData.productDate" auto-complete="off"
+                        :disabled="false"></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="expireDate">
+              <el-input v-model="detailFormData.expireDate" auto-complete="off"
+                        :disabled="false"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>批次号：</span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="batchNo">
+              <el-input v-model="detailFormData.batchNo" auto-complete="off" :disabled="false"></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="sweepCount">
+              <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="hideDetailForm">取消</el-button>
+        <el-button
+            type="primary"
+            @click.native="submitUploadDetail()"
+            :loading="detailFormLoading"
+        >提交
+        </el-button
         >
-            <stockOrderQRCodeDetail
-                :closeDialog="closeQRCodeDetailDialog"
-                :idQuery="idQuery"
-            ></stockOrderQRCodeDetail>
-        </el-dialog>
+      </div>
+    </el-dialog>
 
-        <el-dialog
-            title="码管理"
-            :visible.sync="qrcodeExportVisible"
-            width="60%"
-            v-if="qrcodeExportVisible"
-            @close='closeQRCodeExportDialog'
-        >
-            <stockQRCodeExport
-                :closeDialog="closeQRCodeExportDialog"
-                :idQuery="idQuery"
-            ></stockQRCodeExport>
-        </el-dialog>
-    </div>
+    <el-dialog
+        title="码详情"
+        :visible.sync="qrcodeDetailVisible"
+        width="70%"
+        v-if="qrcodeDetailVisible"
+        @close='closeQRCodeDetailDialog'
+    >
+      <stockOrderQRCodeDetail
+          :closeDialog="closeQRCodeDetailDialog"
+          :idQuery="idQuery"
+      ></stockOrderQRCodeDetail>
+    </el-dialog>
+
+    <el-dialog
+        title="码管理"
+        :visible.sync="qrcodeExportVisible"
+        width="60%"
+        v-if="qrcodeExportVisible"
+        @close='closeQRCodeExportDialog'
+    >
+      <stockQRCodeExport
+          :closeDialog="closeQRCodeExportDialog"
+          :idQuery="idQuery"
+      ></stockQRCodeExport>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    stockOrderList, stockOrderDetail,
-    deleteStockOrderById, deleteStockOrderDetailById,
-    copyStockOrderDetail, submitStockOrder,
-    uploadStockOrderDetail, uploadStockOrderDetailCount,
-    generateStockOrderQRCodeText, supplementOrder
+  stockOrderList, stockOrderDetail,
+  deleteStockOrderById, deleteStockOrderDetailById,
+  copyStockOrderDetail, submitStockOrder,
+  uploadStockOrderDetail, uploadStockOrderDetailCount,
+  generateStockOrderQRCodeText, supplementOrder
 } from "../../api/warehouse/stockOrder";
 import stockOrderDistribution from "./stockOrderDistribution";
 import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
@@ -318,455 +344,458 @@ import {getLocalJoinBusType} from "../../api/basic/busLocalType";
 import {filterAll} from "@/api/basic/invWarehouse";
 
 export default {
-    name: "stockOrderDelSearch",
-    data() {
-        return {
-            query: {
-                startTime: "",
-                endTime: "",
-                billNo: "",
-                status: 5,
-                page: 1,
-                limit: 10
-            },
-            detailQuery: {
-                orderIdFk: "",
-                page: 1,
-                limit: 20
-            },
-            busTypes: [],
-            list: [],
-            detailList: [],
-            total: 0,
-            detailTotal: 0,
-            storageList: [],
-            loading: false,
-            detailLoading: false,
-            idQuery: {
-                id: "",
-            },
-            distributionVisible: false,
-            detailFormRules: {
-                batchNo: [
-                    {required: true, message: "请输入批次号", trigger: "blur"}
-                ],
-                productDate: [
-                    {required: true, message: "请输入生产日期", trigger: "blur"}
-                ],
-                expireDate: [
-                    {required: true, message: "请输入失效日期", trigger: "blur"}
-                ],
-                sweepCount: [
-                    {required: true, message: "请输入扫码数量", trigger: "blur"}
-                ]
+  name: "stockOrderDelSearch",
+  data() {
+    return {
+      query: {
+        billType: null,
+        corpName: null,
+        locStorageCode: null,
+        startTime: "",
+        endTime: "",
+        billNo: "",
+        status: 5,
+        page: 1,
+        limit: 10
+      },
+      detailQuery: {
+        orderIdFk: "",
+        page: 1,
+        limit: 20
+      },
+      busTypes: [],
+      list: [],
+      detailList: [],
+      total: 0,
+      detailTotal: 0,
+      storageList: [],
+      loading: false,
+      detailLoading: false,
+      idQuery: {
+        id: "",
+      },
+      distributionVisible: false,
+      detailFormRules: {
+        batchNo: [
+          {required: true, message: "请输入批次号", trigger: "blur"}
+        ],
+        productDate: [
+          {required: true, message: "请输入生产日期", trigger: "blur"}
+        ],
+        expireDate: [
+          {required: true, message: "请输入失效日期", trigger: "blur"}
+        ],
+        sweepCount: [
+          {required: true, message: "请输入扫码数量", trigger: "blur"}
+        ]
+      },
+      sourceMap: {
+        "1": "网页新增",
+        "2": "第三方系统",
+        "3": "扫码单据",
+      },
+      detailFormVisible: false,
+      detailFormData: {},
+      detailFormLoading: false,
+      haveDistributionVisible: true,
+      qrcodeDetailVisible: false,
+      qrcodeExportVisible: false,
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            sourceMap: {
-                "1": "网页新增",
-                "2": "第三方系统",
-                "3": "扫码单据",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            detailFormVisible: false,
-            detailFormData: {},
-            detailFormLoading: false,
-            haveDistributionVisible: true,
-            qrcodeDetailVisible: false,
-            qrcodeExportVisible: false,
-            actDateRange: [],
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-        }
+          },
+        ],
+      },
+    }
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.query = {
+        billNo: "",
+        status: 5,
+        startTime: "",
+        endTime: "",
+        page: 1,
+        limit: 10
+      };
+      this.getList();
+      this.haveDistributionVisible = true;
+      this.actDateRange = [];
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: ""
-            });
-            this.query = {
-                billNo: "",
-                status: 5,
-                startTime: "",
-                endTime: "",
-                page: 1,
-                limit: 10
-            };
-            this.getList();
-            this.haveDistributionVisible = true;
-            this.actDateRange = [];
-        },
-        onSubmit() {
-            if (this.actDateRange !== null) {
-                this.query.startTime = this.actDateRange[0];
-                this.query.endTime = this.actDateRange[1];
-            } else {
-                this.query.startTime = null;
-                this.query.endTime = null;
-            }
-            this.getList();
-            if (this.query.status === "202" || this.query.status === "502") {
-                this.haveDistributionVisible = true;
-            } else {
-                this.haveDistributionVisible = false;
-            }
-        },
-        handleCurrentChange(val) {
-            this.query.page = val;
-            this.getList();
-        },
-        detailHandleCurrentChange(val) {
-            this.query.page = val;
-            this.getStockOrderDetailList();
-        },
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.query.startTime = this.actDateRange[0];
+        this.query.endTime = this.actDateRange[1];
+      } else {
+        this.query.startTime = null;
+        this.query.endTime = null;
+      }
+      this.getList();
+      if (this.query.status === "202" || this.query.status === "502") {
+        this.haveDistributionVisible = true;
+      } else {
+        this.haveDistributionVisible = false;
+      }
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
+    detailHandleCurrentChange(val) {
+      this.query.page = val;
+      this.getStockOrderDetailList();
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
         // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    getList() {
+      this.loading = true;
+      this.query.corpId = store.getters.customerId;
+      stockOrderList(this.query)
+          .then(response => {
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.detailList = [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+            this.detailList = [];
+          });
+    },
+    distributionForm(index, row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.distributionVisible = true;
+      }
+    },
+    closeDialog(type) {
+      this.distributionVisible = false;
+      this.getList();
+      if (this.$isNotBlank(type)) {
+        this.detailList = [];
+      }
+    },
+    printQRCodeText(row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.qrcodeExportVisible = true;
+      }
+    },
+    printOrder(row) {
+      let tQuery = {queryId: row.id,}
+      this.loading = true;
+      inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
+        if (response.code === 20000) {
+          tQuery = {
+            id: row.id,
+          }
+          stockOrderPDFFromTemplateFile(tQuery).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+                new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+          }).catch(() => {
+            this.loading = false;
+          });
+        } else {
+          this.loading = false;
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    closeQRCodeExportDialog() {
+      this.qrcodeExportVisible = false;
+      this.getList();
+    },
+    qrcodeDetail(row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.qrcodeDetailVisible = true;
+      }
+    },
+    closeQRCodeDetailDialog() {
+      this.qrcodeDetailVisible = false;
+      this.getList();
+    },
+    getStockOrderDetailList(row) {
+      if (this.$isNotBlank(row)) {
+        this.detailQuery.orderIdFk = row.id;
+      }
+      this.detailLoading = true;
+      stockOrderDetail(this.detailQuery)
+          .then((response) => {
+            console.log(response)
+            this.detailLoading = false;
+            this.detailList = response.data.list || [];
+          })
+          .catch(() => {
+            this.detailLoading = false;
+            this.detailList = [];
+          });
+    },
+    deleteStockOrder(row) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        deleteStockOrderById({id: row.id})
+            .then(response => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.$message.success(response.data);
                 this.getList();
-            }
-        },
-        getList() {
-            this.loading = true;
-            this.query.corpId = store.getters.customerId;
-            stockOrderList(this.query)
-                .then(response => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.detailList = [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                    this.detailList = [];
-                });
-        },
-        distributionForm(index, row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.distributionVisible = true;
-            }
-        },
-        closeDialog(type) {
-            this.distributionVisible = false;
-            this.getList();
-            if (this.$isNotBlank(type)) {
                 this.detailList = [];
-            }
-        },
-        printQRCodeText(row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.qrcodeExportVisible = true;
-            }
-        },
-        printOrder(row) {
-            let tQuery = {queryId: row.id,}
-            this.loading = true;
-            inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
-                if (response.code === 20000) {
-                    tQuery = {
-                        id: row.id,
-                    }
-                    stockOrderPDFFromTemplateFile(tQuery).then((response) => {
-                        //将pdf文件转换为url。
-                        const binaryData = [];
-                        binaryData.push(response);
-                        //获取blob链接。
-                        let url = window.URL.createObjectURL(
-                            new Blob(binaryData, {type: "application/pdf"})
-                        );
-                        this.loading = false;
-                        window.open(url);//打开新标签页，预览pdf。
-                    }).catch(() => {
-                        this.loading = false;
-                    });
-                } else {
-                    this.loading = false;
-                    this.$message.error(response.message);
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        closeQRCodeExportDialog() {
-            this.qrcodeExportVisible = false;
-            this.getList();
-        },
-        qrcodeDetail(row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.qrcodeDetailVisible = true;
-            }
-        },
-        closeQRCodeDetailDialog() {
-            this.qrcodeDetailVisible = false;
-            this.getList();
-        },
-        getStockOrderDetailList(row) {
-            if (this.$isNotBlank(row)) {
-                this.detailQuery.orderIdFk = row.id;
-            }
-            this.detailLoading = true;
-            stockOrderDetail(this.detailQuery)
-                .then((response) => {
-                    console.log(response)
-                    this.detailLoading = false;
-                    this.detailList = response.data.list || [];
-                })
-                .catch(() => {
-                    this.detailLoading = false;
-                    this.detailList = [];
-                });
-        },
-        deleteStockOrder(row) {
-            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.loading = true;
-                deleteStockOrderById({id: row.id})
-                    .then(response => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success(response.data);
-                            this.getList();
-                            this.detailList = [];
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                    })
-            }).catch(() => {
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            })
+      }).catch(() => {
 
+      });
+    },
+    copyDetail(row) {
+      this.$confirm("是否复制该记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let tQuery = {
+          id: row.id
+        }
+        this.detailLoading = true;
+        copyStockOrderDetail(tQuery)
+            .then((response) => {
+              this.detailLoading = false;
+              if (response.code === 20000) {
+                this.$message.success("复制成功");
+                this.getStockOrderDetailList();
+              } else {
+                this.$message.error(response.message);
+              }
             });
-        },
-        copyDetail(row) {
-            this.$confirm("是否复制该记录?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                let tQuery = {
-                    id: row.id
-                }
-                this.detailLoading = true;
-                copyStockOrderDetail(tQuery)
-                    .then((response) => {
-                        this.detailLoading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("复制成功");
-                            this.getStockOrderDetailList();
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
-            }).catch(() => {
-            });
-        },
-        deleteStockOrderDetail(row) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.detailLoading = true;
-                deleteStockOrderDetailById({id: row.id})
-                    .then(response => {
-                        this.detailLoading = false;
-                        if (response.code === 20000) {
-                            this.$message.success(response.data);
-                            this.getStockOrderDetailList();
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.detailLoading = false;
-                    })
-            }).catch(() => {
+      }).catch(() => {
+      });
+    },
+    deleteStockOrderDetail(row) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.detailLoading = true;
+        deleteStockOrderDetailById({id: row.id})
+            .then(response => {
+              this.detailLoading = false;
+              if (response.code === 20000) {
+                this.$message.success(response.data);
+                this.getStockOrderDetailList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.detailLoading = false;
+            })
+      }).catch(() => {
 
-            });
-        },
-        // 显示表单
-        handleDetailForm(index, row) {
-            this.detailFormVisible = true;
-            this.detailFormData = {};
-            if (row !== null) {
-                this.detailFormData = Object.assign({}, row);
-            }
-        },
-        hideDetailForm() {
-            // 更改值
-            this.detailFormVisible = !this.detailFormVisible;
-            return true;
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].localAction === action) {
-                    return this.busTypes[i].localName;
-                }
-            }
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getLocalJoinBusType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
-                })
-                .catch(() => {
-                });
-        },
-        submitUploadDetail() {
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
-                    this.detailLoading = true;
-                    let tQuery = this.detailFormData;
-                    uploadStockOrderDetail(tQuery).then((response) => {
-                        this.detailLoading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("修改完成");
-                            this.hideDetailForm();
-                            this.getStockOrderDetailList();
-                        } else {
-                            this.$alert(response.message, '提示', {
-                                confirmButtonText: '确定',
-                                type: 'warning',
-                                closeOnClickModal: true,
-                                callback: action => {
-                                    this.$refs.inputRef.focus();
-                                }
-                            });
-                        }
-                    });
-                }
-            });
-        },
-        getStorageName(code) {
-            for (let i = 0; i < this.storageList.length; i++) {
-                if (this.storageList[i].code === code) {
-                    return this.storageList[i].name;
-                }
-            }
-        },
-        getStorage() {
-            this.storageList = [];
-            filterAll()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
-        supplementOrder(row) {
-            this.$confirm('是否确认补单?', '提示', {
+      });
+    },
+    // 显示表单
+    handleDetailForm(index, row) {
+      this.detailFormVisible = true;
+      this.detailFormData = {};
+      if (row !== null) {
+        this.detailFormData = Object.assign({}, row);
+      }
+    },
+    hideDetailForm() {
+      // 更改值
+      this.detailFormVisible = !this.detailFormVisible;
+      return true;
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].localAction === action) {
+          return this.busTypes[i].localName;
+        }
+      }
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getLocalJoinBusType(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.filterQuery.billAction = this.busTypes[0].action;
+            // this.getList();
+          })
+          .catch(() => {
+          });
+    },
+    submitUploadDetail() {
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          this.detailLoading = true;
+          let tQuery = this.detailFormData;
+          uploadStockOrderDetail(tQuery).then((response) => {
+            this.detailLoading = false;
+            if (response.code === 20000) {
+              this.$message.success("修改完成");
+              this.hideDetailForm();
+              this.getStockOrderDetailList();
+            } else {
+              this.$alert(response.message, '提示', {
                 confirmButtonText: '确定',
-                cancelButtonText: '取消',
                 type: 'warning',
-                center: true,
-            }).then(() => {
-                this.$message({
-                    type: 'success',
-                    message: '补单成功!'
-                });
-                //补单
-                let orderQuery = {
-                    billNo: row.billNo
+                closeOnClickModal: true,
+                callback: action => {
+                  this.$refs.inputRef.focus();
                 }
-                supplementOrder(orderQuery);
-            }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '取消补单'
-                });
-            });
+              });
+            }
+          });
         }
+      });
     },
-    components: {
-        draggable,
-        stockOrderDistribution,
-        stockOrderQRCodeDetail,
-        stockQRCodeExport,
+    getStorageName(code) {
+      for (let i = 0; i < this.storageList.length; i++) {
+        if (this.storageList[i].code === code) {
+          return this.storageList[i].name;
+        }
+      }
     },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "gray",
-                1: "success"
-            };
-            return statusMap[status];
-        },
-        statusFilterName(status) {
-            const statusMap = {
-                "1": "草稿",
-                "2": "未配货",
-                "3": "待校验",
-                "4": "已校验",
-                "5": "已核对",
-            };
-            return statusMap[status];
-        },
-        typeFilterName(type) {
-            const typeMap = {
-                1: "预入库",
-                2: "普通采购",
-            };
-            return typeMap[type];
+    getStorage() {
+      this.storageList = [];
+      filterAll()
+          .then((response) => {
+            this.storageList = response.data || [];
+          })
+          .catch(() => {
+          });
+    },
+    supplementOrder(row) {
+      this.$confirm('是否确认补单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        center: true,
+      }).then(() => {
+        this.$message({
+          type: 'success',
+          message: '补单成功!'
+        });
+        //补单
+        let orderQuery = {
+          billNo: row.billNo
         }
+        supplementOrder(orderQuery);
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消补单'
+        });
+      });
+    }
+  },
+  components: {
+    draggable,
+    stockOrderDistribution,
+    stockOrderQRCodeDetail,
+    stockQRCodeExport,
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "gray",
+        1: "success"
+      };
+      return statusMap[status];
     },
-    created() {
-        this.getStorage();
-        this.getBusType();
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
-        this.getList();
+    statusFilterName(status) {
+      const statusMap = {
+        "1": "草稿",
+        "2": "未配货",
+        "3": "待校验",
+        "4": "已校验",
+        "5": "已核对",
+      };
+      return statusMap[status];
+    },
+    typeFilterName(type) {
+      const typeMap = {
+        1: "预入库",
+        2: "普通采购",
+      };
+      return typeMap[type];
     }
+  },
+  created() {
+    this.getStorage();
+    this.getBusType();
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    this.getList();
+  }
 }
 </script>
 
diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index beecafd..7cf37a6 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -306,11 +306,21 @@
                             ></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column width="150"
-                                     label="单据数量"
-                                     prop="count"
-                                     show-overflow-tooltip
-                    ></el-table-column>
+                    <!--                    <el-table-column width="150"-->
+                    <!--                                     label="单据数量"-->
+                    <!--                                     prop="count"-->
+                    <!--                                     show-overflow-tooltip-->
+                    <!--                    ></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="注册/备案凭证号"
@@ -528,7 +538,7 @@ export default {
             currentRow: {},
             selectedIndex: "",
             selectProductVisible: false,
-            selectInvProductVisible:false,
+            selectInvProductVisible: false,
             thisData: {},
             storageList: [],
         };
@@ -776,7 +786,8 @@ export default {
             this.thisData = {};
 
             if (this.$isNotBlank(rData)) {
-                console.log(rData)
+                console.log(rData);
+                this.codeArray = [];
                 rData.forEach((obj, index) => {
                     if (this.codeArray.length === 0) {
                         this.codeArray.push(obj);
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 68598a2..15ffc66 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -21,6 +21,58 @@
                     <!--                            <el-option label="已校验" value="4"></el-option>-->
                     <!--                        </el-select>-->
                     <!--                    </el-form-item>-->
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.localName"
+                                :label="item.localName"
+                                :value="item.localAction">
+                                <span style="float: left">{{ item.localName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
+                            <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-form-item class="query-form-item">
+                        <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.localName"
+                                :label="item.localName"
+                                :value="item.localAction">
+                                <span style="float: left">{{ item.localName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
+                            <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-form-item class="query-form-item">
                         <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
                         <el-date-picker
@@ -337,6 +389,9 @@ export default {
     data() {
         return {
             query: {
+                billType:null,
+                corpName:null,
+                locStorageCode:null,
                 startTime: "",
                 endTime: "",
                 billNo: "",