浏览代码

修改bug

chenrui 2 年之前
父节点
当前提交
d1100b748e
共有 2 个文件被更改,包括 23 次插入13 次删除
  1. 20 11
      src/views/salesManagement/waitDispatch/dsModal.vue
  2. 3 2
      src/views/salesManagement/waitDispatch/edit.vue

+ 20 - 11
src/views/salesManagement/waitDispatch/dsModal.vue

@@ -22,15 +22,25 @@
           <a-form-model-item label="客户名称">
             <span>{{ detailData ? detailData.buyerName : '--' }}</span>
           </a-form-model-item>
-          <a-form-model-item label="收货客户名称" extra="如果收货客户和下单客户相同,则不需要选择收货客户名称">
-            <dealerSubareaScopeList ref="dealerSubareaScopeList" :disabled="!receiverDisabled" defValKey="buyerSn" @change="custChange" v-model="form.receiverSn" />
-          </a-form-model-item>
-          <a-form-model-item label="收货地址" prop="dealerRecevieAddressSn" v-if="form.receiverSn">
-            <div style="display:flex;padding-top:6px;">
-              <div style="width:80%;flex-grow:1;line-height: 24px;">{{ chooseAddr }}</div>
-              <a-button size="small" type="link" v-if="!receiverDisabled" @click="openAddrModal = true">{{ addressVal }} >></a-button>
-            </div>
-          </a-form-model-item>
+          <div v-if="!receiverDisabled">
+            <a-form-model-item label="收货客户名称" extra="如果收货客户和下单客户相同,则不需要选择收货客户名称">
+              <dealerSubareaScopeList ref="dealerSubareaScopeList" :disabled="receiverDisabled" defValKey="buyerSn" @change="custChange" v-model="form.receiverSn" />
+            </a-form-model-item>
+            <a-form-model-item label="收货地址" prop="dealerRecevieAddressSn" v-if="form.receiverSn">
+              <div style="display:flex;padding-top:6px;">
+                <div style="width:80%;flex-grow:1;line-height: 24px;">{{ chooseAddr }}</div>
+                <a-button size="small" type="link" v-if="receiverDisabled" @click="openAddrModal = true">{{ addressVal }} >></a-button>
+              </div>
+            </a-form-model-item>
+          </div>
+          <div v-if="receiverDisabled && detailData.salesBillExtEntity">
+            <a-form-model-item label="收货客户名称">
+              {{ detailData.salesBillExtEntity.consigneeName?detailData.salesBillExtEntity.consigneeName:'--' }}
+            </a-form-model-item>
+            <a-form-model-item label="收货地址">
+              {{ detailData.salesBillExtEntity.consigneeName+'('+detailData.salesBillExtEntity.consigneeTel+')' +detailData.salesBillExtEntity.shippingAddrProvinceName||undefined+detailData.salesBillExtEntity.shippingAddrCityName||undefined+ detailData.salesBillExtEntity.shippingAddrCountyName||undefined +detailData.salesBillExtEntity.shippingAddr||undefined }}
+            </a-form-model-item>
+          </div>
           <a-form-model-item label="发货编号" prop="sendNo">
             <a-input
               id="dealerAccountEdit-phone"
@@ -192,8 +202,7 @@ export default {
     //  获取详情
     setDetail (data) {
       this.detailData = data
-      if (this.title != '销售单一键审核') {
-        this.form.receiverSn = data.receiverSn
+      if (data && data.dispatchBillCount && data.dispatchBillCount == 1) {
         this.receiverDisabled = true
       }
     },

+ 3 - 2
src/views/salesManagement/waitDispatch/edit.vue

@@ -182,9 +182,9 @@ export default {
             this.$nextTick(() => {
               _this.$refs.table.refresh()
             })
-          }else{
+          } else {
             this.dataSource = []
-             this.$refs.table.clearTable()
+            this.$refs.table.clearTable()
           }
         } else {
           this.totalData = null
@@ -354,6 +354,7 @@ export default {
     handleDispatch () {
       if (this.dataSource.length) {
         this.showDsModal = true
+        this.detailData.dispatchBillCount = this.totalData.dispatchBillCount
         this.$refs.dsModal.setDetail(this.detailData)
       } else {
         this.$message.warning('请选择待下推产品')