修改

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -2,70 +2,115 @@
 <template>
   <div class="container">
     <el-scrollbar style="height: 100%">
-     <el-row>
-        <el-col style='padding-left:15px;' :span="16">
-        <ws-button :type="searchType==1?'primary':''" @click="handlestatus(1)">待审核</ws-button>
-          <ws-button :type="searchType==2?'primary':''" @click="handlestatus(2)">待结算</ws-button>
-          <ws-button :type="searchType==3?'primary':''" @click="handlestatus(3)">已结算</ws-button>
-          <ws-button :type="searchType==''?'primary':''" @click="handlestatus('')">全部</ws-button>
-        <ws-button type="primary" v-hasPermission="
-            `report.procurementInReport.view`
-          " @click="handlepass()">通过</ws-button>
-        <ws-button type="primary" v-hasPermission="
-            `report.procurementInReport.view`
-          " @click="handlereject()">驳回</ws-button>
-        <ws-button type="primary" v-hasPermission="
-            `report.procurementInReport.payment`
-          " @click="handlepayment">付款</ws-button>
-        <ws-button type="primary" v-hasPermission="
-            `report.procurementInReport.draw`
-          " @click="handleninvoice">开发票</ws-button>
-        <ws-button type="primary" v-hasPermission="
-            `report.procurementInReport.edit`
-          " @click="amend()">修改</ws-button>
-        <ws-button type="primary" v-hasPermission="
-            `report.procurementInReport.carry`
-          " @click="carryover">补货结转</ws-button>
+      <el-row>
+        <el-col style="padding-left: 15px" :span="16">
+          <ws-button
+            :type="searchType == 1 ? 'primary' : ''"
+            @click="handlestatus(1)"
+            >待审核</ws-button
+          >
+          <ws-button
+            :type="searchType == 2 ? 'primary' : ''"
+            @click="handlestatus(2)"
+            >待结算</ws-button
+          >
+          <ws-button
+            :type="searchType == 3 ? 'primary' : ''"
+            @click="handlestatus(3)"
+            >已结算</ws-button
+          >
+          <ws-button
+            :type="searchType == '' ? 'primary' : ''"
+            @click="handlestatus('')"
+            >全部</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.view`"
+            @click="handlepass()"
+            >通过</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.view`"
+            @click="handlereject()"
+            >驳回</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.payment`"
+            @click="handlepayment"
+            >付款</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.draw`"
+            @click="handleninvoice"
+            >开发票</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.edit`"
+            @click="amend()"
+            >修改</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.carry`"
+            @click="carryover"
+            >补货结转</ws-button
+          >
         </el-col>
-        <el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="8">
-        <ws-select
-          v-model="contractNo"
-          placeholder="请选择合同"
-          clearable
-          @change="contractchange"
-          maxlength="500"
-          type="input"
-          class="findValue"
+        <el-col
+          style="text-align: right; line-height: 60px; padding-right: 10px"
+          :span="8"
         >
-          <ws-option key="" label="全部合同" value="" />
-          <ws-option
-          v-if='item.reportStatus'
-            v-for="item in contractNoList"
-            :key="item.constKey"
-            :label="item.contractNo + '(' + item.reportStatus + ')'"
-            :value="item.contractNo"
-          />
-          <ws-option
-          v-if='!item.reportStatus'
-            v-for="item in contractNoList"
-            :key="item.constKey"
-            :label="item.contractNo"
-            :value="item.contractNo"
-          />
-        </ws-select>
-      </el-col>
+          <ws-select
+            v-model="contractNo"
+            placeholder="请选择合同"
+            clearable
+            @change="contractchange"
+            maxlength="500"
+            type="input"
+            class="findValue"
+          >
+            <ws-option key="" label="全部合同" value="" />
+            <ws-option
+              v-if="item.reportStatus"
+              v-for="item in contractNoList"
+              :key="item.constKey"
+              :label="item.contractNo + '(' + item.reportStatus + ')'"
+              :value="item.contractNo"
+            />
+            <ws-option
+              v-if="!item.reportStatus"
+              v-for="item in contractNoList"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            />
+          </ws-select>
+        </el-col>
       </el-row>
-      <div v-if='contractNo!=""'>
-        <span v-if='orderList.transactionsNumber'>合同重量: {{orderList.transactionsNumber}} 吨</span>
+      <div v-if="contractNo != ''">
+        <span v-if="orderList.transactionsNumber"
+          >合同重量: {{ orderList.transactionsNumber }} 吨</span
+        >
         <span v-else>合同重量: 0 吨</span>
