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

src/api/V2/personnelManagement/index.js

@@ -0,0 +1,2 @@
+export const API_GET_PERSON_LIST = '/clockInfo/selectClockInfoPc'
+export const API_GET_PERSON_LIST1 = '/clockInfo/selectClockInfo'

src/api/common/index.js

@@ -14,9 +14,9 @@ export const API_POST_NOTIFICATIONSTAFFTODOTASK_CHANGESHOWTIME = '/notificationS
 
 // 分页查询船舶列表
 export const API_GET_VESSELPAGE = '/systemVessel/query/getVesselPage'
-// 查询船舶详情
+    // 查询船舶详情
 export const API_GET_VESSELONE = '/systemVessel/query/getVesselOne'
-// 修改船舶信息表
+    // 修改船舶信息表
 export const API_POST_CHANGEINFO = '/systemVessel/api/changeInfo'
 
 
@@ -59,18 +59,18 @@ export const API_GET_PROGRESS_PERCENTAGE = '/tbInitializationData/query/getProgr
 export const API_GET_IS_SHOW_DIALOG = '/tbInitializationData/query/getVesselList'
 
 // 获取运输结算统计信息
-export const API_GET_INFO ='/tranSettlementReport/getInfo'
+export const API_GET_INFO = '/tranSettlementReport/getInfo'
 
 // 通过手机号获取公司
 export const API_GET_COMP = '/commonUser/getCompList'
-/*
- * @Author: Myz
- * @Date: 2020-10-19 15:10:28
- * @Last Modified by: Yolo
- * @Last Modified time: 2021-01-15 15:42:45
- * @Desc 首页不包括统计Api接口  如果想找统计的接口 请到statistical文件夹中
- */
-// 查询附件
+    /*
+     * @Author: Myz
+     * @Date: 2020-10-19 15:10:28
+     * @Last Modified by: Yolo
+     * @Last Modified time: 2021-01-15 15:42:45
+     * @Desc 首页不包括统计Api接口  如果想找统计的接口 请到statistical文件夹中
+     */
+    // 查询附件
 export const API_GET_GETFILELIST = `/appendix/query/getFileList`
 
 // 获取当前登录用户信息
