md

src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue

@@ -125,7 +125,7 @@
                   style="margin-right: 5px;"
                   type="warning"
                   plain
-                   :disabled="single"
+                   :disabled="multiple"
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"

src/views/emis/emisWaybill/waybillGot.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container" >
-    <el-form ref="form"  size="mini" :model="form" :rules="rules" :disabled="this.form.lockFlag=='T'" label-width="100px">
+    <el-form ref="form"  size="mini" :model="form" :rules="rules" :disabled="this.action=='modify' && this.form.lockFlag=='T'" label-width="100px">
         <el-collapse v-model="activeNames">
           <el-collapse-item title="" name="1">
             <template slot="title">
@@ -815,7 +815,6 @@ 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';
@@ -1032,25 +1031,14 @@ data() {
 },
 computed: {
 },
- watch: {
+watch: {
-    $route () {
-	      if(this.$route.query.action=='got'){
-          this.action="got";
-          // 判断时间是否一致
-          if(this.lastTimestamp != this.$route.query.timestamp){
-            this.lastTimestamp=this.$route.query.timestamp;
-            this.billCode=this.$route.query.billCode;
-            const title = '接单:'+this.billCode;
-            const route = Object.assign({}, this.$route, { title: `${title}` })
-            this.$store.dispatch('tagsView/updateVisitedView', route)
-            this.initData();
-          }
-	      }
 
-	  }
 },
 created() {
+
+
   this.action=this.$route.query.action;
+
   if(!this.action){
     this.action="add";
   }
@@ -1060,20 +1048,26 @@ created() {
     const title = '运单录入';
     const route = Object.assign({}, this.$route, { title: `${title}` })
     this.$store.dispatch('tagsView/updateVisitedView', route)
+
+    this.initData();
+
   }
   else if(this.action=='got'){
       this.billCode=this.$route.query.billCode;
       const title = '接单:'+this.billCode;
       const route = Object.assign({}, this.$route, { title: `${title}` })
       this.$store.dispatch('tagsView/updateVisitedView', route)
+      this.initData();
+
   }
   else if(this.action=='modify'){
       const title = '运单修改';
       const route = Object.assign({}, this.$route, { title: `${title}` })
       this.$store.dispatch('tagsView/updateVisitedView', route)
+
+      this.initData();
   }
 
-  this.initData();
 },
 mounted() {
 
@@ -1456,12 +1450,17 @@ methods: {
 
   },
   initData() {
+
+    console.log("====>this.action=2222=>",this.action);
+    console.log("====>this.billCode=2222=>",this.billCode);
+
       this.reset();
       this.form.productTypeSelArr=null;
 
       if(this.billCode && this.billCode!=undefined) {
         this.loading = true;
         getWaybillDetail(this.billCode).then(response => {
+
           if(this.$store.getters.ownerSiteCode!='88888'&&this.action!='got'){
             if(this.$store.getters.ownerSiteCode!=response.data.sendSiteCode){
               this.$modal.msgError('此单归属不允许修改');

src/views/emis/emisWaybill/waybillModify.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container" >
-    <el-form ref="form"  size="mini" :model="form" :rules="rules" :disabled="this.form.lockFlag=='T'" label-width="100px">
+    <el-form ref="form"  size="mini" :model="form" :rules="rules" :disabled="this.action=='modify' && this.form.lockFlag=='T'" label-width="100px">
         <el-collapse v-model="activeNames">
           <el-collapse-item title="" name="1">
             <template slot="title">
@@ -815,7 +815,6 @@ 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';
@@ -1032,25 +1031,14 @@ data() {
 },
 computed: {
 },
- watch: {
+watch: {
-    $route () {
-	      if(this.$route.query.action=='got'){
-          this.action="got";
-          // 判断时间是否一致
-          if(this.lastTimestamp != this.$route.query.timestamp){
-            this.lastTimestamp=this.$route.query.timestamp;
-            this.billCode=this.$route.query.billCode;
-            const title = '接单:'+this.billCode;
-            const route = Object.assign({}, this.$route, { title: `${title}` })
-            this.$store.dispatch('tagsView/updateVisitedView', route)
-            this.initData();
-          }
-	      }
 
-	  }
 },
 created() {
+
+
   this.action=this.$route.query.action;
+
   if(!this.action){
     this.action="add";
   }
@@ -1060,20 +1048,26 @@ created() {
     const title = '运单录入';
     const route = Object.assign({}, this.$route, { title: `${title}` })
     this.$store.dispatch('tagsView/updateVisitedView', route)
+
+    this.initData();
+
   }
   else if(this.action=='got'){
       this.billCode=this.$route.query.billCode;
       const title = '接单:'+this.billCode;
       const route = Object.assign({}, this.$route, { title: `${title}` })
       this.$store.dispatch('tagsView/updateVisitedView', route)
+      this.initData();
+
   }
   else if(this.action=='modify'){
       const title = '运单修改';
       const route = Object.assign({}, this.$route, { title: `${title}` })
       this.$store.dispatch('tagsView/updateVisitedView', route)
+
+      this.initData();
   }
 
-  this.initData();
 },
 mounted() {
 
@@ -1456,12 +1450,17 @@ methods: {
 
   },
   initData() {
+
+    console.log("====>this.action=2222=>",this.action);
+    console.log("====>this.billCode=2222=>",this.billCode);
+
       this.reset();
       this.form.productTypeSelArr=null;
 
       if(this.billCode && this.billCode!=undefined) {
         this.loading = true;
         getWaybillDetail(this.billCode).then(response => {
+
           if(this.$store.getters.ownerSiteCode!='88888'&&this.action!='got'){
             if(this.$store.getters.ownerSiteCode!=response.data.sendSiteCode){
               this.$modal.msgError('此单归属不允许修改');
@@ -1509,6 +1508,11 @@ methods: {
           if(this.action=="got"){
              // 获取可用运单数
             this.initGetTotalAvailablePag(this.form.sendSiteCode);
+
+            if(!this.form.cargoList){
+              this.handleInitGenGoods();
+            }
+
             this.startTimer();
           }
 

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container" >
-    <el-form ref="form"  size="mini" :model="form" :rules="rules" :disabled="this.form.lockFlag=='T'" label-width="100px">
+    <el-form ref="form"  size="mini" :model="form" :rules="rules" :disabled="this.action=='modify' && this.form.lockFlag=='T'" label-width="100px">
         <el-collapse v-model="activeNames">
           <el-collapse-item title="" name="1">
             <template slot="title">
@@ -815,7 +815,6 @@ 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';
@@ -1032,25 +1031,14 @@ data() {
 },
 computed: {
 },
- watch: {
+watch: {
-    $route () {
-	      if(this.$route.query.action=='got'){
-          this.action="got";
-          // 判断时间是否一致
-          if(this.lastTimestamp != this.$route.query.timestamp){
-            this.lastTimestamp=this.$route.query.timestamp;
-            this.billCode=this.$route.query.billCode;
-            const title = '接单:'+this.billCode;
-            const route = Object.assign({}, this.$route, { title: `${title}` })
-            this.$store.dispatch('tagsView/updateVisitedView', route)
-            this.initData();
-          }
-	      }
 
-	  }
 },
 created() {
+
+
   this.action=this.$route.query.action;
+
   if(!this.action){
     this.action="add";
   }
@@ -1060,20 +1048,26 @@ created() {
     const title = '运单录入';
     const route = Object.assign({}, this.$route, { title: `${title}` })
     this.$store.dispatch('tagsView/updateVisitedView', route)
+
+    this.initData();
+
   }
   else if(this.action=='got'){
       this.billCode=this.$route.query.billCode;
       const title = '接单:'+this.billCode;
       const route = Object.assign({}, this.$route, { title: `${title}` })
       this.$store.dispatch('tagsView/updateVisitedView', route)
+      this.initData();
+
   }
   else if(this.action=='modify'){
       const title = '运单修改';
       const route = Object.assign({}, this.$route, { title: `${title}` })
       this.$store.dispatch('tagsView/updateVisitedView', route)
+
+      this.initData();
   }
 
-  this.initData();
 },
 mounted() {
 
@@ -1456,12 +1450,17 @@ methods: {
 
   },
   initData() {
+
+    console.log("====>this.action=2222=>",this.action);
+    console.log("====>this.billCode=2222=>",this.billCode);
+
       this.reset();
       this.form.productTypeSelArr=null;
 
       if(this.billCode && this.billCode!=undefined) {
         this.loading = true;
         getWaybillDetail(this.billCode).then(response => {
+
           if(this.$store.getters.ownerSiteCode!='88888'&&this.action!='got'){
             if(this.$store.getters.ownerSiteCode!=response.data.sendSiteCode){
               this.$modal.msgError('此单归属不允许修改');