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

src/views/contractManagement/futuresPurchaseContract.vue

@@ -456,7 +456,7 @@ export default {
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
+            if (response.records[i].addressUrl != null&&response.records[i].addressUrl != "") {
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')
             } else {

src/views/contractManagement/futuresSalesContract.vue

@@ -457,7 +457,7 @@ export default {
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
+            if (response.records[i].addressUrl != null&&response.records[i].addressUrl != "") {
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')
             } else {

src/views/purchasingManagement/purchaseOrderList.vue

@@ -1431,6 +1431,8 @@ export default {
       this.$set(this.aduitlist, 'type', item.type)
       this.$set(this.aduitlist, 'typeKey', item.typeKey)
       this.$set(this.aduitlist, 'procurementPlanType', item.procurementPlanType)
+      this.$set(this.aduitlist, 'unitPrice', item.unitPrice)
+      this.$set(this.aduitlist, 'invoiceFee', item.invoiceFee)
       this.$set(this.aduitlist, 'basis', Math.abs(item.basis))
       this.$set(this.aduitlist, 'depositRatio', item.customerInfo.depositRatio)
       this.$set(this.aduitlist, 'totalDeposit', item.customerInfo.totalDeposit)

src/views/salesManagement/salesPlanOrderList.vue

@@ -163,7 +163,7 @@
           }}</span>
         </template></el-table-column
       >
-      <el-table-column
+      <!-- <el-table-column
         width="100"
         class="table_td"
         prop="unloadingCharge"
@@ -174,7 +174,7 @@
             scope.row.unloadingCharge
           }}</span>
         </template></el-table-column
-      >
+      > -->
       <el-table-column
         width="100"
         class="table_td"
@@ -734,7 +734,7 @@
             class="deal"
           ></el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           v-if="aduitlist.salePlanType == '期货'"
           label="卸车费(元/吨)"
           :label-width="formLabelWidth"
@@ -745,7 +745,7 @@
             placeholder="请输入卸车费"
             class="deal"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           v-if="aduitlist.salePlanType == '期货'"
           label="发票费用(元/吨)"
@@ -1524,6 +1524,9 @@ export default {
       this.$set(this.aduitlist, 'salePlanType', item.salePlanType)
       this.$set(this.aduitlist, 'depositRatio', item.customerInfo.depositRatio)
       this.$set(this.aduitlist, 'totalDeposit', item.customerInfo.totalDeposit)
+      this.$set(this.aduitlist, 'unitPrice', item.unitPrice)
+      this.$set(this.aduitlist, 'invoiceFee', item.invoiceFee)
+      this.$set(this.aduitlist, 'basis', item.basis)
     },
     aduitconfirm() {
       if (!this.aduitlist.unitPrice) {

src/views/statisticalReport/salesClosingCashierList.vue

@@ -9,10 +9,10 @@
           <ws-button :type="searchType==''?'primary':''" @click="handlestatus('')">全部</ws-button>
           <ws-button type="primary" v-hasPermission="
             `report.saleCloseReport.view`
-          " @click="handleAudit(0)">驳回</ws-button>
+          " @click="handleAudit(1)">驳回</ws-button>
           <ws-button type="primary" v-hasPermission="
             `report.saleCloseReport.view`
-          " @click="handleAudit(1)">通过</ws-button>
+          " @click="handleAudit(0)">通过</ws-button>
           <ws-button type="primary" v-hasPermission="
             `report.saleCloseReport.payment`
           " @click="payment()">付款</ws-button>