Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/businessManagement/deliveryNotice/index.vue

@@ -384,9 +384,7 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        if (this.page.total) {
-          this.option.height = window.innerHeight - 240;
-        }
+        this.option.height = window.innerHeight - 240;
       }).finally(() => {
         this.loading = false;
       })

src/views/businessManagement/purchaseOrder/index.vue

@@ -409,9 +409,7 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        if (this.page.total) {
-          this.option.height = window.innerHeight - 240;
-        }
+        this.option.height = window.innerHeight - 240;
       }).finally(() => {
         this.loading = false;
       })

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -91,6 +91,18 @@
                 <el-select v-else-if="item.prop === 'warehouseType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled || receiveDisabled">
                   <el-option v-for="(item,index) in warehouseTypeOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
+                <el-select
+                  v-else-if="item.prop === 'arrivalAddress'"
+                  v-model="form[item.prop]"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                  size="small"
+                  @change="arrivalAddressChange"
+                  :disabled="detailData.seeDisabled || receiveDisabled">
+                  <el-option v-for="(item,index) in GYSInfo" :key="index" :label="item.addr" :value="item.addr"></el-option>
+                </el-select>
                 <warehouse-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]"
                                   :configuration="configurationWarehouse" style="width: 100%" :disabled="detailData.seeDisabled || receiveDisabled"/>
                 <el-input
@@ -147,7 +159,7 @@
                 v-if="row.$cellEdit"
                 v-model.trim="row.actualQuantity"
                 v-input-limit="0"
-                @change="actualQuantityChange(row)"
+                @input="actualQuantityChange(row)"
               ></el-input>
               <span v-else>{{ row.actualQuantity | IntegerFormat }}</span>
             </template>
@@ -839,7 +851,8 @@ export default {
         row.actualQuantity = '0.00'
         row.deliveryAmount = '0.00'
       } else {
-        row.deliveryAmount = Number(row.actualQuantity) * Number(row.purchaseAmount)
+        this.$set(row, 'deliveryAmount', Number(row.actualQuantity) * Number(row.purchaseAmount))
+        // row.deliveryAmount = Number(row.actualQuantity) * Number(row.purchaseAmount)
       }
     },
     // 类别变换时触发
@@ -1401,6 +1414,20 @@ export default {
     getGSName(row) {
       this.form.belongCompany = row.cname
     },
+    arrivalAddressChange(val) {
+      let isTrue = false
+      this.GYSInfo.forEach(item => {
+        if (val == item.addr) {
+          this.$set(this.form, 'arrivalContact', item.attn)
+          this.$set(this.form, 'arrivalTel', item.tel)
+          isTrue = true
+        }
+      })
+      if (!isTrue) {
+        this.$set(this.form, 'arrivalContact', null)
+        this.$set(this.form, 'arrivalTel', null)
+      }
+    },
   }
 }
 </script>

src/views/businessManagement/receipt/index.vue

@@ -367,9 +367,7 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        if (this.page.total) {
-          this.option.height = window.innerHeight - 240;
-        }
+        this.option.height = window.innerHeight - 240;
       }).finally(() => {
         this.loading = false;
       })

src/views/businessManagement/salesOrder/index.vue

@@ -432,9 +432,7 @@ export default {
           this.$set(item,'loading', true)
         })
         this.page.total = res.data.data.total
-        if (this.page.total) {
-          this.option.height = window.innerHeight - 240;
-        }
+        this.option.height = window.innerHeight - 240;
       }).finally(() => {
         this.loading = false;
       })