diff --git a/public/config.json b/public/config.json
index 96a9d8b..04b2772 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
-    "BASE_URL": "http://192.168.0.66:8500/SPMS_SERVER",
-    "SERVER_IP": "http://192.168.0.66:8500/SPMS_SERVER",
+    "BASE_URL": "http://192.168.0.109:9906",
+    "SERVER_IP": "http://192.168.0.109:9906",
     "hosp_name": "诏安县总医院（测试）"
 
 }
diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue
index c0b0dae..13f3d37 100644
--- a/src/views/basic/basicCompanyProducts.vue
+++ b/src/views/basic/basicCompanyProducts.vue
@@ -693,6 +693,7 @@
                                         size="small"
                                         splaceholder="请输入内容"
                                         type='number'
+                                        step="0.01"
                                         v-model="editQuery.price"
                                     ></el-input>
                                 </div>
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 4448f50..18d6e38 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -338,7 +338,7 @@
                       style="width: 100%">
                 <el-table-column
                     type="selection"
-                    :reserve-selection="false"
+                    :reserve-selection="true"
                     width="55">
                 </el-table-column>
                 <el-table-column label="单据类型编码" prop="action" fixed></el-table-column>
@@ -894,7 +894,7 @@ export default {
             bussinessTypeQuery: {
                 enabled: true,
                 page: 1,
-                limit: 10
+                limit: 100
             },
             bussinessTypeTotal: 0,
             curSeleUser: null,
diff --git a/src/views/basic/invWarehouseRelBusTypes.vue b/src/views/basic/invWarehouseRelBusTypes.vue
index 4a5d246..ac8fe5a 100644
--- a/src/views/basic/invWarehouseRelBusTypes.vue
+++ b/src/views/basic/invWarehouseRelBusTypes.vue
@@ -122,8 +122,11 @@ export default {
         },
         handleSelectionChange(val) {
             this.multipleSelection = val;
-        }
+        },
 
+        getRowKeys(row) {
+            return row.id
+        },
     },
 
     created() {
diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue
index d7e663e..c245e1b 100644
--- a/src/views/inventory/DialogInvProduct.vue
+++ b/src/views/inventory/DialogInvProduct.vue
@@ -1,82 +1,82 @@
 <template>
-    <div>
-        <el-card>
-            <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-                <el-row>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button-group>
+  <div>
+    <el-card>
+      <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+        <el-row>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
 
-                            <el-button type="primary" icon="search" @click="onSubmit"
-                            >查询
-                            </el-button
-                            >
-                            <el-button type="primary" icon="search" @click="combine">确定</el-button>
-                        </el-button-group>
-                    </el-form-item>
-                </el-row>
-            </el-form>
+              <el-button type="primary" icon="search" @click="onSubmit"
+              >查询
+              </el-button
+              >
+              <el-button type="primary" icon="search" @click="combine">确定</el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%"
-                      highlight-current-row="false"
-                      ref="multipleTable">
-                <el-table-column
-                    type="selection"
-                    width="55">
-                </el-table-column>
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="产品标识" prop="nameCode"></el-table-column>
-                <el-table-column label="产品名称" prop="cpmctymc">
-                </el-table-column>
-                <el-table-column label="规格型号" prop="ggxh"></el-table-column>
-                <el-table-column label="批次号" prop="batchNo"></el-table-column>
-                <el-table-column label="生产日期" prop="productionDate"></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-                <el-table-column label="入库数量" prop="inCount"></el-table-column>
-                <el-table-column label="出库数量" prop="outCount"></el-table-column>
-                <el-table-column label="结余数量" prop="reCount">
-                    <template slot-scope="scope">
-                        {{ (scope.row.inCount - scope.row.outCount) }}
-                    </template>
-                </el-table-column>
+      <el-table v-loading="loading" :data="list" style="width: 100%"
+                highlight-current-row="false"
+                ref="multipleTable">
+        <el-table-column
+            type="selection"
+            width="55">
+        </el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品标识" prop="nameCode"></el-table-column>
+        <el-table-column label="产品名称" prop="cpmctymc">
+        </el-table-column>
+        <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount"></el-table-column>
+        <el-table-column label="结余数量" prop="reCount">
+          <template slot-scope="scope">
+            {{ (scope.row.inCount - scope.row.outCount) }}
+          </template>
+        </el-table-column>
 
-            </el-table>
-        </el-card>
+      </el-table>
+    </el-card>
 
-        <el-dialog
-            title="库存码详情"
-            :visible.sync="codeDetailVisible"
-            width="85%"
-            v-if="codeDetailVisible"
-        >
-            <codeDetail
-                :idQuery="idQuery"
-                v-on:closeDetailDialog="closeDetailDialog"
-            ></codeDetail>
-        </el-dialog>
-        <el-pagination
-            :page-size="filterQuery.limit"
-            @current-change="handleCurrentChange"
-            layout="prev, pager, next"
-            :total="total"
-            :current-page="filterQuery.page"
-        ></el-pagination>
-    </div>
+    <el-dialog
+        title="库存码详情"
+        :visible.sync="codeDetailVisible"
+        width="85%"
+        v-if="codeDetailVisible"
+    >
+      <codeDetail
+          :idQuery="idQuery"
+          v-on:closeDetailDialog="closeDetailDialog"
+      ></codeDetail>
+    </el-dialog>
+    <el-pagination
+        :page-size="filterQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+        :current-page="filterQuery.page"
+    ></el-pagination>
+  </div>
 </template>
 
 <script>
 import {
-    filterProducts,
-    filterDetailProducts,
-    deleteProducts,
+  filterProducts,
+  filterDetailProducts,
+  deleteProducts,
 } from "../../api/inventory/InvProducts";
 import draggable from "vuedraggable";
 import codeDetail from "./InvProductsDetail";
@@ -87,255 +87,255 @@ import {getStockOrderDetailInstrumentById} from "@/api/warehouse/stockOrder";
 
 
 export default {
-    name: "DialogInvProduct",
-    props: {
-        data: {
-            type: Object,
-            required: true,
-        },
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        invQueryData: {
-            type: Object,
-            required: true,
-        }
+  name: "DialogInvProduct",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    invQueryData: {
+      type: Object,
+      required: true,
+    }
+  },
+  data() {
+    return {
+      filterQuery: {
+        cpmctymc: null,
+        nameCode: null,
+        relIdFk: null,
+        batchNo: null,
+        page: 1,
+        limit: 10,
+        customerId: null,
+        supId: null,
+        unitFk: null,
+        invStorageCode: null,
+        invWarehouseCode: null,
+      },
+      detailQuery: {
+        code: null,
+        productIdFk: null,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      codeDetailVisible: false,
+      total: 0,
+      loading: true,
+      index: null,
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      deleteLoading: false,
+      busTypes: [],
+      idQuery: null,
+      showSup: false,
+      fromOptions: [],
+    };
+  },
+  components: {
+    draggable,
+    codeDetail,
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        cpmctymc: null,
+        nameCode: null,
+        relIdFk: null,
+        batchNo: null,
+        customerId: null,
+        unitFk: null,
+        supId: null,
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
     },
-    data() {
-        return {
-            filterQuery: {
-                cpmctymc: null,
-                nameCode: null,
-                relIdFk: null,
-                batchNo: null,
-                page: 1,
-                limit: 10,
-                customerId: null,
-                supId: null,
-                unitFk: null,
-                invStorageCode: null,
-                invWarehouseCode: null,
-            },
-            detailQuery: {
-                code: null,
-                productIdFk: null,
-                page: 1,
-                limit: 20,
-            },
-            list: [],
-            codeDetailVisible: false,
-            total: 0,
-            loading: true,
-            index: null,
-            dialogTableVisible: false,
-            formLoading: false,
-            dialogVisible: false,
-            deleteLoading: false,
-            busTypes: [],
-            idQuery: null,
-            showSup: false,
-            fromOptions: [],
-        };
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
     },
-    components: {
-        draggable,
-        codeDetail,
+    handleUnitClick(row) {
+      this.curIndex = row.id;
+      this.dialogTableVisible = true;
+    },
+    closeDetailDialog(val) {
+      this.codeDetailVisible = false;
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                cpmctymc: null,
-                nameCode: null,
-                relIdFk: null,
-                batchNo: null,
-                customerId: null,
-                unitFk: null,
-                supId: null,
-                page: 1,
-                limit: 10,
-            };
-            this.getList();
-        },
-        onSubmit() {
-            this.loading = true;
-            this.filterQuery.page = 1;
-            this.getList();
-        },
-        handleSizeChange(val) {
-            this.filterQuery.limit = val;
-            this.getList();
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        handleUnitClick(row) {
-            this.curIndex = row.id;
-            this.dialogTableVisible = true;
-        },
-        closeDetailDialog(val) {
-            this.codeDetailVisible = false;
-        },
 
-        getList() {
-            this.loading = true;
-            this.filterQuery.customerId = store.getters.customerId;
-            filterProducts(this.filterQuery)
-                .then((response) => {
-                    this.showSup = response.data.showSup;
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
+    getList() {
+      this.loading = true;
+      this.filterQuery.customerId = store.getters.customerId;
+      filterProducts(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup;
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
 
-        deleteOrders(data) {
-            this.loading = true;
-            let query = {
-                id: data,
+    deleteOrders(data) {
+      this.loading = true;
+      let query = {
+        id: data,
+      }
+      deleteProducts(query)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.getList();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
             }
-            deleteProducts(query)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.getList();
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
-
-                })
-                .catch(() => {
-                });
-        },
 
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteOrders(rowId);
-                })
-                .catch(() => {
-                });
-        },
-        findMethod(query) {
-            this.fromOptions = [];
-            let cQuery = {
-                key: query,
-            };
-            getBasicUnitMaintains(cQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.fromOptions = response.data.page.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
-        },
+          })
+          .catch(() => {
+          });
+    },
 
-        intentDetail(row) {
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.deleteOrders(rowId);
+          })
+          .catch(() => {
+          });
+    },
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+      };
+      getBasicUnitMaintains(cQuery)
+          .then((response) => {
+            this.loading = false;
+            this.fromOptions = response.data.page.list || [];
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+    },
 
-            this.idQuery = row;
-            // this.idQuery.supId = null;
-            this.idQuery.customerId = null;
-            this.codeDetailVisible = true;
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getBussinessType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
-                })
-                .catch(() => {
-                });
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].name;
-                }
-            }
-        },
-        combine() {
-            let selection = this.$refs.multipleTable.selection;
-            if (selection.length < 1) {
-                this.$message.error('未选择产品');
-                return;
-            }
-            let ids = [];
-            selection.forEach((obj, index) => {
-                let data = {
-                    relId: obj.relIdFk,
-                    batchNo: obj.batchNo,
-                    productDate: obj.productionDate,
-                    expireDate: obj.expireDate,
-                }
-                ids.push(data);
-            });
+    intentDetail(row) {
 
-            this.loading = true;
-            let tQuery = {
-                datas: ids,
-                stockOrderLists: this.data.stockOrderLists,
-            };
-            getStockOrderDetailInstrumentById(tQuery).then((response) => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.closeDialog(response.data);
-                } else {
-                    this.$message.error(response.message);
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
+      this.idQuery = row;
+      // this.idQuery.supId = null;
+      this.idQuery.customerId = null;
+      this.codeDetailVisible = true;
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getBussinessType(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.filterQuery.billAction = this.busTypes[0].action;
+            // this.getList();
+          })
+          .catch(() => {
+          });
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
     },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                false: "success",
-                true: "danger",
-            };
-            return statusMap[status];
-        },
+    combine() {
+      let selection = this.$refs.multipleTable.selection;
+      if (selection.length < 1) {
+        this.$message.error('未选择产品');
+        return;
+      }
+      let ids = [];
+      selection.forEach((obj, index) => {
+        let data = {
+          relId: obj.relIdFk,
+          batchNo: obj.batchNo,
+          productDate: obj.productionDate,
+          expireDate: obj.expireDate,
+        }
+        ids.push(data);
+      });
+
+      this.loading = true;
+      let tQuery = {
+        datas: ids,
+        stockOrderLists: this.data.stockOrderLists,
+      };
+      getStockOrderDetailInstrumentById(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
     },
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "danger",
+      };
+      return statusMap[status];
     },
