gjy преди 3 години
родител
ревизия
a338882cb6
променени са 2 файла, в които са добавени 14 реда и са изтрити 8 реда
  1. 9 7
      src/views/houseSelfCollect/inspectInfo.vue
  2. 5 1
      src/views/warehouse/warehouseManagementEdit.vue

+ 9 - 7
src/views/houseSelfCollect/inspectInfo.vue

@@ -36,6 +36,12 @@
               <ws-input v-model="inspect.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10" size="small"
                 :disabled="disabled" />
             </ws-form-item>
+            <ws-form-item label="货名" span="1" prop="goodsName">
+              <ws-select v-model="inspect.goodsName" placeholder="" class="typeselect" :disabled="disabledName" @change="waterContentChange">
+                <ws-option v-for="item in goodNameList" :key="item.goodsName" :label="item.goodsName"
+                  :value="item.goodsName" />
+              </ws-select>
+            </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="carNumber">
               <!-- <el-select v-model="inspect.carNumber" clearable filterable  placeholder="请选择" class="typeselect" @change="shipperNameChange"
                 :disabled="disabled1">
@@ -59,12 +65,7 @@
               <ws-input :disabled="disabled" v-model="inspect.titleNoOther" placeholder="请输入封号" maxlength="20"
                 size="small" />
             </ws-form-item>
-            <ws-form-item label="货名" span="1" prop="goodsName">
-              <ws-select v-model="inspect.goodsName" placeholder="" class="typeselect" :disabled="disabledName" @change="waterContentChange">
-                <ws-option v-for="item in goodNameList" :key="item.goodsName" :label="item.goodsName"
-                  :value="item.goodsName" />
-              </ws-select>
-            </ws-form-item>
+            
             <ws-form-item v-if="inspect.paramType != '1'" label="扣重比" span="1" prop="buckleWeightRatio">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.buckleWeightRatio"
                 placeholder="请输入扣重比" maxlength="100" size="small" :disabled="disabled" />
@@ -915,8 +916,9 @@
         let customers = e.split('(')
         this.inspect.customerName = customers[0]
         for (let i = 0; i < this.customerList1.length; i++) {
-          console.log(this.customerList1[i].customerName, this.inspect.customerName)
+          // console.log(this.customerList1[i].customerName, this.customerList1[i])
           if (this.customerList1[i].customerName == this.inspect.customerName) {
+            console.log(this.customerList1[i])
             this.inspect.customerNumberCard = this.customerList1[i].customerNumberCard
           }
         }

+ 5 - 1
src/views/warehouse/warehouseManagementEdit.vue

@@ -495,7 +495,11 @@
             }else{
                 this.addressUrls = []
             }
-            this.deptBudgetList.otherPersonPhone = this.deptBudgetList.otherPersonPhone.split(',')
+            if(this.deptBudgetList.otherPersonPhone!=''){
+              this.deptBudgetList.otherPersonPhone = this.deptBudgetList.otherPersonPhone.split(',')
+            }else{
+               this.deptBudgetList.otherPersonPhone = []
+            }
             this.addressUrls.pop()
           })
       },