lilei 2 سال پیش
والد
کامیت
0636754afd

+ 6 - 4
src/views/salesManagement/salesCollection/list.vue

@@ -169,6 +169,12 @@
           <span v-if="record.settleState=='WAIT' && record.voidFlag==1">--</span>
         </template>
       </s-table>
+
+      <!-- 关联收款单 -->
+      <detailModal ref="detailModal" modalTit="关联收款单" @ok="relationSuccess" :openModal="showDetail" @cancel="showDetail=false"></detailModal>
+      <!-- 销售收款凭证 -->
+      <voucherModal ref="voucherModal" modalTit="销售收款凭证" :openModal="showVoucher" @cancel="showVoucher=false"></voucherModal>
+
       <!-- 销售收款弹框 -->
       <commonModal
         :openModal="showSkModal"
@@ -191,10 +197,6 @@
           </div>
         </div>
       </commonModal>
-      <!-- 关联收款单 -->
-      <detailModal ref="detailModal" modalTit="关联收款单" @ok="relationSuccess" :openModal="showDetail" @cancel="showDetail=false"></detailModal>
-      <!-- 销售收款凭证 -->
-      <voucherModal ref="voucherModal" modalTit="销售收款凭证" :openModal="showVoucher" @cancel="showVoucher=false"></voucherModal>
     </a-spin>
   </a-card>
 </template>

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -327,7 +327,7 @@ export default {
       // } else {
       //   this.$router.push({ path: '/salesManagement/salesQuery/list', query: { closeLastOldTab: true } })
       // }
-      this.$router.push({ name: this.fromRouter ? this.fromRouter.name : 'salesQueryList' })
+      this.$router.push({ name: this.fromRouter.name ? this.fromRouter.name : 'salesQueryList' })
     },
     // 编辑
     handleEdit () {

+ 2 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -245,6 +245,7 @@ import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
+import commonModal from '@/views/common/commonModal.vue'
 import chooseCustomModal from './chooseCustomModal.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import { salesList, salesDel, salesCount } from '@/api/sales'
@@ -252,7 +253,7 @@ import { findBySalesBillSn, dispatchPrintStatus } from '@/api/dispatch'
 export default {
   name: 'SalesQueryList',
   mixins: [commonMixin],
-  components: { STable, VSelect, chooseCustomModal, dealerSubareaScopeList, rangeDate, subarea },
+  components: { STable, VSelect, chooseCustomModal, dealerSubareaScopeList, rangeDate, subarea, commonModal },
   data () {
     return {
       spinning: false,

+ 9 - 32
src/views/salesManagement/waitDispatch/dsModal.vue

@@ -25,9 +25,9 @@
           <a-form-model-item label="收货客户名称" extra="如果收货客户和下单客户相同,则不需要选择收货客户名称">
             <dealerSubareaScopeList ref="dealerSubareaScopeList" defValKey="buyerSn" @change="custChange" v-model="form.receiverSn" />
           </a-form-model-item>
-          <a-form-model-item label="收货地址" prop="consigneeTel" v-if="form.receiverSn">
-            <div>
-              {{ chooseAddr }}
+          <a-form-model-item label="收货地址" prop="dealerRecevieAddressSn" v-if="form.receiverSn">
+            <div style="display:flex;">
+              <div style="width:80%;flex-grow:1;line-height: 24px;">{{ chooseAddr }}</div>
               <a-button type="link" @click="openAddrModal = true">{{ addressVal }} >></a-button>
             </div>
           </a-form-model-item>
@@ -97,20 +97,12 @@ export default {
         buyerName: '',
         receiverSn: '',
         receiverName: '',
-        shippingAddrProvinceSn: '',
-        shippingAddrProvinceName: '', // 省
-        shippingAddrCitySn: '',
-        shippingAddrCityName: '', // 市
-        shippingAddrCountySn: '',
-        shippingAddrCountyName: '', // 区
-        shippingAddr: '', // 详细地址
-        consigneeTel: '', // 联系电话
-        consigneeName: '' // 联系人名称
+        dealerRecevieAddressSn: undefined // 地址sn
       },
       rules: {
         sendNo: [{ required: true, message: '请输入发货编号', trigger: 'change' }],
         printStatus: [{ required: true, message: '请选择备货打印', trigger: 'change' }],
-        consigneeTel: [ { required: true, message: '收货人手机号码不能为空', trigger: ['change', 'blur'] } ]
+        dealerRecevieAddressSn: [ { required: true, message: '请选择收货地址', trigger: ['change', 'blur'] } ]
       },
       detailData: null, //  详情数据
       addressVal: '选择地址', //  选择地址/更换地址
@@ -153,15 +145,7 @@ export default {
       if (id == this.addressId) {
         this.chooseAddr = ''
         this.addressVal = '选择地址'
-        this.form.shippingAddrProvinceSn = ''
-        this.form.shippingAddrProvinceName = ''// 省
-        this.form.shippingAddrCitySn = ''
-        this.form.shippingAddrCityName = '' // 市
-        this.form.shippingAddrCountySn = ''
-        this.form.shippingAddrCountyName = '' // 区
-        this.form.shippingAddr = ''// 详细地址
-        this.form.consigneeTel = '' // 联系电话
-        this.form.consigneeName = ''
+        this.form.dealerRecevieAddressSn = undefined
       }
     },
     //  保存
@@ -179,21 +163,14 @@ export default {
     },
     //  地址保存
     handleOk (data) {
+      console.log(data, 'chooseAddr')
       this.chooseAddr = (data.consigneeName || '') + '(' + (data.consigneeTel || '-') + ')' + ' ' + (data.address || '')
       this.addressVal = '更换地址'
-      this.form.shippingAddrProvinceSn = data.provinceSn || ''
-      this.form.shippingAddrProvinceName = data.provinceName || '' // 省
-      this.form.shippingAddrCitySn = data.citySn || ''
-      this.form.shippingAddrCityName = data.cityName || '' // 市
-      this.form.shippingAddrCountySn = data.countySn || ''
-      this.form.shippingAddrCountyName = data.countyName || '' // 区
-      this.form.shippingAddr = data.addr || ''// 详细地址
-      this.form.consigneeTel = data.consigneeTel || '' // 联系电话
-      this.form.consigneeName = data.consigneeName || ''
+      this.form.dealerRecevieAddressSn = data.dealerRecevieAddressSn || undefined
       this.addressId = data.id || undefined
       this.openAddrModal = false
       // 移除表单项的校验结果
-      this.$refs.ruleForm.clearValidate('consigneeTel')
+      this.$refs.ruleForm.clearValidate('dealerRecevieAddressSn')
     },
     //  获取详情
     setDetail (data) {