浏览代码

bug 修复

lilei 2 年之前
父节点
当前提交
d3a9850a56

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

@@ -81,7 +81,8 @@
                       <Area id="matchSoo-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                     </a-form-model-item>
                   </a-form-model-item>
-                  </a-form-model-item></a-col>
+                  </a-form-model-item>
+                </a-col>
               </template>
               <a-col :md="6" :sm="24">
                 <span class="table-page-search-submitButtons">

+ 17 - 0
src/views/salesManagement/outboundOrder/sendGoodModal.vue

@@ -47,6 +47,16 @@
                   <a-textarea placeholder="请输入详细地址(最多300字符)" :maxLength="300" v-model.trim="form.customerAddressDetail"></a-textarea>
                 </a-form-model-item>
               </a-col>
+              <a-col span="12">
+                <a-form-model-item label="物流电话" prop="transportTele">
+                  <a-input placeholder="请输入物流电话" :maxLength="30" v-model.trim="form.transportTele"></a-input>
+                </a-form-model-item>
+              </a-col>
+              <a-col span="12">
+                <a-form-model-item label="物流单号" prop="transportNo">
+                  <a-input placeholder="请输入电话" :maxLength="30" v-model.trim="form.transportNo"></a-input>
+                </a-form-model-item>
+              </a-col>
               <a-col span="12">
                 <a-form-model-item label="付款方式">
                   <v-select
@@ -208,6 +218,8 @@ export default {
         'sendDate': moment(), // 托运时间
         'customerAddress': '', // 目的地
         'customerAddressDetail': '', // 详细地址
+        'transportTele': '', // 物流电话
+        'transportNo': '', // 物流单号
         'customerCacateName': '', // 收货人
         'customerCacatePhone': '', // 收货人电话
         'payType': '', // 收款方式
@@ -280,6 +292,8 @@ export default {
           this.form.customerCacatePhone = res.data.customerCacatePhone
           this.form.customerAddress = res.data.customerAddress
           this.form.customerAddressDetail = res.data.customerAddressDetail
+          this.form.transportTele = res.data.transportTele
+          this.form.transportNo = res.data.transportNo
           this.form.sendDate = res.data.sendDate
           this.form.payType = res.data.payType
           this.form.handoverType = res.data.handoverType
@@ -396,12 +410,15 @@ export default {
       this.$emit('cancel')
       this.tableData = []
       this.detail = []
+      this.spinning = false
       this.$refs.ruleForm.resetFields()
       this.form = {
         'stockOutSnList': [], // 出库单列表
         'sendDate': moment(), // 托运时间
         'customerAddress': '', // 目的地
         'customerAddressDetail': '', // 详细地址
+        'transportTele': '', // 物流电话
+        'transportNo': '', // 物流单号
         'customerCacateName': '', // 收货人
         'customerCacatePhone': '', // 收货人电话
         'payType': '', // 收款方式

+ 3 - 0
src/views/salesManagement/sendOutOrder/detailModal.vue

@@ -27,6 +27,9 @@
           <div style="flex-basis:35%">收款方式:{{ detail.payTypeDictValue||'--' }}</div>
           <div style="flex-basis:35%">交货方式:{{ detail.handoverTypeDictValue||'--' }}</div>
           <div style="flex-basis:30%">运费合计:{{ detail.totalSendAmount }}</div>
+          <div style="flex-basis:35%">物流电话:{{ detail.transportTele||'--' }}</div>
+          <div style="flex-basis:35%">物流单号:{{ detail.transportNo||'--' }}</div>
+          <div style="flex-basis:30%"></div>
           <!-- <div style="flex-basis:100%;word-break: break-all;">发货备注:{{ detail.sendRemark||'--' }}</div> -->
           <div style="flex-basis:35%" :class="type==0?'requerd':''">物流情况:
             <v-select

+ 27 - 4
src/views/salesManagement/sendOutOrder/list.vue

@@ -53,6 +53,19 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="sendOut-subarea" v-model="queryParam.subareaSn"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="地区">
+                  <a-form-model-item >
+                    <Area id="sendOut-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                  </a-form-model-item>
+                </a-form-model-item>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
@@ -117,11 +130,13 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
 import detailModal from './detailModal.vue'
 import sendGoodModal from '../outboundOrder/sendGoodModal.vue'
+import Area from '@/views/common/area.js'
+import subarea from '@/views/common/subarea.js'
 import { sendBillQueryPageList } from '@/api/sendBill'
 export default {
   name: 'SendOutOrderList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, detailModal, sendGoodModal },
+  components: { STable, VSelect, rangeDate, detailModal, sendGoodModal, Area, subarea },
   data () {
     return {
       spinning: false,
@@ -140,7 +155,9 @@ export default {
         sendBillNo: '', //  发货单号
         bizNos: '', //  业务单号
         transportState: undefined, //  物流状态
-        receiveFlag: undefined // 收货状态
+        receiveFlag: undefined, // 收货状态
+        subareaSn: undefined,
+        provinceSn: undefined
       },
       totalData: {
         totalAmount: 0,
@@ -174,12 +191,18 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '10%', align: 'center' },
-        { title: '客户名称', dataIndex: 'customeName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '12%', align: 'center' },
+        { title: '所在区域', dataIndex: 'subareaNameSet', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '地区', dataIndex: 'provinceName ', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'customeName', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '托运日期', dataIndex: 'sendDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收货人', dataIndex: 'customerCacateName', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '物流电话', dataIndex: 'transportTele', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '物流单号', dataIndex: 'transportNo', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '总件数', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '运费合计', dataIndex: 'totalSendAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '收货状态', dataIndex: 'receiveFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款时间', dataIndex: 'settleTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货时间', dataIndex: 'receiveDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '物流情况', dataIndex: 'transportStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'transportRemark', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },