Merge branch 'master' of http://git.zthymaoyi.com/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/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/lang/zh.js

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

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.get(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/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -678,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: '分界',
@@ -698,7 +698,7 @@ export default {
           type: 4,
         })
         this.makeSpliceIndex(item, item1, index)
-      // }
+      }
     },
     // 减少分界
     reduce(item, item1, index) {
@@ -1900,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"
@@ -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

@@ -479,7 +479,11 @@
         id: '',
         inOutData: {},
         idPrint: '',
-        ewCustomerOptions: [{
+        ewCustomerOptions: [
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        },{
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -489,13 +493,13 @@
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
         }, {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         }],
         companyNameOptions: [{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        },{
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -505,9 +509,6 @@
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
         }, {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        },{
           value: '榆树市保寿镇保寿村民胜粮食加工有限公司',
           label: '榆树市保寿镇保寿村民胜粮食加工有限公司'
         }, ],

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/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/cashoutaduit.vue

@@ -136,15 +136,15 @@
       
     </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>
@@ -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/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> -->
@@ -338,7 +338,7 @@ export default {
       intotal: 0,
       fujianshow: false,
       appendixIdss: [],
-      appendixIdss1: [],
+      appendixIdss1:'',
       approveStatus: false,
       currectdata:{},
       choiceObj: [],
@@ -450,6 +450,7 @@ export default {
           message: '提交成功!',
           type: 'success',
         })
+        this.dialogVisible=false
         this.getList()
         // this.$router.go(-1)
       })

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/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/tranManagementWarehouseInOutTaskAudit.vue

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

src/views/universalityAudit/audit.vue

