高敬炎 1 год назад
Родитель
Сommit
466ece00ab
1 измененных файлов с 25 добавлено и 37 удалено
  1. 25 37
      src/views/tradeServicesManagement/warehouseReceiptAdd.vue

+ 25 - 37
src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -45,7 +45,7 @@
         <el-input disabled v-model="deptBudgetList.warehouseAddress" placeholder="请输入仓库地址" size="small"></el-input>
       </el-form-item>
       <el-form-item prop="goodsName" label="货名">
-        <el-select disabled v-model="deptBudgetList.goodsName" placeholder="请选择货名" @change="dataFlush" filterable clearable>
+        <el-select disabled v-model="deptBudgetList.goodsName" placeholder="自动获取,不可编辑" @change="dataFlush" filterable clearable>
           <el-option v-for="item in goodsList" :key="item.goodsName" :label="item.goodsName"
                   :value="item.goodsName" >
           </el-option>
@@ -59,12 +59,12 @@
           <el-option label="等外" value="等外"></el-option>
         </el-select>
       </el-form-item> -->
-      <el-form-item label="现有储量" prop="nowWeight" class="forlist">
+      <!-- <el-form-item label="现有储量" prop="nowWeight" class="forlist">
         <el-input disabled v-model="deptBudgetList.nowWeight" placeholder="请输入现有储量" size="small"></el-input>
       </el-form-item>
       <el-form-item label="可用储量(吨)" prop="useWeight" class="forlist">
         <el-input disabled v-model="deptBudgetList.useWeight" placeholder="请输入可用储量" size="small"></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="货源" prop="weight" class="forlist supplyofgoods">
         <el-input disabled v-model="goodstext" placeholder="" size="small" @input='inputChange'>
         </el-input>
@@ -193,6 +193,7 @@
               pureWeight+=data.modification[i].netWeight
             }
             this.deptBudgetList.goodsName = data.modification[0].goodsName
+            console.log(11111)
             this.dataFlush()
             this.deptBudgetList.weight = weight.toFixed(2)
             if(this.deptBudgetList.goodsName.indexOf('潮粮')!=-1){
@@ -246,7 +247,7 @@
 
         // 获取业务编号
         getbillno().toPromise().then((response) => {
-          this.deptBudgetList.billNo = response
+          this.deptBudgetList.billNo =  localStorage.getItem('ws-pf_compDomainName')+response
         })
         this.getWarehouse()
       },
@@ -287,19 +288,6 @@
                       this.goodsList.push(response[0].goodsNameInfos[i])
                     }
                   }
-                  if(this.goodsList.length > 0 ){
-                    this.deptBudgetList.nowWeight = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0].storage : ''
-                    this.deptBudgetList.useWeight = response[0].goodsNameInfos[0].useStorage
-                    this.deptBudgetList.goodsName = this.goodsList[0].goodsName
-                    this.deptBudgetList.goodsNameKey = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0].goodsNameKey : ''
-                  }else {
-
-                      this.deptBudgetList.nowWeight = ''
-                    this.deptBudgetList.useWeight = ''
-                    this.deptBudgetList.goodsName =''
-                    this.deptBudgetList.goodsNameKey = ''
-                  }
-              
                 }
                 
               this.deptBudgetList.warehouseId = response[0].id
@@ -309,17 +297,17 @@
           })
       },
       //货名切换
-      changeGoodsName(val) {
-        let _data = this.goodsList
-        for (let i = 0; i < _data.length; i++) {
-          if (_data[i].goodsName == val) {
-            this.deptBudgetList.goodsNameKey = _data[i].goodsNameKey
-            this.deptBudgetList.goodsName = _data[i].goodsName
-            this.deptBudgetList.nowWeight = _data[i].storage
-            this.deptBudgetList.useWeight =  _data[i].useStorage                                       
-          }
-        }
-      },
+      // changeGoodsName(val) {
+      //   let _data = this.goodsList
+      //   for (let i = 0; i < _data.length; i++) {
+      //     if (_data[i].goodsName == val) {
+      //       this.deptBudgetList.goodsNameKey = _data[i].goodsNameKey
+      //       this.deptBudgetList.goodsName = _data[i].goodsName
+      //       this.deptBudgetList.nowWeight = _data[i].storage
+      //       this.deptBudgetList.useWeight =  _data[i].useStorage                                       
+      //     }
+      //   }
+      // },
       dataFlush(){
         for (let i = 0; i < this.warehouseList.length; i++) {
           if (this.warehouseList[i].warehouseName == this.deptBudgetList.warehouseName) {
@@ -456,15 +444,15 @@
           this.$message.error('总价值不能为空!');
           return false
         }
-        if (!this.deptBudgetList.applicationProportion || _Validate(10, 100, 2, '', this.deptBudgetList
-            .applicationProportion)) {
-          if (!this.deptBudgetList.applicationProportion) {
-            this.$message.error('申请比例不能为空!');
-          } else {
-            this.$message.error('申请比例输入错误,10-100之间,最多保留2位小数!');
-          }
-          return false
-        }
+        // if (!this.deptBudgetList.applicationProportion || _Validate(10, 100, 2, '', this.deptBudgetList
+        //     .applicationProportion)) {
+        //   if (!this.deptBudgetList.applicationProportion) {
+        //     this.$message.error('申请比例不能为空!');
+        //   } else {
+        //     this.$message.error('申请比例输入错误,10-100之间,最多保留2位小数!');
+        //   }
+        //   return false
+        // }
         if (!this.deptBudgetList.interest || _Validate(1, 1000000000, 2, '', this.deptBudgetList
             .interest)) {
           if (!this.deptBudgetList.interest) {