-    created() {
-        this.getBusType();
-        let query = this.$route.query;
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getBusType();
+    let query = this.$route.query;
 
-        this.filterQuery = Object.assign(this.filterQuery, query);
+    this.filterQuery = Object.assign(this.filterQuery, query);
 
 
-        this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
-        this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode;
-        this.filterQuery.limit = parseInt(this.filterQuery.limit);
-        // 加载表格数据
-        this.getList();
-    },
+    this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
+    this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode;
+    this.filterQuery.limit = parseInt(this.filterQuery.limit);
+    // 加载表格数据
+    this.getList();
+  },
 };
 </script>
 
diff --git a/src/views/inventory/invUdiTraceOrder.vue b/src/views/inventory/invUdiTraceOrder.vue
index 7d1ae03..8077d63 100644
--- a/src/views/inventory/invUdiTraceOrder.vue
+++ b/src/views/inventory/invUdiTraceOrder.vue
@@ -20,7 +20,6 @@
                             style="width: 500px"
                             @keypress.enter.native="enterKey($event)"
                         ></el-input>
-                        <el-checkbox v-model="sitcomScan" style="margin-left: 15px">分段扫码</el-checkbox>
                     </el-form-item>
 
                 </el-row>
@@ -487,12 +486,8 @@ export default {
         },
 
         enterKey(event) {
-            if (this.sitcomScan) {
-                return;
-            } else {
-                this.$refs.inputRef.select();
-                this.onSubmit();
-            }
+            this.$refs.inputRef.select();
+            this.onSubmit();
         },
         onSubmit() {
             this.getList();
@@ -584,7 +579,7 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             if (!this.$isBlank(this.filterQuery.code)) {
                 let code = this.filterQuery.code;
-                this.filterQuery.code = code.replace("\r","")
+                this.filterQuery.code = code.replace("\r", "")
             }
             filterOrderTrace(this.filterQuery)
                 .then((response) => {
@@ -976,9 +971,8 @@ export default {
         };
         var that = this;
         var inputer = document.getElementById("inputer");
-        window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
+        window.sc = new A.KeyScaner(inputer);
         sc.onInput = function (text) {
-            //onInput事件在检测到回车键按下或在连续输入后超过500ms没有继续输入时触发
             if (text.includes("delete")) {
                 that.formData.code = "";
                 return;
@@ -1009,7 +1003,30 @@ export default {
 </script>
 
 
-<style>
+<style scoped>
+
+#inputer {
+    width: 100%;
+    min-height: 30px;
+    background-color: white;
+    border: #d0d0d0;
+    border-style: solid;
+    border-width: 0.1px;
+    color: #4a4a4a;
+
+}
+
+#inputer:focus {
+    width: 100%;
+    min-height: 30px;
+    background-color: white;
+    border: #0080FF;
+    border-style: solid;
+    border-width: 0.1px;
+    color: #4a4a4a;
+
+}
+
 .el-table .warning-row {
     background: #ffb5b5;
 }
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index fd09925..6395eb3 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -702,7 +702,6 @@ export default {
         },
 
 
-
         findSubStorageMethod() {
             let cQuery = {
                 pcode: this.formData.corpId,
@@ -793,9 +792,7 @@ export default {
         },
         selectProductFunction(event) {
 
-            if (event == null) {
-                // this.$refs.inputRef.focus();
-            } else {
+            if (event != null) {
                 event.target.select();
             }
             if (this.$isBlank(event)) {
diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue
index 887facd..90f85e8 100644
--- a/src/views/warehouse/stockOrderDelete.vue
+++ b/src/views/warehouse/stockOrderDelete.vue
@@ -1,608 +1,590 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form
-                :inline="true"
-                :model="query"
-                class="query-form"
-                size="mini"
+  <div>
+    <el-card class="el-card">
+      <el-form
+          :inline="true"
+          :model="query"
+          class="query-form"
+          size="mini"
 
-            >
-                <el-row style="width: 100%">
-                    <el-form-item class="query-form-item">
-                        <el-input style="width: 300px" v-model="query.billNo" placeholder="单据号"></el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button-group>
-                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-                            <el-button type="primary" icon="search" @click="deleteAllOrder">全部删除</el-button>
-                            <el-button type="primary" icon="search" @click="editAllOrderTime">编辑</el-button>
-                        </el-button-group>
-                    </el-form-item>
-                </el-row>
-
-            </el-form>
+      >
+        <el-row style="width: 100%">
+          <el-form-item class="query-form-item">
+            <el-input style="width: 300px" v-model="query.billNo" placeholder="单据号"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+              <el-button type="primary" icon="search" @click="deleteAllOrder">全部删除</el-button>
+              <el-button type="primary" icon="search" @click="editAllOrderTime">编辑</el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-row>
 
-            <el-table
-                v-loading="loading"
-                :data="list"
-                style="width: 100%"
-                @row-click="getOrderDetailList"
-                highlight-current-row
-                @selection-change="handleSelectionChange"
-                :row-class-name="tableRowClassName"
-            >
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="扫码单据类型" prop="action">
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.action) }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    label="扫码单据号"
-                    prop="id"
-                    show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="业务单据号"
-                    prop="erpFk"
-                    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="locStorageCode" width="150">
-                    <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                    </template>
-                </el-table-column>
+      </el-form>
 
-                <el-table-column label="所属部门" prop="deptName" width="120">
-                </el-table-column>
+      <el-table
+          v-loading="loading"
+          :data="list"
+          style="width: 100%"
+          @row-click="getOrderDetailList"
+          highlight-current-row
+          @selection-change="handleSelectionChange"
+          :row-class-name="tableRowClassName"
+      >
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="action">
+          <template slot-scope="scope">
+            <span>{{ getActionName(scope.row.action) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+            label="扫码单据号"
+            prop="id"
+            show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="业务单据号"
+            prop="erpFk"
+            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="locStorageCode" width="150">
+          <template slot-scope="scope">
+            <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+          </template>
+        </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="actDate"-->
-                <!--                    width="150"-->
-                <!--                    show-overflow-tooltip="true"-->
-                <!--                >-->
-                <!--                    <template slot-scope="scope">-->
-                <!--                        <i class="el-icon-time"></i>-->
-                <!--                        <span>{{ scope.row.auditTime }}</span>-->
-                <!--                    </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="操作" fixed="right" width="150">
-                    <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="deleteOrder(scope.row)"
-                        >删除
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-card>
+        <el-table-column label="所属部门" prop="deptName" width="120">
+        </el-table-column>
 
-        <el-card class="el-card" v-if="true">
-            <el-table
-                v-loading="loading"
-                :data="detailList"
-                style="width: 100%"
+        <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="操作" fixed="right" width="150">
+          <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="deleteOrder(scope.row)"
+            >删除
+            </el-button
             >
-                <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>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
 
-                <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-card class="el-card" v-if="true">
+      <el-table
+          v-loading="loading"
+          :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-dialog
-            title="详情"
-            :visible.sync="codeDetailVisible"
-            width="80%"
-            v-if="codeDetailVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-        >
-            <codeReplace
-                :idQuery="idQuery"
-                v-on:closeDetailDialog="closeDetailDialog"
-            ></codeReplace>
-        </el-dialog>
+        <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="codeDetailVisible"
+        width="80%"
+        v-if="codeDetailVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+    >
+      <codeReplace
+          :idQuery="idQuery"
+          v-on:closeDetailDialog="closeDetailDialog"
+      ></codeReplace>
+    </el-dialog>
 
-        <el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
-            <span>{{ errorDetail }}</span>
-            <span slot="footer" class="dialog-footer">
+    <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>
+    </el-dialog>
 
-        <el-dialog
-            title="修改时间"
-            :visible.sync="editOrderVisible"
-            width="35%"
-            v-if="editOrderVisible"
-        >
+    <el-dialog
+        title="修改时间"
+        :visible.sync="editOrderVisible"
+        width="35%"
+        v-if="editOrderVisible"
+    >
 
-            <el-row style="width: 100%">
-                <el-lable>创建时间：</el-lable>
-                <el-date-picker
-                    v-model="actDate"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    :picker-options="pickerOptions"
-                    placeholder="选择日期时间">
-                </el-date-picker>
-            </el-row>
+      <el-row style="width: 100%">
+        <el-lable>创建时间：</el-lable>
+        <el-date-picker
+            v-model="actDate"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :picker-options="pickerOptions"
+            placeholder="选择日期时间">
+        </el-date-picker>
+      </el-row>
 
-            <el-row style="width: 100%; margin-top: 20px;">
-                <el-lable>审核时间：</el-lable>
-                <el-date-picker
-                    v-model="auditTime"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    :picker-options="pickerOptions"
-                    placeholder="选择日期">
-                </el-date-picker>
-            </el-row>
+      <el-row style="width: 100%; margin-top: 20px;">
+        <el-lable>审核时间：</el-lable>
+        <el-date-picker
+            v-model="auditTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :picker-options="pickerOptions"
+            placeholder="选择日期">
+        </el-date-picker>
+      </el-row>
 
-            <div style="text-align: right; margin-top: 10px;">
-                <el-button type="primary" size="small" icon="search" @click="updateOrderInfo"
-                >提交
-                </el-button
-                >
-                <el-button type="primary" size="small" icon="search" @click="cancelEdit"
-                >取消
-                </el-button
-                >
-            </div>
-        </el-dialog>
+      <div style="text-align: right; margin-top: 10px;">
+        <el-button type="primary" size="small" icon="search" @click="updateOrderInfo"
+        >提交
+        </el-button
+        >
+        <el-button type="primary" size="small" icon="search" @click="cancelEdit"
+        >取消
+        </el-button
+        >
+      </div>
+    </el-dialog>
 
-    </div>
+  </div>
 </template>
 
 <script>
-    import {filterOrderForDelete, orderDetail, deleteByOrderId, updateOrderInfo} from "../../api/warehouse/order";
-    import store from "../../store";
-    import {getBussinessType} from "../../api/basic/bussinessType";
-    import {filterAllByUser} from "@/api/basic/invWarehouse";
-    import codeReplace from "./codeReplace";
+import {filterOrderForDelete, orderDetail, deleteByOrderId, updateOrderInfo} from "../../api/warehouse/order";
+import store from "../../store";
+import {getBussinessType} from "../../api/basic/bussinessType";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
+import codeReplace from "./codeReplace";
 
-    export default {
-        name: "stockOrderDelete",
-        data() {
-            return {
-                query: {
-                    billNo: "",
-                    page: 1,
-                    limit: 10
-                },
-                detailQuery: {
-                    orderIdFk: "",
-                    page: 1,
-                    limit: 20
-                },
-                busTypes: [],
-                list: [],
-                detailList: [],
-                currentCheckIndex: -1,
-                multipId: [],
-                formLabelWidth: '150px',
-                total: 0,
-                detailTotal: 0,
-                storageList: [],
-                loading: false,
-                detailLoading: false,
-                idQuery: {
-                    id: "",
-                },
-                sourceMap: {
-                    "1": "web端新增单据",
-                    "2": "第三方系统",
-                    "3": "扫码单据转换",
-                },
-                fromTypeMap: {
-                    "1": "UDIMS平台",
-                    "2": "网页新增",
-                    "3": "pda即时校验",
-                    "4": "pda未校验",
-                    "5": "pc端扫码精灵",
-                    "6": "缺量补录单据",
-                    "7": "UDI供应商平台",
-                    "8": "平衡补录单据",
-                },
-                erpCheckStatus: {
-                    0: "未校验",
-                    1: "失败",
-                    2: "成功",
-                },
-                isSp: store.getters.customerId,
-                detailFormData: {},
-                detailFormLoading: false,
-                actDateRange: [],
-                curRow: null,
-                codeDetailVisible: false,
-                editOrderVisible: false,
-                actDate: null, //创建时间
-                auditTime: null, //审核时间
-                orderIds: [],
-                pickerOptions: {
-                    disabledDate: time => {
-                        let endDate = new Date().getTime();
-                        let nowDate = new Date(time).getTime();
-                        return (nowDate > endDate);
-                    }
-                }
-            }
-        },
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: ""
-                });
-                this.query = {
-                    billNo: ""
-                };
-                this.list = [];
-                this.detailList = [];
-                this.actDateRange = [];
-            },
-            onSubmit() {
-                this.query.page = 1;
-                this.getList();
-            },
-            handleCurrentChange(val) {
-                this.query.page = val;
-                this.getList();
-            },
+export default {
+  name: "stockOrderDelete",
+  data() {
+    return {
+      query: {
+        billNo: "",
+        page: 1,
+        limit: 10
+      },
+      detailQuery: {
+        orderIdFk: "",
+        page: 1,
+        limit: 20
+      },
+      busTypes: [],
+      list: [],
+      detailList: [],
+      currentCheckIndex: -1,
+      multipId: [],
+      formLabelWidth: '150px',
+      total: 0,
+      detailTotal: 0,
+      storageList: [],
+      loading: false,
+      detailLoading: false,
+      idQuery: {
+        id: "",
+      },
+      sourceMap: {
+        "1": "web端新增单据",
+        "2": "第三方系统",
+        "3": "扫码单据转换",
+      },
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+      },
+      erpCheckStatus: {
+        0: "未校验",
+        1: "失败",
+        2: "成功",
+      },
+      isSp: store.getters.customerId,
+      detailFormData: {},
+      detailFormLoading: false,
+      actDateRange: [],
+      curRow: null,
+      codeDetailVisible: false,
+      editOrderVisible: false,
+      actDate: null, //创建时间
+      auditTime: null, //审核时间
+      orderIds: [],
+      pickerOptions: {
+        disabledDate: time => {
+          let endDate = new Date().getTime();
+          let nowDate = new Date(time).getTime();
+          return (nowDate > endDate);
+        }
+      }
+    }
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.query = {
+        billNo: ""
+      };
+      this.list = [];
+      this.detailList = [];
+      this.actDateRange = [];
+    },
+    onSubmit() {
+      this.query.page = 1;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
 
-            changeFun(row) {
-                let _this = this;
-                _this.multipId = []; //每次改动重置ID
-                row.forEach((item) => {
-                    _this.multipId.push(item.id);
-                })
-            },
-            detailHandleCurrentChange(val) {
-                this.query.page = val;
-                this.getOrderDetailList();
-            },
-            // 刷新表单
-            resetForm() {
-                if (this.$refs["dataForm"]) {
-                    // 清空验证信息表单
-                    this.$refs["dataForm"].clearValidate();
-                    // 刷新表单
-                    this.$refs["dataForm"].resetFields();
-                    this.getList();
-                }
-            },
-            getList() {
-                this.query.billNo = this.query.billNo.trim();
-                if (this.query.billNo === null || this.query.billNo === "") {
-                    this.$message.warning("请输入需要查询的单号");
-                } else {
-                    this.loading = true;
-                    filterOrderForDelete(this.query)
-                        .then(response => {
-                            this.loading = false;
-                            this.list = response.data.list || [];
-                            this.detailList = [];
-                            this.total = response.data.total || 0;
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                            this.list = [];
-                            this.total = 0;
-                            this.detailList = [];
-                        });
-                }
-            },
-            getOrderDetailList(row) {
-                if (this.$isNotBlank(row)) {
-                    this.detailQuery.orderId = row.id;
-                    this.detailQuery.orderIdFk = row.id;
-                }
-                this.detailLoading = true;
-                orderDetail(this.detailQuery)
-                    .then((response) => {
-                        this.detailLoading = false;
-                        this.detailList = response.data || [];
-                    })
-                    .catch(() => {
-                        this.detailLoading = false;
-                        this.detailList = [];
-                    });
-            },
-            tableRowClassName({row, rowIndex}) {
-                if (rowIndex === 0) {
-                    return 'highlight-row';
-                }
-                return '';
-            },
-            getActionName(action) {
-                for (let i = 0; i < this.busTypes.length; i++) {
-                    if (this.busTypes[i].action === action) {
-                        return this.busTypes[i].name;
-                    }
-                }
-            },
-            getBusType() {
-                let query = {
-                    enabled: true,
-                };
-                getBussinessType(query)
-                    .then((response) => {
-                        this.busTypes = response.data.list || [];
-                    })
-                    .catch(() => {
-                    });
-            },
-            getStorageName(code) {
-                for (let i = 0; i < this.storageList.length; i++) {
-                    if (this.storageList[i].code === code) {
-                        return this.storageList[i].name;
-                    }
-                }
-            },
-            getStorage() {
-                this.storageList = [];
-                filterAllByUser()
-                    .then((response) => {
-                        this.storageList = response.data || [];
-                    })
-                    .catch(() => {
-                    });
-            },
-            deleteOrder(row) {
-                this.$confirm('是否确认删除单据及相关数据?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    let params = {
-                        id: row.id
-                    };
-                    deleteByOrderId(params).then((res) => {
-                        if (res.code === 20000) {
-                            this.$message({
-                                type: 'success',
-                                message: '删除成功!'
-                            });
-                            this.getList();
-                            this.detailList = [];
-                        }
-                    }).catch((error) => {
-                        this.$message.error("删除失败");
-                    });
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消删除'
-                    });
-                });
-            },
-            deleteAllOrder() {
-                if (this.query.billNo === null || this.query.billNo === "" || this.list.length === 0) {
-                    return;
-                }
-                this.$confirm("是否确认删除此单据及所有关联单据？", "提示", {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    let ids = [];
-                    this.list.forEach(item => {
-                        ids.push(item.id);
-                    });
-                    let params = {
-                        ids: ids
-                    };
-                    deleteByOrderId(params).then((res) => {
-                        if (res.code === 20000) {
-                            this.$message.success("删除成功");
-                            this.list = [];
-                            this.detailList = [];
-                        }
-                    }).catch((error) => {
-                        this.$message.error("删除失败");
-                    })
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消删除'
-                    });
-                })
-            },
-            editAllOrderTime() {
-                if (this.query.billNo === null || this.query.billNo === "" || this.list.length === 0) {
-                    return;
-                }
-                this.actDate = null;
-                this.auditTime = null;
-                this.editOrderVisible = true;
-            },
-            intentDetail(row) {
-                this.codeDetailVisible = true;
-                this.idQuery.id = row.id;
-            },
-            handleEdit(row) {
-                this.editOrderVisible = true;
-                let actDateSplit = row.actDate.split(" ");
-                this.actDate = actDateSplit[0];
-                this.actDate2 = actDateSplit[1];
+    changeFun(row) {
+      let _this = this;
+      _this.multipId = []; //每次改动重置ID
+      row.forEach((item) => {
+        _this.multipId.push(item.id);
+      })
+    },
+    detailHandleCurrentChange(val) {
+      this.query.page = val;
+      this.getOrderDetailList();
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    getList() {
+      this.query.billNo = this.query.billNo.trim();
+      if (this.query.billNo === null || this.query.billNo === "") {
+        this.$message.warning("请输入需要查询的单号");
+      } else {
+        this.loading = true;
+        filterOrderForDelete(this.query)
+            .then(response => {
+              this.loading = false;
+              this.list = response.data.list || [];
+              this.detailList = [];
+              this.total = response.data.total || 0;
+            })
+            .catch(() => {
+              this.loading = false;
+              this.list = [];
+              this.total = 0;
+              this.detailList = [];
+            });
+      }
+    },
+    getOrderDetailList(row) {
+      if (this.$isNotBlank(row)) {
+        this.detailQuery.orderId = row.id;
+        this.detailQuery.orderIdFk = row.id;
+      }
+      this.detailLoading = true;
+      orderDetail(this.detailQuery)
+          .then((response) => {
+            this.detailLoading = false;
+            this.detailList = response.data || [];
+          })
+          .catch(() => {
+            this.detailLoading = false;
+            this.detailList = [];
+          });
+    },
+    tableRowClassName({row, rowIndex}) {
+      if (rowIndex === 0) {
+        return 'highlight-row';
+      }
+      return '';
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getBussinessType(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+          })
+          .catch(() => {
+          });
+    },
+    getStorageName(code) {
+      for (let i = 0; i < this.storageList.length; i++) {
+        if (this.storageList[i].code === code) {
+          return this.storageList[i].name;
+        }
+      }
+    },
+    getStorage() {
+      this.storageList = [];
+      filterAllByUser()
+          .then((response) => {
+            this.storageList = response.data || [];
+          })
+          .catch(() => {
+          });
+    },
+    deleteOrder(row) {
+      this.$confirm('是否确认删除单据及相关数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {
+          id: row.id
+        };
+        deleteByOrderId(params).then((res) => {
+          if (res.code === 20000) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+            this.getList();
+            this.detailList = [];
+          }
+        }).catch((error) => {
+          this.$message.error("删除失败");
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
+    deleteAllOrder() {
+      if (this.query.billNo === null || this.query.billNo === "" || this.list.length === 0) {
+        return;
+      }
+      this.$confirm("是否确认删除此单据及所有关联单据？", "提示", {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let ids = [];
+        this.list.forEach(item => {
+          ids.push(item.id);
+        });
+        let params = {
+          ids: ids
+        };
+        deleteByOrderId(params).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("删除成功");
+            this.list = [];
+            this.detailList = [];
+          }
+        }).catch((error) => {
+          this.$message.error("删除失败");
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      })
+    },
+    editAllOrderTime() {
+      if (this.query.billNo === null || this.query.billNo === "" || this.list.length === 0) {
+        return;
+      }
+      this.actDate = null;
+      this.auditTime = null;
+      this.editOrderVisible = true;
+    },
+    intentDetail(row) {
+      this.codeDetailVisible = true;
+      this.idQuery.id = row.id;
+    },
+    handleEdit(row) {
+      this.editOrderVisible = true;
+      let actDateSplit = row.actDate.split(" ");
+      this.actDate = actDateSplit[0];
+      this.actDate2 = actDateSplit[1];
 
-                let auditTimeSplit = row.auditTime.split(" ");
-                this.auditTime = auditTimeSplit[0];
-                this.auditTime2 = auditTimeSplit[1];
+      let auditTimeSplit = row.auditTime.split(" ");
+      this.auditTime = auditTimeSplit[0];
+      this.auditTime2 = auditTimeSplit[1];
 
-                this.orderIds = [];
-            },
-            updateOrderInfo() {
-                if (this.actDate === null || this.actDate === '') {
-                    this.$message.warning("创建时间不能为空");
-                    return;
-                }
-                this.editOrderVisible = false;
-                this.list.forEach(item => {
-                    this.orderIds.push(item.id);
-                });
-                let data = {
-                    actDate: this.actDate,
-                    auditTime: this.auditTime,
-                    orderIds: this.orderIds
-                };
-                updateOrderInfo(data).then((res) => {
-                    if (res.code === 20000) {
-                        this.$message.success("修改成功");
-                        this.getList();
-                    }
-                }).catch((error) => {
-                    this.$message.error(error.message);
-                });
-            },
-            cancelEdit() {
-                this.editOrderVisible = false;
-            }
-        },
-        components: {
-            codeReplace
-        },
-        filters: {
-            statusFilterType(status) {
-                const statusMap = {
-                    0: "gray",
-                    1: "success"
-                };
-                return statusMap[status];
-            },
-            statusFilterName(status) {
-                const statusMap = {
-                    "1": "草稿",
-                    "2": "未配货",
-                    "3": "待校验",
-                    "4": "已校验",
-                    "5": "已核对",
-                };
-                return statusMap[status];
-            },
-            typeFilterName(type) {
-                const typeMap = {
-                    1: "预入库",
-                    2: "普通采购",
-                };
-                return typeMap[type];
-            }
-        },
-        created() {
-            this.getBusType();
-            this.getStorage();
+      this.orderIds = [];
+    },
+    updateOrderInfo() {
+      if (this.actDate === null || this.actDate === '') {
+        this.$message.warning("创建时间不能为空");
+        return;
+      }
+      this.editOrderVisible = false;
+      this.list.forEach(item => {
+        this.orderIds.push(item.id);
+      });
+      let data = {
+        actDate: this.actDate,
+        auditTime: this.auditTime,
+        orderIds: this.orderIds
+      };
+      updateOrderInfo(data).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success("修改成功");
+          this.getList();
         }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      });
+    },
+    cancelEdit() {
+      this.editOrderVisible = false;
     }
