前端

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/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/warehousenew/warehousingOrder.vue

@@ -648,6 +648,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'),

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,