瀏覽代碼

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

# Conflicts:
#	src/views/salesManagement/salesList/list.vue
lilei 1 年之前
父節點
當前提交
7672653bc5

+ 19 - 6
src/views/salesManagement/salesCollection/detailModal.vue

@@ -42,27 +42,33 @@
         <div ref="tableSearch" class="table-page-search-wrapper">
           <a-form layout="inline">
             <a-row :gutter="15">
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="收款单号">
                   <a-input v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="财务收款事由">
                   <a-input v-model.trim="queryParam.bookReason" allowClear placeholder="请输入财务收款事由"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="申请人">
                   <employee style="width: 100%;" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="申请时间">
                   <rangeDate ref="rangeApply" :value="applyDate" @change="dateApplyChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="客户名称">
+                  <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" @change="custChange" />
+                </a-form-item>
+              </a-col>
+
+              <a-col :md="6" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
@@ -120,13 +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 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 },
+  components: { STable, VSelect, employee, commonModal, detailModal, rangeDate, custList },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -158,6 +165,7 @@ export default {
       handlePlData: [],
       applyDate: [],
       queryParam: {
+        dealerSn: undefined,
         bookNo: '',
         bookReason: '',
         applyPersonSn: undefined,
@@ -216,6 +224,10 @@ export default {
     }
   },
   methods: {
+    // 客户名称搜索
+    custChange (val) {
+      this.queryParam.dealerSn = val.key
+    },
     // 财务收款详情
     viewDetail (row) {
       this.showDetailModal = true
@@ -278,6 +290,7 @@ export default {
     // 重置
     resetSearchForm () {
       this.queryParam = {
+        dealerSn: undefined,
         bookNo: '',
         bookReason: '',
         applyPersonSn: undefined,

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

@@ -81,16 +81,6 @@
                   <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"
-                    ref="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">

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

@@ -65,8 +65,18 @@
                     allowClear></v-select>
                 </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="24" :sm="24" style="margin-top:16px;text-align:center">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSchedule-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnSchedule-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -290,7 +300,6 @@ export default {
     },
     // 详情
     handleDetail (row) {
-      
       this.$router.push({ name: 'salesReturnDetail', params: { sn: row.salesReturnBillSn }, query: { path: 'returnSchedule' } })
     },
     // 选择省份