From 1a4ada19f93322d94db898f3904b68503dc22c4a Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Wed, 3 Jul 2024 16:21:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E5=8F=B7+?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=B1=BB=E5=9E=8B=E7=9A=84=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emisWaybillProblemInfo/problemEntry.vue   | 24 +++++-
 .../registrationProblemInquiry.vue            | 76 ++++++++++++-------
 2 files changed, 71 insertions(+), 29 deletions(-)

diff --git a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
index 5f9c05dc..23dbf478 100644
--- a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
@@ -368,6 +368,14 @@ export default {
       // this.getWaybill(this.form.billCode)
       // this.loading = true;
 
+      for(let i = 0; i < this.emisWaybillList.length; i++){
+        if(this.emisWaybillList[i].billCode == this.form.billCode && this.emisWaybillList[i].problemId == this.form.problemId){
+          this.$message.error("重复扫描");
+          this.form.billCode = "";
+          return;
+        }
+      }
+
       let res=await getWaybillDetail(this.form.billCode);
       // this.loading = false;
       if(res.code != 200){
@@ -476,7 +484,6 @@ export default {
         this.$message.error("请填写问题原因");
         return;
       }
-      debugger;
       this.tempRecord.notifySiteCode = this.form.notifySiteCode;
       this.tempRecord.notifySiteName =  this.form.notifySiteName;
       this.tempRecord.problemTypeName=this.form.problemType;
@@ -641,7 +648,20 @@ export default {
       // });
       this.loading = true;
       for(let bc=0;bc<bcList.length;bc++){
-        await this.addToList(bcList[bc]);
+        // for(let i = 0; i < this.emisWaybillList.length; i++){
+        //   if(this.emisWaybillList[i].billCode == this.form.billCode && this.emisWaybillList[i].problemId == this.form.problemId){
+        //     this.$message.error("重复扫描");
+        //     this.form.billCode = "";
+        //     return;
+        //   }
+        // }
+        let exitlist = this.emisWaybillList.filter(item => (item.billCode == bcList[bc] && item.problemId == this.form.problemId));
+        if(exitlist.length > 0){
+          this.$message.error("单号："+ bcList[bc] + ", 已存在");
+          continue;
+        }else{
+          await this.addToList(bcList[bc]);
+        }
       }
       this.loading = false;
       this.openBatch=false;
diff --git a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
index 15350079..59ddf3fc 100644
--- a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
@@ -83,6 +83,15 @@
               @click="getList"
             >查询</el-button>
           </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              size="mini"
+              @click="handleDelete"
+              :disabled="multiable"
+            >删除</el-button>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button
               type="primary"
@@ -111,8 +120,9 @@
           </el-col>
         </el-row>
       </div>
+      <!-- <el-table-column :label="$t('选择')" type="selection" width="55" align="center" /> -->
       
-      <el-table-column width="40" align="center" >
+      <el-table-column  width="60" align="center" >
         <template slot-scope="scope">
           <el-radio class="radio" :label="scope.row" v-model="radio" @change.native="getCurrentRow(scope.row)" >&nbsp;</el-radio>
         </template>
@@ -202,7 +212,7 @@
 </template>
 
 <script>
-import { listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
+import { listEmisWaybillProblemInfo, delEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
 import { listEmisWaybill } from "@/api/emis/emisWaybill";
 import { addEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
 import CommentInfoForm from '@/views/emis/emisWaybillProblemFaq/commentInfoForm.vue';
@@ -245,6 +255,8 @@ export default {
       open: false,
       currentRow:{},
 
+      multiable: true,
+
       openForm: false,
       titleForm: "",
 
@@ -406,6 +418,7 @@ export default {
         }
         this.currentRow = {};
         this.showProblemDetail = false;
+        this.multiable = true;
         this.reversion = {
           status:'',
           content:''
@@ -558,28 +571,29 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection,row) {
-      if (selection.length > 1) {
-        // this.$message.error("只能选择一条数据");
-        this.$refs.singleSelectTable.getInstance().clearSelection();
-        this.$refs.singleSelectTable.getInstance().toggleRowSelection(row);
-        this.currentRow = row;
-        this.showProblemDetail = true;
-        this.reversion = this.currentRow;
-      } else if(selection.length==1) {
-        this.currentRow = selection[0];
-        this.showProblemDetail = true;
-        this.reversion = this.currentRow;
-      }else{
-        this.currentRow = {};
-        this.showProblemDetail = false;
-
-      }
-      this.reversion = {
-        status:'',
-        content:''
-      }
-      // this.ids = selection.map(item => item.id)
+      // this.ids = selection;
+      // if (selection.length > 1) {
+      //   // this.$message.error("只能选择一条数据");
+      //   this.$refs.singleSelectTable.getInstance().clearSelection();
+      //   this.$refs.singleSelectTable.getInstance().toggleRowSelection(row);
+      //   this.currentRow = row;
+      //   this.showProblemDetail = true;
+      //   this.reversion = this.currentRow;
+      // } else if(selection.length==1) {
+      //   this.currentRow = selection[0];
+      //   this.showProblemDetail = true;
+      //   this.reversion = this.currentRow;
+      // }else{
+      //   this.currentRow = {};
+      //   this.showProblemDetail = false;
 
+      // }
+      // this.reversion = {
+      //   status:'',
+      //   content:''
+      // }
+      this.ids = selection.map(item => item.id)
+      this.multiable = this.ids.length > 0 ? false : true;
 
     },
     async saveReversion(){
@@ -725,12 +739,20 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete() {
-      const ids = this.ids
-      this.$modal.confirm('是否确认删除').then(function() {
-        return delEmisTmsScanRecord(ids);
+      const ids = this.ids;
+      let res;
+      let that = this;
+      this.$modal.confirm('是否确认删除').then(async function() {
+        for(let i = 0; i< ids.length; i++){
+          res = await delEmisWaybillProblemInfo(ids[i]);
+        }
+        if(!res || res.code != 0){
+          that.$message.error(res && res.message || "删除失败");
+        }else{
+          that.$modal.msgSuccess("删除成功");
+        }
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

From 6c6461f1c554d842773b9e0b659781291f584fad Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Wed, 3 Jul 2024 16:55:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=8C=85=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E6=9C=AA=E4=BC=A0=E5=90=88=E5=8C=85?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisTmsScanRecord/coPackageScanning.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
index 5f1d2e94..54524035 100644
--- a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
@@ -452,6 +452,7 @@ export default {
           {
             billCode:this.form.billCode,
             scanWeight:this.form.scanWeight,
+            bagNo: this.form.bagNo
             // dispatchOrSendManCode:this.form.dispatchOrSendManCode
           }
         ]