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

src/lang/zh.js

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

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: '请选择签订日期',

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
 

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',

src/views/profitable/cashoutaduit.vue

@@ -15,6 +15,8 @@
           <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="1"
+                style="color: #8890b1" />
+                <ws-option label="运费" value="2"
                 style="color: #8890b1" />
                 <ws-option label="库点费用" value="3"
                 style="color: #8890b1" />

src/views/profitable/cashoutaduitNQ.vue

@@ -16,6 +16,7 @@
           <div style='margin:0 -30px 10px;font-weight:bold'>基本信息</div>
          <el-form-item label-width='100px' label="用途" span="1" prop="expensesPurpose">
               <span v-if='deptBudgetList.expensesPurpose==1'>合同费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==2'>运费</span>
               <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
               <span v-if='deptBudgetList.expensesPurpose==5'>经营性费用</span>
           </el-form-item>

src/views/profitable/cashoutedit.vue

@@ -16,6 +16,8 @@
           <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select v-model="deptBudgetList.purpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="合同费用"
+                style="color: #8890b1" />
+                <ws-option label="运费" value="运费"
                 style="color: #8890b1" />
                 <ws-option label="库点费用" value="库点费用"
                 style="color: #8890b1" />
@@ -338,6 +340,9 @@
         }else if(this.deptBudgetList.purpose=='库点费用'){
           this.deptBudgetList.expensesPurpose=3
           //  this.deptBudgetList.costNo='KDF'+this.getdate()+this.MathRand()
+        }else if(this.deptBudgetList.purpose=='运费'){
+          this.deptBudgetList.expensesPurpose=2
+          //  this.deptBudgetList.costNo='KDF'+this.getdate()+this.MathRand()
         }else if(this.deptBudgetList.purpose=='经营性费用'){
           this.deptBudgetList.expensesPurpose=5
           //  this.deptBudgetList.costNo='JYF'+this.getdate()+this.MathRand()

src/views/statisticalReport/autoSettlementList.vue

@@ -48,7 +48,7 @@
           <el-date-picker @change="datechange" format="yyyy-MM-dd" v-model="value2" type="daterange" unlink-panels range-separator="至"
           start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
         </el-date-picker>
-          <el-input v-model="carNo" placeholder="可按车牌号进行查找" clearable maxlength="500" type="input"
+          <el-input v-model="searchKeyWord" placeholder="可按车牌号进行查找" clearable maxlength="500" type="input"
           class="findValue" @keyup.enter.native="find()"></el-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
@@ -445,6 +445,19 @@
             v-model="deptBudgetList.remark">
             </el-input>
         </el-form-item>
+        <ws-upload
+          style="margin-left:30px"
+          ref="upload"
+          table-name="maintain_work_order"
+          oss-key="mainPlan"
+          :comp-id="compId"
+          :appendix-ids="appendixIdsAdd"
+          :vesselId="deptBudgetList.addressUrl"
+          :size-limit="size"
+          @uploadSuccess="uploadSuccess"
+          @onChange="onChange"
+          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        />
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="handleClose3">取 消</el-button>
@@ -507,6 +520,7 @@ export default {
       needReapply: true,
       totalList:[],
       carNo:'',
+      appendixIdsAdd: '',
       deptBudgetList:{},
       pickerOptions: {
           shortcuts: [{
@@ -616,12 +630,8 @@ export default {
       compId: localStorage.getItem('ws-pf_compId'),
       roleId: localStorage.getItem('ws-pf_roleId'),
       deptCircularPage: {},
-      warehouseList: [],
       orderList: {},
       tranPriceApproveList: [],
-      deptBudgetList: {},
-      id: '',
-
       pcFlag: 1,
       carryoverlist: {},
       modification: [],
@@ -677,6 +687,16 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+    },
+    onChange(files) {
+      this.fileNum = files
+      this.$refs.upload.handleSaveBill().then((res) => {
+        console.log(files)
+      })
+    },
     datechange(e){
       if (this.value2) {
           this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
@@ -1662,7 +1682,8 @@ export default {
         carType:this.carType,
         carNo:this.carNo,
         startDate:this.startDate,
-        endDate:this.endDate
+        endDate:this.endDate,
+        searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
         .then((response) => {