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

src/api/V2/statisticalReport/index.js

@@ -108,4 +108,6 @@ export const API_POST_SUBMITLOGISTICS = '/tranSettlementReport/api/submitLogisti
 //船运反馈接口
 export const API_POST_EDITTRANTASK = '/tranTaskInfo/api/editTranTask'
 //粮食单价编辑
-export const API_POST_EDIT_TRANSETTLEMENT ='/tranSettlementReport/api/editTranSettlementReport'
+export const API_POST_EDIT_TRANSETTLEMENT ='/tranSettlementReport/api/editTranSettlementReport'
+// 汽运导出
+export const API_GET_EXPORT = `/tranSettlementReport/export`

src/api/V2/universalityAudit/index.js

@@ -0,0 +1,12 @@
+// 查看
+export const API_GET_AUDITINFO= '/generalAuditInfo/getGeneralAuditInfo'
+// 编辑
+export const API_EDIT_AUDITINFO= '/generalAuditInfo/api/editGeneralAuditInfo'
+// 删除
+export const API_DEL_AUDITINFO= '/generalAuditInfo/api/deleteGeneralAuditInfo'
+// 添加
+export const API_ADD_AUDITINFO= '/generalAuditInfo/api/insertGeneralAuditInfo'
+// 列表
+export const API_LIST_AUDITINFO= '/generalAuditInfo/selectGeneralAuditInfo'
+// 类型下拉
+export const API_GET_INFO= '/commonSysParameter/getInfo'

src/components/WsUpload/index.vue

@@ -45,7 +45,7 @@
       <template v-slot:file="{ file }">
         <div class="thumbnail-group">
           <img 
-          v-if='getFileClass(file)=="ext png"||getFileClass(file)=="ext jpg"||getFileClass(file)=="ext jpeg"'
+          v-if='getFileClass(file)=="ext png"||getFileClass(file)=="ext jpg"||getFileClass(file)=="ext jpeg"||getFileClass(file)=="ext JPG"'
           :src='file.url'
             class="el-upload-list__item-thumbnail"
             :class="getFileClass(file)"

src/components/balanceAlert.vue

