前端

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -39,7 +39,7 @@
             <span v-else>合同重量: 0 吨</span>
             <span v-if="outboundVolume">出库量: {{ outboundVolume }} 吨</span>
             <span v-else>出库量: 0 吨</span>
-            <span v-if="orderList.unitContractPrice">合同单价: {{ orderList.unitContractPrice }} 元/吨</span>
+            <span v-if="orderList.unitContractPrice&&this.tranType!='随行就市'">合同单价: {{ orderList.unitContractPrice }} 元/吨</span>
             <span v-else>合同单价: 0 元/吨</span>
             <span v-if="amountReceivable">应收: {{ amountReceivable }} 元</span>
             <span v-else>应收: 0 元</span>
@@ -101,7 +101,24 @@
         <el-table-column v-else-if="this.tranType=='散船'||this.tranType=='箱船'" class="table_td" prop="unloadingWeight"
           label="卸船净重（吨）"></el-table-column>
         <el-table-column class="table_td" prop="settlementWeight" label="结算重量（吨）"></el-table-column>
-        <el-table-column v-if="this.tranType=='随行就市'" class="table_td" prop="settlementPrice" label="结算单价（元/吨）"></el-table-column>
+        <el-table-column class="table_td" prop="settlementPrice" width='130' label="结算单价（元/吨）">
+        <template slot-scope="scope">
+            <div class="inputChenge">
+              <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
+              </el-input>
+              <div v-if="scope.row.identification1 == 'false'" class="inputs">
+                <span>{{scope.row.settlementPrice}}</span>
+              </div>
+            </div>
+            <div style='display:inline-block;' v-if="scope.row.identification1 == 'false'">
+              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
+                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
+                @click="whether(scope.row,2)" alt="" />
+            </div>
+
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
+          </template></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>
@@ -148,13 +165,31 @@
             <div style='display:inline-block;' v-if="scope.row.identification == 'false'">
               <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
                 style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
-                @click="whether(scope.row)" alt="" />
+                @click="whether(scope.row,1)" alt="" />
             </div>
 
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'" @click="weightClick(scope.row)"></i>
+              v-if="scope.row.identification == 'true'" @click="weightClick(scope.row,1)"></i>
           </template>
         </el-table-column>
+        <el-table-column class="table_td" prop="settlementPrice" width='130' label="结算单价（元/吨）">
+        <template slot-scope="scope">
+            <div class="inputChenge">
+              <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
+              </el-input>
+              <div v-if="scope.row.identification1 == 'false'" class="inputs">
+                <span>{{scope.row.settlementPrice}}</span>
+              </div>
+            </div>
+            <div style='display:inline-block;' v-if="scope.row.identification1 == 'false'">
+              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
+                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
+                @click="whether(scope.row,2)" alt="" />
+            </div>
+
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
+          </template></el-table-column>
         <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)">
           <template slot-scope="scope">
             <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
@@ -463,10 +498,15 @@
         }
       },
       //修改结算重量
-      whether(row) {
-        row.identification = 'true'
+      whether(row,flag) {
+        if(flag==1){
+          row.identification = 'true'
+        }else{
+          row.identification1 = 'true'
+        }
+        
       },
-      weightClick(row) {
+      weightClick(row,flag) {
         if (
           row.settlementWeight > 200 ||
           row.settlementWeight < 1 ||
@@ -486,22 +526,44 @@
           })
           return
         }
-        this.$confirm(`确定要修改结算重量？`, {
+        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, {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning',
           })
           .then(() => {
-            saleEditSettlementWeight({
-                settlementWeight: row.settlementWeight,
-                id: row.id,
-              })
+            saleEditSettlementWeight(data)
               .toPromise()
               .then((response) => {
-                this.$notify.success({
+                if(flag==1){
+                  this.$notify.success({
                   title: '成功',
                   message: '结算重量修改成功',
                 })
+                }else{
+                  this.$notify.success({
+                  title: '成功',
+                  message: '结算单价修改成功',
+                })
+                }
+                
                 this.getList(this.orderList.deliverType)
               })
               .catch(() => {
@@ -569,9 +631,9 @@
               sums[index] = '合计'
             } else if (
               index === 8 ||
-              index === 9 ||
               index === 10 ||
-              index === 11
+              index === 11 ||
+              index === 12
             ) {
               const values = data.map((item) => Number(item[column.property]))
               if (!values.every((value) => isNaN(value))) {
@@ -594,7 +656,7 @@
               if (index === 0) {
                 sums[index] = '合计'
               } else if (
-                index === 8 ||
+                index === 11 ||
                 index === 9 ||
                 index === 10 ||
                 index === 7
@@ -621,7 +683,7 @@
               } else if (
                 index === 11 ||
                 index === 9 ||
-                index === 10 ||
+                index === 13 ||
                 index === 12
               ) {
                 const values = data.map((item) => Number(item[column.property]))
@@ -645,7 +707,7 @@
                 sums[index] = '合计'
               } else if (
                 index === 11 ||
-                index === 9 ||
+                index === 12 ||
                 index === 10 ||
                 index === 8
               ) {
@@ -870,6 +932,7 @@
             let num = []
             for (var i = 0; i < response.records.length; i++) {
               response.records[i].identification = 'false'
+              response.records[i].identification1 = 'false'
               if (response.records[i].amountIngReceivable) {
                 this.amountReceivable += Number(response.records[i].amountIngReceivable.toFixed(2))
               }