@@ -90,18 +90,20 @@ export const API_GET_GETSTAFFHOMESHOWLIST = `/staffHomeShowInfo/query/getStaffHo
 
 // 查询附件
 export const API_GET_APPENDIX_GETFILELIST = `/appendix/query/getFileList`
-// 保存附件
+    // 保存附件
 export const POST_GET_APPENDIX_SAVEFILES = `/appendix/api/saveFiles`
-// 获取系统web路径
+    // 获取系统web路径
 export const API_GET_SYSTEM_GETROOTURL = `/system/query/getRootUrl`
-// 获得oss 的bucket 和 endpoint TODO:不知道删了会不会有影响 目前先没删
+    // 获得oss 的bucket 和 endpoint TODO:不知道删了会不会有影响 目前先没删
 export const API_GET_FILE_ACCESSCONFIG = `/file/query/accessConfig`
-// 船端上传附件
+    // 船端上传附件
 export const API_POST_UPLOADFILES = `/appendix/api/uploadFiles`
-//删除附件
+    //删除附件
 export const API_POST_DELETEFILES = `/appendix/api/deleteFiles`
-// 上传附件
+    // 上传附件
 export const API_POST_OTHERUPLOADFILES = `/appendix/api/uploadFiles`
-//获取公司下拉列表
+    //获取公司下拉列表
 export const API_GET_API_COMPLIST = `/commonUser/getComp`
 export const API_GET_ADMINID = `/commonUser/test`
+    // 获取部门
+export const API_GET_DEPT = `/department/query/getDeptListByCompId`

src/components/balanceAlert.vue

@@ -9,7 +9,6 @@
       </div>
       <div class="number" v-else>{{ tareVal }} kg</div>
     </div>
-
     <div class="btn" @click="sendVal">确定</div>
   </div>
 </template>
@@ -62,7 +61,7 @@ export default {
             this.param = 1200
           } else if (this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
             this.param = 2400
-          } else {
+          }  else {
             this.param = 9600
           }
           console.log(this.param)
@@ -91,39 +90,38 @@ export default {
           // var receData = HexConvert.ByteToString(value);
           // console.log("receData",receData);
           var flag = false
-          var flag1 = false
-          // for (var i = 0; i < value.length; i++) {
-          //   var tmp = String.fromCharCode(value[i])
-          //   if (tmp == '+') {
-          //     flag = true
-          //   }
-          //   if (flag && result.length < 6 && tmp != '+') {
-          //     result += tmp
-          //   }
-          // }
-          // if (this.information != '毛重检斤') {
-          //   if(parseInt(result)){
-          //     this.deptBudgetList.grossWeight = parseInt(result)
-          //   }
-          // } else {
-          //   if(parseInt(result)){
-          //     this.deptBudgetList.tare = parseInt(result)
-          //   }
-          // }
-
-          if (value.length > 3) {
+          if (
+              this.deptBudgetList.warehouseName == '克东润津库'&&
+              value.length < 9
+            ) {
+              continue
+            }
+          if (value.length > 2) {
             if (value.length <= 6) {
+              // continue
+            }
+            if (
+              (this.deptBudgetList.warehouseName == '肇东金信库' || this.deptBudgetList.warehouseName == '甘南宏旗库') &&
+              value.length < 10
+            ) {
+              var start = new Date().getTime()
+              while (new Date().getTime() - start < 100) {}
               continue
             }
             if (
-              this.deptBudgetList.warehouseName == '肇东金信库' &&
+              this.deptBudgetList.warehouseName == '克东瑞信达'&&
               value.length < 10
             ) {
               var start = new Date().getTime()
-              while (new Date().getTime() - start < 200) {}
+              while (new Date().getTime() - start < 30) {}
               continue
             }
+            var zzz = ''
+            for (var i = 0; i < value.length; i++) {
+              zzz += String.fromCharCode(value[i])
+            }
             console.log('value23:', value)
+            console.log('valuezzz:', zzz)
           } else if (
             this.deptBudgetList.warehouseName == '白城内陆港' ||
             this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库'
@@ -133,6 +131,20 @@ export default {
             while (new Date().getTime() - start < 400) {}
             continue
           }
+          else if (
+              this.deptBudgetList.warehouseName == '克东瑞信达'&&
+              value.length < 10
+            ) {
+              var start = new Date().getTime()
+              while (new Date().getTime() - start < 30) {}
+              continue
+            }
+            var zzz = ''
+            for (var i = 0; i < value.length; i++) {
+              zzz += String.fromCharCode(value[i])
+            }
+            console.log('value23:', value)
+            console.log('valuezzz:', zzz)
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
@@ -142,8 +154,11 @@ export default {
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
               this.deptBudgetList.warehouseName == '龙江金信库' ||
               this.deptBudgetList.warehouseName == '白城内陆港' ||
+              this.deptBudgetList.warehouseName == '甘南林峰库' ||
               this.deptBudgetList.warehouseName == '肇东金信库' ||
-              this.deptBudgetList.warehouseName == '呼兰大金仓')
+              this.deptBudgetList.warehouseName == '呼兰大金仓'||
+              this.deptBudgetList.warehouseName == '克东润津库'||
+              this.deptBudgetList.warehouseName == '克东瑞信达')
           ) {
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
@@ -163,7 +178,8 @@ export default {
                 this.tareVal = parseInt(result)
               }
             }
-          } else if (
+          } else 
+          if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '顺诚粮库' ||
               this.deptBudgetList.warehouseName == '鲅鱼圈金信库')
@@ -187,7 +203,8 @@ export default {
                 this.tareVal = parseInt(result)
               }
             }
-          } else {
+          } else{
+
             if (value.length > 10) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
@@ -255,6 +272,26 @@ export default {
               }
             }
           }
+          // else {
+          //   for (var i = 0; i < value.length; i++) {
+          //     var tmp = String.fromCharCode(value[i])
+          //     if (tmp == '+') {
+          //       flag = true
+          //     }
+          //     if (flag && result.length < 6 && tmp != '+') {
+          //       result += tmp
+          //     }
+          //   }
+          //   if (this.information.indexOf('毛重') > -1) {
+          //     if (parseInt(result) || parseInt(result) == 0) {
+          //       this.grossWeightVal = parseInt(result)
+          //     }
+          //   } else {
+          //     if (parseInt(result) || parseInt(result) == 0) {
+          //       this.tareVal = parseInt(result)
+          //     }
+          //   }
+          // }
           // setTimeout(1000)
           // value 是一个 Uint8Array
         }

src/model/personnelManagement/index.js

@@ -0,0 +1,17 @@
+import { errorCatcher, errorHandle, filter } from 'base-core-lib'
+import { appRx } from '../defalutConfig/indexRx'
+import {
+    API_GET_PERSON_LIST,
+    API_GET_PERSON_LIST1
+} from '@/api/V2/personnelManagement'
+import {
+    API_GET_DEPT,
+} from '@/api/common/index'
+// 列表
+export const getList = appRx.get(API_GET_PERSON_LIST, errorCatcher, errorHandle, filter)
+    // 添加
+    // export const addList = appRx.post(API_POST_ADD_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
+    // 获取部门列表
+export const getDeptList = appRx.get(API_GET_DEPT, errorCatcher, errorHandle, filter)
+
+export const getList1 = appRx.get(API_GET_PERSON_LIST1, errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContractEdit.vue

@@ -58,17 +58,18 @@
           </ws-form-item>
           <!-- 合同单价（元/吨） -->
         <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价收购'">
-          <span v-if="deptBudgetList.unitContractPrice != 'null'">{{
-            deptBudgetList.unitContractPrice
-          }}</span>
+        <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
+            maxlength="100" size="small" />
         </ws-form-item>
         <!-- 重量（吨） -->
         <ws-form-item label="重量（吨）" span="1" prop="weight">
-          <ws-input v-model="deptBudgetList.weight" maxlength="100" size="small" placeholder="请输入重量（吨）" />
+          <ws-input v-model="deptBudgetList.weight" @input="weightchange" maxlength="100" size="small" placeholder="请输入重量（吨）" />
         </ws-form-item>
         <!-- 合同总价（元） -->
         <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价收购'">
-          <ws-input v-model="deptBudgetList.totalContractPrice" maxlength="100" placeholder="请输入合同单价" size="small" />
+           <span v-if="deptBudgetList.totalContractPrice != 'null'">{{
+            deptBudgetList.totalContractPrice
+          }}</span>
         </ws-form-item>
         <!-- 溢短装（%） -->
         <ws-form-item label="溢短装（%）" span="1" prop="overShort">
@@ -308,6 +309,17 @@
         this.dialogVisible = true
         this.type = type
       },
+      weightchange(e) {
+        if(this.deptBudgetList.unitContractPrice){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.unitContractPrice
+        }
+        this.deptBudgetList.finalTradingVolume = e
+      },
+      pricechange(e) {
+        if(this.deptBudgetList.weight){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.weight
+        }
+      },
       blurMap() {
         this.dialogVisible = false
       },

src/views/contractManagement/purchaseContractEdit.vue

@@ -122,7 +122,7 @@
         </ws-form-item>
         <!-- 重量（吨） -->
         <ws-form-item label="重量（吨）" span="1" prop="weight">
-          <ws-input v-model="deptBudgetList.weight" maxlength="100" size="small" placeholder="请输入重量（吨）" />
+          <ws-input v-model="deptBudgetList.weight" @input="weightchange" maxlength="100" size="small" placeholder="请输入重量（吨）" />
         </ws-form-item>
         <!-- 交货日期（起） -->
         <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
@@ -144,13 +144,15 @@
           </ws-form-item>
         <!-- 合同单价（元/吨） -->
         <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
-          <span v-if="deptBudgetList.unitContractPrice != 'null'">{{
-            deptBudgetList.unitContractPrice
-          }}</span>
+          <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
+            maxlength="100" size="small" />
         </ws-form-item>
         <!-- 合同总价（元） -->
         <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
-          <ws-input v-model="deptBudgetList.totalContractPrice" maxlength="100" placeholder="请输入合同单价" size="small" />
+          <span v-if="deptBudgetList.totalContractPrice != 'null'">{{
+            deptBudgetList.totalContractPrice
+          }}</span>
+         
         </ws-form-item>
         <!-- 货源所在地区 -->
         <ws-form-item label="货源所在地区" span="1" prop="packingMethod">
@@ -579,6 +581,17 @@
             this.feedbackLeaders.unshift(_obj)
           })
       },
+      weightchange(e) {
+        if(this.deptBudgetList.unitContractPrice){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.unitContractPrice
+        }
+        this.deptBudgetList.finalTradingVolume = e
+      },
+      pricechange(e) {
+        if(this.deptBudgetList.weight){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.weight
+        }
+      },
       addClick() {
         this.unitList.push({
           flag: 'add',

src/views/contractManagement/salesContractEdit.vue

@@ -155,7 +155,7 @@
           </ws-form-item>
           <!--重量（吨）-->
           <ws-form-item label="重量（吨）" span="1" prop="contractNo">
-            <ws-input v-model="deptBudgetList.weight" placeholder="请输入重量（吨）" maxlength="100" size="small" />
+            <ws-input v-model="deptBudgetList.weight" @input="weightchange" placeholder="请输入重量（吨）" maxlength="100" size="small" />
           </ws-form-item>
           <!--交货日期（起）-->
           <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
@@ -179,14 +179,15 @@
           </ws-form-item>
           <!--合同单价（元/吨）-->
           <ws-form-item label="合同单价（元/吨）" span="1" prop="contractNo" v-if="deptBudgetList.priceType == '定价销售'">
-            <div class="unchanged">
-              {{ deptBudgetList.unitContractPrice }}
-            </div>
-            <span class="unchangeable">*</span>
+            <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
+              maxlength="100" size="small" />
           </ws-form-item>
           <!--合同总价-->
           <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
-            <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
+            <div class="unchanged">
+              {{ deptBudgetList.totalContractPrice }}
+            </div>
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <!--签订日期-->
           <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType=='销售合同'">
@@ -677,6 +678,17 @@
             this.pleaseChoose = ''
           })
       },
+      weightchange(e) {
+        if(this.deptBudgetList.unitContractPrice){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.unitContractPrice
+        }
+        this.deptBudgetList.finalTradingVolume = e
+      },
+      pricechange(e) {
+        if(this.deptBudgetList.weight){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.weight
+        }
+      },
       saveClick(item, index) {
         //  console.log(item)
 

src/views/home/index.vue

@@ -37,7 +37,7 @@
         <ItemWrap class="contetn_left-center contetn_lr-item" title="合营比例">
           <LeftCenter :hylistData="leftCenterDataList"/>
         </ItemWrap>
-        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="在途信息" style="padding: 0 10px 16px 10px">
+        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="车辆信息" style="padding: 0 10px 16px 10px">
           <LeftBottom :ztxxlistData="leftBottomDataList"/>
         </ItemWrap>
       </div>
@@ -162,7 +162,7 @@ export default {
     gChartsData({
       compId: localStorage.getItem('ws-pf_compId'),
       loadingstatus: 1,
-      seachMoth: '2022'
+      seachMoth: '2022-10-10'
     }).toPromise().then(res => {
       console.log('··············', res)
       this.leftTopDataList = res[0].biViewInfoList

src/views/houseSelfCollect/paymentManagement.vue

@@ -98,7 +98,8 @@
     </BaseHeaderLayout>
     <el-table :data="paymentList" ref="table" style="width: 100%; margin-top: 20px" border height="calc(100% - 170px)"
       @row-click="handleRowClick" @selection-change="handleSelectionChange" :summary-method="getSummaries" show-summary>
-      <el-table-column :selectable="selectInit" type="selection" width="30"></el-table-column>
+      <!-- <el-table-column :selectable="selectInit" type="selection" width="30"></el-table-column> -->
+      <el-table-column  type="selection" width="30"></el-table-column>
       <el-table-column type="index" label="序号" width="50">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -948,6 +949,7 @@
               break
             case '打印结算凭证':
               this.isShowPrintType3 = !this.isShowPrintType3
+              break
             case '打印检斤单':
               this.isShowPrintType4 = !this.isShowPrintType4
               break

src/views/personnelManagement/cardReplacementManagement.vue

@@ -0,0 +1,381 @@
+//补卡审核
+<template>
+  <div class="container">
+    <el-row class="row_top">
+      <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="center">
+      <el-row style='margin-bottom:10px;'>
+        <el-col :span="18">
+          <el-button style="margin-left:10px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
+          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">待审核</el-button>
+          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">已通过</el-button>
+          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">已驳回</el-button>
+        </el-col>
+        <el-col style='text-align:right;' :span="6">
+        </el-col>
+      </el-row>
+      <div class="fromdata">
+        <el-table :data="tableData">
+          <el-table-column type="index" label="序号">
+            <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="empName" label="姓名">
+          </el-table-column>
+          <el-table-column prop="dept" label="部门">
+          </el-table-column>
+          
+          <el-table-column  prop="driverName" label="备注">
+          </el-table-column>
+          <el-table-column prop="approveStatus" width="100" label="状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span><span v-else>{{scope.row.travelStatus}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="address" label="操作">
+            <template slot-scope="scope">
+              <el-button @click="look(scope.row)" type="primary">查看</el-button>
+             
+              <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
+              <el-button v-if='scope.row.approveStatus' @click="pass(scope.row)" type="primary">通过</el-button>
+              <el-button v-if='scope.row.approveStatus' @click="reject(scope.row)" type="primary">驳回</el-button>
+              <!-- <el-button v-if='scope.row.status=="已驳回"' @click="expenseedit(scope.row)" type="primary">编辑</el-button> -->
+              <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        style="text-align:center" :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
+    <el-dialog width='50%' :visible.sync="dialogVisible2" :title="title1">
+      <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}"
+>
+        <div style='width:100%;justify-content: space-between;' class='flex'>
+          <div style='width:33.333%;text-align:left;'>{{item.operateUser}}</div>
+          <div style='width:33.333%;text-align:center;'>{{item.dealMsg!='请款'?item.approveResult==1?'通过':'驳回':item.dealMsg}}</div>
+          <div style='width:33.333%;text-align:right;'>{{item.operateDate}}</div>
+        </div>
+        <div v-if='index<recordList.length-1' style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
+        <div v-else style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
+      </div>
+    </el-dialog>
+    <WinseaContentModal v-model="fujianshow" :title="title"
+      @on-cancel="handleClose">
+    </WinseaContentModal>
+  </div>
+</template>
+<script>
+  import WsUpload from '@/components/WsUpload'
+  import {
+    getList1,
+  } from '@/model/personnelManagement/index'
+  import {
+    getfielfillinginfo,
+  } from '@/model/profitable/index'
+  import {
+    woekflowhandle
+  } from '@/model/tasksport/index'
+  export default {
+    components: {
+      WsUpload,
+    },
+    data() {
+      return {
+        value: '',
+        tableData: [],
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        recordList:[],
+        compId:localStorage.getItem('ws-pf_compId'),
+        dialogVisible1:false,
+        form:{},
+        dialogVisible2:false,
+        deptCircularPage: {},
+        searchType:'',
+        searchKeyWord:'',
+        strokeType:'1',
+        title:'附件',
+        title1:'',
+        outtotal:0,
+        intotal:0,
+        fujianshow:false,
+        appendixIdss:[],
+      }
+    },
+    activated() {
+      this.getList()
+    },
+    methods: {
+      handlerecord(row){
+        if(row.expensesType==1){
+          this.title1='收款审核记录'
+        }else{
+          this.title1='请款审核记录'
+        }
+        getAuditRecord({ id: row.id,
+            workflowId: row.workflowId}).toPromise()
+                .then((response) => {
+                  this.recordList=response
+                  this.dialogVisible1=true
+                }).catch((response) => {})
+      },
+      returnsales(){
+        this.$router.go(-1)
+      },
+      handleClose() {
+        this.fujianshow = false
+      },
+      fujian(row) {
+        this.id = row.id
+        this.fujianshow = true
+        if(row.addressUrl){
+         this.appendixIdss=row.addressUrl
+        }
+      },
+      look(row){
+        this.form=row
+        this.dialogVisible1=true
+      },
+      
+      strokeTypeChange(num){
+        this.strokeType = num
+        this.getList()
+      },
+      typeChange(num){
+        this.searchType = num
+        this.getList()
+      },
+      edit(row){
+        this.$router.push({name:'cashoutedit',query:{id:row.id}})
+      },
+      pass(row){
+        if(row.taskId){
+          this.$confirm('确认通过请款信息？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            woekflowhandle({
+              taskId: row.taskId,
+              approved:true,
+              auditMind: '34',
+              needReapply: true,
+            }).toPromise()
+            .then((response) => {
+              this.$message({
+                message: '通过成功!',
+                type: 'success',
+              })
+              this.getList()
+            }).catch((response) => {
+              this.$message({
+                message: '通过失败!',
+                type: 'error',
+              })
+            })
+          })
+        }else{
+          this.$message({
+            message: '暂无此权限!',
+            type: 'warning',
+          })
+        }
+      },
+      reject(row){
+        if(row.taskId){
+          this.$confirm('确认驳回请款信息？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            woekflowhandle({
+              taskId: row.taskId,
+              approved:false,
+              auditMind: '34',
+              needReapply: true,
+            }).toPromise()
+            .then((response) => {
+              this.$message({
+                message: '驳回成功!',
+                type: 'success',
+              })
+              this.getList()
+            }).catch((response) => {
+              this.$message({
+                message: '驳回失败!',
+                type: 'error',
+              })
+            })
+          })
+        }else{
+          this.$message({
+            message: '暂无此权限!',
+            type: 'warning',
+          })
+        }
+      },
+      payment(row){
+        if(localStorage.getItem('ws-pf_roleName')=='出纳'){
+          this.$router.push({name:'payment',query:{id:row.id}})
+        }else{
+          this.$message({
+            message: '暂无此权限!',
+            type: 'warning',
+          })
+        }
+        
+      },
+      allot(row){
+        if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
+          this.$router.push({name:'expenseallot',query:{id:row.id}})
+        }else{
+          this.$message({
+            message: '暂无此权限!',
+            type: 'warning',
+          })
+        }
+      },
+      cashout(){
+        this.$router.push({name:'cashout'})
+      },
+      storageCharge(){
+        this.$router.push({name:'storageCharge'})
+      },
+      receipt(){
+        this.$router.push({name:'receipt'})
+      },
+      // inventory(){
+      //   this.$router.push({name:'contractinventory'})
+      // },
+      getList() {
+        getList1({
+            // warehouseType: 1,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            compId: localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+          .then(response => {
+            this.tableData = response.records
+           this.deptBudgetTotal = response.total
+          })
+      },
+      changeDate(){
+        if(this.value){
+          this.startDate = this.value[0]
+          this.endDate = this.value[1]
+        }
+        this.getList()
+      },
+      pickerOptions() {},
+      find() {
+        this.getList()
+
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .container {
+    background: #E8ECF6;
+  }
+
+  .center {
+    margin: 0 auto;
+    background: #ffffff;
+    // height: calc(100vh - 13vh);
+    border-radius: 4px;
+    padding: 20px 0;
+
+    /deep/.el-table td,
+    /deep/.el-table th {
+      text-align: center;
+    }
+  }
+
+  .row_top {
+    background: #F6F7FC;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .bg-left {
+      padding-left: 30px;
+    }
+
+    .bg-right {
+      padding-right: 10px;
+      text-align: right;
+    }
+
+    .title {
+      position: relative;
+    }
+
+    .title::before {
+      content: '';
+      display: inline-block;
+      width: 5px;
+      height: 30px;
+      background: #5473e8;
+      position: absolute;
+      left: 0;
+    }
+  }
+
+  .datascreen {
+    display: flex;
+
+    .data_css {
+      width: 40%;
+    }
+
+    .input_css {
+      width: 50%;
+      margin: 0 10px;
+    }
+
+    .find {
+      margin-right: 10px;
+    }
+  }
+
+  .fromdata {
+    margin: 20px 0;
+    overflow-y: scroll;
+    height: 546px;
+  }
+  .top_info{
+    margin: 10px 0 0 10px;
+    min-width: 712px;
+    .info_css{
+      margin-right: 20px;
+    }
+  }
+  .bg-right{
+    padding-top:15px;
+  }
+</style>

src/views/personnelManagement/checkWorkList.vue

@@ -0,0 +1,589 @@
+//考勤管理
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="10">
+      <template slot="right">
+        <el-select class="warehouse_select" v-model="deptId" placeholder="请选择部门" @change="deptChange"
+          filterable clearable style="margin: 0 10px">
+          <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
+          </el-option>
+        </el-select>
+        <el-date-picker style="margin: 0 10px 0 0" value-format="yyyy-MM-dd" v-model="value2" @change="datechange"
+          type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期"
+          end-placeholder="结算日期">
+        </el-date-picker>
+        <div></div>
+        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按员工姓名查找"
+          clearable maxlength="500" type="input">
+        </ws-input>
+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+        <ws-button class="find" type="primary" @click="find()">
+          <img width="16" height="16" style="vertical-align: text-top; position: relative; top: 0px;left:-8px;"
+            src="../../../public/img/sousuo.png" alt />
+        </ws-button>
+      </template>
+    </BaseHeaderLayout>
+    
+    <div style="height:calc(100% - 130px);overflow-y: scroll;">
+      <el-table
+    :data="tableData"
+    style="width: 100%">
+    <el-table-column type="expand">
+      <template slot-scope="props">
+        <el-table
+    :data="props.row.clockInfoList"
+    stripe
+    style="width: 100%">
+    <el-table-column
+      prop="createDate"
+      label="日期"
+      width="180">
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.createDate.split(" ")[0] }}</span>
+      </template>
+
+    </el-table-column>
+    <el-table-column
+      prop="toClockDate"
+      label="上班打卡时间"
+      width="180">
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.toClockDate.split(" ")[1] }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="offClockDate"
+      label="下班打卡时间">
+    </el-table-column>
+  </el-table>
+        <!-- <el-form label-position="left" inline class="demo-table-expand">
+          <el-form-item label="商品名称">
+            <span>{{ props.row.name }}</span>
+          </el-form-item>
+          <el-form-item label="所属店铺">
+            <span>{{ props.row.shop }}</span>
+          </el-form-item>
+          <el-form-item label="商品 ID">
+            <span>{{ props.row.id }}</span>
+          </el-form-item>
+          <el-form-item label="店铺 ID">
+            <span>{{ props.row.shopId }}</span>
+          </el-form-item>
+          <el-form-item label="商品分类">
+            <span>{{ props.row.category }}</span>
+          </el-form-item>
+          <el-form-item label="店铺地址">
+            <span>{{ props.row.address }}</span>
+          </el-form-item>
+          <el-form-item label="商品描述">
+            <span>{{ props.row.desc }}</span>
+          </el-form-item>
+        </el-form> -->
+      </template>
+    </el-table-column>
+    <el-table-column
+      label="姓名"
+      prop="empName">
+    </el-table-column>
+    <el-table-column
+      label="部门"
+      prop="dept">
+    </el-table-column>
+    <el-table-column
+      label="手机号"
+      prop="phone">
+    </el-table-column>
+  </el-table>
+</div>
+<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" :page-size="pageSize"  layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"></el-pagination>
+   
+  <!-- <div class="content">
+    <div v-for="(item,index) in tableData">
+      <div class="row">
+        <div>姓名：</div>
+        <div>{{item.empName}}</div>
+      </div>
+      <div class="row">
+        <div>部门：</div>
+        <div>{{item.dept}}</div>
+      </div>
+      <div>考勤列表</div>
+      <div v-for="item1 in item.clockInfoList">
+        <div>
+          <div>
+            上班打卡时间
+          </div>
+          <div>
+            {{item1.toClockDate}}
+          </div>
+        </div>
+        <div>
+          <div>
+            下班打卡时间
+          </div>
+          <div>
+            {{item1.offClockDate}}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div> -->
+</div>
+</template>
+<script>
+  import {
+    getList,
+    getDeptList
+  } from '@/model/personnelManagement/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+
+  export default {
+    components: {
+      WsUpload,
+      Pagination,
+    },
+    data() {
+      return {
+        value2:[],
+        currentPage: 1,
+        pageSize: 10,
+        deptList:[],
+        deptId:'',
+        searchKeyWord:'',
+        tableData: [],
+        deptBudgetTotal: 0,
+      }
+  
+    },
+    activated() {
+      this.getList()
+      this.getDeptList()
+    },
+    mounted() {
+      let date = new Date()
+            // 通过时间戳计算
+            let defalutStartTime = date.getTime() - 7 * 24 * 3600 * 1000 // 转化为时间戳
+            let defalutEndTime = date.getTime()
+            let startDateNs = new Date(defalutStartTime) 
+            let endDateNs = new Date(defalutEndTime)
+            // 月，日 不够10补0
+            defalutStartTime = startDateNs.getFullYear() + '-' + ((startDateNs.getMonth() + 1) >= 10 ? (startDateNs.getMonth() + 1) : '0' + (startDateNs.getMonth() + 1)) + '-' + (startDateNs.getDate() >= 10 ? startDateNs.getDate() : '0' + startDateNs.getDate())
+            defalutEndTime = endDateNs.getFullYear() + '-' + ((endDateNs.getMonth() + 1) >= 10 ? (endDateNs.getMonth() + 1) : '0' + (endDateNs.getMonth() + 1)) + '-' + (endDateNs.getDate() >= 10 ? endDateNs.getDate() : '0' + endDateNs.getDate())
+            this.value2= [defalutStartTime, defalutEndTime]
+    },
+     
+    methods: {
+      load(tree, treeNode, resolve) {
+        setTimeout(() => {
+          resolve([
+            {
+              id: 31,
+              date: '2016-05-01',
+              name: '王小虎',
+              address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+              id: 32,
+              date: '2016-05-01',
+              name: '王小虎',
+              address: '上海市普陀区金沙江路 1519 弄'
+            }
+          ])
+        }, 1000)
+      },
+      datechange() {
+        this.getList()
+      },
+      deptChange(){
+        this.getList()
+      },
+      //查看//传参
+      nocomplete(row) {
+        this.$router.push({
+          name: 'vehicleDispatchingview',
+          query: {
+            id: row.id,
+          },
+        })
+      },
+      dateFormat(fmt, date) {
+        let ret
+        const opt = {
+          'Y+': date.getFullYear().toString(), // 年
+          'm+': (date.getMonth() + 1).toString(), // 月
+          'd+': date.getDate().toString(), // 日
+          'H+': date.getHours().toString(), // 时
+          // "M+": date.getMinutes().toString(),         // 分
+          // "S+": date.getSeconds().toString()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
+        }
+        for (let k in opt) {
+          ret = new RegExp('(' + k + ')').exec(fmt)
+          if (ret) {
+            fmt = fmt.replace(
+              ret[1],
+              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+            )
+          }
+        }
+        return fmt
+      },
+
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      changestatus(state) {
+        this.searchType = state
+        this.getList()
+      },
+      whether(row) {
+        row.identification = 'true'
+      },
+      //列表查询
+      getList() {
+        var startDate = ''
+        var endDate = ''
+        if (this.value2) {
+          startDate = this.value2[0] ? this.value2[0] : ''
+          endDate = this.value2[1] ? this.value2[1] : ''
+        }
+        getList({
+          currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            startDate: startDate,
+            endDate: endDate,
+            searchKeyWord: this.searchKeyWord,
+            compId: localStorage.getItem('ws-pf_compId'),
+            dept:this.deptId
+          })
+          .toPromise()
+          .then((response) => {
+            console.log(response.data)
+            debugger
+            this.tableData = response.records
+            // for (var i = 0; i < response.records.length; i++) {
+            //   response.records[i].identification = 'false'
+            // }
+            // this.customerList = response
+            // this.deptCircularPage.currentPage = response.current
+            // this.deptCircularPage.pageSize = response.size
+            // this.deptBudgetTotal = response.total
+          })
+      },
+      //部门列表查询
+      getDeptList() {
+        getDeptList()
+          .toPromise()
+          .then((response) => {
+            console.log(response)
+            this.deptList = response
+            // for (var i = 0; i < response.records.length; i++) {
+            //   response.records[i].identification = 'false'
+            // }
+            // this.customerList = response
+            // this.deptCircularPage.currentPage = response.current
+            // this.deptCircularPage.pageSize = response.size
+            // this.deptBudgetTotal = response.total
+          })
+      },
+      find() {
+        this.currentPage = 1
+        this.getList()
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .content {
+    width: 90%;
+    margin: 0 auto;
+    .row{
+      display: flex;
+    }
+  }
+
+ 
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    color: #fff;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .dialog-footer {
+    margin-top: 33px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
+
+  /deep/.zengjia .el-textarea__inner {
+    display: block;
+    padding: 13px 9px;
+    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;
+    margin-left: 180px;
+    margin-top: 10px;
+  }
+
+  /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: 95px;
+  }
+
+  /deep/.tuihui .el-textarea__inner {
+    display: block;
+    padding: 13px 9px;
+    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;
+    margin-left: 180px;
+    margin-top: 10px;
+  }
+
+  /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: 155px;
+    margin-top: 10px;
+  }
+
+  /deep/.addprice {
+    width: 98px;
+    margin-left: 50px;
+  }
+
+  /deep/.returnprice {
+    width: 98px;
+    margin-left: 50px;
+  }
+
+  /deep/.yuan {
+    width: 10px;
+    margin-left: 150%;
+    margin-top: -32px;
+  }
+
+  /deep/.addpricejine {
+    width: 98px;
+    margin-left: 50px;
+    margin-bottom: -37px;
+    padding-top: 20px;
+  }
+
+  /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: -19px;
+  }
+
+  .inputChenge {
+    width: 50%;
+    display: inline-flex;
+  }
+
+  .inputs {
+    margin: 0 auto;
+  }
+
+  /deep/.ketuidingjin {
+    margin-left: 135px;
+    width: 70px;
+    margin-top: -19px;
+  }
+</style>

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

@@ -0,0 +1,64 @@
+import Layout from '@/layout/index';
+
+const checkWorkListRouter = {
+    path: '/checkWorkList',
+    component: Layout,
+    redirect: { name: 'checkWorkList' },
+    name: 'checkWorkList',
+    alwaysShow: true, // will always show the root menu
+    meta: {
+        title: '人事管理',
+        module: 'customerManagement.customer.customerInfo',
+        icon: '-kehuguanli'
+    },
+    children: [{
+            path: 'checkWorkList',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/personnelManagement/checkWorkList'),
+            name: 'checkWorkList',
+            meta: {
+                title: '考勤管理',
+                shortcutEntrance: 'checkWorkList',
+                module: 'customerManagement.customer.customerInfo',
+                permissicon: [],
+                keepAlive: true,
+                // module: 'procurement.sparepart.applDetail'
+            },
+            // hidden: true
+        },
+        {
+            path: 'leaveList',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/personnelManagement/leaveList'),
+            name: 'checkWorkList',
+            meta: {
+                title: '请假管理',
+                shortcutEntrance: 'leaveList',
+                module: 'customerManagement.customer.customerInfo',
+                permissicon: [],
+                keepAlive: true,
+                // module: 'procurement.sparepart.applDetail'
+            },
+            // hidden: true
+        },
+        {
+            path: 'cardReplacementManagement',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/personnelManagement/cardReplacementManagement'),
+            name: 'cardReplacementManagement',
+            meta: {
+                title: '补卡管理',
+                shortcutEntrance: 'leaveList',
+                module: 'customerManagement.customer.customerInfo',
+                permissicon: [],
+                keepAlive: true,
+                // module: 'procurement.sparepart.applDetail'
+            },
+            // hidden: true
+        },
+
+
+
+    ],
+};
+export default checkWorkListRouter;

src/views/personnelManagement/leaveList.vue

@@ -0,0 +1,814 @@
+//客户管理
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="8">
+      <template slot="left"> </template>
+      <template slot="left">
+        <ws-input v-model="searchKeyWord" placeholder="可按客户名称、电话查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></ws-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
+
+        <!--设置默认定金比例-->
+        <el-button class="bg-bottom" type="primary" size="small" @click="installRatio()">
+          默认定金比例</el-button>
+        <el-dialog width="25%" title="设置默认定金比例" :visible.sync="outerVisibleDefaultEdit" :append-to-body="true">
+          <div style="width: 50%">
+            <div class="dingjin">定金比例(元/吨)</div>
+            <el-input type="textarea" :rows="2" placeholder="请输入定金比例" v-model="depositRatio">
+            </el-input>
+          </div>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="outerVisibleDefaultEdit = false">取 消</el-button>
+            <el-button type="primary" @click="editDefaultDepositRatio()">确 定</el-button>
+          </div>
+        </el-dialog>
+
+        <!--增加定金-->
+        <el-dialog width="30%" title="增加定金" :visible.sync="outerVisibleAdd" :append-to-body="true">
+          <div class="addprice">
+            已付定金
+            <div class="yifudingjin">
+              <template> {{ this.totalDeposit }} 元 </template>
+            </div>
+          </div>
+          <div class="addpricejine">增加金额</div>
+          <div style="width: 50%" class="zengjia">
+            <el-input type="textarea" :rows="2" maxlength="30" placeholder="请输入本次增加定金金额" v-model="money">
+            </el-input>
+            <div class="yuan">元</div>
+          </div>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="outerVisibleAdd = false">取 消</el-button>
+            <el-button type="primary" @click="editPrice(1)">确 定</el-button>
+          </div>
+        </el-dialog>
+
+        <!--退回定金-->
+        <el-dialog width="30%" title="退回定金" :visible.sync="outerVisibleReturn" :append-to-body="true">
+          <div class="returnprice">
+            可退定金
+            <div class="ketuidingjin">
+              <template>
+                {{ this.totalDeposit - this.freezingDeposit }} 元
+              </template>
+            </div>
+          </div>
+          <div class="returnpricejine">退回金额</div>
+          <div style="width: 50%" class="tuihui">
+            <el-input type="textarea" :rows="2" maxlength="30" placeholder="请输入本次退回定金金额" v-model="money">
+            </el-input>
+            <div class="yuan">元</div>
+          </div>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="outerVisibleReturn = false">取 消</el-button>
+            <el-button type="primary" @click="editPrice(2)">确 定</el-button>
+          </div>
+        </el-dialog>
+      </template>
+    </BaseHeaderLayout>
+    <el-table class="wenzi" :data="customerList.records" style="width: 100%" height="calc(100% - 110px)">
+      <el-table-column prop="index" label="序号" width="80">
+        <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="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> -->
+      </el-table-column>
+      <el-table-column prop="compAddress" label="地址"></el-table-column>
+      <el-table-column prop="customerPhone" label="电话"> </el-table-column>
+      <el-table-column width='170' 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 width='150' prop="freezingDeposit" label="冻结定金(元)">
+      </el-table-column>
+      <el-table-column width='150' class="table_td" prop="depositRatio" label="定金比例(元/吨)">
+        <template slot-scope="scope">
+          <div class="inputChenge">
+            <!-- readonly -->
+            <el-input v-model="scope.row.depositRatio" v-if="scope.row.identification == 'true'"></el-input>
+            <div v-if="scope.row.identification == 'false'" class="inputs">
+              {{ scope.row.depositRatio }}
+            </div>
+          </div>
+          <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png" @click="whether(scope.row)" v-if="scope.row.identification == 'false'"
+            alt="" />
+          <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+            v-if="scope.row.identification == 'true'" @click="varietyClick(scope.row)"></i>
+          <!-- <div>—</div> -->
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
+      <el-table-column prop="seller" label="操作" width="280">
+        <template slot-scope="scope">
+          <el-button type="primary" v-hasPermission="
+            `customerManagement.customer.customerInfo.View`
+          " @click="editClick(1, scope.row)">增加定金</el-button>
+          <el-button v-hasPermission="
+            `customerManagement.customer.customerInfo.View`
+          " type="primary" @click="editClick(2, scope.row)">退回定金</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
+  </div>
+</template>
+<script>
+  import {
+    getList,
+    installDepositRatio,
+    editCustomerInfo,
+  } from '@/model/customer/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
+    },
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
+      },
+    },
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchKeyWord: '',
+        outerVisibleDefaultEdit: false,
+        outerVisibleEdit: false,
+        outerVisibleAdd: false,
+        outerVisibleReturn: false,
+        contractType: 2,
+        searchType: 1,
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        depositRatio: '700',
+        id: '',
+        money: '',
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        customerList: [],
+        deptBudgetList: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        accessoryTFs: false,
+        customerInfo: {
+          id: '',
+          compId: '',
+          depositRatio: '',
+          flag: '',
+          money: '',
+          totalDeposit: 0,
+          freezingDeposit: 0,
+        },
+        totalDeposit: 0,
+        freezingDeposit: 0,
+      }
+    },
+    activated() {
+      this.getList()
+      this.showType = this.isShow
+    },
+    methods: {
+      //查看//传参
+      nocomplete(row) {
+        this.$router.push({
+          name: 'vehicleDispatchingview',
+          query: {
+            id: row.id,
+          },
+        })
+      },
+      dateFormat(fmt, date) {
+        let ret
+        const opt = {
+          'Y+': date.getFullYear().toString(), // 年
+          'm+': (date.getMonth() + 1).toString(), // 月
+          'd+': date.getDate().toString(), // 日
+          'H+': date.getHours().toString(), // 时
+          // "M+": date.getMinutes().toString(),         // 分
+          // "S+": date.getSeconds().toString()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
+        }
+        for (let k in opt) {
+          ret = new RegExp('(' + k + ')').exec(fmt)
+          if (ret) {
+            fmt = fmt.replace(
+              ret[1],
+              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+            )
+          }
+        }
+        return fmt
+      },
+
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      changestatus(state) {
+        this.searchType = state
+        this.getList()
+      },
+      //修改定金比例
+      varietyClick(row) {
+        if (
+          row.depositRatio < 0 ||
+          row.depositRatio > 100000 ||
+          (String(row.depositRatio).indexOf('.') != -1 &&
+            String(row.depositRatio).length -
+            (String(row.depositRatio).indexOf('.') + 1) >
+            2)
+        ) {
+          this.$message({
+            message: '定金比例输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (row.depositRatio) {
+          if (isNaN(row.depositRatio)) {
+            this.$message({
+              message: '定金比例非数字!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (!row.depositRatio) {
+          this.$message({
+            message: '定金比例不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        this.$confirm(`确定要修改定金比例？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editCustomerInfo({
+                flag: 0,
+                depositRatio: row.depositRatio,
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {})
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      whether(row) {
+        row.identification = 'true'
+      },
+      //列表查询
+      getList() {
+        getList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+            customerTypeFlag: this.customerTypeFlag,
+          })
+          .toPromise()
+          .then((response) => {
+            for (var i = 0; i < response.records.length; i++) {
+              response.records[i].identification = 'false'
+            }
+            this.customerList = response
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      //设置默认定金比例
+      installRatio() {
+        this.outerVisibleDefaultEdit = true
+      },
+      editDefaultDepositRatio() {
+        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: localStorage.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 == 1) {
+          this.outerVisibleAdd = true
+          this.customerInfo.flag = 1
+        }
+        //退回定金
+        else {
+          this.outerVisibleReturn = true
+          this.customerInfo.flag = 2
+        }
+      },
+      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 == 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 == 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
+          }
+        }
+        editCustomerInfo(this.customerInfo)
+          .toPromise()
+          .then((response) => {
+            this.outerVisibleAdd = false
+            this.outerVisibleReturn = false
+            this.outerVisibleEdit = false
+            this.getList()
+            this.money = ''
+
+            //增加定金
+            if (asdf == 1) {
+              this.$message.success('增加成功')
+            }
+            //退回定金
+            if (asdf == 2) {
+              this.$message.success('退回成功')
+            }
+          })
+      },
+      find() {
+        this.currentPage = 1
+        this.getList()
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    color: #fff;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .dialog-footer {
+    margin-top: 33px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
+
+  /deep/.zengjia .el-textarea__inner {
+    display: block;
+    padding: 13px 9px;
+    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;
+    margin-left: 180px;
+    margin-top: 10px;
+  }
+
+  /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: 95px;
+  }
+
+  /deep/.tuihui .el-textarea__inner {
+    display: block;
+    padding: 13px 9px;
+    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;
+    margin-left: 180px;
+    margin-top: 10px;
+  }
+
+  /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: 155px;
+    margin-top: 10px;
+  }
+
+  /deep/.addprice {
+    width: 98px;
+    margin-left: 50px;
+  }
+
+  /deep/.returnprice {
+    width: 98px;
+    margin-left: 50px;
+  }
+
+  /deep/.yuan {
+    width: 10px;
+    margin-left: 150%;
+    margin-top: -32px;
+  }
+
+  /deep/.addpricejine {
+    width: 98px;
+    margin-left: 50px;
+    margin-bottom: -37px;
+    padding-top: 20px;
+  }
+
+  /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: -19px;
+  }
+
+  .inputChenge {
+    width: 50%;
+    display: inline-flex;
+  }
+
+  .inputs {
+    margin: 0 auto;
+  }
+
+  /deep/.ketuidingjin {
+    margin-left: 135px;
+    width: 70px;
+    margin-top: -19px;
+  }
+</style>

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