@@ -57,6 +57,7 @@ export default {
           if (
             this.deptBudgetList.warehouseName == '白城内陆港' ||
             this.deptBudgetList.warehouseName == '肇东金信库'||
+            this.deptBudgetList.warehouseName == '白城鹏羽库'||
             this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库'||
             this.deptBudgetList.warehouseName == '洮南向阳乡金昊'
           ) {
@@ -158,6 +159,7 @@ export default {
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
               this.deptBudgetList.warehouseName == '龙江金信库' ||
               this.deptBudgetList.warehouseName == '白城内陆港' ||
+              this.deptBudgetList.warehouseName == '白城鹏羽库' ||
               this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库' ||
               this.deptBudgetList.warehouseName == '洮南向阳乡金昊' ||
               this.deptBudgetList.warehouseName == '甘南林峰库' ||

src/global.js

@@ -25,6 +25,9 @@ export default {
         alert('当前浏览器不支持websocket')
       }
   },
+  allRoles:function(){
+    console.log(localStorage.getItem('winseaview-userInfo'))
+  },
   initWebSocket: function() {
     // 连接错误
     this.websocket.onerror =evt => {

src/lang/zh.js

@@ -658,6 +658,9 @@ export default {
     grainpulseenterprisereview: '粮脉企业审核',
     grainPulseDynamic: '粮脉动态审核',
 
+    // 通用审核
+    aduitmanagement:'审核管理',
+    universalityaudit:'通用审核',
     // 采购模块
     procurement: '采购管理',
     sparepart: '备件采购',

src/main.js

@@ -39,29 +39,30 @@ Vue.prototype.$axios = axios;
 import global from './global.js'
 Vue.prototype.global = global
 import ItemWrap from './components/item-wrap/item-wrap.vue'
-Vue.component('ItemWrap',ItemWrap)
+Vue.component('ItemWrap', ItemWrap)
 import Echart from './components/echart/index.vue'
-Vue.component('Echart',Echart)
-    // 初始化vue-amap
-    // AMap.initAMapApiLoader({
-    //   // 高德key
-    //   key: 'd5486742b76ab0969e4c3ce26f46dfc6',
-    //   // 插件集合 （插件按需引入）
-    //   plugin: ['AMap.Geolocation', 'Geolocation', 'AMap.DistrictSearch', "AMap.PlaceSearch",'AMap.Autocomplete', 'AMap.Geocoder', 'AMap.DistrictSearch'],
-    //   v: '1.4.4'
-    // });
-    // ------------ 通过域名判断起始的登陆页面 开始 --------------------
-    //使用login的Url
-    // const urls = [
-    //   'www.winsea.com',
-    //   'product-test.winsea.com',
-    //   'test.winsea.com',
-    //   'saas.winsea.com',
-    //   'saas-test.winsea.com'
-    // ]
-    // urls.includes(window.location.host)
-    //   ? localStorage.setItem('ws_login_type', 2)
-    //   : localStorage.removeItem('ws_login_type')
+Vue.component('Echart', Echart)
+import '@/utils/jsmpeg.min'
+// 初始化vue-amap
+// AMap.initAMapApiLoader({
+//   // 高德key
+//   key: 'd5486742b76ab0969e4c3ce26f46dfc6',
+//   // 插件集合 （插件按需引入）
+//   plugin: ['AMap.Geolocation', 'Geolocation', 'AMap.DistrictSearch', "AMap.PlaceSearch",'AMap.Autocomplete', 'AMap.Geocoder', 'AMap.DistrictSearch'],
+//   v: '1.4.4'
+// });
+// ------------ 通过域名判断起始的登陆页面 开始 --------------------
+//使用login的Url
+// const urls = [
+//   'www.winsea.com',
+//   'product-test.winsea.com',
+//   'test.winsea.com',
+//   'saas.winsea.com',
+//   'saas-test.winsea.com'
+// ]
+// urls.includes(window.location.host)
+//   ? localStorage.setItem('ws_login_type', 2)
+//   : localStorage.removeItem('ws_login_type')
 
 // ------------ 通过域名判断起始的登陆页面 结束 --------------------
 

src/model/profitable/index.js

@@ -13,6 +13,7 @@ import {
   API_GET_WAREHOUSE,
   API_GET_LOOK,
   API_POST_SUBMIT,
+
   API_POST_SHOUGUAN,
   API_POST_SUBMITPAY,
   API_GET_WAREHOUSE_NO,
@@ -128,4 +129,6 @@ export const getboodinfo= appRx.get(API_BOODINFO, errorCatcher, errorHandle, fil
 
 export const getcontractno= appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
 //抵粮款
-export const setfoodallowance= appRx.post(API_SET_FOODALLOWANCE, errorCatcher, errorHandle, filter)
+export const setfoodallowance= appRx.post(API_SET_FOODALLOWANCE, errorCatcher, errorHandle, filter)
+//费用下拉详情筛选
+export const getXialaList= appRx.get(API_GETXIALALIST, errorCatcher, errorHandle, filter)

src/model/statisticalReport/index.js

@@ -51,7 +51,8 @@ import {
     API_POST_INVOICELIST,
     API_POST_SUBMITLOGISTICS,
     API_POST_EDITTRANTASK,
-    API_POST_EDIT_TRANSETTLEMENT
+    API_POST_EDIT_TRANSETTLEMENT,
+    API_GET_EXPORT
 } from '@/api/V2/statisticalReport'
 //期货采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -165,4 +166,6 @@ export const submitlogistics = appRx.post(API_POST_SUBMITLOGISTICS, errorCatcher
 // 船运反馈
 export const edittrantask = appRx.post(API_POST_EDITTRANTASK, errorCatcher, errorHandle, filter)
 // 船运反馈
-export const editgrainprice = appRx.post(API_POST_EDIT_TRANSETTLEMENT, errorCatcher, errorHandle, filter)
+export const editgrainprice = appRx.post(API_POST_EDIT_TRANSETTLEMENT, errorCatcher, errorHandle, filter)
+// 船运反馈
+export const getexport = appRx.post(API_GET_EXPORT)

src/model/universalityAudit/index.js

@@ -0,0 +1,23 @@
+import { errorCatcher, errorHandle, filter } from 'base-core-lib'
+import { appRx } from '../defalutConfig/indexRx'
+
+import {
+    API_GET_AUDITINFO,
+    API_EDIT_AUDITINFO,
+    API_DEL_AUDITINFO,
+    API_ADD_AUDITINFO,
+    API_LIST_AUDITINFO,
+    API_GET_INFO
+} from '@/api/V2/universalityAudit'
+// 查看
+export const getaduitinfo = appRx.get(API_GET_AUDITINFO, errorCatcher, errorHandle, filter)
+// 编辑
+export const editaduitinfo = appRx.get(API_EDIT_AUDITINFO, errorCatcher, errorHandle, filter)
+// 删除
+export const deladuitinfo = appRx.get(API_DEL_AUDITINFO, errorCatcher, errorHandle, filter)
+// 添加
+export const addaduitinfo = appRx.post(API_ADD_AUDITINFO, errorCatcher, errorHandle, filter)
+// 列表
+export const aduitinfoList = appRx.get(API_LIST_AUDITINFO, errorCatcher, errorHandle, filter)
+// 类型下拉
+export const xiala = appRx.get(API_GET_INFO, errorCatcher, errorHandle, filter)

src/store/modules/user.js

@@ -210,6 +210,7 @@ const actions = {
           commit('SET_COMPANY', '')
           // commit('SET_TRAIN', '')
           commit('SET_ROLES', [])
+          commit('SET_OPEN_ROUTE', [])
           commit('SET_GUIDE_INFO', [])
           commit('permission/SET_ROUTES', [], { root: true }) // 清空路由，因为有权限管理
           localStorage.removeItem('wf-pf_admin-token')

src/utils/util.js

@@ -20,6 +20,23 @@ export const loadStyle = (url, callback) => {
   }
 };
 
+export const allRoles=()=>{
+  var currectRole={
+    roleName:'',
+    roles:[]
+  }
+  var roles=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.roles
+  currectRole.roles=roles
+  for (let i = 0; i < roles.length; i++) {
+    if(currectRole.roleName==''){
+      currectRole.roleName=roles[i].roleName
+    }else{
+      currectRole.roleName=currectRole.roleName+','+roles[i].roleName
+    }
+  }
+  return currectRole
+  console.log(roles)
+};
 /**
  * 动态插入js
  */

src/views/contractManagement/purchaseContract.vue

@@ -268,6 +268,7 @@ import {
 import {
   downloadFile
 } from '@/utils/batchDown'
+import { allRoles } from '@/utils/util'
 import { hasPermission } from '../../utils/getHasPermission'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -412,6 +413,7 @@ export default {
     }
   },
   activated() {
+    console.log(allRoles())
     this.applstatus = hasPermission('contractManagement.buyContract.buyContractInfo.appl')
     this.jiesuanstatus = hasPermission('contractManagement.buyContract.buyContractInfo.jiedan')
     this.fapiaostatus = hasPermission('contractManagement.buyContract.buyContractInfo.fapiao')

src/views/contractManagement/purchaseContractAdd.vue

@@ -635,6 +635,8 @@ import { isUndefined } from 'xe-utils/methods'
           .toPromise()
           .then((response) => {
             this.deptBudgetList = response
+            this.newSelectedOptions=  this.deptBudgetList.sourceProvince +'/'+this.deptBudgetList.sourceCity +'/'+this.deptBudgetList.sourceArea 
+          this.newSelectedOptions1 = this.deptBudgetList.deliveryProvince +'/'+this.deptBudgetList.deliveryCity +'/'+this.deptBudgetList.deliveryArea
             if(this.deptBudgetList.personPhone){
               this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.split(',')
             }
@@ -726,7 +728,7 @@ import { isUndefined } from 'xe-utils/methods'
         console.log(item);
       },
       sellerSelect(item) {
-        console.log(item)
+        // console.log(item)
         for (let i = 0; i < this.customerinfo.length; i++) {
           console.log(this.customerinfo[i].customerName,item)
           if(this.customerinfo[i].customerName==item){
@@ -739,7 +741,7 @@ import { isUndefined } from 'xe-utils/methods'
         for (let i = 0; i < this.customerinfo.length; i++) {
           console.log(this.customerinfo[i].customerName,item)
           if(this.customerinfo[i].customerName==item){
-            this.deptBudgetList.buyPhone=this.customerinfo[i].customerPhone
+            this.deptBudgetList.buyerPhone=this.customerinfo[i].customerPhone
           }
         }
       },
@@ -919,8 +921,8 @@ import { isUndefined } from 'xe-utils/methods'
           .then((response) => {
             this.feedbackLeaders = response
             let _obj = []   //发货反馈负责人下拉列表第一个添加  "无需发货反馈（默认）"
-            _obj.staffName = "无需发货反馈（默认）"
-            _obj.staffMobilePhone = "(默认)"
+            _obj.staffName = "无需发货反馈"
+            _obj.staffMobilePhone = ""
             this.feedbackLeaders.unshift(_obj)
           })
         //关联合同

src/views/contractManagement/salesContractAdd.vue

@@ -588,6 +588,8 @@
           .toPromise()
           .then((response) => {
             this.deptBudgetList = response
+            this.newSelectedOptions=  this.deptBudgetList.sourceProvince +'/'+this.deptBudgetList.sourceCity +'/'+this.deptBudgetList.sourceArea 
+          this.newSelectedOptions1 = this.deptBudgetList.deliveryProvince +'/'+this.deptBudgetList.deliveryCity +'/'+this.deptBudgetList.deliveryArea
             if(this.deptBudgetList.personPhone){
               this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.split(',')
             }

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -231,6 +231,10 @@ export default {
   watch: {},
   data() {
     return {
+      leftFJPrice:{},
+      leftFJIndex:0,
+      rightFJPrice:{},
+      rightFJIndex:0,
       isSolidFood: false,
       isShowTip: false,
       price: 0,
@@ -674,13 +678,13 @@ export default {
     },
     // 增加分界
     add(item, item1, index) {
-      // let _data = this.detailList;
-      // if (item.index > 2) {
-      //   this.$message({
-      //     message: '最多插入3个分界值',
-      //     type: 'warning',
-      //   })
-      // } else {
+      let _data = this.detailList;
+      if (item.index > 2) {
+        this.$message({
+          message: '最多插入3个分界值',
+          type: 'warning',
+        })
+      } else {
         item.index++
         item.detailList.splice(index + 1, 0, {
           name: '分界',
@@ -694,7 +698,7 @@ export default {
           type: 4,
         })
         this.makeSpliceIndex(item, item1, index)
-      // }
+      }
     },
     // 减少分界
     reduce(item, item1, index) {
@@ -1522,9 +1526,8 @@ export default {
                 _obj.priceOther = this.keepTwoDecimal(priceList[i].val)
               }
             }
-
             _list.push(_obj)
-            // console.log('_list', _list)
+            console.log('_list', _list)
           }
         } else {
           _obj = {}
@@ -1576,9 +1579,12 @@ export default {
       let that = this
       this.left = []
       this.right = []
+      
       let _priceList = this.priceList
       for (let i = 0; i < _priceList.length; i++) {
         for (let k = 0; k < _priceList[i].checkList.length; k++) {
+          this.rightFJIndex=0
+          this.leftFJIndex=0
           let _leftObj = {}
           _leftObj.level = _priceList[i].checkList[k]
           _leftObj.basicUnitPrice = parseFloat(_priceList[i].basicUnitPrice)
@@ -1662,13 +1668,38 @@ export default {
                   if (j == index) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
-                    baseprice = parseFloat(
+                      if(_priceList[i].detailList[j].type==5){
+                        this.leftFJIndex++
+                        if(this.leftFJIndex==1){
+                          baseprice = parseFloat(
                       parseFloat(_priceList[i].basicUnitPrice) +
                         ((parseFloat(_priceList[i].detailList[j + 2].water) -
                           parseFloat(_priceList[i].detailList[j].water)) /
                           0.1) *
                           parseFloat(_priceList[i].detailList[j + 1].jfprice)
                     )
+                    this.leftFJPrice = baseprice
+                        }else if(this.leftFJIndex>1){
+                          baseprice = parseFloat(
+                      parseFloat(this.leftFJPrice) +
+                        ((parseFloat(_priceList[i].detailList[j + 2].water) -
+                          parseFloat(_priceList[i].detailList[j].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[j + 1].jfprice)
+                    )
+                    this.leftFJPrice = baseprice
+                        }
+                      }else{
+                        baseprice = parseFloat(
+                      parseFloat(_priceList[i].basicUnitPrice) +
+                        ((parseFloat(_priceList[i].detailList[j + 2].water) -
+                          parseFloat(_priceList[i].detailList[j].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[j + 1].jfprice)
+                    )
+                      }
+
+                  
                   }
                   _leftObj.priceList.push({
                     index: j,
@@ -1729,6 +1760,29 @@ export default {
                   if (k == index) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
+                    if(_priceList[i].detailList[k].type==5){
+                      this.rightFJIndex++
+                      if(this.rightFJIndex==1){
+                        baseprice = parseFloat(
+                      parseFloat(_priceList[i].basicUnitPrice) -
+                        ((parseFloat(_priceList[i].detailList[k].water) -
+                          parseFloat(_priceList[i].detailList[k - 2].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[k - 1].jfprice)
+                    )
+                    this.rightFJPrice = baseprice
+                      }else if(this.rightFJIndex>1){
+                        baseprice = parseFloat(
+                      parseFloat(this.rightFJPrice) -
+                        ((parseFloat(_priceList[i].detailList[k].water) -
+                          parseFloat(_priceList[i].detailList[k - 2].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[k - 1].jfprice)
+                    )
+                    this.rightFJPrice = baseprice
+                      }
+                    }else{
+                      
                     baseprice = parseFloat(
                       parseFloat(_priceList[i].basicUnitPrice) -
                         ((parseFloat(_priceList[i].detailList[k].water) -
@@ -1736,6 +1790,8 @@ export default {
                           0.1) *
                           parseFloat(_priceList[i].detailList[k - 1].jfprice)
                     )
+                    }
+
                   }
                   _rightObj.priceList.push({
                     index: k,
@@ -1844,6 +1900,7 @@ export default {
     calculatePriceRight(_waterMax) {
       //获取每个分界值
       let _listResult = []
+      debugger
       for (let i = 0; i < this.right.length; i++) {
         let _list = this.right[i].priceList
         let tmp = {}

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -434,7 +434,7 @@
                     v-model="deptBudgetList.reImperfectGrain" type="number" @mousewheel.native.prevent
                     placeholder="请输入不完善粒占比" maxlength="40" size="small" />
                 </ws-form-item>
-                <!-- <ws-form-item v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3" label="水分增价（元/公斤）" span="1" prop="imperfectGrain">
+                <ws-form-item v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3" label="水分增价（元/公斤）" span="1" prop="imperfectGrain">
                   <ws-input v-if='statusTypetext != "复检"'
                     v-model="deptBudgetList.waterPriceIncrease" type="number" @input="deductionchange"
                     placeholder="请输入水分增价" maxlength="40" size="small" />
@@ -453,7 +453,7 @@
                   <ws-input v-if='statusTypetext != "复检"'
                     v-model="deptBudgetList.qualityPriceDeduction" type="number" @input="deductionchange"
                     placeholder="请输入质量扣价" maxlength="40" size="small" />
-                </ws-form-item> -->
+                </ws-form-item>
               </ws-info-table>
               <ws-info-table v-if="zjJurisdiction&&statusTypetext == '初检'||statusTypetext != '初检'">
                 <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice"
@@ -897,7 +897,7 @@ export default {
               managementType: 1,
               statusType: that.statusType,
               serviceManagementType: that.serviceManagementType,
-              loadingstatus: 1,
+              // loadingstatus: 1,
             })
               .toPromise()
               .then((response) => {
@@ -2735,36 +2735,36 @@ export default {
 
 
       }
-      // if (this.serviceManagementType==3&&this.zjJurisdiction&&this.statusTypetext=='初检') {
-      //   if (this.deptBudgetList.waterPriceIncrease>10||this.deptBudgetList.waterPriceIncrease<0) {
-      //     this.$message({
-      //       message: '水分增价输入错误',
-      //       type: 'warning',
-      //     })
-      //     return
-      //   }
-      //   if (this.deptBudgetList.waterPriceDeduction>10||this.deptBudgetList.waterPriceDeduction<0) {
-      //     this.$message({
-      //       message: '水分扣价输入错误',
-      //       type: 'warning',
-      //     })
-      //     return
-      //   }
-      //   if (this.deptBudgetList.qualityPriceIncrease>10||this.deptBudgetList.qualityPriceIncrease<0) {
-      //     this.$message({
-      //       message: '质量增价输入错误',
-      //       type: 'warning',
-      //     })
-      //     return
-      //   }
-      //   if (this.deptBudgetList.qualityPriceDeduction>10||this.deptBudgetList.qualityPriceDeduction<0) {
-      //     this.$message({
-      //       message: '质量扣价输入错误',
-      //       type: 'warning',
-      //     })
-      //     return
-      //   }
-      // }
+      if (this.serviceManagementType==3&&this.zjJurisdiction&&this.statusTypetext=='初检') {
+        if (this.deptBudgetList.waterPriceIncrease>10||this.deptBudgetList.waterPriceIncrease<0) {
+          this.$message({
+            message: '水分增价输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.waterPriceDeduction>10||this.deptBudgetList.waterPriceDeduction<0) {
+          this.$message({
+            message: '水分扣价输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.qualityPriceIncrease>10||this.deptBudgetList.qualityPriceIncrease<0) {
+          this.$message({
+            message: '质量增价输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.qualityPriceDeduction>10||this.deptBudgetList.qualityPriceDeduction<0) {
+          this.$message({
+            message: '质量扣价输入错误',
+            type: 'warning',
+          })
+          return
+        }
+      }
        if (this.serviceManagementType==3&&this.qyJurisdiction&&this.statusTypetext=='初检'
       ||this.serviceManagementType==3&&this.statusTypetext!='初检'
       ||this.serviceManagementType==1) {

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -24,6 +24,9 @@
 
         <div class="bottom">
           <div class="bg-left titleup"><span class="word_css">实时监控</span></div>
+          <!-- <div>
+            <canvas id="video" class="canvas"></canvas>
+          </div> -->
           <div v-if="!monitorUrl1" class="video1">
             <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
             <div>监控视频未连接</div>
@@ -301,7 +304,6 @@
     getsettleaccout,
     newSubmit
   } from '@/model/houseSelfCollect/index'
-
   import {
     addstorageputList
   } from '@/model/warehouse/index'
@@ -477,7 +479,11 @@
         id: '',
         inOutData: {},
         idPrint: '',
-        ewCustomerOptions: [{
+        ewCustomerOptions: [
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        },{
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -487,13 +493,13 @@
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
         }, {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         }],
         companyNameOptions: [{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        },{
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -503,9 +509,6 @@
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
         }, {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        },{
           value: '榆树市保寿镇保寿村民胜粮食加工有限公司',
           label: '榆树市保寿镇保寿村民胜粮食加工有限公司'
         }, ],
@@ -532,6 +535,8 @@
       }
     },
     mounted() {
+      
+      // this.getVideos()
       this.isShowBalance = true
       var _saomaData = JSON.parse(localStorage.getItem('saoma_data')) //判断是否扫码进来的
       // }
@@ -616,6 +621,12 @@
 
     },
     methods: {
+      getVideos(){debugger
+          let canvas = document.getElementById('video')
+          let url = 'ws://127.0.0.1:8082'
+          var player = new JSMpeg.Player(url, {canvas: canvas})
+          console.log(player)
+    },
       refreshClick(type) {
         let that = this
         if (type == 1) {
@@ -2438,4 +2449,8 @@
     border-right: 4px solid #2aff7c;
     // border-bottom: 1px solid #2aff7c ;
   }
+  .canvas{
+    width: 300px;
+    height:300px
+  }
 </style>

src/views/houseSelfCollect/paymentManagement.vue

@@ -1564,7 +1564,7 @@
             posthandle({
                 taskId: item.taskId,
                 approved: status,
-                auditMind: reason != undefined ? '已驳回' : '34',
+                auditMind: reason != undefined ? '已驳回' : '',
                 needReapply: status2 != undefined ? true : false,
               })
               .toPromise()

src/views/houseSelfCollect/weighingManagement.vue

@@ -202,6 +202,9 @@
     data() {
       return {
         ewCustomerOptions: [{
+            value: '黑龙江中天昊元贸易有限公司',
+            label: '黑龙江中天昊元贸易有限公司'
+          },{
             value: '黑龙江利润元粮食贸易有限公司',
             label: '黑龙江利润元粮食贸易有限公司'
           }, {
@@ -210,11 +213,11 @@
           }, {
             value: '黑龙江鑫满仓粮食贸易有限公司',
             label: '黑龙江鑫满仓粮食贸易有限公司'
-          }, {
-            value: '黑龙江中天昊元贸易有限公司',
-            label: '黑龙江中天昊元贸易有限公司'
           }],
         companyNameOptions: [{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        },{
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -223,10 +226,7 @@
         }, {
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
-        }, {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, ],
+        },  ],
          companyNameOptions1: [
             {
           value: '黑龙江中天昊元贸易有限公司',

src/views/newTask/listPage.vue

@@ -59,7 +59,7 @@
           infinite-scroll-distance="30">
         <li v-for="(i, index) in listShow"
             :key="index"
-            v-if='i.businessType!="BUY"&&i.businessType!="SALE"'
+            v-if='i.businessType!="BUY"&&i.businessType!="SALE"&&i.businessType!="DAICHU"'
             class="list-item"
             @click="goPath(i)">
           <!-- 图标 -->
@@ -431,7 +431,9 @@ export default {
           }else{
             console.log(url)
              this.$router.push({
-              name: url
+              name: url,query:{
+                id:data.id
+              }
             })
           }
           // 产品 船舶检查

src/views/outboundManagement/weighingManagementNew.vue

@@ -782,7 +782,7 @@
                   warehouseName: that.warehouseName,
                   managementType: 3,
                   statusType: that.statusType,
-                  loadingstatus: 1,
+                  // loadingstatus: 1,
                 })
                 .toPromise()
                 .then((response) => {
@@ -1091,6 +1091,9 @@
       },
 
       listclick(row) {
+        if(this.tpyeNo == 2){
+          
+        }
         this.id = row.id
         getweighing({
             id: row.id,
@@ -2342,7 +2345,7 @@
         //合同编号
         xialaNo({
             compId: localStorage.getItem('ws-pf_compId'),
-            loadingstatus: 1,
+            // loadingstatus: 1,
             flag: 5,
           })
           .toPromise()

src/views/personnelManagement/cardReplacementManagement.vue

@@ -122,7 +122,7 @@
             woekflowhandle({
               taskId: row.taskId,
               approved:true,
-              auditMind: '34',
+              auditMind: '',
               needReapply: true,
             }).toPromise()
             .then((response) => {
@@ -156,7 +156,7 @@
             woekflowhandle({
               taskId: row.taskId,
               approved:false,
-              auditMind: '34',
+              auditMind: '',
               needReapply: true,
             }).toPromise()
             .then((response) => {

src/views/personnelManagement/leaveList.vue

@@ -229,7 +229,7 @@
             woekflowhandle({
               taskId: row.taskId,
               approved:true,
-              auditMind: '34',
+              auditMind: '',
               needReapply: true,
             }).toPromise()
             .then((response) => {
@@ -263,7 +263,7 @@
             woekflowhandle({
               taskId: row.taskId,
               approved:false,
-              auditMind: '34',
+              auditMind: '',
               needReapply: true,
             }).toPromise()
             .then((response) => {

src/views/profitable/cashout.vue

@@ -570,7 +570,9 @@
             this.deptBudgetList.expenseAllocationInfoList=[]
           }else if(this.deptBudgetList.type=='非粮款'){
             this.deptBudgetList.costType=3
-            this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
+            if(this.mode!="暂不分配"){
+              this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
+            }
           }else if(this.deptBudgetList.type=='保证金'){
             this.deptBudgetList.costType=5
             this.deptBudgetList.expenseAllocationInfoList=[]

src/views/profitable/cashoutaduit.vue

@@ -136,20 +136,20 @@
       
     </div>
     <el-dialog
-      title="驳回"
+      :title="title"
       :visible.sync="rejectshow"
       width="30%"
       :before-close="handleClose">
-      <span>驳回原因</span>
+      <span>{{title=='驳回'?'驳回审核':'通过审核'}}</span>
       <div><el-input
   type="textarea"
   :rows="2"
-  placeholder="请输入驳回原因"
+  placeholder="请输入审核意见"
   v-model="textarea">
 </el-input>
 </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button @click="rejectshow = false">取 消</el-button>
         <el-button type="primary" @click="rejectclick">确 定</el-button>
       </span>
     </el-dialog>
@@ -184,6 +184,7 @@ import WsUpload from '@/components/WsUpload'
         warecontractList:[],
         textarea:'',
         size:100,
+        title:'驳回',
         feeDetailsDistributions:[{proDate:'',weight:'',money:'',warehouse:'',belonging:'',index:0}],
         deptBudgetList:{},
         makeWordData: {},
@@ -219,10 +220,44 @@ import WsUpload from '@/components/WsUpload'
             type: 'warning'
           })
           .then(() => {
-            woekflowhandle({
+            this.title='通过'
+            this.rejectshow=true
+            
+          })
+      },
+      returnsales(){
+        this.$router.go(-1)
+      },
+      reject(){
+        this.title='驳回'
+        this.rejectshow=true
+      },
+      rejectclick(){
+        if(this.title=='驳回'){
+          woekflowhandle({
+            taskId: this.deptBudgetList.taskId,
+            approved:false,
+            auditMind: this.textarea,
+            needReapply: true,
+          }).toPromise()
+          .then((response) => {
+            this.$message({
+              message: '驳回成功!',
+              type: 'success',
+            })
+            this.rejectshow=false
+            this.$router.go(-1)
+          }).catch((response) => {
+            this.$message({
+              message: '驳回失败!',
+              type: 'error',
+            })
+          })
+        }else{
+          woekflowhandle({
               taskId: this.deptBudgetList.taskId,
               approved:true,
-              auditMind: '34',
+              auditMind: this.textarea,
               needReapply: true,
             }).toPromise()
             .then((response) => {
@@ -237,34 +272,8 @@ import WsUpload from '@/components/WsUpload'
                 type: 'error',
               })
             })
-          })
-      },
-      returnsales(){
-        this.$router.go(-1)
-      },
-      reject(){
-        this.rejectshow=true
-      },
-      rejectclick(){
-        woekflowhandle({
-          taskId: this.deptBudgetList.taskId,
-          approved:false,
-          auditMind: this.textarea,
-          needReapply: true,
-        }).toPromise()
-        .then((response) => {
-          this.$message({
-            message: '驳回成功!',
-            type: 'success',
-          })
-          this.rejectshow=false
-          this.$router.go(-1)
-        }).catch((response) => {
-          this.$message({
-            message: '驳回失败!',
-            type: 'error',
-          })
-        })
+        }
+        
       },
       getList() {
        getcontract({

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

@@ -401,22 +401,22 @@ const profitableRouter = {
     // 油费
     },
     // 保证金
-    // {
-    //   path: 'earnestmoney',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/earnestmoney'),
-    //   name: 'earnestmoney',
-    //   meta: {
-    //     title: 'earnestmoney',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'lirunhesuan.feiyongguanli.view',
-    //     permissicon: [],
-    //     keepAlive: true,
-    //     _title:'保证金'
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    // // 油费
-    // },
+    {
+      path: 'earnestmoney',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/earnestmoney'),
+      name: 'earnestmoney',
+      meta: {
+        title: 'earnestmoney',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan.feiyongguanli.view',
+        permissicon: [],
+        keepAlive: true,
+        _title:'保证金'
+        // module: 'procurement.sparepart.applDetail'
+      },
+    // 油费
+    },
     {
       path: 'oilcost',
       component: () =>

src/views/profitable/contractprofitsdetails.vue

@@ -93,8 +93,8 @@
           <el-table-column prop="signingDate" label="签订日期"></el-table-column>
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
-              <!-- <el-button v-if="scope.row.status=='已结算'" @click="finalstatement(scope.row)" type="primary">结算单</el-button>
-              <el-button v-if="scope.row.status=='已完成'" @click="closeaccount(scope.row)" type="primary">结算</el-button> -->
+              <el-button v-if="scope.row.status=='已结算'" @click="finalstatement(scope.row)" type="primary">结算单</el-button>
+              <el-button v-if="scope.row.status=='已完成'" @click="closeaccount(scope.row)" type="primary">结算</el-button>
               <el-button @click="inventory(scope.row)" type="primary">库存</el-button>
               <el-button @click="cost(scope.row)" type="primary">费用</el-button>
             </template>

src/views/profitable/earnestmoney.vue

@@ -227,7 +227,7 @@
           });
           return
         }
-        if(this.form.amountMoney>this.form.money||this.form.amountMoney<0||String(this.form.amountMoney).indeOf('.')!= -1 &&
+        if(this.form.amountMoney>this.form.money||this.form.amountMoney<0||String(this.form.amountMoney).indexOf('.')!= -1 &&
             String(this.deptBudgetList.weight).length -
             (String(this.deptBudgetList.weight).indexOf('.') + 1) >
             2){

src/views/profitable/expensemanagementdetails.vue

@@ -157,13 +157,13 @@
           </el-table-column>
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
-              <el-button @click="look(scope.row)" type="primary">查看</el-button>
+              <el-button v-if="scope.row.expenseName!='保证金抵粮款'" @click="look(scope.row)" type="primary">查看</el-button>
               <div v-hasPermission="`lirunhesuan.feiyongguanli.queshou`" style="display: inline-block">
                 <el-button v-if="
-                  scope.row.status == '待确认' && scope.row.expensesType == 1&&scope.row.costType!=5
+                  scope.row.status == '待确认' &&scope.row.expenseName!='保证金抵粮款'
                 " @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
                 <el-button v-if="
-                  scope.row.status == '待确认' && scope.row.expensesType == 1&&scope.row.costType==5
+                  scope.row.status == '待确认'&&scope.row.expenseName=='保证金抵粮款'
                 " @click="shoukuanqueren1(scope.row)" type="primary">确认</el-button>
               </div>
               <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
@@ -292,6 +292,7 @@
   </div>
 </template>
 <script>
+import { allRoles } from '@/utils/util'
 import WsUpload from '@/components/WsUpload'
 import {
   getInOutDetailed,
@@ -338,7 +339,7 @@ export default {
       intotal: 0,
       fujianshow: false,
       appendixIdss: [],
-      appendixIdss1: [],
+      appendixIdss1:'',
       approveStatus: false,
       currectdata:{},
       choiceObj: [],
@@ -450,6 +451,7 @@ export default {
           message: '提交成功!',
           type: 'success',
         })
+        this.dialogVisible=false
         this.getList()
         // this.$router.go(-1)
       })
@@ -680,7 +682,8 @@ export default {
       }
     },
     allotaduit(row) {
-      if (localStorage.getItem('ws-pf_roleName') == '单证中心主任') {
+      var role=allRoles()
+      if (role.roleName.indexOf('单证中心主任') != -1) {
         localStorage.setItem(
           'expenseqr',
           JSON.stringify(row.expenseAllocationInfoList)

src/views/profitable/oilcost.vue

@@ -294,7 +294,7 @@
             woekflowhandle({
               taskId: row.taskId,
               approved:true,
-              auditMind: '34',
+              auditMind: '',
               needReapply: true,
             }).toPromise()
             .then((response) => {
@@ -328,7 +328,7 @@
             woekflowhandle({
               taskId: row.taskId,
               approved:false,
-              auditMind: '34',
+              auditMind: '',
               needReapply: true,
             }).toPromise()
             .then((response) => {

src/views/profitable/payment.vue

@@ -60,7 +60,8 @@
                :preview-src-list="srcList"></el-image></span>
               -->
               <ws-upload ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
-        @onChange="onChange" 
+              :limit="99"
+              @onChange="onChange" 
        />
           </div>
         </el-form-item>
@@ -105,7 +106,7 @@
           name: '玉米',
           count: 2000,
         }],
-        size:9,
+        size:99,
         compId:localStorage.getItem('ws-pf_compId'),
         rejectshow:false,
         deptBudgetList:{},

src/views/purchasingManagement/purchaseOrderList.vue

@@ -1214,7 +1214,7 @@
               posthandle({
                   taskId: this.aduitlist.taskId,
                   approved: true,
-                  auditMind: '34',
+                  auditMind: '',
                   needReapply: false,
                 })
                 .toPromise()

src/views/salesManagement/salesPlanOrderList.vue

@@ -1272,7 +1272,7 @@
               posthandle({
                   taskId: this.aduitlist.taskId,
                   approved: true,
-                  auditMind: '34',
+                  auditMind: '',
                   needReapply: false,
                 })
                 .toPromise()

src/views/statisticalReport/autoSettlementList.vue

@@ -16,6 +16,7 @@
           </ws-button>
           <ws-button type="primary" v-hasPermission="`report.transportationReport.draw`" @click="handleninvoice">开发票
           </ws-button>
+          <ws-button type="primary" @click="exportlist">导出</ws-button>
           <ws-button type="primary" @click="editRecord">记录</ws-button>
           <!-- v-hasPermission="`report.transportationReport.payment`" -->
         </el-col>
@@ -425,7 +426,8 @@ import {
   autopaymoney,
   openinvoicelist,
   submitlogistics,
-  editgrainprice
+  editgrainprice,
+  getexport
   // postaudit,
   //   getselectctcontractno,
 } from '@/model/statisticalReport/index'
@@ -444,8 +446,9 @@ import {
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import {
-  EventBus
-} from 'base-core-lib'
+    dayjs,
+    EventBus
+  } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -560,6 +563,10 @@ export default {
         paymentScreenshot: '',
         id: '',
       },
+      date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
       carType:'',
       settlementPrice:0,
       amountNotPayable: 0,
@@ -588,6 +595,27 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    async exportlist() {
+      if(this.modification.length>0){
+        const {
+          data
+        } = await getexport({
+          tranSettlementReportList:this.modification,
+        }, {}, {
+          responseType: 'blob',
+        }).toPromise()
+        downloadFile({
+          res: data,
+          fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_汽运结算`,
+          type: 'xls',
+        })
+      }else{
+        this.$message.warning('请勾选要导出的条目')
+      }
+        
+      },
     editgrainPrice(){
       if(this.grainPricetext=='编辑'){
         this.grainPricetext='提交'
@@ -1288,7 +1316,7 @@ export default {
         posthandle({
           taskId: item.taskId,
           approved: status,
-          auditMind: reason != undefined ? '已驳回' : '34',
+          auditMind: reason != undefined ? '已驳回' : '',
           needReapply: status2 != undefined ? true : false,
         })
           .toPromise()
@@ -1605,28 +1633,6 @@ export default {
           this.historyList = response
         })
     },
-    async exportlist() {
-      const {
-        data
-      } = await export1({
-        compId: localStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-      }, {}, {
-        responseType: 'blob'
-      }).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${this.date.year + (this.date.month ? `-${this.date.month}` : '')
-          }_采购合同`,
-        type: 'xls',
-      })
-    },
     total() { },
   },
 }

src/views/statisticalReport/huoyunList.vue

@@ -1041,7 +1041,7 @@
           posthandle({
               taskId: item.taskId,
               approved: status,
-              auditMind: reason != undefined ? '已驳回' : '34',
+              auditMind: reason != undefined ? '已驳回' : '',
               needReapply: status2 != undefined ? true : false,
             })
             .toPromise()

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -316,7 +316,7 @@
           posthandle({
               taskId: item.taskId,
               approved: status,
-              auditMind: reason != undefined ? '已驳回' : '34',
+              auditMind: reason != undefined ? '已驳回' : '',
               needReapply: status2 != undefined ? true : false,
             })
             .toPromise()

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -648,7 +648,7 @@
           posthandle({
               taskId: item.taskId,
               approved: status,
-              auditMind: reason != undefined ? '已驳回' : '34',
+              auditMind: reason != undefined ? '已驳回' : '',
               needReapply: status2 != undefined ? true : false,
             })
             .toPromise()

src/views/statisticalReport/shippingList.vue

@@ -1042,7 +1042,7 @@
           posthandle({
               taskId: item.taskId,
               approved: status,
-              auditMind: reason != undefined ? '已驳回' : '34',
+              auditMind: reason != undefined ? '已驳回' : '',
               needReapply: status2 != undefined ? true : false,
             })
             .toPromise()

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -600,6 +600,7 @@ export default {
           //终到地 终到地详细地址  默认第一运输阶段的收货地区（需求）
           this.handleChange1(tmp)
           this.endDetailedAddressChange()
+          this.$forceUpdate()
         }
       }
     },
@@ -818,6 +819,7 @@ export default {
     endDetailedAddressChange(){
       //终到地详细地址  默认第一运输阶段的收货地详细地址（需求）
      this.deptBudgetList.tranProcessInfoList[0].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
+     this.$forceUpdate()
     },
     handleChange3(value, index) {
       this.deptBudgetList.tranProcessInfoList[index].sendPrivate =

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -779,7 +779,7 @@
             woekflowhandle({
                 taskId: list.taskId,
                 approved: true,
-                auditMind: '34',
+                auditMind: '',
                 needReapply: false,
               })
               .toPromise()

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

@@ -12,6 +12,22 @@ const tranManagementRouter = {
     icon: '-yunshu2'
   },
   children: [
+    //汽运调度
+    {
+      path: 'vehicleDispatching',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicle'),
+      name: 'vehicleDispatching',
+      meta: {
+        title: 'tranManagementVehicle',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManager.vehicleDispatching',
+        permissicon: [],
+        keepAlive: true,
+        _title:'汽运调度'
+      },
+
+    },
 
     //火运调度
     {
@@ -109,22 +125,7 @@ const tranManagementRouter = {
     //   },
     //   hidden: true
     // },
-    //汽运调度
-    {
-      path: 'vehicleDispatching',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicle'),
-      name: 'vehicleDispatching',
-      meta: {
-        title: 'tranManagementVehicle',
-        shortcutEntrance: 'tranManagement',
-        module: 'tranManager.vehicleDispatching',
-        permissicon: [],
-        keepAlive: true,
-        _title:'汽运调度'
-      },
-
-    },
+    
     //船运调度
     {
       path: 'shippingDispatching',

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -45,11 +45,11 @@
             >
 
             <!--发货地址-->
-            <ws-form-item label="发货地址" span="1" prop="netWeight">
+            <!-- <ws-form-item label="发货地址" span="1" prop="netWeight">
               {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
               }}{{ deptBudgetList.sendArea
               }}{{ deptBudgetList.sendDetailedAddress }}
-            </ws-form-item>
+            </ws-form-item> -->
             <!--发货人-->
             <ws-form-item label="发货人" span="1" prop="agent">{{
               deptBudgetList.sender
@@ -60,11 +60,11 @@
               deptBudgetList.senderPhone
             }}</ws-form-item>
             <!--收货地址-->
-            <ws-form-item label="收货地址" span="1" prop="netWeight">
+            <!-- <ws-form-item label="收货地址" span="1" prop="netWeight">
               {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
               }}{{ deptBudgetList.receiveArea
               }}{{ deptBudgetList.receiveDetailedAddress }}
-            </ws-form-item>
+            </ws-form-item> -->
             <!--收货人-->
             <ws-form-item label="收货人" span="1" prop="receiver">{{
               deptBudgetList.receiver

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -31,11 +31,11 @@
                 <el-input type="text" class="row-item" v-model="deptBudgetList.weight" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item label="发货地址" span="1" prop="netWeight">
                 <el-input type="text" class="row-item" v-model="fhaddress" disabled></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="8">
               <el-form-item label="发货人" span="1" prop="agent">
                 <el-input type="text" class="row-item" v-model="deptBudgetList.sender" disabled></el-input>
@@ -46,11 +46,11 @@
                 <el-input type="text" class="row-item" v-model="deptBudgetList.senderPhone" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item label="收货地址" span="1" prop="netWeight">
                 <el-input type="text" class="row-item" v-model="shaddress" disabled></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="8">
               <el-form-item label="收货人电话" span="1" prop="receiverPhone">
                 <el-input type="text" class="row-item" v-model="deptBudgetList.receiverPhone" disabled></el-input>
@@ -106,20 +106,22 @@
               <el-input v-else v-model="deptBudgetList.tranPriceIngCar" maxlength="70" />
             </el-form-item>
             <div class="input-item-margin">
-              <div v-if="deptBudgetList.priceStatus=='审核中'&&pricetype==1">
+              <div style="display:inline-block;" v-if="deptBudgetList.priceStatus=='审核中'&&pricetype==1">
+                {{deptBudgetList.approveStatus}}
                 <el-button type="primary" v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small"
-                  @click="examine(1)">审核中
+                @click="examine(1)">审核中
                 </el-button>
               </div>
               <el-button v-if="deptBudgetList.priceStatus!='审核中'&&pricetype==1" type="primary" @click="priceSubmit(1)">提交</el-button>
-              <el-button v-else-if="deptBudgetList.priceStatus=='审核中'&&pricetype==1" type="primary">{{deptBudgetList.approveStatus}}</el-button>
-              <div v-if="deptBudgetList.priceStatusCar=='审核中'&&pricetype==2">
-                <el-button type="primary" v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small"
-                  @click="examine(2)">审核中
+              <!-- <el-button @click="examine(1)" v-else-if="deptBudgetList.priceStatus=='审核中'&&pricetype==1" type="primary">{{deptBudgetList.approveStatus}}</el-button> -->
+              <div style="display:inline-block;" v-if="deptBudgetList.priceStatusCar=='审核中'&&pricetype==2">
+                {{deptBudgetList.approveStatus}}
+                <el-button @click="examine(2)" type="primary" v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small"
+                  >审核中
                 </el-button>
               </div>
               <el-button v-if="deptBudgetList.priceStatusCar!='审核中'&&pricetype==2" type="primary" @click="priceSubmit(2)">提交</el-button>
-              <el-button v-else-if="deptBudgetList.priceStatus=='审核中'&&pricetype==2" type="primary">{{deptBudgetList.approveStatus}}</el-button>
+              <!-- <el-button @click="examine(2)" v-else-if="deptBudgetList.priceStatus=='审核中'&&pricetype==2" type="primary">{{deptBudgetList.approveStatus}}</el-button> -->
             </div>
           </div>
           <div class="content3" v-for="(item, index) in driverlist" :key="index">
@@ -513,7 +515,7 @@
           } else {
             var tmp1 = 'C00'
             this.deptBudgetList.count++
-            if (this.deptBudgetList.tranCarInfoList.length + 1 < 10) {
+            if (this.deptBudgetList.tranCarInfoList.length < 10) {
               this.deptBudgetList.tranCarInfoList.push({
                 driverName: '',
                 driverPhone: '',
@@ -532,7 +534,7 @@
                 tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length+ 1 < 100 && this.deptBudgetList.tranCarInfoList.length + 1>=
+            } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length >=
               10) {
               tmp1 = 'C0'
               this.deptBudgetList.count++
@@ -554,7 +556,7 @@
                 tranCarNo: 'C0' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length+ 1 >=
+            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length >=
               100) {
               tmp1 = 'C'
               this.deptBudgetList.count++
@@ -587,7 +589,7 @@
           } else {
             var tmp1 = 'C00'
             this.deptBudgetList.count++
-            if (this.deptBudgetList.tranCarInfoList.length + 1 < 10) {
+            if (this.deptBudgetList.tranCarInfoList.length < 10) {
               this.deptBudgetList.tranCarInfoList.push({
                 driverName: '',
                 driverPhone: '',
@@ -606,7 +608,7 @@
                 tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length+ 1 >=
+            } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length >=
               10) {
               tmp1 = 'C0'
               this.deptBudgetList.count++
@@ -628,7 +630,7 @@
                 tranCarNo: 'C0' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length+ 1 >=
+            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length >=
               100) {
               tmp1 = 'C'
               this.deptBudgetList.count++

src/views/universalityAudit/audit.vue

@@ -0,0 +1,558 @@
+//通用审核
+<template>
+  <div class="container">
+    
+    <div class="center">
+      <el-row style='margin-bottom:10px;'>
+        <el-col :span="12">
+          <div style='margin-left:10px;' class="datascreen">
+            <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" unlink-panels range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" class="data_css" @change="changeDate" >
+            </el-date-picker>
+            <el-input placeholder="可按发起人姓名或业务编号查找" class="input_css" v-model="searchKeyWord"></el-input>
+            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
+                src="../../../public/img/sousuo.png" alt="" /></el-button>
+          </div>
+          
+        </el-col>
+        <el-col style="text-align:right;" :span="12">
+          <el-button style="margin-right:10px" @click="addlist" type="primary">添加</el-button>
+        </el-col>
+      </el-row>
+      <el-row style='margin-bottom:10px;'>
+        <el-col :span="18">
+          <el-button style="margin-left:10px" @click="typeChange1('')" :type="searchType == ''?'primary':''">全部</el-button>
+          <el-button @click="typeChange1(1)" :type="searchType == 1?'primary':''">待审核</el-button>
+          <el-button @click="typeChange1(2)" :type="searchType == 2?'primary':''">已驳回</el-button>
+          <el-button @click="typeChange1(3)" :type="searchType == 3?'primary':''">已通过</el-button>
+          <el-select v-model="businessType" filterable clearable placeholder="选择类型" @change="typeChange" >
+          <el-option  key="type0" label="全部类型" value=""
+            style="color: #8890b1" />
+            <el-option v-for="item in xialaList"  :key="item.id" :label="item.constValue" :value="item.constValue"
+            style="color: #8890b1" />
+        </el-select>
+        <i class="el-icon-question"></i>
+        </el-col>
+        <el-col :span="6">
+
+        </el-col>
+      </el-row>
+      <div class="fromdata">
+        <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+          <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="auditBusinessNo" label="审核业务编号">
+          </el-table-column>
+          <el-table-column prop="businessType" label="类型">
+          </el-table-column>
+          <el-table-column prop="buyer" label="备注">
+             <template slot-scope="scope">
+              <el-popover
+              placement="bottom"
+              title="备注详情"
+              width="400"
+              trigger="click"
+             >
+              <div>
+                <div>{{scope.row.sponsor+'（'+scope.row.auditBusinessNo+'）'}}</div>
+                <div>{{scope.row.remark}}</div>
+              </div>
+              
+              <el-button slot="reference">查看</el-button>
+            </el-popover>
+            </template> 
+          </el-table-column>
+          <el-table-column prop="addressUrl" label="附件">
+       <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.addressUrlArray != null">
+            {{
+              scope.row.addressUrlArray.length == 0
+                ? ''
+                : scope.row.addressUrlArray.length
+            }}
+          </span>
+        </template> 
+      </el-table-column>
+          <el-table-column prop="createDate" label="时间"></el-table-column>
+    
+          <el-table-column prop="status" label="状态"></el-table-column>
+          <el-table-column prop="address" label="操作" width="300">
+            <template slot-scope="scope">
+              
+              <el-button @click="pass(scope.row)" type="primary">通过</el-button>
+              <el-button @click="reject(scope.row)" type="primary">驳回</el-button>
+              <!-- <div style="display:inline-block;"> -->
+                <el-button v-if="scope.row.status=='已驳回'" @click="del(scope.row)" type="danger">删除</el-button>
+              <!-- </div> -->
+            </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
+  title="提示"
+  :visible.sync="addshow"
+  width="30%"
+  :before-close="handleClose">
+  <el-form ref="form" :model="form" label-width="80px">
+  <el-form-item label="类型">
+    <el-select v-model="form.businessType" filterable clearable placeholder="选择类型">
+      <el-option v-for="item in xialaList"  :key="item.id" :label="item.constValue" :value="item.constValue" style="color: #8890b1" />
+    </el-select>
+  </el-form-item>
+  <el-form-item label="附件">
+    <ws-upload ref="upload" limit="20" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="form.addressUrl" :size-limit="size"
+        @onChange="onChange" 
+       />
+  </el-form-item>
+  
+  <el-form-item label="备注">
+    <el-input maxlength="2000" type="textarea" show-word-limit v-model="form.remark"></el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button @click="addshow=false">取消</el-button>
+    <el-button type="primary" @click="onSubmit">提交</el-button>
+  </el-form-item>
+</el-form>
+</el-dialog>
+<el-dialog
+  title="合同结算单"
+  :visible.sync="show"
+  width="30%"
+  :before-close="handleClose1">
+  <!--<div>
+     <table class="table">
+          <tr class="row">
+            <td class="col col-bgc">合同编号</td>
+            <td class="col">{{tableData.contractNo}}</td>
+            <td class="col col-bgc">合同类型</td>
+            <td  class="col">{{tableData.agreementType}}</td>
+          </tr>
+          <tr class="row">
+            <td class="col col-bgc">买方</td>
+            <td class="col">{{tableData.buyer}}</td>
+            <td class="col col-bgc">卖方</td>
+            <td class="col">{{tableData.seller}}</td>
+          </tr>
+          <tr class="row">
+            <td class="col col-bgc">结算单价（元/吨）</td>
+            <td class="col">{{tableData.settlementPrice}}</td>
+            <td class="col col-bgc">合计利润（元）</td>
+            <td class="col">{{tableData.profit}}</td>
+          </tr>
+          <tr class="row">
+            <td class="col col-bgc">关联合同</td>
+            <td class="col col-bgc">结算单价（元/吨）</td>
+            <td class="col col-bgc">重量（吨）</td>
+            <td class="col col-bgc">利润（元）</td>
+          </tr>
+          <tr v-for="item in tableData.contractList" class="row">
+            <td class="col">{{item.contractNo}}</td>
+            <td class="col">{{item.settlementPrice}}</td>
+            <td class="col">{{item.weight}}</td>
+            <td class="col">{{item.profit}}</td>
+          </tr>
+        </table>
+    </div> -->
+</el-dialog>
+<el-dialog
+      :title="title"
+      :visible.sync="rejectshow"
+      width="30%"
+      :before-close="handleClose">
+      <span>{{title=='驳回'?'确定驳回审核？':'确定通过审核？'}}</span>
+      <div><el-input
+  type="textarea"
+  :rows="2"
+  placeholder="请输入审核意见"
+  v-model="textarea">
+</el-input>
+</div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="rejectclick">确 定</el-button>
+      </span>
+    </el-dialog>
+<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
+  </div>
+</template>
+<script>
+  import {
+    xiala,
+    aduitinfoList,
+    addaduitinfo,
+    deladuitinfo
+  } from '@/model/universalityAudit/index'
+  import WsUpload from '@/components/WsUpload'
+  export default {
+    components: {
+      WsUpload
+    },
+    data() {
+      return {
+        value: "",
+        tableData: [],
+        show:false,
+        title:'',
+        textarea:'',
+        rejectshow:false,
+        addshow:false,
+        correlationshow:false,
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        businessType:'',
+        searchType:"",
+        searchKeyWord:"",
+        startDate:"",
+        endDate:"",
+        outtotal:0,
+        xialaList:[],
+        intotal:0,
+        form:{},
+        dialogVisible:false,
+        contractList:[],
+        datalist:{},
+        size:100,
+        accessoryTFs:false,
+        appendixIdss:'',
+        compId:localStorage.getItem('ws-pf_compId'),
+        currectdata:{}
+      }
+    },
+    activated() {
+      xiala({constId:'EXA1'}).toPromise()
+          .then(response => {
+            this.xialaList=response
+          })
+          this.getList()
+    },
+    methods: {
+      rejectclick(){
+        if(this.title=='驳回'){
+          woekflowhandle({
+            taskId: this.currectdata.taskId,
+            approved:false,
+            auditMind: this.textarea,
+            needReapply: true,
+          }).toPromise()
+          .then((response) => {
+            this.$message({
+              message: '驳回成功!',
+              type: 'success',
+            })
+            this.rejectshow=false
+            this.$router.go(-1)
+          }).catch((response) => {
+            this.$message({
+              message: '驳回失败!',
+              type: 'error',
+            })
+          })
+        }else{
+          woekflowhandle({
+              taskId: this.currectdata.taskId,
+              approved:true,
+              auditMind: this.textarea,
+              needReapply: true,
+            }).toPromise()
+            .then((response) => {
+              this.$message({
+                message: '通过成功!',
+                type: 'success',
+              })
+            }).catch((response) => {
+              this.$message({
+                message: '通过失败!',
+                type: 'error',
+              })
+            })
+        }
+        
+      },
+      pass(row){
+        this.currectdata=row
+        this.title='通过'
+        this.rejectshow=true
+      },
+      reject(row){
+        this.currectdata=row
+        this.title='驳回'
+        this.rejectshow=true
+      },
+      fujian(row) {
+        this.id = row.id
+        this.accessoryTFs = true
+        this.appendixIdss = row.addressUrl
+        console.log(this.appendixIdss)
+      },
+      del(row){
+        this.$confirm('确定删除审核信息？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            deladuitinfo({id:row.id}).toPromise().then(response => {
+            this.$message({
+                message: '删除成功!',
+                type: 'success',
+            })
+            this.getList()
+          })
+          })
+      },  
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async (response) => {
+            this.form.addressUrl = response
+          })
+          .catch((res) => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
+      
+      onSubmit(){
+        if(!this.form.businessType){
+          this.$message({
+                message: '审核类型不能为空!',
+                type: 'warning',
+            })
+        }
+        if(this.form.remark&&this.form.remark.length<2||this.form.remark&&this.form.remark.length>1000){
+          this.$message({
+                message: '备注信息10-2000个字!',
+                type: 'warning',
+            })
+        }
+        this.$confirm('确定发起审核？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            this.form.compId=localStorage.getItem('ws-pf_compId')
+            this.form.sponsor=localStorage.getItem('ws-pf_roleName')
+          addaduitinfo(this.form).toPromise().then(response => {
+            this.$message({
+                message: '提交成功!',
+                type: 'success',
+            })
+            this.form={}
+            this.$refs.upload.clearFiles()
+            this.addshow=false
+            this.getList()
+          })
+        })
+      },
+      addlist(){
+        this.addshow=true
+      },
+      handleClose(){
+        this.addshow=false
+      },
+      handleClose1(){
+        this.show=false
+      },
+      typeChange(num){
+        this.businessType= num
+        this.getList()
+      },
+      typeChange1(num){
+        this.searchType= num
+        this.getList()
+      },
+      returnsales(){
+        this.$router.go(-1)
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      async getList() {
+        aduitinfoList({
+            startDate:this.startDate,
+            endDate:this.endDate,
+            searchKeyWord:this.searchKeyWord,
+            currentPage: this.currentPage,
+            pageSize:this.pageSize ,
+            searchType:this.searchType,
+            businessType:this.businessType
+          })
+          .toPromise()
+          .then(response => {
+            if(response.records.length>0){
+              for (let i = 0; i < response.records.length; i++) {
+                if(response.records[i].addressUrl){
+                  response.records[i].addressUrlArray=[]
+                  var arr=response.records[i].addressUrl.split(',')
+                  for (let q = 0; q < arr.length; q++) {
+                    if(arr[q]!=''){
+                      response.records[i].addressUrlArray.push(arr[q])
+                    }
+                    
+                  }
+                  
+                }
+                
+              }
+            }
+            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>
+ table,
+      table tr th,
+      table tr td {
+        border: 2px solid #333333;
+        padding: 5px 0;
+        height: 55px;
+      }
+
+      .content {
+        width: 1000px;
+        padding: 70px 20px 20px 20px;
+        font-size: 22px;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+      }
+
+      table {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+        border: 3px solid #333333;
+      }
+
+      .col-bgc {
+        background: #f6f7fb;
+      }
+
+  .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/universalityAudit/component/routers/route.js

@@ -0,0 +1,36 @@
+import Layout from '@/layout/index';
+
+// const profitableRouter = {
+//   path: '/aduitmanagement',
+//   component: Layout,
+//   redirect: '/aduitmanagement',
+//   name: 'aduitmanagement',
+//   alwaysShow: true, // will always show the root menu
+//   meta: {
+//     title: 'aduitmanagement',
+//     module: 'lirunhesuan',
+//     icon: '-caigouguanli'
+//   },
+//   children: [
+   
+//       {
+//         path: 'audit',
+//         component: () =>
+//           import(/* webpackChunkName: "applDetail" */ '@/views/universalityAudit/audit'),
+//         name: 'audit',
+//         meta: {
+//           title: 'universalityaudit',
+//           shortcutEntrance: 'profitable',
+//           module: 'lirunhesuan',
+//           permissicon: [],
+//           keepAlive: true,
+//           _title:'通用审核'
+//           // module: 'procurement.sparepart.applDetail'
+//         }
+//       },  
+    
+//   ],
+
+// };
+
+// export default profitableRouter;

src/views/warehousenew/warehousingOrder.vue

@@ -106,7 +106,13 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="130"></el-table-column>
+        <el-table-column prop="contractNo" label="合同编号" width="190">
+          <template  scope="scope">
+            <span>
+              {{ scope.row.contractNo }} ({{ scope.row.inType }})
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column prop="buyer" label="买方" width="150"></el-table-column>
         <el-table-column prop="goodsSource" label="货源" width="130">
           <template scope="scope">
@@ -121,7 +127,7 @@
         </el-table-column> -->
         <el-table-column prop="goodsName" label="货名" width="120">
         </el-table-column>
-        <el-table-column prop="inWarehouseWeight1" width="170" class="table_td" label="加权水分">
+        <el-table-column prop="inWarehouseWeight1" width="130" class="table_td" label="加权水分">
           <template scope="scope">
             <span v-if='scope.row.edit == false'>{{ scope.row.weightedMoisture }}</span>
             <el-input style='width:80%;' v-if='scope.row.edit' v-model='scope.row.weightedMoisture'></el-input>
@@ -164,13 +170,13 @@
           </template>
         </el-table-column>
         <el-table-column prop="avgCost" width="90" class="table_td" label="平均成本"></el-table-column>
-        <el-table-column prop="requestFunds" width="150" class="table_td tablerequestFunds" label="请款">
+        <el-table-column prop="requestFunds" width="100" class="table_td tablerequestFunds" label="请款">
           <template scope="scope">
             <span v-if="!scope.row.select">{{ scope.row.requestFunds }}</span>
             <el-input @focus="qingkuan(scope.row, item.id)" v-else v-model='scope.row.requestFunds'></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="remark" width="150" class="table_td" label="请款备注">
+        <el-table-column prop="remark" width="100" class="table_td" label="请款备注">
           <template scope="scope">
             <div v-if="!scope.row.select" @click.stop="lookRemark(scope.row)">
               <span class="text_css">查看</span>
@@ -187,7 +193,9 @@
       </el-table>
     </div>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-      :page-size="pageSize" layout="total,  prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+        style="text-align: center" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal">
+      </el-pagination>
     <el-dialog title="付款" :visible.sync="aduitshow" width="50%" :before-close="handleClose">
       <div style='display:flex;'>
         <div style='width:50%;'>
@@ -352,7 +360,7 @@
         </div>
         <el-form ref="form" :model="form" label-width="140px">
           <el-form-item label="折干前重量（吨）">
-            <el-input v-model="fieldrationsList.beforeWeight"></el-input>
+            <el-input v-model="fieldrationsList.beforeWeight" disabled></el-input>
           </el-form-item>
           <!-- <el-form-item label="折干前成本(元/吨)">
               <el-input disabled placeholder="自动计算，不可编辑" v-model="fieldrationsList.beforeCost"></el-input>
@@ -365,7 +373,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="折干后重量（吨）">
-            <el-input @input="afterWeightchange" v-model="fieldrationsList.afterWeight"></el-input>
+            <el-input @input="afterWeightchange" v-model="fieldrationsList.afterWeight" disabled></el-input>
           </el-form-item>
           <!-- <el-form-item label="折干后成本(元/吨)">
               <el-input disabled  placeholder="自动计算，不可编辑" v-model="fieldrationsList.afterCost"></el-input>
@@ -453,6 +461,25 @@
         </div>
       </div>
     </el-dialog>
+    <el-dialog
+      :title="title1"
+      :visible.sync="rejectshow"
+      width="30%"
+      :before-close="handleClose5">
+      <span>{{title1=='驳回'?'驳回审核':'通过审核'}}</span>
+      <div>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入审核意见"
+          v-model="auditMind">
+        </el-input>
+        </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="rejectshow = false">取 消</el-button>
+        <el-button type="primary" @click="rejectclick">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
   </div>
 </template>
@@ -514,6 +541,8 @@ export default {
       interestrateshow: false,
       dataList: [],
       payeeinfo: [],
+      title1:'',
+      rejectshow:false,
       options: [],
       textarea: '',
       dialogVisiblecontent: false,
@@ -593,12 +622,14 @@ export default {
       value1: '',
       value: '',
       value2: '',
+      deptBudgetTotal: 0,
       pageSize: 10,
       searchType: '',
       searchTypeText: '待审核',
       searchKeyWord: '',
       inOutType: '',
       contractType: 2,
+      auditdata:[],
       fieldrationsshow: false,
       // 提交类型
       submitType: true,
@@ -614,10 +645,9 @@ export default {
       endDate: '',
       startDate: '',
       warehouseName: '',
-      goodsName:"",
-      reserves:"",
+      goodsName:'',
+      reserves:'',
       goodsList:[],
-      deptBudgetTotal: 0,
       compId: localStorage.getItem('ws-pf_compId'),
       historyList: [],
       money: 0,
@@ -640,7 +670,8 @@ export default {
       dialogTitle: '',
       titletype: '',
       remark: '',
-      baseId:""
+      baseId:'',
+      auditMind:''
     }
   },
   // activated() {
@@ -648,6 +679,9 @@ export default {
   //   this.showType = this.isShow
   // },
   activated() {
+    if(this.$route.query.status==1){
+      this.searchType='2'
+    }
     this.value2 = this.getNowTime()
     selectWarehouseSelf({
       compId: localStorage.getItem('ws-pf_compId'),
@@ -679,7 +713,7 @@ export default {
               } else {
                 return prev;
               }
-            }, 0).toFixed(2)
+            }, 0).toFixed(3)
           }
 
         } else {
@@ -693,8 +727,8 @@ export default {
       if (e == '全部仓库' || e == '') {
         this.warehouseName = ''
         this.goodsList = []
-        this.goodsName = ""
-        this.baseId = ""
+        this.goodsName = ''
+        this.baseId = ''
       }else{
         for(let i =0 ; i<this.warehouseList.length;i++){
           if(this.warehouseList[i].warehouseName == e){
@@ -715,8 +749,8 @@ export default {
             break
           }
         }
-        this.goodsName= ""
-        this.reserves = ""
+        this.goodsName= ''
+        this.reserves = ''
       }
       this.getList()
     },
@@ -860,11 +894,11 @@ export default {
       item.summation = 0
       for (let i = 0; i < val.length; i++) {
         if (val[i].surplusWeight) {
-          item.summation += val[i].surplusWeight
+          item.summation += Number(val[i].surplusWeight)
         }
 
       }
-      item.summation = item.summation.toFixed(2)
+      item.summation = item.summation.toFixed(3)
       this.$forceUpdate()
       // console.log(val,item.summation,1111111111)
       this.multipleSelection1[item.id] = val
@@ -1133,7 +1167,7 @@ export default {
       console.log(this.currectdata)
       this.fieldrationsList.warehousingOrderList = this.currectdata
       this.fieldrationsList.baseId = this.currectdata[0].baseId
-      this.fieldrationsList.beforeWeight = weight.toFixed(2)
+      this.fieldrationsList.beforeWeight = weight.toFixed(3)
       getbyname({ warehouseId: this.currectdata[0].baseId, goodsName: this.currectdata[0].goodsName }).toPromise()
         .then((response) => {
           if (response) {
@@ -1146,7 +1180,7 @@ export default {
               weight2 += ((deductWeight / 100) * this.currectdata[i].surplusWeight)
             }
             console.log(this.currectdata)
-            this.fieldrationsList.afterWeight = weight2.toFixed(2)
+            this.fieldrationsList.afterWeight = weight2.toFixed(3)
             this.fieldrationsshow = true
           }
         })
@@ -1174,7 +1208,6 @@ export default {
         });
         return
       }
-
       if (currectData.length == 0) {
         this.$message({
           message: '请选择一条数据！',
@@ -1444,11 +1477,18 @@ export default {
             this.form.distributionIng = ''
             this.fieldrationsshow = false
             this.getList()
-          }).catch(() => {
-            this.$message({
-              message: '折干失败',
-              type: 'warning'
-            });
+          }).catch((response) => {
+            if (response.code == null) {
+              this.$message({
+                message: response.data.message,
+                type: 'warning'
+              });
+            } else {
+              this.$message({
+                message: '折干失败',
+                type: 'warning'
+              });
+            }
           })
       }).catch(() => {
         // this.$message({
@@ -1637,6 +1677,7 @@ export default {
         }
       }
       var arr3 = this.filtertask(arr2)
+     
       this.$confirm('审核请款信息', {
         confirmButtonText: '通过',
         cancelButtonText: '驳回',
@@ -1644,22 +1685,34 @@ export default {
         type: 'warning',
       })
         .then(() => {
-
-          this.aduithandle(arr3, 0, true)
+          this.title1='通过'
+          this.auditdata=arr3
+          this.rejectshow=true
+          // this.aduithandle(arr3, 0, true)
         }).catch((action) => {
           console.log(action)
           if (action == 'cancel') {
-            this.aduithandle(arr3, 0, false)
+            this.title1='驳回'
+            this.auditdata=arr3
+            this.rejectshow=true
+            // this.aduithandle(arr3, 0, false)
           }
 
         })
     },
+    rejectclick(){
+      if(this.title=='通过'){
+        this.aduithandle(this.auditdata, 0, true)
+      }else{
+        this.aduithandle(this.auditdata, 0, false)
+      }
+    },
     aduithandle(item, index, status) {
       if (index < item.length) {
         workflowhandle({
           taskId: item[index].taskId,
           approved: status,
-          auditMind: '34',
+          auditMind: this.auditMind,
           needReapply: true,
         }).toPromise()
           .then((response) => {
@@ -1733,10 +1786,10 @@ export default {
             for (let q = 0; q < data.length; q++) {
               if (data[q].inType == '收购入库') {
                 data[q].inWarehouseWeight1 = Number((data[q].inWarehouseWeight).toFixed(3))
-                data[q].surplusWeight = (data[q].inWarehouseWeight) - data[q].outWarehouseWeight + data[q].profitAndLoss
+                data[q].surplusWeight = ((data[q].inWarehouseWeight) - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
               } else {
                 data[q].inWarehouseWeight1 = data[q].inWarehouseWeight.toFixed(3)
-                data[q].surplusWeight = data[q].inWarehouseWeight - data[q].outWarehouseWeight + data[q].profitAndLoss
+                data[q].surplusWeight =(data[q].inWarehouseWeight - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
               }
               console.log(response.records[i].warehouseType)
               data[q].select = false
@@ -1871,6 +1924,9 @@ export default {
     handleClose() {
       this.aduitshow = false
     },
+    handleClose5() {
+      this.rejectshow = false
+    },
     handleClose3() {
       this.customershow = false
     },

src/views/workNotification/components/MessageItem.vue

@@ -132,9 +132,11 @@ export default {
         this.info.acceptanceType,
         this.info.messageContent
       )
+      console.log(url)
       if (!url) {
         EventBus.$emit('error', this.$t('workNotification.noRelatedType'))
       } else {
+        console.log(2222222222)
         if (
           url == 'certificateDetailSecond' ||
           url == 'certificateDetailThird'
@@ -155,7 +157,13 @@ export default {
             name: url,
             query: { id: id, title: title, code: this.info.businessCode }
           })
+        } else if (url === 'warehousingOrder') {
+          this.$router.push({
+            name: url,
+            query: { status:1 }
+          })
         } else {
+          console.log(id,title,111111111)
           this.$router.push({
             name: url,
             query: { id: id, title: title, code: this.info.businessCode }

src/views/workNotification/utils/index.js

@@ -17,6 +17,9 @@ export function code2Url (type, code, state,status,message,businessId) {
     // 判断 销售
     case 'SALE':
       return sale(code, state)
+      // 判断 代储
+    case 'DAICHU':
+      return daichu(code, state)
       // 判断 运输
     case 'Tran':
       return tran(code, state)
@@ -60,6 +63,17 @@ export function trantask(code, state,message){
   }
    return url
 }
+export function daichu(code, state,message){
+  let url = ''
+  switch (code) {
+      // 代储合同
+      case 'DAICHU-CONTRACT-APPROVE':
+        url = 'storageContractExamine'
+        break
+
+  }
+   return url
+}
 export function warehousing(code, state){
   let url = ''
   switch (code) {