From 8058206dee06d0ec70a742e45c3adbc2647bc830 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 8 Aug 2024 16:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E6=89=AB=E7=A0=81=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pharmaceuticals/drugDistribution.js   |   8 +
 src/views/basic/product/drug/drugAdd.vue      |   2 +
 .../distribution/DialogCreateOrder.vue        | 108 ++----
 .../distribution/IoCreateOrder.vue            |   4 -
 .../distribution/IoDealOrder.vue              | 308 ++++--------------
 5 files changed, 101 insertions(+), 329 deletions(-)

diff --git a/src/api/pharmaceuticals/drugDistribution.js b/src/api/pharmaceuticals/drugDistribution.js
index f4154c9..cc919ad 100644
--- a/src/api/pharmaceuticals/drugDistribution.js
+++ b/src/api/pharmaceuticals/drugDistribution.js
@@ -106,6 +106,14 @@ export function addOrderWeb(query) {
   });
 }
 
+export function addDrugOrderWeb(query) {
+  return axios({
+    url: "/warehouse/inout/drug/addOrderWeb",
+    method: "post",
+    data: query
+  });
+}
+
 export function enterCodeWeb(query) {
   return axios({
     url: "/warehouse/inout/enterCode",
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index b39c5a5..11e5b52 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -664,8 +664,10 @@ export default {
         this.saveLoading = false
         if (res.code == 20000) {
           this.$message.success("保存成功！");
+          this.selectedIndex = null;
           if (this.newProductData.id != null)
             this.getDetailList();
+
         } else {
           this.$message.error(res.message)
         }
diff --git a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
index 657e73c..c3fe585 100644
--- a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
+++ b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
@@ -242,13 +242,13 @@
 <script>
 import {
   submitBiz, addOrderWeb, submitCodes, submitOrderWeb, saveOrderWeb,
-  updateCodeBindSup, enterCodeWeb, submitAllocateBiz
+  updateCodeBindSup, enterCodeWeb, submitAllocateBiz, addDrugOrderWeb
 } from "@/api/pharmaceuticals/drugDistribution";
 import {findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
 import {parseTime} from "@/utils/coTools";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"
 import editCodeDialog from "./DialogEditCode";
-import {selectAuthMenuByMenuKeys } from '@/api/system/sysMenuHelp'
+import {selectAuthMenuByMenuKeys} from '@/api/system/sysMenuHelp'
 
 
 import codesPanel from "./PanelCreateOrderCodeDetail"
@@ -286,15 +286,15 @@ export default {
     return {
       BASE_URL: process.env.VUE_APP_BASE_API,
       //查看帮助相关
-      ioCreateOrderHelp500:{},
+      ioCreateOrderHelp500: {},
       // ioCreateOrderHelp502:{},
       // ioCreateOrderHelp503:{},
-      ioCreateOrderHelp504:{},
-      ioCreateOrderHelp505:{},
+      ioCreateOrderHelp504: {},
+      ioCreateOrderHelp505: {},
       // ioCreateOrderHelp507:{},
-      ioCreateOrderHelp605:{},
-      ioCreateOrderHelp604:{},
-      helpMenuKeys:[
+      ioCreateOrderHelp605: {},
+      ioCreateOrderHelp604: {},
+      helpMenuKeys: [
         "ioCreateOrderHelp500",
         // "ioCreateOrderHelp502",
         // "ioCreateOrderHelp503",
@@ -303,8 +303,8 @@ export default {
         // "ioCreateOrderHelp507",
         "ioCreateOrderHelp605",
         "ioCreateOrderHelp604"
-      ] ,
-      help:[],
+      ],
+      help: [],
       //单据相关
       orderFormData: {
         billNo: null,
@@ -402,8 +402,8 @@ export default {
       selectAuthMenuByMenuKeys(this.helpMenuKeys).then((res) => {
         if (res.code === 20000) {
           this.help = res.data;
-          if (this.help.length >0){
-            this.help.forEach( x => {
+          if (this.help.length > 0) {
+            this.help.forEach(x => {
               let menuKey = x.menuKey;
               this[menuKey] = x;
             })
@@ -414,13 +414,13 @@ export default {
 
     //查看帮助新开标签页
     helpOpenWindow(code) {
-      let helpType = this["ioCreateOrderHelp"+code].helpType;
+      let helpType = this["ioCreateOrderHelp" + code].helpType;
       //为url类型
       if (helpType == 1) {
-        window.open(this["ioCreateOrderHelp"+code].urlPath, '_blank')
-      }else if(helpType == 0 ||helpType == null){
-          let certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-          window.open(certFileUrl + this["ioCreateOrderHelp"+code].filePath);
+        window.open(this["ioCreateOrderHelp" + code].urlPath, '_blank')
+      } else if (helpType == 0 || helpType == null) {
+        let certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+        window.open(certFileUrl + this["ioCreateOrderHelp" + code].filePath);
       }
     },
 
@@ -580,13 +580,6 @@ export default {
       this.addCodeAfterCheck(event);
     },
     addCodeAfterCheck(event) {
-      this.originCode = "";
-      this.sictomText = "";
-      this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
-      this.codeFormData.batchNo = "";
-      this.codeFormData.produceDate = "";
-      this.codeFormData.expireDate = "";
-      this.codeFormData.serialNo = "";
       this.actionEnable = true;
       if (event == null) {
       } else event.target.select();
@@ -624,10 +617,9 @@ export default {
 
     },
 
-
     //添加条码后提交
     addCodeSubmit(tQuery) {
-      addOrderWeb(tQuery).then((response) => {
+      addDrugOrderWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.orderFormData.billNo = response.data.orderId;
           if (response.data.errMsg != null) {
@@ -662,7 +654,7 @@ export default {
               cancelButtonText: "查看帮助",
               type: "error",
               showClose: false,
-              showCancelButton: this.ioCreateOrderHelp504==null?false:true,
+              showCancelButton: this.ioCreateOrderHelp504 == null ? false : true,
             }).then(() => {
               tQuery.ignoreExpire = true;
               this.addCodeSubmit(tQuery)
@@ -675,7 +667,7 @@ export default {
               cancelButtonText: "查看帮助",
               type: "warning",
               showClose: false,
-              showCancelButton: this.ioCreateOrderHelp505==null?false:true,
+              showCancelButton: this.ioCreateOrderHelp505 == null ? false : true,
             }).then(() => {
               tQuery.ignoreRecentExpire = true;
               this.addCodeSubmit(tQuery)
@@ -688,7 +680,7 @@ export default {
               cancelButtonText: "查看帮助",
               showClose: false,
               type: "warning",
-              showCancelButton: this.ioCreateOrderHelp605==null?false:true,
+              showCancelButton: this.ioCreateOrderHelp605 == null ? false : true,
             }).then(() => {
 
             }).catch(() => {
@@ -701,7 +693,7 @@ export default {
               cancelButtonText: "查看帮助",
               showClose: false,
               type: "warning",
-              showCancelButton: this.ioCreateOrderHelp604==null?false:true,
+              showCancelButton: this.ioCreateOrderHelp604 == null ? false : true,
             }).then(() => {
 
             }).catch(() => {
@@ -728,7 +720,7 @@ export default {
               cancelButtonText: "查看帮助",
               type: 'warning',
               showClose: false,
-              showCancelButton: this.ioCreateOrderHelp500==null?false:true,
+              showCancelButton: this.ioCreateOrderHelp500 == null ? false : true,
               // callback: action => {
               //   this.$refs.inputRef.focus();
               //   this.$refs.inputRef.select();
@@ -869,58 +861,8 @@ export default {
 
     //校验UDI码格式是否正确
 
-    enterKey() {
-      this.checkSuccess = true;
-      let tQuery = {
-        originCode: this.originCode,
-        code: this.codeFormData.code.trim(),
-      }
-      enterCodeWeb(tQuery).then((response) => {
-        if (response.code === 20000) {
-          this.$refs.inputRef.focus();
-          this.$refs.inputRef.select();
-          this.codeFormData.code = response.data;
-          this.addCode();
-        } else {
-          if (response.code == 502) {
-            this.checkSuccess = false;
-            this.codeFormData.code = response.data;
-            this.originCode = this.codeFormData.code;
-          } else if (response.code == 501) {
-            this.checkSuccess = false;
-            this.$message.error(response.message);
-          } else if (response.code == 503) {
-            this.checkSuccess = false;
-            this.codeFormData.code = response.data;
-            this.$confirm(response.message, "提示", {
-              type: "warning",
-            })
-              .then(() => {
-                this.codeFormData.code = response.data;
-                this.addCode();
-              })
-              .catch(() => {
-                this.codeFormData.code = this.originCode;
-              });
-
-          } else if (response.code == 508) {
-            this.originCode = "";
-            this.codeFormData.code = "01" + response.data.nameCode;
-            this.originCode = this.codeFormData.code;
-          } else {
-            this.$alert(response.message, '提示', {
-              confirmButtonText: '确定',
-              type: 'warning',
-              closeOnClickModal: true,
-              callback: action => {
-                this.$refs.inputRef.focus();
-                this.$refs.inputRef.select();
-              }
-            });
-          }
-        }
-        this.loading = false;
-      });
+    enterKey(event) {
+      this.addCode()
     },
 
 
diff --git a/src/views/pharmaceuticals/distribution/IoCreateOrder.vue b/src/views/pharmaceuticals/distribution/IoCreateOrder.vue
index a069c5c..290b66f 100644
--- a/src/views/pharmaceuticals/distribution/IoCreateOrder.vue
+++ b/src/views/pharmaceuticals/distribution/IoCreateOrder.vue
@@ -377,13 +377,9 @@
 import {
   deleteByOrderId,
   submitOrderWeb,
-  updateUnit, mergeOrder,
   getOrderList
 } from "@/api/pharmaceuticals/drugDistribution";
-import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"
-import draggable from "vuedraggable";
 import addOrder from "./DialogCreateOrder";
-import store from "@/store";
 import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import {getLocalJoinByUserOptimize} from "@/api/basic/busType";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
diff --git a/src/views/pharmaceuticals/distribution/IoDealOrder.vue b/src/views/pharmaceuticals/distribution/IoDealOrder.vue
index 60f1336..80c831d 100644
--- a/src/views/pharmaceuticals/distribution/IoDealOrder.vue
+++ b/src/views/pharmaceuticals/distribution/IoDealOrder.vue
@@ -1,88 +1,12 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单号:">-->
-<!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
-<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购部门:">&ndash;&gt;-->
-<!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"&ndash;&gt;-->
-<!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
-<!--          &lt;!&ndash;              >&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
-<!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
-<!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
-<!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
-<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="收货仓库:">-->
-<!--              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"-->
-<!--                         style="width: 90%"-->
-<!--                         @change="invChange"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单据类型:">-->
-<!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
-<!--                         style="width: 90%"-->
-<!--                         clearable>-->
-<!--                <el-option-->
-<!--                  v-for="item in busTypes"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.action">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="8">-->
-
-
-<!--            <el-form-item class="query-form-item" label="创建时间:">-->
-<!--              <el-date-picker-->
-<!--                :picker-options="pickerOptions"-->
-<!--                v-model="actDateRange"-->
-<!--                type="daterange"-->
-<!--                format="yyyy 年 MM 月 dd 日"-->
-<!--                value-format="yyyy-MM-dd"-->
-<!--                range-separator="至"-->
-<!--                start-placeholder="开始日期"-->
-<!--                end-placeholder="结束日期"-->
-<!--                style="width: 90%"-->
-<!--              >-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-
-<!--        </el-row>-->
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"
+               label-width="100px" v-show="showSearch">
         <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <template v-for="(item, index) in queryList" >
-            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+          <template v-for="(item, index) in queryList">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -91,7 +15,8 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select v-model="filterQuery[item.columnName]"
                          :placeholder="item.columnDesc"
                          :disabled="executeEval(null,item.disabledFuc,false)"
@@ -104,7 +29,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -122,7 +48,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -134,7 +61,8 @@
                 end-placeholder="结束日期"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="filterQuery[item.columnName]"
                 :style="`width:${item.width+'px'}`"
@@ -170,66 +98,6 @@
                 :default-sort="defaultSort"
                 @sort-change="handleSortChange"
       >
-<!--        <el-table-column label="序号" type="index"></el-table-column>-->
-<!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>-->
-<!--        <el-table-column label="单据类型" prop="billTypeName" width="150">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip-->
-<!--                         sortable="custom"-->
-<!--                         :sort-orders="['ascending', 'descending']">-->
-<!--          <template slot-scope="scope">-->
-<!--            <i class="el-icon-time"></i>-->
-<!--            <span>{{ scope.row.createTime }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="收货仓库" prop="invName" width="120">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
-<!--        <el-table-column label="来源" prop="fromType" width="120">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column label="单据状态" prop="status" width="100">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-<!--                checkStatus[scope.row.status]-->
-<!--              }}-->
-<!--            </el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" width="150" fixed="right">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="addOrders(scope.row)"-->
-<!--            >编辑-->
-<!--            </el-button-->
-<!--            >-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="deleteDialog(scope.row.billNo)"-->
-<!--            >删除-->
-<!--            </el-button-->
-<!--            >-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="onUpload(scope.row.billNo)"-->
-<!--            >校验提交-->
-<!--            </el-button-->
-<!--            >-->
-<!--          </template>-->
-<!--        </el-table-column>-->
         <template v-for="(item, index) in tableHeader">
           <el-table-column
             v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -250,7 +118,7 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
@@ -263,8 +131,10 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template   slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                  item.lableRuleObj[scope.row[item.columnName]]
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -276,9 +146,12 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template   slot-scope="scope">
-              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+            <template slot-scope="scope">
+              <el-tag
+                :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{
+                    item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                  }}</span>
               </el-tag>
             </template>
           </el-table-column>
@@ -313,7 +186,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -361,30 +236,6 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
-        <!--<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">-->
-        <!--  <el-form-item class="query-form-item" label="物资名称:">-->
-        <!--    <el-input-->
-        <!--      v-model="bizQuery.productName"-->
-        <!--      placeholder="请输入物资名称"-->
-        <!--      clearable-->
-        <!--    >-->
-        <!--    </el-input>-->
-        <!--  </el-form-item>-->
-        <!--  <el-form-item>-->
-        <!--    <el-button-group>-->
-        <!--      <el-button-->
-        <!--        type="primary"-->
-        <!--        icon="el-icon-refresh"-->
-        <!--        @click="onBizReset"-->
-        <!--      >重置-->
-        <!--      </el-button>-->
-        <!--      <el-button type="primary" @click="onBizSubmit"-->
-        <!--                 icon="el-icon-search"-->
-        <!--      >查询-->
-        <!--      </el-button>-->
-        <!--    </el-button-group>-->
-        <!--  </el-form-item>-->
-        <!--</el-form>-->
         <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
                   :row-style="rowStyle"
                   row-key="id"
@@ -404,57 +255,30 @@
             label="规格型号" width="150"
             prop="spec"
           ></el-table-column>
-          <el-table-column  label="批次号" header-align="center">
-            <el-table-column header-align="center"
-                             label="手录" width="100"
-                             prop="bbatchNo"
-                             show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column header-align="center"
-                             label="扫码"
-                             prop="sbatchNo" width="100"
-                             show-overflow-tooltip
-            ></el-table-column>
-          </el-table-column>
-
-          <el-table-column label="生产日期" header-align="center">
-            <el-table-column header-align="center"
-                             label="手录" width="100"
-                             prop="bproductDate"
-                             show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column header-align="center"
-                             label="扫码" width="100"
-                             prop="sproductDate"
-                             show-overflow-tooltip
-            ></el-table-column>
+          <el-table-column label="批次号"
+                           prop="bbatchNo"
+                           width="120"
+                           show-overflow-tooltip>
           </el-table-column>
+          <el-table-column
+            label="单据数量" width="100"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量" width="100"
+            prop="scanCount"
+          ></el-table-column>
 
-          <el-table-column label="失效日期" header-align="center">
-            <el-table-column header-align="center"
-                             label="手录" width="100"
-                             prop="bexpireDate"
-                             show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column header-align="center"
-                             label="扫码" width="100"
-                             prop="sexpireDate"
-                             show-overflow-tooltip
-            ></el-table-column>
+          <el-table-column label="生产日期"
+                           prop="bproductDate"
+                           width="120"
+                           show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="数量" header-align="center">
-            <el-table-column
-              header-align="center"
-              label="单据数量" width="100"
-              prop="count"
-            ></el-table-column>
-            <el-table-column
-              header-align="center"
-              label="扫码数量" width="100"
-              prop="scanCount"
-            ></el-table-column>
+          <el-table-column label="失效日期"
+                           prop="bexpireDate"
+                           width="120"
+                           show-overflow-tooltip>
           </el-table-column>
-
           <el-table-column
             label="价格"
             prop="price" width="100"
@@ -494,7 +318,7 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {isBlank} from "@/utils/strUtil";
 import {getBizDetailList, getCheckDetailList} from "@/api/pharmaceuticals/drugOrderDetail";
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 
@@ -509,7 +333,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "unCheck",
+        statusType: "unAllocate",
         page: 1,
         limit: 10,
         startTime: null,
@@ -517,7 +341,7 @@ export default {
         invCode: this.$store.getters.locInvCode,
         productType: 2
       },
-      viewType: 3,
+      viewType: 4,
       checkStatus: {
         1: "草稿",
         2: "等待处理",
@@ -537,13 +361,13 @@ export default {
       codeDetailVisible: false,
       addOrderVisible: false,
       total: 0,
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
       options: {
-        getInvList:[],
-        getDeptList:[],
-        getBusType:[],
+        getInvList: [],
+        getDeptList: [],
+        getBusType: [],
       },
       loading: false,
       index: null,
@@ -567,7 +391,7 @@ export default {
         "11": "仓库盘点",
         "12": "采购计划",
         "13": "领用单据",
-        "14": "第三方系统单据","15":"采购订单"
+        "14": "第三方系统单据", "15": "采购订单"
       },
       deleteData: {
         billNo: "",
@@ -687,7 +511,7 @@ export default {
         .catch(() => {
         });
     },
-    addOrders(_this,row) {
+    addOrders(_this, row) {
       _this.currentRow = row;
       _this.idQuery = {};
       _this.idQuery = row;
@@ -755,7 +579,7 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(_this,rowId) {
+    deleteDialog(_this, rowId) {
       _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -767,7 +591,7 @@ export default {
         .catch(() => {
         });
     },
-    onUpload(_this,data) {
+    onUpload(_this, data) {
       _this.loading = true;
       var idQuery = {
         billNo: "",
@@ -838,7 +662,7 @@ export default {
       this.getBizDetailList();
     },
 
-    handleSelectionChange(_this,val) {
+    handleSelectionChange(_this, val) {
       _this.currentRow = val;
       _this.getBizDetailList();
     },
@@ -864,11 +688,11 @@ export default {
         this.bizTotal = 0;
       })
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -883,7 +707,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    getHead("IoDealOrder","1").then((re) => {
+    getHead("IoDealOrder", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;