前端入库单审核意见，费用添加合同费用非粮款暂不分配提交

src/views/contractManagement/purchaseContractAdd.vue

@@ -726,7 +726,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 +739,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
           }
         }
       },

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/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

@@ -149,7 +149,7 @@
 </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>

src/views/warehousenew/warehousingOrder.vue

@@ -461,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>
@@ -522,6 +541,8 @@ export default {
       interestrateshow: false,
       dataList: [],
       payeeinfo: [],
+      title1:'',
+      rejectshow:false,
       options: [],
       textarea: '',
       dialogVisiblecontent: false,
@@ -608,6 +629,7 @@ export default {
       searchKeyWord: '',
       inOutType: '',
       contractType: 2,
+      auditdata:[],
       fieldrationsshow: false,
       // 提交类型
       submitType: true,
@@ -648,7 +670,8 @@ export default {
       dialogTitle: '',
       titletype: '',
       remark: '',
-      baseId:''
+      baseId:'',
+      auditMind:''
     }
   },
   // activated() {
@@ -1654,6 +1677,7 @@ export default {
         }
       }
       var arr3 = this.filtertask(arr2)
+     
       this.$confirm('审核请款信息', {
         confirmButtonText: '通过',
         cancelButtonText: '驳回',
@@ -1661,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: '',
+          auditMind: this.auditMind,
           needReapply: true,
         }).toPromise()
           .then((response) => {
@@ -1888,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'
@@ -161,6 +163,7 @@ export default {
             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) {