@@ -15,96 +15,96 @@ const platformauditRouter = {
 
         // 粮商审核
         {
-          path: 'grainmerchantreview',
-          component: () =>
-            import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainmerchantreview'),
-          name: 'grainmerchantreview',
-          meta: {
-            title: 'grainmerchantreview',
-            shortcutEntrance: 'grainmerchantreview',
-            module: 'audit.grainMerchant.grainMerchantInfo',
-            permissicon: [],
-            keepAlive: true,
-            _title:'粮商审核'
-          },
+            path: 'grainmerchantreview',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainmerchantreview'),
+            name: 'grainmerchantreview',
+            meta: {
+                title: 'grainmerchantreview',
+                shortcutEntrance: 'grainmerchantreview',
+                module: 'audit.grainMerchant.grainMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '粮商审核'
+            },
         },
 
         //司机审核
         {
-          path: 'driverreview',
-          component: () =>
-            import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/driverreview'),
-          name: 'driverreview',
-          meta: {
-            title: 'driverreview',
-            shortcutEntrance: 'driverreview',
-            module: 'audit.driverMerchant.driverMerchantInfo',
-            permissicon: [],
-            keepAlive: true,
-            _title:'司机审核'
-          },
+            path: 'driverreview',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/driverreview'),
+            name: 'driverreview',
+            meta: {
+                title: 'driverreview',
+                shortcutEntrance: 'driverreview',
+                module: 'audit.driverMerchant.driverMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '司机审核'
+            },
         },
 
         //采购交易信息审核
         {
-          path: 'transactioninformationreview',
-          component: () =>
-            import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/transactioninformationreview'),
-          name: 'transactioninformationreview',
-          meta: {
-            title: 'transactioninformationreview',
-            shortcutEntrance: 'transactioninformationreview',
-            module: 'audit.tranMerchant.tranMerchantInfo',
-            permissicon: [],
-            keepAlive: true,
-            _title:'采购信息审核'
-          },
+            path: 'transactioninformationreview',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/transactioninformationreview'),
+            name: 'transactioninformationreview',
+            meta: {
+                title: 'transactioninformationreview',
+                shortcutEntrance: 'transactioninformationreview',
+                module: 'audit.tranMerchant.tranMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '采购信息审核'
+            },
         },
 
         //销售交易信息审核
         {
-          path: 'saletransactioninformationreview',
-          component: () =>
-            import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/saletransactioninformationreview'),
-          name: 'saletransactioninformationreview',
-          meta: {
-            title: 'saletransactioninformationreview',
-            shortcutEntrance: 'saletransactioninformationreview',
-            module: 'audit.tranMerchant.tranMerchantInfo',
-            permissicon: [],
-            keepAlive: true,
-            _title:'销售信息审核'
-          },
+            path: 'saletransactioninformationreview',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/saletransactioninformationreview'),
+            name: 'saletransactioninformationreview',
+            meta: {
+                title: 'saletransactioninformationreview',
+                shortcutEntrance: 'saletransactioninformationreview',
+                module: 'audit.tranMerchant.tranMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '销售信息审核'
+            },
         },
         //粮脉企业审核
         {
-          path: 'grainpulseenterprisereview',
-          component: () =>
-            import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainpulseenterprisereview'),
-          name: 'grainpulseenterprisereview',
-          meta: {
-            title: 'grainpulseenterprisereview',
-            shortcutEntrance: 'grainpulseenterprisereview',
-            module: 'audit.tranMerchant.tranMerchantInfo',
-            permissicon: [],
-            keepAlive: true,
-            _title:'粮脉企业审核'
-          },
+            path: 'grainpulseenterprisereview',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainpulseenterprisereview'),
+            name: 'grainpulseenterprisereview',
+            meta: {
+                title: 'grainpulseenterprisereview',
+                shortcutEntrance: 'grainpulseenterprisereview',
+                module: 'audit.tranMerchant.tranMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '粮脉企业审核'
+            },
         },
         //粮脉动态审核
         {
-          path: 'grainPulseDynamic',
-          component: () =>
-            import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainPulseDynamic'),
-          name: 'grainPulseDynamic',
-          meta: {
-            title: 'grainPulseDynamic',
-            shortcutEntrance: 'grainPulseDynamic',
-            module: 'audit.grainMerchant.grainMerchantInfo.review',
-            permissicon: [],
-            keepAlive: true,
-            _title:'粮脉动态审核'
-          },
+            path: 'grainPulseDynamic',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainPulseDynamic'),
+            name: 'grainPulseDynamic',
+            meta: {
+                title: 'grainPulseDynamic',
+                shortcutEntrance: 'grainPulseDynamic',
+                module: 'audit.grainMerchant.grainMerchantInfo.review',
+                permissicon: [],
+                keepAlive: true,
+                _title: '粮脉动态审核'
+            },
         },
     ],
 };

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -85,7 +85,7 @@
                 <span v-if="scope.row.taskStatus == '待审核'" class="executory"></span>
                 <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
                 <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>