@@ -0,0 +1,421 @@
+//通用审核
+<template>
+  <div class="container">
+    
+    <div class="center">
+      <el-row style='margin-bottom:10px;'>
+        <el-col :span="12">
+          <!-- <el-button style="margin-left:10px" @click="typeChange('')" type="primary">导出</el-button> -->
+        </el-col>
+        <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-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(4)" :type="searchTypeCon == 4?'primary':''">待审核</el-button>
+          <el-button @click="typeChange1(1)" :type="searchTypeCon == 1?'primary':''">已驳回</el-button>
+          <el-button @click="typeChange1(3)" :type="searchTypeCon == 3?'primary':''">已通过</el-button>
+          <el-select v-model="contractType" filterable clearable placeholder="选择类型" @change="selecttype" :value="searchType">
+          <el-option  key="type0" label="全部类型" value=""
+            style="color: #8890b1" />
+            <el-option v-for="item in xialaList"  :key="item.id" :label="item" :value="item"
+            style="color: #8890b1" />
+        </el-select>
+        </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">
+            </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 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>
+          </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="correlationshow"
+  width="30%"
+  :before-close="handleClose">
+  <div v-if="contractList.length>0">
+    <div style="display:flex;justify-content: space-between;" v-for="item in contractList"><div>{{item.contractNo}}</div>
+  <div><span v-if="item.status!='已完成'&&item.status!='已结算'&&item.status!='发运结束'">未完成</span><span v-else>未完成</span></div>
+     </div>
+  </div>
+  <div v-else>暂无关联合同</div>
+</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>
+  </div>
+</template>
+<script>
+  import {
+    xiala,
+    aduitinfoList
+  } from '@/model/universalityAudit/index'
+  export default {
+    components: {},
+    data() {
+      return {
+        value: "",
+        tableData: [],
+        show:false,
+        correlationshow:false,
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        agreementType:'',
+        deptCircularPage: {},
+        searchType:"",
+        searchKeyWord:"",
+        startDate:"",
+        searchContractType:'',
+        searchTypeCon:'',
+        endDate:"",
+        outtotal:0,
+        xialaList:[],
+        intotal:0,
+        contractList:[],
+        tableData:{},
+        datalist:{},
+        compId:localStorage.getItem('ws-pf_compId'),
+      }
+    },
+    activated() {
+      xiala({constCode:'EXA1'}).toPromise()
+          .then(response => {
+            this.xialaList=response
+          })
+          this.getList()
+    },
+    methods: {
+      handleClose(){
+        this.correlationshow=false
+      },
+      handleClose1(){
+        this.show=false
+      },
+      correlation(row){
+        getrelationcontract({
+          agreementType:row.agreementType,contractNo:row.contractNo,compId:this.compId})
+          .toPromise()
+          .then(response => {
+            this.contractList=response
+            this.correlationshow=true
+          })
+        
+      },
+      typeChange(num){
+        this.searchContractType= num
+        this.getList()
+      },
+      typeChange1(num){
+        this.searchTypeCon= num
+        this.getList()
+      },
+      async closeaccount(row){
+      
+        var data=await getrelationcontract({
+          agreementType:row.agreementType,contractNo:row.contractNo,compId:this.compId})
+            .toPromise()
+            var arr=[row].concat(data)
+            this.datalist.contractManagementInfoList=arr
+            judgesettlement(this.datalist).toPromise().then(response => {
+                         var weightprice=0
+                  for (let i = 0; i < data.length; i++) {
+                      weightprice+=(data[i].weight*data[i].settlementPrice)
+                  }
+                  if(row.agreementType=='收购合同'||row.agreementType=='采购合同'){
+                    row.profit=weightprice-(row.weight*row.settlementPrice)
+                  }else if(row.agreementType=='销售合同'){
+                    row.profit=(row.weight*row.settlementPrice)-weightprice
+                  }
+        this.$confirm('结算后当前合同和相关合同不可再进行费用相关操作', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            editcontract({flag:2,id:row.id,profit:row.profit}).toPromise()
+          .then(response => {
+            this.$message({
+                message: '结算成功!',
+                type: 'success',
+          })
+          this.getList()
+          }).catch(()=>{
+            this.$message({
+                message: '结算失败!',
+                type: 'warning',
+          })
+          })
+          })
+        })
+      },
+      finalstatement(row){
+        this.tableData.contractNo=row.contractNo
+        this.tableData.agreementType=row.agreementType
+        this.tableData.buyer=row.buyer
+        this.tableData.seller=row.seller
+        this.tableData.settlementPrice=row.settlementPrice
+        this.tableData.profit=row.profit
+        getrelationcontract({
+          agreementType:row.agreementType,contractNo:row.contractNo,compId:this.compId})
+          .toPromise()
+          .then(response => {
+            this.tableData.contractList=response
+            this.show=true
+          })
+      },
+      inventory(row){
+        this.$router.push({name:'contractinventory',query:{contractNo:row.contractNo,contractType:row.contractType,buyer:row.buyer,seller:row.seller}})
+      },
+      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,
+          })
+          .toPromise()
+          .then(response => {
+            this.tableData=response
+          })
+      },
+
+      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>
@@ -593,6 +601,7 @@ export default {
       value1: '',
       value: '',
       value2: '',
+      deptBudgetTotal: 0,
       pageSize: 10,
       searchType: '',
       searchTypeText: '待审核',
@@ -614,10 +623,9 @@ export default {
       endDate: '',
       startDate: '',
       warehouseName: '',
-      goodsName:"",
-      reserves:"",
+      goodsName:'',
+      reserves:'',
       goodsList:[],
-      deptBudgetTotal: 0,
       compId: localStorage.getItem('ws-pf_compId'),
       historyList: [],
       money: 0,
@@ -640,7 +648,7 @@ export default {
       dialogTitle: '',
       titletype: '',
       remark: '',
-      baseId:""
+      baseId:''
     }
   },
   // activated() {
@@ -648,6 +656,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 +690,7 @@ export default {
               } else {
                 return prev;
               }
-            }, 0).toFixed(2)
+            }, 0).toFixed(3)
           }
 
         } else {
@@ -693,8 +704,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 +726,8 @@ export default {
             break
           }
         }
-        this.goodsName= ""
-        this.reserves = ""
+        this.goodsName= ''
+        this.reserves = ''
       }
       this.getList()
     },
@@ -860,11 +871,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 +1144,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 +1157,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 +1185,6 @@ export default {
         });
         return
       }
-
       if (currectData.length == 0) {
         this.$message({
           message: '请选择一条数据！',
@@ -1659,7 +1669,7 @@ export default {
         workflowhandle({
           taskId: item[index].taskId,
           approved: status,
-          auditMind: '34',
+          auditMind: '',
           needReapply: true,
         }).toPromise()
           .then((response) => {
@@ -1733,10 +1743,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

src/views/workNotification/components/MessageItem.vue

@@ -155,6 +155,11 @@ 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 {
           this.$router.push({
             name: url,