前端 sdy

src/views/statisticalReport/huoyunList.vue

@@ -4,17 +4,17 @@
     <el-scrollbar style="height: 100%">
       <el-row>
         <el-col style="padding-left: 15px" :span="16">
-          <ws-button
+          <!-- <ws-button
             :type="searchType == 1 ? 'primary' : ''"
             @click="handlestatus(1)"
             >待审核</ws-button
-          >
+          > -->
           <ws-button
             :type="searchType == 2 ? 'primary' : ''"
             @click="handlestatus(2)"
             >待结算</ws-button
           >
-          <ws-button
+          <!-- <ws-button
             :type="searchType == 3 ? 'primary' : ''"
             @click="handlestatus(3)"
             >已结算</ws-button
@@ -23,7 +23,7 @@
             :type="searchType == '' ? 'primary' : ''"
             @click="handlestatus('')"
             >全部</ws-button
-          >
+          >  
           <ws-button
             type="primary"
             v-hasPermission="`report.transportationReport.view`"
@@ -35,19 +35,19 @@
             v-hasPermission="`report.transportationReport.view`"
             @click="handlereject()"
             >驳回</ws-button
-          >
+          > -->
           <ws-button
             type="primary"
             v-hasPermission="`report.transportationReport.payment`"
             @click="handlepayment"
-            >付款</ws-button
+            >申请结算</ws-button
           >
-          <ws-button
+          <!-- <ws-button
             type="primary"
             v-hasPermission="`report.transportationReport.draw`"
             @click="handleninvoice"
             >开发票</ws-button
-          >
+          > -->
         </el-col>
         <el-col
           style="text-align: right; line-height: 60px; padding-right: 10px"
@@ -84,7 +84,7 @@
 
       <el-table
         class="wenzi"
-        :data="warehouseList.records"
+        :data="warehouseList"
         style="width: 100%; margin-top: 20px"
         ref="warehouseList"
         border
@@ -104,7 +104,7 @@
           prop="contractNo"
           label="合同编号"
         ></el-table-column>
-         <el-table-column
+        <el-table-column
           class="table_td"
           prop="taskNo"
           label="运输任务"
@@ -126,22 +126,33 @@
         ></el-table-column>
         <el-table-column
           class="table_td"
-          prop="carNo"
+          prop="loadingWeight"
           label="装车净重（吨）"
-          ></el-table-column
-        >
+        ></el-table-column>
         <el-table-column
           class="table_td"
-          prop="loadingWeight"
+          prop="unloadingWeight"
           label="卸车净重(吨)"
         >
         </el-table-column>
-        <el-table-column
-          class="table_td"
-          prop="loadingWeight"
-          label="损耗(吨)"
-        >
+        <el-table-column class="table_td" prop="lossWeight" label="损耗(吨)">
         </el-table-column>
+        <el-table-column class="table_td" label="账户" prop="">
+          <template slot-scope="scope">
+            <div
+              style="
+                display: inline-block;
+                color: #5878e8;
+                padding: 0 4px !important;
+                position: relative;
+                font-size: 14px;
+              "
+              @click="look(scope.row)"
+            >
+              查看
+            </div>
+          </template></el-table-column
+        >
       </el-table>
 
       <!-- 页数 -->
@@ -154,7 +165,7 @@
         :total="deptBudgetTotal"
       ></el-pagination>
     </el-scrollbar>
-    <!-- 付款 -->
+      <!-- 付款 -->
     <el-dialog
       width="25%"
       title="付款"
@@ -258,47 +269,47 @@
     >
       <h3 style="margin-left: 30px">{{ driverPayeeList.payeeName }}的账户</h3>
       <div v-for="(item, index) in driverPayeeList" :key="index">
