diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue
index b9372ac..f1b6484 100644
--- a/src/views/business/stockOrder.vue
+++ b/src/views/business/stockOrder.vue
@@ -27,21 +27,21 @@
                     <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"-->
+                    <!--                                   @change="invChange"-->
+                    <!--                                   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.locStorageCode"
-                                   @change="invChange"
-                                   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.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    @change="subInvChange"
                                    size="mini">
                             <el-option
@@ -378,13 +378,13 @@ import store from "../../store";
 import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
 import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
-import {convertDate} from  "@/utils/date"
+import {convertDate} from "@/utils/date"
 
 export default {
     name: "stockOrder",
     data() {
         return {
-            convertDateFun:convertDate,
+            convertDateFun: convertDate,
             query: {
                 billType: null,
                 corpName: null,
@@ -826,11 +826,14 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
+
                 })
                 .catch(() => {
                 });
@@ -898,7 +901,7 @@ export default {
     },
     created() {
         // 加载表格数据
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let end = new Date();
         let start = new Date();
diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue
index 80ae941..fab5b9e 100644
--- a/src/views/business/stockOrderDelSearch.vue
+++ b/src/views/business/stockOrderDelSearch.vue
@@ -27,21 +27,21 @@
                     <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"-->
+                    <!--                                   @change="invChange"-->
+                    <!--                                   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.locStorageCode"
-                                   @change="invChange"
-                                   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.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    @change="subInvChange"
                                    size="mini">
                             <el-option
@@ -879,11 +879,14 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+
+                filter:3,
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -1035,7 +1038,7 @@ export default {
         }
     },
     created() {
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let end = new Date();
         let start = new Date();
diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue
index 83625ed..edfba8d 100644
--- a/src/views/business/stockOrderEditor.vue
+++ b/src/views/business/stockOrderEditor.vue
@@ -26,21 +26,21 @@
                     <el-form-item class="query-form-item" v-if="isSp ==110">
                         <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"-->
+                    <!--                                   @change="invChange"-->
+                    <!--                                   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.locStorageCode"
-                                   @change="invChange"
-                                   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.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    @change="subInvChange"
                                    size="mini">
                             <el-option
@@ -645,11 +645,11 @@ export default {
                 this.query.startTime = null;
                 this.query.endTime = null;
             }
-            this.query.page=1
+            this.query.page = 1
             this.getList();
             //清空详情数据
-            this.detailQuery.page=1
-            this.detailTotal=0
+            this.detailQuery.page = 1
+            this.detailTotal = 0
             if (this.query.status === "202") {
                 this.haveDistributionVisible = true;
             } else {
@@ -979,11 +979,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -1025,7 +1027,7 @@ export default {
         }
     },
     created() {
-        this.getStorage();
+        this.getSubInvList();
         this.getSysParm();
         this.getBusType();
         this.getList();
diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue
index 50109a2..dccca10 100644
--- a/src/views/business/stockOrderNew.vue
+++ b/src/views/business/stockOrderNew.vue
@@ -1,463 +1,463 @@
 <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>
+          <el-form-item class="query-form-item">
+            <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" v-if="isSp ==110">
+            <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"-->
+          <!--                                   @change="invChange">-->
+          <!--                            <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.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
+                       @change="subInvChange"
+                       size="mini">
+              <el-option
+                  v-for="item in subInvList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-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>
-                    <el-form-item class="query-form-item">
-                        <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" v-if="isSp ==110">
-                        <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"
-                                   @change="invChange">
-                            <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.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
-                                   @change="subInvChange"
-                                   size="mini">
-                            <el-option
-                                v-for="item in subInvList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
-                        <el-date-picker
-                            :picker-options="pickerOptions"
-                            v-model="actDateRange"
-                            type="daterange"
-                            format="yyyy 年 MM 月 dd 日"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-
-                    <el-form-item>
-                        <el-button-group>
-                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-                            <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
-                                新增订单
-                            </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" width="150" show-overflow-tooltip>
-
-                    <template slot-scope="scope">
-                        {{ scope.row.billdate.slice(0, 10) }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="单据状态" width="150">
-                    <template slot-scope="scope">
-                        {{ scope.row.status | statusFilterName }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="业务类型" prop="billTypeName" width="150">
-                </el-table-column>
-                <el-table-column label="当前仓库" prop="invName" width="150">
-                </el-table-column>
-                <el-table-column label="当前分库" prop="subInvName" width="120">
-                </el-table-column>
-                <el-table-column label="所属科室" prop="deptName" width="120">
-                </el-table-column>
-                <el-table-column label="操作" fixed="right" width="150">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="newDistributionForm(scope.$index, scope.row)"
-                            v-if="!haveNewDistributionVisible"
-                        >编辑
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="repealSubmit(scope.row)"
-                            v-if="haveNewDistributionVisible"
-                        >撤销提交
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="deleteStockOrder(scope.row)"
-                            v-if="!haveNewDistributionVisible"
-                        >删除
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <el-pagination
-                :page-size="query.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button-group>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+              <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
+                新增订单
+              </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" width="150" show-overflow-tooltip>
+
+          <template slot-scope="scope">
+            {{ scope.row.billdate.slice(0, 10) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="单据状态" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.status | statusFilterName }}
+          </template>
+        </el-table-column>
+        <el-table-column label="业务类型" prop="billTypeName" width="150">
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="150">
+        </el-table-column>
+        <el-table-column label="当前分库" prop="subInvName" width="120">
+        </el-table-column>
+        <el-table-column label="所属科室" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="150">
+          <template slot-scope="scope">
+            <el-button
+                type="text"
+                size="small"
+                @click.native="newDistributionForm(scope.$index, scope.row)"
+                v-if="!haveNewDistributionVisible"
+            >编辑
+            </el-button
             >
-            </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="产品通用名" width="150" prop="productName"></el-table-column>
-                <el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
-                <el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
-                <el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
-                <el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
-                <el-table-column label="单据数量" width="150" prop="count"></el-table-column>
-                <!--        <el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>-->
-                <el-table-column label="价格" width="150" prop="price"></el-table-column>
-                <el-table-column label="生产厂家" width="150" prop="ylqxzcrbarmc"></el-table-column>
-                <el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
-                <el-table-column label="操作" fixed="right" width="150">
-                    <template slot-scope="scope" v-if="!haveNewDistributionVisible">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="handleDetailForm(scope.$index, scope.row)"
-                        >编辑
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <el-pagination
-                :page-size="detailQuery.limit"
-                @current-change="detailHandleCurrentChange"
-                layout="prev, pager, next"
-                :total="detailTotal"
+            <el-button
+                type="text"
+                size="small"
+                @click.native="repealSubmit(scope.row)"
+                v-if="haveNewDistributionVisible"
+            >撤销提交
+            </el-button
             >
-            </el-pagination>
-        </el-card>
-
-        <el-dialog
-            title="编辑"
-            :visible.sync="newDistributionVisible"
-            width="80%"
-            v-if="newDistributionVisible"
-            @close='closeDialog'
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :before-close="handleClose"
-        >
-            <stockOrderNewDistribution
-                :closeDialog="closeDialog"
-                :idQuery="idQuery"
-                :closeConfirmFunction="closeConfirmFunction"
-            ></stockOrderNewDistribution>
-        </el-dialog>
-        <el-dialog
-            title="编辑"
-            :visible.sync="newSpDistributionVisible"
-            width="80%"
-            v-if="newSpDistributionVisible"
-            @close='closeDialog'
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :before-close="handleClose"
-        >
-            <stockHospOrderNew
-                :closeDialog="closeDialog"
-                :idQuery="idQuery"
-                :closeConfirmFunction="closeConfirmFunction"
-            ></stockHospOrderNew>
-        </el-dialog>
-
-        <el-dialog
-            title="编辑"
-            :visible.sync="detailFormVisible"
-            :before-close="hideDetailForm"
-            width="85%"
-            top="5vh"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-        >
-            <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="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="status">
-                            <el-input v-model="statusMap[formData.status]" 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="billdate">
-                            <el-input v-model="formData.billdate" 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="corpName">
-                            <el-input v-model="formData.corpName" 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="billType">
-                            <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable="true"
-                                       disabled="true">
-                                <el-option
-                                    v-for="item in busTypes"
-                                    :key="item.localName"
-                                    :label="item.localName"
-                                    :value="item.localAction">
-                                    <span style="float: left">{{ item.localName }}</span>
-                                    <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</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">
-                            <el-input v-model="typeMap[formData.type]" auto-complete="off" :disabled="true"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-divider></el-divider>
-
-                <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"
-                                      clearable type="number"
-                                      :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="batchNo">
-                            <el-input v-model="detailFormData.batchNo"
-                                      clearable
-                                      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="reCount">-->
-                    <!--                            <el-input v-model="detailFormData.reCount" auto-complete="off"-->
-                    <!--                                      oninput="value=value.replace(/[^\d]/g,'')"></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"
-                                      clearable
-                                      oninput="if(value.length>6)value=value.slice(0,6)"
-                                      type="number"
-                                      :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-input v-model="detailFormData.expireDate" auto-complete="off"
-                                      clearable
-                                      oninput="if(value.length>6)value=value.slice(0,6)"
-                                      type="number"
-                                      :disabled="false"></el-input>
-
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="detailFormData.expireDate"-->
-                            <!--                                placeholder="请选择失效日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
-                        </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.price"
-                                      clearable
-                                      type="number"
-                                      auto-complete="off" :disabled="false"></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-button
+                type="text"
+                size="small"
+                @click.native="deleteStockOrder(scope.row)"
+                v-if="!haveNewDistributionVisible"
+            >删除
+            </el-button
+            >
+          </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-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="产品通用名" width="150" prop="productName"></el-table-column>
+        <el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
+        <el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
+        <el-table-column label="单据数量" width="150" prop="count"></el-table-column>
+        <!--        <el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>-->
+        <el-table-column label="价格" width="150" prop="price"></el-table-column>
+        <el-table-column label="生产厂家" width="150" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="操作" fixed="right" width="150">
+          <template slot-scope="scope" v-if="!haveNewDistributionVisible">
+            <el-button
+                type="text"
+                size="small"
+                @click.native="handleDetailForm(scope.$index, scope.row)"
+            >编辑
+            </el-button
+            >
+          </template>
+        </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-dialog
+        title="编辑"
+        :visible.sync="newDistributionVisible"
+        width="80%"
+        v-if="newDistributionVisible"
+        @close='closeDialog'
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :before-close="handleClose"
+    >
+      <stockOrderNewDistribution
+          :closeDialog="closeDialog"
+          :idQuery="idQuery"
+          :closeConfirmFunction="closeConfirmFunction"
+      ></stockOrderNewDistribution>
+    </el-dialog>
+    <el-dialog
+        title="编辑"
+        :visible.sync="newSpDistributionVisible"
+        width="80%"
+        v-if="newSpDistributionVisible"
+        @close='closeDialog'
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :before-close="handleClose"
+    >
+      <stockHospOrderNew
+          :closeDialog="closeDialog"
+          :idQuery="idQuery"
+          :closeConfirmFunction="closeConfirmFunction"
+      ></stockHospOrderNew>
+    </el-dialog>
+
+    <el-dialog
+        title="编辑"
+        :visible.sync="detailFormVisible"
+        :before-close="hideDetailForm"
+        width="85%"
+        top="5vh"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+    >
+      <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="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="status">
+              <el-input v-model="statusMap[formData.status]" 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="billdate">
+              <el-input v-model="formData.billdate" 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="corpName">
+              <el-input v-model="formData.corpName" 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="billType">
+              <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable="true"
+                         disabled="true">
+                <el-option
+                    v-for="item in busTypes"
+                    :key="item.localName"
+                    :label="item.localName"
+                    :value="item.localAction">
+                  <span style="float: left">{{ item.localName }}</span>
+                  <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</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">
+              <el-input v-model="typeMap[formData.type]" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider></el-divider>
+
+        <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-dialog>
-    </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="count">
+              <el-input v-model="detailFormData.count" auto-complete="off"
+                        clearable type="number"
+                        :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="batchNo">
+              <el-input v-model="detailFormData.batchNo"
+                        clearable
+                        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="reCount">-->
+          <!--                            <el-input v-model="detailFormData.reCount" auto-complete="off"-->
+          <!--                                      oninput="value=value.replace(/[^\d]/g,'')"></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"
+                        clearable
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        type="number"
+                        :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-input v-model="detailFormData.expireDate" auto-complete="off"
+                        clearable
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        type="number"
+                        :disabled="false"></el-input>
+
+              <!--                            <el-date-picker-->
+              <!--                                type="date"-->
+              <!--                                size="small" v-model="detailFormData.expireDate"-->
+              <!--                                placeholder="请选择失效日期" style="width: 80%"-->
+              <!--                                value-format="yyMMdd"-->
+              <!--                                format="yyyy-MM-dd"-->
+              <!--                            >-->
+              <!--                            </el-date-picker>-->
+            </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.price"
+                        clearable
+                        type="number"
+                        auto-complete="off" :disabled="false"></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
+        >
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    stockOrderList, stockOrderDetail, stockOrderDetail2,
-    deleteStockOrderById, deleteStockOrderDetailById,
-    copyStockOrderDetail, submitStockOrder,
-    uploadStockOrderDetail, uploadStockOrderDetailCount,
-    generateStockOrderQRCodeText, stockOrderDetailTemp,
-    deleteStockOrderDetailTempById, repealSubmitNewStockOrder
+  stockOrderList, stockOrderDetail, stockOrderDetail2,
+  deleteStockOrderById, deleteStockOrderDetailById,
+  copyStockOrderDetail, submitStockOrder,
+  uploadStockOrderDetail, uploadStockOrderDetailCount,
+  generateStockOrderQRCodeText, stockOrderDetailTemp,
+  deleteStockOrderDetailTempById, repealSubmitNewStockOrder
 } from "../../api/inout/stockOrder";
 import {BASE_URL} from "../../config/app";
 import stockOrderNewDistribution from "./stockOrderNewDistribution";
@@ -469,541 +469,543 @@ import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
-    name: "stockOrder",
-    data() {
-        return {
-            query: {
-                billType: null,
-                corpName: null,
-                locStorageCode: this.$store.getters.locInvCode,
-                invWarehouseCode: this.$store.getters.locSubInvCode,
-                billNo: "",
-                status: "1",
-                page: 1,
-                limit: 20,
-                startTime: "",
-                endTime: "",
-            },
-            detailQuery: {
-                orderIdFk: "",
-                page: 1,
-                limit: 20
-            },
-            list: [],
-            detailList: [],
-            total: 0,
-            detailTotal: 0,
-            loading: false,
-            detailLoading: false,
-            formData: {},
-            storageList: [],
-            subInvList: [],
-            statusMap: {
-                "1": "草稿",
-                "2": "未配货",
-                "3": "待校验",
+  name: "stockOrder",
+  data() {
+    return {
+      query: {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+        billNo: "",
+        status: "1",
+        page: 1,
+        limit: 20,
+        startTime: "",
+        endTime: "",
+      },
+      detailQuery: {
+        orderIdFk: "",
+        page: 1,
+        limit: 20
+      },
+      list: [],
+      detailList: [],
+      total: 0,
+      detailTotal: 0,
+      loading: false,
+      detailLoading: false,
+      formData: {},
+      storageList: [],
+      subInvList: [],
+      statusMap: {
+        "1": "草稿",
+        "2": "未配货",
+        "3": "待校验",
+      },
+      sourceMap: {
+        "1": "web端新增单据",
+        "2": "第三方系统",
+        "3": "扫码单据转换",
+        "4": "采购计划转换",
+      },
+      typeMap: {
+        1: "预入库",
+        2: "普通采购",
+      },
+      idQuery: {
+        id: "",
+      },
+      newDistributionVisible: false,
+      newSpDistributionVisible: false,
+      isSp: store.getters.customerId,
+      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"}
+        ]
+      },
+      busTypes: [],
+      detailFormVisible: false,
+      detailFormData: {},
+      detailFormLoading: false,
+      haveNewDistributionVisible: false,
+      qrcodeExportVisible: false,
+      filterUDIType: false,
+      closeConfirm: false,
+      detailCountMax: 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": "web端新增单据",
-                "2": "第三方系统",
-                "3": "扫码单据转换",
-                "4": "采购计划转换",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            typeMap: {
-                1: "预入库",
-                2: "普通采购",
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-            idQuery: {
-                id: "",
-            },
-            newDistributionVisible: false,
-            newSpDistributionVisible: false,
-            isSp: store.getters.customerId,
-            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"}
-                ]
-            },
-            busTypes: [],
-            detailFormVisible: false,
-            detailFormData: {},
-            detailFormLoading: false,
-            haveNewDistributionVisible: false,
-            qrcodeExportVisible: false,
-            filterUDIType: false,
-            closeConfirm: false,
-            detailCountMax: 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]);
-                        },
-                    },
-                ],
-            },
-        }
+          },
+        ],
+      },
+    }
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.query = {
+        billNo: "",
+        status: "1",
+        startTime: "",
+        endTime: "",
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+
+      this.haveNewDistributionVisible = false;
+      this.actDateRange = [];
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: ""
-            });
-            this.query = {
-                billNo: "",
-                status: "1",
-                startTime: "",
-                endTime: "",
-                page: 1,
-                limit: 20
-            };
-            this.getList();
-
-            this.haveNewDistributionVisible = false;
-            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.query.page=1
-            this.getList();
-            if (this.query.status === "502") {
-                this.haveNewDistributionVisible = true;
-            } else {
-                this.haveNewDistributionVisible = false;
-            }
-        },
-        handleCurrentChange(val) {
-            this.query.page = val;
-            this.getList();
-        },
-        detailHandleCurrentChange(val) {
-            this.detailQuery.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.query.page = 1
+      this.getList();
+      if (this.query.status === "502") {
+        this.haveNewDistributionVisible = true;
+      } else {
+        this.haveNewDistributionVisible = false;
+      }
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
+    detailHandleCurrentChange(val) {
+      this.detailQuery.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.getList();
-            }
-        },
-        getList() {
-            this.loading = true;
-            this.query.corpId = store.getters.customerId;
-            stockOrderList(this.query)
-                .then(response => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                        this.detailList = [];
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        newDistributionForm(index, row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-            }
-            this.newDistributionVisible = true;
-        },
-        closeDialog(type) {
-            this.newDistributionVisible = false;
-            this.newSpDistributionVisible = false;
-            this.getList();
-            this.detailList = [];
-            // if (this.$isNotBlank(type)) {
-            //     this.detailList = [];
-            // }
-        },
-        closeConfirmFunction(type) {
-            if (this.$isNotBlank(type) && type) {
-                this.closeConfirm = type;
-            }
-        },
-        handleClose(done) {
-            if (this.closeConfirm) {
-                this.$confirm('数据未保存，确认关闭？')
-                    .then(_ => {
-                        this.closeConfirm = false;
-                        done();
-                    })
-                    .catch(_ => {
-                    });
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    getList() {
+      this.loading = true;
+      this.query.corpId = store.getters.customerId;
+      stockOrderList(this.query)
+          .then(response => {
+            this.loading = false;
+            if (response.code == 20000) {
+              this.list = response.data.list || [];
+              this.total = response.data.total || 0;
+              this.detailList = [];
             } else {
-                this.newDistributionVisible = false;
-                this.newSpDistributionVisible = false;
-            }
-        },
-        exportQRCodeText(row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.qrcodeExportVisible = true;
+              this.$message.error(response.message);
             }
-        },
-        closeQRCodeExportDialog() {
-            this.qrcodeExportVisible = false;
-            this.getList();
-        },
-        getStockOrderDetailList(row) {
-            if (this.$isNotBlank(row)) {
-                this.detailQuery.orderIdFk = row.id;
-                this.detailQuery.page=1
-                this.formData = row;
-            }
-            this.detailLoading = true;
-            stockOrderDetail(this.detailQuery)
-                .then((response) => {
-                    this.detailLoading = false;
-                    this.detailList = response.data.list || [];
-                    this.detailTotal = response.data.total;
-                })
-                .catch(() => {
-                    this.detailLoading = false;
-                    this.detailList = [];
-                });
-        },
-        repealSubmit(row) {
-            this.$confirm("是否撤销提交？", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                let tQuery = {
-                    id: row.id
-                }
-                this.loading = true;
-                repealSubmitNewStockOrder(tQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("撤销成功");
-                            this.getList();
-                            this.detailList = [];
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        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(() => {
-
-            });
-        },
-        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(() => {
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+    newDistributionForm(index, row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+      }
+      this.newDistributionVisible = true;
+    },
+    closeDialog(type) {
+      this.newDistributionVisible = false;
+      this.newSpDistributionVisible = false;
+      this.getList();
+      this.detailList = [];
+      // if (this.$isNotBlank(type)) {
+      //     this.detailList = [];
+      // }
+    },
+    closeConfirmFunction(type) {
+      if (this.$isNotBlank(type) && type) {
+        this.closeConfirm = type;
+      }
+    },
+    handleClose(done) {
+      if (this.closeConfirm) {
+        this.$confirm('数据未保存，确认关闭？')
+            .then(_ => {
+              this.closeConfirm = false;
+              done();
+            })
+            .catch(_ => {
             });
-        },
-        deleteStockOrderDetailTemp(row) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.detailLoading = true;
-                deleteStockOrderDetailTempById({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(() => {
-
+      } else {
+        this.newDistributionVisible = false;
+        this.newSpDistributionVisible = false;
+      }
+    },
+    exportQRCodeText(row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.qrcodeExportVisible = true;
+      }
+    },
+    closeQRCodeExportDialog() {
+      this.qrcodeExportVisible = false;
+      this.getList();
+    },
+    getStockOrderDetailList(row) {
+      if (this.$isNotBlank(row)) {
+        this.detailQuery.orderIdFk = row.id;
+        this.detailQuery.page = 1
+        this.formData = row;
+      }
+      this.detailLoading = true;
+      stockOrderDetail(this.detailQuery)
+          .then((response) => {
+            this.detailLoading = false;
+            this.detailList = response.data.list || [];
+            this.detailTotal = response.data.total;
+          })
+          .catch(() => {
+            this.detailLoading = false;
+            this.detailList = [];
+          });
+    },
+    repealSubmit(row) {
+      this.$confirm("是否撤销提交？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let tQuery = {
+          id: row.id
+        }
+        this.loading = true;
+        repealSubmitNewStockOrder(tQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.$message.success("撤销成功");
+                this.getList();
+                this.detailList = [];
+              } else {
+                this.$message.error(response.message);
+              }
             });
-        },
-        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(() => {
+        this.loading = false;
+      });
+    },
+    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(() => {
+
+      });
+    },
+    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);
+              }
             });
-        },
-        // 显示表单
-        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;
-                }
-            }
-        },
-        getStorageName(code) {
-            for (let i = 0; i < this.storageList.length; i++) {
-                if (this.storageList[i].code === code) {
-                    return this.storageList[i].name;
-                }
-            }
-        },
-        getSubStorageName(code) {
-            for (let i = 0; i < this.subInvList.length; i++) {
-                if (this.subInvList[i].code === code) {
-                    return this.subInvList[i].name;
+      }).catch(() => {
+      });
+    },
+    deleteStockOrderDetailTemp(row) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.detailLoading = true;
+        deleteStockOrderDetailTempById({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(() => {
+
+      });
+    },
+    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;
+        }
+      }
+    },
+    getStorageName(code) {
+      for (let i = 0; i < this.storageList.length; i++) {
+        if (this.storageList[i].code === code) {
+          return this.storageList[i].name;
+        }
+      }
+    },
+    getSubStorageName(code) {
+      for (let i = 0; i < this.subInvList.length; i++) {
+        if (this.subInvList[i].code === code) {
+          return this.subInvList[i].name;
+        }
+      }
+    },
+    getBusType() {
+      let query = {
+        code: this.query.invWarehouseCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(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();
                 }
+              });
             }
-        },
-        getBusType() {
-            let query = {
-                code: this.query.invWarehouseCode,
-                enabled: true,
-            };
-            getLocalJoinByUser(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();
-                                }
-                            });
-                        }
-                    });
-                }
-            });
-        },
-
-        getSysParm() {
-            let query = {
-                paramKey: "stock_order_detail_count_max",
-            };
-            selectSysParamByKey(query).then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.detailCountMax = true;
-                    } else
-                        this.detailCountMax = false;
-                }
-            });
-        },
-        getStorage() {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                    if (this.storageList.length > 0) {
-                        this.getSubInvList();
-                        this.getList();
-                    }
-                })
-                .catch(() => {
-                });
-        },
-        invChange() {
-            this.query.invWarehouseCode = "";
-            this.subInvList = [];
-            let query = {
-                pcode: this.query.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
-
-        getSubInvList() {
-            let query = {
-                pcode: this.query.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
-
-        subInvChange() {
-            this.getBusType();
-        },
-
-    },
-    components: {
-        draggable,
-        stockOrderNewDistribution
-    },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "gray",
-                1: "success"
-            };
-            return statusMap[status];
-        },
-        statusFilterName(status) {
-            const statusMap = {
-                "1": "草稿",
-                "2": "未配货",
-                "3": "待校验",
-            };
-            return statusMap[status];
-        },
-        typeFilterName(type) {
-            const typeMap = {
-                1: "预入库",
-                2: "普通采购",
-            };
-            return typeMap[type];
+          });
         }
+      });
     },
-    created() {
-        this.getBusType();
-        this.getStorage();
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
 
+    getSysParm() {
+      let query = {
+        paramKey: "stock_order_detail_count_max",
+      };
+      selectSysParamByKey(query).then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.detailCountMax = true;
+          } else
+            this.detailCountMax = false;
+        }
+      });
+    },
+    getStorage() {
+      this.storageList = [];
+      filterAllByUser()
+          .then((response) => {
+            this.storageList = response.data || [];
+            if (this.storageList.length > 0) {
+              this.getSubInvList();
+              this.getList();
+            }
+          })
+          .catch(() => {
+          });
+    },
+    invChange() {
+      this.query.invWarehouseCode = "";
+      this.subInvList = [];
+      let query = {
+        pcode: this.query.locStorageCode
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+          })
+          .catch(() => {
+          });
+    },
+
+    getSubInvList() {
+      let query = {
+        // pcode: this.query.locStorageCode
+        filter: 3
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+            this.getList();
+          })
+          .catch(() => {
+          });
+    },
+
+    subInvChange() {
+      this.getBusType();
+    },
+
+  },
+  components: {
+    draggable,
+    stockOrderNewDistribution
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "gray",
+        1: "success"
+      };
+      return statusMap[status];
+    },
+    statusFilterName(status) {
+      const statusMap = {
+        "1": "草稿",
+        "2": "未配货",
+        "3": "待校验",
+      };
+      return statusMap[status];
+    },
+    typeFilterName(type) {
+      const typeMap = {
+        1: "预入库",
+        2: "普通采购",
+      };
+      return typeMap[type];
     }
+  },
+  created() {
+    this.getBusType();
+    this.getSubInvList();
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+
+  }
 }
 </script>
 
@@ -1013,7 +1015,7 @@ export default {
 解决el-input输入框 type=number时，输入中文光标上移问题
  */
 .el-input__inner {
-    line-height: 1px !important;
+  line-height: 1px !important;
 }
 
 </style>
diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue
index 187db0a..3717f8a 100644
--- a/src/views/business/stockOrderSearch.vue
+++ b/src/views/business/stockOrderSearch.vue
@@ -27,21 +27,21 @@
                     <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"-->
+                    <!--                                   @change="invChange"-->
+                    <!--                                   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.locStorageCode"
-                                   @change="invChange"
-                                   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.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    @change="subInvChange"
                                    size="mini">
                             <el-option
@@ -1002,11 +1002,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+                filter:3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -1120,7 +1122,7 @@ export default {
     created() {
 
         this.isReceAble = true;
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let end = new Date();
         let start = new Date();
diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue
index f093336..d9cee37 100644
--- a/src/views/business/stockOrderWaitCheck.vue
+++ b/src/views/business/stockOrderWaitCheck.vue
@@ -27,21 +27,21 @@
                     <el-form-item class="query-form-item" v-if="isSp ==110">
                         <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"-->
+<!--                                   @change="invChange"-->
+<!--                                   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.locStorageCode"
-                                   @change="invChange"
-                                   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.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    @change="subInvChange"
                                    size="mini">
                             <el-option
@@ -813,11 +813,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+                filter:3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -884,7 +886,7 @@ export default {
     },
     created() {
         // 加载表格数据
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let end = new Date();
         let start = new Date();
diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue
index 17dd55c..e1fc87c 100644
--- a/src/views/inout/IOCheckErrorOrder.vue
+++ b/src/views/inout/IOCheckErrorOrder.vue
@@ -33,21 +33,21 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <!--                    <el-form-item class="query-form-item">-->
+                    <!--                        <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
+                    <!--                                   @change="invChange"-->
+                    <!--                                   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="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
-                                   @change="invChange"
-                                   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="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    @change="subInvChange"
                                    size="mini">
                             <el-option
@@ -495,7 +495,7 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
-import {convertDate} from  "@/utils/date"
+import {convertDate} from "@/utils/date"
 
 
 const formJson = {
@@ -514,7 +514,7 @@ export default {
 
     data() {
         return {
-            convertDateFun:convertDate,
+            convertDateFun: convertDate,
             query: {
                 page: 1,
                 limit: 20,
@@ -541,7 +541,7 @@ export default {
                 "6": "缺量补录单据",
                 "7": "UDI供应商平台",
                 "8": "平衡补录单据",
-                "10":"手动补单",
+                "10": "手动补单",
                 "11": "仓库盘点"
             },
             busTypes: [],
@@ -781,7 +781,7 @@ export default {
                         this.list = response.data.list || [];
                         this.total = response.data.total || 0;
 
-                    }else {
+                    } else {
                         this.$message.error(response.message);
                     }
                     this.detailList = [];
@@ -1131,11 +1131,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.filterQuery.locStorageCode
+                // pcode: this.filterQuery.locStorageCode
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -1162,7 +1164,7 @@ export default {
     },
 
     created() {
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let query = this.$route.query;
         this.query = Object.assign(this.query, query);
diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue
index dd464b4..960859f 100644
--- a/src/views/inout/IOCheckWaitOrder.vue
+++ b/src/views/inout/IOCheckWaitOrder.vue
@@ -33,21 +33,21 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+<!--                    <el-form-item class="query-form-item">-->
+<!--                        <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
+<!--                                   @change="invChange"-->
+<!--                                   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="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
-                                   @change="invChange"
-                                   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="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    @change="subInvChange"
                                    size="mini">
                             <el-option
@@ -883,11 +883,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.filterQuery.locStorageCode
+                // pcode: this.filterQuery.locStorageCode
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -914,7 +916,7 @@ export default {
     },
 
     created() {
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let query = this.$route.query;
         this.query = Object.assign(this.query, query);
diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue
index a9865ea..3aace20 100644
--- a/src/views/inout/IOFinishOrder.vue
+++ b/src/views/inout/IOFinishOrder.vue
@@ -1,397 +1,397 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form
-                :inline="true"
-                :model="filterQuery"
-                class="query-form"
-                size="mini"
+  <div>
+    <el-card class="el-card">
+      <el-form
+          :inline="true"
+          :model="filterQuery"
+          class="query-form"
+          size="mini"
+      >
+        <el-row>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.id" placeholder="单号"></el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item">
+            <el-select
+                v-model="filterQuery.mainAction"
+                placeholder="出入库类型"
+                clearable
             >
-                <el-row>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.id" placeholder="单号"></el-input>
-                    </el-form-item>
-
-                    <el-form-item class="query-form-item">
-                        <el-select
-                            v-model="filterQuery.mainAction"
-                            placeholder="出入库类型"
-                            clearable
-                        >
-                            <el-option label="全部" value=""></el-option>
-                            <el-option label="入库" value="WareHouseIn"></el-option>
-                            <el-option label="出库" value="WareHouseOut"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.action" placeholder="请选择扫码单据类型" clearable>
-                            <el-option
-                                v-for="item in busTypes"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.action">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
-                                   @change="invChange"
-                                   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="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
-                                   @change="subInvChange"
-                                   size="mini">
-                            <el-option
-                                v-for="item in subInvList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="入库" value="WareHouseIn"></el-option>
+              <el-option label="出库" value="WareHouseOut"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-select v-model="filterQuery.action" placeholder="请选择扫码单据类型" clearable>
+              <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!--                    <el-form-item class="query-form-item">-->
+          <!--                        <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
+          <!--                                   @change="invChange"-->
+          <!--                                   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="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
+                       @change="subInvChange"
+                       size="mini">
+              <el-option
+                  v-for="item in subInvList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="query-form-item">
             <span style="color: #000; margin-left: 10px; margin-right: 6px;font-size: small"
             >创建日期:</span
             >
-                        <el-date-picker
-                            :picker-options="pickerOptions"
-                            v-model="actDateRange"
-                            type="daterange"
-                            format="yyyy 年 MM 月 dd 日"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button-group>
-                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-                            <!--                            <el-button type="primary" icon="search" @click="exportOrders">导出单据</el-button>-->
-                        </el-button-group>
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <el-table
-                v-loading="loading"
-                :data="list"
-                style="width: 100%"
-                @row-click="getOrderDetail"
-                highlight-current-row
-                @selection-change="handleSelectionChange"
+            <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
             >
-                <el-table-column type="selection" width="55"></el-table-column>
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="扫码单据类型" prop="billTypeName">
-                </el-table-column>
-                <el-table-column
-                    label="订单号"
-                    prop="id"
-                    show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column label="来源" prop="fromType">
-
-                    <template slot-scope="scope">
-                        <span>{{ fromTypeMap[scope.row.fromType] }}</span>
-                    </template>
-
-
-                </el-table-column>
-                <el-table-column label="往来单位" prop="fromCorp" width="250">
-                </el-table-column>
-                <el-table-column label="当前仓库" prop="invName" width="120">
-                </el-table-column>
-                <el-table-column label="当前分库" prop="subInvName" width="120">
-                </el-table-column>
-                <el-table-column label="所属科室" prop="deptName" width="120">
-                </el-table-column>
-                <el-table-column
-                    label="创建时间"
-                    prop="actDate"
-                    width="150"
-                    show-overflow-tooltip="true"
-                >
-                    <template slot-scope="scope">
-                        <i class="el-icon-time"></i>
-                        <span>{{ scope.row.actDate }}</span>
-                    </template>
-                </el-table-column>
-                <!--<el-table-column label="校验状态" prop="status" width="100">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-tag :type="(scope.row.status === 3) | statusFilterType">{{-->
-                <!--checkStatus[scope.row.contrastStatus]-->
-                <!--}}-->
-                <!--</el-tag>-->
-                <!--</template>-->
-                <!--</el-table-column>-->
-                <el-table-column label="校验状态" prop="contrastStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
-                            {{ erpCheckStatus[scope.row.contrastStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-                <!--<el-table-column label="操作" width="150">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.contrastStatus === null"-->
-                <!--@click.native.stop="repeatCheckClick(scope.row)"-->
-                <!--&gt;重新校验-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.contrastStatus !== 0"-->
-                <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
-                <!--&gt;校验信息-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--</template>-->
-                <!--</el-table-column>-->
-                <!-- <el-table-column label="上传状态" prop="exportStatus"></el-table-column> -->
-                <!--<el-table-column label="操作" width="250">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.status === 4"-->
-                <!--@click.native.stop="repeatCheckClick(scope.row)"-->
-                <!--&gt;重新校验-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.status === 4"-->
-                <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
-                <!--&gt;校验信息-->
-                <!--</el-button-->
-                <!--&gt;-->
-
-                <!--</template>-->
-                <!--</el-table-column>-->
-                <el-table-column label="操作" fixed="right" width="120">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="intentDetail(scope.row)"
-                        >详情
-                        </el-button
-                        >
-
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native.stop="successOrderExportPDF(scope.row)"-->
-                        <!--                        >单据打印-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
-
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="deleteDialog(scope.row.id)"
-                        >删除
-                        </el-button
-                        >
-                        <!--<el-button-->
-                        <!--type="text"-->
-                        <!--size="small"-->
-                        <!--@click.native.stop="importOrder(scope.row)"-->
-                        <!--&gt;选择单据校验-->
-                        <!--</el-button>-->
-                    </template>
-                </el-table-column>
-            </el-table>
-
-
-            <el-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-                :current-page="filterQuery.page"
-            ></el-pagination>
-        </el-card>
-
-        <el-card class="el-card" v-if="true" id="printJS-form">
-            <el-table
-                v-loading="loading"
-                :row-class-name="tableRowClassName"
-                :data="detailList"
-                style="width: 100%"
-            >
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column
-                    label="产品通用名"
-                    prop="coName"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="包装规格"
-                    prop="packSpec"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="批次号"
-                    prop="batchNo"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="生产日期"
-                    prop="productDate"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="失效日期"
-                    prop="expireDate"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="单据数量"
-                    prop="erpCount"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="实际数量"
-                    prop="reCount"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-
-                <el-table-column label="扫码数量" prop="count"></el-table-column>
-                <el-table-column
-                    label="供应商"
-                    prop="supName"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="生产企业"
-                    prop="productCompany"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="注册/备案凭证号"
-                    prop="authCode"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-            </el-table>
-        </el-card>
-        <el-dialog
-            title="选择往来单位"
-            :visible.sync="dialogTableVisible"
-            width="70%"
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+              <!--                            <el-button type="primary" icon="search" @click="exportOrders">导出单据</el-button>-->
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-table
+          v-loading="loading"
+          :data="list"
+          style="width: 100%"
+          @row-click="getOrderDetail"
+          highlight-current-row
+          @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName">
+        </el-table-column>
+        <el-table-column
+            label="订单号"
+            prop="id"
+            show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column label="来源" prop="fromType">
+
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+
+
+        </el-table-column>
+        <el-table-column label="往来单位" prop="fromCorp" width="250">
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="当前分库" prop="subInvName" width="120">
+        </el-table-column>
+        <el-table-column label="所属科室" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column
+            label="创建时间"
+            prop="actDate"
+            width="150"
+            show-overflow-tooltip="true"
         >
-            <el-form :inline="true" :model="query" class="query-form" size="mini">
-                <el-form-item class="query-form-item">
-                    <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button
-                        type="primary"
-                        icon="search"
-                        @click.native.stop="getUnitList()"
-                    >查询
-                    </el-button
-                    >
-                </el-form-item>
-            </el-form>
-
-            <el-table
-                v-loading="loading"
-                :data="unitlist"
-                style="width: 100%"
-                @row-click="selectUnit"
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.actDate }}</span>
+          </template>
+        </el-table-column>
+        <!--<el-table-column label="校验状态" prop="status" width="100">-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-tag :type="(scope.row.status === 3) | statusFilterType">{{-->
+        <!--checkStatus[scope.row.contrastStatus]-->
+        <!--}}-->
+        <!--</el-tag>-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column label="校验状态" prop="contrastStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
+              {{ erpCheckStatus[scope.row.contrastStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <!--<el-table-column label="操作" width="150">-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button-->
+        <!--type="text"-->
+        <!--size="small"-->
+        <!--:disabled="scope.row.contrastStatus === null"-->
+        <!--@click.native.stop="repeatCheckClick(scope.row)"-->
+        <!--&gt;重新校验-->
+        <!--</el-button-->
+        <!--&gt;-->
+        <!--<el-button-->
+        <!--type="text"-->
+        <!--size="small"-->
+        <!--:disabled="scope.row.contrastStatus !== 0"-->
+        <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
+        <!--&gt;校验信息-->
+        <!--</el-button-->
+        <!--&gt;-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!-- <el-table-column label="上传状态" prop="exportStatus"></el-table-column> -->
+        <!--<el-table-column label="操作" width="250">-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button-->
+        <!--type="text"-->
+        <!--size="small"-->
+        <!--:disabled="scope.row.status === 4"-->
+        <!--@click.native.stop="repeatCheckClick(scope.row)"-->
+        <!--&gt;重新校验-->
+        <!--</el-button-->
+        <!--&gt;-->
+        <!--<el-button-->
+        <!--type="text"-->
+        <!--size="small"-->
+        <!--:disabled="scope.row.status === 4"-->
+        <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
+        <!--&gt;校验信息-->
+        <!--</el-button-->
+        <!--&gt;-->
+
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column label="操作" fixed="right" width="120">
+          <template slot-scope="scope">
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="intentDetail(scope.row)"
+            >详情
+            </el-button
             >
-                <el-table-column label="往来单位ID" prop="unitId"></el-table-column>
-                <el-table-column
-                    label="往来单位名称"
-                    prop="name"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="往来单位简写"
-                    prop="spell"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="地址"
-                    prop="addr"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column label="状态" prop="status"></el-table-column>
-                <el-table-column label="类型" prop="type"></el-table-column>
-            </el-table>
-        </el-dialog>
-        <el-dialog
-            title="选择erp业务单据"
-            :visible.sync="addDialogVisible"
-            width="80%"
-            v-if="addDialogVisible"
-        >
-            <selectErpOrder
-                v-on:closeManuDialog="closeManuDialog"
-                :orderId="orderId"
-            ></selectErpOrder>
-        </el-dialog>
-
-        <el-dialog
-            title="单号详情"
-            :visible.sync="codeDetailVisible"
-            width="80%"
-            v-if="codeDetailVisible"
-        >
-            <codeDetail
-                :idQuery="idQuery"
-                v-on:closeDetailDialog="closeDetailDialog"
-            ></codeDetail>
-        </el-dialog>
-
-        <el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
-            <span>{{ errorDetail }}</span>
-            <span slot="footer" class="dialog-footer">
+
+            <!--                        <el-button-->
+            <!--                            type="text"-->
+            <!--                            size="small"-->
+            <!--                            @click.native.stop="successOrderExportPDF(scope.row)"-->
+            <!--                        >单据打印-->
+            <!--                        </el-button-->
+            <!--                        >-->
+
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="deleteDialog(scope.row.id)"
+            >删除
+            </el-button
+            >
+            <!--<el-button-->
+            <!--type="text"-->
+            <!--size="small"-->
+            <!--@click.native.stop="importOrder(scope.row)"-->
+            <!--&gt;选择单据校验-->
+            <!--</el-button>-->
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <el-pagination
+          :page-size="filterQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+          :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+
+    <el-card class="el-card" v-if="true" id="printJS-form">
+      <el-table
+          v-loading="loading"
+          :row-class-name="tableRowClassName"
+          :data="detailList"
+          style="width: 100%"
+      >
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+            label="产品通用名"
+            prop="coName"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="包装规格"
+            prop="packSpec"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="批次号"
+            prop="batchNo"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="生产日期"
+            prop="productDate"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="失效日期"
+            prop="expireDate"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="单据数量"
+            prop="erpCount"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="实际数量"
+            prop="reCount"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+
+        <el-table-column label="扫码数量" prop="count"></el-table-column>
+        <el-table-column
+            label="供应商"
+            prop="supName"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="生产企业"
+            prop="productCompany"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="注册/备案凭证号"
+            prop="authCode"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog
+        title="选择往来单位"
+        :visible.sync="dialogTableVisible"
+        width="70%"
+    >
+      <el-form :inline="true" :model="query" class="query-form" size="mini">
+        <el-form-item class="query-form-item">
+          <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+              type="primary"
+              icon="search"
+              @click.native.stop="getUnitList()"
+          >查询
+          </el-button
+          >
+        </el-form-item>
+      </el-form>
+
+      <el-table
+          v-loading="loading"
+          :data="unitlist"
+          style="width: 100%"
+          @row-click="selectUnit"
+      >
+        <el-table-column label="往来单位ID" prop="unitId"></el-table-column>
+        <el-table-column
+            label="往来单位名称"
+            prop="name"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="往来单位简写"
+            prop="spell"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="地址"
+            prop="addr"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column label="状态" prop="status"></el-table-column>
+        <el-table-column label="类型" prop="type"></el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog
+        title="选择erp业务单据"
+        :visible.sync="addDialogVisible"
+        width="80%"
+        v-if="addDialogVisible"
+    >
+      <selectErpOrder
+          v-on:closeManuDialog="closeManuDialog"
+          :orderId="orderId"
+      ></selectErpOrder>
+    </el-dialog>
+
+    <el-dialog
+        title="单号详情"
+        :visible.sync="codeDetailVisible"
+        width="80%"
+        v-if="codeDetailVisible"
+    >
+      <codeDetail
+          :idQuery="idQuery"
+          v-on:closeDetailDialog="closeDetailDialog"
+      ></codeDetail>
+    </el-dialog>
+
+    <el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
+      <span>{{ errorDetail }}</span>
+      <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="errDialogVisible = false"
         >关 闭</el-button
         >
       </span>
-        </el-dialog>
-    </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    orderList,
-    codeList,
-    findAllByOrderId,
-    updateUnit,
-    filterOrder,
-    deleteByOrderId,
-    updateExportStatus,
-    uploadOrder,
-    mergeOrder,
-    orderDetail, exportJson
+  orderList,
+  codeList,
+  findAllByOrderId,
+  updateUnit,
+  filterOrder,
+  deleteByOrderId,
+  updateExportStatus,
+  uploadOrder,
+  mergeOrder,
+  orderDetail, exportJson
 } from "../../api/inout/order";
 import {
-    orderDetailPDFFromTemplateCode,
-    orderDetailPDFFromTemplateFile,
-    inspectionOrderDetailPDFFromTemplateCode,
-    inspectionOrderDetailPDFFromTemplateFile, stockOrderPDFFromTemplateFile
+  orderDetailPDFFromTemplateCode,
+  orderDetailPDFFromTemplateFile,
+  inspectionOrderDetailPDFFromTemplateCode,
+  inspectionOrderDetailPDFFromTemplateFile, stockOrderPDFFromTemplateFile
 } from "../../api/itextpdf/itextpdf";
 import {repeatCheck} from "../../api/inout/erpOrder";
 import draggable from "vuedraggable";
@@ -407,571 +407,573 @@ import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
 const formJson = {
-    site_id: "",
-    site_name: "",
-    describe: "",
-    ads: [],
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
 };
 export default {
-    props: {
-        isSelect: {
-            type: Boolean,
-            default: false,
-        },
-    },
-
-    data() {
-        return {
-            query: {
-                page: 1,
-                limit: 20,
-            },
-            checkStatus: {
-                1: "校验异常",
-                0: "未校验",
-                2: "正常",
-            },
-            erpCheckStatus: {
-                // error: "校验异常",
-                // null: "未校验",
-                // success: "正常",
-                1: "已完成",
-                0: "已完成",
-                2: "已完成",
-            },
-            fromTypeMap: {
-                "1": "UDIMS平台",
-                "2": "网页新增",
-                "3": "pda即时校验",
-                "4": "pda未校验",
-                "5": "pc端扫码精灵",
-                "6": "缺量补录单据",
-                "7": "UDI供应商平台",
-                "8": "平衡补录单据",
-                "10": "手动补单",
-                "11": "仓库盘点"
-            },
-            //往来单位
-            unitquery: {key: "", page: 1, limit: 20},
-            unitlist: [],
-            list: [],
-            detailList: [],
-            storageList: [],
-            subInvList: [],
-            unitUpdateQuery: {
-                id: "",
-                fromCorpId: "",
-                fromCorp: "",
-            },
-            actDateRange: [],
-            filterQuery: {
-                id: "",
-                mainAction: null,
-                action: null,
-                page: 1,
-                limit: 10,
-                code: "",
-                exportStatus: null,
-                unionCtrStatus: 1,
-                status: null,
-                startTime: "",
-                endTime: "",
-                locStorageCode: this.$store.getters.locInvCode,
-                invWarehouseCode: this.$store.getters.locSubInvCode,
-            },
-            detailQuery: {
-                orderId: "",
-            },
-            deleteData: {
-                id: "",
-            },
-            idQuery: {
-                id: "",
-            },
-            curIndex: "",
-            adListNoDataText: "无数据",
-            queryAdIdAsyncLoading: false,
-            codeDetailVisible: false,
-            total: 0,
-            loading: false,
-            index: null,
-            formName: null,
-            orderId: "",
-            formMap: {
-                add: "新增",
-                edit: "编辑",
-            },
-            exportQuery: {
-                orderId: "",
-                exportStatus: "",
+  props: {
+    isSelect: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  data() {
+    return {
+      query: {
+        page: 1,
+        limit: 20,
+      },
+      checkStatus: {
+        1: "校验异常",
+        0: "未校验",
+        2: "正常",
+      },
+      erpCheckStatus: {
+        // error: "校验异常",
+        // null: "未校验",
+        // success: "正常",
+        1: "已完成",
+        0: "已完成",
+        2: "已完成",
+      },
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点"
+      },
+      //往来单位
+      unitquery: {key: "", page: 1, limit: 20},
+      unitlist: [],
+      list: [],
+      detailList: [],
+      storageList: [],
+      subInvList: [],
+      unitUpdateQuery: {
+        id: "",
+        fromCorpId: "",
+        fromCorp: "",
+      },
+      actDateRange: [],
+      filterQuery: {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        code: "",
+        exportStatus: null,
+        unionCtrStatus: 1,
+        status: null,
+        startTime: "",
+        endTime: "",
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+      },
+      detailQuery: {
+        orderId: "",
+      },
+      deleteData: {
+        id: "",
+      },
+      idQuery: {
+        id: "",
+      },
+      curIndex: "",
+      adListNoDataText: "无数据",
+      queryAdIdAsyncLoading: false,
+      codeDetailVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      orderId: "",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      exportQuery: {
+        orderId: "",
+        exportStatus: "",
+      },
+
+      uploadQuery: {
+        orderId: "",
+      },
+      busTypes: [],
+      multipleSelection: [],
+      dialogTableVisible: false,
+      formLoading: false,
+      formVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      addDialogVisible: false,
+      errDialogVisible: false,
+      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]);
             },
-
-            uploadQuery: {
-                orderId: "",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            busTypes: [],
-            multipleSelection: [],
-            dialogTableVisible: false,
-            formLoading: false,
-            formVisible: false,
-            formData: formJson,
-            deleteLoading: false,
-            addDialogVisible: false,
-            errDialogVisible: false,
-            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]);
             },
-        };
+          },
+        ],
+      },
+    };
+  },
+  components: {
+    draggable,
+    codeDetail,
+    selectErpOrder,
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        code: "",
+        unionCtrStatus: 1,
+        exportStatus: null,
+        status: null,
+        startTime: "",
+        endTime: "",
+      };
+      this.actDateRange = [];
+      this.getList();
     },
-    components: {
-        draggable,
-        codeDetail,
-        selectErpOrder,
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                id: "",
-                mainAction: null,
-                action: null,
-                page: 1,
-                limit: 10,
-                code: "",
-                unionCtrStatus: 1,
-                exportStatus: null,
-                status: null,
-                startTime: "",
-                endTime: "",
-            };
-            this.actDateRange = [];
-            this.getList();
-        },
-        onSubmit() {
-            if (this.actDateRange !== null) {
-                this.filterQuery.startTime = this.actDateRange[0];
-                this.filterQuery.endTime = this.actDateRange[1];
-            } else {
-                this.filterQuery.startTime = null;
-                this.filterQuery.endTime = null;
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    handleSelectionChange(val) {
+      console.log(val);
+      this.multipleSelection = val;
+    },
+    getStorage() {
+      this.storageList = [];
+      filterAllByUser()
+          .then((response) => {
+            this.storageList = response.data || [];
+            if (this.storageList.length > 0) {
+              // this.filterQuery.locStorageCode = this.storageList[0].code;
+              this.getSubInvList();
+              this.getList();
             }
-            this.filterQuery.page = 1;
-            this.getList();
-        },
-        handleSizeChange(val) {
-            this.filterQuery.limit = val;
-            this.getList();
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        handleSelectionChange(val) {
-            console.log(val);
-            this.multipleSelection = val;
-        },
-        getStorage() {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                    if (this.storageList.length > 0) {
-                        // this.filterQuery.locStorageCode = this.storageList[0].code;
-                        this.getSubInvList();
-                        this.getList();
-                    }
-                })
-                .catch(() => {
+          })
+          .catch(() => {
+          });
+    },
+    getStorageName(code) {
+      for (let i = 0; i < this.storageList.length; i++) {
+        if (this.storageList[i].code === code) {
+          return this.storageList[i].name;
+        }
+      }
+    },
+    getSubStorageName(code) {
+      for (let i = 0; i < this.subInvList.length; i++) {
+        if (this.subInvList[i].code === code) {
+          return this.subInvList[i].name;
+        }
+      }
+    },
+    handleErrorDetail(poistion) {
+      var mOrder = this.list[poistion];
+      this.errorDetail = mOrder.remark;
+      this.errDialogVisible = true;
+    },
+
+    mergesOrders() {
+      var repeatData = this.multipleSelection;
+      if (repeatData.length <= 1) {
+        this.$message.warning("选择的订单需大于1");
+        return;
+      }
+      var orderid = repeatData[0].id;
+      var unit = repeatData[0].fromCorp;
+      var action = repeatData[0].action;
+      var orderList = [];
+      repeatData.forEach((obj, index) => {
+        if (unit !== obj.fromCorp) {
+          this.$message.warning("往来单位不一致！");
+          return;
+        }
+        if (action !== obj.action) {
+          this.$message.warning("业务类型不一致！");
+          return;
+        }
+        orderList.push(obj.id);
+      });
+      var tquery = {
+        orderList: orderList,
+      };
+
+      this.$confirm(
+          "所选择的订单将会合并到订单号为" + orderid + "的订单下",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+      )
+          .then(() => {
+            mergeOrder(tquery).then((response) => {
+              if (response.code === 20000) {
+                this.getList();
+                this.$message({
+                  type: "success",
+                  message: "合并成功",
                 });
-        },
-        getStorageName(code) {
-            for (let i = 0; i < this.storageList.length; i++) {
-                if (this.storageList[i].code === code) {
-                    return this.storageList[i].name;
-                }
-            }
-        },
-        getSubStorageName(code) {
-            for (let i = 0; i < this.subInvList.length; i++) {
-                if (this.subInvList[i].code === code) {
-                    return this.subInvList[i].name;
-                }
-            }
-        },
-        handleErrorDetail(poistion) {
-            var mOrder = this.list[poistion];
-            this.errorDetail = mOrder.remark;
-            this.errDialogVisible = true;
-        },
-
-        mergesOrders() {
-            var repeatData = this.multipleSelection;
-            if (repeatData.length <= 1) {
-                this.$message.warning("选择的订单需大于1");
-                return;
-            }
-            var orderid = repeatData[0].id;
-            var unit = repeatData[0].fromCorp;
-            var action = repeatData[0].action;
-            var orderList = [];
-            repeatData.forEach((obj, index) => {
-                if (unit !== obj.fromCorp) {
-                    this.$message.warning("往来单位不一致！");
-                    return;
-                }
-                if (action !== obj.action) {
-                    this.$message.warning("业务类型不一致！");
-                    return;
-                }
-                orderList.push(obj.id);
+              } else {
+                this.$message.error(response.message);
+              }
             });
-            var tquery = {
-                orderList: orderList,
-            };
-
-            this.$confirm(
-                "所选择的订单将会合并到订单号为" + orderid + "的订单下",
-                "提示",
-                {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                }
-            )
-                .then(() => {
-                    mergeOrder(tquery).then((response) => {
-                        if (response.code === 20000) {
-                            this.getList();
-                            this.$message({
-                                type: "success",
-                                message: "合并成功",
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
-                })
-                .catch(() => {
-                });
-        },
+          })
+          .catch(() => {
+          });
+    },
 
-        exportOrders() {
-            var repeatData = this.multipleSelection;
-            if (repeatData.length < 1) {
-                this.$message.warning("选择的订单需大于1");
-                return;
-            }
-            var orderList = [];
-            repeatData.forEach((obj, index) => {
-                orderList.push(obj.id);
-            });
-            var tquery = {
-                ids: orderList,
-            };
-
-            exportJson(tquery).then((response) => {
-                const binaryData = [];
-                binaryData.push(response);
-                let url = window.URL.createObjectURL(
-                    new Blob(binaryData, {type: "application/json"})
-                );
-                // window.open(url);
-                this.loading = false;
-                const eleLink = document.createElement('a');
-                var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
-                // var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm")
-                eleLink.download = "Order_" + timestamp + ".LowerIn";
-                eleLink.style.display = 'none';
-                eleLink.href = url;
-                document.body.appendChild(eleLink)
-                eleLink.click()
-                document.body.removeChild(eleLink)
-            }).catch(() => {
-                this.loading = false;
-            });
+    exportOrders() {
+      var repeatData = this.multipleSelection;
+      if (repeatData.length < 1) {
+        this.$message.warning("选择的订单需大于1");
+        return;
+      }
+      var orderList = [];
+      repeatData.forEach((obj, index) => {
+        orderList.push(obj.id);
+      });
+      var tquery = {
+        ids: orderList,
+      };
+
+      exportJson(tquery).then((response) => {
+        const binaryData = [];
+        binaryData.push(response);
+        let url = window.URL.createObjectURL(
+            new Blob(binaryData, {type: "application/json"})
+        );
+        // window.open(url);
+        this.loading = false;
+        const eleLink = document.createElement('a');
+        var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
+        // var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm")
+        eleLink.download = "Order_" + timestamp + ".LowerIn";
+        eleLink.style.display = 'none';
+        eleLink.href = url;
+        document.body.appendChild(eleLink)
+        eleLink.click()
+        document.body.removeChild(eleLink)
+      }).catch(() => {
+        this.loading = false;
+      });
 
-        },
-        //获取订单列表
-        getList() {
-            this.loading = true;
-            this.filterQuery.customerId = store.getters.customerId;
-            filterOrder(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.list = response.data.list || [];
-                        this.detailList = [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.list = [];
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        //业务明细表
-        getOrderDetail(row) {
-            this.loading = true;
-            this.detailQuery = {
-                orderId: row.id,
-            };
-            this.refresgOrderDetail();
-        },
-        repeatCheckClick(row) {
-            let tQuery = {
-                orderId: row.id,
-            };
-            this.loading = true;
-            repeatCheck(tQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success(response.data);
-                        this.getList();
-                        this.detailQuery = {
-                            orderId: row.id,
-                        };
-                        this.refresgOrderDetail();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.getList();
-                    this.$message.error(response.message);
-                });
-        },
-        refresgOrderDetail() {
-            orderDetail(this.detailQuery)
-                .then((response) => {
-                    console.log(response)
-                    this.loading = false;
-                    this.detailList = response.data || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                });
-        },
-
-        handleUnitClick(row) {
-            this.curIndex = row.id;
-            // this.dialogTableVisible = true;
-        },
-        getUnitList() {
-            this.loading = true;
-            unitListBykey(this.unitquery)
-                .then((response) => {
-                    this.loading = false;
-                    this.unitlist = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
-        },
-        intentDetail(row) {
-            this.codeDetailVisible = true;
-            this.idQuery.id = row.id;
-        },
-        closeDialog() {
-            this.getList();
-        },
-
-        selectUnit(row) {
-            console.log(row.id);
-            this.unitUpdateQuery.id = this.curIndex;
-            this.unitUpdateQuery.fromCorp = row.name;
-            this.unitUpdateQuery.fromCorpId = row.unitid;
-            updateUnit(this.unitUpdateQuery)
-                .then((response) => {
-                    this.dialogTableVisible = false;
-                    this.getList();
-                })
-                .catch(() => {
-                    this.dialogTableVisible = false;
-                });
-        },
-        deleteOrders(data) {
-            this.loading = true;
-            this.deleteData.id = data;
-            deleteByOrderId(this.deleteData)
-                .then((response) => {
-                    this.getList();
-                    this.refresgOrderDetail();
-                    this.$message({
-                        type: "success",
-                        message: "删除成功！",
-                    });
-                })
-                .catch(() => {
-                });
-        },
-        tableRowClassName({row, rowIndex}) {
-            if (row.reCount === row.count) {
-                return "success-row";
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.filterQuery.customerId = store.getters.customerId;
+      filterOrder(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.list = response.data.list || [];
+              this.detailList = [];
+              this.total = response.data.total || 0;
             } else {
-                return "warning-row";
+              this.list = [];
+              this.$message.error(response.message);
             }
-        },
-
-
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteOrders(rowId);
-                })
-                .catch(() => {
-                });
-        },
-        closeDetailDialog(val) {
-            this.codeDetailVisible = false;
-        },
-        closeManuDialog(val) {
-            this.addDialogVisible = false;
-            if (val) {
-                this.$message.success("选入成功");
-                this.refresgOrderDetail();
-                this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+    //业务明细表
+    getOrderDetail(row) {
+      this.loading = true;
+      this.detailQuery = {
+        orderId: row.id,
+      };
+      this.refresgOrderDetail();
+    },
+    repeatCheckClick(row) {
+      let tQuery = {
+        orderId: row.id,
+      };
+      this.loading = true;
+      repeatCheck(tQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success(response.data);
+              this.getList();
+              this.detailQuery = {
+                orderId: row.id,
+              };
+              this.refresgOrderDetail();
             } else {
-                this.$message.error("选入失败");
-            }
-        },
-        cancelDialog() {
-            this.addDialogVisible = false;
-        },
-        importOrder(row) {
-            this.orderId = row.id;
-            this.addDialogVisible = true;
-        },
-        getBusType() {
-            let query = {
-                code: this.filterQuery.invWarehouseCode,
-                enabled: true,
-            };
-            getLocalJoinByUser(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
-                })
-                .catch(() => {
-                });
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].name;
-                }
+              this.$message.error(response.message);
             }
-        },
-        invChange() {
-            this.filterQuery.invWarehouseCode = "";
-            this.subInvList = [];
-            let query = {
-                pcode: this.filterQuery.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
-
-        getSubInvList() {
-            let query = {
-                pcode: this.filterQuery.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
+          })
+          .catch(() => {
+            this.loading = false;
+            this.getList();
+            this.$message.error(response.message);
+          });
+    },
+    refresgOrderDetail() {
+      orderDetail(this.detailQuery)
+          .then((response) => {
+            console.log(response)
+            this.loading = false;
+            this.detailList = response.data || [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.detailList = [];
+          });
+    },
 
-        subInvChange() {
-            this.getBusType();
-        },
-    }
-    ,
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                false: "success",
-                true: "danger",
-            };
-            return statusMap[status];
+    handleUnitClick(row) {
+      this.curIndex = row.id;
+      // this.dialogTableVisible = true;
+    },
+    getUnitList() {
+      this.loading = true;
+      unitListBykey(this.unitquery)
+          .then((response) => {
+            this.loading = false;
+            this.unitlist = response.data.list || [];
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+    },
+    intentDetail(row) {
+      this.codeDetailVisible = true;
+      this.idQuery.id = row.id;
+    },
+    closeDialog() {
+      this.getList();
+    },
+
+    selectUnit(row) {
+      console.log(row.id);
+      this.unitUpdateQuery.id = this.curIndex;
+      this.unitUpdateQuery.fromCorp = row.name;
+      this.unitUpdateQuery.fromCorpId = row.unitid;
+      updateUnit(this.unitUpdateQuery)
+          .then((response) => {
+            this.dialogTableVisible = false;
+            this.getList();
+          })
+          .catch(() => {
+            this.dialogTableVisible = false;
+          });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.id = data;
+      deleteByOrderId(this.deleteData)
+          .then((response) => {
+            this.getList();
+            this.refresgOrderDetail();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          })
+          .catch(() => {
+          });
+    },
+    tableRowClassName({row, rowIndex}) {
+      if (row.reCount === row.count) {
+        return "success-row";
+      } else {
+        return "warning-row";
+      }
+    },
+
+
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.deleteOrders(rowId);
+          })
+          .catch(() => {
+          });
+    },
+    closeDetailDialog(val) {
+      this.codeDetailVisible = false;
+    },
+    closeManuDialog(val) {
+      this.addDialogVisible = false;
+      if (val) {
+        this.$message.success("选入成功");
+        this.refresgOrderDetail();
+        this.getList();
+      } else {
+        this.$message.error("选入失败");
+      }
+    },
+    cancelDialog() {
+      this.addDialogVisible = false;
+    },
+    importOrder(row) {
+      this.orderId = row.id;
+      this.addDialogVisible = true;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invWarehouseCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.filterQuery.billAction = this.busTypes[0].action;
+            // this.getList();
+          })
+          .catch(() => {
+          });
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
         }
-        ,
-    }
-    ,
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-    }
-    ,
+      }
+    },
+    invChange() {
+      this.filterQuery.invWarehouseCode = "";
+      this.subInvList = [];
+      let query = {
+        pcode: this.filterQuery.locStorageCode
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+          })
+          .catch(() => {
+          });
+    },
 
-    created() {
-        this.getStorage();
-        this.getBusType();
-        let query = this.$route.query;
-        this.query = Object.assign(this.query, query);
-        this.query.limit = parseInt(this.query.limit);
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
-        selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
-            if (res.code === 20000) {
-                if (res.data.paramValue === "0") {
-                    this.enableDept = true;
-                }
-            }
-        })
+    getSubInvList() {
+      let query = {
+        // pcode: this.filterQuery.locStorageCode
+        filter: 3
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+            this.getList();
+          })
+          .catch(() => {
+          });
+    },
+
+    subInvChange() {
+      this.getBusType();
+    },
+  }
+  ,
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "danger",
+      };
+      return statusMap[status];
     }
     ,
+  }
+  ,
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+
+  created() {
+    this.getSubInvList();
+    this.getBusType();
+    let query = this.$route.query;
+    this.query = Object.assign(this.query, query);
+    this.query.limit = parseInt(this.query.limit);
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+  }
+  ,
 }
 ;
 </script>
@@ -979,10 +981,10 @@ export default {
 
 <style>
 .el-table .warning-row {
-    background: #ffb5b5;
+  background: #ffb5b5;
 }
 
 .el-table .success-row {
-    background: #ffffff;
+  background: #ffffff;
 }
 </style>
diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue
index 2f48659..c09665e 100644
--- a/src/views/inout/IONewOrder.vue
+++ b/src/views/inout/IONewOrder.vue
@@ -28,21 +28,21 @@
 
                     </el-col>
                     <el-col>
+                        <!--                        <el-form-item class="query-form-item">-->
+                        <!--                            <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
+                        <!--                                       @change="invChange"-->
+                        <!--                                       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="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
-                                       @change="invChange"
-                                       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="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                            <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                        size="mini"
                                        @change="subInvChange"
                             >
@@ -682,11 +682,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.filterQuery.locStorageCode
+                // pcode: this.filterQuery.locStorageCode
+                filter: 3,
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -720,7 +722,7 @@ export default {
         };
     },
     created() {
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let query = this.$route.query;
         this.filterQuery = Object.assign(this.filterQuery, query);
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index bf37bf9..3b371d0 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,11 +1,8 @@
 <template>
     <div class="login-container">
-
-
         <div>
             <h3 class="toptitle">{{ hospName }}</h3>
         </div>
-
         <el-form
             class="card-box login-form"
             autocomplete="on"
diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue
index d4afd11..00c411c 100644
--- a/src/views/purchase/pureApplyDetailDialog.vue
+++ b/src/views/purchase/pureApplyDetailDialog.vue
@@ -61,65 +61,24 @@
                     </el-col>
 
                     <el-col :span="7">
-                        <el-form-item prop="locStorageCode">
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"
-                                       :disabled="true"
-                                       style="width: 50%"
-                                       clearable>
-                                <el-option
-                                    v-for="item in storageList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                </el-option>
-                            </el-select>
-                            <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 50%"
-                                       :disabled="true"
-                                       clearable>
-                                <el-option
-                                    v-for="item in subInvList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
+                        <el-select v-model="formData.invWarehouseCode" placeholder="当前仓库信息" style="width: 100%"
+                                   :disabled="true"
+                                   clearable>
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{
+                                        item.warehouseName
+                                    }}</span>
+                            </el-option>
+                        </el-select>
+
                     </el-col>
 
 
-                    <!--          <el-col :span="3">-->
-                    <!--            <div class="ao-text">-->
-                    <!--              <span>当前仓库：</span>-->
-                    <!--            </div>-->
-                    <!--          </el-col>-->
-
-                    <!--          <el-col :span="7">-->
-                    <!--            <el-form-item prop="targetInv">-->
-                    <!--              <el-select v-model="formData.targetInv" placeholder="当前仓库信息" @change="locInChange"-->
-                    <!--                         style="width: 50%"-->
-                    <!--                         clearable>-->
-                    <!--                <el-option-->
-                    <!--                    v-for="item in targetInvList"-->
-                    <!--                    :key="item.name"-->
-                    <!--                    :label="item.name"-->
-                    <!--                    :value="item.code">-->
-                    <!--                  <span style="float: left">{{ item.name }}</span>-->
-                    <!--                </el-option>-->
-                    <!--              </el-select>-->
-                    <!--              <el-select v-model="formData.targetSubInv" placeholder="当前分库信息" style="width: 50%"-->
-                    <!--                         clearable>-->
-                    <!--                <el-option-->
-                    <!--                    v-for="item in targetSubInvList"-->
-                    <!--                    :key="item.name"-->
-                    <!--                    :label="item.name"-->
-                    <!--                    :value="item.code">-->
-                    <!--                  <span style="float: left">{{ item.name }}</span>-->
-                    <!--                </el-option>-->
-                    <!--              </el-select>-->
-                    <!--            </el-form-item>-->
-                    <!--          </el-col>-->
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>申购说明：</span>
@@ -133,7 +92,6 @@
                         </el-form-item>
                     </el-col>
 
-
                 </el-row>
 
 
@@ -180,12 +138,34 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-
-
+                <el-row :gutter="20" v-if="formData.audtoPlan">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>采购科室：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="targetInv">
+                            <el-select v-model="formData.targetSubInv" placeholder="当前采购科室信息" @change="setTargetInv"
+                                       style="width: 100%"
+                                       clearable>
+                                <el-option
+                                    v-for="item in targetSubInvList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{
+                                            item.warehouseName
+                                        }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
             </el-card>
 
             <el-card>
-
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
                           :row-class-name="tableRowClassName"
                           max-height="300" height="300" ref="multipleTable">
@@ -243,7 +223,6 @@
                 </el-table>
             </el-card>
         </el-form>
-
         <el-dialog
             title="产品录入"
             :visible.sync="selectProductVisible"
@@ -340,11 +319,8 @@ export default {
             thisData: {},
             storageList: [],
             subInvList: [],
-
-
             targetInvList: [],
             targetSubInvList: [],
-
             invQueryData: {},
 
         };
@@ -358,6 +334,12 @@ export default {
             let tip = "";
             if (status == "3") {
                 tip = "是否确定通过该申购请求？";
+                if (this.formData.audtoPlan) {
+                    if (this.$isBlank(this.formData.targetSubInv)) {
+                        this.$message.warning("请选择当前采购科室！");
+                        return;
+                    }
+                }
             } else {
                 tip = "是否确定拒绝该申购请求？";
             }
@@ -525,7 +507,7 @@ export default {
         findTargetSubInvs() {
             this.targetSubInvList = [];
             let query = {
-                pcode: this.formData.targetInv
+                filter:3
             };
             filterSubByInv(query)
                 .then((response) => {
@@ -590,7 +572,9 @@ export default {
         }
         this.getStorage();
         this.findSubInvs();
-        this.getTargetStorage();
+        // this.getTargetStorage();
+
+        this.findTargetSubInvs();
         this.codeArray = [];
         this.getBusType();
     },