Browse Source

修改销售报表

mxx 3 years ago
parent
commit
a72773560b
1 changed files with 43 additions and 37 deletions
  1. 43 37
      src/views/statisticalReport/stockSaleOutReportList.vue

+ 43 - 37
src/views/statisticalReport/stockSaleOutReportList.vue

@@ -39,7 +39,8 @@
             <span v-else>合同重量: 0 吨</span>
             <span v-else>合同重量: 0 吨</span>
             <span v-if="outboundVolume">出库量: {{ outboundVolume.toFixed(3)}} 吨</span>
             <span v-if="outboundVolume">出库量: {{ outboundVolume.toFixed(3)}} 吨</span>
             <span v-else>出库量: 0 吨</span>
             <span v-else>出库量: 0 吨</span>
-            <span v-if="orderList.unitContractPrice&&this.tranType!='随行就市'">合同单价: {{ orderList.unitContractPrice.toFixed(3) }} 元/吨</span>
+            <span v-if="orderList.unitContractPrice&&this.tranType!='随行就市'">合同单价:
+              {{ orderList.unitContractPrice.toFixed(3) }} 元/吨</span>
             <span v-else>合同单价: 0 元/吨</span>
             <span v-else>合同单价: 0 元/吨</span>
             <span v-if="amountReceivable">应收: {{ amountReceivable.toFixed(3)}} 元</span>
             <span v-if="amountReceivable">应收: {{ amountReceivable.toFixed(3)}} 元</span>
             <span v-else>应收: 0 元</span>
             <span v-else>应收: 0 元</span>
@@ -102,7 +103,7 @@
           label="卸船净重(吨)"></el-table-column>
           label="卸船净重(吨)"></el-table-column>
         <el-table-column class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
         <el-table-column class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
         <el-table-column class="table_td" prop="settlementPrice" width='130' label="结算单价(元/吨)">
         <el-table-column class="table_td" prop="settlementPrice" width='130' label="结算单价(元/吨)">
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <div class="inputChenge">
             <div class="inputChenge">
               <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
               <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
               </el-input>
               </el-input>
@@ -118,7 +119,8 @@
 
 
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
               v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
               v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
-          </template></el-table-column>
+          </template>
+        </el-table-column>
         <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)"></el-table-column>
         <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)"></el-table-column>
         <el-table-column class="table_td" prop="amountEdReceivable" label="已收金额(元)">
         <el-table-column class="table_td" prop="amountEdReceivable" label="已收金额(元)">
         </el-table-column>
         </el-table-column>
@@ -173,7 +175,7 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
         <el-table-column class="table_td" prop="settlementPrice" width='130' label="结算单价(元/吨)">
         <el-table-column class="table_td" prop="settlementPrice" width='130' label="结算单价(元/吨)">
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <div class="inputChenge">
             <div class="inputChenge">
               <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
               <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
               </el-input>
               </el-input>
@@ -189,7 +191,8 @@
 
 
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
               v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
               v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
-          </template></el-table-column>
+          </template>
+        </el-table-column>
         <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)">
         <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
             <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
@@ -455,6 +458,7 @@
         for (var i = 0; i < this.contractNoList.length; i++) {
         for (var i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
           if (this.contractNoList[i].contractNo == e) {
             this.orderList = this.contractNoList[i]
             this.orderList = this.contractNoList[i]
+            if (!this.orderList.tranTaskInfoList) this.orderList.tranTaskInfoList = []
             for (let i = 0; i < this.orderList.tranTaskInfoList.length; i++) {
             for (let i = 0; i < this.orderList.tranTaskInfoList.length; i++) {
               if (this.orderList.tranTaskInfoList[i].tranProcessInfo) {
               if (this.orderList.tranTaskInfoList[i].tranProcessInfo) {
                 this.tranProcessInfo.push({
                 this.tranProcessInfo.push({
@@ -466,8 +470,10 @@
               }
               }
             }
             }
             console.log(this.orderList.tranTaskInfoList)
             console.log(this.orderList.tranTaskInfoList)
-            this.activeName = this.tranProcessInfo[0].name
-            this.tranType = this.tranProcessInfo[0].tranType
+            if (this.tranProcessInfo.length > 0) {
+              this.activeName = this.tranProcessInfo[0].name
+              this.tranType = this.tranProcessInfo[0].tranType
+            }
             if (this.contractNoList[i].depositUrl) {
             if (this.contractNoList[i].depositUrl) {
               this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
               this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
             } else {
             } else {
@@ -498,15 +504,15 @@
         }
         }
       },
       },
       //修改结算重量
       //修改结算重量
-      whether(row,flag) {
-        if(flag==1){
+      whether(row, flag) {
+        if (flag == 1) {
           row.identification = 'true'
           row.identification = 'true'
-        }else{
+        } else {
           row.identification1 = 'true'
           row.identification1 = 'true'
         }
         }
-        
+
       },
       },
-      weightClick(row,flag) {
+      weightClick(row, flag) {
         if (
         if (
           row.settlementWeight > 200 ||
           row.settlementWeight > 200 ||
           row.settlementWeight < 1 ||
           row.settlementWeight < 1 ||
@@ -526,22 +532,22 @@
           })
           })
           return
           return
         }
         }
-        var title=''
-        var data={}
-        if(flag==1){
-          title='确定要修改结算重量?'
-          data={
-                settlementWeight: row.settlementWeight,
-                id: row.id,
-                flag:flag
-              }
-        }else{
-          title='确定要修改结算单价?'
-          data={
-                settlementPrice: row.settlementPrice,
-                id: row.id,
-                flag:flag
-              }
+        var title = ''
+        var data = {}
+        if (flag == 1) {
+          title = '确定要修改结算重量?'
+          data = {
+            settlementWeight: row.settlementWeight,
+            id: row.id,
+            flag: flag
+          }
+        } else {
+          title = '确定要修改结算单价?'
+          data = {
+            settlementPrice: row.settlementPrice,
+            id: row.id,
+            flag: flag
+          }
         }
         }
         this.$confirm(title, {
         this.$confirm(title, {
             confirmButtonText: '确定',
             confirmButtonText: '确定',
@@ -552,18 +558,18 @@
             saleEditSettlementWeight(data)
             saleEditSettlementWeight(data)
               .toPromise()
               .toPromise()
               .then((response) => {
               .then((response) => {
-                if(flag==1){
+                if (flag == 1) {
                   this.$notify.success({
                   this.$notify.success({
-                  title: '成功',
-                  message: '结算重量修改成功',
-                })
-                }else{
+                    title: '成功',
+                    message: '结算重量修改成功',
+                  })
+                } else {
                   this.$notify.success({
                   this.$notify.success({
-                  title: '成功',
-                  message: '结算单价修改成功',
-                })
+                    title: '成功',
+                    message: '结算单价修改成功',
+                  })
                 }
                 }
-                
+
                 this.getList(this.orderList.deliverType)
                 this.getList(this.orderList.deliverType)
               })
               })
               .catch(() => {
               .catch(() => {