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

src/api/V2/statisticalReport/index.js

@@ -60,3 +60,13 @@ export const API_POST_FINAL_SETTLEMENT_PRICE = '/salesDeliveryReport/api/editSal
 export const API_POST_ISSUE_APPROVAL = '/salesDeliveryReport/api/examineSalesDeliveryReport'
 // 销售出库报表头部信息
 export const API_GET_SELECTSALEORDER= '/salesDeliveryReport/selectOrder'
+// 汽运结算报表
+export const API_GET_AUTOSETTLEMENT= '/tranSettlementReport/selectTranSettlementReport'
+// 汽运结算报表修改结算重量，扣款，已开发票
+export const API_POST_EDITAUTOSETTLEMENT= '/tranSettlementReport/api/editTranSettlementReport'
+// 汽运结算报表合同
+export const API_GET_AUTOCONTRACT= '/tranSettlementReport/selectContractNoList'
+// 汽运结算报表付款
+export const API_POST_AUTOPAYMONEY= '/tranSettlementReport/api/payMoney'
+// 汽运结算报表批量开发票
+export const API_POST_OPENINVOICELIST= '/tranSettlementReport/api/openInvoiceList'

src/api/V2/taskspost/index.js

@@ -44,3 +44,5 @@ export const API_POST_OUT_MOVESTATES = '/inOutWarehouseTask/api/editStatus'
 export const API_POST_DEL_HAULAGE_STAGE= '/tranProcessInfo/api/deleteTranProcess'
 // 审核记录
 export const API_GET_TASKHISTORIES= '/workflowHistory/query/taskHistories'
+// 获取发货人
+export const API_GET_STAFF = '/staff/query/getStaffListByCompId'

src/api/V2/transport/index.js

@@ -46,4 +46,8 @@ export const API_POST_AUTOMOBILE_FEEDBACK = '/tranProcessInfo/api/insertTranCar'
 //更改反馈状态
 export const API_POST_AUTOMOBILE_STATE = '/tranProcessInfo/api/editFeedbackStatus'
 //状态
-export const API_POST_AUTOMOBILE_ALSOSTATE = '/tranProcessInfo/editStatus'
+export const API_POST_AUTOMOBILE_ALSOSTATE = '/tranProcessInfo/editStatus'
+//运输价格
+export const API_POST_AUTOMOBILE_TRANPRICE = '/tranProcessInfo/api/setUpTranPrice'
+// 删除运输车辆
+export const API_POST_DEL_HAULAGE_STAGE= '/tranCarInfo/api/deleteTranCar'

src/lang/zh.js

@@ -538,6 +538,7 @@
     purchaseClosingCashierList:'采购平仓报表',
     salesDeliveryReportList:'销售出库报表',
     salesClosingCashierList:'销售平仓报表',
+    autoSettlementList:'汽运结算报表',
     // 财务管理
     financialManagement:'财务管理',
     collectionManagementList:'收款管理',
@@ -585,6 +586,8 @@
     driverreview: '司机审核',
     transactioninformationreview: '采购信息审核',
     saletransactioninformationreview: '销售信息审核',
+    grainpulseenterprisereview: '粮脉企业审核',
+    grainPulseDynamic: '粮脉动态审核',
 
     // 采购模块
     procurement: '采购管理',

src/model/statisticalReport/index.js

@@ -28,7 +28,12 @@ import {
     API_GET_PURCHASE_IN_CONTRACTNO,
     API_GET_SELECTORDER,
     API_GET_SELECTSALEORDER,
-    API_GET_SELECTCONTRACTNO
+    API_GET_SELECTCONTRACTNO,
+    API_GET_AUTOSETTLEMENT,
+    API_POST_EDITAUTOSETTLEMENT,
+    API_GET_AUTOCONTRACT,
+    API_POST_AUTOPAYMONEY,
+    API_POST_OPENINVOICELIST
 } from '@/api/V2/statisticalReport'
 //采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -91,3 +96,14 @@ export const issueapproval = appRx.post(API_POST_ISSUE_APPROVAL, errorCatcher, e
 export const getsaleorder = appRx.get(API_GET_SELECTSALEORDER, errorCatcher, errorHandle, filter)
 
 
+
+//汽运结算报表 
+export const autoList = appRx.get(API_GET_AUTOSETTLEMENT, errorCatcher, errorHandle, filter)
+// 汽运结算报表修改结算重量，扣款，已开发票
+export const editauto = appRx.post(API_POST_EDITAUTOSETTLEMENT, errorCatcher, errorHandle, filter)
+//汽运结算报表合同
+export const autocontract = appRx.get(API_GET_AUTOCONTRACT, errorCatcher, errorHandle, filter)
+// 汽运结算报表付款
+export const autopaymoney = appRx.post(API_POST_AUTOPAYMONEY, errorCatcher, errorHandle, filter)
+// 汽运结算报表批量开发票
+export const openinvoicelist = appRx.post(API_POST_OPENINVOICELIST, errorCatcher, errorHandle, filter)

src/model/tasksport/index.js

@@ -23,6 +23,7 @@ import {
     API_POST_OUT_STATES,
     API_POST_OUT_MOVESTATES,
     API_POST_DEL_HAULAGE_STAGE,
+    API_GET_STAFF,
     API_GET_TASKHISTORIES
 } from '@/api/V2/taskspost'
 //运输任务列表
@@ -67,5 +68,7 @@ export const states = appRx.post(API_POST_OUT_STATES, errorCatcher, errorHandle,
 export const movestates = appRx.post(API_POST_OUT_MOVESTATES, errorCatcher, errorHandle, filter)
 //删除运输阶段
 export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)
-//删除运输阶段
-export const gettaskhistories = appRx.get(API_GET_TASKHISTORIES, errorCatcher, errorHandle, filter)
+//查询审核记录
+export const gettaskhistories = appRx.get(API_GET_TASKHISTORIES, errorCatcher, errorHandle, filter)
+//获取发货人
+export const getstaff = appRx.get(API_GET_STAFF, errorCatcher, errorHandle, filter)

src/model/transport/index.js

@@ -26,6 +26,8 @@ import {
     API_GET_AUTOMOBILE_NAME,
     API_POST_AUTOMOBILE_FEEDBACK,
     API_POST_AUTOMOBILE_STATE,
+    API_POST_AUTOMOBILE_TRANPRICE,
+    API_POST_DEL_HAULAGE_STAGE, 
     API_POST_AUTOMOBILE_ALSOSTATE
 
 } from '@/api/V2/transport'
@@ -77,4 +79,7 @@ export const feedback = appRx.post(API_POST_AUTOMOBILE_FEEDBACK, errorCatcher, e
 export const state = appRx.post(API_POST_AUTOMOBILE_STATE, errorCatcher, errorHandle, filter)
 //状态
 export const alsostate = appRx.post(API_POST_AUTOMOBILE_ALSOSTATE, errorCatcher, errorHandle, filter)
-
+//设置运输价格
+export const setUpTranPrice = appRx.post(API_POST_AUTOMOBILE_TRANPRICE, errorCatcher, errorHandle, filter)
+//删除车辆
+export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)

src/views/financialManagement/collectionManagementList.vue

