From 2046d51ec59024847afdfeb98250a37e06cf21cb Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 11 Nov 2024 17:45:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=83=E5=8F=96=E8=B4=A7=E6=A7=BD?=
 =?UTF-8?q?=E4=BD=8D=20=E8=8D=AF=E5=93=81=E6=95=B0=E6=8D=AE=E7=BA=A7?=
 =?UTF-8?q?=E5=88=AB=E5=92=8C=E4=B8=8B=E7=BA=A7=E6=95=B0=E9=87=8F=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=B0=8F=E6=95=B0=E7=82=B9=2011/11=201.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/drug/drugAdd.vue | 12 +++++++
 src/views/collect/IoCreateOrder.vue      | 43 ++++++++++++++----------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 59248336..9a81c9fe 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -75,6 +75,7 @@
                 <el-input size="small" v-model="scope.row.packLevel" style="width: 100%"
                           type="number"
                           :disabled="scope.$index !== selectedIndex"
+                          @input="handleInput(scope.$index, $event,1)"
                 ></el-input>
               </template>
             </el-table-column>
@@ -90,6 +91,7 @@
                 <el-input size="small" v-model="scope.row.bhxjsl" style="width: 100%"
                           type="number"
                           :disabled="scope.$index !== selectedIndex"
+                          @input="handleInput(scope.$index, $event,2)"
                 ></el-input>
               </template>
             </el-table-column>
@@ -1263,6 +1265,16 @@ export default {
     closeUdi(val) {
       this.chooseHouseDrugVisible = false
       this.getThirdSysDetail()
+    },
+    handleInput(index, value,type){
+      const intValue = parseInt(value, 10);
+      // 更新行的数据
+      if (type == 1){
+        this.$set(this.detailList[index], 'packLevel', intValue);
+      }else {
+        this.$set(this.detailList[index], 'bhxjsl', intValue);
+      }
+
     }
 
   },
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 804b9cd3..d266d347 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -35,7 +35,7 @@
             </el-button>
             <el-button size="mini" type="primary" @click.native="delOrder()" :loading="submitLoading"
                        style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
-                       :disabled="orderFormData.billNo == null"
+                       :disabled="orderFormData.billNo == null && curQueueName == ''  "
             >放弃
             </el-button>
             <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
@@ -1777,24 +1777,31 @@ export default {
       )
       tQuery.billNo = this.orderFormData.billNo
       tQuery.orderType = 2
-      if (this.orderFormData.billNo == null) {
-        this.$message.error('请先录入单据信息！')
-        return
-      }
+      // if (this.orderFormData.billNo == null) {
+      //   this.$message.error('请先录入单据信息！')
+      //   return
+      // }
       this.saveLoading = true
-      deleteByOrderId(tQuery).then((response) => {
-        this.saveLoading = false
-        if (response.code === 20000) {
-          this.$message.success('放弃成功')
-          this.successCloseData()
-          this.result = ''
-          this.$refs.inputRef.focus()
-        } else {
-          this.$message.error(response.message)
-        }
-        this.loading = false
-        this.saveLoading = false
-      })
+      if (this.orderFormData.billNo != null){
+        deleteByOrderId(tQuery).then((response) => {
+          this.saveLoading = false
+          if (response.code === 20000) {
+            this.$message.success('放弃成功')
+            this.successCloseData()
+            this.result = ''
+            this.$refs.inputRef.focus()
+          } else {
+            this.$message.error(response.message)
+          }
+          this.loading = false
+          this.saveLoading = false
+        })
+      }else {
+        this.successCloseData()
+        this.result = ''
+        this.$refs.inputRef.focus()
+      }
+
     },
     // 刷新表单
     resetForm() {