Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/paymentManagement.vue

@@ -69,7 +69,7 @@
       <el-table-column class="table_td" prop="paymentNo" width="100" label="编号" sortable></el-table-column>
       <el-table-column class="table_td" prop="customerName" label="客户" sortable>
         <template slot-scope="scope">
-          <div @click.stop="customer(scope.row)"><span :class="{ text_css: scope.row.textcss }">{{scope.row.customerName}}</span></div>
+          <div @click.stop="customer(scope.row)"><span class="text_css">{{scope.row.customerName}}</span></div>
         </template>
       </el-table-column>
       <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
@@ -499,20 +499,11 @@ import download from '../../components/WsDownload/download'
           .catch(() => {})
       },
       customer(row) {
-        for(let i = 0 ; i < this.paymentList.length ; i++){
-          if(row.id == this.paymentList[i].id){
-            row.textcss = true
-          }else{
-            this.paymentList[i].textcss = false
-          }
-        }
-        row.textcss = true
         this. customerInfo = true
         this.customerlist = row.identityAuthenticationInfo
         this.customerlist.cardAddressUrl1 = this.customerlist.cardAddressUrl.split(',')[0]
         this.customerlist.cardAddressUrl2 = this.customerlist.cardAddressUrl.split(',')[1]
         this.customerlist.payeeAddressUrls = this.customerlist.payeeAddressUrl.split(',')
-        this.$forceUpdate();
       },
       customerclose(e){
         console.log(e)
@@ -748,9 +739,6 @@ import download from '../../components/WsDownload/download'
         .toPromise()
         .then(response => {
           this.paymentList = response.records
-          for(let i = 0 ; i < this.paymentList.length ; i++){
-            this.paymentList.textcss = false
-          }
           this.deptBudgetTotal = response.total
         })
       // getJurisdiction({
@@ -762,8 +750,6 @@ import download from '../../components/WsDownload/download'
       //   .then(response => {
       //     this.isShowAdopt = response
       //   })
-
-
       },
       del(row) {
         this.$confirm(
@@ -1238,6 +1224,6 @@ import download from '../../components/WsDownload/download'
   }
 
   .text_css {
-    color: #2c29e7;
+    color: #5878e8;
   }
 </style>

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -683,10 +683,11 @@
         let that = this;
         that.$forceUpdate();
         that.freightspace[that.index].imgCount++
-        console.log(that.freightspace[that.index].imgCount)
-        that.freightspace[that.index].loadPoundImg += e.url + ","
-        console.log(that.freightspace[that.index].loadPoundImg)
-
+        if(that.freightspace[that.index].loadPoundImg){
+             that.freightspace[that.index].loadPoundImg += "," + e.url  
+        }else{
+             that.freightspace[that.index].loadPoundImg += e.url 
+        }
       }
     }
   }

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -759,7 +759,12 @@ export default {
         that.$forceUpdate();
         that.freightspace[that.index].imgCount++
         console.log(that.freightspace[that.index].imgCount)
-        that.freightspace[that.index].unloadPoundImg += e.url + ','
+        debugger
+        if( that.freightspace[that.index].unloadPoundImg){
+           that.freightspace[that.index].unloadPoundImg += ',' + e.url
+        }else{
+          that.freightspace[that.index].unloadPoundImg += e.url
+        }
     },
   },
 }