+  },
+  components: {
+    codeReplace
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "gray",
+        1: "success"
+      };
+      return statusMap[status];
+    },
+    statusFilterName(status) {
+      const statusMap = {
+        "1": "草稿",
+        "2": "未配货",
+        "3": "待校验",
+        "4": "已校验",
+        "5": "已核对",
+      };
+      return statusMap[status];
+    },
+    typeFilterName(type) {
+      const typeMap = {
+        1: "预入库",
+        2: "普通采购",
+      };
+      return typeMap[type];
+    }
+  },
+  created() {
+    this.getBusType();
+    this.getStorage();
+  }
+}
 </script>
 
 <style scoped>
 
-    .el-dialog {
-        display: flex;
-        flex-direction: column;
-        margin: 0 !important;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-    }
+.el-dialog {
+  display: flex;
+  flex-direction: column;
+  margin: 0 !important;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
 
-    .el-dialog .el-dialog__body {
-        flex: 1;
-        overflow: auto;
-    }
+.el-dialog .el-dialog__body {
+  flex: 1;
+  overflow: auto;
+}
 
 
-    .el-table /deep/ .highlight-row {
-        background: #cae3f9;
-    }
+.el-table /deep/ .highlight-row {
+  background: #cae3f9;
+}
 
 </style>
 
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index 4fe446a..9009110 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -1,324 +1,324 @@
 <template>
-    <div>
-
-        <el-form :model="formData" :rules="formRules" ref="dataForm">
-            <el-row type="flex" justify="end">
-                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-                    <el-button
-                        type="primary"
-                        @click.native="saveOrder('1')"
-                        :loading="loading"
-                    >草稿保存
-                    </el-button
-                    >
-                    <el-button
-                        type="primary"
-                        @click.native="saveOrder('2')"
-                        :loading="loading"
-                    >未配货提交
-                    </el-button
-                    >
-
-                    <el-button
-                        type="primary"
-                        @click.native="saveOrder('3')"
-                        :loading="loading"
-                    >已配货提交
-                    </el-button
-                    >
-                </el-button-group>
-            </el-row>
-
-
-            <el-card style="margin-top: -5px;">
-                <el-row :gutter="20" style="margin-top: 10px;">
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>单据号：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item prop="billNo">
-                            <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>单据日期：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item prop="billdate">
-                            <!--                            <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
-                            <el-date-picker
-                                v-model="formData.billdate"
-                                type="datetime"
-                                placeholder="选择日期"
-                                style="width: 100%"
-                                :clearable="false"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                            >
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" style="margin-top: -5px">
-
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>业务类型：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item prop="billType">
-                            <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage"
-                                       :disabled="codeArray.length>0"
-                                       clearable>
-                                <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-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" style="margin-top: 5px">
-
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>当前仓库：</span>
-                        </div>
-                    </el-col>
-
-                    <el-col :span="7">
-                        <el-form-item prop="locStorageCode">
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
-                                       :disabled="codeArray.length>0"
-                                       @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-col>
-
-
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>当前分库：</span>
-                        </div>
-                    </el-col>
-
-                    <el-col :span="7">
-                        <el-form-item prop="invWarehouseCode">
-                            <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
-                                       :disabled="codeArray.length>0"
-                                       clearable>
-                                <el-option
-                                    v-for="item in subInvList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-
-            </el-card>
-
-            <el-card>
-                <el-button-group style="display: flex">
-                    <el-button
-                        type="primary"
-                        size="small"
-                        @click.native.stop="selectProductFunction()"
-                        style="margin: 0px 60px 10px auto; height: 35px"
-                        :loading="loading"
-                    >产品录入
-                    </el-button
-                    >
-                </el-button-group>
-
-                <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
-                          :row-class-name="tableRowClassName"
-                          max-height="300" height="300" ref="multipleTable">
-                    <el-table-column label="序号" type="index" width="50"></el-table-column>
-                    <el-table-column width="150"
-                                     label="产品通用名"
-                                     prop="productName"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column width="150"
-                                     label="规格型号"
-                                     prop="spec"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column width="150" label="批次号">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.batchNo"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
-                                      ref='inputBatchNoRef'
-                                      placeholder="请输入批次号" style="width: 80%"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="180" label="生产日期(yyMMdd)">
-                        <template slot-scope="scope">
-                            <el-input v-model="scope.row.productDate" auto-complete="off"
-                                      oninput="if(value.length>6)value=value.slice(0,6)"
-                                      type="number"
-                                      :disabled="false"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="180" label="失效日期(yyMMdd)">
-                        <template slot-scope="scope">
-
-                            <el-input v-model="scope.row.expireDate" auto-complete="off"
-                                      oninput="if(value.length>6)value=value.slice(0,6)"
-                                      type="number"
-                                      :disabled="false"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="150" label="单据数量">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.count"
-                                      placeholder="请输入数量" style="width: 80%"
-                                      type='number'
-                                      @change="tableCountChange(scope.row)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="150" label="价格">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.price"
-                                      type='number'
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      placeholder="请输入价格" style="width: 80%"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column width="150"
-                                     label="注册/备案凭证号"
-                                     prop="zczbhhzbapzbh"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column width="150"
-                                     label="生产厂家"
-                                     prop="ylqxzcrbarmc"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column label="操作" fixed="right" width="150">
-                        <template slot-scope="scope">
-                            <el-button
-                                type="text"
-                                size="small"
-                                :disabled="scope.row.index === selectedIndex"
-                                @click.stop="true"
-                                @click.native="rowChange(scope.row)"
-                            >编辑
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.stop="true"
-                                @click.native="copyDetail(scope.row)"
-                            >复制
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.stop="true"
-                                @click.native="deleteCodeArray(scope.$index, scope.row)"
-                            >删除
-                            </el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-card>
-        </el-form>
-
-        <el-dialog
-            title="产品录入"
-            :visible.sync="selectProductVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="85%"
-            v-if="selectProductVisible"
-            :append-to-body='true'
-        >
-            <stockOrderNewSelectProduct
-                :closeDialog="closeDialogC2"
-                :data="thisData"
-            ></stockOrderNewSelectProduct>
-        </el-dialog>
-
-
-        <el-dialog
-            title="库存产品录入"
-            :visible.sync="selectInvProductVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="85%"
-            v-if="selectInvProductVisible"
-            :append-to-body='true'
-        >
-            <dialogInvProduct
-                :closeDialog="closeDialogC2"
-                :data="thisData"
-            ></dialogInvProduct>
-        </el-dialog>
-    </div>
+  <div>
+
+    <el-form :model="formData" :rules="formRules" ref="dataForm">
+      <el-row type="flex" justify="end">
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+          <el-button
+              type="primary"
+              @click.native="saveOrder('1')"
+              :loading="loading"
+          >草稿保存
+          </el-button
+          >
+          <el-button
+              type="primary"
+              @click.native="saveOrder('2')"
+              :loading="loading"
+          >未配货提交
+          </el-button
+          >
+
+          <el-button
+              type="primary"
+              @click.native="saveOrder('3')"
+              :loading="loading"
+          >已配货提交
+          </el-button
+          >
+        </el-button-group>
+      </el-row>
+
+
+      <el-card style="margin-top: -5px;">
+        <el-row :gutter="20" style="margin-top: 10px;">
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>单据号：</span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="billNo">
+              <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>单据日期：</span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="billdate">
+              <!--                            <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
+              <el-date-picker
+                  v-model="formData.billdate"
+                  type="datetime"
+                  placeholder="选择日期"
+                  style="width: 100%"
+                  :clearable="false"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" style="margin-top: -5px">
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>业务类型：</span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="billType">
+              <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage"
+                         :disabled="codeArray.length>0"
+                         clearable>
+                <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-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" style="margin-top: 5px">
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>当前仓库：</span>
+            </div>
+          </el-col>
+
+          <el-col :span="7">
+            <el-form-item prop="locStorageCode">
+              <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
+                         :disabled="codeArray.length>0"
+                         @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-col>
+
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>当前分库：</span>
+            </div>
+          </el-col>
+
+          <el-col :span="7">
+            <el-form-item prop="invWarehouseCode">
+              <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
+                         :disabled="codeArray.length>0"
+                         clearable>
+                <el-option
+                    v-for="item in subInvList"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+      </el-card>
+
+      <el-card>
+        <el-button-group style="display: flex">
+          <el-button
+              type="primary"
+              size="small"
+              @click.native.stop="selectProductFunction()"
+              style="margin: 0px 60px 10px auto; height: 35px"
+              :loading="loading"
+          >产品录入
+          </el-button
+          >
+        </el-button-group>
+
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
+                  :row-class-name="tableRowClassName"
+                  max-height="300" height="300" ref="multipleTable">
+          <el-table-column label="序号" type="index" width="50"></el-table-column>
+          <el-table-column width="150"
+                           label="产品通用名"
+                           prop="productName"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="规格型号"
+                           prop="spec"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150" label="批次号">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.batchNo"
+                        :disabled="scope.row.index !== selectedIndex"
+                        @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
+                        ref='inputBatchNoRef'
+                        placeholder="请输入批次号" style="width: 80%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="180" label="生产日期(yyMMdd)">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.productDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        type="number"
+                        :disabled="false"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="180" label="失效日期(yyMMdd)">
+            <template slot-scope="scope">
+
+              <el-input v-model="scope.row.expireDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        type="number"
+                        :disabled="false"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="单据数量">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.count"
+                        placeholder="请输入数量" style="width: 80%"
+                        type='number'
+                        @change="tableCountChange(scope.row)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="价格">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.price"
+                        type='number'
+                        :disabled="scope.row.index !== selectedIndex"
+                        placeholder="请输入价格" style="width: 80%"
+              ></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column width="150"
+                           label="注册/备案凭证号"
+                           prop="zczbhhzbapzbh"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="生产厂家"
+                           prop="ylqxzcrbarmc"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-button
+                  type="text"
+                  size="small"
+                  :disabled="scope.row.index === selectedIndex"
+                  @click.stop="true"
+                  @click.native="rowChange(scope.row)"
+              >编辑
+              </el-button
+              >
+              <el-button
+                  type="text"
+                  size="small"
+                  @click.stop="true"
+                  @click.native="copyDetail(scope.row)"
+              >复制
+              </el-button
+              >
+              <el-button
+                  type="text"
+                  size="small"
+                  @click.stop="true"
+                  @click.native="deleteCodeArray(scope.$index, scope.row)"
+              >删除
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-form>
+
+    <el-dialog
+        title="产品录入"
+        :visible.sync="selectProductVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectProductVisible"
+        :append-to-body='true'
+    >
+      <stockOrderNewSelectProduct
+          :closeDialog="closeDialogC2"
+          :data="thisData"
+      ></stockOrderNewSelectProduct>
+    </el-dialog>
+
+
+    <el-dialog
+        title="库存产品录入"
+        :visible.sync="selectInvProductVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectInvProductVisible"
+        :append-to-body='true'
+    >
+      <dialogInvProduct
+          :closeDialog="closeDialogC2"
+          :data="thisData"
+      ></dialogInvProduct>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    stockOrderDetail,
-    submitStockOrder,
-    submitStockOrderError,
-    uploadStockOrderDetailCount,
-    stockOrderGenerateBillNo,
-    getStockOrderDetailInstrument,
-    deleteStockOrderById,
-    insertStockOrderWeb,
-    stockOrderDetailTemp,
-    deleteStockOrderDetailById,
-    addStockOrderDetailFromCode,
-    uploadStockOrderDetail,
-    copyStockOrderDetail,
-    stockOrderDetailQueryProduct,
-    getStockOrderDetailInstrumentById, stockOrderDetail2
+  stockOrderDetail,
+  submitStockOrder,
+  submitStockOrderError,
+  uploadStockOrderDetailCount,
+  stockOrderGenerateBillNo,
+  getStockOrderDetailInstrument,
+  deleteStockOrderById,
+  insertStockOrderWeb,
+  stockOrderDetailTemp,
+  deleteStockOrderDetailById,
+  addStockOrderDetailFromCode,
+  uploadStockOrderDetail,
+  copyStockOrderDetail,
+  stockOrderDetailQueryProduct,
+  getStockOrderDetailInstrumentById, stockOrderDetail2
 } from "../../api/warehouse/stockOrder";
 import draggable from "vuedraggable";
 import {
-    filterAll, filterAllByUser
+  filterAll, filterAllByUser
 } from "../../api/basic/invWarehouse";
 
 import {saveAs} from "file-saver";
@@ -332,727 +332,702 @@ import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../ap
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
-    name: "idQuery",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        idQuery: {
-            type: Object,
-            required: true,
-        },
-        closeConfirmFunction: {
-            type: Function,
-            required: true,
-        },
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            code: "",
-            query: {
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-            },
-            formData: {},
-            formRules: {
-                corpName: [
-                    {required: true, message: "请输入供应商", trigger: "blur"}
-                ],
-                billdate: [
-                    {required: true, message: "请输入单据日期", trigger: "blur"}
-                ],
-                billType: [
-                    {required: true, message: "请选择业务类型", trigger: "blur"}
-                ],
-                locStorageCode: [
-                    {required: true, message: "请选择当前仓库", trigger: "blur"}
-                ],
-                invWarehouseCode: [
-                    {required: true, message: "请选择当前分库", trigger: "blur"}
-                ],
-                // type: [
-                //     {required: true, message: "请选择采购类型", trigger: "blur"}
-                // ],
-            },
-            codeArray: [],
-            total: 0,
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-
-            statusMap: {
-                101: "未处理",
-                102: "已处理",
-                201: "未配货",
-                202: "已配货",
-                301: "已打印",
-                401: "异常",
-                501: "未提交",
-                502: "已提交",
-            },
-            typeMap: {
-                1: "预入库",
-                2: "普通采购",
-            },
-            orderEditor: true,
-            iCount: 0,
-            sOptions: [],
-            sValue: [],
-            sList: [],
-            sLoading: false,
-            busTypes: [],
-            storageList: [],
-            subInvList: [],
-            currentRow: {},
-            selectedIndex: "",
-            selectProductVisible: false,
-            selectInvProductVisible: false,
-            thisData: {},
-        };
+    idQuery: {
+      type: Object,
+      required: true,
     },
-    components: {
-        draggable,
-        stockOrderNewSelectProduct,
-        dialogInvProduct,
+    closeConfirmFunction: {
+      type: Function,
+      required: true,
     },
-    methods: {
-        saveOrder(status) {
-
-            this.code = "";
-            this.$refs.multipleTable.setCurrentRow();
-            this.currentRow = {};
-            this.selectedIndex = "";
-            this.iCount = 0;
-
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
-                    if (this.codeArray.length < 1) {
-                        this.$message.warning('未添加产品');
-                        return;
-                    }
-
-                    for (let i = 0; i < this.codeArray.length; i++) {
-                        if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) {
-                            return this.$message.error('生产日期格式错误');
-                        }
-                        if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
-                            return this.$message.error('失效日期格式错误');
-                        }
-
-                    }
-                    if (status === '3') {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
-                                return this.$message.error('单据数量不能为0');
-                            }
-                            // if (this.$isBlank(this.codeArray[i].batchNo)) {
-                            //     if (!this.codeArray[i].allowNoBatch) {
-                            //         return this.$message.error('批次号不能为空');
-                            //     }
-                            // }
-                            // if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
-                            //     return this.$message.error('生产日期与失效日期不能全部为空');
-                            // }
-                        }
-                    }
-
-
-                    if (status === '2') {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count === '0') {
-                                return this.$message.error('单据数量不能小于0');
-                            }
-                        }
-                    }
-
-                    if (status === '501') {
-                        this.submitFunction(status);
-                    } else {
+  },
+  data() {
+    return {
+      code: "",
+      query: {
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+      formData: {},
+      formRules: {
+        corpName: [
+          {required: true, message: "请输入供应商", trigger: "blur"}
+        ],
+        billdate: [
+          {required: true, message: "请输入单据日期", trigger: "blur"}
+        ],
+        billType: [
+          {required: true, message: "请选择业务类型", trigger: "blur"}
+        ],
+        locStorageCode: [
+          {required: true, message: "请选择当前仓库", trigger: "blur"}
+        ],
+        invWarehouseCode: [
+          {required: true, message: "请选择当前分库", trigger: "blur"}
+        ],
+      },
+      codeArray: [],
+      total: 0,
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+
+      statusMap: {
+        101: "未处理",
+        102: "已处理",
+        201: "未配货",
+        202: "已配货",
+        301: "已打印",
+        401: "异常",
+        501: "未提交",
+        502: "已提交",
+      },
+      typeMap: {
+        1: "预入库",
+        2: "普通采购",
+      },
+      orderEditor: true,
+      iCount: 0,
+      sOptions: [],
+      sValue: [],
+      sList: [],
+      sLoading: false,
+      busTypes: [],
+      storageList: [],
+      subInvList: [],
+      currentRow: {},
+      selectedIndex: "",
+      selectProductVisible: false,
+      selectInvProductVisible: false,
+      thisData: {},
+    };
+  },
+  components: {
+    draggable,
+    stockOrderNewSelectProduct,
+    dialogInvProduct,
+  },
+  methods: {
+    saveOrder(status) {
+
+      this.code = "";
+      this.$refs.multipleTable.setCurrentRow();
+      this.currentRow = {};
+      this.selectedIndex = "";
+      this.iCount = 0;
+
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (this.codeArray.length < 1) {
+            this.$message.warning('未添加产品');
+            return;
+          }
+
+          for (let i = 0; i < this.codeArray.length; i++) {
+            if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) {
+              return this.$message.error('生产日期格式错误');
+            }
+            if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
+              return this.$message.error('失效日期格式错误');
+            }
 
-                        if (status == "1") {
-                            this.submitFunction(status);
-                        } else {
-                            let tip = "是否确定提交订单?";
-                            if (status == "2") {
-                                tip = "是否确定提交单据为未配货？";
-                            } else if (status == "3") {
-                                tip = "是否确定提交单据为已配货？";
-                            }
-                            this.$confirm(tip, "提示", {
-                                confirmButtonText: "确定",
-                                cancelButtonText: "取消",
-                                type: "warning",
-                            }).then(() => {
-                                this.submitFunction(status);
-                            }).catch(() => {
-                                this.loading = false;
-                            });
-                        }
+          }
+          if (status === '3') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
+              // if (this.$isBlank(this.codeArray[i].batchNo)) {
+              //     if (!this.codeArray[i].allowNoBatch) {
+              //         return this.$message.error('批次号不能为空');
+              //     }
+              // }
+              // if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+              //     return this.$message.error('生产日期与失效日期不能全部为空');
+              // }
+            }
+          }
 
 
-                    }
-                }
-            });
-        },
-        submitFunction(status) {
-            let tMessage = status === '501' ? '保存' : '提交';
-            this.loading = true;
-            let tQuery = this.formData;
-            tQuery.status = status;
-            // if (!this.orderEditor) {
-            tQuery.subErpOrders = this.codeArray;
-            if (status == '3') {
-                tQuery.subErpOrders.forEach((obj) => {
-                    obj.reCount = obj.count;
-                    console.log(obj.reCount);
-                });
+          if (status === '2') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count === '0') {
+                return this.$message.error('单据数量不能小于0');
+              }
             }
