Pārlūkot izejas kodu

Merge branch 'develop_yh23' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh23

lilei 1 gadu atpakaļ
vecāks
revīzija
7f9bb33f19

+ 12 - 8
src/views/salesManagement/salesCollection/detailModal.vue

@@ -63,8 +63,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="客户名称">
-                  <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" @change="custChange" />
+                <a-form-item label="付款方">
+                  <dealerSearchList ref="custList" @change="custChange" />
                 </a-form-item>
               </a-col>
 
@@ -126,14 +126,14 @@ import { STable, VSelect } from '@/components'
 import { financeBookQueryPage } from '@/api/financeBook.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import commonModal from '@/views/common/commonModal.vue'
-import custList from '@/views/common/custList.vue'
+import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import detailModal from '@/views/financialManagement/financialCollection/detail.vue'
 import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import { settleReceiptBookBatch } from '@/api/settleReceipt'
 export default {
   name: 'GlDetailModal',
   mixins: [commonMixin],
-  components: { STable, VSelect, employee, commonModal, detailModal, rangeDate, custList },
+  components: { STable, VSelect, employee, commonModal, detailModal, rangeDate, dealerSearchList },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -165,7 +165,7 @@ export default {
       handlePlData: [],
       applyDate: [],
       queryParam: {
-        dealerSn: undefined,
+        payerName: undefined,
         bookNo: '',
         bookReason: '',
         applyPersonSn: undefined,
@@ -224,9 +224,12 @@ export default {
     }
   },
   methods: {
-    // 客户名称搜索
     custChange (val) {
-      this.queryParam.dealerSn = val.key
+      if (val.row) {
+        this.queryParam.payerName = val.row.dealerSn
+      } else {
+        this.queryParam.payerName = val.key
+      }
     },
     // 财务收款详情
     viewDetail (row) {
@@ -290,12 +293,13 @@ export default {
     // 重置
     resetSearchForm () {
       this.queryParam = {
-        dealerSn: undefined,
+        payerName: undefined,
         bookNo: '',
         bookReason: '',
         applyPersonSn: undefined,
         status: 'AUDIT_PASS'
       }
+      this.$refs.custList.resetForm()
       this.orginData = []
       this.$nextTick(() => {
         this.$refs.rangeApply.resetDate()

+ 10 - 0
src/views/salesManagement/salesList/list.vue

@@ -81,6 +81,16 @@
                   <Area id="salesList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
                 </a-form-model-item>
               </a-col>
+              <!-- <a-col :md="6" :sm="24">
+                <a-form-model-item label="超时环节提醒">
+                  <v-select
+                    v-model="queryParam.sendFlag"
+                    id="outboundOrderList-sendFlag"
+                    code="SEND_FLAG"
+                    placeholder="请选择提醒环节"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col> -->
             </template>
             <a-col :md="6" :sm="24">
               <div class="table-page-search-submitButtons">

+ 2 - 2
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -65,7 +65,7 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <!-- <a-col :md="6" :sm="24">
                 <a-form-model-item label="超时环节提醒">
                   <v-select
                     v-model="queryParam.sendFlag"
@@ -74,7 +74,7 @@
                     placeholder="请选择提醒环节"
                     allowClear></v-select>
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
             </template>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSchedule-refresh">查询</a-button>