-                {{ scope.row.taskStatus }}
+                {{scope.row.approveStatus?scope.row.approveStatus:scope.row.taskStatus }}
               </span>
             </template>
             <img v-if="scope.row.taskStatus == '执行中'" width="17" height="18"

src/views/warehousenew/warehousingOrder.vue

@@ -99,9 +99,9 @@
              <span @click='lookcustomer(scope.row)'>{{scope.row.customer}}</span>
             </template>
         </el-table-column> -->
-        <el-table-column prop="goodsName" label="货名" width="60">
+        <el-table-column prop="goodsName" label="货名" width="50">
         </el-table-column>
-        <el-table-column prop="inWarehouseWeight1"  width="120" class="table_td" label="入库重量">
+        <el-table-column prop="inWarehouseWeight1"  width="110" class="table_td" label="入库重量">
           <template scope="scope">
             <span v-if='scope.row.weightedit==false&&scope.row.warehouseType==2||scope.row.warehouseType==1'>{{scope.row.inWarehouseWeight1}}</span>
             <el-input style='width:80%;' v-if='scope.row.weightedit&&scope.row.warehouseType==2' v-model='scope.row.inWarehouseWeight1'></el-input>
@@ -115,7 +115,7 @@
         <el-table-column prop="profitAndLoss" class="table_td" label="盈亏（吨）"></el-table-column>
         <el-table-column prop="surplusWeight" width="80" class="table_td" label="剩余重量"></el-table-column>
         <el-table-column prop="grainFund"  width="80" class="table_td" label="粮款（元）"></el-table-column>