-      <h4 style="margin-left: 30px">账户-{{index+1}}</h4>
-      <div class="anniu">
-        <el-radio-group @change="bankCard(item,id)" v-model="item.radio">
-        <el-radio label="1">本次收款账户</el-radio>
-      </el-radio-group>
-      </div>
-      <el-form class="customer" :model="form">
-        <el-form-item label="账户类型" :label-width="formLabelWidth">
-          {{ item.accountType }}
-        </el-form-item>
-        <el-form-item label="银行卡号" :label-width="formLabelWidth">
-          {{ item.bankCard }}
-        </el-form-item>
-        <el-form-item label="开户行" :label-width="formLabelWidth">
-          {{ item.bankDeposit }}
-        </el-form-item>
-        <el-form-item label="开户支行" :label-width="formLabelWidth">
-          {{ item.bankDepositBranch }}
-        </el-form-item>
-        <el-form-item
-          label="收款人姓名"
-          :label-width="formLabelWidth"
-          v-if="item.accountTypeFlag == 1"
-        >
-          {{ item.payeeName }}
-        </el-form-item>
-        <el-form-item
-          label="收款人身份证号"
-          :label-width="formLabelWidth"
-          v-if="item.accountTypeFlag == 1"
-        >
-          {{ item.payeeNumberCard }}
-        </el-form-item>
-        <el-form-item
-          v-if="item.accountTypeFlag == 2"
-          label="企业名称"
-          :label-width="formLabelWidth"
-        >
-          {{ item.compName }}
-        </el-form-item>
-      </el-form>
+        <h4 style="margin-left: 30px">账户-{{ index + 1 }}</h4>
+        <div class="anniu">
+          <el-radio-group @change="bankCard(item, id)" v-model="item.radio">
+            <el-radio label="1">本次收款账户</el-radio>
+          </el-radio-group>
+        </div>
+        <el-form class="customer" :model="form">
+          <el-form-item label="账户类型" :label-width="formLabelWidth">
+            {{ item.accountType }}
+          </el-form-item>
+          <el-form-item label="银行卡号" :label-width="formLabelWidth">
+            {{ item.bankCard }}
+          </el-form-item>
+          <el-form-item label="开户行" :label-width="formLabelWidth">
+            {{ item.bankDeposit }}
+          </el-form-item>
+          <el-form-item label="开户支行" :label-width="formLabelWidth">
+            {{ item.bankDepositBranch }}
+          </el-form-item>
+          <el-form-item
+            label="收款人姓名"
+            :label-width="formLabelWidth"
+            v-if="item.accountTypeFlag == 1"
+          >
+            {{ item.payeeName }}
+          </el-form-item>
+          <el-form-item
+            label="收款人身份证号"
+            :label-width="formLabelWidth"
+            v-if="item.accountTypeFlag == 1"
+          >
+            {{ item.payeeNumberCard }}
+          </el-form-item>
+          <el-form-item
+            v-if="item.accountTypeFlag == 2"
+            label="企业名称"
+            :label-width="formLabelWidth"
+          >
+            {{ item.compName }}
+          </el-form-item>
+        </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible8 = false">取 消</el-button>
@@ -311,7 +322,7 @@
       @on-cancel="handleClose"
     >
       <p>查看装车磅单</p>
-        <img width="100" height="100" :src="loadingImg1" alt="" />
+      <img width="100" height="100" :src="loadingImg1" alt="" />
     </WinseaContentModal>
     <WinseaContentModal
       v-model="accesscard"
