lilei 2 years ago
parent
commit
ee12799a67

+ 10 - 4
src/views/salesManagement/receiptPrint/list.vue

@@ -26,7 +26,7 @@
               </a-col>
               </a-col>
               <a-col :md="5" :sm="24">
               <a-col :md="5" :sm="24">
                 <a-form-item label="客户名称">
                 <a-form-item label="客户名称">
-                  <dealerSubareaScopeList ref="payerName" id="salesCollectionList-payerName" @change="custChange" />
+                  <dealerSearchList ref="payerName" id="alesCollectionList-payerName" @change="custChange" />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="4" :sm="24" v-if="currentTab == 1">
               <a-col :md="4" :sm="24" v-if="currentTab == 1">
@@ -131,7 +131,7 @@
 import { commonMixin } from '@/utils/mixin'
 import { commonMixin } from '@/utils/mixin'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
-import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import recordModal from './recordModal.vue'
 import recordModal from './recordModal.vue'
 import printModel from './printModel.vue'
 import printModel from './printModel.vue'
@@ -139,7 +139,7 @@ import { financeBookDetailList, updateFinanceBookDetail, getBatchLastProcessInst
 export default {
 export default {
   name: 'ReceiptPrintList',
   name: 'ReceiptPrintList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, commonModal, recordModal, printModel },
+  components: { STable, VSelect, dealerSearchList, rangeDate, commonModal, recordModal, printModel },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -154,6 +154,7 @@ export default {
         endDate: '',
         endDate: '',
         bookNo: '',
         bookNo: '',
         payerName: '',
         payerName: '',
+        dealerSn:undefined,
         subareaSn: undefined,
         subareaSn: undefined,
         billStatus: undefined,
         billStatus: undefined,
         dealerProvinceSn: undefined,
         dealerProvinceSn: undefined,
@@ -307,7 +308,11 @@ export default {
       this.queryParam.endDate = date[1] ? date[1] : ''
       this.queryParam.endDate = date[1] ? date[1] : ''
     },
     },
     custChange (val) {
     custChange (val) {
-      this.queryParam.payerName = val.name
+      if(val.row){
+        this.queryParam.payerName = val.row.dealerName
+      }else{
+        this.queryParam.payerName = val.key
+      }
     },
     },
     handlePrintStatus (row) {
     handlePrintStatus (row) {
       this.tipData = row
       this.tipData = row
@@ -350,6 +355,7 @@ export default {
         endDate: '',
         endDate: '',
         bookNo: '',
         bookNo: '',
         payerName: '',
         payerName: '',
+        dealerSn:undefined,
         subareaSn: undefined,
         subareaSn: undefined,
         billStatus: undefined,
         billStatus: undefined,
         dealerProvinceSn: undefined,
         dealerProvinceSn: undefined,

+ 1 - 1
src/views/setting/notice/detailModal.vue

@@ -7,7 +7,7 @@
     title="公告详情"
     title="公告详情"
     v-model="isShow"
     v-model="isShow"
     @cancel="isShow=false"
     @cancel="isShow=false"
-    :width="800">
+    width="80%">
     <div>
     <div>
       <a-descriptions bordered size="small" :column="2">
       <a-descriptions bordered size="small" :column="2">
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>

+ 1 - 1
src/views/setting/noticeManagement/detailModal.vue

@@ -7,7 +7,7 @@
     title="公告详情"
     title="公告详情"
     v-model="isShow"
     v-model="isShow"
     @cancel="isShow=false"
     @cancel="isShow=false"
-    :width="960">
+    width="80%">
     <div>
     <div>
       <a-descriptions bordered size="small" :column="2">
       <a-descriptions bordered size="small" :column="2">
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>

+ 2 - 2
src/views/setting/noticeManagement/editModal.vue

@@ -7,7 +7,7 @@
     :title="modalTit"
     :title="modalTit"
     v-model="isShow"
     v-model="isShow"
     @cancel="isShow=false"
     @cancel="isShow=false"
-    :width="960">
+    width="80%">
     <!-- 表单 -->
     <!-- 表单 -->
     <div>
     <div>
       <a-spin :spinning="spinning" tip="Loading...">
       <a-spin :spinning="spinning" tip="Loading...">
@@ -116,7 +116,7 @@ export default {
       spinning: false,
       spinning: false,
       formItemLayout: {
       formItemLayout: {
         labelCol: { span: 4 },
         labelCol: { span: 4 },
-        wrapperCol: { span: 20 }
+        wrapperCol: { span: 18 }
       },
       },
       form: {
       form: {
         type: undefined,
         type: undefined,