lilei 11 месяцев назад
Родитель
Сommit
7ea58ffaef

+ 13 - 8
src/views/salesManagement/waitCostOrder/list.vue

@@ -3,7 +3,7 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont">
         <template slot="subTitle">
-          <a href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a href="javascript:;" @click="handleBack" id="waitCostList-back-btn"><a-icon type="left" /> 返回列表</a>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="pages-wrap">
@@ -15,12 +15,13 @@
                 <a-row :gutter="15" type="flex">
                   <a-col flex="300px">
                     <a-form-item label="促销名称/简称">
-                      <a-input v-model.trim="queryParam.promotionDescription" allowClear placeholder="请输入促销名称/简称"/>
+                      <a-input id="waitCostList-promotionDescription" v-model.trim="queryParam.promotionDescription" allowClear placeholder="请输入促销名称/简称"/>
                     </a-form-item>
                   </a-col>
                   <a-col flex="300px">
                     <a-form-item label="费用类型">
                       <v-select
+                        id="waitCostList-convertExpenseAccountType"
                         v-model="queryParam.convertExpenseAccountType"
                         code="CONVERT_EXPENSE_ACCOUNT_TYPE"
                         placeholder="请选择费用类型"
@@ -29,22 +30,22 @@
                   </a-col>
                   <a-col flex="300px">
                     <a-form-item label="客户名称">
-                      <dealerSubareaScopeList ref="dealerSubareaScopeList" @change="custChange" />
+                      <dealerSubareaScopeList id="waitCostList-dealerSubareaScopeList" ref="dealerSubareaScopeList" @change="custChange" />
                     </a-form-item>
                   </a-col>
                   <a-col flex="300px">
                     <a-form-item label="销售单号">
-                      <a-input v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                      <a-input id="waitCostList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                     </a-form-item>
                   </a-col>
                   <a-col flex="300px">
                     <a-form-item label="规则简称">
-                      <a-input v-model.trim="queryParam.promotionRuleDescription" allowClear placeholder="请输入规则简称"/>
+                      <a-input id="waitCostList-promotionRuleDescription" v-model.trim="queryParam.promotionRuleDescription" allowClear placeholder="请输入规则简称"/>
                     </a-form-item>
                   </a-col>
                   <a-col flex="150px">
-                    <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
-                    <a-button style="margin-left: 10px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                    <a-button type="primary" id="handel-search" :disabled="disabled" @click="searchForm">查询</a-button>
+                    <a-button style="margin-left: 10px" id="handel-reset" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                   </a-col>
                 </a-row>
               </a-form>
@@ -78,6 +79,7 @@
               <div>
                 <a-button
                   size="small"
+                  :id="'handel-submit-'+record.no"
                   type="link"
                   class="button-warning"
                   @click="handleSave(record)"
@@ -92,6 +94,7 @@
       <a-button
         style="width: 100px;"
         type="info"
+        id="handel-views"
         @click="handleView()"
       >
         查看已选
@@ -99,6 +102,7 @@
       <a-button
         type="primary"
         class="button-info"
+        id="handel-submit"
         :disabled="spinning"
         style="width: 100px;margin: 0 20px;"
         @click="handleSave()"
@@ -107,6 +111,7 @@
       </a-button>
       <a-button
         type="primary"
+        id="handel-mergeSubmit"
         :disabled="spinning"
         style="width: 100px;"
         @click="handleMerge()"
@@ -231,7 +236,7 @@ export default {
         }
       }
     },
-    // 客户选
+    // 客户选
     custChange (val) {
       this.queryParam.buyerName = val.name || ''
     },

+ 6 - 5
src/views/salesManagement/waitCostOrder/meargeOptionModal.vue

@@ -12,12 +12,12 @@
         <a-icon :style="{ fontSize: '16px', color: '#666', marginRight:'6px' }" type="check-square" /> 相同客户名称
       </div>
       <div style="padding:5px 0 25px 40px;" v-if="sameCustomeName">
-        <a-checkbox v-model="sameRules1" @change="sameRules2=undefined">相同促销活动</a-checkbox>
-        <a-checkbox v-model="sameRules2" @change="sameRules1=undefined">相同活动规则(同一促销活动)</a-checkbox>
+        <a-checkbox id="meargeOptions-sameRules1" v-model="sameRules1" @change="sameRules2=undefined">相同促销活动</a-checkbox>
+        <a-checkbox id="meargeOptions-sameRules2" v-model="sameRules2" @change="sameRules1=undefined">相同活动规则(同一促销活动)</a-checkbox>
       </div>
       <div class="btn-cont" style="padding:20px 20px 0;text-align: center;">
-        <a-button type="info" @click="isShow=false">取消</a-button>
-        <a-button type="primary" style="margin-left: 10px" @click="submit">确定</a-button>
+        <a-button type="info" @click="isShow=false" id="meargeOptions-cancel-btn">取消</a-button>
+        <a-button type="primary" style="margin-left: 10px" @click="submit" id="meargeOptions-ok-btn">确定</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -32,7 +32,7 @@ export default {
   mixins: [commonMixin],
   props: {
     openModal: {
-      type: Boolean,
+      type: Boolean, // 弹框显示
       default: false
     }
   },
@@ -46,6 +46,7 @@ export default {
     }
   },
   methods: {
+    // 确定提交
     submit () {
       this.$emit('meargeOk', { sameRules1: this.sameRules1, sameRules2: this.sameRules2 })
       this.isShow = false

+ 9 - 7
src/views/salesManagement/waitCostOrder/viewSelectModal.vue

@@ -26,8 +26,8 @@
         <div v-show="showEmpty" class="empty-data"><a-empty description="暂无数据" :image="simpleImage"/></div>
       </div>
       <div class="btn-cont" style="padding:20px 20px 0;text-align: center;">
-        <a-button type="primary" v-if="submitType=='noMearge'" class="button-info" @click="cancel">关闭</a-button>
-        <a-button type="primary" v-else @click="submit">提交</a-button>
+        <a-button id="viewChoose-modal-cancel" type="primary" v-if="submitType=='noMearge'" class="button-info" @click="cancel">关闭</a-button>
+        <a-button id="viewChoose-modal-submit" type="primary" v-else @click="submit">提交</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -42,7 +42,7 @@ export default {
   name: 'ViewSelectModal',
   mixins: [commonMixin],
   props: {
-    openModal: {
+    openModal: { // 弹框显示
       type: Boolean,
       default: false
     }
@@ -50,7 +50,7 @@ export default {
   data () {
     return {
       spinning: false,
-      isShow: this.openModal,
+      isShow: this.openModal, // 弹框显示
       simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
       columnWidthResizeOption: {
         // default false
@@ -58,9 +58,9 @@ export default {
         // column resize min width
         minWidth: 50
       },
-      showEmpty: false,
-      tableHeight: 450,
-      dataSource: [],
+      showEmpty: false, // 无数据图表
+      tableHeight: 450, // 表格高度
+      dataSource: [], // 列表数据
       title: '已选待转费用报销单',
       submitType: 'noMearge' // 默认是,直接勾选的数据,不是合并后的数据
     }
@@ -82,6 +82,7 @@ export default {
     }
   },
   methods: {
+    // 设置列表数据
     setData (list) {
       this.dataSource = JSON.parse(JSON.stringify(list))
       this.dataSource.map((item, index) => {
@@ -93,6 +94,7 @@ export default {
       this.spinning = true
       this.$emit('submit', this.dataSource)
     },
+    // 关闭弹框
     cancel () {
       this.isShow = false
     }