+          }
 
+          if (status === '501') {
+            this.submitFunction(status);
+          } else {
 
-            console.log(tQuery);
-            insertStockOrderWeb(tQuery)
-                .then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success(tMessage + "成功");
-                        this.formData.billNo = response.data;
-                        this.closeDialog(true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                })
-        },
-        submit(formName) {
-            if (this.total < 1) {
-                this.$message.warning('未添加产品');
-                return;
-            }
-            this.$confirm("是否提交？", "提示", {
+            if (status == "1") {
+              this.submitFunction(status);
+            } else {
+              let tip = "是否确定提交订单?";
+              if (status == "2") {
+                tip = "是否确定提交单据为未配货？";
+              } else if (status == "3") {
+                tip = "是否确定提交单据为已配货？";
+              }
+              this.$confirm(tip, "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning",
-            }).then(() => {
-                let tQuery = {
-                    id: this.idQuery.id
-                }
-                this.loading = true;
-                submitStockOrder(tQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("提交成功");
-                            this.closeDialog(true);
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
-            }).catch(() => {
+              }).then(() => {
+                this.submitFunction(status);
+              }).catch(() => {
                 this.loading = false;
-            });
-        },
-        selectProductFunction(event) {
-            if (event == null) {
-            } else event.target.select();
-            if (this.$isBlank(event)) {
-
-                if (this.$isBlank(this.formData.billType)) {
-                    this.$message.error("单据类型不能为空！")
-                    return;
-                }
-                if (this.$isBlank(this.formData.locStorageCode) || this.$isBlank(this.formData.invWarehouseCode)) {
-                    this.$message.error("当前仓库和当前分库不能为空！");
-                    return;
-                }
-
-                this.code = "";
-                this.$refs.multipleTable.setCurrentRow();
-                this.currentRow = {};
-                this.selectedIndex = "";
-                this.iCount = 0;
-                this.thisData.code = "";
-                this.thisData.orderEditor = this.orderEditor;
-                this.thisData.orderId = "";
-                this.thisData.stockOrderLists = this.codeArray;
-                if (this.orderEditor) {
-                    this.thisData.orderId = this.formData.id
-                }
-                this.selectProductVisible = true;
-                return;
+              });
             }
-            this.code = this.code.trim();
 
-            if (this.code.length > 13) {
-                let tStr = this.code.substring(0, 2);
-                tStr = tStr.replace('m', 'M');
-                tStr = tStr.replace('a', 'A');
-                if (tStr.indexOf("MA") !== -1) {
-                    this.code = tStr + this.code.substring(2, this.code.length);
-                }
-            }
-
-            this.loading = true;
-            let tQuery = {
-                code: this.code,
-                customerId: store.getters.customerId,
-            };
-            stockOrderDetailQueryProduct(tQuery).then((response) => {
-                this.loading = false;
-                console.log(response)
-                if (response.code === 20000) {
-                    if (response.data.getType === "1") {
-                        this.loading = true;
-                        let ids = [response.data.getId];
-                        let tQuery2 = {
-                            ids: ids,
-                            udiEntity: response.data,
-                            stockOrderLists: this.codeArray,
-                        };
-                        getStockOrderDetailInstrumentById(tQuery2).then((response) => {
-                            this.loading = false;
-                            if (response.code === 20000) {
-                                this.closeDialogC2(response.data);
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        }).catch(() => {
-                            this.loading = false;
-                        });
 
-                    } else {
-                        this.thisData = response.data;
-                        this.thisData.code = this.code;
-                        this.thisData.orderEditor = this.orderEditor;
-                        this.thisData.orderId = "";
-                        if (this.orderEditor) {
-                            this.thisData.orderId = this.formData.id
-                        }
-                        this.thisData.stockOrderLists = this.codeArray;
-                        this.selectProductVisible = true;
-                    }
-                } else {
-                    this.$message.warning(response.message);
-                    if (this.$isNotBlank(event)) {
-                        event.target.select();
-                    }
-                }
-            });
-
-
-        },
-        closeDialogC2(rData) {
-            this.selectProductVisible = false;
-            this.selectInvProductVisible = false;
-            this.thisData = {};
-
-            if (this.$isNotBlank(rData)) {
-                this.codeArray = [];
-                rData.forEach((obj, index) => {
-                    this.codeArray.unshift(obj);
-                });
-                this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                this.currentRow = this.codeArray[0];
-                this.selectedIndex = 0;
-                this.focusNext('iCount');
-                this.closeConfirmFunction(true);
-            }
-        },
-        rowChange(val) {
-            this.currentRow = val;
-            this.selectedIndex = val.index;
-            this.iCount = val.count;
-
-            this.focusNext('iCount');
-
-        },
-        iCountChange() {
-            // console.log(this.iCount)
-            // this.currentRow.count = this.iCount;
-            // this.currentRow.reCount = this.iCount;
-        },
-        iCountEnterFunction() {
-            if (this.$isNotBlank(this.currentRow)) {
-                this.currentRow.count = this.iCount;
-                // this.currentRow.reCount = this.iCount;
-            }
-            this.focusNext('inputRef');
-        },
-        tableCountChange(row) {
-            if (this.$isNotBlank(row)) {
-                // row.count = row.reCount;
-            }
-        },
-        tableRowClassName({row, rowIndex}) {
-            row.index = rowIndex;
-        },
-        focusNext(nextRef) {
-            this.$refs[nextRef].focus()
-        },
-        focusNextToTable(nextRef) {
-            this.$refs[nextRef][0].focus()
-        },
-        remoteMethod(query) {
-            if (query !== '') {
-                this.sLoading = true;
-                let tQuery = {
-                    key: query,
-                    page: 1,
-                    limit: 20,
-                };
-                getBasicUnitMaintains2(tQuery)
-                    .then((response) => {
-                        console.log(response)
-                        this.sLoading = false;
-                        this.sOptions = response.data.list;
-                    })
-                    .catch(() => {
-                        this.sLoading = false;
-                        this.sOptions = [];
-                    });
+          }
+        }
+      });
+    },
+    submitFunction(status) {
+      let tMessage = status === '501' ? '保存' : '提交';
+      this.loading = true;
+      let tQuery = this.formData;
+      tQuery.status = status;
+      // if (!this.orderEditor) {
+      tQuery.subErpOrders = this.codeArray;
+      if (status == '3') {
+        tQuery.subErpOrders.forEach((obj) => {
+          obj.reCount = obj.count;
+          console.log(obj.reCount);
+        });
+      }
+
+
+      console.log(tQuery);
+      insertStockOrderWeb(tQuery)
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success(tMessage + "成功");
+              this.formData.billNo = response.data;
+              this.closeDialog(true);
             } else {
-                this.sOptions = [];
-            }
-        },
-        // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
-            }
-        },
-        addCode() {
-            this.code = this.code.trim();
-            if (this.$isBlank(this.code)) {
-                this.$message.warning('请输入条码');
-                return;
-            }
-            if (this.iCount <= 0) {
-                this.$message.warning('请输入数量');
-                return;
+              this.$message.error(response.message);
             }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
+    },
+    submit(formName) {
+      if (this.total < 1) {
+        this.$message.warning('未添加产品');
+        return;
+      }
+      this.$confirm("是否提交？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let tQuery = {
+          id: this.idQuery.id
+        }
+        this.loading = true;
+        submitStockOrder(tQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.$message.success("提交成功");
+                this.closeDialog(true);
+              } else {
+                this.$message.error(response.message);
+              }
+            });
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    selectProductFunction(event) {
+      if (event != null)
+        event.target.select();
+      if (this.$isBlank(event)) {
+        if (this.$isBlank(this.formData.billType)) {
+          this.$message.error("单据类型不能为空！")
+          return;
+        }
+        if (this.$isBlank(this.formData.locStorageCode) || this.$isBlank(this.formData.invWarehouseCode)) {
+          this.$message.error("当前仓库和当前分库不能为空！");
+          return;
+        }
+
+        this.code = "";
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+        this.iCount = 0;
+        this.thisData.code = "";
+        this.thisData.orderEditor = this.orderEditor;
+        this.thisData.orderId = "";
+       this.thisData.billType = this.formData.billType;
+        this.thisData.stockOrderLists = this.codeArray;
+        if (this.orderEditor) {
+          this.thisData.orderId = this.formData.id
+        }
+        this.selectProductVisible = true;
+        return;
+      }
+      this.code = this.code.trim();
+
+      if (this.code.length > 13) {
+        let tStr = this.code.substring(0, 2);
+        tStr = tStr.replace('m', 'M');
+        tStr = tStr.replace('a', 'A');
+        if (tStr.indexOf("MA") !== -1) {
+          this.code = tStr + this.code.substring(2, this.code.length);
+        }
+      }
+
+      this.loading = true;
+      let tQuery = {
+        code: this.code,
+        customerId: store.getters.customerId,
+      };
+      stockOrderDetailQueryProduct(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          if (response.data.getType === "1") {
             this.loading = true;
-            let tQuery = {
-                orderId: this.formData.id,
-                count: this.iCount,
-                code: this.code,
+            let ids = [response.data.getId];
+            let tQuery2 = {
+              ids: ids,
+              udiEntity: response.data,
+              stockOrderLists: this.codeArray,
             };
+            getStockOrderDetailInstrumentById(tQuery2).then((response) => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.closeDialogC2(response.data);
+              } else {
+                this.$message.error(response.message);
+              }
+            }).catch(() => {
+              this.loading = false;
+            });
 
+          } else {
+            this.thisData = response.data;
+            this.thisData.code = this.code;
+            this.thisData.orderEditor = this.orderEditor;
+            this.thisData.orderId = "";
             if (this.orderEditor) {
-                addStockOrderDetailFromCode(tQuery).then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.getStockOrderDetailList();
-                    } else {
-                        this.$alert(response.message, '提示', {
-                            confirmButtonText: '确定',
-                            type: 'warning',
-                            closeOnClickModal: true,
-                            callback: action => {
-                                this.$refs.inputRef.focus();
-                            }
-                        });
-                    }
-                });
-            } else {
-                getStockOrderDetailInstrument(tQuery).then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.codeArray[i].productId === response.data.productId) {
-                                this.$alert("已添加", '提示', {
-                                    confirmButtonText: '确定',
-                                    type: 'warning',
-                                    closeOnClickModal: true,
-                                    callback: action => {
-                                        this.$refs.inputRef.focus();
-                                    }
-                                });
-                                break;
-                            }
-                            if (i + 1 === this.codeArray.length) {
-                                this.codeArray.push(response.data);
-                            }
-                        }
-                        if (this.codeArray.length === 0) {
-                            this.codeArray.push(response.data);
-                        }
-                    } else {
-                        this.$alert(response.message, '提示', {
-                            confirmButtonText: '确定',
-                            type: 'warning',
-                            closeOnClickModal: true,
-                            callback: action => {
-                                this.$refs.inputRef.focus();
-                            }
-                        });
-                    }
-                });
-            }
-        },
-        saveCodeArray(index, row) {
-            if (this.$isBlank(row.batchNo)) {
-                return this.$message.error('批次号不能为空');
-            }
-            if (this.$isBlank(row.productDate)) {
-                return this.$message.error('生产日期不能为空');
-            }
-            if (this.$isBlank(row.expireDate)) {
-                return this.$message.error('失效日期不能为空');
+              this.thisData.orderId = this.formData.id
             }
+            this.thisData.stockOrderLists = this.codeArray;
+            this.selectProductVisible = true;
+          }
+        } else {
+          this.$message.warning(response.message);
+          if (this.$isNotBlank(event)) {
+            event.target.select();
+          }
+        }
+      });
 
