Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/V2/customer/index.js

@@ -3,7 +3,7 @@
 export const API_GET_CUSTOMERINFO_LOOK = '/customerInfo/selectCustomerInfo'
 
 // 设置默认定金比例
-export const API_POST_INSTALLDEPOSITRATIO = '/customerInfo/api/installDepositRatio'
+export const API_GET_INSTALLDEPOSITRATIO = '/customerInfo/api/installDepositRatio'
 
 // 编辑
 export const API_POST_EDITCUSTOMERINFO = '/customerInfo/api/editCustomerInfo'

src/api/V2/platformaudit/index.js

@@ -3,4 +3,12 @@ export const API_POST_GRAINMERCHANTREVIEW = '/identityAuthenticationInfo/api/exa
 //司机审核
 export const API_POST_DRIVERREVIEW = '/driverViewInfo/api/examine'
 //交易信息审核
-export const API_POST_TRANSACTIONINFORMATIONREVIEW = '/procurementPlanInfo/api/examine'
+export const API_POST_TRANSACTIONINFORMATIONREVIEW = '/procurementPlanInfo/api/examine'
+//粮商列表
+export const API_GET_GRAINMERCHANT_LIST = '/identityAuthenticationInfo/selectIdentityAuthenticationInfoPc'
+//司机列表
+export const API_GET_DRIVER_LIST = '/driverViewInfo/selectDriverInfoPage'
+//交易信息列表
+export const API_GET_TRANSACTIONINFORMATION_LIST = '/procurementPlanInfo/selectProcurementPlanInfo'
+//交易信息删除
+export const API_POST_DELETETRANSACTIONINFORMATION = '/procurementPlanInfo/api/deleteProcurementPlan'

src/lang/zh.js

@@ -488,6 +488,9 @@
     salesContractAdd: '销售合同添加',
     purchaseContractAdd: '采购合同添加',
     purchaseContractEdit: '采购合同编辑',
+    priceConfirmationSheet: '点价确认单',
+    priceConfirmationSheetAdd:'创建点价确认单',
+    priceConfirmationSheetEdit:'编辑点价确认单',   
     //仓库管理
     warehouseManagementList: '仓库管理',
     warehouseManagementAdd: '仓库管理添加',

src/model/customer/index.js

@@ -2,7 +2,7 @@ import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
 import {
     API_GET_CUSTOMERINFO_LOOK,
-    API_POST_INSTALLDEPOSITRATIO,
+    API_GET_INSTALLDEPOSITRATIO,
     API_POST_EDITCUSTOMERINFO
 } from '@/api/V2/customer'
 // import { app } from 'electron'
