Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/statisticalReport/autoSettlementList.vue

@@ -713,7 +713,7 @@ export default {
             // amountNotPayable: this.modification[0].amountNotPayable,
             money: this.money,
             paymentDate: this.paymentDate,
-            paymentScreenshot: this.paymentScreenshot,
+            paymentScreenshot: this.deptBudgetList.addressUrl,
           })
             .toPromise()
             .then((response) => {
@@ -811,6 +811,7 @@ export default {
       for (var i = 0; i < this.modification.length; i++) {
         this.amountEdPayable += this.modification[i].amountEdPayable
       }
+      this.alreadyInvoice=this.amountEdPayable
       this.dialogFormVisible2 = true
     },
     submitBatchInvoice() {

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -97,7 +97,7 @@
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">
             <!--当前运输总价-->
-          <ws-form-item label="当前运输总价(元/吨):" span="1" prop="tranPrice">
+          <ws-form-item label="当前运输总价(元):" span="1" prop="tranPrice">
               <ws-input
                 v-model="deptBudgetList.tranPrice"
                 maxlength="70"

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -82,7 +82,7 @@
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">
-            <ws-form-item label="当前运输总价(元/吨):" span="1" prop="tranPrice">
+            <ws-form-item label="当前运输总价(元):" span="1" prop="tranPrice">
                 <ws-input
                   v-model="deptBudgetList.tranPrice"
                   maxlength="70"
@@ -91,7 +91,7 @@
                   style="width:70px"
                 />
             </ws-form-item>
-            <ws-form-item label="审核中的运输总价(元/吨):" span="1" prop="tranPriceIng">
+            <ws-form-item label="审核中的运输总价(元):" span="1" prop="tranPriceIng">
               <ws-input
                   v-if="deptBudgetList.priceStatus=='审核中'"
                   :disabled="readonly"