-            this.$refs.multipleTable.setCurrentRow();
-            this.currentRow = {};
-            this.selectedIndex = "";
-            this.iCount = 0;
 
-            this.detailLoading = true;
-            // row.count = row.reCount;
-            let tQuery = row;
-            uploadStockOrderDetail(tQuery).then((response) => {
-                this.detailLoading = false;
-                if (response.code === 20000) {
-                    this.$message.success("修改完成");
-                    this.getStockOrderDetailList();
-                    this.$refs.inputRef.focus();
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-        },
-        deleteCodeArray(index, row) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.$refs.multipleTable.setCurrentRow();
-                this.currentRow = {};
-                this.selectedIndex = "";
-                this.iCount = 0;
+    },
+    closeDialogC2(rData) {
+      this.selectProductVisible = false;
+      this.selectInvProductVisible = false;
+      this.thisData = {};
 
-                if (this.orderEditor) {
-                    this.detailLoading = true;
-                    if (this.$isNotBlank(row.id)) {
-                        deleteStockOrderDetailById({id: row.id})
-                            .then(response => {
-                                this.detailLoading = false;
-                                if (response.code === 20000) {
-                                    this.$message.success(response.data);
-                                    // this.getStockOrderDetailList();
-                                    this.codeArray.splice(index, 1);
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                            })
-                            .catch(() => {
-                                this.detailLoading = false;
-                            })
-                    } else {
-                        this.$message.success('删除成功');
-                        this.codeArray.splice(index, 1);
-                    }
-                } else {
-                    this.$message.success('删除成功');
-                    this.codeArray.splice(index, 1);
-                }
-            }).catch(() => {
+      if (this.$isNotBlank(rData)) {
+        this.codeArray = [];
+        rData.forEach((obj, index) => {
+          this.codeArray.unshift(obj);
+        });
+        this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+        this.currentRow = this.codeArray[0];
+        this.selectedIndex = 0;
+        this.focusNext('iCount');
+        this.closeConfirmFunction(true);
+      }
+    },
+    rowChange(val) {
+      this.currentRow = val;
+      this.selectedIndex = val.index;
+      this.iCount = val.count;
 
-            });
-        },
-        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);
-                //         }
-                //     });
+      this.focusNext('iCount');
 