-        <el-table-column prop="amountEdPayable"  width="90" class="table_td" label="已付（元）">
+        <el-table-column prop="amountEdPayable"  width="110" class="table_td" label="已付（元）">
           <template scope="scope">
             <span >{{scope.row.amountEdPayable}}</span>
             <img v-if='scope.row.addressUrl' width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -125,7 +125,7 @@
         <el-table-column prop="amountNotPayable" width="80" class="table_td" label="未付（元）"></el-table-column>
         <el-table-column prop="amountMoney" width="80" class="table_td" label="费用（元）">
           <template scope="scope">
-            <span @click='costclick(scope.row)'>{{scope.row.amountMoney}}</span>
+            <span style='color:#66b1ff;' @click='costclick(scope.row)'>{{scope.row.amountMoney}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="avgCost"  width="90" class="table_td" label="平均成本"></el-table-column>
@@ -413,13 +413,13 @@
           <div class="audit_left">
             <span class="audit_name">{{item.costNo}}</span>
           </div>
-          <div class='audit_date'><span>{{item.expenseDate}}</span></div>
+          <div class='audit_date'><span>{{item.createDate}}</span></div>
         </div>
         <div class="audit_item">
           <div class="audit_left">
-            <span class="audit_name">{{item.expensesName}}</span>
+            <span class="audit_name">{{item.expenseName}}</span>
           </div>
-          <div class='audit_date'><span>{{item.expensesPrice}}</span></div>
+          <div class='audit_date'><span>{{item.distributionMoney}}</span></div>
         </div>
       </div>
     </el-dialog>
@@ -1009,6 +1009,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
       },
       costclick(row){
         this.costlist=row.expenseAllocationInfoList
+        this.dialogVisible1=true
         // getexenseinfo({id:row.id}).toPromise()
         //   .then((response) => {
         //     this.costlist=response