From 0cdd2a1fcc9d4f5e81c323bc0d363015ca9976b1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 1 Aug 2024 12:06:32 +0800
Subject: [PATCH] md

---
 src/components/XdTable/index.vue              |  5 +++
 .../emis/emisWaybill/waybillIsPrinted.vue     | 14 ++++++--
 src/views/emis/emisWaybill/waybillModify.vue  | 32 +++++++++----------
 src/views/emis/emisWaybill/waybillRecord.vue  | 31 ++++++++----------
 4 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index 3d18a416..01a8528b 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -615,6 +615,11 @@ export default {
         return Math.random().toString(36).substring(3,10);
       },
 
+      clearSelection(){
+        this.$nextTick(()=>{
+          this.$refs.table.$refs.elTable.clearSelection();
+        });
+      },
       initKeyDown(){
         let that=this;
         document.addEventListener('keydown', function(e) {
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index 979ca8d3..4ee6828d 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -110,7 +110,11 @@
 
           </el-row>
       </div>
-
+      <el-table-column label="序号" align="center" min-width="60">
+        <template slot-scope="scope">
+          <span v-text="getIndex(scope.$index)"> </span>
+        </template>
+      </el-table-column>
       <el-table-column type="selection" width="55" :reserve-selection="true" align="center" />
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/>
@@ -537,10 +541,12 @@ export default {
           this.queryParams.billCode=newBillCodeStr;
 
         }
+      }else{
+        this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"Date");
       }
 
       // this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate");
-      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"Date");
+
 
       queryPrintListSimple(this.queryParams).then(response => {
         this.emisWaybillList = response.rows;
@@ -558,7 +564,9 @@ export default {
     handleQuery() {
 
       // 清除已选择
-      // this.$refs.refQueryTable.clearSelection();
+      if(this.ids&&this.ids.length>0){
+        this.$refs.refQueryTable.clearSelection();
+      }
 
       this.queryParams.pageNum = 1;
       this.getList();
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 00673bc1..163b6fae 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -808,6 +808,7 @@ import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPic
 
 // import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
 
+
 import feeItemForm from './feeItemForm.vue';
 
 import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
@@ -1360,15 +1361,8 @@ methods: {
           this.form = response.data;
           if(this.$store.getters.ownerSiteCode!='88888'&&this.addFrom!='userOrder'){
             if(this.$store.getters.ownerSiteCode!=this.form.sendSiteCode){
-              this.$confirm("此单归属不允许修改", '提示', {
-                    confirmButtonText: '确认',
-                    cancelButtonText: '返回',
-                    type: 'warning'
-                  }).then(() => {
-
-                  }).catch(() => {
-
-              })
+              this.$message.error('此单归属不允许修改');
+              return;
             }
           }
 
@@ -1384,14 +1378,6 @@ methods: {
           }
 
 
-          if(!this.form.feeItems){
-            this.form.feeItems=[];
-          }
-
-          if(!this.form.cargoList){
-            this.form.cargoList=[];
-            this.handleInitGenGoods();
-          }
 
           if(!this.form.attachmentList){
             this.form.attachmentList=[];
@@ -1409,7 +1395,19 @@ methods: {
             })
           }
 
+
+
+
           if(this.addFrom=="userOrder"){
+            if(!this.form.feeItems){
+              this.form.feeItems=[];
+            }
+
+            if(!this.form.cargoList){
+              this.form.cargoList=[];
+              this.handleInitGenGoods();
+            }
+
              // 获取可用运单数
             this.initGetTotalAvailablePag(this.form.sendSiteCode);
             this.startTimer();
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index e5768840..62e423cd 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -1361,15 +1361,8 @@ methods: {
           this.form = response.data;
           if(this.$store.getters.ownerSiteCode!='88888'&&this.addFrom!='userOrder'){
             if(this.$store.getters.ownerSiteCode!=this.form.sendSiteCode){
-              this.$confirm("此单归属不允许修改", '提示', {
-                    confirmButtonText: '确认',
-                    cancelButtonText: '返回',
-                    type: 'warning'
-                  }).then(() => {
-
-                  }).catch(() => {
-
-              })
+              this.$message.error('此单归属不允许修改');
+              return;
             }
           }
 
@@ -1385,14 +1378,6 @@ methods: {
           }
 
 
-          if(!this.form.feeItems){
-            this.form.feeItems=[];
-          }
-
-          if(!this.form.cargoList){
-            this.form.cargoList=[];
-            this.handleInitGenGoods();
-          }
 
           if(!this.form.attachmentList){
             this.form.attachmentList=[];
@@ -1410,7 +1395,19 @@ methods: {
             })
           }
 
+
+
+
           if(this.addFrom=="userOrder"){
+            if(!this.form.feeItems){
+              this.form.feeItems=[];
+            }
+
+            if(!this.form.cargoList){
+              this.form.cargoList=[];
+              this.handleInitGenGoods();
+            }
+
              // 获取可用运单数
             this.initGetTotalAvailablePag(this.form.sendSiteCode);
             this.startTimer();