-        <span v-if='orderList.cumulativeTurnover'>成交量: {{orderList.cumulativeTurnover}} 吨</span>
+        <span v-if="orderList.cumulativeTurnover"
+          >成交量: {{ orderList.cumulativeTurnover }} 吨</span
+        >
         <span v-else>成交量: 0 吨</span>
-        <span v-if='orderList.closedPosition'>已平仓: {{orderList.closedPosition}} 吨</span>
+        <span v-if="orderList.closedPosition"
+          >已平仓: {{ orderList.closedPosition }} 吨</span
+        >
         <span v-else>已平仓: 0 吨</span>
-        <span v-if='orderList.stockInQuantity'>入库量: {{orderList.stockInQuantity}} 吨</span>
+        <span v-if="orderList.stockInQuantity"
+          >入库量: {{ orderList.stockInQuantity }} 吨</span
+        >
         <span v-else>入库量: 0 吨</span>
       </div>
-      
+
       <el-table
         class="wenzi"
         :data="warehouseList.records"
@@ -77,7 +122,11 @@
         @row-click="handleRowClick"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column :selectable='selectInit' type="selection" width="55"></el-table-column>
+        <el-table-column
+          :selectable="selectInit"
+          type="selection"
+          width="55"
+        ></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column
           class="table_td"
@@ -94,62 +143,60 @@
           prop="positionNumber"
           label="仓位号"
         ></el-table-column>
-        <el-table-column
-          class="table_td"
-          prop="carNo"
-          label="车牌号"
-        ><template slot-scope="scope">
-              {{scope.row.carNo}}({{scope.row.tranCarNo}})
-              </template></el-table-column>
+        <el-table-column class="table_td" prop="carNo" label="车牌号"
+          ><template slot-scope="scope">
+            {{ scope.row.carNo }}({{ scope.row.tranCarNo }})
+          </template></el-table-column
+        >
         <el-table-column
           class="table_td"
           prop="warehousingDate"
           label="入库日期"
         ></el-table-column>
         <el-table-column
-        width='100'
+          width="100"
           class="table_td"
           prop="protein"
           label="蛋白(%)>="
         ></el-table-column>
         <el-table-column
-        width='100'
+          width="100"
           class="table_td"
           prop="waterContent"
           label="水分(%)>="
         ></el-table-column>
         <el-table-column
-        width='100'
+          width="100"
           class="table_td"
           prop="unitPrice"
           label="单价(元/吨)"
         ></el-table-column>
         <el-table-column
-        width='100'
+          width="100"
           class="table_td"
           prop="basisPrice"
           label="基差(元/吨)"
         ></el-table-column>
         <el-table-column
-        width='120'
+          width="120"
           class="table_td"
           prop="unloadingCharge"
           label="卸车费(元/吨)"
         ></el-table-column>
         <el-table-column
-        width='120'
+          width="120"
           class="table_td"
           prop="invoiceFee"
           label="发票费(元/吨)"
         ></el-table-column>
         <el-table-column
-        width='100'
+          width="100"
           class="table_td"
           prop="deductionAmount"
           label="扣款(元/吨)"
         ></el-table-column>
         <el-table-column
-        width='140'
+          width="140"
           class="table_td"
           prop="settlementPrice"
           label="结算单价(元/吨)"
@@ -160,19 +207,19 @@
           label="净重(吨)"
         ></el-table-column>
         <el-table-column
-        width='100'
+          width="100"
           class="table_td"
           label="应付金额(元)"
           prop="amountIngPayable"
         ></el-table-column>
         <el-table-column
-        width='100'
+          width="100"
           class="table_td"
           label="已付金额(元)"
           prop="amountEdPayable"
         ></el-table-column>
         <el-table-column
-        width='100'
+          width="100"
           class="table_td"
           label="未付金额(元)"
           prop="amountNotPayable"
@@ -208,7 +255,7 @@
           prop="invoiceType"
         ></el-table-column>
         <el-table-column
-        width='100'
+          width="100"
           class="table_td"
           prop="alreadyInvoice"
           label="已开发票(元)"
@@ -228,11 +275,12 @@
 
         <el-table-column label="状态" prop="status">
           <template slot-scope="scope">
-            <span v-if='scope.row.approveStatus!=null'>{{ scope.row.approveStatus }}</span>
+            <span v-if="scope.row.approveStatus != null">{{
+              scope.row.approveStatus
+            }}</span>
             <span v-else>{{ scope.row.status }}</span>
           </template>
         </el-table-column>
-        
       </el-table>
 
       <!-- 页数 -->