-                let rData = JSON.parse(JSON.stringify(row));
-                rData.id = null;
-                if (this.codeArray.length === 0) {
-                    this.codeArray.push(rData);
-                    this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                    this.currentRow = this.codeArray[0];
-                    this.selectedIndex = 0;
-                } else {
-                    this.codeArray.unshift(rData);
-                    this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                    this.currentRow = this.codeArray[0];
-                    this.selectedIndex = 0;
-                }
-                this.$message.success("复制成功");
-                this.iCount = this.currentRow.count;
-                this.focusNext('iCount');
-            }).catch(() => {
+    },
+    iCountChange() {
+    },
+    iCountEnterFunction() {
+      if (this.$isNotBlank(this.currentRow)) {
+        this.currentRow.count = this.iCount;
+      }
+      this.focusNext('inputRef');
+    },
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+      }
+    },
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+    focusNext(nextRef) {
+      this.$refs[nextRef].focus()
+    },
+    focusNextToTable(nextRef) {
+      this.$refs[nextRef][0].focus()
+    },
+    remoteMethod(query) {
+      if (query !== '') {
+        this.sLoading = true;
+        let tQuery = {
+          key: query,
+          page: 1,
+          limit: 20,
+        };
+        getBasicUnitMaintains2(tQuery)
+            .then((response) => {
+              console.log(response)
+              this.sLoading = false;
+              this.sOptions = response.data.list;
+            })
+            .catch(() => {
+              this.sLoading = false;
+              this.sOptions = [];
             });
-        },
-        getInputFocus(event) {
-            event.currentTarget.select();
-        },
-        tableSelection() {
-            this.$refs.multipleTable.clearSelection();
-            this.$refs.multipleTable.toggleAllSelection();
-        },
-        handleSizeChange(val) {
-            this.query.limit = val;
-            this.getStockOrderDetailList();
-        },
-        handleCurrentChange(val) {
-            this.query.page = val;
+      } else {
+        this.sOptions = [];
+      }
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    addCode() {
+      this.code = this.code.trim();
+      if (this.$isBlank(this.code)) {
+        this.$message.warning('请输入条码');
+        return;
+      }
+      if (this.iCount <= 0) {
+        this.$message.warning('请输入数量');
+        return;
+      }
+      this.loading = true;
+      let tQuery = {
+        orderId: this.formData.id,
+        count: this.iCount,
+        code: this.code,
+      };
+
+      if (this.orderEditor) {
+        addStockOrderDetailFromCode(tQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
             this.getStockOrderDetailList();
-        },
-        getStockOrderDetailList() {
-            this.loading = true;
-            stockOrderDetail(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        intentBack() {
-            this.$router.go(-1);
-        },
-
-        getBusType() {
-            let query = {
-                enabled: true,
-                code: this.formData.locStorageCode
-            };
-            getLocalJoinByUser(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.getStorage(this.formData.billType);
-                })
-                .catch(() => {
-                });
-        },
-        getStorage(event) {
-            console.log("-----" + event);
-            let query = {
-                advanceType: this.getActionName(event),
-                spUse: true,
-            };
-            this.storageList = [];
-            filterAll(query)
-                .then((response) => {
-                    this.storageList = response.data || [];
-                })
-                .catch(() => {
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+              }
+            });
+          }
+        });
+      } else {
+        getStockOrderDetailInstrument(tQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.codeArray[i].productId === response.data.productId) {
+                this.$alert("已添加", '提示', {
+                  confirmButtonText: '确定',
+                  type: 'warning',
+                  closeOnClickModal: true,
+                  callback: action => {
+                    this.$refs.inputRef.focus();
+                  }
                 });
-        },
-        getActionItem(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i];
-                }
+                break;
+              }
+              if (i + 1 === this.codeArray.length) {
+                this.codeArray.push(response.data);
+              }
             }
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].advanceType;
-                }
+            if (this.codeArray.length === 0) {
+              this.codeArray.push(response.data);
             }
-        },
-        invChange() {
-            if (this.$isNotBlank(this.formData.invWarehouseCode))
-                this.formData.invWarehouseCode = '';
-            this.findSubInvs();
-        },
-
-        findSubInvs() {
-            this.subInvList = [];
-            let query = {
-                pcode: this.formData.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+              }
+            });
+          }
+        });
+      }
+    },
+    saveCodeArray(index, row) {
+      if (this.$isBlank(row.batchNo)) {
+        return this.$message.error('批次号不能为空');
+      }
+      if (this.$isBlank(row.productDate)) {
+        return this.$message.error('生产日期不能为空');
+      }
+      if (this.$isBlank(row.expireDate)) {
+        return this.$message.error('失效日期不能为空');
+      }
+
+      this.$refs.multipleTable.setCurrentRow();
+      this.currentRow = {};
+      this.selectedIndex = "";
+      this.iCount = 0;
+
+      this.detailLoading = true;
+      let tQuery = row;
+      uploadStockOrderDetail(tQuery).then((response) => {
+        this.detailLoading = false;
+        if (response.code === 20000) {
+          this.$message.success("修改完成");
+          this.getStockOrderDetailList();
+          this.$refs.inputRef.focus();
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
+    deleteCodeArray(index, row) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+        this.iCount = 0;
+
+        if (this.orderEditor) {
+          this.detailLoading = true;
+          if (this.$isNotBlank(row.id)) {
+            deleteStockOrderDetailById({id: row.id})
+                .then(response => {
+                  this.detailLoading = false;
+                  if (response.code === 20000) {
+                    this.$message.success(response.data);
+                    // this.getStockOrderDetailList();
+                    this.codeArray.splice(index, 1);
+                  } else {
+                    this.$message.error(response.message);
+                  }
                 })
                 .catch(() => {
-                });
+                  this.detailLoading = false;
+                })
+          } else {
+            this.$message.success('删除成功');
+            this.codeArray.splice(index, 1);
+          }
+        } else {
+          this.$message.success('删除成功');
+          this.codeArray.splice(index, 1);
         }
-    },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-    },
-    created() {
-        this.getBusType();
-        this.formData = {};
-        this.codeArray = [];
-        this.closeConfirmFunction(false);
-        if (this.$isNotBlank(this.idQuery.id)) {
-            this.query.limit = 100;
-            this.query.orderIdFk = this.idQuery.id;
-            this.formData = this.idQuery.formData;
-            this.orderEditor = true;
-            this.sValue = this.formData.corpName;
-            this.getStockOrderDetailList();
+      }).catch(() => {
 
+      });
+    },
+    copyDetail(row) {
+      this.$confirm("是否复制该记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let rData = JSON.parse(JSON.stringify(row));
+        rData.id = null;
+        if (this.codeArray.length === 0) {
+          this.codeArray.push(rData);
+          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+          this.currentRow = this.codeArray[0];
+          this.selectedIndex = 0;
         } else {
-            this.formData = {
-                billdate: "",
-                corpName: store.getters.companyName,
-                customerId: store.getters.customerId,
-                billType: "",
-                type: "2",
-                locStorageCode: store.getters.locInvCode,
-                invWarehouseCode: store.getters.locSubInvCode,
-                // type: "",
-            };
-            this.iCount = 0;
-            this.orderEditor = false;
-            this.formData.billdate = new Date();
-
+          this.codeArray.unshift(rData);
+          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+          this.currentRow = this.codeArray[0];
+          this.selectedIndex = 0;
+        }
+        this.$message.success("复制成功");
+        this.iCount = this.currentRow.count;
+        this.focusNext('iCount');
+      }).catch(() => {
+      });
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    tableSelection() {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleAllSelection();
+    },
+    handleSizeChange(val) {
+      this.query.limit = val;
+      this.getStockOrderDetailList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getStockOrderDetailList();
+    },
+    getStockOrderDetailList() {
+      this.loading = true;
+      stockOrderDetail(this.query) //查找该单号下的所有条码
+          .then((response) => {
+            console.log(response)
+            this.codeArray = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+    intentBack() {
+      this.$router.go(-1);
+    },
 
+    getBusType() {
+      let query = {
+        enabled: true,
+        code: this.formData.locStorageCode
+      };
+      getLocalJoinByUser(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.getStorage(this.formData.billType);
+          })
+          .catch(() => {
+          });
+    },
+    getStorage(event) {
+      console.log("-----" + event);
+      let query = {
+        advanceType: this.getActionName(event),
+        spUse: true,
+      };
+      this.storageList = [];
+      filterAll(query)
+          .then((response) => {
+            this.storageList = response.data || [];
+          })
+          .catch(() => {
+          });
+    },
+    getActionItem(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i];
+        }
+      }
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].advanceType;
         }
-        this.findSubInvs();
+      }
     },
+    invChange() {
+      if (this.$isNotBlank(this.formData.invWarehouseCode))
+        this.formData.invWarehouseCode = '';
+      this.findSubInvs();
+    },
+
+    findSubInvs() {
+      this.subInvList = [];
+      let query = {
+        pcode: this.formData.locStorageCode
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+          })
+          .catch(() => {
+          });
+    }
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getBusType();
+    this.formData = {};
+    this.codeArray = [];
+    this.closeConfirmFunction(false);
+    if (this.$isNotBlank(this.idQuery.id)) {
+      this.query.limit = 100;
+      this.query.orderIdFk = this.idQuery.id;
+      this.formData = this.idQuery.formData;
+      this.orderEditor = true;
+      this.sValue = this.formData.corpName;
+      this.getStockOrderDetailList();
+
+    } else {
+      this.formData = {
+        billdate: "",
+        corpName: store.getters.companyName,
+        customerId: store.getters.customerId,
+        billType: "",
+        type: "2",
+        locStorageCode: store.getters.locInvCode,
+        invWarehouseCode: store.getters.locSubInvCode,
+        // type: "",
+      };
+      this.iCount = 0;
+      this.orderEditor = false;
+      this.formData.billdate = new Date();
+
+
+    }
+    this.findSubInvs();
+  },
 };
 </script>
 <style>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index b079843..bbf24cd 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -125,7 +125,7 @@
             append-to-body
             v-if="udiRlDetailVisible"
         >
-            <udiRlDetailDialog :editQuery="currentRow" ></udiRlDetailDialog>
+            <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
         </el-dialog>
     </div>
 </template>
@@ -137,8 +137,9 @@ import {
 } from "../../api/warehouse/stockOrder";
 import store from "../../store";
 import udiRlDetailDialog from "./../basic/UdiRlDetailDialog";
+
 export default {
-    name: "closeDialog",
+    name: "stockOrderNewSelectProduct",
     props: {
         data: {
             type: Object,
@@ -168,7 +169,7 @@ export default {
             total: 1,
             currentRow: null,
             loading: false,
-            udiRlDetailVisible:false,
+            udiRlDetailVisible: false,
             multipleUdiSelection: [],
             thirdSys: [],
             thirdSysFk: null,
@@ -321,6 +322,8 @@ export default {
             this.multipleUdiSelection = val;
         },
     },
+    components: {udiRlDetailDialog},
+
     created() {
         if (this.$isNotBlank(this.data)) {
             this.listQuery.nameCode = this.data.udi;
@@ -328,13 +331,15 @@ export default {
                 this.listQuery.billType = this.data.billType;
             } else
                 this.listQuery.billType = this.data.formData.billType;
-            this.listQuery.corpId = this.data.formData.corpId;
+
+            if (this.data.formData != null) {
+                this.listQuery.corpId = this.data.formData.corpId;
+            }
             this.orderEditor = this.data.orderEditor;
             this.orderId = this.data.orderId;
-            this.getList();
         }
+        this.getList();
     },
-    components: {udiRlDetailDialog},
 };
 </script>