gjy há 2 anos atrás
pai
commit
0bc3327cb8

+ 1 - 0
src/lang/zh.js

@@ -657,6 +657,7 @@ export default {
     saletransactioninformationreview: '销售信息审核',
     grainpulseenterprisereview: '粮脉企业审核',
     grainPulseDynamic: '粮脉动态审核',
+    tradeInformation:'交易信息审核',
 
     // 通用审核
     aduitmanagement:'审核管理',

+ 7 - 0
src/views/contractManagement/purchaseContractAdd.vue

@@ -1319,6 +1319,13 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
+        if(!this.deptBudgetList.personCharge){
+          this.$message({
+            message: '请选择临时仓库负责人!',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.deptBudgetList.signingDate) {
           this.$message({
             message: '请选择签订日期',

+ 33 - 8
src/views/contractManagement/purchaseContractEdit.vue

@@ -149,7 +149,7 @@
           </ws-form-item>
         <!-- 合同单价(元/吨) -->
         <ws-form-item class="readonly" label="合同单价(元/吨)" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
-          <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
+          <ws-input disabled @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
             maxlength="100" size="small" />
         </ws-form-item>
         <!-- 合同总价(元) -->
@@ -211,8 +211,12 @@
 
         <!-- 临时仓库负责人 -->
         <ws-form-item label="临时仓库负责人" span="1" prop="packingMethod" v-if="deptBudgetList.deliverType != 2">
-          <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable @change="selectstaff">
+          <!-- <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable @change="selectstaff">
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
+          </el-select> -->
+          <el-select v-model="deptBudgetList.personPhone" multiple placeholder="请选择临时仓库负责人" filterable clearable
+            @change="selectstaff">
+            <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffMobilePhone" />
           </el-select>
         </ws-form-item>
         <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod" v-if="deptBudgetList.deliverType==1">
@@ -323,7 +327,7 @@
     delxiala,
     examineList,
     editInfo,
-    getstafffind
+    getstaffall
   } from '@/model/contarct/index'
   import WsUpload from '@/components/WsUpload'
   import {
@@ -405,8 +409,8 @@
     },
 
     activated() {
-      getstafffind({
-          roles: 'd6a5c8a52da544309259f91f75de1ec6'
+      getstaffall({
+        compId:this.compId
         })
         .toPromise()
         .then((response) => {
@@ -476,13 +480,19 @@
           this.options = this.staffList
         }
       },
+
       selectstaff(e) {
+        console.log(e)
+        this.deptBudgetList.personCharge=''
         for (var i = 0; i < this.staffList.length; i++) {
-          if (this.staffList[i].staffName == e) {
-            this.deptBudgetList.personPhone = this.staffList[i].staffMobilePhone
-            this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+          for (var j = 0; j < e.length; j++) {
+            if (this.staffList[i].staffMobilePhone == e[j]) {
+              this.deptBudgetList.personCharge += this.staffList[i].staffName + ' ' + this.staffList[i]
+                .staffMobilePhone + ','
+            }
           }
         }
+        console.log(this.deptBudgetList)
       },
       handleChange(value) {
         this.selectedOptions = value
@@ -497,6 +507,7 @@
           })
           .toPromise()
           .then((response) => {
+
             if (response.weight) {
               response.weight = String(response.weight)
             }
@@ -509,6 +520,20 @@
             if (response.unitContractPrice) {
               response.unitContractPrice = String(response.unitContractPrice)
             }
+            if(response.personCharge&&response.personCharge!=''){
+              var arr= response.personCharge.split(',')
+              var arr3=[]
+              for (let i = 0; i < arr.length; i++) {
+                if(arr[i]!=''){
+                  var arr1=arr[i].split(' ')
+                    if(arr1[1]!=''){
+                      arr3.push(arr1[1])
+                    }
+                }
+                
+              }
+              response.personPhone=arr3
+            }
             // var tmp = []
             // tmp[0] = TextToCode[response.sourceProvince].code
 

+ 15 - 0
src/views/platformAudit/component/routers/route.js

@@ -106,6 +106,21 @@ const platformauditRouter = {
                 _title: '粮脉动态审核'
             },
         },
+        //交易信息审核
+        // {
+        //     path: 'tradeInformation',
+        //     component: () =>
+        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/tradeInformation'),
+        //     name: 'tradeInformation',
+        //     meta: {
+        //         title: 'tradeInformation',
+        //         shortcutEntrance: 'tradeInformation',
+        //         module: 'audit.grainMerchant.grainMerchantInfo.review',
+        //         permissicon: [],
+        //         keepAlive: true,
+        //         _title: '交易信息审核'
+        //     },
+        // },
         // 客服留言
         {
             path: 'customerService',

+ 2 - 2
src/views/profitable/expensemanagementdetails.vue

@@ -52,10 +52,10 @@
               <el-option v-for="item in personList" :key="item.id" :label="item.agent" :value="item.agent">
               </el-option>
             </el-select>
-            <!-- <el-select v-model="toExamineType"  filterable  clearable @change="getList1" class="options_css">
+            <el-select v-model="toExamineType"  filterable  clearable @change="getList1" class="options_css">
               <el-option label="全部状态" value=""></el-option>
               <el-option label="待审核" value="1"></el-option>
-            </el-select> -->
+            </el-select>
             <!-- <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员,可选多人"  allow-create default-first-option @change="selectstaffOther" multiple filterable clearable>
             <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName" :value="item.staffMobilePhone" />
           </el-select> -->