@@ -475,11 +523,9 @@ import {
   postpaymoney,
   postopeninvoice,
   postbatchopeninvoice,
-  getselectctcontractno
+  getselectctcontractno,
 } from '@/model/statisticalReport/index'
-import {
-  posthandle
-} from '@/model/purchasingManagement/index'
+import { posthandle } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -505,7 +551,7 @@ export default {
       invoiceType: '自开发票',
       // invoiceTypeKey:'',
       alreadyInvoice: '',
-      needReapply:true,
+      needReapply: true,
       dialogFormVisible1: false,
       dialogFormVisible2: false,
       dialogFormVisible3: false,
@@ -566,7 +612,7 @@ export default {
       roleId: sessionStorage.getItem('ws-pf_roleId'),
       deptCircularPage: {},
       warehouseList: [],
-      orderList:{},
+      orderList: {},
       deptBudgetList: {},
       id: '',
 
@@ -608,55 +654,58 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    cur(status){
-      if(status==0){
-        this.currect=true
-      }else{
-        var that=this
-        this.currect=false
-        getselectctcontractno({customerName:this.modification[0].customerName,contractNo:this.modification[0].contractNo}).toPromise()
-            .then((response) => {
-              that.carryovercontractnolist=response
-               for (var i = 0; i < that.carryovercontractnolist.length; i++) {
-                    if(that.carryovercontractnolist[i].amountNotPayable>0){
-                          that.carryovercontractnolist[i].closeaccountstatus="待结算"
-                    }
-                    else{
-                          that.carryovercontractnolist[i].closeaccountstatus="已结算"
-                    }
-                }
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
+    cur(status) {
+      if (status == 0) {
+        this.currect = true
+      } else {
+        var that = this
+        this.currect = false
+        getselectctcontractno({
+          customerName: this.modification[0].customerName,
+          contractNo: this.modification[0].contractNo,
+        })
+          .toPromise()
+          .then((response) => {
+            that.carryovercontractnolist = response
+            for (var i = 0; i < that.carryovercontractnolist.length; i++) {
+              if (that.carryovercontractnolist[i].amountNotPayable > 0) {
+                that.carryovercontractnolist[i].closeaccountstatus = '待结算'
+              } else {
+                that.carryovercontractnolist[i].closeaccountstatus = '已结算'
+              }
+            }
+          })
+          .catch((response) => {
+            console.log(response)
+            EventBus.$emit('error', response.message)
+          })
       }
     },
-    handleRowClick(row){
-        if(row.approveStatus==null){
-            this.$refs.warehouseList.toggleRowSelection(row);
-            return true  
-        }else if(row.approveStatus!=null){    
-          if(row.taskId==null){
-            return false 
-          }else{
-            this.$refs.warehouseList.toggleRowSelection(row);
-            return true  
-          }
+    handleRowClick(row) {
+      if (row.approveStatus == null) {
+        this.$refs.warehouseList.toggleRowSelection(row)
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
+          this.$refs.warehouseList.toggleRowSelection(row)
+          return true
         }
+      }
+    },
+    selectInit(row) {
+      //在这里一定要记得类型匹配的上。
+      if (row.approveStatus == null) {
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
+          return true
+        }
+      }
     },
-     selectInit(row){
-//在这里一定要记得类型匹配的上。
-            if(row.approveStatus==null){
-                return true  
-            }else if(row.approveStatus!=null){    
-              if(row.taskId==null){
-                return false 
-              }else{
-                return true  
-              }
-            }
-        },
     //付款
     handlepayment() {
       this.amountNotPayable = 0
@@ -668,13 +717,16 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要付款的条目')
       } else {
-      for (var i = 0; i < this.modification.length; i++) {
-        if(this.modification[i].status=='已通过'||this.modification[i].status=='部分付款'){
-          this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
-        } 
-        this.amountNotPayable += this.modification[i].amountNotPayable
-      }
-      this.dialogFormVisible1 = true
+        for (var i = 0; i < this.modification.length; i++) {
+          if (
+            this.modification[i].status != '已通过' &&
+            this.modification[i].status != '部分付款'
+          ) {
+            this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
+          }
+          this.amountNotPayable += this.modification[i].amountNotPayable
+        }
+        this.dialogFormVisible1 = true
       }
     },
     submitMoney() {
@@ -864,7 +916,7 @@ export default {
 
     //审核
     handleAudit() {
-      var that=this
+      var that = this
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要审核的条目')
       } else {
@@ -882,49 +934,49 @@ export default {
           //     this.$message.success('审核成功')
           //     this.getList()
           //   })
-            that.audit(this.modification[0],0,true)
-          
+          that.audit(this.modification[0], 0, true)
         })
       }
     },
-    audit(item,index,status,status2,reason){
-      if(index<this.modification.length){
-        posthandle({ taskId: item.taskId,
-            approved: status,
-            auditMind: reason!=undefined?'已驳回':'34',
-            needReapply: status2!=undefined?true:false,})
-             .toPromise()
+    audit(item, index, status, status2, reason) {
+      if (index < this.modification.length) {
+        posthandle({
+          taskId: item.taskId,
+          approved: status,
+          auditMind: reason != undefined ? '已驳回' : '34',
+          needReapply: status2 != undefined ? true : false,
+        })
+          .toPromise()
           .then((response) => {
-            this.audit(this.modification[index+1],index+1,status)
-          }).catch((req) => {
-              this.$message.warning(req.message)
-            })
-      }else{
-        if(status){
+            this.audit(this.modification[index + 1], index + 1, status)
+          })
+          .catch((req) => {
+            this.$message.warning(req.message)
+          })
+      } else {
+        if (status) {
           this.$message.success('通过成功')
           this.getList()
-        }else if(!status){
-          if(status1==2){
+        } else if (!status) {
+          if (status1 == 2) {
             postaudit({
-            flag: 2,
-            purchaseReceiptReportList: this.modification,
-          })
-            .toPromise()
-            .then((response) => {
-              this.$message.success('驳回成功')
-              this.getList()
-            })
-            .catch((req) => {
-              this.$message.success('驳回失败')
+              flag: 2,
+              purchaseReceiptReportList: this.modification,
             })
+              .toPromise()
+              .then((response) => {
+                this.$message.success('驳回成功')
+                this.getList()
+              })
+              .catch((req) => {
+                this.$message.success('驳回失败')
+              })
           }
         }
-         
-         
       }
     },
     handlereject(status) {
-      var that=this
+      var that = this
       if (this.modification.length == 0) {
         this.$message.warning('请选择要驳回的条目')
       } else {
@@ -946,12 +998,12 @@ export default {
           //   .catch((req) => {
           //     this.$message.success('驳回失败')
           //   })
-            that.audit(this.modification[0],0,false,true,'已驳回')
+          that.audit(this.modification[0], 0, false, true, '已驳回')
         })
       }
     },
     handlepass() {
-      var that=this
+      var that = this
       if (this.modification.length == 0) {
         this.$message.warning('请选择要通过的条目')
       } else {
@@ -960,54 +1012,54 @@ export default {
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
-            that.audit(this.modification[0],0,true,2)
+          that.audit(this.modification[0], 0, true, 2)
         })
       }
     },
     carryoverconfirm() {
-      var data={}
-      if(!this.carryoverlist.carryOverWeight){
+      var data = {}
+      if (!this.carryoverlist.carryOverWeight) {
         this.$message.warning('结转重量不能为空')
         return
       }
-      if(this.carryoverlist.carryOverWeight>this.modification[0].netWeight){
+      if (this.carryoverlist.carryOverWeight > this.modification[0].netWeight) {
         this.$message.warning('结转重量不能超过净重')
         return
       }
       if (this.currect == true) {
-        data={
+        data = {
           customerConfirmationStatusFlag:
             this.modification[0].customerConfirmationStatusFlag,
-            id:this.modification[0].id,
-            contractNo:this.modification[0].contractNo,
-            carryOverWeight: this.carryoverlist.carryOverWeight,
-            purchaseReceiptReport: {
+          id: this.modification[0].id,
+          contractNo: this.modification[0].contractNo,
+          carryOverWeight: this.carryoverlist.carryOverWeight,
+          purchaseReceiptReport: {
             contractNo: this.carryoverlist.contractNo,
             carryOverWeight: this.carryoverlist.carryOverWeight,
-            },
+          },
           amountNotPayable: this.modification[0].amountNotPayable,
         }
-      }else{
-        data={
+      } else {
+        data = {
           customerConfirmationStatusFlag:
             this.modification[0].customerConfirmationStatusFlag,
-            id:this.modification[0].id,
-            contractNo:this.carryoverlist.contractNo,
-            carryOverWeight: this.carryoverlist.carryOverWeight,
-            purchaseReceiptReport: {
+          id: this.modification[0].id,
+          contractNo: this.carryoverlist.contractNo,
+          carryOverWeight: this.carryoverlist.carryOverWeight,
+          purchaseReceiptReport: {
             contractNo: this.carryoverlist.contractNo,
             carryOverWeight: this.carryoverlist.carryOverWeight,
-            },
+          },
           amountNotPayable: this.modification[0].amountNotPayable,
         }
       }
       postreplanishent(data)
-          .toPromise()
-          .then((response) => {
-            this.dialogFormVisible11=false
-            this.$message.success('结转成功')
-            this.getList()
-          })
+        .toPromise()
+        .then((response) => {
+          this.dialogFormVisible11 = false
+          this.$message.success('结转成功')
+          this.getList()
+        })
     },
     amendconfirm() {
       this.amendlist.id = this.modification[0].id
@@ -1036,7 +1088,6 @@ export default {
         this.$message.warning('请选择一条要结转的条目')
       } else {
         this.dialogFormVisible11 = true
-        
       }
     },
     handleSelectionChange(val) {
@@ -1048,12 +1099,12 @@ export default {
     },
     contractchange(e) {
       this.contractNo = e
-        getorder({
-        contractNo: this.contractNo
+      getorder({
+        contractNo: this.contractNo,
       })
         .toPromise()
         .then((response) => {
-          if(response!=null){
+          if (response != null) {
             this.orderList = response
           }
         })
@@ -1061,8 +1112,9 @@ export default {
     },
     carryovercontractchange(e) {
       for (let i = 0; i < this.carryovercontractnolist.length; i++) {
-        if(this.carryovercontractnolist[i].contractNo==e){
-          this.carryoverlist.netWeight=this.carryovercontractnolist[i].netWeight
+        if (this.carryovercontractnolist[i].contractNo == e) {
+          this.carryoverlist.netWeight =
+            this.carryovercontractnolist[i].netWeight
         }
       }
     },
@@ -1078,7 +1130,13 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '合计'
-        } else if (index === 15 || index === 17 || index === 18 || index === 16 || index === 25) {
+        } else if (
+          index === 15 ||
+          index === 17 ||
+          index === 18 ||
+          index === 16 ||
+          index === 25
+        ) {
           const values = data.map((item) => Number(item[column.property]))
           if (!values.every((value) => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -1124,11 +1182,9 @@ export default {
           .toPromise()
           .then((response) => {
             this.$message.success('添加成功')
-
-            // this.$router.go(-1)
+            this.getList()
           })
           .catch(() => {
-            console.log(1111111111)
             return false
           })
       })
@@ -1145,7 +1201,7 @@ export default {
       // }else if(this.roleId=="4ef070439cd64784bce8844fd3f0f8e1"){
       //   this.roleFlag=''
       // }
-      
+
       getpurchreceipt({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
@@ -1158,14 +1214,15 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].identification = 'false'
-            response.records[i].settlementPrice = response.records[i].unitPrice 
-            - Math.abs(response.records[i].basisPrice)
-            - Math.abs(response.records[i].unloadingCharge)
-            - Math.abs(response.records[i].invoiceFee)
-            - Math.abs(response.records[i].deductionAmount)
+            response.records[i].settlementPrice =
+              response.records[i].unitPrice -
+              Math.abs(response.records[i].basisPrice) -
+              Math.abs(response.records[i].unloadingCharge) -
+              Math.abs(response.records[i].invoiceFee) -
+              Math.abs(response.records[i].deductionAmount)
           }
-          
-          this.deptBudgetTotal=response.total
+
+          this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
       getpurchaseincontractno({
@@ -1190,23 +1247,6 @@ export default {
     handleDownload(file) {
       console.log(file)
     },
-
-    // statusquery(state) {
-    //   this.searchType = state
-    //   this.getList()
-    // },
-    // delivery(item) {
-    //   this.$router.push({
-    //     path: 'warehouseManagementDelivery',
-    //     query: {
-    //       baseId: item.warehouseId,
-    //       positionId: item.binNumberId,
-    //       warehouseName: item.warehouseName,
-    //       binNumber: item.binNumber,
-    //       capacity: item.capacity
-    //     }
-    //   })
-    // },
     getSpanArr(data) {
       let that = this
 
@@ -1324,20 +1364,6 @@ export default {
         }
       }
     },
-    // fujian(row) {
-    //   if (
-    //     row.receiveAttachmentPath === null ||
-    //     row.receiveAttachmentPath === ''
-    //   ) {
-    //     EventBus.$emit(
-    //       'warning',
-    //       this.$t('system.noticeCircular.NoInformation')
-    //     )
-    //   } else {
-    //     this.accessoryTFs = true
-    //   }
-    //   this.appendixIdss = row.receiveAttachmentPath
-    // },
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
@@ -1631,9 +1657,4 @@ hr {
   text-align: center;
   height: 40px;
 }
-// .danjia{
-//   width: 9px;
-//   height: 9px;
-//   margin-left: 40px;
-// }
 </style>