lilei 1 năm trước cách đây
mục cha
commit
fa6281171a

+ 7 - 1
src/views/expenseManagement/expenseReimbursement/baseDataModal.vue

@@ -134,8 +134,10 @@ export default {
         applyDepartmentSn: undefined, //  申请部门
         expenseType: undefined, //  费用类型1
         expenseType2: undefined, //  费用类型2
+        expenseType3: undefined, // 费用类型3
         expenseTypeName: undefined, //  费用类型1
         expenseTypeName2: undefined, //  费用类型2
+        expenseTypeName3: undefined, // 费用类型3
         expenseDate: moment().locale('zh-cn').format('YYYY-MM'), //  费用产生月
         title: '', // 主题
         content: '' // 费用说明
@@ -183,8 +185,10 @@ export default {
         applyDepartmentSn: undefined, //  申请部门
         expenseType: undefined, //  费用类型1
         expenseType2: undefined, //  费用类型2
+        expenseType3: undefined, // 费用类型3
         expenseTypeName: undefined, //  费用类型1
         expenseTypeName2: undefined, //  费用类型2
+        expenseTypeName3: undefined, // 费用类型3
         expenseDate: moment().locale('zh-cn').format('YYYY-MM'), //  费用产生月
         title: '', // 主题
         content: '' // 费用说明
@@ -220,9 +224,11 @@ export default {
       this.expenseTypes = val || []
       this.form.expenseType = val && val[0] ? val[0] : ''
       this.form.expenseType2 = val && val[1] ? val[1] : ''
+      this.form.expenseType3 = val && val[2] ? val[2] : ''
       // 名称
       this.form.expenseTypeName = opts && opts[0] ? opts[0].name : ''
       this.form.expenseTypeName2 = opts && opts[1] ? opts[1].name : ''
+      this.form.expenseTypeName3 = opts && opts[2] ? opts[2].name : ''
     },
     //  附件上传
     changeAttach (file) {
@@ -245,7 +251,7 @@ export default {
         this.$refs.attachList.setFileList(this.attachList)
       }
       setTimeout(()=>{
-        this.expenseTypes = data.expenseType ? [this.form.expenseType, this.form.expenseType2] : []
+        this.expenseTypes = data.expenseType ? [this.form.expenseType, this.form.expenseType2, this.form.expenseType3] : []
       }, 500)
     },
     //  详情

+ 9 - 2
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -43,6 +43,11 @@
                 <creatorList ref="creatorList" id="promotionList-creatorId" @change="creatorChange" />
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="经销商名称">
+                <a-input id="promotionList-purchaseBillNo" v-model="queryParam.dealerName" placeholder="请输入经销商名称" allowClear/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="promotionList-refresh">查询</a-button>
@@ -271,7 +276,8 @@ export default {
         enabledFlag: undefined, // 发布状态
         state: undefined,
         creatorId: undefined,
-        dealerAuditFlag: undefined
+        dealerAuditFlag: undefined,
+        dealerName: ''
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
@@ -535,7 +541,8 @@ export default {
         enabledFlag: undefined, // 发布状态
         state: undefined,
         creatorId: creatorObj.userid,
-        dealerAuditFlag: undefined
+        dealerAuditFlag: undefined,
+        dealerName: ''
       }
       this.$refs.rangeDate.resetDate()
       this.$refs.table.refresh(true)