@@ -587,45 +587,11 @@ export default {
       this.tranCarNo = item.tranCarNo
       this.staffId = item.staffId
       //this.freightspace[0].agent = this.agent
-      var tranCarNos = ''
       this.dialogFormVisible2 = true
       this.dataList = item
-      paiLook({
-        contractNo: this.dataList.contractNo
-      })
-        .toPromise()
-        .then(response => {
-          // this.index = response.length + 1
-          var tmp1='C00'
-          if(response.length>0){
-            this.freightspace = response
-            console.log(this.freightspace)
-          }else{
-            this.freightspace=[{
-            carNo: '',
-            boxNo: '',
-            titleNo: '',
-            tranCarNo: 'C001',
-            agent: ''
-          }]
-          }
-          
-          if(this.freightspace.length+1>=10){
-            tmp1='C0'
-          }if(this.freightspace.length+1>=100){
-            tmp1='C'
-          }
-          this.freightspace.unshift({
-            carNo: '',
-            boxNo: '',
-            titleNo: '',
-            tranCarNo: tmp1+(this.freightspace.length+1),
-            agent: this.freightspace[this.freightspace.length-1].agent
-          })
-          
-        })
-
-      this.staffQO.roleId = 'd6a5c8a52da544309259f91f75de1ec6'
+      this.refresh()
+      // this.staffQO.roleId = 'd6a5c8a52da544309259f91f75de1ec6'
+      this.staffQO.roleId = '4be0c38df3e243a9b86446a3c524b91a'
       kuguan(this.staffQO)
         .toPromise()
         .then(response => {
@@ -644,18 +610,33 @@ export default {
         .then(response => {
           // this.index = response.length + 1
           this.freightspace = response
+          var tmp = 'C001';
+          if(this.freightspace.length >0 ){
+            tmp = this.freightspace[0].tranCarNo;
+            tmp = parseInt(tmp.replace('C',''));
+            tmp++
+            if(tmp < 10){
+              tmp = 'C00'+ tmp
+            }
+            else if(tmp < 100){
+              tmp = 'C0'+ tmp
+            }
+            else{
+              tmp = 'C'+ tmp
+            }
+          }
           this.freightspace.unshift({
             carNo: '',
             boxNo: '',
             titleNo: '',
-            tranCarNo: '',
-            agent: ''
+            tranCarNo: tmp,
+            agent: this.agent
           })
-          for (var i = 0; i < this.freightspace.length; i++) {
-            var index = i + 1
-            this.freightspace[this.freightspace.length - 1 - i].tranCarNo =
-              'C00' + index
-          }
+          // for (var i = 0; i < this.freightspace.length; i++) {
+          //   var index = i + 1
+          //   this.freightspace[this.freightspace.length - 1 - i].tranCarNo =
+          //     'C00' + index
+          // }
         })
     },
     dateFormat(fmt, date) {
@@ -773,6 +754,7 @@ export default {
             } else {
               response.records[i].addressUrlArray = []
             }
+            response.records[i].collectionNotPayable=response.records[i].collectionIngPayable-response.records[i].collectionEdPayable
           }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
@@ -786,7 +768,7 @@ export default {
     //   }
     // },
     add1(item) {
-          if (!this.freightspace[0].carNo) {
+      if (!this.freightspace[0].carNo) {
         this.$message({
            message: '车牌号不能为空',
              type: 'warning'
@@ -834,32 +816,24 @@ export default {
         })
         return
       }
-      var tmp = this.freightspace[0].agent
-      var tmp1 = this.freightspace.length + 1
-      var tmp2='C00'
-      if(tmp1>=10){
-        tmp2='C0'
+      if (!this.freightspace[0].agent && !this.agent) {
+        this.$message({
+          message: '请选择库管',
+          type: 'warning'
+        })
+        return
       }
-      if(tmp1>=100){
-        tmp2='C'
+      if(this.freightspace[0].agent){
+        item.agent = this.freightspace[0].agent
+      }
+      else{
+        item.agent = this.agent
       }
-      this.freightspace.unshift({
-        carNo: '',
-        boxNo: '',
-        titleNo: '',
-        planId: this.planId,
-        staffId: this.staffId,
-        goodsName: this.goodsName,
-        buyer: this.buyer,
-        tranCarNo: tmp2 + tmp1,
-        agent: tmp
-      })
       item.planId = this.planId
       item.goodsName = this.goodsName
       item.buyer = this.buyer
       item.contractNo = this.contractNo
       item.staffId = this.staffId
-
       paifa(item)
         .toPromise()
         .then(response => {

src/views/platformaudit/component/router/route.js

@@ -1,77 +1,105 @@
 import Layout from '@/layout/index';
 
 const platformauditRouter = {
-    path: '/platformaudit',
-    component: Layout,
-    redirect: '/platformaudit',
-    name: 'platformaudit',
-    alwaysShow: true, // will always show the root menu
-    meta: {
-      title: 'platformaudit',
-      module: 'audit.driverMerchant',
-      icon: '-shenhe'
-    },
-    children: [
-  
-      //粮商审核
-      {
-        path: 'grainmerchantreview',
-        component: () =>
-          import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainmerchantreview'),
-        name: 'grainmerchantreview',
-        meta: {
-          title: 'grainmerchantreview',
-          shortcutEntrance: 'grainmerchantreview',
-          module: 'audit.grainMerchant.grainMerchantInfo',
-          permissicon: [],
-          keepAlive: true
-        },
+  path: '/platformaudit',
+  component: Layout,
+  redirect: '/platformaudit',
+  name: 'platformaudit',
+  alwaysShow: true, // will always show the root menu
+  meta: {
+    title: 'platformaudit',
+    module: 'audit.driverMerchant',
+    icon: '-shenhe'
+  },
+  children: [
+
+    //粮商审核
+    {
+      path: 'grainmerchantreview',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainmerchantreview'),
+      name: 'grainmerchantreview',
+      meta: {
+        title: 'grainmerchantreview',
+        shortcutEntrance: 'grainmerchantreview',
+        module: 'audit.grainMerchant.grainMerchantInfo',
+        permissicon: [],
+        keepAlive: true
       },
+    },
 
-      //司机审核
-      {
-        path: 'driverreview',
-        component: () =>
-          import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/driverreview'),
-        name: 'driverreview',
-        meta: {
-          title: 'driverreview',
-          shortcutEntrance: 'driverreview',
-          module: 'audit.driverMerchant.driverMerchantInfo',
-          permissicon: [],
-          keepAlive: true
-        },
+    //司机审核
+    {
+      path: 'driverreview',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/driverreview'),
+      name: 'driverreview',
+      meta: {
+        title: 'driverreview',
+        shortcutEntrance: 'driverreview',
+        module: 'audit.driverMerchant.driverMerchantInfo',
+        permissicon: [],
+        keepAlive: true
       },
+    },
 
-      //采购交易信息审核
-      {
-        path: 'transactioninformationreview',
-        component: () =>
-          import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/transactioninformationreview'),
-        name: 'transactioninformationreview',
-        meta: {
-          title: 'transactioninformationreview',
-          shortcutEntrance: 'transactioninformationreview',
-          module: 'audit.tranMerchant.tranMerchantInfo',
-          permissicon: [],
-          keepAlive: true
-        },
+    //采购交易信息审核
+    {
+      path: 'transactioninformationreview',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/transactioninformationreview'),
+      name: 'transactioninformationreview',
+      meta: {
+        title: 'transactioninformationreview',
+        shortcutEntrance: 'transactioninformationreview',
+        module: 'audit.tranMerchant.tranMerchantInfo',
+        permissicon: [],
+        keepAlive: true
       },
+    },
 
-      //销售交易信息审核
-      {
-        path: 'saletransactioninformationreview',
-        component: () =>
-          import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/saletransactioninformationreview'),
-        name: 'saletransactioninformationreview',
-        meta: {
-          title: 'saletransactioninformationreview',
-          shortcutEntrance: 'saletransactioninformationreview',
-          module: 'audit.tranMerchant.tranMerchantInfo',
-          permissicon: [],
-          keepAlive: true
-        },
+    //销售交易信息审核
+    {
+      path: 'saletransactioninformationreview',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/saletransactioninformationreview'),
+      name: 'saletransactioninformationreview',
+      meta: {
+        title: 'saletransactioninformationreview',
+        shortcutEntrance: 'saletransactioninformationreview',
+        module: 'audit.tranMerchant.tranMerchantInfo',
+        permissicon: [],
+        keepAlive: true
       },
-    ],
+    },
+    //粮脉企业审核
+    {
+      path: 'grainpulseenterprisereview',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainpulseenterprisereview'),
+      name: 'grainpulseenterprisereview',
+      meta: {
+        title: 'grainpulseenterprisereview',
+        shortcutEntrance: 'grainpulseenterprisereview',
+        module: 'audit.tranMerchant.tranMerchantInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+    },
+    //粮脉动态审核
+    {
+      path: 'grainPulseDynamic',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainPulseDynamic'),
+      name: 'grainPulseDynamic',
+      meta: {
+        title: 'grainPulseDynamic',
+        shortcutEntrance: 'grainPulseDynamic',
+        module: 'audit.grainMerchant.grainMerchantInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+    },
+  ],
 };
-export default platformauditRouter;  
+export default platformauditRouter;

src/views/platformaudit/grainPulseDynamic.vue

@@ -0,0 +1,532 @@
+<!--粮脉动态审核-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="15">
+      <template slot="right">
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selectExamineType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in searchTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890b1"
+          />
+        </ws-select>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按账号、发布主体查找"
+          clearable
+          maxlength="500"
+          type="input"
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()"
+          ><img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -5px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+        <!-- </div> -->
+      </template>
+    </BaseHeaderLayout>
+    <div class="container">
+      <el-table
+        class="wenzi"
+        :data="tranManagementList.records"
+        style="width: 100%"
+        height="680"
+      >
+        <el-table-column type="index" label="序号" width="50">
+          <template scope="scope">
+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+            <span v-else>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="salePlanNo" label="昵称"> </el-table-column>
+        <el-table-column prop="seller" label="账号"></el-table-column>
+        <el-table-column prop="goodsName" label="发布主体"> </el-table-column>
+        <el-table-column prop="plannedSaleVolume" label="标题">
+        </el-table-column>
+        <el-table-column prop="updateDate" label="更新时间" width="140">
+        </el-table-column>
+        <el-table-column prop="" label="操作" width="180">
+          <template slot-scope="scope">
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+            >
+              查看
+            </div>
+            <div
+              class="record"
+              @click="deleteclick(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+            >
+              删除
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="审核">
+          <template slot-scope="scope">
+            <el-button
+              size="medium"
+              type="text"
+              class="record"
+              v-if="scope.row.statusFlag == 1"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+              @click="reject(scope.row)"
+              >驳回</el-button
+            >
+            <el-button
+              size="medium"
+              type="text"
+              class="record"
+              v-if="scope.row.statusFlag == 1"
+              @click="adopt(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+              >通过</el-button
+            >
+            <template
+              v-else
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+              slot-scope="scope"
+            >
+              {{ scope.row.status }}
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
+    </div>
+    <!--动态信息-->
+    <el-dialog
+      width="30%"
+      title="查看动态信息"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+    >
+      <el-form class="customer" :model="form">
+        <el-form-item label="发布主体" :label-width="formLabelWidth">
+          {{ 111111 }}
+        </el-form-item>
+        <el-form-item label="标题" :label-width="formLabelWidth">
+          {{ 11111111 }}
+        </el-form-item>
+        <el-form-item label="内容" :label-width="formLabelWidth">
+          <el-input>{{ 111111111 }}</el-input>
+        </el-form-item>
+          <el-form-item label="定位" :label-width="formLabelWidth">
+          <span>营口市</span>
+        </el-form-item>
+        <!-- <img width="100%" :src="customerlist.cardAddressUrl2" alt />
+        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
+        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
+        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
+        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
+        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
+        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
+        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
+        <img width="100%" :src="customerlist.cardAddressUrl2" alt /> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <!-- <span v-if="scope.row.status == '待审核'"> -->
+          <el-button @click="reject()">驳回</el-button>
+          <el-button @click="adopt()">通过</el-button>
+        <!-- </span>
+        <span v-if="scope.row.status == '已审核'"
+          ><el-button @click="dialogFormVisible = fase">关闭</el-button>
+        </span> -->
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { saleList, deletesale, saleexamine } from '@/model/platformaudit/index'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import { EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogFormVisible: false,
+      dialogViewSpareMoney: false,
+      // 表格显示数据
+      tableDate: [],
+
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      currentPage: 1,
+      pageSize: 10,
+      deptBudgetTotal: 0,
+      searchTypeText: '待审核',
+      searchKeyWord: '',
+      // 提交类型
+      submitType: true,
+      size: 10,
+      spanArr: [],
+      searchType: 1,
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      tranManagementList: [],
+      id:'',
+      deptBudgetList: {},
+      searchTypeList: [
+        { value: '待审核', type: 1 },
+        { value: '已通过', type: 2 },
+        { value: '全部', type: '' },
+      ],
+      salePlanInfo: {
+        id: '',
+        flag: '',
+      },
+      accessoryTFs: false,
+    }
+  },
+  activated() {
+    this.getList()
+    this.showType = this.isShow
+  },
+  methods: {
+    getSpanArr(data) {
+      let that = this
+      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+      that.spanArr = []
+      that.pos = 0
+      //遍历数据
+      data.forEach((item, index) => {
+        //判断是否是第一项
+
+        // if (index === 0) {
+        //   this.spanArr.push(1)
+        //   this.pos = 0
+        // } else {
+        //不是第一项时，就根据标识去存储
+        if (data[index].warehouseNumViewList.length > 1) {
+          // 查找到符合条件的数据时每次要把之前存储的数据+1
+          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+          this.spanArr.push(0)
+        } else {
+          // 没有符合的数据时，要记住当前的index
+          this.spanArr.push(1)
+          this.pos = index
+        }
+        // }
+      })
+    },
+    //删除
+    deleteclick(row) {
+      this.$confirm(`动态信息删除后不可恢复，是否确定删除？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          deletesale({
+            id: row.id,
+          })
+            .toPromise()
+            .then((response) => {
+              this.getList()
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    //查看//传参
+    nocomplete(row) {
+    this.id = row.id
+      this.dialogFormVisible = true
+
+    },
+    //查找
+    lookUp() {
+      this.currentPage = 1
+      this.getList()
+    },
+    selectExamineType(e) {
+      for (var i = 0; i < this.searchTypeList.length; i++) {
+        if (this.searchTypeList[i].value == e) {
+          this.searchType = this.searchTypeList[i].type
+        }
+      }
+      this.currentPage = 1
+      this.getList()
+    },
+    //审核通过
+    adopt() {
+      this.salePlanInfo.id = this.id
+      this.salePlanInfo.flag = 1
+      this.$confirm(`确定通过该动态信息？`, '提示', {
+        confirmButtonText: '通过',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          saleexamine(this.salePlanInfo)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '通过成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              EventBus.$emit('error', response.message)
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    //审核驳回
+    reject() {
+      this.salePlanInfo.id = this.id
+      this.salePlanInfo.flag = 2
+      this.$confirm(`确定驳回该动态信息？`, '提示', {
+        confirmButtonText: '驳回',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          saleexamine(this.salePlanInfo)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '驳回成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    //销售列表
+    getList() {
+      saleList({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        searchType: this.searchType,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchKeyWord: this.searchKeyWord,
+      })
+        .toPromise()
+        .then((response) => {
+          this.tranManagementList = response
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+        })
+    },
+    // fujian(row) {
+    //   if (
+    //     row.receiveAttachmentPath === null ||
+    //     row.receiveAttachmentPath === ''
+    //   ) {
+    //     EventBus.$emit(
+    //       'warning',
+    //       this.$t('system.noticeCircular.NoInformation')
+    //     )
+    //   } else {
+    //     this.accessoryTFs = true
+    //   }
+    //   this.appendixIdss = row.receiveAttachmentPath
+    // },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.container {
+  width: 100%;
+  margin: 0 auto;
+}
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-button--default {
+  color: #8890b1;
+  border-color: #e8eaf1;
+}
+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+  width: 30px;
+  margin-left: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+//操作按钮
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+//状态样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
+.putstorage.el-button--default,
+.deliverystorage.el-button--default {
+  border-color: #8890b1;
+  background-color: #fff;
+  color: #8890b1;
+}
+/deep/.el-table td,
+/deep/.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+}
+/deep/.el-table tr td:first-child,
+/deep/.el-table tr th.is-leaf:first-child {
+  border-left: 1px solid #e9ecf7;
+}
+.el-row {
+  height: 60px;
+}
+.base_header_layout .grid-content {
+  margin-top: 80px;
+}
+
+.el-input--small .el-input__inner {
+  margin-left: 20px;
+}
+.el-range-editor--small.el-input__inner {
+  height: 32px;
+  margin: 0 10px;
+}
+/deep/.el-pagination {
+  text-align: center;
+  white-space: nowrap;
+  padding: 2px 5px;
+  color: #303133;
+  font-weight: 700;
+  margin-bottom: 20px;
+}
+.el-select {
+  width: 30%;
+  margin-right: 10px;
+}
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
+}
+</style>

src/views/platformaudit/grainpulseenterprisereview.vue

@@ -0,0 +1,625 @@
+<!--粮脉企业审核-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="15">
+      <template slot="right">
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selectExamineType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in searchTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890b1"
+          />
+        </ws-select>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按账号、企业名称查找"
+          clearable
+          maxlength="500"
+          type="input"
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()"
+          ><img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -5px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+        <!-- </div> -->
+      </template>
+    </BaseHeaderLayout>
+    <div class="container">
+      <el-table
+        class="wenzi"
+        :data="grainList.records"
+        style="width: 100%"
+        height="680"
+      >
+        <el-table-column type="index" label="序号" width="50">
+          <template scope="scope">
+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+            <span v-else>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="seller" label="昵称"> </el-table-column>
+        <el-table-column prop="seller" label="账号"> </el-table-column>
+        <el-table-column prop="seller" label="企业名称"> </el-table-column>
+        <el-table-column prop="seller" label="地址"> </el-table-column>
+        <el-table-column prop="updateDate" label="更新时间" width="140">
+        </el-table-column>
+        <el-table-column prop="" label="操作" width="240">
+          <template slot-scope="scope">
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+            >
+              查看
+            </div>
+            <div
+              class="record"
+              @click="delivery(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+            >
+              编辑
+            </div>
+            <div
+              class="record"
+              @click="deleteclick(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+            >
+              删除
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="审核" width="180">
+          <template slot-scope="scope">
+            <el-button
+              size="medium"
+              type="text"
+              class="record"
+              v-if="scope.row.statusFlag == 1"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+              @click="reject(scope.row)"
+              >驳回</el-button
+            >
+            <el-button
+              size="medium"
+              type="text"
+              class="record"
+              v-if="scope.row.statusFlag == 1"
+              @click="adopt(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+              >通过</el-button
+            >
+            <template
+              v-else
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+              slot-scope="scope"
+            >
+              {{ scope.row.status }}
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 页数 -->
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
+      <!--查看-->
+      <el-dialog
+        width="30%"
+        title="查看企业信息"
+        :visible.sync="dialogFormVisible1"
+        :append-to-body="true"
+      >
+        <el-form class="customer" :model="form">
+          <h3 style="margin-left: 30px">基本信息</h3>
+          <el-form-item label="公司名称" :label-width="formLabelWidth">
+            {{ 111111 }}
+          </el-form-item>
+          <el-form-item label="主营类型" :label-width="formLabelWidth">
+            {{ 111111 }}
+          </el-form-item>
+          <el-form-item label="标题" :label-width="formLabelWidth">
+            {{ 111111 }}
+          </el-form-item>
+          <el-form-item label="封面简介" :label-width="formLabelWidth">
+            {{ 111111 }}
+          </el-form-item>
+          <el-form-item label="坐标" :label-width="formLabelWidth">
+            {{ 11111 }}
+          </el-form-item>
+          <el-form-item label="所在区域" :label-width="formLabelWidth">
+            {{ 111111 }}
+          </el-form-item>
+          <el-form-item label="详细地址" :label-width="formLabelWidth">
+            {{ 11111111 }}
+          </el-form-item>
+          <h4>上传封面图片</h4>
+          <img width="50%" :src="111" alt />
+          <h4>营业执照</h4>
+          <img width="50%" :src="1111" alt />
+          <h3 style="margin-left: 30px">附加信息</h3>
+          <el-form-item label="企业概况" :label-width="formLabelWidth">
+            {{ 1111111 }}
+          </el-form-item>
+          <el-form-item label="标签" :label-width="formLabelWidth">
+            {{ 1111111 }}
+          </el-form-item>
+          <h4>场地图片</h4>
+          <img width="50%" :src="1111" alt />
+          <h3 style="margin-left: 30px">联系方式</h3>
+          <el-form-item label="联系人" :label-width="formLabelWidth">
+            {{ 11111 }}
+          </el-form-item>
+          <el-form-item label="电话" :label-width="formLabelWidth">
+            {{ 1111111 }}
+          </el-form-item>
+          <el-form-item label="邮箱" :label-width="formLabelWidth">
+            {{ 111111 }}
+          </el-form-item>
+          <el-form-item label="传真" :label-width="formLabelWidth">
+            {{ 1111111 }}
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible1 = false">关闭</el-button>
+          <template slot-scope="scope">
+            <el-button
+              size="medium"
+              type="text"
+              class="record"
+              v-if="scope.row.statusFlag == 1"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+              @click="reject(scope.row)"
+              >驳回</el-button
+            >
+            <el-button
+              size="medium"
+              type="text"
+              class="record"
+              v-if="scope.row.statusFlag == 1"
+              @click="adopt(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
+              >通过</el-button
+            >
+          </template>
+        </div>
+      </el-dialog>
+      <!--编辑-->
+      <el-dialog
+        width="30%"
+        title="编辑企业信息"
+        :visible.sync="dialogFormVisible2"
+        :append-to-body="true"
+      >
+        <el-form class="" :model="form1">
+          <h3 style="margin-left: 30px">基本信息(必填)</h3>
+          <el-form-item label="公司名称" :label-width="formLabelWidth">
+            <el-input v-model="form.name"></el-input>
+          </el-form-item>
+          <el-form-item label="主营类型(可多选，必须为真实经营类型)">
+            <el-checkbox-group v-model="form1.type" style="">
+              <el-checkbox-button label="粮库" name="type"></el-checkbox-button>
+              <el-checkbox-button label="加工厂" name="type"></el-checkbox-button>
+              <el-checkbox-button label="烘干塔" name="type"></el-checkbox-button>
+              <el-checkbox-button label="饲料厂" name="type"></el-checkbox-button>
+              <el-checkbox-button label="养殖厂" name="type"></el-checkbox-button>
+              <el-checkbox-button label="粮贸" name="type"></el-checkbox-button>
+              <el-checkbox-button label="期货" name="type"></el-checkbox-button>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item label="标题" :label-width="formLabelWidth">
+            <el-input v-model="form.name"></el-input>
+          </el-form-item>
+          <el-form-item label="封面简介" :label-width="formLabelWidth">
+            <el-input type="textarea" v-model="form.desc"></el-input>
+          </el-form-item>
+          <el-form-item label="坐标" :label-width="formLabelWidth">
+            {{ 11111 }}
+          </el-form-item>
+          <el-form-item label="所在区域" :label-width="formLabelWidth">
+            <el-input v-model="form.name"></el-input>
+          </el-form-item>
+          <el-form-item label="详细地址" :label-width="formLabelWidth">
+            <el-input v-model="form.name"></el-input>
+          </el-form-item>
+          <h4>上传封面图片</h4>
+          <img width="50%" :src="111" alt />
+          <h4>营业执照</h4>
+          <img width="50%" :src="1111" alt />
+          <h3 style="margin-left: 30px">附加信息(选填)</h3>
+          <el-form-item label="企业概况" :label-width="formLabelWidth">
+            <el-input type="textarea" v-model="form.desc"></el-input>
+          </el-form-item>
+          <el-form-item label="标签(标签应突出企业特色，最多6个)" >
+            
+          </el-form-item>
+          <h4>场地图片</h4>
+          <img width="50%" :src="1111" alt />
+          <h3 style="margin-left: 30px">联系方式</h3>
+          <div :key="index" v-for="(item, index) in freightspace">
+            <el-form-item label="联系人" :label-width="formLabelWidth">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="电话" :label-width="formLabelWidth">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+              <img
+            width="22"
+            height="22"
+            class="add"
+            @click="add"
+            src="../../../public/img/add.png"
+            alt=""
+          />
+          <img
+            width="22"
+            height="22"
+            class="del"
+            @click="del(index)"
+            src="../../../public/img/del.png"
+            alt=""
+          />
+          </div>
+          <el-form-item label="邮箱" :label-width="formLabelWidth">
+            <el-input v-model="form.name"></el-input>
+          </el-form-item>
+          <el-form-item label="传真" :label-width="formLabelWidth">
+            <el-input v-model="form.name"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="submit()">提交</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+<script>
+import { saleList, deletesale, saleexamine } from '@/model/platformaudit/index'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import { EventBus } from 'base-core-lib'
+// const cityOptions = ['粮库', '加工厂', '烘干塔', '饲料厂', '养殖厂', '粮贸', '期货'];
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      dialogFormVisible1: false,
+      dialogFormVisible2: false,
+      checkboxGroup2: [],
+      // 表格显示数据
+      tableDate: [],
+
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      currentPage: 1,
+      pageSize: 10,
+      deptBudgetTotal: 0,
+      searchTypeText: '待审核',
+      searchKeyWord: '',
+      // 提交类型
+      submitType: true,
+      size: 10,
+      spanArr: [],
+      warehouseName: '',
+      searchType: 1,
+      formLabelWidth: '120px',
+      form: {},
+      form1: {
+        type: [],
+      },
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      grainList: [],
+      searchTypeList: [
+        { value: '待审核', type: 1 },
+        { value: '已通过', type: 2 },
+        { value: '未通过', type: 3 },
+        { value: '全部', type: '' },
+      ],
+      salePlanInfo: {
+        id: '',
+        flag: '',
+      },
+      freightspace: [{  }],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+    }
+  },
+  activated() {
+    this.getList()
+    this.showType = this.isShow
+  },
+  methods: {
+    add() {
+      this.freightspace.push({
+
+      })
+    },
+    del(index) {
+      if (this.freightspace.length > 1) {
+        this.freightspace.splice(index, 1)
+      }
+    },
+    //列表
+    getList() {
+      saleList({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        searchType: this.searchType,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchKeyWord: this.searchKeyWord,
+      })
+        .toPromise()
+        .then((response) => {
+          this.grainList = response
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+        })
+    },
+    //删除
+    deleteclick(row) {
+      this.$confirm(`企业信息删除后不可恢复，是否确定删除？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          deletesale({
+            id: row.id,
+          })
+            .toPromise()
+            .then((response) => {
+              this.getList()
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    //查看
+    nocomplete(item) {
+      this.dialogFormVisible1 = true
+    },
+    //编辑
+    delivery(item) {
+      this.dialogFormVisible2 = true
+    },
+    //查找
+    lookUp() {
+      this.currentPage = 1
+      this.getList()
+    },
+    selectExamineType(e) {
+      for (var i = 0; i < this.searchTypeList.length; i++) {
+        if (this.searchTypeList[i].value == e) {
+          this.searchType = this.searchTypeList[i].type
+        }
+      }
+      this.currentPage = 1
+      this.getList()
+    },
+    //审核通过
+    adopt(row) {
+      this.salePlanInfo.id = row.id
+      this.salePlanInfo.flag = 1
+      this.$confirm(`确定通过该入驻申请？`, '提示', {
+        confirmButtonText: '通过',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          saleexamine(this.salePlanInfo)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '通过成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    //审核驳回
+    reject(row) {
+      this.salePlanInfo.id = row.id
+      this.salePlanInfo.flag = 2
+      this.$confirm(`确定驳回该入驻申请？`, '提示', {
+        confirmButtonText: '驳回',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          saleexamine(this.salePlanInfo)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '驳回成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.container {
+  width: 100%;
+  margin: 0 auto;
+}
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-button--default {
+  color: #8890b1;
+  border-color: #e8eaf1;
+}
+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+  width: 30px;
+  margin-left: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+//操作按钮
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+//状态样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
+.putstorage.el-button--default,
+.deliverystorage.el-button--default {
+  border-color: #8890b1;
+  background-color: #fff;
+  color: #8890b1;
+}
+/deep/.el-table td,
+/deep/.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+}
+/deep/.el-table tr td:first-child,
+/deep/.el-table tr th.is-leaf:first-child {
+  border-left: 1px solid #e9ecf7;
+}
+.el-row {
+  height: 60px;
+}
+.base_header_layout .grid-content {
+  margin-top: 80px;
+}
+
+.el-input--small .el-input__inner {
+  margin-left: 20px;
+}
+.el-range-editor--small.el-input__inner {
+  height: 32px;
+  margin: 0 10px;
+}
+/deep/.el-pagination {
+  text-align: center;
+  white-space: nowrap;
+  padding: 2px 5px;
+  color: #303133;
+  font-weight: 700;
+  margin-bottom: 20px;
+}
+.el-select {
+  width: 30%;
+  margin-right: 10px;
+}
+.customer .el-form-item {
+  border-bottom: 1px solid #ccc;
+}
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
+}
+</style>

src/views/platformaudit/saletransactioninformationreview.vue

@@ -144,7 +144,6 @@ import { saleList ,deletesale ,saleexamine} from '@/model/platformaudit/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { EventBus } from 'base-core-lib'
-import { billoperatehis } from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -217,32 +216,6 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    getSpanArr(data) {
-      let that = this
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
-      that.spanArr = []
-      that.pos = 0
-      //遍历数据
-      data.forEach((item, index) => {
-        //判断是否是第一项
-
-        // if (index === 0) {
-        //   this.spanArr.push(1)
-        //   this.pos = 0
-        // } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          // 查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
-        }
-        // }
-      })
-    },
     //删除
     deleteclick(row) {
       //cancelButtonClass: "btn-custom-cancel"
@@ -353,31 +326,6 @@ export default {
           return false
         })
     },
-    dateFormat(fmt, date) {
-      let ret
-      const opt = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
-        // "M+": date.getMinutes().toString(),         // 分
-        // "S+": date.getSeconds().toString()          // 秒
-        // 有其他格式化字符需求可以继续添加，必须转化成字符串
-      }
-      for (let k in opt) {
-        ret = new RegExp('(' + k + ')').exec(fmt)
-        if (ret) {
-          fmt = fmt.replace(
-            ret[1],
-            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-          )
-        }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
@@ -409,69 +357,6 @@ export default {
           this.deptBudgetTotal = response.total
         })
     },
-    //更改状态
-    editClick(row) {
-      var status = ''
-      if (row.processStatus == '待执行' || row.processStatus == '已完成') {
-        status = '执行中'
-      } else if (row.processStatus == '执行中') {
-        status = '已完成'
-      }
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          alsostate({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
   },
 }
 </script>

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -532,7 +532,7 @@ export default {
     handleChange1(value) {
       this.selectedOptions1 = value
       this.dataList.outputPrivate = CodeToText[value[0]]
-      this.dataList.outputCity = CodeToText[value[1]]
+      // this.dataList.outputCity = CodeToText[value[1]]
     },
     sendWarehousechange(e) {
       for (let i = 0; i < this.warehouseList.length; i++) {
@@ -871,10 +871,10 @@ export default {
               this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
               this.dataList.outputPrivate =
                 CodeToText[this.selectedOptions1[0]]
-              this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
-              if(this.dataList.procurementPlanType=='期货'){
-                this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
-              }
+              // this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
+              // if(this.dataList.procurementPlanType=='期货'){
+              //   this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
+              // }
               this.dataList.compId = this.compId
               this.dataList.unitPrice=this.dataList.procurementPrice
               

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -613,7 +613,7 @@ export default {
     handleChange1(value) {
       this.selectedOptions1 = value
       this.dataList.outputPrivate = CodeToText[value[0]]
-      this.dataList.outputCity = CodeToText[value[1]]
+      // this.dataList.outputCity = CodeToText[value[1]]
     },
     submit() {
       if (this.outputYear) {
@@ -642,7 +642,7 @@ export default {
           this.selectedOptions = tmp
           var tmp1 = []
           tmp1[0] = TextToCode[this.dataList.outputPrivate].code
-          tmp1[1] = TextToCode[this.dataList.outputPrivate][this.dataList.outputCity].code
+          // tmp1[1] = TextToCode[this.dataList.outputPrivate][this.dataList.outputCity].code
           this.selectedOptions1 = tmp1
         })
       // 货名
@@ -910,10 +910,10 @@ export default {
               this.dataList.receiveCity = CodeToText[this.selectedOptions[1]]
               this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
               this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
-              this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
-              if(this.dataList.procurementPlanType=='期货'){
-                this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
-              }
+              // this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
+              // if(this.dataList.procurementPlanType=='期货'){
+              //   this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
+              // }
               this.dataList.compId = this.compId
               // this.dataList.pcFlag = 1
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')

src/views/purchasingManagement/procurementPlanList.vue

@@ -561,7 +561,8 @@ export default {
           .then(() => {
             procurementEditOther({
               flag: 1,
-              basisPrice: '-'+Math.abs(row.basisPrice),
+              // basisPrice: '-'+Math.abs(row.basisPrice),
+              basisPrice: row.basisPrice,
               id: row.id,
             })
               .toPromise()

src/views/purchasingManagement/purchaseOrderList.vue

@@ -1124,7 +1124,8 @@ export default {
         .then(() => {
           editStatus({
             flag: 3,
-            basis: '-'+Math.abs(row.basis),
+            // basis: '-'+Math.abs(row.basis),
+            basis: row.basis,
             id: row.id,
           })
             .toPromise()
@@ -1302,7 +1303,7 @@ export default {
         })
         return
       }
-      this.closePositionList1.closingBasis='-'+Math.abs(this.closePositionList1.closingBasis)
+      // this.closePositionList1.closingBasis='-'+Math.abs(this.closePositionList1.closingBasis)
       closePositionList(this.closePositionList1)
         .toPromise()
         .then((response) => {
@@ -1320,10 +1321,15 @@ export default {
       if(this.closePositionList1.transactionPrice
       && this.closePositionList1.closeRate && this.closePositionList1.closingBasis && this.closePositionList1.closingQuantity)
       {
-        this.closePositionList1.closingPositionPayable =
+        // this.closePositionList1.closingPositionPayable =
+        //   (this.closePositionList1.transactionPrice -
+        //     this.closePositionList1.closeRate-
+        //     Math.abs(this.closePositionList1.closingBasis)) *
+        //   this.closePositionList1.closingQuantity
+         this.closePositionList1.closingPositionPayable =
           (this.closePositionList1.transactionPrice -
-            this.closePositionList1.closeRate-
-            Math.abs(this.closePositionList1.closingBasis)) *
+            this.closePositionList1.closeRate+
+            this.closePositionList1.closingBasis) *
           this.closePositionList1.closingQuantity
       }
     },
@@ -1446,7 +1452,8 @@ export default {
       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, 'basis', Math.abs(item.basis))
+      this.$set(this.aduitlist, 'basis', item.basis)
       this.$set(this.aduitlist, 'depositRatio', item.customerInfo.depositRatio)
       this.$set(this.aduitlist, 'totalDeposit', item.customerInfo.totalDeposit)
       this.$set(this.aduitlist, 'baggingNotes', item.baggingNotes)
@@ -1536,9 +1543,9 @@ export default {
       this.aduitlist.procurementPlanType = this.aduitlist.procurementPlanType
        if (this.aduitlist.procurementPlanType == '期货') {
            this.aduitlist.freezingDeposit = this.aduitlist.transactionsNumber*this.aduitlist.depositRatio
-           if(this.aduitlist.invoiceFee){
-             this.aduitlist.invoiceFee=-Math.abs(this.aduitlist.invoiceFee)
-           }
+          //  if(this.aduitlist.invoiceFee){
+          //    this.aduitlist.invoiceFee=-Math.abs(this.aduitlist.invoiceFee)
+          //  }
             this.aduitlist.unloadingCharge = '-' + this.aduitlist.unloadingCharge
             this.aduitlist.basis = '-' + this.aduitlist.basis
        }
@@ -1677,7 +1684,8 @@ export default {
           id: this.clinchdeal.id,
           commonId: this.clinchdeal.commonId,
           compId: sessionStorage.getItem('ws-pf_compId'),
-          basis:'-'+Math.abs(this.clinchdeal1.basis)
+          // basis:'-'+Math.abs(this.clinchdeal1.basis)
+          basis:this.clinchdeal1.basis
         })
           .toPromise()
           .then((response) => {
@@ -1747,7 +1755,7 @@ export default {
       // 合同编号
       aduitcontractno({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        flag: 0,
+        flag: 3,
       })
         .toPromise()
         .then((response) => {

src/views/salesManagement/salesPlanAdd.vue

@@ -617,7 +617,7 @@ export default {
     handleChange1(value) {
       this.selectedOptions1 = value
       this.dataList.outputPrivate = CodeToText[value[0]]
-      this.dataList.outputCity = CodeToText[value[1]]
+      // this.dataList.outputCity = CodeToText[value[1]]
     },
     sendWarehousechange(e) {
       for (let i = 0; i < this.warehouseList.length; i++) {
@@ -983,7 +983,7 @@ export default {
               this.dataList.sendCity = CodeToText[this.selectedOptions[1]]
               this.dataList.sendArea = CodeToText[this.selectedOptions[2]]
               this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
-              this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
+              // this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
               this.dataList.unitPrice=this.dataList.salePrice
 
               this.dataList.compId = this.compId

src/views/salesManagement/salesPlanEdit.vue

@@ -552,7 +552,7 @@ export default {
     handleChange1(value) {
       this.selectedOptions1 = value
       this.dataList.outputPrivate = CodeToText[value[0]]
-      this.dataList.outputCity = CodeToText[value[1]]
+      // this.dataList.outputCity = CodeToText[value[1]]
     },
     submit() {
       if (this.outputYear) {
@@ -581,7 +581,7 @@ export default {
           this.selectedOptions = tmp
           var tmp1 = []
           tmp1[0] = TextToCode[this.dataList.outputPrivate].code
-          tmp1[1] = TextToCode[this.dataList.outputPrivate][this.dataList.outputCity].code
+          // tmp1[1] = TextToCode[this.dataList.outputPrivate][this.dataList.outputCity].code
           this.selectedOptions1 = tmp1
         })
       // 货名
@@ -880,7 +880,7 @@ export default {
               this.dataList.sendCity = CodeToText[this.selectedOptions[1]]
               this.dataList.sendArea = CodeToText[this.selectedOptions[2]]
               this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
-              this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
+              // this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
 
               this.dataList.compId = this.compId
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')

src/views/salesManagement/salesPlanOrderList.vue

@@ -1421,14 +1421,15 @@ export default {
     },
     //修改基差
     changebasis(item) {
-      editStatus({ basis: Math.abs(this.basis), id: item.id, flag: 3 })
+      // editStatus({ basis: Math.abs(this.basis), id: item.id, flag: 3 })
+      editStatus({ basis: this.basis, id: item.id, flag: 3 })
         .toPromise()
         .then((response) => {
           this.$message.success('修改基差成功')
           this.getList()
         })
         .catch((req) => {
-          this.$message.success('修改基差失败')
+          this.$message.warning('修改基差失败')
         })
     },
     editbasis(item) {
@@ -1705,7 +1706,7 @@ export default {
       // 合同编号
       aduitcontractno({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        flag: 1,
+        flag: 4,
       })
         .toPromise()
         .then((response) => {

src/views/statisticalReport/autoSettlementList.vue

@@ -0,0 +1,1668 @@
+//汽运结算报表
+<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
+          >
+        </el-col>
+        <el-col
+          style="text-align: right; line-height: 60px; padding-right: 10px"
+          :span="8"
+        >
+          <el-select
+            v-model="contractNo"
+            placeholder="请选择合同"
+            clearable
+            filterable
+            :filter-method="dataFilter"
+            @change="contractchange"
+            maxlength="500"
+            type="input"
+            class="findValue"
+          >
+            <el-option
+              v-if="item.reportStatus"
+              v-for="item in options"
+              :key="item.constKey"
+              :label="item.contractNo + '(' + item.reportStatus + ')'"
+              :value="item.contractNo"
+            />
+            <el-option
+              v-if="!item.reportStatus"
+              v-for="item in options"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+
+      <el-table
+        class="wenzi"
+        :data="warehouseList.records"
+        style="width: 100%; margin-top: 20px"
+        ref="warehouseList"
+        border
+        :summary-method="getSummaries"
+        show-summary
+        @row-click="handleRowClick"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          prop="contractNo"
+          width="120"
+          label="合同编号"
+        ></el-table-column>
+        <el-table-column
+          width="120"
+          class="table_td"
+          prop="processNo"
+          label="运输阶段"
+        ></el-table-column>
+        <el-table-column
+          width="60"
+          class="table_td"
+          prop="name"
+          label="姓名"
+        ></el-table-column>
+        <el-table-column
+          width="120"
+          class="table_td"
+          prop="phone"
+          label="电话"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          prop="carNo"
+          label="车牌号"
+          width="140"
+          ><template slot-scope="scope">
+            {{ scope.row.carNo }}({{ scope.row.tranCarNo }})
+          </template></el-table-column
+        >
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="loadingWeight"
+          label="装车净重(吨)"
+        ><template slot-scope="scope">
+            <div
+              style="
+                display: inline-block;
+                color: #5878e8;
+                padding: 0 4px !important;
+                position: relative;
+                font-size: 14px;
+              "
+              @click="lookloadingImg(scope.row)"
+            >
+            <span>{{scope.row.loadingWeight}}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="unloadingWeight"
+          label="卸车净重(吨)"
+        ><template slot-scope="scope">
+            <span v-if="scope.row.unloadingWeight == null ">未卸车</span>
+            <div
+              style="
+                display: inline-block;
+                color: #5878e8;
+                padding: 0 4px !important;
+                position: relative;
+                font-size: 14px;
+              "
+              @click="lookunloadingImg(scope.row)"
+            >
+            <span>{{scope.row.unloadingWeight}}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="lossWeight"
+          label="损耗(吨)"
+          ><template slot-scope="scope">
+            <span v-if="scope.row.unloadingWeight == null">--</span>
+            <span
+              v-else-if="
+                scope.row.lossWeight > 0 &&
+                scope.row.lossWeight > scope.row.loadingWeight / 1000
+              "
+              style="color: #f10404; font-weight: 600"
+              >{{ scope.row.lossWeight }}</span
+            >
+           <span
+              v-else
+              style="font-weight: 600"
+              >{{ scope.row.lossWeight }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column
+          width="120"
+          class="table_td"
+          prop="transportPrice"
+          label="运输单价(元/吨)"
+        ></el-table-column>
+        <el-table-column
+          width="120"
+          class="table_td"
+          prop="settlementWeight"
+          label="结算重量(吨)"
+          ><template slot-scope="scope">
+            <span v-if="scope.row.unloadingWeight == '未卸车'">{{scope.row.loadingWeight}}}</span>
+            <span
+              v-if="
+                !scope.row.settlementWeightchange && scope.row.settlementWeight
+              "
+              >{{ scope.row.settlementWeight }}</span
+            >
+            <input
+              v-if="scope.row.settlementWeightchange"
+              style="width: 60px"
+              v-model="settlementWeight"
+              type="text"
+            />
+            <!--改结算重量-->
+            <i
+              @click="changesettlementWeight(scope.row)"
+              v-if="
+                (scope.row.settlementWeightchange &&
+                  scope.row.status == '未审核') ||
+                (scope.row.settlementWeightchange &&
+                  scope.row.status == '已驳回')
+              "
+              class="iconfont icon-dui"
+            ></i>
+            <img
+              v-if="
+                (!scope.row.settlementWeightchange &&
+                  scope.row.settlementWeight &&
+                  scope.row.status == '未审核') ||
+                (!scope.row.settlementWeightchange &&
+                  scope.row.settlementWeight &&
+                  scope.row.status == '已驳回')
+              "
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="editsettlementWeight(scope.row)"
+              alt=""
+            /> </template
+        ></el-table-column>
+        <el-table-column
+          width="120"
+          class="table_td"
+          prop="deductionAmount"
+          label="扣款(元)"
+          ><template slot-scope="scope">
+            <span
+              v-if="
+                !scope.row.deductionAmountchange && scope.row.deductionAmount
+              "
+              >{{ scope.row.deductionAmount }}</span
+            >
+            <input
+              v-if="scope.row.deductionAmountchange"
+              style="width: 60px"
+              v-model="deductionAmount"
+              type="text"
+            />
+            <!--改扣款-->
+            <i
+              @click="changedeductionAmount(scope.row)"
+              v-if="
+                (scope.row.deductionAmountchange &&
+                  scope.row.status == '未审核') ||
+                (scope.row.deductionAmountchange &&
+                  scope.row.status == '已驳回')
+              "
+              class="iconfont icon-dui"
+            ></i>
+            <img
+              v-if="
+                (!scope.row.deductionAmountchange &&
+                  scope.row.deductionAmount &&
+                  scope.row.status == '未审核') ||
+                (!scope.row.deductionAmountchange &&
+                  scope.row.deductionAmount &&
+                  scope.row.status == '已驳回')
+              "
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="editdeductionAmount(scope.row)"
+              alt=""
+            /> </template
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="应付金额(元)"
+          prop="amountIngPayable"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="已付金额(元)"
+          prop="amountEdPayable"
+        ><template slot-scope="scope">
+            <div
+              style="
+                display: inline-block;
+                color: #5878e8;
+                padding: 0 4px !important;
+                position: relative;
+                font-size: 14px;
+              "
+              @click="lookpaymentScreenshot(scope.row)"
+            >
+            <span>{{scope.row.amountEdPayable}}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="未付金额(元)"
+          prop="amountNotPayable"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="已开发票(元)"
+          prop="alreadyInvoice"
+          ><template slot-scope="scope">
+            {{ scope.row.alreadyInvoice }}
+            <img
+              v-if="scope.row.amountEdPayable > 0"
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="editClickInvoice(scope.row)"
+              alt=""
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          width="150"
+          class="table_td"
+          label="付款日期"
+          prop="paymentDate"
+        ></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-column label="状态" prop="status">
+          <template slot-scope="scope">
+            <span v-if="scope.row.approveStatus != null">{{
+              scope.row.approveStatus
+            }}</span>
+            <span v-else>{{ scope.row.status }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 页数 -->
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      ></el-pagination>
+    </el-scrollbar>
+    <!-- 付款 -->
+    <el-dialog
+      width="25%"
+      title="付款"
+      :visible.sync="dialogFormVisible1"
+      :append-to-body="true"
+    >
+      <el-form :model="form">
+        <el-form-item label="未付金额（元）" :label-width="formLabelWidth">
+          <template>
+            <span>{{ amountNotPayable }}</span>
+          </template>
+        </el-form-item>
+        <el-form-item label="本次付款金额" :label-width="formLabelWidth">
+          <el-input
+            v-model="money"
+            autocomplete="off"
+            placeholder="请输入本次付款金额"
+            class="deal"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="付款日期"
+          prop="paymentDate"
+          :label-width="formLabelWidth"
+          class="deal"
+        >
+          <ws-date-picker
+            v-model="paymentDate"
+            type="date"
+            placeholder="请选择付款日期"
+            value-format="yyyy-MM-dd"
+            class="deal"
+          />
+        </el-form-item>
+        <el-form-item label="上传付款截图" :label-width="formLabelWidth">
+          <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            list-type="picture-card"
+            :on-success="handlePictureCardPreview"
+            :on-remove="handleRemove"
+            class="photo2"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible1 = false">取 消</el-button>
+        <el-button type="primary" @click="submitMoney()">提 交</el-button>
+      </div>
+    </el-dialog>
+    <!-- 批量开发票 -->
+    <el-dialog
+      width="30%"
+      title="批量开发票"
+      :visible.sync="dialogFormVisible2"
+      :append-to-body="true"
+    >
+      <el-form :model="form">
+        <el-form-item label="发票金额（元）" :label-width="formLabelWidth">
+          <span> {{ amountEdPayable }}</span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible2 = false">取 消</el-button>
+        <el-button type="primary" @click="submitBatchInvoice()"
+          >提 交</el-button
+        >
+      </div>
+    </el-dialog>
+    <!-- 开发票 -->
+    <el-dialog
+      width="30%"
+      title="开发票"
+      :visible.sync="dialogFormVisible3"
+      :append-to-body="true"
+    >
+      <el-form :model="form">
+        <el-form-item label="可开发票金额（元）" :label-width="formLabelWidth1">
+          {{ amountEdPayable }}
+        </el-form-item>
+        <el-form-item label="实际发票金额（元）" :label-width="formLabelWidth1">
+          <el-input
+            v-model="alreadyInvoice"
+            autocomplete="off"
+            class="deal"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible3 = false">取 消</el-button>
+        <el-button type="primary" @click="submitInvoice()">提 交</el-button>
+      </div>
+    </el-dialog>
+    <!--账户-->
+    <el-dialog
+      width="30%"
+      title="账户信息"
+      :visible.sync="dialogFormVisible8"
+      :append-to-body="true"
+    >
+      <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>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible8 = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!--磅单 -->
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      title="磅单信息"
+      @on-cancel="handleClose"
+    >
+      <p>查看装车磅单</p>
+        <img width="100" height="100" :src="loadingImg1" alt="" />
+    </WinseaContentModal>
+    <WinseaContentModal
+      v-model="accesscard"
+      title="磅单信息"
+      @on-cancel="handleClose1"
+    >
+      <p>查看卸车磅单</p>
+      <img width="100" height="100" :src="unloadingImg1" alt="" />
+    </WinseaContentModal>
+    <!--付款截图 -->
+    <WinseaContentModal
+      v-model="paymentImg"
+      title="付款截图信息"
+      @on-cancel="handleClose2"
+    >
+      <p>查看付款截图</p>
+      <div v-for="item in paymentScreenshot1">
+        <img style="width: 100px; height: 100px" :src="item" alt="" />
+      </div>
+    </WinseaContentModal>
+  </div>
+  <!-- </div> -->
+</template>
+<script>
+import {
+  autoList,
+  editauto,
+  autocontract,
+  autopaymoney,
+  openinvoicelist,
+  // postaudit,
+  //   getselectctcontractno,
+} from '@/model/statisticalReport/index'
+import { posthandle } from '@/model/purchasingManagement/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import { EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+
+  data() {
+    return {
+      checked: true,
+      alreadyInvoice: '',
+      needReapply: true,
+      dialogFormVisible1: false,
+      dialogFormVisible2: false,
+      dialogFormVisible3: false,
+      dialogFormVisible4: false,
+      dialogFormVisible5: false,
+      dialogFormVisible6: false,
+      dialogFormVisible7: false,
+      dialogFormVisible8: false,
+      dialogFormVisible11: false,
+      dialogVisible: false,
+
+      form: {
+        transactionPrice: '',
+        transactionsNumber: '',
+        basis: '',
+      },
+      currect: true,
+      formLabelWidth: '120px',
+      formLabelWidth1: '140px',
+      barWidth: 0,
+      barHeight: 0,
+      retioX: 1,
+      ratioY: 1,
+      isTaped: false,
+      isHover: false,
+      settlementWeightchange: false,
+      deductionAmountchange: false,
+      isShow: !this.autohide,
+      //弹出框
+      dialogViewSpareMoney: false,
+      contractNoList: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      options: [],
+      id:'',
+      pickerOptions: {},
+      value2: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: '1',
+      manualFlag: '',
+      searchTypeText: '未完成',
+      searchKeyWord: '',
+      driverPayeeList: {
+          radio: '1',
+      },
+      contractType: 2,
+      accessoryTFs: false,
+      accesscard: false,
+      paymentImg: false,
+      enter: {
+        closePositionList: [],
+      },
+
+      // 提交类型
+      submitType: true,
+      size: 10,
+      spanArr: [],
+      contractNo: '全部合同',
+      inOutTaskNo: '',
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      roleId: sessionStorage.getItem('ws-pf_roleId'),
+      deptCircularPage: {},
+      warehouseList: [],
+      orderList: {},
+      deptBudgetList: {},
+      id: '',
+
+      pcFlag: 1,
+      carryoverlist: {},
+      modification: [],
+      loadingImg1: [],
+      unloadingImg1: [],
+      paymentScreenshot1: [],
+      amendlist: {},
+      roleFlag: 1,
+      alreadyInvoice1: 0,
+      money: '',
+      paymentDate: '',
+      tranSettlementReportList: [],
+      autoSettlementReport: {
+        tranSettlementReportList: [],
+        money: '',
+        amountNotPayable: 0,
+        amountEdPayable: 0,
+        paymentDate: '',
+        paymentScreenshot: '',
+        id: '',
+      },
+
+      amountNotPayable: 0,
+      amountEdPayable: 0,
+      paymentScreenshotUrls: [],
+      carryovercontractnolist: [],
+      historyList: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+    }
+  },
+  activated() {
+    this.getList()
+    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)
+          })
+      }
+    },
+    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
+        }
+      }
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleClose1() {
+      this.accesscard = false
+    },
+    handleClose2() {
+      this.paymentImg = false
+    },
+    //账户
+    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"
+          }
+          console.log(this.driverPayeeList[i].radio)
+        }
+        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
+      }
+    },
+    submitMoney() {
+      this.autoSettlementReport.money = this.money
+      this.autoSettlementReport.paymentDate = this.paymentDate
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要付款的条目')
+      } else {
+        if (
+          this.money < 0 ||
+          (String(this.money).indexOf('.') != -1 &&
+            String(this.money).length - (String(this.money).indexOf('.') + 1) >
+              2)
+        ) {
+          this.$message({
+            message: '付款金额输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.money) {
+          if (isNaN(this.money)) {
+            this.$message({
+              message: '付款金额非数字!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (!this.money) {
+          this.$message({
+            message: '付款金额不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.money > this.modification[0].amountNotPayable) {
+          this.$message({
+            message: '付款金额不能大于未付金额！',
+            type: 'warning',
+          })
+          return
+        }
+        this.$confirm(`确定提交付款信息？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          autopaymoney({
+            tranSettlementReportList: this.modification,
+            // amountEdPayable: this.modification[0].amountEdPayable,
+            // amountNotPayable: this.modification[0].amountNotPayable,
+            money: this.money,
+            paymentDate: this.paymentDate,
+            paymentScreenshot: this.paymentScreenshot,
+          })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '付款成功',
+              })
+              this.tranSettlementReportList = {}
+              this.money = ''
+              this.paymentDate = ''
+              this.dialogFormVisible1 = false
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+      }
+    },
+    //开发票
+    editClickInvoice(row) {
+      this.id = row.id
+      this.alreadyInvoice1 = row.alreadyInvoice
+      this.amountEdPayable = row.amountEdPayable
+      this.amountNotPayable = row.amountNotPayable
+      this.dialogFormVisible3 = 'true'
+    },
+    submitInvoice() {
+      if (this.amountEdPayable < 0) {
+        this.$message.warning('请选择一条已付款的条目')
+      } else {
+        if (
+          this.alreadyInvoice < 0 ||
+          this.alreadyInvoice > this.amountEdPayable - this.alreadyInvoice1 ||
+          (String(this.alreadyInvoice).indexOf('.') != -1 &&
+            String(this.alreadyInvoice).length -
+              (String(this.alreadyInvoice).indexOf('.') + 1) >
+              2)
+        ) {
+          this.$message({
+            message: '金额输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.alreadyInvoice) {
+          if (isNaN(this.alreadyInvoice)) {
+            this.$message({
+              message: '金额非数字!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (!this.alreadyInvoice) {
+          this.$message({
+            message: '金额不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        this.$confirm(`确定提交发票信息？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          editauto({
+            id: this.id,
+            flag: 2,
+            alreadyInvoice: this.alreadyInvoice,
+            amountEdPayable: this.amountEdPayable,
+            amountNotPayable: this.amountNotPayable,
+          })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '提交成功',
+              })
+              this.dialogFormVisible3 = false
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+      }
+    },
+    //批量开发票
+    handleninvoice() {
+      this.amountEdPayable = 0
+      this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
+      for (var i = 0; i < this.modification.length; i++) {
+        this.amountEdPayable += this.modification[i].amountEdPayable
+      }
+      this.dialogFormVisible2 = true
+    },
+    submitBatchInvoice() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要开发票的条目')
+      } else if (this.modification[0].amountEdPayable < 0) {
+        this.$message.warning('请选择一条已付款的条目')
+      } else {
+        this.$confirm(`确定提交发票信息？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          openinvoicelist({
+            tranSettlementReportList: this.modification,
+          })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '提交成功',
+              })
+              this.dialogFormVisible2 = false
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+      }
+    },
+    //修改结算重量
+    changesettlementWeight(item) {
+      if (!this.settlementWeight) {
+        this.$message({
+          message: '结算重量不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (this.settlementWeight &&
+          String(this.settlementWeight).indexOf('.') != -1 &&
+          String(this.settlementWeight).length -
+            (String(this.settlementWeight).indexOf('.') + 1) >
+            2) ||
+        (this.settlementWeight && this.settlementWeight > 100) ||
+        (this.settlementWeight && this.settlementWeight < 1)
+      ) {
+        this.$message({
+          message: '结算重量输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      editauto({
+        settlementWeight: Math.abs(this.settlementWeight),
+        id: item.id,
+        flag: 0,
+      })
+        .toPromise()
+        .then((response) => {
+          this.$message.success('修改结算重量成功')
+          this.getList()
+        })
+        .catch((req) => {
+          this.$message.warning('修改结算重量失败')
+        })
+    },
+    //设置本次账户
+    bankCard(item,id) {
+      editauto({
+        cardNo: item.bankCard,
+        id: id,
+        flag: 3,
+      })
+        .toPromise()
+        .then((response) => {
+          this.$message.success('成功')
+          this.dialogFormVisible8 = false
+          this.getList()
+        })
+        .catch((req) => {
+          this.$message.warning('失败')
+        })
+    },
+    editsettlementWeight(item) {
+      this.settlementWeight = item.settlementWeight
+      item.settlementWeightchange = true
+    },
+    //修改扣款
+    changedeductionAmount(item) {
+      if (!this.deductionAmount) {
+        this.$message({
+          message: '扣款金额不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (this.deductionAmount &&
+          String(this.deductionAmount).indexOf('.') != -1 &&
+          String(this.deductionAmount).length -
+            (String(this.deductionAmount).indexOf('.') + 1) >
+            2) ||
+        (this.deductionAmount && this.deductionAmount > 100000) ||
+        (this.deductionAmount && this.deductionAmount < 1)
+      ) {
+        this.$message({
+          message: '扣款金额输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      editauto({
+        deductionAmount: Math.abs(this.deductionAmount),
+        id: item.id,
+        flag: 1,
+      })
+        .toPromise()
+        .then((response) => {
+          this.$message.success('修改扣款成功')
+          this.getList()
+        })
+        .catch((req) => {
+          this.$message.warning('修改扣款失败')
+        })
+    },
+    editdeductionAmount(item) {
+      this.deductionAmount = item.deductionAmount
+      item.deductionAmountchange = true
+    },
+    //装车磅单
+    lookloadingImg(row) {
+      if (row.loadingImg == null || row.loadingImg == '') {
+        EventBus.$emit(
+          this.$message.warning('暂无磅单信息')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.loadingImg1 = row.loadingImg
+    },
+    //卸车磅单
+    lookunloadingImg(row) {
+      if (row.unloadingImg === null || row.unloadingImg === '') {
+        EventBus.$emit(
+          this.$message.warning('暂无磅单信息')
+        )
+      } else {
+        this.accesscard = true
+      }
+      this.unloadingImg1 = row.unloadingImg
+    },
+    //付款截图
+    lookpaymentScreenshot(row) {
+      if (row.paymentScreenshot == null || row.paymentScreenshot == '') {
+        EventBus.$emit(
+          this.$message.warning('暂无付款截图信息')
+        )
+      } else {
+        this.paymentImg = true
+      }
+      this.paymentScreenshot1 = row.paymentScreenshot.split('$')
+    },
+    //审核
+    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.$message.success('通过成功')
+          this.getList()
+        } else if (!status) {
+          if (status1 == 2) {
+            postaudit({
+              flag: 2,
+              tranSettlementReportList: this.modification,
+            })
+              .toPromise()
+              .then((response) => {
+                this.$message.success('驳回成功')
+                this.getList()
+              })
+              .catch((req) => {
+                this.$message.success('驳回失败')
+              })
+          }
+        }
+      }
+    },
+    handlereject(status) {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要驳回的条目')
+      } else {
+        this.$confirm(`是否确定驳回？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          that.audit(this.modification[0], 0, false, true, '已驳回')
+        })
+      }
+    },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.contractNo = val
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter((item) => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options = this.contractNoList
+      }
+    },
+    handlepass() {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要通过的条目')
+      } else {
+        this.$confirm(`是否确定通过？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          that.audit(this.modification[0], 0, true, 2)
+        })
+      }
+    },
+    handleSelectionChange(val) {
+      this.modification = val
+    },
+    handlestatus(status) {
+      this.searchType = status
+      this.getList()
+    },
+    contractchange(e) {
+      this.contractNo = e
+      this.getList()
+    },
+    updated() {
+      this.$nextTick(() => {
+        this.$refs.warehouseList.doLayout()
+      })
+    },
+    //合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (
+          index === 13 ||
+          index === 14 ||
+          index === 15 ||
+          index === 16
+        ) {
+          const values = data.map((item) => Number(item[column.property]))
+          if (!values.every((value) => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+          } else {
+            sums[index] = '元'
+          }
+        } else {
+          sums[index] = '--'
+        }
+      })
+      return sums
+    },
+    //列表
+    getList() {
+      autoList({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        contractNo: this.contractNo,
+        manualFlag: this.manualFlag,
+      })
+        .toPromise()
+        .then((response) => {
+          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].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.warehouseList = response
+        })
+      autocontract({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        // roleFlag: this.roleFlag,
+      })
+        .toPromise()
+        .then((response) => {
+          this.contractNoList = response
+          this.contractNoList.unshift({ contractNo: '全部合同' })
+          this.options = this.contractNoList
+        })
+    },
+    handleRemove(file) {
+      console.log(file)
+    },
+    handlePictureCardPreview(file) {
+      this.paymentScreenshot = file.url
+
+      this.dialogVisible = true
+    },
+    handleDownload(file) {
+      console.log(file)
+    },
+    getSpanArr(data) {
+      let that = this
+
+      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+
+      that.spanArr = []
+
+      that.pos = 0
+
+      // //遍历数据
+
+      data.forEach((item, index) => {
+        //判断是否是第一项
+
+        if (index === 0) {
+          this.spanArr.push(1)
+          this.pos = 0
+        } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            查找到符合条件的数据时每次要把之前存储的数据 + 1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+        }
+      })
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(row) {
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
+    async exportlist() {
+      const { data } = await export1(
+        {
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        },
+        {},
+        { responseType: 'blob' }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+        type: 'xls',
+      })
+    },
+    total() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+.connert {
+  width: 90%;
+  margin: 0 auto;
+}
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+//分页
+.el-pagination {
+  padding: 10px 15px;
+  margin-bottom: 0;
+  text-align: center;
+}
+/deep/.el-pager li.active {
+  color: #5878e8;
+  cursor: default;
+}
+/deep/.el-pager li:hover {
+  color: #5878e8;
+  cursor: default;
+}
+.el-button--default {
+  color: #8890b1;
+  border-color: #e8eaf1;
+}
+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+  width: 30px;
+  margin-left: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  width: 385px;
+}
+.completed.el-button--default {
+  border-color: #5878e8;
+  background-color: #f6f7fc;
+  color: #5878e8;
+}
+.putstorage.el-button--default,
+.deliverystorage.el-button--default {
+  border-color: #8890b1;
+  background-color: #fff;
+  color: #8890b1;
+}
+/deep/.el-table td,
+/deep/.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+}
+/deep/.el-table tr td:first-child,
+/deep/.el-table tr th.is-leaf:first-child {
+  border-left: 1px solid #e9ecf7;
+}
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+.anniu {
+  margin-left: 40%;
+  margin-top: -7%;
+  margin-bottom: 6%;
+}
+// .el-row{
+//     height: 150px;
+// }
+.base_header_layout .grid-content {
+  margin-top: 80px;
+}
+.el-input--small .el-input__inner {
+  margin-left: 20px;
+}
+.el-range-editor--small.el-input__inner {
+  height: 32px;
+  margin-left: -20%;
+}
+//执行样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.bg-left {
+  padding-left: 30px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+  // margin-left: 85%;
+  margin-top: 13px;
+}
+//导航条样式
+.el-col-12 {
+  width: 50%;
+  height: 60px;
+  background: #f6f7fc;
+  border-radius: 4px 4px 1px 1px;
+}
+.el-input--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  width: 385px;
+  margin-top: 10px;
+}
+.bg-bottom {
+  margin-left: 85%;
+}
+.but {
+  margin-left: 30%;
+  /* margin-top: -32px; */
+  overflow: auto;
+  /* float: left; */
+  /* margin-left: 1px; */
+  margin-left: -10px;
+}
+.look .el-form-item {
+  border-bottom: 1px solid #ccc;
+}
+.el-input--small {
+  font-size: 13px;
+  width: 390px;
+  margin-left: 74%;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+.el-scrollbar__wrap {
+  overflow-y: hidden;
+}
+/deep/.deal {
+  margin-left: 0%;
+  width: 64%;
+}
+.photo {
+  padding: 0% 34%;
+}
+.photo1 {
+  padding: 0 10%;
+}
+.photo2 {
+  padding: 0 12%;
+}
+/deep/.el-form-item--small .el-form-item__label,
+.el-form-item--small .el-form-item__content {
+  text-align: center;
+}
+hr {
+  width: 91%;
+}
+/deep/.deaal {
+  width: 66%;
+  margin-left: 9%;
+}
+.el-date-editor.el-input,
+.el-date-editor.el-input__inner,
+.el-input-number--small {
+  width: 123% !important;
+}
+/deep/.el-table td,
+.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+  height: 40px;
+}
+</style>

src/views/statisticalReport/component/routers/route.js

@@ -72,7 +72,21 @@ const statisticalReportRouter = {
         // module: 'procurement.sparepart.applDetail'
         }
       },
-      
+      //汽运结算报表
+      {
+        path: 'autoSettlementList',
+        component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/autoSettlementList'),
+        name: 'autoSettlementList',
+        meta: {
+        title: 'autoSettlementList',
+        shortcutEntrance: 'statisticalReport',
+        module: 'report.saleCloseReport',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+        }
+      },
     
   ],
 

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -267,6 +267,9 @@
           <template slot-scope="scope">
             {{ scope.row.alreadyInvoice }}
             <img
+            v-if="
+                scope.row.amountEdPayable > 0
+              "
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
@@ -1243,11 +1246,16 @@ export default {
           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].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].unitPrice +
+              response.records[i].basisPrice+
+              response.records[i].unloadingCharge+
+              response.records[i].invoiceFee+
+              response.records[i].deductionAmount
           }
 
           this.deptBudgetTotal = response.total

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -238,6 +238,9 @@
           <template slot-scope="scope">
             {{ scope.row.alreadyInvoice }}
             <img
+            v-if="
+                scope.row.collectionEdPayable > 0
+              "
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -305,13 +305,23 @@
               size="small"
             ></el-input>
           </el-form-item>
-          <el-form-item label="发货人" span="1" prop="bulkDensity">
-            <el-input
-              v-model="item.sender"
-              placeholder="请输入发货人"
-              maxlength="20"
-              size="small"
-            ></el-input>
+          <el-form-item label="发货人" span="1" prop="sender">
+            <el-select
+            v-model="item.sender"
+            placeholder="请选择发货人"
+            filterable
+            :filter-method="dataFilter"
+            @change=" (val) => {
+                  selectstaff(val, index)
+                }"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+          </el-select>
           </el-form-item>
           <el-form-item label="发货人电话" span="1" prop="bulkDensity">
             <el-input
@@ -319,6 +329,7 @@
               placeholder="请输入发货人电话"
               maxlength="20"
               size="small"
+              disabled
             ></el-input>
           </el-form-item>
         </ws-info-table>
@@ -347,12 +358,22 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="收货人" span="1" prop="bulkDensity">
-            <el-input
-              v-model="item.receiver"
-              placeholder="请输入收货人"
-              maxlength="20"
-              size="small"
-            ></el-input>
+             <el-select
+            v-model="item.receiver"
+            placeholder="请选择收货人"
+            filterable
+            :filter-method="dataFilter"
+            @change="(val) => {
+                  selectstaff1(val, index)
+                }"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+          </el-select>
           </el-form-item>
           <el-form-item label="收货人电话" span="1" prop="bulkDensity">
             <el-input
@@ -360,6 +381,7 @@
               placeholder="请输入收货人电话"
               maxlength="20"
               size="small"
+              disabled
             ></el-input>
           </el-form-item>
         </ws-info-table>
@@ -380,7 +402,7 @@
 <script>
 import { packList } from '@/model/contarct/index'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { addtrantask, getwarehousename, xialaNo } from '@/model/tasksport/index'
+import { addtrantask, getwarehousename, xialaNo,getstaff} from '@/model/tasksport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -440,6 +462,7 @@ export default {
       options_: regionData,
       heightData: '600px',
       zoom: 7,
+      options: [],
       endflag: false,
       selectedOptions: [],
       selectedOptions1: [],
@@ -510,6 +533,36 @@ export default {
         }
       }
     },
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        console.log(val)
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        this.options = this.staffList
+      }
+    },
+    selectstaff(val, index) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == val) {
+            this.deptBudgetList.tranProcessInfoList[index].senderPhone = this.staffList[i].staffMobilePhone
+        }
+      }
+    },
+    selectstaff1(val, index) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == val) {
+            this.deptBudgetList.tranProcessInfoList[index].receiverPhone = this.staffList[i].staffMobilePhone
+        }
+      }
+    },
     sendWarehousechange1(e) {
       for (let i = 0; i < this.warehouseList1.length; i++) {
         if (this.warehouseList1[i].warehouseName == e) {
@@ -631,6 +684,14 @@ export default {
         .then((response) => {
           this.warehouseList1 = response
         })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          // this.agent = response
+          this.options = response
+          this.staffList = response
+          this.sender = response
+        })
       xialaNo({
         compId: this.compId,
       })

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -216,6 +216,7 @@
             height="22"
             class="del"
             @click="del(index, item)"
+            v-if="item.carNum==0||!item.carNum"
             src="../../../public/img/del.png"
             alt=""
           />
@@ -301,12 +302,22 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="发货人" span="1" prop="bulkDensity">
-            <el-input
-              v-model="item.sender"
-              placeholder="请输入发货人"
-              maxlength="20"
-              size="small"
-            ></el-input>
+            <el-select
+            v-model="item.sender"
+            placeholder="请选择发货人"
+            filterable
+            :filter-method="dataFilter"
+            @change="(val) => {
+                  selectstaff(val, index)
+                }"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+          </el-select>
           </el-form-item>
           <el-form-item label="发货人电话" span="1" prop="bulkDensity">
             <el-input
@@ -342,12 +353,22 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="收货人" span="1" prop="bulkDensity">
-            <el-input
-              v-model="item.receiver"
-              placeholder="请输入收货人"
-              maxlength="20"
-              size="small"
-            ></el-input>
+             <el-select
+            v-model="item.receiver"
+            placeholder="请选择收货人"
+            filterable
+            :filter-method="dataFilter"
+            @change="(val) => {
+                  selectstaff1(val, index)
+                }"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+          </el-select>
           </el-form-item>
           <el-form-item label="收货人电话" span="1" prop="bulkDensity">
             <el-input
@@ -381,6 +402,7 @@ import {
   xialaNo,
   examinetran,
   delhaulagestage,
+  getstaff
 } from '@/model/tasksport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -417,6 +439,7 @@ export default {
       warehouseList: [],
       warehouseList1:[],
       goodnameList: [],
+      options: [],
       taskType: [],
       size: 10,
       unitList: [],
@@ -426,6 +449,7 @@ export default {
       age: '',
       weight: 0,
       number: 2,
+      count: 2,
     }
   },
   activated() {
@@ -511,6 +535,36 @@ export default {
     weightchange(e) {
       this.deptBudgetList.tranProcessInfoList[0].weight = e
     },
+    selectstaff(val, index) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == val) {
+           this.deptBudgetList.tranProcessInfoList[index].senderPhone = this.staffList[i].staffMobilePhone
+        }
+      }
+    },
+    selectstaff1(val, index) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == val) {
+            this.deptBudgetList.tranProcessInfoList[index].receiverPhone = this.staffList[i].staffMobilePhone
+        }
+      }
+    },
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        console.log(val)
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        this.options = this.staffList
+      }
+    },
     engflagchange(e,index) {
       this.endflag = e
       if (this.endflag) {
@@ -540,6 +594,7 @@ export default {
           }
           this.deptBudgetList = response
           this.number = response.tranProcessInfoList.length + 1
+          this.count = response.count + 1
           if (
             response.startPrivate != null &&
             response.startCity != null &&
@@ -628,6 +683,14 @@ export default {
         .then((response) => {
           this.taskwayList = response
         })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          // this.agent = response
+          this.options = response
+          this.staffList = response
+          this.sender = response
+        })
       getwarehousename({
         compId: this.compId,
         warehouseType: this.deptBudgetList.warehouseType,
@@ -680,7 +743,7 @@ export default {
     },
     add(index) {
       this.deptBudgetList.tranProcessInfoList.push({
-        processNo: this.deptBudgetList.taskNo + this.number,
+        processNo: this.deptBudgetList.taskNo + this.count,
         sort: 0,
         tranType: '汽运',
         tranTypeKey: '1',
@@ -703,7 +766,7 @@ export default {
         senderPhone: '',
         receiverPhone: '',
       })
-      this.number++
+      this.count++
     },
     del(index, row) {
       if (row.id) {
@@ -726,7 +789,8 @@ export default {
           this.deptBudgetList.tranProcessInfoList.splice(index, 1)
         }
       }
-      this.number--
+      this.count--
+      this.loaddata()
     },
     handleChange(value) {
       this.selectedOptions = value
@@ -839,8 +903,8 @@ export default {
         return
       }
       for (var i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {
-        this.deptBudgetList.tranProcessInfoList[i].processNo =
-          this.deptBudgetList.taskNo + (i + 1)
+        // this.deptBudgetList.tranProcessInfoList[i].processNo =
+        //   this.deptBudgetList.taskNo + (i + 1)
         if (
           new Date(
             this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -106,33 +106,36 @@
               >
                 <span v-show="item.temporaryDriverFlag != 0">{{item.driver}}</span>
               </ws-form-item>
-              <el-divider direction="vertical" class="line"></el-divider>
               <!-- 电话 -->
-              <ws-form-item label="司机电话：" span="1" prop="driverPhone">
+              <ws-form-item label="司机电话：" span="1" prop="driverPhone" style="width:200px">
                 <span v-show="item.temporaryDriverFlag != 0">{{ item.driverPhone }}</span>
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driverPhone }}</span>
               </ws-form-item>
-              <el-divider direction="vertical" class="line"></el-divider>
               <!--车牌号-->
               <ws-form-item label="车牌号：" span="1" prop="carNo">
                 <span v-show="item.temporaryDriverFlag != 0">{{ item.carNo }}</span>
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
               </ws-form-item>
-
-              <el-divider direction="vertical" class="line"></el-divider>
               <!--装车净重-->
               <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">{{item.loadNetWeight}}</ws-form-item>
-              <el-divider direction="vertical" class="line"></el-divider>
               <!--卸车净重(吨)-->
               <ws-form-item label="卸车净重(吨):" span="1" prop="unloadNetWeight">
                 <ws-input
+                  v-if="item.status == '已送达'" 
+                  v-model="item.unloadNetWeight"
+                  placeholder="请输入卸车净重"
+                  maxlength="20"
+                  :disabled="readonly"
+                  size="small"
+                />
+                 <ws-input
+                  v-else
                   v-model="item.unloadNetWeight"
                   placeholder="请输入卸车净重"
                   maxlength="20"
                   size="small"
                 />
               </ws-form-item>
-              <el-divider direction="vertical" class="line"></el-divider>
               <!--磅单-->
               <ws-form-item label="磅单：" span="1" prop="unloadPoundImg">
                 <template >
@@ -166,6 +169,20 @@
                   >未上传</span>
                 </template>
               </ws-form-item>
+               <!--箱号-->
+            <ws-form-item label="箱号:" span="1" prop="caseNo">
+             <span>{{ item.caseNo }}</span>
+            </ws-form-item>
+              <!--封号-->
+            <ws-form-item label="封号:" span="1" prop="titleNo">
+             <span>{{ item.titleNo }}</span>
+            </ws-form-item>
+            <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+              {{ item.signStatus }}
+            </div>
+            <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
+              {{ item.signStatus }}
+            </div>
             </ws-info-table>
           </div>
           <div
@@ -630,6 +647,26 @@ export default {
   left: 2px;
   margin: 0 auto;
 }
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 30px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+}
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 30px;
+  color: #5473e8;
+  line-height: 24px;
+}
 /deep/.ws-info-table.el-form-item .el-form-item__label {
     // background-color: #eee;
     // padding-right: 8px;

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -164,7 +164,21 @@
                 </div> -->
               </template>
             </ws-form-item>
-           
+            <!--箱号-->
+            <ws-form-item label="箱号:" span="1" prop="caseNo">
+             <span>{{ item.caseNo }}</span>
+            </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
+              <!--封号-->
+            <ws-form-item label="封号:" span="1" prop="titleNo">
+             <span>{{ item.titleNo }}</span>
+            </ws-form-item>
+            <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+              {{ item.signStatus }}
+            </div>
+            <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
+              {{ item.signStatus }}
+            </div>
           </ws-info-table>
         </div>
       </div>
@@ -795,4 +809,24 @@ margin-top: 20px;
   margin-top: 6px;
   left: 2px;
 }
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 30px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+}
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 30px;
+  color: #5473e8;
+  line-height: 24px;
+}
 </style>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -171,6 +171,15 @@
             <!--装车净重-->
             <ws-form-item label="装车净重：" span="1" prop="loadNetWeight">
               <ws-input
+                v-if="item.status == '已装车'||item.status == '已送达'" 
+                :disabled="readonly"
+                v-model="item.loadNetWeight"
+                placeholder="请输入装车净重"
+                maxlength="20"
+                size="small"
+              />
+               <ws-input
+                v-else
                 v-model="item.loadNetWeight"
                 placeholder="请输入装车净重"
                 maxlength="20"
@@ -204,15 +213,22 @@
                     deptBudgetList.tranCarInfoList[index].loadPoundImg == null
                   "
                   >未上传</span>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+              </template>
+            </ws-form-item>
+              <!--箱号-->
+            <ws-form-item label="箱号:" span="1" prop="caseNo">
+             <span>{{ item.caseNo }}</span>
+            </ws-form-item>
+              <!--封号-->
+            <ws-form-item label="封号:" span="1" prop="titleNo">
+             <span>{{ item.titleNo }}</span>
+            </ws-form-item>
+               <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
                   {{ item.signStatus }}
                 </div>
                 <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
                   {{ item.signStatus }}
                 </div>
-              </template>
-            </ws-form-item>
-
             <span
               v-show="item.temporaryDriverFlag != 0"
               width="22"
@@ -282,6 +298,7 @@ export default {
       personCharge: [],
       district: null,
       driverList: [],
+      readonly: true,
       listDate: { country: '中国', level: 'country', city: '' },
       citylist: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -484,6 +501,7 @@ export default {
               this.tranCarInfoList = this.freightspace
               this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+              this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
               this.tranCarInfoList.carNo = this.deptBudgetList.carNo
               this.tranCarInfoList.loadNetWeight =
                 this.deptBudgetList.loadNetWeight
@@ -501,6 +519,8 @@ export default {
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.infoId = this.deptBudgetList.infoId
+              tranProcessInfo.processNo = this.deptBudgetList.processNo
+              tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
               tranProcessInfo.tranCarInfoList = this.tranCarInfoList
               // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
               feedback(tranProcessInfo)
@@ -802,23 +822,23 @@ export default {
       display: none;
     }
   }
-  .is-disabled {
-    .el-input__inner:hover {
-      background-color: #fff !important;
-      border: 0;
-    }
-    color: #606266;
-    .el-input__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-  }
+  // .is-disabled {
+  //   .el-input__inner:hover {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+  //   color: #606266;
+  //   .el-input__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //     color: #606266;
+  //   }
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //     color: #606266;
+  //   }
+  // }
 }
 
 // 控制select为只读的时候显示样式
@@ -829,20 +849,20 @@ export default {
     padding: 0px 2px;
   }
 }
-/deep/.is-disabled {
-  .el-input__prefix,
-  .el-input__suffix {
-    display: none;
-  }
-  .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
-    color: #000 !important;
-    font-size: 14px;
-    cursor: text;
-    padding: 0 !important;
-  }
-}
+// /deep/.is-disabled {
+//   .el-input__prefix,
+//   .el-input__suffix {
+//     display: none;
+//   }
+//   .el-input__inner {
+//     background-color: #fff;
+//     border-color: #fff !important;
+//     color: #000 !important;
+//     font-size: 14px;
+//     cursor: text;
+//     padding: 0 !important;
+//   }
+// }
 .winseaview-view {
   padding: 0 0 20px;
 }

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -156,26 +156,34 @@
                       .length == 0
                   "
                   >无</span>
-                <div
-                  v-show="
-                    item.temporaryDriverFlag == 0 &&
-                    item.signStatus == '未签合同'
-                  "
-                  class="signStatus"
-                >
-                  {{ item.signStatus }}
-                </div>
-                <div
-                  v-show="
-                    item.temporaryDriverFlag == 0 &&
-                    item.signStatus == '已签合同'
-                  "
-                  class="signStatus1"
-                >
-                  {{ item.signStatus }}
-                </div>
               </template>
             </ws-form-item>
+             <!--箱号-->
+            <ws-form-item label="箱号:" span="1" prop="caseNo">
+             <span>{{ item.caseNo }}</span>
+            </ws-form-item>
+              <!--封号-->
+            <ws-form-item label="封号:" span="1" prop="titleNo">
+             <span>{{ item.titleNo }}</span>
+            </ws-form-item>
+            <div
+            v-show="
+              item.temporaryDriverFlag == 0 &&
+              item.signStatus == '未签合同'
+            "
+            class="signStatus"
+          >
+            {{ item.signStatus }}
+          </div>
+          <div
+            v-show="
+              item.temporaryDriverFlag == 0 &&
+              item.signStatus == '已签合同'
+            "
+            class="signStatus1"
+          >
+            {{ item.signStatus }}
+          </div>
           </ws-info-table>
         </div>
       </div>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -99,7 +99,52 @@
           </ws-info-table>
 
           <div class="small-title" style="font-size: 16px">派车</div>
-
+          <div class="myTest">
+              <!--当前运输单价-->
+            <ws-form-item label="当前运输单价(元/吨):" span="1" prop="tranPrice">
+                <ws-input
+                  v-model="deptBudgetList.tranPrice"
+                  maxlength="70"
+                  :disabled="readonly"
+                  size="small"
+                  style="width:70px"
+                />
+            </ws-form-item>
+            <!--审核中的运输单价-->
+            <ws-form-item label="审核中的运输单价(元/吨):" span="1" prop="tranPriceIng">
+              <ws-input
+                  v-if="deptBudgetList.priceStatus=='审核中'"
+                  :disabled="readonly"
+                  v-model="deptBudgetList.tranPriceIng"
+                  maxlength="70"
+                  size="small"
+                  style="width:70px"
+                />
+                 <ws-input
+                  v-else
+                  v-model="deptBudgetList.tranPriceIng"
+                  maxlength="70"
+                  size="small"
+                  style="width:70px"
+                />
+            </ws-form-item>
+            <ws-form-item>
+             <el-button
+              v-if="deptBudgetList.priceStatus=='审核中'"
+              type="primary"
+              size="small"
+              @click="examine()"
+              >审核中</el-button
+            >
+             <el-button
+              v-else
+              type="primary"
+              size="small"
+              @click="priceSubmit()"
+              >提交</el-button
+            >
+            </ws-form-item>
+          </div>
           <div
             class="driver position liaison"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
@@ -108,10 +153,13 @@
             <ws-info-table>
               <div class="catNos">
                 司机-{{ index + 1 }}
-                <span class="noservice" v-show="item.status == '未送达'">{{
+                <span class="noservice" v-show="item.status == '未装车'">{{
+                  item.status
+                }}</span>
+                <span class="service" v-show="item.status == '已装车'">{{
                   item.status
                 }}</span>
-                <span class="service" v-show="item.status == '已送达'">{{
+                 <span class="serviced" v-show="item.status == '已送达'">{{
                   item.status
                 }}</span>
               </div>
@@ -191,6 +239,66 @@
                   size="small"
                 />
               </ws-form-item>
+             <!--派车编号-->
+              <ws-form-item
+                label="派车编号："
+                span="1"
+                prop="carModel"
+                class="siji"
+                style="width:245px"
+              >
+                <ws-input
+                  :disabled="readonly"
+                  v-model="item.tranCarNo"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
+              <!--箱号-->
+              <ws-form-item
+                label="箱号："
+                span="1"
+                prop="carModel"
+                class="siji"
+              >
+               <ws-input
+                  v-if="item.status == '已装车'||item.status == '已送达'" 
+                  :disabled="readonly"
+                  v-model="item.caseNo"
+                  maxlength="120"
+                  size="small"
+                />
+                <ws-input
+                  v-else
+                  v-model="item.caseNo"
+                  placeholder="请输入箱号"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
+              <!--封号-->
+              <ws-form-item
+                label="封号："
+                span="1"
+                prop="carModel"
+                class="siji"
+              >
+                <ws-input
+                 v-if="item.status == '已装车'||item.status == '已送达'" 
+                  v-model="item.titleNo"
+                  placeholder="请输入封号"
+                  :disabled="readonly"
+                  maxlength="120"
+                  size="small"
+                />
+                <ws-input
+                  v-model="item.titleNo"
+                  placeholder="请输入封号"
+                   v-else
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
               <!--车型-->
               <ws-form-item
                 label="车型："
@@ -236,13 +344,28 @@
                   size="small"
                 />
               </ws-form-item>
+               <!--运输单价-->
+              <ws-form-item
+                label="运输单价(元/吨):"
+                span="1"
+                prop="carModel"
+                class="siji"
+                style="width:250px"
+              >
+                <ws-input
+                  :disabled="readonly"
+                  v-model="item.tranPrice"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
             </ws-info-table>
             <span
-              v-show="!item.temporaryDriverFlag"
+              v-if="item.status == '未装车'||item.temporaryDriverFlag!=0" 
               width="22"
               height="22"
               class="del"
-              @click="del(index)"
+              @click="del(index, item)"
               src="../../../public/img/del.png"
               alt=""
               >×</span
@@ -282,6 +405,8 @@ import {
   nameXiala,
   arrange,
   dispatchCat,
+  delhaulagestage,
+  setUpTranPrice
 } from '@/model/transport/index'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
@@ -312,6 +437,7 @@ export default {
       carList: [],
       // 提交类型
       readonly: true,
+      tranPriceApprove:{},
       rules: {
         netWeight: [
           {
@@ -361,24 +487,129 @@ export default {
     revert() {
       this.$router.go(-1)
     },
-    del(index) {
-      if (this.deptBudgetList.tranCarInfoList.length > 1) {
-        this.deptBudgetList.tranCarInfoList.splice(index, 1)
-      }
+    del(index, row) {
+      this.$confirm('派车信息删除后不可恢复，是否确定删除？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          delhaulagestage({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$message.success('删除成功')
+              if (this.deptBudgetList.tranCarInfoList.length > 1) {
+                  this.deptBudgetList.tranCarInfoList.splice(index, 1)
+               }
+            })
+        })
     },
     add() {
-      this.deptBudgetList.tranCarInfoList.push({
-        driverName: '',
-        driverPhone: '',
-        carLength: 0,
-        carLengthKey: '',
-        loadWeight: null,
-        carModel: '',
-        carModelKey: '',
-        carNumber: '',
-        disabled: false,
-        tranType: '1',
+      if(!this.deptBudgetList.tranPrice){
+        this.$message({
+          message: '请设置运输单价！',
+          type: 'warning',
+        })
+      }
+      else{
+            var tmp1='C00'
+            this.deptBudgetList.count++
+            if(this.deptBudgetList.tranCarInfoList.length<10){
+                this.deptBudgetList.tranCarInfoList.push({
+                driverName: '',
+                driverPhone: '',
+                carLength: 0,
+                carLengthKey: '',
+                loadWeight: null,
+                carModel: '',
+                carModelKey: '',
+                carNumber: '',
+                disabled: false,
+                tranType: '1',
+                tranCarNo: tmp1+(this.deptBudgetList.count),
+                tranPrice:this.deptBudgetList.tranPrice
+              })
+          }
+         else if(this.deptBudgetList.tranCarInfoList.length<100&&this.deptBudgetList.tranCarInfoList.length>=10){
+                tmp1='C0'
+                 this.deptBudgetList.count++
+                this.deptBudgetList.tranCarInfoList.push({
+                driverName: '',
+                driverPhone: '',
+                carLength: 0,
+                carLengthKey: '',
+                loadWeight: null,
+                carModel: '',
+                carModelKey: '',
+                carNumber: '',
+                disabled: false,
+                tranType: '1',
+                tranCarNo: tmp1+(this.deptBudgetList.count),
+                tranPrice:this.deptBudgetList.tranPrice
+              })
+          }
+          else if(this.deptBudgetList.tranCarInfoList.length<1000&&this.deptBudgetList.tranCarInfoList.length>=100){
+                tmp1='C'
+                 this.deptBudgetList.count++
+                this.deptBudgetList.tranCarInfoList.push({
+                driverName: '',
+                driverPhone: '',
+                carLength: 0,
+                carLengthKey: '',
+                loadWeight: null,
+                carModel: '',
+                carModelKey: '',
+                carNumber: '',
+                disabled: false,
+                tranType: '1',
+                tranCarNo: tmp1+(this.deptBudgetList.count),
+                tranPrice:this.deptBudgetList.tranPrice
+              })
+          }
+      }
+    },
+    //审核
+    examine(){
+      this.$prompt('运输单价审核', {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+        }).then(({ value }) => {
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.flag = "2"
+              tranProcessInfo.tranPriceIng = value
+              setUpTranPrice(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('审核成功')
+                  this.getList()
+                });
+        }).catch(() => {
+          this.$message.warning(
+            '取消审核'
+          );       
+        });
+    },
+    priceSubmit(){
+      this.$confirm(`运输单价将发送给决策人审核，确定提交？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
       })
+        .then(() => {
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.flag = "1"
+              tranProcessInfo.tranPriceIng = this.deptBudgetList.tranPriceIng
+              setUpTranPrice(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('提交成功')
+                  this.getList()
+                })              
+        })
+        .catch(() => {
+          return false
+        })
     },
     //提交按钮
     submit() {
@@ -459,6 +690,8 @@ export default {
                 carNumber: '',
                 disabled: false,
                 tranType: '1',
+                tranCarNo: 'C001',
+                tranPrice:this.deptBudgetList.tranPrice
               },
             ]
           }
@@ -537,6 +770,11 @@ export default {
   .ws-info-table {
     border: none;
   }
+  .myTest{
+    width: 800px;
+    display: flex;
+    height: 40px;
+  }
   .el-form-item {
     width: 33.3333%;
     border: none;
@@ -701,6 +939,15 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
+.serviced {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #2c81cf;
+}
 //添加司机
 .add {
   width: 100px;

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -84,6 +84,18 @@
         }}</ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">派车</div>
+       <div class="myTest">
+            <!--当前运输单价-->
+          <ws-form-item label="当前运输单价(元/吨):" span="1" prop="tranPrice">
+              <ws-input
+                v-model="deptBudgetList.tranPrice"
+                maxlength="70"
+                :disabled="readonly"
+                size="small"
+                style="width:70px"
+              />
+          </ws-form-item>
+       </div>
       <div
         style="width: 100%"
         class="driver"
@@ -93,12 +105,15 @@
         <ws-info-table>
           <div class="catNos">
             司机-{{ index + 1 }}
-            <span class="noservice" v-show="item.status == '未送达'">
-              {{ item.status }}
-            </span>
-            <span class="service" v-show="item.status == '已送达'">
-              {{ item.status }}
-            </span>
+             <span class="noservice" v-show="item.status == '未装车'">{{
+                  item.status
+                }}</span>
+                <span class="service" v-show="item.status == '已装车'">{{
+                  item.status
+                }}</span>
+                 <span class="serviced" v-show="item.status == '已送达'">{{
+                  item.status
+                }}</span>
           </div>
           <!--姓名-->
           <ws-form-item label="姓名:" span="1" prop="driver">{{
@@ -111,7 +126,76 @@
             prop="driverPhone"
             >{{ item.driverPhone }}</ws-form-item
           >
-          <ws-form-item label="车牌号:" span="1" prop="carNo">
+          <!--车牌号-->
+              <ws-form-item label="车牌号：" span="1" prop="carNo" class="siji">
+                {{ item.carNo }}
+              </ws-form-item>
+             <!--派车编号-->
+              <ws-form-item
+                label="派车编号："
+                span="1"
+                prop="carModel"
+                class="siji"
+                style="width:245px"
+              >
+               {{ item.tranCarNo }}
+              </ws-form-item>
+              <!--箱号-->
+              <ws-form-item
+                label="箱号："
+                span="1"
+                prop="caseNo"
+                class="siji"
+              >
+                {{ item.caseNo }}
+              </ws-form-item>
+              <!--封号-->
+              <ws-form-item
+                label="封号："
+                span="1"
+                prop="carModel"
+                class="siji"
+              >
+                {{ item.titleNo }}
+              </ws-form-item>
+              <!--车型-->
+              <ws-form-item
+                label="车型："
+                span="1"
+                prop="carModel"
+                class="siji"
+              >
+               {{ item.carModel }}
+              </ws-form-item>
+              <!--车长-->
+              <ws-form-item
+                label="车长："
+                span="1"
+                prop="carLength"
+                class="siji"
+              >
+               {{ item.carLength }}
+              </ws-form-item>
+              <!--载重吨-->
+              <ws-form-item
+                label="载重(吨):"
+                span="1"
+                prop="loadWeight"
+                class="siji zaizhong"
+              >
+                {{ item.loadWeight }}
+              </ws-form-item>
+               <!--运输单价-->
+              <ws-form-item
+                label="运输单价(元/吨):"
+                span="1"
+                prop="carModel"
+                class="siji"
+                style="width:245px"
+              >
+               {{ item.tranPrice }}
+              </ws-form-item>
+          <!-- <ws-form-item label="车牌号:" span="1" prop="carNo">
             <template slot-scope="scope">
               <el-popover
                 placement="top"
@@ -154,7 +238,7 @@
             span="1"
             prop="unloadNetWeight"
             class="hetong"
-          ></ws-form-item>
+          ></ws-form-item> -->
         </ws-info-table>
       </div>
     </ws-form>
@@ -167,12 +251,26 @@
         >关闭</el-button
       >
     </div>
+    <div class="small-title" style="font-size: 13px;margin-left: 170px">审核记录</div>
+         <el-table
+        class="wenzi"
+        :data="deptBudgetList.tranPriceApproveList"
+        style="width: 60%;margin-left: 170px;"
+        height="180"
+      >
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
+        </el-table-column>
+        <el-table-column prop="result" label="审核结果">
+        </el-table-column>
+        <el-table-column prop="updateDate" label="审核时间"></el-table-column>
+        <el-table-column prop="tranPrice" label="运输单价(元/吨)"></el-table-column>
+     </el-table>
   </div>
 </template>
 <script>
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { seeCat } from '@/model/transport/index'
+import { seeCat} from '@/model/transport/index'
 import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
@@ -196,7 +294,7 @@ export default {
       searchType: 1,
       startDate: null,
       endDate: null,
-
+      taskhistories:[],
       readonly: true,
       rules: {
         netWeight: [
@@ -333,8 +431,8 @@ export default {
   width: 50%;
 }
 .container {
+  height: 93vh;
   overflow: scroll;
-  height: 120vh;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: center;
@@ -357,6 +455,11 @@ export default {
   padding: 10px;
   font-weight: 600;
 }
+  .myTest{
+    width: 800px;
+    display: flex;
+    height: 40px;
+  }
 .small-title::before {
   position: absolute;
   content: '';
@@ -444,6 +547,15 @@ export default {
   padding: 2px;
   font-size: 12px;
 }
+.serviced {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #2c81cf;
+}
 .noservice {
   background: #c4cada;
   color: #ffffff;