From a4f56dbeeb755475e5c4d947173326e1fd44aa95 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 19 Dec 2024 11:16:20 +0800
Subject: [PATCH 01/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IocCollectOrderCheckCode.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index 9eec9229..4338673d 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -45,7 +45,7 @@
         </el-row>
 
 
-        <div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">
+        <div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px"  v-loading="this.loading">
           <el-row :gutter="0" style="margin-top: 5px">
             <el-col :span="20">
               <el-form-item prop="code" :label="scanTip" label-width="80px">
@@ -186,6 +186,7 @@ export default {
       scanResultType: 'success',
       result: '\n',
       errVisible: false,
+      loading: false,
       successVisible: true,
       errResult: '',
       scanCode: '',
@@ -252,7 +253,7 @@ export default {
     },
 
     enterBillNoKey(billNo) {
-      // this.checkSuccess = true;
+      this.loading = true;
       this.filterQuery.code = this.scanCode
       let tQuery = {
         viewType: 'tagCode',

From b1727de5dc1f38d39a96677574001d8f17a63f19 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 19 Dec 2024 11:34:11 +0800
Subject: [PATCH 02/12] =?UTF-8?q?12/19=20=E5=8D=95=E6=8D=AE=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=20=E4=B8=9A=E5=8A=A1=E8=AF=A6=E6=83=851.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/workplace/busTypeManage.vue   | 13 +++--
 src/views/basic/workplace/workplaceManage.vue | 13 +++--
 src/views/collect/DialogCheckCode.vue         | 13 +++--
 .../collect/IocCollectOrderCheckCode.vue      | 53 +++++++++++++++----
 src/views/collect/PanelOrderEndSearch.vue     | 15 +++++-
 5 files changed, 78 insertions(+), 29 deletions(-)

diff --git a/src/views/basic/workplace/busTypeManage.vue b/src/views/basic/workplace/busTypeManage.vue
index 042fec2f..c0893980 100644
--- a/src/views/basic/workplace/busTypeManage.vue
+++ b/src/views/basic/workplace/busTypeManage.vue
@@ -353,13 +353,12 @@ export default {
         3: '用户所属仓库',
       },
       consignees: {
-        1: '原始单据的收货方',
-        2: '原始单据的发货方',
-        3: '供应商',
-        4: '客户',
-        5: '特殊往来',
-        6: '内部科室',
-        7: '填写',
+        1: '客户',
+        2: '供应商',
+        3: '内部科室',
+        4: '特殊往来',
+        5: '原始单据的收货方',
+        6: '原始单据的发货方',
       },
       userList: [],
       userLoading: false,
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 763faf96..2993fb75 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -912,13 +912,12 @@ export default {
         'true' : '是',
       },
       consignees: {
-        1: '原始单据的收货方',
-        2: '原始单据的发货方',
-        3: '供应商',
-        4: '客户',
-        5: '特殊往来',
-        6: '内部科室',
-        7: '填写',
+        1: '客户',
+        2: '供应商',
+        3: '内部科室',
+        4: '特殊往来',
+        5: '原始单据的收货方',
+        6: '原始单据的发货方',
       },
       userList: [],
       userLoading: false,
diff --git a/src/views/collect/DialogCheckCode.vue b/src/views/collect/DialogCheckCode.vue
index edf73198..c96a21c1 100644
--- a/src/views/collect/DialogCheckCode.vue
+++ b/src/views/collect/DialogCheckCode.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-button-group  style="display: flex; justify-content: flex-end;">
+      <el-button-group  style="display: flex; justify-content: flex-end;" v-if="type == 1">
         <el-button
           type="primary"
           @click.native="confirmCheckOrder()"
@@ -11,7 +11,7 @@
       <el-form :model="orderData" class="demo-form-inline" style="margin-top: 30px" @submit.native.prevent>
 
         <!--<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">-->
-        <el-row :gutter="0" style="margin-top: 5px">
+        <el-row :gutter="0" style="margin-top: 5px" v-if="type == 1">
           <el-col :span="20">
             <el-form-item prop="code" label="扫码校验" label-width="80px">
               <el-input
@@ -40,7 +40,7 @@
           </el-col>
         </el-row>
         <el-alert
-          v-if="successVisible"
+          v-if="successVisible && type == 1"
           :title="scanTitle"
           :type="scanResultType"
           :closable="false"
@@ -57,7 +57,7 @@
         <!--  :description="warnResult">-->
         <!--</el-alert>-->
         <el-alert
-          v-if="errVisible"
+          v-if="errVisible && type == 1"
           title="错误信息:"
           type="error"
           :closable="false"
@@ -154,6 +154,11 @@ export default {
       type: Function,
       required: true
     },
+    type: {
+      type: Object,
+      default: null,
+      required: true
+    },
   },
   data() {
     return {
diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index 4338673d..e4afc661 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -154,6 +154,30 @@
             @pagination="getCodeList"
           ></pagination>
         </el-tab-pane>
+        <el-tab-pane>
+          <span slot="label">单据 {{ orderData.billNo }}-业务详情</span>
+          <el-table :data="busDataList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
+          >
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="药品编码" prop="nameCode"></el-table-column>
+            <el-table-column label="产品通用名称" prop="cpmctymc" width="120"></el-table-column>
+            <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
+            <el-table-column label="包装规格" prop="spec" width="80"></el-table-column>
+            <el-table-column label="批次号" prop="batchNo"></el-table-column>
+            <el-table-column label="生产日期" prop="productDate"></el-table-column>
+            <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+            <el-table-column label="医保编码" prop="ybbm"></el-table-column>
+            <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+            <!--<el-table-column label="扫码数量" prop="scanActCount"></el-table-column>-->
+          </el-table>
+          <pagination
+            v-show="busDataTotal>0"
+            :total="busDataTotal"
+            :limit.sync="busQuery.limit"
+            :page.sync="busQuery.page"
+            @pagination="getBizDetailList"
+          ></pagination>
+        </el-tab-pane>
       </el-tabs>
 
 
@@ -198,6 +222,13 @@ export default {
         page: 1,
         limit: 10
       },
+      busQuery: {
+        billNo: null,
+        orderIdFk: null,
+        code: null,
+        page: 1,
+        limit: 10
+      },
       filterQuery: {
         code: '',
         billNo: null,
@@ -216,7 +247,9 @@ export default {
       curRow: null,
       codeList: [],
 
-      checkCodeList: []
+      checkCodeList: [],
+      busDataList:[],
+      busDataTotal:0
 
     }
   },
@@ -273,6 +306,7 @@ export default {
           this.$refs.inputRef.select()
           this.scanCode = ''
           this.getCodeList()
+          this.getBizDetailList()
         }else {
           this.$refs.inputRef.focus()
           this.$refs.inputRef.select()
@@ -303,21 +337,19 @@ export default {
       })
     },
     getBizDetailList() {
-      let preQuery = {}
-      if (this.filterQuery == null) {
-        return
-      }
-      if (this.filterQuery != null) {
-        preQuery = {
 
-          orderIdFk: this.filterQuery.billNo
-        }
+      if (this.orderData != null) {
+        // this.codeQuery.page = 1
+        this.busQuery.orderIdFk = this.orderData.billNo
+        // this.codeQuery.bizIdFk = this.bizId
       }
-      orderDetail(preQuery).then(res => {
+      orderDetail(this.busQuery).then(res => {
         if (res.code != 20000) {
           this.$message.error(res.message)
           return
         }
+        this.busDataList = res.data.list
+        this.busDataTotal = res.data.total
       }).catch(() => {
         this.$message.error('数据加载失败')
       })
@@ -505,6 +537,7 @@ export default {
       }
 
     },
+
     batchVailCode(params) {
       // batchVailCode(params).then((res) => {
       //   if (res.code === 20000) {
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index e0d9e8c3..b72c1d86 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -273,7 +273,7 @@
     </el-tabs>
 
     <el-dialog
-      title="扫码校验"
+      :title="scanTitleMap[scanTitle]"
       :visible.sync="codeCheckVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -285,6 +285,7 @@
       <DialogCheckCode
         :orderData="curRow"
         :closeCodeCheckDialog="closeCodeCheckDialog"
+        :type="scanTitle"
       >
 
       </DialogCheckCode>
@@ -414,6 +415,11 @@ export default {
 
       //码校验数据
 
+      scanTitle: 1,
+      scanTitleMap: {
+        1 : '扫码校验',
+        2 : '校验详情'
+      }
     }
   },
 
@@ -562,6 +568,13 @@ export default {
 
     //码校验
     codeCheckClick(_this,row){
+      _this.scanTitle = 1
+      _this.curRow = row
+      _this.codeCheckVisible = true
+    },
+    //校验详情
+    codeCheckDetail(_this,row){
+      _this.scanTitle = 2
       _this.curRow = row
       _this.codeCheckVisible = true
     },

From 2ac137215bd50588bdce8490fd47f6a3f41fc8d6 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 19 Dec 2024 11:37:18 +0800
Subject: [PATCH 03/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderTabs.vue | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index 6558a6c7..240931fc 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -57,7 +57,7 @@
 <!--              <i class="el-icon-s-order"></i>-->
 <!--              <span>单据管理</span>-->
 <!--            </template>-->
-            <el-menu-item :index=0 @click="clickMenuItem(0)" v-if="workPlaceClass == 1">
+            <el-menu-item :index=0 @click="clickMenuItem(0)" v-if="workPlaceClass == 1" >
               <!--              <i class="el-icon-edit-outline"></i>-->
               <span slot="title">处理单据</span>
             </el-menu-item>
@@ -444,6 +444,7 @@ export default {
       tabIndex: 0,
       menuActive: 0,
       autoTag: 0,
+      inAndOutType: 0,
       workPlaceClass: 1,
       resetKeys: {}
     }
@@ -642,9 +643,11 @@ export default {
             let busType = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType)
             this.formData.busName = busType.busName;
             this.autoTag = busType.autoTag;
+            this.inAndOutType = busType.inAndOutType;
           } else if (this.busTypeList.length == 1) {
             this.formData.busType = this.busTypeList[0].documentTypeCode
             this.autoTag = this.busTypeList[0].autoTag;
+            this.inAndOutType = this.busTypeList[0].inAndOutType;
             this.$router.push({query: {...this.$route.query, busType: this.formData.busType}, path: this.$route.path})
             this.selectBusTypeDisabled = false
             this.formData.busName = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType).busName;
@@ -653,6 +656,21 @@ export default {
             this.formData.busType = null
           }
 
+          if(this.inAndOutType == 1){
+            this.closeAllTabs()
+            this.editableTabsValue = 'IocCollectOrderCheckCode';
+            this.menuActive= 10,
+              this.editableTabs =  [{
+                number: 10,
+                title: '单据审核',
+                name: 'IocCollectOrderCheckCode',
+                component: IocCollectOrderCheckCode,
+                // 假设你需要传递的参数
+                componentProps: {}
+              }
+              ];
+          }
+
         }
         return
       })

From 8bc454e7f857444e844e63023fac45919ee4adb7 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 19 Dec 2024 13:40:04 +0800
Subject: [PATCH 04/12] =?UTF-8?q?12/19=20=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectFinishOrderBackupDetail.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/collect/CollectFinishOrderBackupDetail.vue b/src/views/collect/CollectFinishOrderBackupDetail.vue
index 0a65834a..5027c654 100644
--- a/src/views/collect/CollectFinishOrderBackupDetail.vue
+++ b/src/views/collect/CollectFinishOrderBackupDetail.vue
@@ -274,15 +274,14 @@ export default {
     ///界面配置相关------------end
 
     preHandleCurrentChange(val) {
-      this.filterQuery.page = val.page;
-      this.getPrescribeDetail(this, null);
+      this.preQuery.page = val.page;
+      this.getPrescribeDetail(this);
     },
     getPrescribeDetail(_this) {
-
       if (_this.prescribeData == null)
         return
       if (_this.prescribeData != null) {
-        _this.preQuery.page = 1
+        // _this.preQuery.page = 1
         _this.preQuery.orderIdFk = this.prescribeData.billNo
       }
       _this.preLoading = true;
@@ -293,6 +292,7 @@ export default {
           return
         }
         _this.preDetailList = res.data.list
+        _this.preTotal = res.data.total
         _this.preLoading = false
       }).catch(() => {
         _this.preLoading = false

From 63f6a01374630e59acd0618da081011ed244cb0b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 20 Dec 2024 09:45:23 +0800
Subject: [PATCH 05/12] =?UTF-8?q?12/20=20=E8=8D=AF=E5=93=81=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=20=E5=9F=BA=E7=A1=80=E6=98=BE=E7=A4=BA=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/drug/drugAdd.vue      |  27 ++++-
 .../collect/IocCollectOrderCheckCode.vue      |   1 +
 src/views/inout/InvoiceCkeck.vue              |   2 +-
 src/views/inoutDrug/InvoiceCkeck.vue          | 106 +-----------------
 src/views/inoutDrug/InvoiceRegByOrder.vue     |   7 +-
 5 files changed, 37 insertions(+), 106 deletions(-)

diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index d2e98a7a..4b6e77a3 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -79,6 +79,13 @@
                 ></el-input>
               </template>
             </el-table-column>
+            <el-table-column label="包装比例" prop="packRatio" show-overflow-tooltip width="120">
+              <template slot-scope="scope">
+                <el-input size="small" v-model="scope.row.packRatio" style="width: 100%"
+                          :disabled="scope.$index !== selectedIndex"
+                ></el-input>
+              </template>
+            </el-table-column>
             <el-table-column label="层级单位" prop="packUnit" show-overflow-tooltip width="120">
               <template slot-scope="scope">
                 <el-input size="small" v-model="scope.row.packUnit" style="width: 100%"
@@ -262,7 +269,7 @@
                   <el-option label="中药注射剂" :value="7"></el-option>
                   <el-option label="疫苗" :value="8"></el-option>
                   <el-option label="血液制品" :value="9"></el-option>
-                  <el-option label="国家基本药品目录入网药品" :value="10"></el-option>
+                  <el-option label="国家基本药品目录入网药品" :value="10" v-if="!isSpecial"></el-option>
                   <el-option label="非基本药物" :value="11"></el-option>
                   <el-option label="各省增补基本药物" :value="12"></el-option>
                   <el-option label="特殊药品复方制剂" :value="13"></el-option>
@@ -830,6 +837,7 @@ export default {
           productId: null,
           nameCode: '',
           packLevel: null,
+          packRatio: null,
           bhxjsl: null,
           isDisabled: false,
           isUpDisabled: true,
@@ -849,7 +857,8 @@ export default {
       levelUnitList: [],
       maxLevel: 1,
 
-      editRowSwitch: false //产品标识编辑开关 没保存前其他编辑不能按
+      editRowSwitch: false, //产品标识编辑开关 没保存前其他编辑不能按
+      isSpecial:false
     }
 
   },
@@ -1061,7 +1070,8 @@ export default {
         uuid: this.newProductData.uuid,
         productId: row.productId,
         diType: row.diType,
-        xjdw: row.xjdw
+        xjdw: row.xjdw,
+        packRatio: row.packRatio
       }
       updateLevelDrug(editQuery).then(res => {
         this.saveLoading = false
@@ -1150,6 +1160,7 @@ export default {
           .then((response) => {
             this.loading = false
             this.detailList = response.data || []
+            this.checkIsSpecial()
           })
           .catch(() => {
             this.loading = false
@@ -1157,7 +1168,15 @@ export default {
           })
       }
     },
-
+    checkIsSpecial(){
+      if (this.detailList.length > 0){
+        this.detailList.forEach(item => {
+          if (item.nameCode.startsWith('89')) {
+            this.isSpecial = true
+          }
+        })
+      }
+    },
     distributeLevelDiChange(val) {
       const matchingItem = this.detailList.find(item => item.nameCode == val)
       if (matchingItem) {
diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index e4afc661..8dadd2e6 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -163,6 +163,7 @@
             <el-table-column label="产品通用名称" prop="cpmctymc" width="120"></el-table-column>
             <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
             <el-table-column label="包装规格" prop="spec" width="80"></el-table-column>
+            <el-table-column label="单据数量" prop="count" width="80"></el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
             <el-table-column label="生产日期" prop="productDate"></el-table-column>
             <el-table-column label="失效日期" prop="expireDate"></el-table-column>
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 3701a049..203a9309 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -504,7 +504,7 @@ export default {
       this.inputQuery.list = this.invoiceRow;
       let mount = 0;
       for (var i = 0; i < this.invoiceRow.length; i++) {
-        mount += this.invoiceRow[i].amount
+        mount += this.invoiceRow[i].price
       }
       if (mount != this.inputQuery.price) {
         this.$confirm("价格不匹配，是否确定提交?", "提示", {
diff --git a/src/views/inoutDrug/InvoiceCkeck.vue b/src/views/inoutDrug/InvoiceCkeck.vue
index 75e2ba35..c122117a 100644
--- a/src/views/inoutDrug/InvoiceCkeck.vue
+++ b/src/views/inoutDrug/InvoiceCkeck.vue
@@ -155,100 +155,6 @@
       </el-card>
     </el-form>
 
-    <el-tabs type="border-card" style="margin: 15px">
-      <!--单据业务详情-->
-      <el-tab-pane>
-        <span slot="label">单据 {{ input.billNo }}-单据详情</span>
-        <el-table
-          v-loading="bizDetailLoading"
-          :data="codeDetailList"
-          style="width: 100%"
-          border
-          @current-change="BizDetailInv"
-          @selection-change="handleSelectionUdiChange"
-          row-key="id"
-          highlight-current-row
-        >
-          <el-table-column type="selection" width="55"></el-table-column>
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-            label="发票代码"
-            prop="invoiceCodes"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="药品名称"
-            prop="coName"
-            width="150"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="包装规格"
-            width="150"
-            prop="spec"
-          ></el-table-column>
-          <el-table-column
-            label="批次号"
-            width="100"
-            prop="batchNo"
-          ></el-table-column>
-          <el-table-column
-            label="数量"
-            prop="count"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="扫码数量"
-            prop="reCount"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="价格"
-            prop="price"
-            width="100"
-          ></el-table-column>
-
-          <el-table-column
-            label="金额"
-            prop="amount"
-            width="100"
-          ></el-table-column>
-
-          <el-table-column
-            label="生产日期"
-            prop="productDate"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="失效日期"
-            prop="expireDate"
-            width="100"
-          ></el-table-column>
-          <el-table-column width="100" label="计量单位" prop="measname">
-          </el-table-column>
-          <el-table-column
-            label="生产企业"
-            prop="manufacturer"
-            width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="批准文号"
-            width="160"
-            prop="certCode"
-            show-overflow-tooltip
-          ></el-table-column>
-
-        </el-table>
-        <pagination
-          v-show="codeTotal > 0"
-          :total="codeTotal"
-          :page.sync="codeQuery.page"
-          :limit.sync="codeQuery.limit"
-          @pagination="getCodeDetailLists"
-        />
-      </el-tab-pane>
-    </el-tabs>
 
     <el-image-viewer
       v-if="imgViewerVisible"
@@ -308,7 +214,7 @@ export default {
     return {
       check: false,
       idList: [],
-      invoiceRow: [],
+      // invoiceRow: [],
       statusCode: null,
       choiceFile: "选取文件",
       fileList: [],
@@ -485,10 +391,10 @@ export default {
   components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
   methods: {
     onSubmit() {
-      if (this.invoiceRow == null || this.invoiceRow.length == 0) {
-        this.$message.error("请选择要登记的物资! ");
-        return false;
-      }
+      // if (this.invoiceRow == null || this.invoiceRow.length == 0) {
+      //   this.$message.error("请选择要登记的物资! ");
+      //   return false;
+      // }
       if (this.$isBlank(this.inputQuery.invoiceEncode)) {
         this.$message.error("发票编码不能为空！");
         return;
@@ -504,7 +410,7 @@ export default {
       this.inputQuery.list = this.invoiceRow;
       let mount = 0;
       for (var i = 0; i < this.invoiceRow.length; i++) {
-        mount += this.invoiceRow[i].amount
+        mount += this.invoiceRow[i].price
       }
       if (mount != this.inputQuery.price) {
         this.$confirm("价格不匹配，是否确定提交?", "提示", {
diff --git a/src/views/inoutDrug/InvoiceRegByOrder.vue b/src/views/inoutDrug/InvoiceRegByOrder.vue
index 11b75e1d..71fed077 100644
--- a/src/views/inoutDrug/InvoiceRegByOrder.vue
+++ b/src/views/inoutDrug/InvoiceRegByOrder.vue
@@ -437,11 +437,13 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       v-if="checkInvoice"
+      @close="closecheckInvoice"
     >
       <checkInvoice
         :closeDialog="closecheckInvoice"
         :input="inputInv"
         :getOrderDetails="getOrderDetails"
+        :invoiceRow="detaillist"
       ></checkInvoice>
     </el-dialog>
 
@@ -708,6 +710,7 @@ export default {
       acceptQuery: null,
       acceptOrderVisible: false,
       subRow: null,
+      detaillist:[],
     };
   },
   components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
@@ -737,11 +740,13 @@ export default {
       this.getList();
     },
     InvoiceRegister1(_this,row) {
-      _this.savebillno = row.billNo
+      _this.savebillno = _this.currentRow.billNo
       _this.inputInv = row;
+      _this.detaillist.push(row)
       _this.checkInvoice = true;
     },
     closecheckInvoice() {
+      this.detaillist = []
       this.checkInvoice = false;
       this.getList();
       this.currentRow.billNo = this.savebillno;

From 40de60c67990f3d208bd5253058d4ec20fe77648 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 20 Dec 2024 10:06:09 +0800
Subject: [PATCH 06/12] 12/20

---
 src/views/basic/collectPoint/timerSetting.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/basic/collectPoint/timerSetting.vue b/src/views/basic/collectPoint/timerSetting.vue
index 38067e67..404f62a8 100644
--- a/src/views/basic/collectPoint/timerSetting.vue
+++ b/src/views/basic/collectPoint/timerSetting.vue
@@ -76,6 +76,14 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
+              <el-col :span="8" class="el-col">
+                <el-form-item label="寄售预验收扫码校验:" prop="autoFinishOrder" style="margin-bottom: 0">
+                  <el-radio-group v-model="formData.isScanCodeCheck">
+                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="false">否</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-collapse-item>
           <el-collapse-item name="3">
@@ -237,7 +245,8 @@ export default {
       activeNames: ['0', '1', '2', '3'],
       formData: {
         startDownloadTime: null,
-        lastCodeSplit: true
+        lastCodeSplit: true,
+        isScanCodeCheck:true,
       },
       systemParam: null,
 

From 199d5133c4f3cd6ff6656aecc8b77f426f24ccde Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 20 Dec 2024 19:20:53 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=89=AB=E5=A4=9A=E6=AE=B5=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/ConfirmDrugDealOrder.vue | 2 +-
 src/views/collect/DealOrder.vue            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/collect/ConfirmDrugDealOrder.vue b/src/views/collect/ConfirmDrugDealOrder.vue
index bd2f6794..d4f95552 100644
--- a/src/views/collect/ConfirmDrugDealOrder.vue
+++ b/src/views/collect/ConfirmDrugDealOrder.vue
@@ -1549,7 +1549,7 @@ export default {
       }
 
       // 2. 判断是否以 "01" 开头且长度大于等于 18
-      if (str.startsWith("01") && str.length >= 18) {
+      if (str.startsWith("01") && str.length >= 16) {
         return true;
       }
 
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index ac208891..dc6b5e2e 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -1595,7 +1595,7 @@ export default {
       }
 
       // 2. 判断是否以 "01" 开头且长度大于等于 18
-      if (str.startsWith("01") && str.length >= 18) {
+      if (str.startsWith("01") && str.length >= 16) {
         return true;
       }
 

From 62b89306d12b5d512428fcd655fdb63651fbfbbc Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 23 Dec 2024 10:11:08 +0800
Subject: [PATCH 08/12] =?UTF-8?q?12/23=20=E6=A7=BD=E4=BD=8D=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/workplace/editQueueDialog.vue | 146 ++++++++++++++++++
 src/views/basic/workplace/freightManage.vue   | 117 +++++++++++---
 src/views/inout/InvoiceRegByOrder.vue         |   2 +-
 src/views/inoutDrug/InvoiceRegByOrder.vue     |   2 +-
 4 files changed, 243 insertions(+), 24 deletions(-)
 create mode 100644 src/views/basic/workplace/editQueueDialog.vue

diff --git a/src/views/basic/workplace/editQueueDialog.vue b/src/views/basic/workplace/editQueueDialog.vue
new file mode 100644
index 00000000..dd0fc149
--- /dev/null
+++ b/src/views/basic/workplace/editQueueDialog.vue
@@ -0,0 +1,146 @@
+<template>
+  <div>
+    <el-form :model="formData" style="width: 100%;" ref="dataForm" :rules="formRules"
+             label-width="auto"
+    >
+      <el-row :gutter="24">
+        <el-col :span="12" class="el-col">
+          <el-form-item label="槽位编码:" prop="code" class="query-form-item">
+            <el-input
+              v-model="formData.code" style="width: 80%"
+              auto-complete="off"
+              disabled
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="槽位名称:" class="query-form-item">
+            <el-input
+              v-model="formData.name" style="width: 80%"
+              auto-complete="off"
+              placeholder="请输入槽位名称"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!--<el-row :gutter="24">-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="所属工位:" class="query-form-item" prop="workPlaceIdFk">-->
+      <!--      <el-select-->
+      <!--        disabled-->
+      <!--        v-model="formData.workPlaceIdFk"-->
+      <!--        filterable-->
+      <!--        remote-->
+      <!--        style="width: 80%"-->
+      <!--        placeholder="请输入选择所属工位"-->
+      <!--      >-->
+      <!--        <el-option-->
+      <!--          v-for="item in workPlaces"-->
+      <!--          :key="item.code"-->
+      <!--          :label="item.label"-->
+      <!--          :value="item.code"-->
+      <!--        />-->
+      <!--      </el-select>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+    </el-form>
+    <div slot="footer" class="dialog-footer" style="margin-top: 50px">
+      <el-button @click.native="hideForm">取消</el-button>
+      <el-button
+        type="primary"
+        @click.native="formSubmit()"
+      >提交
+      </el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
+import { updateQueue} from '@/api/basic/workPlace/SysWorkplaceQueue'
+import { isBlank } from '@/utils/strUtil'
+
+export default {
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true
+    },
+    rowData: {
+      type: Object,
+      required: true
+    },
+    workplaceId: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      formData: {
+        code: '',
+        name: '',
+        remark: '',
+        workPlaceIdFk: ''
+      },
+      freightData: null,
+      workPlaces: [],
+      formRules: {
+        // name: [
+        //   { required: true, message: '请输入货架说明', trigger: 'blur' }
+        // ],
+        workPlaceIdFk: [
+          { required: true, message: '请选择所属工位', trigger: 'blur' }
+        ]
+      },
+
+
+    }
+  },
+  methods: {
+    findWorkPlace(val) {
+      let query = {
+        // chargeUser: _this.$store.getters.userId,
+        userIdFlag: true,
+        key: val,
+        page: 1,
+        limit: 10,
+        workPlaceClass: 2
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          this.workPlaces = response.data || []
+        })
+        .catch(() => {
+          this.options.getWorkPlaceList = []
+        })
+    },
+    formSubmit(){
+      updateQueue(this.formData).then(res => {
+        if (res.code == 20000){
+          this.$message.success("更新成功")
+        }else {
+          this.$message.error("更新失败")
+        }
+        this.closeDialog()
+      })
+    }
+  },
+  created() {
+    if (this.rowData != null){
+      this.formData = this.rowData
+    }
+    this.findWorkPlace('')
+
+  }
+}
+</script>
+
+<style scoped>
+.dialog-footer {
+  display: flex;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/basic/workplace/freightManage.vue b/src/views/basic/workplace/freightManage.vue
index 341e8dc2..21b7f734 100644
--- a/src/views/basic/workplace/freightManage.vue
+++ b/src/views/basic/workplace/freightManage.vue
@@ -8,6 +8,8 @@
         <el-card style="width: 100%;height: 100%">
           <div slot="header" class="clearfix" style="margin-bottom: 10px;">
             <span style="font-weight: 700;">取货架列表
+            </span>
+            <span>
               <el-button-group style="float: right">
               <el-button style="margin-bottom: -5px " @click="printFreight(1,null)" type="primary">打印全部
               </el-button>
@@ -27,23 +29,21 @@
             <el-table-column type="index" label="序号">
             </el-table-column>
             <el-table-column
-              width="100"
               prop="code"
               label="取货架编码"
             >
             </el-table-column>
             <el-table-column
-              width="140"
               prop="remark"
               label="取货架说明"
             >
             </el-table-column>
-            <el-table-column
-              width="140"
-              prop="layerCount"
-              label="摆货层数量"
-            >
-            </el-table-column>
+            <!--<el-table-column-->
+            <!--  width="140"-->
+            <!--  prop="layerCount"-->
+            <!--  label="摆货层数量"-->
+            <!--&gt;-->
+            <!--</el-table-column>-->
             <!--<el-table-column-->
             <!--  width="140"-->
             <!--  prop="name"-->
@@ -82,7 +82,7 @@
 
         </el-card>
       </div>
-      <div style="width: 322px;height: 340px;margin-bottom: 10px">
+      <div style="width: 280px;height: 340px;margin-bottom: 10px">
         <el-card style="width: 100%;height: 100%">
           <div slot="header" class="clearfix" style="margin-bottom: 10px;">
             <span style="font-weight: 700;">摆货层列表</span>
@@ -94,17 +94,16 @@
             @row-click="handChangeLayer"
           >
             <el-table-column
-              width="100"
               prop="code"
               label="摆货层编码"
             >
             </el-table-column>
-            <el-table-column
-              width="120"
-              prop="queueNum"
-              label="出货槽数量"
-            >
-            </el-table-column>
+            <!--<el-table-column-->
+            <!--  width="120"-->
+            <!--  prop="queueNum"-->
+            <!--  label="出货槽数量"-->
+            <!--&gt;-->
+            <!--</el-table-column>-->
             <el-table-column label="操作" width="60">
               <template slot-scope="scope">
                 <el-button
@@ -138,7 +137,7 @@
           <!--</pagination>-->
         </el-card>
       </div>
-      <div style="width: 260px;height: 340px;margin-bottom: 10px">
+      <div style="width: 400px;height: 340px;margin-bottom: 10px">
         <el-card style="width: 100%;height: 100%">
           <div slot="header" class="clearfix" style="margin-bottom: 10px;">
             <span style="font-weight: 700;">出货槽列表</span>
@@ -154,7 +153,12 @@
               label="出货槽编号"
             >
             </el-table-column>
-            <el-table-column label="操作" width="60">
+            <el-table-column
+              prop="name"
+              label="槽位名称"
+            >
+            </el-table-column>
+            <el-table-column label="操作" width="120">
               <template slot-scope="scope">
                 <el-button
                   type="text"
@@ -162,6 +166,19 @@
                   @click.native.stop="printFreight(3,scope.row)"
                 >打印
                 </el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="editQueue(scope.row)"
+                >编辑
+                </el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="deleteQueue(scope.row)"
+                >删除
+                </el-button>
+
               </template>
             </el-table-column>
           </el-table>
@@ -205,6 +222,24 @@
       >
       </addWorkplaceFreightDialog>
     </el-dialog>
+
+    <!--</el-card>-->
+    <el-dialog
+      title="槽位编辑"
+      :visible.sync="WorkplaceQueueDialogVisible"
+      width="60%"
+      v-if="WorkplaceQueueDialogVisible"
+      :close-on-press-escape="false"
+      :close-on-click-modal="false"
+      @close="QueuecloseDialog"
+    >
+      <editQueueDialog
+        :closeDialog="QueuecloseDialog"
+        :rowData="queueRowData"
+        :workplaceId="workplaceId"
+      >
+      </editQueueDialog>
+    </el-dialog>
   </div>
 
 </template>
@@ -212,8 +247,9 @@
 <script>
 import { deleteFreight, getWorkplaceFreightList, printAllFreight } from '@/api/basic/workPlace/SysWorkplaceFreight'
 import addWorkplaceFreightDialog from './addWorkplaceFreightDialog'
+import editQueueDialog from "./editQueueDialog"
 import { getLayerList } from '@/api/basic/workPlace/SysWorkplaceLayer'
-import { getQueueListPage } from '@/api/basic/workPlace/SysWorkplaceQueue'
+import { deleteQueue, getQueueListPage } from '@/api/basic/workPlace/SysWorkplaceQueue'
 import { isBlank } from '@/utils/strUtil'
 
 export default {
@@ -223,7 +259,7 @@ export default {
       required: true
     }
   },
-  components: { addWorkplaceFreightDialog },
+  components: { addWorkplaceFreightDialog,editQueueDialog },
   data() {
     return {
       query: {
@@ -251,11 +287,13 @@ export default {
         layerCodes: []
       },
       rowData: null,
+      queueRowData:null,
       freightList: [],
       layerList: [],
       queueList: [],
       queueTotal: 0,
-      WorkplaceFreightDialogVisible: false
+      WorkplaceFreightDialogVisible: false,
+      WorkplaceQueueDialogVisible: false,
     }
   },
   methods: {
@@ -392,14 +430,49 @@ export default {
       this.getQueues()
       this.WorkplaceFreightDialogVisible = false
     },
+    QueuecloseDialog() {
+      this.getList()
+      this.getLayers()
+      this.getQueues()
+      this.WorkplaceQueueDialogVisible = false
+    },
     getAllList(workPlaceIdFk) {
       if (!isBlank(workPlaceIdFk)) {
         this.query.workPlaceIdFk = workPlaceIdFk
+        this.getList()
       }
       // this.LayerQuery.freightCode = ""
-      this.getList()
+
       // this.getLayers()
       // this.getQueues()
+    },
+    editQueue(row){
+      this.queueRowData = row
+      this.WorkplaceQueueDialogVisible = true
+    },
+    deleteQueue(row){
+      this.$confirm('此操作将永久删除该槽位, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteQueue(row).then(res => {
+          if (res.code == 20000){
+            this.getList()
+            this.getLayers()
+            this.getQueues()
+            this.$message.success("删除成功")
+          }else {
+            this.$message.error("删除失败")
+          }
+        }).catch(() => {
+
+        })
+
+        // deleteQueueByCode(){
+        //
+        // }
+      })
     }
   },
   created() {
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index 3f13c189..c04d3995 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -1254,7 +1254,7 @@ export default {
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
-      this.codeQuery.page = 1;
+      // this.codeQuery.page = 1;
       //this.resultQuery.page = 1;
 
       this.getCodeDetailList();
diff --git a/src/views/inoutDrug/InvoiceRegByOrder.vue b/src/views/inoutDrug/InvoiceRegByOrder.vue
index 71fed077..87218f12 100644
--- a/src/views/inoutDrug/InvoiceRegByOrder.vue
+++ b/src/views/inoutDrug/InvoiceRegByOrder.vue
@@ -894,7 +894,7 @@ export default {
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
-      this.codeQuery.page = 1;
+      // this.codeQuery.page = 1;
       //this.resultQuery.page = 1;
 
       this.getCodeDetailList();

From 368639d7855a12d4089fe835f93fb520f24a7c43 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 23 Dec 2024 10:47:07 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=89=AB=E5=A4=9A=E6=AE=B5=E7=A0=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 6fde9063..059f3997 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -1877,16 +1877,15 @@ export default {
             this.codeFormData.code = response.data.code
             this.scanCode = ''
             this.addCode()
-
           } else {
             if (response.code == 502) {
               this.checkSuccess = false
               this.isSuccess = false
-              this.scanCode = ''
+              // this.scanCode = ''
               this.printCodeResult(response.data)
               this.codeFormData.code = response.data.code
               this.originCode = this.codeFormData.code
-              this.originCode = ""
+              // this.originCode = ""
             } else if (response.code == 501) {
               this.checkSuccess = false
               this.scanCode = ''

From 85451c0132cb792764f91eb08893680586636848 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 23 Dec 2024 17:22:14 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=89=AB=E5=A4=9A=E6=AE=B5=E7=A0=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DealOrder.vue       | 1 -
 src/views/inout/DialogCreateOrder.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 684c8ef2..007e521e 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -871,7 +871,6 @@ export default {
               this.printCodeResult(response.data, response.message)
               this.filterQuery.code = response.data.code;
               this.originCode = response.data.code;
-              this.scanCode = ""
             } else if (response.code == 501) {
               this.checkSuccess = false;
               this.$message.error(response.message);
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 685a12c1..e1e57685 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1764,7 +1764,6 @@ export default {
           if (response.code == 502) {
             this.checkSuccess = false;
             this.isSuccess = false;
-            this.scanCode = ""
             this.printCodeResult(response.data)
             this.codeFormData.code = response.data.code;
             this.originCode = this.codeFormData.code;

From 364fec7ded66c8a41487f49fb744f18d02d38198 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 23 Dec 2024 20:57:49 +0800
Subject: [PATCH 11/12] =?UTF-8?q?12/23=20=E5=8D=95=E6=8D=AE=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96=EF=BC=8C=E8=8D=AF?=
 =?UTF-8?q?=E5=93=81.=E5=99=A8=E6=A2=B0=E5=8F=91=E7=A5=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IocCollectOrderCheckCode.vue      | 173 +++++++++++++++---
 src/views/inout/InvoiceCkeck.vue              |   2 +-
 src/views/inoutDrug/InvoiceCkeck.vue          |   2 +-
 3 files changed, 145 insertions(+), 32 deletions(-)

diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index 8dadd2e6..70a18207 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -139,6 +139,7 @@
             <el-table-column label="药品编码" prop="nameCode"></el-table-column>
             <el-table-column label="药品通用名称" prop="cpmctymc" width="110"></el-table-column>
             <el-table-column label="包装规格" prop="ggxh" width="110"></el-table-column>
+            <el-table-column label="扫码数量" prop="scanCount" width="110"></el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
             <el-table-column label="生产日期" prop="productDate"></el-table-column>
             <el-table-column label="失效日期" prop="expireDate"></el-table-column>
@@ -189,7 +190,7 @@
 <script>
 import { isBlank } from '@/utils/strUtil'
 import { getCodeEndList } from '@/api/collect/IoCollectCodeSelect'
-import { enterCodeBillNo } from '@/api/inout/order'
+import { enterCodeBillNo, enterCodeWeb } from '@/api/inout/order'
 import { autoCodeResult, findByBill, manualCodeDetail, orderDetail } from '@/api/collect/collectOrder'
 import {  checkCollectOrderManCode, finishCheckOrder } from '@/api/collect/splitCreateOrder'
 
@@ -250,13 +251,18 @@ export default {
 
       checkCodeList: [],
       busDataList:[],
-      busDataTotal:0
+      busDataTotal:0,
+      //用于校验扫码数量
+      codeCount: 0,
 
     }
   },
   methods: {
     enterKey() {
+      // this.result = "\n"
       this.errResult = ''
+      // this.errVisible = false
+      // this.successVisible = true
       //是否已经有单据
       if (this.orderData.billNo == null) {
         this.enterBillNoKey()
@@ -280,12 +286,80 @@ export default {
           return
         }
       }
-      //单码校验
-      this.filterQuery.orderIdFk = this.orderData.billNo
-      this.verifyCode(this.filterQuery)
+      let tQuery = {
+        code: this.filterQuery.udiCode.trim(),
+      };
+      enterCodeWeb(tQuery).then((response) => {
+        if (response.code === 20000) {
+          this.$refs.inputRef.focus();
+          this.$refs.inputRef.select();
+          this.isSuccess = true;
+          this.printCodeResult(response.data, response.message)
+          this.filterQuery.udiCode = response.data.code;
+          this.scanCode = ""
+          this.originCode = ""
+          this.addCode();
+        } else {
+          if (response.code == 502) {
+            this.checkSuccess = false;
+            this.isSuccess = false;
+            this.printCodeResult(response.data, response.message)
+            this.filterQuery.udiCode = response.data.code;
+            this.originCode = response.data.code;
+          } else if (response.code == 501) {
+            this.checkSuccess = false;
+            this.$message.error(response.message);
+            this.scanCode = ""
+          } else if (response.code == 503) {
+            this.checkSuccess = false;
+            this.isSuccess = false;
+            this.printCodeResult(response.data, response.message)
+            this.filterQuery.udiCode = response.data.code;
+            this.scanCode = ""
+            this.$confirm(response.message, "提示", {
+              type: "warning",
+            })
+              .then(() => {
+                this.filterQuery.udiCode = response.data.code;
+                this.addCode();
+              })
+              .catch(() => {
+                this.filterQuery.udiCode = response.data.code;
+              });
+          }  else {
+            this.scanCode = ""
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
+              type: "warning",
+              closeOnClickModal: true,
+              callback: (action) => {
+                this.$refs.inputRef.focus();
+                this.$refs.inputRef.select();
+              },
+            });
+          }
+        }
+        this.loading = false;
+      });
       // this.getInputFocus()
     },
 
+    addCode(){
+      //前端单码校验是否已经校验该码
+      let isIncludes = this.checkCode(this.filterQuery.udiCode)
+      if (!isIncludes){
+        this.filterQuery.orderIdFk = this.orderData.billNo
+        this.verifyCode(this.filterQuery)
+      }else {
+        this.scanCode = ""
+        this.getInputFocus()
+        this.$message.error("该追溯码已审核")
+      }
+    },
+    checkCode(code){
+      return this.checkCodeList.includes(code)
+    },
+
     enterBillNoKey(billNo) {
       this.loading = true;
       this.filterQuery.code = this.scanCode
@@ -366,11 +440,15 @@ export default {
               this.checkCodeList.push(code);
             });
             this.printCodeResultList(res.data)
+            this.codeCount = this.codeCount + query.udiCodeList.length
+            this.checkCodeEnd()
           } else {
             //如果校验成功
+            this.codeCount = this.codeCount + 1
             this.checkCodeList.push(res.data.code)
             this.verifyFinish(1, res.data, res.message)
             // this.$message.success('校验成功')
+            this.checkCodeEnd()
           }
         } else {
           if (Array.isArray(res.data)) {
@@ -381,6 +459,17 @@ export default {
         }
       })
     },
+    checkCodeEnd(){
+      if (this.codeCount == this.detailList.length){
+        this.$confirm("单据追溯码已经全部审核完毕，是否立即完成单据审核？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.commitCheckOrder()
+        })
+      }
+    },
     verifyFinish(val, data, message) {
       if (val == 1) {
         this.errVisible = false
@@ -474,7 +563,7 @@ export default {
       }
 
       // 2. 判断是否以 "01" 开头且长度大于等于 18
-      if (str.startsWith('01') && str.length >= 18) {
+      if (str.startsWith('01') && str.length >= 16) {
         return true
       }
 
@@ -520,21 +609,6 @@ export default {
           this.resultTotal = res.data.total || 0
           this.$message.error('数据加载失败')
         })
-      } else {
-        this.codeQuery.fifoSplit = this.fifoSplit
-        autoCodeResult(this.codeQuery).then(res => {
-          this.codeLoading = false
-          if (res.code != 20000) {
-            this.$message.error(res.message)
-            return
-          }
-          this.codeDetailList = res.data.list
-          this.codeTotal = res.data.total || 0
-          this.codeLoading = false
-        }).catch(() => {
-          this.codeLoading = false
-          this.$message.error('数据加载失败')
-        })
       }
 
     },
@@ -542,9 +616,32 @@ export default {
     batchVailCode(params) {
       // batchVailCode(params).then((res) => {
       //   if (res.code === 20000) {
+      const vailCodeResultResponseList = []
+      const vailCodeResultResponse = {}
+      const codeList = []
+      params.udiCodeList.forEach(code => {
+        let isIncludes =  this.checkCode(code)
+        if (isIncludes){
+          vailCodeResultResponse.status = 2;
+          vailCodeResultResponse.code = code;
+          vailCodeResultResponse.errMsg = "追溯码已被校验";
+          vailCodeResultResponseList.push(vailCodeResultResponse);
+        }else {
+          codeList.push(code)
+        }
+      });
+      if (vailCodeResultResponseList.length > 0){
+        this.printCodeResultList(vailCodeResultResponseList)
+      }
+
+      if (codeList.length > 0){
+        params.udiCodeList = codeList
+        this.verifyCode(params)
+      }
+      this.scanCode = ""
       this.$refs.inputRef.focus()
       this.$refs.inputRef.select()
-      this.verifyCode(params)
+
       // } else {
       //   this.$message.error(res.message)
       // }
@@ -552,14 +649,26 @@ export default {
     },
     confirmCheckOrder() {
       //完成校验
-      this.$confirm('是否确定完成此单据审核?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.commitCheckOrder()
-      }).catch(() => {
-      })
+      if (this.codeCount != this.detailList.length){
+        this.$confirm('当前单据追溯码未全部审核是否完成此单据?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.commitCheckOrder()
+        }).catch(() => {
+        })
+      }else {
+        this.$confirm('是否确定完成此单据审核?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.commitCheckOrder()
+        }).catch(() => {
+        })
+      }
+
     },
     commitCheckOrder() {
       this.finishOrder()
@@ -606,10 +715,12 @@ export default {
       this.scanResultType = 'success'
       this.curRow = null
       this.orderData = {}
+      this.codeCount = 0
       this.workplaceId = Number(this.$route.query.workplaceId)
       this.codeList = []
       this.detailList = []
       this.checkCodeList = []
+      this.busDataList = []
       this.result = '\n'
       this.scanTip = '扫码审核:'
       this.placeholder = '请输入单据号进行扫码审核'
@@ -651,6 +762,8 @@ export default {
     }
     // this.getResultDetailList()
     // this.init()
+    this.checkCodeList = []
+    this.codeCount = 0
   },
   mounted() {
     this.getInputFocus()
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 203a9309..3701a049 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -504,7 +504,7 @@ export default {
       this.inputQuery.list = this.invoiceRow;
       let mount = 0;
       for (var i = 0; i < this.invoiceRow.length; i++) {
-        mount += this.invoiceRow[i].price
+        mount += this.invoiceRow[i].amount
       }
       if (mount != this.inputQuery.price) {
         this.$confirm("价格不匹配，是否确定提交?", "提示", {
diff --git a/src/views/inoutDrug/InvoiceCkeck.vue b/src/views/inoutDrug/InvoiceCkeck.vue
index c122117a..a8290c36 100644
--- a/src/views/inoutDrug/InvoiceCkeck.vue
+++ b/src/views/inoutDrug/InvoiceCkeck.vue
@@ -410,7 +410,7 @@ export default {
       this.inputQuery.list = this.invoiceRow;
       let mount = 0;
       for (var i = 0; i < this.invoiceRow.length; i++) {
-        mount += this.invoiceRow[i].price
+        mount += this.invoiceRow[i].amount
       }
       if (mount != this.inputQuery.price) {
         this.$confirm("价格不匹配，是否确定提交?", "提示", {

From 46dd7ab5e4c62276390ec404a93fb97f4568c0f6 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 23 Dec 2024 20:58:28 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8A=E8=B4=A7?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue | 238 +++++++---------------------
 1 file changed, 60 insertions(+), 178 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 059f3997..01bb6c3b 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -62,68 +62,6 @@
 
           </el-button-group>
         </el-row>
-        <el-row v-if="false">
-          <el-col :span="11">
-            <el-form-item prop="corpOrderId" class="query-form-item" label="单据号:">
-              <el-input
-                v-model="orderFormData.corpOrderId"
-                auto-complete="off"
-                style="width: 90%"
-                clearable
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item prop="createTime" class="query-form-item" label="单据时间:">
-              <el-date-picker
-                v-model="orderFormData.createTime"
-                type="datetime"
-                placeholder="日期"
-                clearable
-                value-format="yyyy-MM-dd HH:mm:ss"
-                :disabled="true"
-                style="width: 90%"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item prop="invCode" class="query-form-item" label="当前仓库:">
-              <el-select
-                v-model="orderFormData.invCode"
-                placeholder="当前仓库"
-                style="width: 90%"
-                :disabled="corpOrderIdDisabled || viewTypeKsck"
-                @change="changeInv"
-                filterable
-              >
-                <el-option
-                  v-for="item in curInvOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                      item.warehouseName
-                    }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item prop="remark" class="query-form-item" label="单据备注:">
-              <el-input
-                v-model="orderFormData.remark"
-                auto-complete="off"
-                clearable
-                style="width: 90%"
-                placeholder="请输入备注信息"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="6" v-if="!isLinkDisabled">
             <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">
@@ -354,8 +292,15 @@ import {
   submitOrderWeb,
   saveOrderWeb,
   deleteByOrderId,
-  enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, delmitBiz,
-  batchVailCode, batchAddCode, batchAddCodeByOrderFinish, upProcessing, getProcessingOrder
+  enterCodeWeb,
+  submitAllocateBiz,
+  rollbackWaitcheck,
+  submitCodeResult,
+  submitCheckResult,
+  batchVailCode,
+  batchAddCode,
+  batchAddCodeByOrderFinish,
+  upProcessing
 } from '@/api/inout/order'
 import {filterSubAll, findByFrom, findInvByUser} from '@/api/system/invSubWarehouse'
 import {parseTime} from '@/utils/coTools'
@@ -384,6 +329,33 @@ import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
 import {getByCode} from "@/api/basic/workPlace/SysWorkplaceQueue";
 
+// 常量定义
+const SCAN_TIMEOUT = 1000
+const ACTION_TYPES = {
+  BIZ: 'biz',
+  CODES: 'codes'
+}
+
+// 工具方法
+const utils = {
+  isValidJson(str) {
+    try {
+      JSON.parse(str)
+      return true
+    } catch (e) {
+      return false
+    }
+  }
+}
+
+// 错误处理
+const errorHandler = {
+  handle(error) {
+    console.error(error)
+    this.$message.error(error.message)
+  }
+}
+
 export default {
   name: 'ioCreateOrder',
   props: {
@@ -417,11 +389,6 @@ export default {
       type: Object,
       required: true
     },
-    splitBusType: {//科室拆零单据类型
-      type: Object,
-      default: null,
-      required: true
-    },
 
     dialogTitle: {//科室拆零单据类型
       type: Object,
@@ -450,8 +417,9 @@ export default {
   },
   data() {
     return {
-      queueStatus: null, // 1:货位功能开启 0:货位功能关闭
+      queueStatus: null,
       busTypeList: [],
+      splitBusType: null,
       busQuery: {
         busKey: '',
         workplaceCode: null,
@@ -762,39 +730,11 @@ export default {
       this.orderFormData.curSpaceCode = false
       this.orderFormData.checkPreInSpaceCode = false
       this.orderFormData.preCurSpaceCode = false
-      this.getBusTypeByInv()
       this.findCurSpaceList(row)
       this.orderFormData.workPlaceCode = null
       this.findCurWorkPlaces()
     },
 
-    //根据仓库,用户获取单据类型
-    getBusTypeByInv() {
-      let query = {
-        code: this.orderFormData.invCode,
-        editType: 2    //可编辑
-      }
-      if (this.viewTypeKsck) {
-        query = {
-          code: this.orderFormData.invCode,
-          editType: 2,    //可编辑
-          useDyCount: 2    //可编辑
-        }
-      }
-
-      findByInvUser(query)
-        .then((response) => {
-          this.busTypeOptions = response.data || []
-          if (this.splitBusType != null) {
-            this.orderFormData.action = this.splitBusType
-          } else if (this.busTypeOptions.length == 1) {
-            this.orderFormData.action = this.busTypeOptions[0].action
-            this.actionChange(this.orderFormData.action)
-          }
-        })
-        .catch(() => {
-        })
-    },
     //关闭预选单弹框
     closeDialogtwo() {
       this.selectorder = false
@@ -923,85 +863,6 @@ export default {
       })
     },
 
-    //单据类型改变
-    actionChange(item) {
-      this.orderFormData.checkPreInOption = null
-      if (!this.viewTypeKsck) {
-        this.orderFormData.checkPreInOrders = null
-        this.checkPreInArray = []
-      }
-      this.curAction = this.getActionItem(item)
-      if ((this.curAction.checkEnable && this.curAction.checkWebNew != 0) || this.viewType == 1) {
-        //单据类型需要一次校验 或 单据类型为1，显示业务单据页面
-        this.bizShow = true
-      } else {
-        this.bizShow = false
-      }
-      if (
-        this.curAction.corpType == 0 ||
-        this.curAction.corpType == 2 ||
-        this.curAction.corpType == 4 ||
-        (this.curAction.corpType == 1 && !this.curAction.genUnit)
-      ) {
-        //1.切换往来单位
-        this.orderFormData.fromCorp = null
-
-        this.delorderData()
-
-        this.findMethod()
-      } else if (this.curAction.corpType == 3) {
-        //2. 切换往来仓库
-        this.orderFormData.fromInvCode = null
-        this.findFromInvList()
-      }
-      if (this.curAction.scanPreIn && this.curAction.backPreinType == 1 && this.curAction.preInBack) {
-        this.documentShow = true
-      } else if (this.curAction.scanPreIn && this.curAction.backPreinType == 2 && this.curAction.preInBack) {
-        this.preInSpaceShow = true
-        this.findPreInInvList()
-      } else {
-        this.documentShow = false
-        this.preInSpaceShow = false
-      }
-
-      if (this.curAction.vailPrescribe != null && this.curAction.vailPrescribe) {
-        this.viewSickVisible = true
-      } else {
-        this.viewSickVisible = false
-      }
-
-      if (this.curAction.scanPreIn && this.curAction.spaceOut == 1) {
-        this.preInSpaceShow = true
-        this.curSpaceShow = false
-        this.preSpaceShow = false
-        this.orderFormData.curSpaceCode = null
-        this.orderFormData.checkPreInSpaceCode = null
-        this.orderFormData.preCurSpaceCode = null
-        this.findPreInSpaceList()
-      } else if (this.curAction.advancePreIn && this.curAction.spaceOut == 1) {
-        this.preInSpaceShow = false
-        this.curSpaceShow = false
-        this.preSpaceShow = true
-        this.orderFormData.curSpaceCode = null
-        this.orderFormData.checkPreInSpaceCode = null
-        this.orderFormData.preCurSpaceCode = null
-        this.findPreSpaceList()
-      } else if (this.curAction.spaceOut == 1) {
-        this.curSpaceShow = true
-        this.preInSpaceShow = false
-        this.preSpaceShow = false
-        this.orderFormData.curSpaceCode = null
-        this.orderFormData.checkPreInSpaceCode = null
-        this.orderFormData.preCurSpaceCode = null
-      } else {
-        this.curSpaceShow = false
-        this.preInSpaceShow = false
-        this.preSpaceShow = false
-        this.orderFormData.curSpaceCode = null
-        this.orderFormData.checkPreInSpaceCode = null
-        this.orderFormData.preCurSpaceCode = null
-      }
-    },
 
     //获取往来仓库列表
     findFromInvList(val) {
@@ -1165,6 +1026,8 @@ export default {
         this.$message.warning('请选择单据类型！')
         return
       }
+      console.log(this.curAction)
+      console.log(this.splitBusType)
       if (this.splitBusType != null) {
         this.orderFormData.fromCorp = '72198012799726'
       }
@@ -2140,8 +2003,10 @@ export default {
       if (this.splitType == 'search') {
       } else if (this.splitType == 'out') {
         this.orderFormData.action = 'SC72197936495755'
+        this.getBusType();
       } else if (this.splitType == 'return') {
         this.orderFormData.action = 'SC72249388338364'
+        this.getBusType();
       }
       this.orderFormData.fromCorp = '72198012799726'
 
@@ -2159,7 +2024,7 @@ export default {
         this.curAction = {}
         this.refreshCodesPanel()
         this.findInvListByUser()
-        this.initBusType()
+        // this.initBusType()
         this.findFromInvList()
         // this.getWorkBindBusTypes(null);
       } else {
@@ -2302,6 +2167,23 @@ export default {
         }
       })
     },
+
+    getBusType() {
+      let query = {
+        action: this.orderFormData.action,
+        page: 1,
+        limit: 10
+      }
+      getBusTypeList(query)
+        .then((response) => {
+          this.busTypes = response.data.list || []
+          this.splitBusType = this.busTypes[0].busType
+          console.log('==busTypes==', this.busTypes)
+        })
+        .catch(() => {
+        })
+    },
+
     handleScanComplete(fullScanData) {
       if (this.queueStatus == "1" && !this.orderFormData.workPlaceQueueCode) {
         if (fullScanData != null && fullScanData[0].includes("DMQ")) {