@@ -406,7 +417,7 @@ export default {
       // 年
       year: '',
       options: [],
-      id:'',
+      id: '',
       pickerOptions: {},
       value2: '',
       deptBudgetTotal: 0,
@@ -417,7 +428,7 @@ export default {
       searchTypeText: '未完成',
       searchKeyWord: '',
       driverPayeeList: {
-          radio: '1',
+        radio: '1',
       },
       contractType: 2,
       accessoryTFs: false,
@@ -436,7 +447,11 @@ export default {
       compId: sessionStorage.getItem('ws-pf_compId'),
       roleId: sessionStorage.getItem('ws-pf_roleId'),
       deptCircularPage: {},
-      warehouseList: [],
+      warehouseList: [
+        {
+          contractNo:"kmrlejrpoj",
+        }
+      ],
       orderList: {},
       deptBudgetList: {},
       id: '',
@@ -468,6 +483,14 @@ export default {
       paymentScreenshotUrls: [],
       carryovercontractnolist: [],
       historyList: [],
+      account: [
+        {
+          value: '个人账户',
+        },
+        {
+          value: '企业账户',
+        },
+      ],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -545,42 +568,42 @@ export default {
     look(item) {
       this.dialogFormVisible8 = true
       if (item.driverPayeeInfoList) {
-        this.driverPayeeList= item.driverPayeeInfoList
-        this.driverPayeeList.payeeName=item.driverPayeeInfoList[0].payeeName
-        for (var i = 0; i < item.driverPayeeInfoList.length; i++){
-          if(item.driverPayeeInfoList[i].bankCard==item.cardNo){
-            this.driverPayeeList[i].radio='1'
-          }
-          else{
-            this.driverPayeeList[i].radio='2'
+        this.driverPayeeList = item.driverPayeeInfoList
+        this.driverPayeeList.payeeName = item.driverPayeeInfoList[0].payeeName
+        for (var i = 0; i < item.driverPayeeInfoList.length; i++) {
+          if (item.driverPayeeInfoList[i].bankCard == item.cardNo) {
+            this.driverPayeeList[i].radio = '1'
+          } else {
+            this.driverPayeeList[i].radio = '2'
           }
           console.log(this.driverPayeeList[i].radio)
         }
-        this.id=item.id
+        this.id = item.id
       }
     },
-    //付款
+    //结算
     handlepayment() {
-      this.amountNotPayable = 0
-      this.money = this.money
-      this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
-      this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
-      this.paymentDate = this.paymentDate
-      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('只有已通过或部分付款的条目才可进行付款操作')
-            return
-          }
-          this.amountNotPayable += this.modification[i].amountNotPayable
-        }
-        this.dialogFormVisible1 = true
-      }
+      this.dialogFormVisible1 = true
+      // this.amountNotPayable = 0
+      // this.money = this.money
+      // this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
+      // this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
+      // this.paymentDate = this.paymentDate
+      // 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('只有已通过或部分付款的条目才可进行付款操作')
+      //       return
+      //     }
+      //     this.amountNotPayable += this.modification[i].amountNotPayable
+      //   }
+      //   this.dialogFormVisible1 = true
+      // }
     },
     submitMoney() {
       this.autoSettlementReport.money = this.money
@@ -728,7 +751,8 @@ export default {
     //批量开发票
     handleninvoice() {
       this.amountEdPayable = 0
-      this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
+      this.tranSettlementReportList =
+        this.warehouseList.records[0].tranSettlementReportList
       for (var i = 0; i < this.modification.length; i++) {
         this.amountEdPayable += this.modification[i].amountEdPayable
       }
@@ -803,7 +827,7 @@ export default {
         })
     },
     //设置本次账户
-    bankCard(item,id) {
+    bankCard(item, id) {
       editauto({
         cardNo: item.bankCard,
         id: id,
@@ -868,9 +892,7 @@ export default {
     //装车磅单
     lookloadingImg(row) {
       if (row.loadingImg == null || row.loadingImg == '') {
-        EventBus.$emit(
-          this.$message.warning('暂无磅单信息')
-        )
+        EventBus.$emit(this.$message.warning('暂无磅单信息'))
       } else {
         this.accessoryTFs = true
       }
@@ -879,9 +901,7 @@ export default {
     //卸车磅单
     lookunloadingImg(row) {
       if (row.unloadingImg === null || row.unloadingImg === '') {
-        EventBus.$emit(
-          this.$message.warning('暂无磅单信息')
-        )
+        EventBus.$emit(this.$message.warning('暂无磅单信息'))
       } else {
         this.accesscard = true
       }
@@ -890,9 +910,7 @@ export default {
     //付款截图
     lookpaymentScreenshot(row) {
       if (row.paymentScreenshot == null || row.paymentScreenshot == '') {
-        EventBus.$emit(
-          this.$message.warning('暂无付款截图信息')
-        )
+        EventBus.$emit(this.$message.warning('暂无付款截图信息'))
       } else {
         this.paymentImg = true
       }
@@ -915,13 +933,13 @@ export default {
             this.$message.warning(req.message)
           })
       } else {
-        if (status==true) {
+        if (status == true) {
           this.$message.success('通过成功')
           this.getList()
-        } else if (status==false) {
+        } else if (status == false) {
           this.$message.success('驳回成功')
           this.getList()
-          }
+        }
       }
     },
     handlereject(status) {
@@ -1034,7 +1052,9 @@ export default {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].settlementWeightchange = false
             response.records[i].deductionAmountchange = false
-            response.records[i].amountNotPayable=response.records[i].amountIngPayable-response.records[i].amountEdPayable
+            response.records[i].amountNotPayable =
+              response.records[i].amountIngPayable -
+              response.records[i].amountEdPayable
             //     response.records[i].settlementPrice =
             //       response.records[i].unitPrice -
             //       Math.abs(response.records[i].basisPrice) -

src/views/statisticalReport/shippingList.vue

@@ -1,4 +1,4 @@
-//火运结算报表
+//船运结算报表
 <template>
   <div class="container">
     <el-scrollbar style="height: 100%">
@@ -116,29 +116,29 @@
         ></el-table-column>
         <el-table-column
           class="table_td"
-          prop="n"
+          prop="shipType"
           label="类型"
         ></el-table-column>
         <el-table-column
           class="boxNo"
-          prop="phone"
+          prop="boxNo"
           label="箱号/仓位号"
         ></el-table-column>
         <el-table-column
           class="table_td"
-          prop="carNo"
+          prop="loadingWeight"
           label="装车净重（吨）"
           ></el-table-column
         >
         <el-table-column
           class="table_td"
-          prop="loadingWeight"
+          prop="unloadingWeight"
           label="卸车净重(吨)"
         >
         </el-table-column>
         <el-table-column
           class="table_td"
-          prop="loadingWeight"
+          prop="lossWeight"
           label="损耗(吨)"
         >
         </el-table-column>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -620,7 +620,6 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          debugger
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.flag = "1"