@@ -11,7 +11,7 @@ import {
 export const getList = appRx.get(API_GET_CUSTOMERINFO_LOOK, errorCatcher, errorHandle, filter)
 
 // 设置默认定金比例
-export const installDepositRatio = appRx.post(API_POST_INSTALLDEPOSITRATIO, errorCatcher, errorHandle, filter)
+export const installDepositRatio = appRx.get(API_GET_INSTALLDEPOSITRATIO, errorCatcher, errorHandle, filter)
 
 // 编辑
 export const editCustomerInfo = appRx.post(API_POST_EDITCUSTOMERINFO, errorCatcher, errorHandle, filter)

src/model/platformaudit/index.js

@@ -3,12 +3,24 @@ import { appRx } from '../defalutConfig/indexRx'
 import {
     API_POST_GRAINMERCHANTREVIEW,
     API_POST_DRIVERREVIEW,
-    API_POST_TRANSACTIONINFORMATIONREVIEW
+    API_POST_TRANSACTIONINFORMATIONREVIEW,
+    API_GET_GRAINMERCHANT_LIST,
+    API_GET_DRIVER_LIST,
+    API_GET_TRANSACTIONINFORMATION_LIST,
+    API_POST_DELETETRANSACTIONINFORMATION
 } from '@/api/V2/platformaudit'
 // import { app } from 'electron'
 // 粮商审核
-export const getGrainMerchants = appRx.get(API_POST_GRAINMERCHANTREVIEW, errorCatcher, errorHandle, filter)
+export const getGrainMerchants = appRx.post(API_POST_GRAINMERCHANTREVIEW, errorCatcher, errorHandle, filter)
 // 司机审核
-export const getDriver = appRx.get(API_POST_DRIVERREVIEW, errorCatcher, errorHandle, filter)
+export const getDriver = appRx.post(API_POST_DRIVERREVIEW, errorCatcher, errorHandle, filter)
 // 交易信息审核
-export const getTransactionInformation = appRx.get(API_POST_TRANSACTIONINFORMATIONREVIEW, errorCatcher, errorHandle, filter)
+export const getTransactionInformation = appRx.post(API_POST_TRANSACTIONINFORMATIONREVIEW, errorCatcher, errorHandle, filter)
+// 粮商列表
+export const grainMerchantsList = appRx.get(API_GET_GRAINMERCHANT_LIST, errorCatcher, errorHandle, filter)
+//司机列表
+export const driverList = appRx.get(API_GET_DRIVER_LIST, errorCatcher, errorHandle, filter)
+//交易信息列表
+export const transactionInformationList = appRx.get(API_GET_TRANSACTIONINFORMATION_LIST, errorCatcher, errorHandle, filter)
+// 交易信息删除
+export const deleteTransactionInformation = appRx.post(API_POST_DELETETRANSACTIONINFORMATION, errorCatcher, errorHandle, filter)

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

@@ -129,8 +129,54 @@ const contractManagementRouter = {
         // module: 'procurement.sparepart.applDetail'
       },
       hidden: true
-    }
-    
+    },
+    //点价确认单
+    {
+      path: 'priceConfirmationSheet',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/priceConfirmationSheet'),
+      name: 'priceConfirmationSheet',
+      meta: {
+        title: 'priceConfirmationSheet',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.salesContract',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      }
+    },
+    //创建点价确认单
+    {
+      path: 'priceConfirmationSheetAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/priceConfirmationSheetAdd'),
+      name: 'priceConfirmationSheetAdd',
+      meta: {
+        title: 'priceConfirmationSheetAdd',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.salesContract',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
+    //编辑点价确认单
+    {
+      path: 'priceConfirmationSheetEdit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/priceConfirmationSheetEdit'),
+      name: 'priceConfirmationSheetEdit',
+      meta: {
+        title: 'priceConfirmationSheetEdit',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.salesContract',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
   ],
 
 };

src/views/contractManagement/priceConfirmationSheet.vue

@@ -0,0 +1,616 @@
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">点价确认单</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertion-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <div class="wenzi">
+      <h3>所属合同</h3>
+      <p>
+        &nbsp;&nbsp;采购合同(
+        <template>{{ this.deptBudgetList.contractNo }}</template>
+        )
+      </p>
+      <div class="tianjiaanniu">
+        <ws-button
+          type="primary"
+          @click="sheetAdd()"
+          v-hasPermission="
+            `contractManagement.salesContract.salesContractInfo.add`
+          "
+          ><img
+            width="13"
+            height="13"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 2px;
+              left: -4px;
+            "
+            src="../../../public/img/header-add.png"
+            alt=""
+          />添加</ws-button
+        >
+      </div>
+    </div>
+    <div class="dianjiadanbianhao">
+      <h3>点价单编号</h3>
+      <p>
+        <template>CG20210329-02{{ this.deptBudgetList.priceListNo }}</template>
+      </p>
+      <div class="fujian">
+        <template slot-scope="scope" >
+          <img
+            width="18"
+            height="20"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png"
+            @click="fujian(scope.row)"
+            alt=""
+          />
+          <span v-if="(scope.row.enclosureTypeFlag = '0')"
+            >&nbsp;&nbsp;&nbsp;未上传</span
+          >
+          <span v-if="(scope.row.enclosureTypeFlag = '1')"
+            >&nbsp;&nbsp;&nbsp;已上传</span
+          >
+        </template>
+      </div>
+      <div class="caozuoanniu">
+        <el-button class="find" type="primary" @click="sheetEdit()"
+          >编辑</el-button
+        >
+        <el-button class="find" type="primary" @click="sheetDelete()"
+          >删除</el-button
+        >
+      </div>
+    </div>
+    <div class="center">
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <!--基本信息-->
+        <ws-info-table>
+          <ws-form-item
+            label="品种合约及方向"
+            span="1"
+            prop="varietyContractDirection"
+          >
+            <div class="unchanged">
+              {{ deptBudgetList.varietyContractDirection }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="买方联络人" span="1" prop="buyer">
+            <div class="unchanged">
+              {{ deptBudgetList.buyer }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="成交数量" span="1" prop="transactionsNumberHand">
+            <div class="unchanged">
+              {{
+                deptBudgetList.transactionsNumberHand
+              }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;手
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              即&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
+                deptBudgetList.transactionsNumber
+              }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;吨
+            </div>
+          </ws-form-item>
+          <ws-form-item label="买方联络人电话" span="1" prop="buyerPhone">
+            <div class="unchanged">
+              {{ deptBudgetList.buyerPhone }}
+            </div>
+          </ws-form-item>
+          <ws-form-item
+            label="成交价格(元/吨)"
+            span="1"
+            prop="transactionPrice"
+          >
+            <div class="unchanged">
+              {{ deptBudgetList.transactionPrice }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="卖方联络人" span="1" prop="seller">
+            <div class="unchanged">
+              {{ deptBudgetList.seller }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="成交日期" span="1" prop="transactionDate">
+            <div class="unchanged">
+              {{ deptBudgetList.transactionDate }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="卖方联络人电话" span="1" prop="sellerPhone">
+            <div class="unchanged">
+              {{ deptBudgetList.sellerPhone }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="备注" span="1" prop="remarks">
+            <div class="unchanged">
+              {{ deptBudgetList.remarks }}
+            </div>
+          </ws-form-item>
+        </ws-info-table>
+      </ws-form>
+    </div>
+  </div>
+</template>
+<script>
+import { xiala, addxiala, editxiala, delxiala } from '@/model/contarct/index'
+import WsUpload from '@/components/WsUpload'
+import { EventBus } from 'base-core-lib'
+import { regionData,  } from 'element-china-area-data'
+
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      options_: regionData,
+      selectedOptions: [],
+      selectedOptions1: [],
+      // 提交类型
+      submitType: true,
+      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
+      trainingMethods: {},
+      packtypeList: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      contractNo: '',
+      mainReportAdd: {},
+      appendixIdsAdd: '',
+      size: 10,
+      unitList: [],
+      goodnameList: [],
+      gradeList: [],
+      ChapterTwoList: [],
+      addressUrls: [],
+      addressUrl: '',
+      deptBudgetList: {},
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      ruleDeptBudget: {
+        contractNo: [
+          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          {
+            min: 6,
+            max: 20,
+            message: '长度在 6 到 20 个字符',
+            trigger: 'blur',
+          },
+        ],
+      },
+      selectIntendedShip: {},
+      interviewTypeList: {},
+      fileList: [],
+    }
+  },
+  methods: {
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    handleChange1(value) {
+      this.selectedOptions1 = value
+    },
+    returnsales() {
+      this.$router.push({ path: 'salesContract' })
+    },
+    //创建点价确认单
+    sheetAdd() {
+      this.$router.push({ path: 'priceConfirmationSheetAdd' })
+    },
+    // 编辑点价确认单
+    sheetEdit() {
+        this.$router.push({ path: 'priceConfirmationSheetEdit' })
+    },
+    // 删除点价确认单
+    sheetDelete(item, index) {
+    //   this.$confirm(`确认单删除后不可恢复，是否确定删除？`, '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning',
+    //   })
+    //     .then(() => {
+    //       delDriver({ id: row.id })
+    //         .toPromise()
+    //         .then((response) => {
+    //           this.$notify.success({
+    //             title: '成功',
+    //             message: '删除成功',
+    //           })
+    //           this.getUnitList()
+    //           this.pleaseChoose = ''
+    //         })
+    //         .catch((response) => {
+    //           console.log(response)
+    //           EventBus.$emit('error', response.message)
+    //         })
+    //     })
+    //     .catch(() => {
+    //       return false
+    //     })
+    
+    //   if (Object.is(item.constKey, 1)) {
+    //     return
+    //   }
+    //   if (!item.constValue) {
+    //     this.unitList.splice(index, 1)
+    //     return
+    //   }
+    //   delxiala({ id: this.unitList[index].id })
+        
+    },
+    fujian(row) {
+      if (row.addressUrl === null || row.addressUrl === '') {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss = row.addressUrl.split(',')
+    },
+    getUnitList() {
+      xiala({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        constCode: 'TYPEYAN',
+      })
+        .toPromise()
+        .then((response) => {
+          this.unitList = response
+          let currItem
+          this.unitList.forEach((item, index, arr) => {
+            item.flag = 'delete'
+            if (this.vModel == item.constKey) {
+              currItem = item
+            }
+          })
+          //
+          if (currItem) {
+            this.selectContract(currItem.constValue)
+          }
+        })
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid #cdd2dc;
+  border-bottom: 1px solid #cdd2dc;
+}
+.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;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid #cdd2dc;
+  background: #fafbfc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+  background: #f0f2f6;
+  // border: 1px solid #cdd2dc;
+}
+.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;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 16px 0px;
+}
+.caozuoanniu {
+  margin-left: 83%;
+  margin-top: -49px;
+  margin-bottom: 20px;
+}
+.fujian {
+  margin-left: 20px;
+}
+.wenzi {
+  width: 68%;
+  margin: 0 auto;
+  margin-top: 15px;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+  margin-left: 16px;
+}
+.dianjiadanbianhao {
+  width: 70%;
+  margin: 0 auto;
+  margin-top: 45px;
+}
+.dianjiadanbianhao h3 {
+  display: inline-block;
+  left: 10px;
+  font-size: inherit;
+  margin-bottom: 24px;
+}
+.dianjiadanbianhao p {
+  display: inline-block;
+  margin-left: 20px;
+}
+.center {
+  width: 70%;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 70%;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      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;
+    }
+  }
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 148px;
+}
+/deep/.el-date-editor {
+  font-size: 13px;
+}
+/deep/.el-textarea {
+  width: 101%;
+  margin: 0px;
+}
+/deep/el-date-editor--date {
+  width: 200px;
+}
+.unchanged {
+  position: absolute;
+  left: 37px;
+  width: 102px;
+  height: 14px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #afb5cb;
+  line-height: 14px;
+}
+.tianjiaanniu {
+  margin-left: 92%;
+  margin-top: -43px;
+}
+/deep/.el-input--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+}
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    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;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.addressUrls {
+  width: 100%;
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrls-item {
+  position: relative;
+  display: flex;
+}
+.icon-guanbi {
+  position: absolute;
+  right: 8px;
+}
+.addressUrl {
+  margin: 0px 10px;
+  border-radius: 3px;
+}
+//上传文件成功标识
+/deep/.el-upload-list__item-status-label {
+  position: absolute;
+  right: 22px;
+  top: -1px;
+  line-height: inherit;
+  display: none;
+}
+</style>

src/views/contractManagement/priceConfirmationSheetAdd.vue

@@ -0,0 +1,800 @@
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">创建点价确认单</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertion-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <div class="wenzi">
+      <h3>所属合同</h3>
+      <p>
+        &nbsp;&nbsp;采购合同(
+        <template>{{ this.deptBudgetList.contractNo }}</template>
+        )
+      </p>
+    </div>
+    <div class="center">
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <!--基本信息-->
+
+        <ws-info-table>
+          <!--点价单编号-->
+          <ws-form-item
+            label="点价单编号"
+            span="1"
+            prop="priceListNo"
+            class="readonly"
+          >
+            <ws-input
+              v-model="deptBudgetList.priceListNo"
+              placeholder="请输入点价单编号"
+              maxlength="20"
+              size="small"
+              :rules="ruleDeptBudget"
+            />
+          </ws-form-item>
+
+          <!--点价单附件-->
+          <ws-form-item label="点价单附件" span="1" prop="priceListNo">
+            <el-upload
+              class="upload-demo"
+              action="https://www.zthymaoyi.com/upload/admin"
+              :on-success="
+                (res, file) => {
+                  uploadSuccessHandle(res)
+                }
+              "
+              multiple
+              :limit="3"
+              :file-list="fileList"
+            >
+              <el-button size="small" type="primary">附件</el-button>
+            </el-upload>
+            <div class="shangchuan">
+              <template>
+                <span v-if="deptBudgetList.enclosureTypeFlag == '0'"
+                  >未上传</span
+                >
+                <span v-if="deptBudgetList.enclosureTypeFlag == '1'"
+                  >已上传</span
+                >
+              </template>
+            </div>
+          </ws-form-item>
+
+          <!--品种合约及方向-->
+          <ws-form-item
+            label="品种合约及方向"
+            span="1"
+            prop="varietyContractDirection"
+            class="readonly"
+          >
+            <ws-input
+              v-model="deptBudgetList.varietyContractDirection"
+              placeholder="请输入品种合约及方向"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--买方联络人-->
+          <ws-form-item label="买方联络人" span="1" prop="buyer">
+            <ws-input
+              v-model="deptBudgetList.buyer"
+              placeholder="请输入买方联络人"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--成交数量-->
+          <ws-form-item
+            label="成交数量"
+            span="1"
+            prop="transactionsNumberHand"
+            class="readonly"
+          >
+            <ws-input
+              @input="transactionsNumberHandChange"
+              v-model="deptBudgetList.transactionsNumberHand"
+              placeholder="请输入"
+              maxlength="100"
+              size="small"
+            />&nbsp;&nbsp;&nbsp;手&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;即&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <ws-input
+              readonly="readonly"
+              v-model="deptBudgetList.transactionsNumber"
+              placeholder="自动计算"
+              maxlength="100"
+              size="small"
+            />&nbsp;&nbsp;&nbsp;吨
+          </ws-form-item>
+
+          <!--买方联络人电话-->
+          <ws-form-item label="买方联络人电话" span="1" prop="buyerPhone">
+            <ws-input
+              v-model="deptBudgetList.buyerPhone"
+              placeholder="请输入买方联络人电话"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--成交价格(元/吨)-->
+          <ws-form-item label="成交价格(元/吨)" span="1" prop="transactionPrice">
+            <ws-input
+              v-model="deptBudgetList.transactionPrice"
+              placeholder="请输入成交价格"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--卖方联络人-->
+          <ws-form-item label="卖方联络人" span="1" prop="seller">
+            <ws-input
+              v-model="deptBudgetList.seller"
+              placeholder="请输入卖方联络人"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--成交日期-->
+          <ws-form-item label="成交日期" span="1" prop="transactionDate">
+            <ws-date-picker
+              v-model="deptBudgetList.transactionDate"
+              type="date"
+              placeholder="请选择成交日期"
+              value-format="yyyy-MM-dd"
+            />
+          </ws-form-item>
+
+          <!--卖方联络人电话-->
+          <ws-form-item label="卖方联络人电话" span="1" prop="sellerPhone">
+            <ws-input
+              v-model="deptBudgetList.sellerPhone"
+              placeholder="请输入卖方联络人电话"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--备注-->
+          <ws-form-item label="备注" span="1" prop="remarks">
+            <ws-input
+              v-model="deptBudgetList.remarks"
+              placeholder="请输入备注,不超过200字"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
+      </ws-form>
+    </div>
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >提交</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+//  import { getVesselOne } from '@/model/procurement/basic'
+//  import { dayjs } from 'base-core-lib'
+import {
+  addList,
+  xiala,
+  addxiala,
+  editxiala,
+  delxiala,
+} from '@/model/contarct/index'
+import WsUpload from '@/components/WsUpload'
+import { regionData, CodeToText } from 'element-china-area-data'
+
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      options_: regionData,
+      selectedOptions: [],
+      selectedOptions1: [],
+      // 提交类型
+      submitType: true,
+      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
+      trainingMethods: {},
+      packtypeList: [],
+      mainReportAdd: {},
+      appendixIdsAdd: '',
+      size: 10,
+
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      enclosureTypeFlag: '0',
+      unitList: [],
+      goodnameList: [],
+      gradeList: [],
+      ChapterTwoList: [],
+      addressUrls: [],
+      deptBudgetList: {
+        deliverType: '1',
+        finalTradingVolume: 0,
+        contractGoodsInfo: {
+          goodsName: '',
+        },
+        contractProcessInfo: {},
+        addressUrl: '',
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      ruleDeptBudget: {
+        contractNo: [
+          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          {
+            min: 6,
+            max: 20,
+            message: '长度在 6 到 20 个字符',
+            trigger: 'blur',
+          },
+        ],
+      },
+      selectIntendedShip: {},
+      interviewTypeList: {},
+      fileList: [],
+    }
+  },
+  methods: {
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    handleChange1(value) {
+      this.selectedOptions1 = value
+    },
+    returnsales() {
+      this.$router.push({ path: 'priceConfirmationSheet' })
+    },
+
+    // 上传附件
+    uploadSuccessHandle(e) {
+      this.addressUrls.push(e.url)
+      this.deptBudgetList.addressUrl = this.addressUrls.toString
+    },
+    onChange(files) {
+      this.fileNum = files
+      this.$refs.upload.handleSaveBill().then((res) => {
+        console.log(files)
+      })
+    },
+    //计算成交数量(吨)
+    transactionsNumberHandChange(e) {
+        this.deptBudgetList.transactionsNumber = e * 10      
+    },
+    getUnitList() {
+      xiala({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        constCode: 'TYPEYAN',
+      })
+        .toPromise()
+        .then((response) => {
+          this.unitList = response
+          let currItem
+          this.unitList.forEach((item, index, arr) => {
+            item.flag = 'delete'
+            if (this.vModel == item.constKey) {
+              currItem = item
+            }
+          })
+          //
+          if (currItem) {
+            this.selectContract(currItem.constValue)
+          }
+        })
+    },
+
+    submit() {
+      if (!this.deptBudgetList.priceListNo) {
+        this.$message({
+          message: '点价单编号不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.priceListNo.length < 1 ||
+        this.deptBudgetList.priceListNo.length > 20
+      ) {
+        this.$message({
+          message: '点价单编号输入错误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.varietyContractDirection) {
+        this.$message({
+          message: '品种合约及方向不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.varietyContractDirection.length < 1 ||
+        this.deptBudgetList.varietyContractDirection.length > 20
+      ) {
+        this.$message({
+          message: '品种合约及方向输入错误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.buyer) {
+        this.$message({
+          message: '买方联络人不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.buyer.length < 2 ||
+        this.deptBudgetList.buyer.length > 20
+      ) {
+        this.$message({
+          message: '买方联络人姓名输入错误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.buyerPhone) {
+        this.$message({
+          message: '买方联络人电话不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.buyerPhone.length < 7 ||
+        this.deptBudgetList.buyerPhone.length > 20
+      ) {
+        this.$message({
+          message: '买方联络人电话输入错误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (isNaN(this.deptBudgetList.buyerPhone)) {
+        this.$message({
+          message: '卖方联络人电话输入有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.seller) {
+        this.$message({
+          message: '卖方联络人不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.seller.length < 2 ||
+        this.deptBudgetList.seller.length > 20
+      ) {
+        this.$message({
+          message: '卖方联络人姓名输入错误!',
+          type: 'warning',
+        })
+        return
+      }
+
+      if (!this.deptBudgetList.sellerPhone) {
+        this.$message({
+          message: '卖方联络人电话不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (isNaN(this.deptBudgetList.sellerPhone)) {
+        this.$message({
+          message: '卖方联络人电话输入有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.sellerPhone.length < 7 ||
+        this.deptBudgetList.sellerPhone.length > 20
+      ) {
+        this.$message({
+          message: '卖方联络人电话输入有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.transactionsNumberHand) {
+        this.$message({
+          message: '成交数量不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+
+      if (
+        isNaN(this.deptBudgetList.transactionsNumberHand) ||
+        (String(this.deptBudgetList.transactionsNumberHand).indexOf('.') !=
+          -1 &&
+          String(this.deptBudgetList.transactionsNumberHand).length -
+            (String(this.deptBudgetList.transactionsNumberHand).indexOf('.') +
+              1) >
+            2) ||
+        this.deptBudgetList.transactionsNumberHand < 1 ||
+        this.deptBudgetList.transactionsNumberHand > 10000
+      ) {
+        this.$message({
+          message: '输入成交数量有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.transactionPrice < 0 ||
+        this.deptBudgetList.transactionPrice > 100000000 ||
+        (String(this.deptBudgetList.transactionPrice).indexOf('.') != -1 &&
+          String(this.deptBudgetList.transactionPrice).length -
+            (String(this.deptBudgetList.transactionPrice).indexOf('.') + 1) >
+            2)
+      ) {
+        this.$message({
+          message: '成交价格输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.deptBudgetList.transactionPrice) {
+        if (isNaN(this.deptBudgetList.transactionPrice)) {
+          this.$message({
+            message: '成交价格输入错误!',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      if (!this.deptBudgetList.transactionPrice) {
+        this.$message({
+          message: '成交价格不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.transactionDate) {
+        this.$message({
+          message: '成交日期不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid #cdd2dc;
+  border-bottom: 1px solid #cdd2dc;
+}
+.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;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.readonly {
+  position: relative;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid #cdd2dc;
+  background: #fafbfc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+  background: #f0f2f6;
+  // border: 1px solid #cdd2dc;
+}
+.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;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.shangchuan {
+  margin-left: 22px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 16px 0px;
+}
+.wenzi {
+  width: 70%;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+}
+.center {
+  width: 70%;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 70%;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      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;
+    }
+  }
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 130px;
+}
+//*号
+.unchangeable {
+  position: absolute;
+  width: 9px;
+  height: 22px;
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #ff2727;
+  line-height: 22px;
+  display: inline-block;
+  right: 14px;
+}
+/deep/.el-input,
+/deep/.el-date-editor {
+  font-size: 13px;
+}
+/deep/.el-textarea {
+  width: 101%;
+  margin: 0px;
+}
+/deep/el-date-editor--date {
+  width: 200px;
+}
+.unchanged {
+  position: absolute;
+  left: 37px;
+  width: 102px;
+  height: 14px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #afb5cb;
+  line-height: 14px;
+}
+/deep/.el-input--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+}
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    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;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.addressUrls {
+  width: 100%;
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrls-item {
+  position: relative;
+  display: flex;
+}
+.icon-guanbi {
+  position: absolute;
+  right: 8px;
+}
+.addressUrl {
+  margin: 0px 10px;
+  border-radius: 3px;
+}
+//上传文件成功标识
+/deep/.el-upload-list__item-status-label {
+  position: absolute;
+  right: 22px;
+  top: -1px;
+  line-height: inherit;
+  display: none;
+}
+</style>

src/views/contractManagement/priceConfirmationSheetEdit.vue

@@ -0,0 +1,800 @@
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">编辑点价确认单</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertion-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <div class="wenzi">
+      <h3>所属合同</h3>
+      <p>
+        &nbsp;&nbsp;采购合同(
+        <template>{{ this.deptBudgetList.contractNo }}</template>
+        )
+      </p>
+    </div>
+    <div class="center">
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <!--基本信息-->
+
+        <ws-info-table>
+          <!--点价单编号-->
+          <ws-form-item
+            label="点价单编号"
+            span="1"
+            prop="priceListNo"
+            class="readonly"
+          >
+            <ws-input
+              v-model="deptBudgetList.priceListNo"
+              placeholder="请输入点价单编号"
+              maxlength="20"
+              size="small"
+              :rules="ruleDeptBudget"
+            />
+          </ws-form-item>
+
+          <!--点价单附件-->
+          <ws-form-item label="点价单附件" span="1" prop="priceListNo">
+            <el-upload
+              class="upload-demo"
+              action="https://www.zthymaoyi.com/upload/admin"
+              :on-success="
+                (res, file) => {
+                  uploadSuccessHandle(res)
+                }
+              "
+              multiple
+              :limit="3"
+              :file-list="fileList"
+            >
+              <el-button size="small" type="primary">附件</el-button>
+            </el-upload>
+            <div class="shangchuan">
+              <template>
+                <span v-if="deptBudgetList.enclosureTypeFlag == '0'"
+                  >未上传</span
+                >
+                <span v-if="deptBudgetList.enclosureTypeFlag == '1'"
+                  >已上传</span
+                >
+              </template>
+            </div>
+          </ws-form-item>
+
+          <!--品种合约及方向-->
+          <ws-form-item
+            label="品种合约及方向"
+            span="1"
+            prop="varietyContractDirection"
+            class="readonly"
+          >
+            <ws-input
+              v-model="deptBudgetList.varietyContractDirection"
+              placeholder="请输入品种合约及方向"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--买方联络人-->
+          <ws-form-item label="买方联络人" span="1" prop="buyer">
+            <ws-input
+              v-model="deptBudgetList.buyer"
+              placeholder="请输入买方联络人"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--成交数量-->
+          <ws-form-item
+            label="成交数量"
+            span="1"
+            prop="transactionsNumberHand"
+            class="readonly"
+          >
+            <ws-input
+              @input="transactionsNumberHandChange"
+              v-model="deptBudgetList.transactionsNumberHand"
+              placeholder="请输入"
+              maxlength="100"
+              size="small"
+            />&nbsp;&nbsp;&nbsp;手&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;即&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <ws-input
+              readonly="readonly"
+              v-model="deptBudgetList.transactionsNumber"
+              placeholder="自动计算"
+              maxlength="100"
+              size="small"
+            />&nbsp;&nbsp;&nbsp;吨
+          </ws-form-item>
+
+          <!--买方联络人电话-->
+          <ws-form-item label="买方联络人电话" span="1" prop="buyerPhone">
+            <ws-input
+              v-model="deptBudgetList.buyerPhone"
+              placeholder="请输入买方联络人电话"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--成交价格(元/吨)-->
+          <ws-form-item label="成交价格(元/吨)" span="1" prop="transactionPrice">
+            <ws-input
+              v-model="deptBudgetList.transactionPrice"
+              placeholder="请输入成交价格"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--卖方联络人-->
+          <ws-form-item label="卖方联络人" span="1" prop="seller">
+            <ws-input
+              v-model="deptBudgetList.seller"
+              placeholder="请输入卖方联络人"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--成交日期-->
+          <ws-form-item label="成交日期" span="1" prop="transactionDate">
+            <ws-date-picker
+              v-model="deptBudgetList.transactionDate"
+              type="date"
+              placeholder="请选择成交日期"
+              value-format="yyyy-MM-dd"
+            />
+          </ws-form-item>
+
+          <!--卖方联络人电话-->
+          <ws-form-item label="卖方联络人电话" span="1" prop="sellerPhone">
+            <ws-input
+              v-model="deptBudgetList.sellerPhone"
+              placeholder="请输入卖方联络人电话"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--备注-->
+          <ws-form-item label="备注" span="1" prop="remarks">
+            <ws-input
+              v-model="deptBudgetList.remarks"
+              placeholder="请输入备注,不超过200字"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
+      </ws-form>
+    </div>
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >提交</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+//  import { getVesselOne } from '@/model/procurement/basic'
+//  import { dayjs } from 'base-core-lib'
+import {
+  addList,
+  xiala,
+  addxiala,
+  editxiala,
+  delxiala,
+} from '@/model/contarct/index'
+import WsUpload from '@/components/WsUpload'
+import { regionData, CodeToText } from 'element-china-area-data'
+
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      options_: regionData,
+      selectedOptions: [],
+      selectedOptions1: [],
+      // 提交类型
+      submitType: true,
+      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
+      trainingMethods: {},
+      packtypeList: [],
+      mainReportAdd: {},
+      appendixIdsAdd: '',
+      size: 10,
+
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      enclosureTypeFlag: '0',
+      unitList: [],
+      goodnameList: [],
+      gradeList: [],
+      ChapterTwoList: [],
+      addressUrls: [],
+      deptBudgetList: {
+        deliverType: '1',
+        finalTradingVolume: 0,
+        contractGoodsInfo: {
+          goodsName: '',
+        },
+        contractProcessInfo: {},
+        addressUrl: '',
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      ruleDeptBudget: {
+        contractNo: [
+          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          {
+            min: 6,
+            max: 20,
+            message: '长度在 6 到 20 个字符',
+            trigger: 'blur',
+          },
+        ],
+      },
+      selectIntendedShip: {},
+      interviewTypeList: {},
+      fileList: [],
+    }
+  },
+  methods: {
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    handleChange1(value) {
+      this.selectedOptions1 = value
+    },
+    returnsales() {
+      this.$router.push({ path: 'priceConfirmationSheet' })
+    },
+
+    // 上传附件
+    uploadSuccessHandle(e) {
+      this.addressUrls.push(e.url)
+      this.deptBudgetList.addressUrl = this.addressUrls.toString
+    },
+    onChange(files) {
+      this.fileNum = files
+      this.$refs.upload.handleSaveBill().then((res) => {
+        console.log(files)
+      })
+    },
+    //计算成交数量(吨)
+    transactionsNumberHandChange(e) {
+      this.deptBudgetList.transactionsNumber = e * 10 
+    },
+    getUnitList() {
+      xiala({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        constCode: 'TYPEYAN',
+      })
+        .toPromise()
+        .then((response) => {
+          this.unitList = response
+          let currItem
+          this.unitList.forEach((item, index, arr) => {
+            item.flag = 'delete'
+            if (this.vModel == item.constKey) {
+              currItem = item
+            }
+          })
+          //
+          if (currItem) {
+            this.selectContract(currItem.constValue)
+          }
+        })
+    },
+
+    submit() {
+      if (!this.deptBudgetList.priceListNo) {
+        this.$message({
+          message: '点价单编号不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.priceListNo.length < 1 ||
+        this.deptBudgetList.priceListNo.length > 20
+      ) {
+        this.$message({
+          message: '点价单编号输入错误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.varietyContractDirection) {
+        this.$message({
+          message: '品种合约及方向不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.varietyContractDirection.length < 1 ||
+        this.deptBudgetList.varietyContractDirection.length > 20
+      ) {
+        this.$message({
+          message: '品种合约及方向输入错误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.buyer) {
+        this.$message({
+          message: '买方联络人不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.buyer.length < 2 ||
+        this.deptBudgetList.buyer.length > 20
+      ) {
+        this.$message({
+          message: '买方联络人姓名输入错误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.buyerPhone) {
+        this.$message({
+          message: '买方联络人电话不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.buyerPhone.length < 7 ||
+        this.deptBudgetList.buyerPhone.length > 20
+      ) {
+        this.$message({
+          message: '买方联络人电话输入错误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (isNaN(this.deptBudgetList.buyerPhone)) {
+        this.$message({
+          message: '卖方联络人电话输入有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.seller) {
+        this.$message({
+          message: '卖方联络人不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.seller.length < 2 ||
+        this.deptBudgetList.seller.length > 20
+      ) {
+        this.$message({
+          message: '卖方联络人姓名输入错误!',
+          type: 'warning',
+        })
+        return
+      }
+
+      if (!this.deptBudgetList.sellerPhone) {
+        this.$message({
+          message: '卖方联络人电话不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (isNaN(this.deptBudgetList.sellerPhone)) {
+        this.$message({
+          message: '卖方联络人电话输入有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.sellerPhone.length < 7 ||
+        this.deptBudgetList.sellerPhone.length > 20
+      ) {
+        this.$message({
+          message: '卖方联络人电话输入有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.transactionsNumberHand) {
+        this.$message({
+          message: '成交数量不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+
+      if (
+        isNaN(this.deptBudgetList.transactionsNumberHand) ||
+        (String(this.deptBudgetList.transactionsNumberHand).indexOf('.') !=
+          -1 &&
+          String(this.deptBudgetList.transactionsNumberHand).length -
+            (String(this.deptBudgetList.transactionsNumberHand).indexOf('.') +
+              1) >
+            2) ||
+        this.deptBudgetList.transactionsNumberHand < 1 ||
+        this.deptBudgetList.transactionsNumberHand > 10000
+      ) {
+        this.$message({
+          message: '输入成交数量有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.transactionPrice < 0 ||
+        this.deptBudgetList.transactionPrice > 100000000 ||
+        (String(this.deptBudgetList.transactionPrice).indexOf('.') != -1 &&
+          String(this.deptBudgetList.transactionPrice).length -
+            (String(this.deptBudgetList.transactionPrice).indexOf('.') + 1) >
+            2)
+      ) {
+        this.$message({
+          message: '成交价格输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.deptBudgetList.transactionPrice) {
+        if (isNaN(this.deptBudgetList.transactionPrice)) {
+          this.$message({
+            message: '成交价格输入错误!',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      if (!this.deptBudgetList.transactionPrice) {
+        this.$message({
+          message: '成交价格不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.transactionDate) {
+        this.$message({
+          message: '成交日期不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid #cdd2dc;
+  border-bottom: 1px solid #cdd2dc;
+}
+.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;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.readonly {
+  position: relative;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid #cdd2dc;
+  background: #fafbfc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+  background: #f0f2f6;
+  // border: 1px solid #cdd2dc;
+}
+.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;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.shangchuan {
+  margin-left: 22px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 16px 0px;
+}
+.wenzi {
+  width: 70%;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+}
+.center {
+  width: 70%;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 70%;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      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;
+    }
+  }
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 130px;
+}
+//*号
+.unchangeable {
+  position: absolute;
+  width: 9px;
+  height: 22px;
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #ff2727;
+  line-height: 22px;
+  display: inline-block;
+  right: 14px;
+}
+/deep/.el-input,
+/deep/.el-date-editor {
+  font-size: 13px;
+}
+/deep/.el-textarea {
+  width: 101%;
+  margin: 0px;
+}
+/deep/el-date-editor--date {
+  width: 200px;
+}
+.unchanged {
+  position: absolute;
+  left: 37px;
+  width: 102px;
+  height: 14px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #afb5cb;
+  line-height: 14px;
+}
+/deep/.el-input--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+}
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    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;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.addressUrls {
+  width: 100%;
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrls-item {
+  position: relative;
+  display: flex;
+}
+.icon-guanbi {
+  position: absolute;
+  right: 8px;
+}
+.addressUrl {
+  margin: 0px 10px;
+  border-radius: 3px;
+}
+//上传文件成功标识
+/deep/.el-upload-list__item-status-label {
+  position: absolute;
+  right: 22px;
+  top: -1px;
+  line-height: inherit;
+  display: none;
+}
+</style>

src/views/customer/customerList.vue

@@ -3,7 +3,6 @@
   <div>
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left"> </template>
-      <!-- 接单开始 -->
       <template slot="left">
         <ws-input
           v-model="searchKeyWord"
@@ -13,7 +12,6 @@
           type="input"
           class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
@@ -27,86 +25,125 @@
             src="../../../public/img/sousuo.png"
             alt=""
         /></ws-button>
-        <el-button class="bg-bottom" type="primary" size="small" @click="installRatio()"
-        >默认定金比例</el-button
-      >
-      <WinseaContentModal
-      v-model="outerVisibleEdit"
-      title="设置默认定金比例"
-      @on-cancel="handleClose"
-    >
-    
-    <div style="width:90%">
-      <div class="dingjin">定金比例(元/吨)</div> 
-      <el-input
-        type="textarea"
-        :rows="2"
-        maxlength="30"
-        placeholder="请输入定金比例"
-        v-model="auditMindEdit"
-      >
-      </el-input>
-      </div>
-      <div class="dialog-footer">
-        <el-button @click="outerVisibleEdit = false">取 消</el-button>
-        <el-button type="primary" @click="editDepositRatio()">确定</el-button>
-      </div>
-    </WinseaContentModal>
 
-<!--增加定金-->
-      <WinseaContentModal
-      v-model="outerVisibleAdd"
-      title="增加定金"
-      @on-cancel="handleClose"
-    >
-    <div class="addprice">已付定金</div> 
-     <div class="addpricejine">增加金额</div>
-    <div style="width:90%" class="zengjia">
-     
-      <el-input
-        type="textarea"
-        :rows="2"
-        maxlength="30"
-        placeholder="请输入本次增加定金金额"
-        v-model="auditMindAdd"
-      >
-      </el-input>
-    <div class="yuan">元</div>
-      </div>
-     
-      <div class="dialog-footer">
-        <el-button @click="outerVisibleAdd = false">取 消</el-button>
-        <el-button type="primary" @click="editPrice(0)">确定</el-button>
-      </div>
-    </WinseaContentModal>
+        <!--设置默认定金比例-->
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="installRatio()"
+        >
+          默认定金比例</el-button
+        >
+        <WinseaContentModal
+          v-model="outerVisibleDefaultEdit"
+          title="设置默认定金比例"
+          @on-cancel="handleClose"
+        >
+          <div style="width: 90%">
+            <div class="dingjin">定金比例(元/吨)</div>
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入定金比例"
+              v-model="depositRatio"
+            >
+            </el-input>
+          </div>
+          <div class="dialog-footer">
+            <el-button @click="outerVisibleDefaultEdit = false"
+              >取 消</el-button
+            >
+            <el-button type="primary" @click="editDepositRatio()"
+              >确定</el-button
+            >
+          </div>
+        </WinseaContentModal>
 
-    <!--退回定金-->
-      <WinseaContentModal
-      v-model="outerVisibleReturn"
-      title="退回定金"
-      @on-cancel="handleClose"
-    >
-    <div class="returnprice">可退定金</div> 
-     <div class="returnpricejine">退回金额</div>
-    <div style="width:90%" class="tuihui">
-      <el-input
-        type="textarea"
-        :rows="2"
-        maxlength="30"
-        placeholder="请输入本次退回定金金额"
-        v-model="auditMindReturn"
-      >
-      </el-input>
-    <div class="yuan">元</div>
-      </div>
-     
-      <div class="dialog-footer">
-        <el-button @click="outerVisibleReturn = false">取 消</el-button>
-        <el-button type="primary" @click="editPrice(1)">确定</el-button>
-      </div>
-    </WinseaContentModal>
-      </template>
+        <!--修改定金比例-->
+        <WinseaContentModal
+          v-model="outerVisibleEdit"
+          title="修改定金比例"
+          @on-cancel="handleClose"
+        >
+          <div style="width: 90%" class="xiugai">
+            <el-input
+              type="textarea"
+              :rows="2"
+              maxlength="30"
+              placeholder="请输入定金比例"
+              v-model="depositRatio"
+            >
+            </el-input>
+          </div>
+          <div class="dialog-footer">
+            <el-button @click="outerVisibleEdit = false">取 消</el-button>
+            <el-button type="primary" @click="editPrice(0)">确定</el-button>
+          </div>
+        </WinseaContentModal>
+
+        <!--增加定金-->
+        <WinseaContentModal
+          v-model="outerVisibleAdd"
+          title="增加定金"
+          @on-cancel="handleClose"
+        >
+          <div class="addprice">
+            已付定金
+            <div class="yifudingjin">
+              <template> {{ this.totalDeposit }} 元 </template>
+            </div>
+          </div>
+          <div class="addpricejine">增加金额</div>
+          <div style="width: 90%" class="zengjia">
+            <el-input
+              type="textarea"
+              :rows="2"
+              maxlength="30"
+              placeholder="请输入本次增加定金金额"
+              v-model="money"
+            >
+            </el-input>
+            <div class="yuan">元</div>
+          </div>
+          <div class="dialog-footer">
+            <el-button @click="outerVisibleAdd = false">取 消</el-button>
+            <el-button type="primary" @click="editPrice(1)">确定</el-button>
+          </div>
+        </WinseaContentModal>
 
+        <!--退回定金-->
+        <WinseaContentModal
+          v-model="outerVisibleReturn"
+          title="退回定金"
+          @on-cancel="handleClose"
+        >
+          <div class="returnprice">
+            可退定金
+            <div class="ketuidingjin">
+              <template>
+                {{ this.totalDeposit - this.freezingDeposit }} 元
+              </template>
+            </div>
+          </div>
+          <div class="returnpricejine">退回金额</div>
+          <div style="width: 90%" class="tuihui">
+            <el-input
+              type="textarea"
+              :rows="2"
+              maxlength="30"
+              placeholder="请输入本次退回定金金额"
+              v-model="money"
+            >
+            </el-input>
+            <div class="yuan">元</div>
+          </div>
+          <div class="dialog-footer">
+            <el-button @click="outerVisibleReturn = false">取 消</el-button>
+            <el-button type="primary" @click="editPrice(2)">确定</el-button>
+          </div>
+        </WinseaContentModal>
+      </template>
     </BaseHeaderLayout>
     <div>
       <el-table
@@ -122,38 +159,71 @@
           </template>
         </el-table-column>
         <el-table-column prop="customerName" label="客户名称">
-            <template scope="scope">
-            <span v-if="scope.row.customerName == '' || scope.row.customerName == null">{{scope.row.compName}}</span>
-             <span v-if="scope.row.compName == '' || scope.row.compName == null">{{scope.row.customerName}}</span>
+          <template scope="scope">
+            <span
+              v-if="
+                scope.row.customerName == '' || scope.row.customerName == null
+              "
+              >{{ scope.row.compName }}</span
+            >
+            <span
+              v-if="scope.row.compName == '' || scope.row.compName == null"
+              >{{ scope.row.customerName }}</span
+            >
           </template>
         </el-table-column>
         <el-table-column prop="compAddress" label="地址"></el-table-column>
         <el-table-column prop="customerPhone" label="电话"> </el-table-column>
-        <el-table-column prop="payTaxesCard" label="纳税人识别号"> </el-table-column>
-        <el-table-column prop="bankDeposit" label="开户行"> </el-table-column>
+        <el-table-column prop="payTaxesCard" label="纳税人识别号">
+          <template scope="scope">
+            <span
+              v-if="
+                scope.row.payTaxesCard == '' || scope.row.payTaxesCard == null
+              "
+            >
+              — —
+            </span>
+            {{ scope.row.payTaxesCard }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="bankDeposit" label="开户行">
+          <template slot-scope="scope">
+            {{ scope.row.bankDeposit }} - {{ scope.row.bankDepositBranch }}
+          </template>
+        </el-table-column>
         <el-table-column prop="bankCard" label="银行卡号"> </el-table-column>
-        <el-table-column prop="totalDeposit" label="总定金(元)"> </el-table-column>
-        <el-table-column prop="freezingDeposit" label="冻结定金(元)"> </el-table-column>
+        <el-table-column prop="totalDeposit" label="总定金(元)">
+        </el-table-column>
+        <el-table-column prop="freezingDeposit" label="冻结定金(元)">
+        </el-table-column>
         <el-table-column prop="depositRatio" label="定金比例(元/吨)">
           <template slot-scope="scope">
-            {{scope.row.depositRatio}}
+            {{ scope.row.depositRatio }}
             <img
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
-              @click="editClick(scope.row)"
+              @click="editClick(0, scope.row)"
               alt=""
             />
           </template>
         </el-table-column>
         <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
-        <el-table-column prop="seller" label="操作" width="280" >
-          <template>
-            <el-button class="find" type="primary" @click="editClick(1)"
-          >增加定金</el-button>
-            <el-button class="find" type="primary" @click="editClick(2)"
-          >退回定金</el-button>
+        <el-table-column prop="seller" label="操作" width="280">
+          <template slot-scope="scope">
+            <el-button
+              class="find"
+              type="primary"
+              @click="editClick(1, scope.row)"
+              >增加定金</el-button
+            >
+            <el-button
+              class="find"
+              type="primary"
+              @click="editClick(2, scope.row)"
+              >退回定金</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -170,15 +240,14 @@
   </div>
 </template>
 <script>
-import { 
+import {
   getList,
   installDepositRatio,
-  editCustomerInfo
+  editCustomerInfo,
 } from '@/model/customer/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 
-import { billoperatehis } from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -210,6 +279,7 @@ export default {
       pageSize: 10,
       deptBudgetTotal: 0,
       searchKeyWord: '',
+      outerVisibleDefaultEdit: false,
       outerVisibleEdit: false,
       outerVisibleAdd: false,
       outerVisibleReturn: false,
@@ -219,9 +289,9 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
-      auditMindEdit: '',
-      auditMindAdd: '',
-      auditMindReturn: '',
+      depositRatio: '',
+      id: '',
+      money: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       customerList: [],
@@ -233,6 +303,17 @@ export default {
         },
       },
       accessoryTFs: false,
+      customerInfo: {
+        id: '',
+        compId: '',
+        depositRatio: '',
+        flag: '',
+        money: '',
+        totalDeposit: 0,
+        freezingDeposit: 0,
+      },
+      totalDeposit: 0,
+      freezingDeposit: 0,
     }
   },
   activated() {
@@ -240,35 +321,6 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    //设置默认定金比例
-    installRatio(){
-      // installDepositRatio({
-      //     compId: sessionStorage.getItem('ws-pf_compId'),
-      //     depositRatio:this.depositRatio,
-      // })
-      this.outerVisibleEdit = true
-    },
-    editDepositRatio(){
-      installDepositRatio({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-       depositRatio:this.depositRatio,
-      })
-        .toPromise()
-        .then((response) => {
-          // this.deptCircularPage.currentPage = response.current
-          // this.deptCircularPage.pageSize = response.size
-          // this.deptBudgetTotal = response.total
-          // this.customerList = response
-          console.log('成功')
-        })
-      if (!this.auditMindEdit) {
-        this.$message({
-          message: '默认定金比例不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-    },
     //查看//传参
     nocomplete(row) {
       this.$router.push({
@@ -317,6 +369,7 @@ export default {
       this.searchType = state
       this.getList()
     },
+    //列表查询
     getList() {
       getList({
         compId: sessionStorage.getItem('ws-pf_compId'),
@@ -333,61 +386,208 @@ export default {
           this.customerList = response
         })
     },
-    editClick(index) {
-      editCustomerInfo({
-          
-      })
-      .toPromise()
-        .then((response) => {
-          // this.deptCircularPage.currentPage = response.current
-          // this.deptCircularPage.pageSize = response.size
-          // this.deptBudgetTotal = response.total
-          // this.customerList = response
-          console.log('成功')
+    //设置默认定金比例
+    installRatio() {
+      this.outerVisibleDefaultEdit = true
+    },
+    editDepositRatio() {
+      if (
+        this.depositRatio < 1 ||
+        this.depositRatio > 100000 ||
+        (String(this.depositRatio).indexOf('.') != -1 &&
+          String(this.depositRatio).length -
+            (String(this.depositRatio).indexOf('.') + 1) >
+            2)
+      ) {
+        this.$message({
+          message: '默认定金比例输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.depositRatio) {
+        if (isNaN(this.depositRatio)) {
+          this.$message({
+            message: '默认定金比例非数字!',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.depositRatio) {
+          this.$message({
+            message: '默认定金比例不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        installDepositRatio({
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          depositRatio: this.depositRatio,
         })
+          .toPromise()
+          .then((response) => {
+            this.outerVisibleDefaultEdit = false
+            this.getList()
+            this.$message.success('设置默认定金比例成功')
+          })
+      }
+    },
+    //编辑
+    editClick(index, row) {
+      this.id = row.id
+      this.depositRatio = row.depositRatio
+      this.totalDeposit = row.totalDeposit
+      this.freezingDeposit = row.freezingDeposit
+
       //更改定金比例
-      if(index == 0){
-          this.outerVisibleEdit = true
+      if (index == 0) {
+        this.outerVisibleEdit = true
+        this.customerInfo.flag = 0
       }
       //增加定金
-      else if(index == 1){
-          this.outerVisibleAdd = true
+      else if (index == 1) {
+        this.outerVisibleAdd = true
+        this.customerInfo.flag = 1
       }
       //退回定金
-      else{
+      else {
         this.outerVisibleReturn = true
+        this.customerInfo.flag = 2
       }
     },
-    editPrice(asdf){
+    editPrice(asdf) {
+      this.customerInfo.id = this.id
+      this.customerInfo.compId = this.compId
+      this.customerInfo.depositRatio = this.depositRatio
+      this.customerInfo.money = this.money
+      this.customerInfo.totalDeposit = this.totalDeposit
+      this.customerInfo.freezingDeposit = this.freezingDeposit
+      //修改定金比例
+      if (asdf == 0) {
+        if (
+          this.depositRatio < 0 ||
+          this.depositRatio > 100000 ||
+          (String(this.depositRatio).indexOf('.') != -1 &&
+            String(this.depositRatio).length -
+              (String(this.depositRatio).indexOf('.') + 1) >
+              2)
+        ) {
+          this.$message({
+            message: '定金比例输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.depositRatio) {
+          if (isNaN(this.depositRatio)) {
+            this.$message({
+              message: '定金比例非数字!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (!this.depositRatio) {
+          this.$message({
+            message: '定金比例不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+      }
       //增加定金
-        if(asdf == 0){
-            if (!this.auditMindAdd) {
-              this.$message({
-              message: '增加金额不能为空！',
+      else if (asdf == 1) {
+        if (
+          this.money < 0 ||
+          this.money > 100000000 ||
+          (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(asdf == 1){
-          if (!this.auditMindOneReturn) {
+      if (asdf == 2) {
+        if (
+          this.money < 0 ||
+          this.money > 100000000 ||
+          (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.totalDeposit - this.freezingDeposit) {
+          this.$message({
+            message: '退回金额不能大于可退金额！',
+            type: 'warning',
+          })
           return
         }
       }
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
+      editCustomerInfo(this.customerInfo)
         .toPromise()
         .then((response) => {
-          this.historyList = response
+          this.outerVisibleAdd = false
+          this.outerVisibleReturn = false
+          this.outerVisibleEdit = false
+          this.getList()
+          //修改定金比例
+          if (asdf == 0) {
+            this.$message.success('修改定金比例成功')
+          }
+          //增加定金
+          else if (asdf == 1) {
+            this.$message.success('增加成功')
+          }
+          //退回定金
+          if (asdf == 2) {
+            this.$message.success('退回成功')
+          }
         })
     },
-     find() {
+    find() {
       this.currentPage = 1
       this.getList()
     },
@@ -505,10 +705,9 @@ export default {
 }
 .el-input--small .el-input__inner {
   margin-left: 20px;
-  
 }
-.dialog-footer{
-  margin-top: 21px;
+.dialog-footer {
+  margin-top: 33px;
 }
 .el-range-editor--small.el-input__inner {
   height: 32px;
@@ -526,81 +725,110 @@ export default {
   width: 30%;
   margin-right: 10px;
 }
+/deep/.zengjia .el-textarea__inner {
+  display: block;
+  padding: 13px 17px;
+  line-height: 0.5;
+  box-sizing: border-box;
+  width: 80%;
+  font-size: inherit;
+  color: #606266;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  margin-left: 180px;
+}
 
-
-/deep/.zengjia .el-textarea__inner{
-display: block;
-    padding: 13px 17px;
-    line-height: 0.5;
-    box-sizing: border-box;
-    width: 80%;
-    font-size: inherit;
-    color: #606266;
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #dcdfe6;
-    border-radius: 4px;
-    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
-    margin-left: 180px;
+/deep/.xiugai .el-textarea__inner {
+  display: block;
+  padding: 13px 17px;
+  line-height: 0.5;
+  box-sizing: border-box;
+  width: 105%;
+  font-size: inherit;
+  color: #606266;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  margin-left: 0px;
 }
 
-/deep/.tuihui .el-textarea__inner{
-display: block;
-    padding: 13px 17px;
-    line-height: 0.5;
-    box-sizing: border-box;
-    width: 80%;
-    font-size: inherit;
-    color: #606266;
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #dcdfe6;
-    border-radius: 4px;
-    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
-    margin-left: 180px;
-}
-/deep/.dingjin{
+/deep/.tuihui .el-textarea__inner {
+  display: block;
+  padding: 13px 17px;
+  line-height: 0.5;
+  box-sizing: border-box;
+  width: 80%;
+  font-size: inherit;
+  color: #606266;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  margin-left: 180px;
+}
+/deep/.dingjin {
   width: 98px;
   margin-left: 30px;
+  margin-bottom: -37px;
+  padding-top: 20px;
+}
+/deep/.el-textarea__inner {
+  display: block;
+  padding: 13px 17px;
+  line-height: 0.5;
+  box-sizing: border-box;
+  width: 90%;
+  font-size: inherit;
+  color: #606266;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  margin-left: 180px;
 }
-/deep/.el-textarea__inner{
-display: block;
-    padding: 13px 17px;
-    line-height: 0.5;
-    box-sizing: border-box;
-    width: 90%;
-    font-size: inherit;
-    color: #606266;
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #dcdfe6;
-    border-radius: 4px;
-    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
-    margin-left: 180px;
-}
-/deep/.addprice{
+/deep/.addprice {
   width: 98px;
   margin-left: 50px;
 }
-/deep/.returnprice{
+/deep/.returnprice {
   width: 98px;
   margin-left: 50px;
 }
-/deep/.yuan{
-    width: 10px;
-    margin-left: 1400px;
-    margin-top: -36px;
+/deep/.yuan {
+  width: 10px;
+  margin-left: 1400px;
+  margin-top: -36px;
 }
-/deep/.addpricejine{
+/deep/.addpricejine {
   width: 98px;
   margin-left: 50px;
+  margin-bottom: -37px;
+  padding-top: 20px;
 }
-/deep/.returnpricejine{
+/deep/.returnpricejine {
   width: 98px;
   margin-left: 50px;
+  margin-bottom: -37px;
+  padding-top: 20px;
 }
 /deep/.typeselect .el-input__inner {
   color: #8890b1;
 }
-
+/deep/.yifudingjin {
+  margin-left: 135px;
+  width: 70px;
+  margin-top: -31px;
+}
+/deep/.ketuidingjin {
+  margin-left: 135px;
+  width: 70px;
+  margin-top: -31px;
+}
 </style>

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

@@ -1,14 +1,14 @@
 import Layout from '@/layout/index';
 
 const platformauditRouter = {
-    path: '/transportationTask/transportation',
+    path: '/platformaudit',
     component: Layout,
     redirect: '/platformaudit',
     name: 'platformaudit',
     alwaysShow: true, // will always show the root menu
     meta: {
       title: 'platformaudit',
-      module: 'transportationTask.transportation',
+      module: 'warehouseManagement.warehouse.warehouseInfo',
       icon: '-shenhe'
     },
     children: [
@@ -22,7 +22,7 @@ const platformauditRouter = {
         meta: {
           title: 'grainmerchantreview',
           shortcutEntrance: 'grainmerchantreview',
-          module: 'transportationTask.transportation.fireDispatching',
+          module: 'warehouseManagement.warehouse.warehouseInfo',
           permissicon: [],
           keepAlive: true
         },
@@ -37,7 +37,7 @@ const platformauditRouter = {
         meta: {
           title: 'driverreview',
           shortcutEntrance: 'driverreview',
-          module: 'transportationTask.transportation.fireDispatching',
+          module: 'warehouseManagement.warehouse.warehouseInfo',
           permissicon: [],
           keepAlive: true
         },
@@ -52,7 +52,7 @@ const platformauditRouter = {
         meta: {
           title: 'transactioninformationreview',
           shortcutEntrance: 'transactioninformationreview',
-          module: 'transportationTask.transportation.fireDispatching',
+          module: 'warehouseManagement.warehouse.warehouseInfo',
           permissicon: [],
           keepAlive: true
         },

src/views/platformaudit/driverreview.vue

@@ -11,7 +11,7 @@
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
-          @change="selecttaskType"
+          @change="selectExamineType"
           :value="searchType"
         >
           <ws-option
@@ -147,13 +147,13 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="driverName" label="姓名" width="80">
+        <el-table-column prop="driverName" label="姓名" >
         </el-table-column>
-        <el-table-column prop="numberCard" label="身份证号" width="200">
+        <el-table-column prop="numberCard" label="身份证号" >
         </el-table-column>
-        <el-table-column prop="driverPhone" label="手机号" width="100">
+        <el-table-column prop="driverPhone" label="手机号" >
         </el-table-column>
-        <el-table-column prop="carNumber" label="车牌号" width="160">
+        <el-table-column prop="carNumber" label="车牌号" >
           <template scope="scope">
             <ws-select
               v-model="scope.row.carNumber"
@@ -170,23 +170,23 @@
             </ws-select>
           </template>
         </el-table-column>
-        <el-table-column prop="carModel" label="车型" width="100">
+        <el-table-column prop="carModel" label="车型" >
         </el-table-column>
-        <el-table-column prop="carLength" label="车长(米)" width="100">
+        <el-table-column prop="carLength" label="车长(米)" >
         </el-table-column>
-        <el-table-column prop="carLoad" label="载重(吨)" width="100">
+        <el-table-column prop="carLoad" label="载重(吨)" >
         </el-table-column>
-        <el-table-column prop="yearManufacture" label="出厂年份" width="100">
+        <el-table-column prop="yearManufacture" label="出厂年份" >
         </el-table-column>
-        <el-table-column prop="binNumber" label="常驻城市" width="140">
+        <el-table-column prop="binNumber" label="常驻城市" >
           <template slot-scope="scope">
             {{ scope.row.residentCityProvincial
             }}{{ scope.row.residentCityMunicipal }}
           </template>
         </el-table-column>
-        <el-table-column prop="carModel" label="更新时间" width="140">
+        <el-table-column prop="updateDate" label="更新时间" width="140" >
         </el-table-column>
-        <el-table-column prop="addressUrl" label="证件照" width="80">
+        <el-table-column prop="addressUrl" label="证件照" >
           <template slot-scope="scope">
             <img
               width="18"
@@ -201,7 +201,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="账户信息" width="100">
+        <el-table-column label="账户信息" >
           <template slot-scope="scope">
             <el-button
               v-if="!scope.row.expandsStatus"
@@ -237,6 +237,7 @@
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.authenticationStatusKey==1"
               @click="reject(scope.row)"
               >驳回</el-button
             >
@@ -244,9 +245,13 @@
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.authenticationStatusKey==1"
               @click="adopt(scope.row)"
               >通过</el-button
             >
+            <template v-else slot-scope="scope"> 
+            {{ scope.row.authenticationStatus}}
+          </template>
           </template>
         </el-table-column>
       </el-table>
@@ -304,10 +309,8 @@
 </template>
 <script>
 import {
-  selectDriver,
-  billoperatehis,
-  delDriver,
-  disableDriver,
+  driverList,
+  getDriver,
 } from '@/model/platformaudit/index'
 import Pagination from '@/components/Pagination'
 import { provinceAndCityData, CodeToText } from 'element-china-area-data'
@@ -388,6 +391,10 @@ export default {
         { value: '已通过', type: 2 },
         { value: '全部', type: '' },
       ],
+      driverViewInfo:{
+        id: '',
+        flag: '',
+      },
     }
   },
   activated() {
@@ -423,12 +430,30 @@ export default {
         query: { id: row.id },
       })
     },
+    //查找
+    lookUp() {
+      this.currentPage = 1
+      this.getList()
+    },
+    handlestatus(status) {
+      this.searchType = status
+      if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else {
+        this.primary = 3
+      }
+      this.getList()
+    },
     selectcar(e, row) {
       console.log(e, row)
       for (var i = 0; i < row.driverCarInfoList.length; i++) {
         if (e == row.driverCarInfoList[i].carNumber) {
           row.carModel = row.driverCarInfoList[i].carModel
           row.carLength = row.driverCarInfoList[i].carLength
+          row.carLoad = row.driverCarInfoList[i].carLoad
+          row.yearManufacture = row.driverCarInfoList[i].yearManufacture
         }
       }
     },
@@ -438,13 +463,15 @@ export default {
     },
     //审核通过
     adopt(row) {
+      this.driverViewInfo.id = row.id
+      this.driverViewInfo.flag = 1
       this.$confirm(`确定通过该认证信息？`, '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          delDriver({ id: row.id })
+          getDriver(this.driverViewInfo)
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -464,13 +491,15 @@ export default {
     },
     //审核驳回  
     reject(row) {
+      this.driverViewInfo.id = row.id
+      this.driverViewInfo.flag = 2
       this.$confirm(`确定驳回该认证信息？`, '提示', {
         confirmButtonText: '驳回',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          delDriver({ id: row.id })
+          getDriver(this.driverViewInfo)
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -505,25 +534,19 @@ export default {
       this.getList()
     },
     getList() {
-      selectDriver({
+      driverList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
         id: this.id,
-        Flag: this.Flag,
+        flag: this.flag,
       })
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].expandsStatus = false
-            response.records[i].carNumber =
-              response.records[i].driverCarInfoList[0].carNumber
-            response.records[i].carModel =
-              response.records[i].driverCarInfoList[0].carModel
-            response.records[i].carLength =
-              response.records[i].driverCarInfoList[0].carLength
             if (response.records[i].addressUrl != null) {
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')
@@ -539,10 +562,12 @@ export default {
           this.driverList = response
         })
     },
-    selecttaskType(e) {
-      this.residentCityProvincial = CodeToText[e[0]]
-      this.residentCityMunicipal = CodeToText[e[1]]
-      // this.selectedOptions = e
+    selectExamineType(e) {
+      for (var i = 0; i < this.searchTypeList.length; i++) {
+        if (this.searchTypeList[i].value == e) {
+          this.searchType = this.searchTypeList[i].type
+        }
+      }
     },
     fujian(row) {
       if (row.addressUrl === null || row.addressUrl === '') {

src/views/platformaudit/grainmerchantreview.vue

@@ -11,7 +11,7 @@
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
-          @change="selecttaskType"
+          @change="selectExamineType"
           :value="searchType"
         >
           <ws-option
@@ -59,62 +59,69 @@
         <el-table-column type="expand">
           <template slot-scope="props">
             <ws-form>
-              <div v-for="item in props.row.driverPayeeInfoList">
-                <ws-info-table>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 1"
-                    label="收款人"
-                    span="1"
-                    prop="payeeName"
-                    class="el-car name"
-                  >
-                    <div style="width: 100%">{{ item.payeeName }}</div>
-                  </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 2"
-                    label="企业名称"
-                    span="1"
-                    prop="compName"
-                    class="el-car"
-                  >
-                    <div style="width: 100%">{{ item.compName }}</div>
-                  </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 1"
-                    label="身份证"
-                    span="1"
-                    prop="payeeNumberCard"
-                    class="el-car card"
-                  >
-                    <div style="width: 100%">
-                      {{ item.payeeNumberCard }}
-                      <img
-                        width="12"
-                        height="13"
-                        src="../../../public/img/fujian-grey.png"
-                        alt=""
-                        @click="fujian1(item)"
-                      />
-                    </div>
-                  </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    label="开户行"
-                    span="1"
-                    prop="bankDeposit"
-                    class="el-car"
-                  >
-                    <span
+              <ws-info-table>
+                <ws-form-item
+                  :class="
+                    props.row.customerTypeFlag == 1 ? 'personage' : 'company'
+                  "
+                  v-if="props.row.customerTypeFlag == 1"
+                  label="收款人"
+                  span="1"
+                  prop="payeeName"
+                  class="el-car name"
+                >
+                  <div style="width: 100%">{{ props.row.payeeName }}</div>
+                </ws-form-item>
+                <ws-form-item
+                  :class="
+                    props.row.customerTypeFlag == 1 ? 'personage' : 'company'
+                  "
+                  v-if="props.row.customerTypeFlag == 2"
+                  label="企业名称"
+                  span="1"
+                  prop="compName"
+                  class="el-car"
+                >
+                  <div style="width: 100%">{{ props.row.compName }}</div>
+                </ws-form-item>
+                <ws-form-item
+                  :class="
+                    props.row.customerTypeFlag == 1 ? 'personage' : 'company'
+                  "
+                  v-if="props.row.customerTypeFlag == 1"
+                  label="身份证"
+                  span="1"
+                  prop="payeeNumberCard"
+                  class="el-car card"
+                >
+                  <div style="width: 100%">
+                    {{ props.row.payeeNumberCard }}
+                    <img
+                      width="12"
+                      height="13"
+                      src="../../../public/img/fujian-grey.png"
+                      alt=""
+                      @click="fujian1(props.row)"
+                    />
+                  </div>
+                </ws-form-item>
+                <ws-form-item
+                  :class="
+                    props.row.customerTypeFlag == 1 ? 'personage' : 'company'
+                  "
+                  label="开户行"
+                  span="1"
+                  prop="bankDeposit"
+                  class="el-car"
+                >
+                  <span
                       style="
                         margin: 10px;
                         display: inline-block;
                         border-right: 1px solid #e9ecf7;
                         padding-right: 10px;
                       "
-                      >{{ item.bankDeposit }}</span
+                      >{{ props.row.bankDeposit }}</span
                     ><span
                       style="
                         margin: 10px;
@@ -124,20 +131,21 @@
                         line-height: 20px;
                         white-space: normal;
                       "
-                      >{{ item.bankDepositBranch }}</span
+                      >{{ props.row.bankDepositBranch }}</span
                     >
-                  </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    label="账号"
-                    span="1"
-                    prop="bankCard"
-                    class="el-car"
-                  >
-                    <div style="width: 100%">{{ item.bankCard }}</div>
-                  </ws-form-item>
-                </ws-info-table>
-              </div>
+                </ws-form-item>
+                <ws-form-item
+                  :class="
+                    props.row.customerTypeFlag == 1 ? 'personage' : 'company'
+                  "
+                  label="账号"
+                  span="1"
+                  prop="bankCard"
+                  class="el-car"
+                >
+                  <div style="width: 100%">{{ props.row.bankCard }}</div>
+                </ws-form-item>
+              </ws-info-table>
             </ws-form>
           </template>
         </el-table-column>
@@ -147,25 +155,16 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="driverName" label="类型" width="100">
+        <el-table-column prop="customerType" label="类型"> </el-table-column>
+        <el-table-column prop="customerName" label="姓名"> </el-table-column>
+        <el-table-column prop="customerNumberCard" label="身份证号">
         </el-table-column>
-        <el-table-column prop="driverName" label="姓名" width="100">
+        <el-table-column prop="customerPhone" label="手机号"> </el-table-column>
+        <el-table-column prop="payTaxesCard" label="纳税人识别号">
         </el-table-column>
-        <el-table-column prop="numberCard" label="身份证号" width="200">
-        </el-table-column>
-        <el-table-column prop="driverPhone" label="手机号" width="160">
-        </el-table-column>
-        <el-table-column prop="driverPhone" label="纳税人识别号" width="160">
-        </el-table-column>
-        <el-table-column prop="binNumber" label="地址" width="240">
-          <template slot-scope="scope">
-            {{ scope.row.residentCityProvincial
-            }}{{ scope.row.residentCityMunicipal }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="carModel" label="更新时间" width="160">
-        </el-table-column>
-        <el-table-column prop="addressUrl" label="附件" width="100">
+        <el-table-column prop="compAddress" label="地址"> </el-table-column>
+        <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
+        <el-table-column prop="businessLicenseAddressUrl" label="附件">
           <template slot-scope="scope">
             <img
               width="18"
@@ -180,7 +179,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="账户信息" width="120">
+        <el-table-column label="账户信息">
           <template slot-scope="scope">
             <el-button
               v-if="!scope.row.expandsStatus"
@@ -216,6 +215,7 @@
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.authenticationStatusKey == 1"
               @click="reject(scope.row)"
               >驳回</el-button
             >
@@ -223,9 +223,13 @@
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.authenticationStatusKey == 1"
               @click="adopt(scope.row)"
               >通过</el-button
             >
+            <template v-else slot-scope="scope">
+              {{ scope.row.authenticationStatus }}
+            </template>
           </template>
         </el-table-column>
       </el-table>
@@ -239,24 +243,6 @@
       >
       </el-pagination>
     </div>
-    <WinseaContentModal
-      v-model="outerVisible"
-      title="禁用原因"
-      @on-cancel="handleClose"
-    >
-      <el-input
-        type="textarea"
-        :rows="2"
-        maxlength="50"
-        placeholder="请输入禁用原因，不超过50个字"
-        v-model="disablieForm.disableReasons"
-      >
-      </el-input>
-      <div class="dialog-footer">
-        <el-button @click="outerVisible = false">取 消</el-button>
-        <el-button type="primary" @click="disableReasons">确定禁用</el-button>
-      </div>
-    </WinseaContentModal>
     <!-- 附件弹框 -->
     <WinseaContentModal
       v-model="accessoryTFs"
@@ -283,11 +269,10 @@
 </template>
 <script>
 import {
-  selectDriver,
+  grainMerchantsList,
   billoperatehis,
-  delDriver,
-  disableDriver,
-} from '@/model/transport/index'
+  getGrainMerchants,
+} from '@/model/platformaudit/index'
 import Pagination from '@/components/Pagination'
 import { provinceAndCityData, CodeToText } from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
@@ -367,6 +352,10 @@ export default {
         { value: '已通过', type: 2 },
         { value: '全部', type: '' },
       ],
+      identityAuthenticationInfo: {
+        id: '',
+        flag: '',
+      },
     }
   },
   activated() {
@@ -379,6 +368,11 @@ export default {
       this.$refs.expandstable.toggleRowExpansion(row)
     },
 
+    //查找
+    lookUp() {
+      this.currentPage = 1
+      this.getList()
+    },
     //查找
     handleLook() {
       if (this.value2) {
@@ -393,13 +387,15 @@ export default {
     },
     //审核通过
     adopt(row) {
+      this.identityAuthenticationInfo.id = row.id
+      this.identityAuthenticationInfo.flag = 1
       this.$confirm(`确定通过该认证信息？`, '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          delDriver({ id: row.id })
+          getGrainMerchants(this.identityAuthenticationInfo)
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -419,13 +415,15 @@ export default {
     },
     //审核驳回
     reject(row) {
+      this.identityAuthenticationInfo.id = row.id
+      this.identityAuthenticationInfo.flag = 1
       this.$confirm(`确定驳回该认证信息？`, '提示', {
         confirmButtonText: '驳回',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          delDriver({ id: row.id })
+          getGrainMerchants(this.identityAuthenticationInfo)
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -461,25 +459,17 @@ export default {
       this.getList()
     },
     getList() {
-      selectDriver({
+      grainMerchantsList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        residentCityProvincial: this.residentCityProvincial,
-        residentCityMunicipal: this.residentCityMunicipal,
         searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].expandsStatus = false
-            response.records[i].carNumber =
-              response.records[i].driverCarInfoList[0].carNumber
-            response.records[i].carModel =
-              response.records[i].driverCarInfoList[0].carModel
-            response.records[i].carLength =
-              response.records[i].driverCarInfoList[0].carLength
             if (response.records[i].addressUrl != null) {
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')
@@ -488,7 +478,6 @@ export default {
               response.records[i].addressUrlArray = []
             }
           }
-
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
@@ -526,10 +515,23 @@ export default {
           return false
         })
     },
-    selecttaskType(e) {
-      this.residentCityProvincial = CodeToText[e[0]]
-      this.residentCityMunicipal = CodeToText[e[1]]
-      // this.selectedOptions = e
+    selectExamineType(e) {
+      for (var i = 0; i < this.searchTypeList.length; i++) {
+        if (this.searchTypeList[i].value == e) {
+          this.searchType = this.searchTypeList[i].type
+        }
+      }
+    },
+    handlestatus(status) {
+      this.searchType = status
+      if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else {
+        this.primary = 3
+      }
+      this.getList()
     },
     fujian(row) {
       if (row.addressUrl === null || row.addressUrl === '') {

src/views/platformaudit/transactioninformationreview.vue

@@ -11,7 +11,7 @@
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
-          @change="selecttaskType"
+          @change="selectExamineType"
           :value="searchType"
         >
           <ws-option
@@ -52,25 +52,29 @@
         style="width: 100%"
         height="780"
       >
-        <el-table-column type="index" label="序号" width="80">
+        <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="processNo" label="编号" width="200"> </el-table-column>
-        <el-table-column prop="goodsName" label="发布企业/发布人" width="200">
+        <el-table-column prop="procurementPlanNo" label="编号" > </el-table-column>
+        <el-table-column prop="buyer" label="发布企业/发布人" >
         </el-table-column>
-        <el-table-column prop="send" label="发布平台" width="100"> </el-table-column>
-        <el-table-column prop="send" label="类型" width="80"> </el-table-column>
-        <el-table-column prop="send" label="货名" width="80"> </el-table-column>
-        <el-table-column prop="weight" label="重量（吨）" width="100"> </el-table-column>
-        <el-table-column prop="receive" label="交易类型" width="80"> </el-table-column>
-        <el-table-column prop="receive" label="基差(元/吨)" width="100"> </el-table-column>
-        <el-table-column prop="receive" label="价格(元/吨)" width="100"> </el-table-column>
-        <el-table-column prop="receive" label="电话" width="120"> </el-table-column>
-        <el-table-column prop="createDate" label="更新时间" width="120"> </el-table-column>
-        <el-table-column prop="seller" label="操作" width="200">
+        <el-table-column label="发布平台" > 
+          <template scope="scope">
+            <span v-if="scope.row.pcFlag==1">PC端</span>
+            <span v-else>移动端</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="goodsName" label="货名" > </el-table-column>
+        <el-table-column prop="weight" label="重量（吨）" > </el-table-column>
+        <el-table-column prop="procurementPlanType" label="交易类型" > </el-table-column>
+        <el-table-column prop="basisPrice" label="基差(元/吨)" > </el-table-column>
+        <el-table-column prop="unitPrice" label="价格(元/吨)" > </el-table-column>
+        <el-table-column prop="buyerPhone" 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"
@@ -95,12 +99,13 @@
             >删除</div>
           </template>
         </el-table-column>
-        <el-table-column prop="address" label="审核" width="150">
+        <el-table-column prop="address" label="审核" >
           <template slot-scope="scope">
             <el-button
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.statusFlag==1"
               @click="reject(scope.row)"
               >驳回</el-button
             >
@@ -108,9 +113,13 @@
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.statusFlag==1"
               @click="adopt(scope.row)"
               >通过</el-button
             >
+            <template v-else slot-scope="scope"> 
+            {{ scope.row.status}}
+          </template>
           </template>
         </el-table-column>
       </el-table>
@@ -127,7 +136,7 @@
   </div>
 </template>
 <script>
-import { automobileList, alsostate } from '@/model/transport/index'
+import { getTransactionInformation, transactionInformationList ,deleteTransactionInformation} from '@/model/platformaudit/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { EventBus } from 'base-core-lib'
@@ -165,7 +174,6 @@ export default {
       deptBudgetTotal: 0,
       searchTypeText: '待审核',
       searchKeyWord: '',
-      tranTypeKey: 2,
       // 提交类型
       submitType: true,
       size: 10,
@@ -185,6 +193,10 @@ export default {
         { value: '已通过', type: 2 },
         { value: '全部', type: '' },
       ],
+      procurementPlanInfo:{
+        id: '',
+        flag: '',
+      },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -227,24 +239,6 @@ export default {
         // }
       })
     },
-    //查看火运调度详细
-    trainSee(row) {
-      this.$router.push({
-        name: 'fireDispatchingview',
-        query: {
-          id: row.id,
-        },
-      })
-    },
-    //车次
-    trainNumber(row) {
-      this.$router.push({
-        name: 'fireDispatchingcar',
-        query: {
-          id: row.id,
-        },
-      })
-    },
     //删除
     deleteclick(row) {
       //cancelButtonClass: "btn-custom-cancel"
@@ -254,7 +248,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          deltran({
+          deleteTransactionInformation({
             id: row.id
           })
             .toPromise()
@@ -266,17 +260,32 @@ export default {
           return false
         })
     },
+    //查找
+    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
+        }
+      }
+    },
     //审核通过
     adopt(row) {
+      this.procurementPlanInfo.id = row.id
+      this.procurementPlanInfo.flag = 1
       this.$confirm(`确定通过该认证信息？`, '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          delDriver({ id: row.id })
+          getTransactionInformation( this.procurementPlanInfo )
             .toPromise()
             .then((response) => {
+              
               this.$notify.success({
                 title: '成功',
                 message: '通过成功',
@@ -294,13 +303,15 @@ export default {
     },
     //审核驳回
     reject(row) {
+       this.procurementPlanInfo.id = row.id
+       this.procurementPlanInfo.flag = 2
       this.$confirm(`确定驳回该认证信息？`, '提示', {
         confirmButtonText: '驳回',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          delDriver({ id: row.id })
+          getTransactionInformation(this.procurementPlanInfo)
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -354,14 +365,11 @@ export default {
       this.getList()
     },
     getList() {
-      automobileList({
+      transactionInformationList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         searchType: this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        tranTypeKey: this.tranTypeKey,
-        startDate: this.startDate,
-        endDate: this.endDate,
         searchKeyWord: this.searchKeyWord,
       })
         .toPromise()

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -178,7 +178,7 @@
               </div>
             </el-popover>
             <img
-            v-if='scope.row.taskStatus=="执行中"'
+              v-if="scope.row.taskStatus == '执行中'"
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
@@ -195,7 +195,8 @@
         ></el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <span class="corles"
+            <span
+              class="corles"
               @click="nocomplete(scope.row)"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.View`
@@ -206,7 +207,8 @@
               direction="vertical"
               v-if="scope.row.taskStatus == '待审核'"
             ></el-divider>
-            <span class="corles"
+            <span
+              class="corles"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
               "
@@ -218,16 +220,19 @@
               direction="vertical"
               class="divider"
               v-if="
-                scope.row.taskStatus == '待审核'||scope.row.taskStatus == '执行中' ||
+                scope.row.taskStatus == '待审核' ||
+                scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
             ></el-divider>
-            <span class="corles"
+            <span
+              class="corles"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.edit`
               "
               v-if="
-                scope.row.taskStatus == '待审核' ||scope.row.taskStatus == '执行中' ||
+                scope.row.taskStatus == '待审核' ||
+                scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
               @click="delivery(scope.row)"
@@ -237,7 +242,8 @@
               direction="vertical"
               v-if="scope.row.taskId == null"
             ></el-divider>
-            <span class="corles"
+            <span
+              class="corles"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
               "
@@ -405,8 +411,8 @@ export default {
         query: {
           relevanceId: item.relevanceId,
           taskId: item.taskId,
-          businessKey:item.id,
-          workflowId:item.workflowId
+          businessKey: item.id,
+          workflowId: item.workflowId,
         },
       })
     },
@@ -447,8 +453,8 @@ export default {
         path: 'inOutWarehousetaskEdit',
         query: {
           relevanceId: row.relevanceId,
-          businessKey:row.id,
-          workflowId:row.workflowId
+          businessKey: row.id,
+          workflowId: row.workflowId,
         },
       })
     },
@@ -647,8 +653,8 @@ export default {
 /deep/.typeselect .el-input__inner {
   color: #8890b1;
 }
-.corles{
-  color: #5878E8;
+.corles {
+  color: #5878e8;
   font-size: 14px;
 }
 </style>

src/views/tranManagement/tranManagementDriver.vue

@@ -561,13 +561,15 @@ export default {
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
-            response.records[i].expandsStatus = false
-            response.records[i].carNumber =
+            if(response.records[i].driverCarInfoList.length>0){
+              response.records[i].carNumber =
               response.records[i].driverCarInfoList[0].carNumber
-            response.records[i].carModel =
+              response.records[i].carModel =
               response.records[i].driverCarInfoList[0].carModel
-            response.records[i].carLength =
+              response.records[i].carLength =
               response.records[i].driverCarInfoList[0].carLength
+            }
+            response.records[i].expandsStatus = false
             if (response.records[i].addressUrl != null) {
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')

vue.config.js

@@ -145,7 +145,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.116:8090/',
+        target: 'http://192.168.1.120:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',