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

src/components/balanceAlert.vue

@@ -40,6 +40,7 @@ export default {
     sendVal(){
       console.log(this.grossWeightVal)
        console.log(this.tareVal)
+       console.log(this.deptBudgetList)
       if(this.information.indexOf('毛重') > -1){
         this.$emit('balanceListen',this.grossWeightVal)
       }else{

src/views/contractManagement/purchaseContractAdd.vue

@@ -257,9 +257,9 @@
           <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按入库重量结算</el-radio>
         </ws-form-item>
         <ws-form-item v-show="deptBudgetList.deliverType == 1" label="临时仓库负责人" span="1" prop="packingMethod">
-          <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable
+          <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.staffName" />
+            <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffMobilePhone" />
           </el-select>
         </ws-form-item>
       </ws-info-table>
@@ -498,6 +498,9 @@ import { isUndefined } from 'xe-utils/methods'
           agreementType: '采购合同',
           addressUrl: '',
           sellerPhone:'',
+          personPhone:'',
+          personCharge:'',
+          personChargeKey:'',
           finalTradingVolume: 0,
           totalContractPrice: 0,
           contractGoodsInfo: {
@@ -688,12 +691,32 @@ import { isUndefined } from 'xe-utils/methods'
         }
       },
       selectstaff(e) {
+        // this.deptBudgetList.personPhone=''
+        // this.deptBudgetList.personChargeKey=''
+        // for (var i = 0; i < this.staffList.length; i++) {
+        //   if (e.indexOf(this.staffList[i].staffName)!=-1) {
+        //     if(this.deptBudgetList.personPhone){
+        //        this.deptBudgetList.personPhone= this.deptBudgetList.personPhone+','+ this.staffList[i].staffMobilePhone
+        //     }else{
+        //       this.deptBudgetList.personPhone=this.staffList[i].staffMobilePhone
+        //     }
+        //    if(this.deptBudgetList.personChargeKey){
+        //      this.deptBudgetList.personChargeKey= this.deptBudgetList.personChargeKey+','+  this.staffList[i].staffId
+        //    }else{
+        //      this.deptBudgetList.personChargeKey= this.staffList[i].staffId
+        //    }
+            
+        //   }
+        // }
         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)
       },
       // 关闭 dialog时 处理文件url 初始化upload组件
       handleClose() {
@@ -719,6 +742,9 @@ import { isUndefined } from 'xe-utils/methods'
           agreementType: '采购合同',
           addressUrl: '',
           sellerPhone:'',
+          personPhone:'',
+          personCharge:'',
+          personChargeKey:'',
           finalTradingVolume: 0,
           totalContractPrice: 0,
           contractGoodsInfo: {
@@ -1405,6 +1431,9 @@ import { isUndefined } from 'xe-utils/methods'
         }
         this.$refs.deptBudgetList.validate((valid) => {
           if (valid) {
+            if(this.deptBudgetList.personPhone){
+              this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.toString()
+            }
             this.deptBudgetList.compId = this.compId
             this.deptBudgetList.contractType = 2
             this.deptBudgetList.goodsType = 1
@@ -1489,14 +1518,21 @@ import { isUndefined } from 'xe-utils/methods'
                 this.$message.success('添加成功')
                 this.deptBudgetList = {
                   deliverType: '1',
+                  sourceGoods:'',
+                  placeDelivery:'',
                   agreementType: '采购合同',
+                  addressUrl: '',
+                  sellerPhone:'',
+                  personPhone:'',
+                  personCharge:'',
+                  personChargeKey:'',
                   finalTradingVolume: 0,
                   totalContractPrice: 0,
                   contractGoodsInfo: {
                     goodsName: '',
                   },
                   contractProcessInfo: {},
-                  addressUrl: '',
+                  settlementWeightMethod: '1',
                 }
                 this.$router.push({
                   path: 'buyContract'

src/views/houseSelfCollect/weightCheck.vue

@@ -309,11 +309,14 @@
       } else if (this.tpyeNo == 2) {
         this.information = '皮重'
       }
-      this.$route.query.automaticWeightAcquisition = 0
+      // this.$route.query.automaticWeightAcquisition = 0
       // if(this.$route.query.automaticWeightAcquisition == '1'){
         // this.openPort()
-        this.isShowBalance = true
+        // this.isShowBalance = true
       // }
+       if (this.$route.query.automaticWeightAcquisition == '1') {
+        this.isShowBalance = true
+      }
       console.log(this.weighingList)
       
       this.getList()

src/views/warehouse/warehouseManagementGross.vue

@@ -27,7 +27,7 @@
           <div class="top">
             <div class="car-type">毛重</div>
             <div class="weight">
-              {{ grossWeight }} <span class="kg-style">kg</span>
+              {{ deptBudgetList.grossWeight }} <span class="kg-style">kg</span>
             </div>
             <!-- <div v-else class="weight">{{weighingList.tare}} <span class="kg-style">kg</span></div> -->
             <div class="car-no">{{ deptBudgetList.carNo }}</div>

src/views/warehouse/warehouseManagementList.vue

@@ -33,7 +33,7 @@
         </div>
       </template>
       <template slot="right">
-        <ws-input v-model="warehouseName" placeholder="请输入仓库名" clearable maxlength="500" type="input" class="findValue">
+        <ws-input  @keyup.enter.native="find()" v-model="warehouseName" placeholder="请输入仓库名" clearable maxlength="500" type="input" class="findValue">
         </ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -3,7 +3,7 @@
   <div class="">
     <div class="row1">
         <h2 class="bg-left title">检斤待完成</h2>
-        <el-button class="bg-bottom" type="primary" size="small" @click="returnWarehouse()"><img width="6" height="10" src="../../../public/img/lujing.png" alt="" />返回</el-button>
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnWarehouse()">返回</el-button>
     </div>
       <ws-form ref="deptBudgetList" :v-model="deptBudgetList">
         <div class="center">

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -28,7 +28,7 @@
             <div class="car-type">皮重</div>
             <!-- <div class="weight">{{deptBudgetList.grossWeight}} <span class="kg-style">kg</span></div> -->
             <div class="weight">
-              {{ tare }} <span class="kg-style">kg</span>
+              {{ dataList.tare }} <span class="kg-style">kg</span>
             </div>
             <div class="car-no">{{ dataList.carNo }}</div>
           </div>
@@ -1361,7 +1361,6 @@
                 this.dataList.deductionAmount = Math.round(
                   this.dataList.deductionAmount * 1000
                 )
-
                 addstorageputList(this.dataList)
                   .toPromise()
                   .then((response) => {

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -27,7 +27,7 @@
           <div class="top">
             <div class="car-type">毛重</div>
             <div class="weight">
-              {{ grossWeight }}
+              {{ dataList.grossWeight }}
               <span class="kg-style">kg</span>
             </div>
             <!-- <div class="weight">{{dataList.tare}} <span class="kg-style">kg</span></div> -->

src/views/warehouse/warehouseManagementTare.vue

@@ -27,7 +27,7 @@
             <div class="car-type">皮重</div>
             <!-- <div class="weight">{{deptBudgetList.grossWeight}} <span class="kg-style">kg</span></div> -->
             <div class="weight">
-              {{ tare }} <span class="kg-style">kg</span>
+              {{ deptBudgetList.tare }} <span class="kg-style">kg</span>
             </div>
             <div class="car-no">{{ deptBudgetList.carNo }}</div>
           </div>