lilei hai 11 meses
pai
achega
12e31726f0

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

@@ -1,5 +1,6 @@
 <template>
   <a-modal
+    v-drag
     v-model="opened"
     :title="title"
     centered

+ 2 - 1
src/views/salesManagement/waitCostOrder/list.vue

@@ -260,6 +260,7 @@ export default {
         salesPromoSnList: salesPromoSnList,
         groupType: groupType
       }
+      const meargeType = { 'CUSTOMER': '相同客户名称', 'CUSTOMER_PROMO': '相同促销活动', 'CUSTOMER_PROMO_RULE': '相同活动规则' }
       // 开始合并
       queryBatchCreateBySalesPromoSnListGroupType(params).then(res => {
         // 打开已合并的待转费用报销单弹框
@@ -268,7 +269,7 @@ export default {
           if (list.length) {
             // 打开查看弹框
             this.showViewModal = true
-            this.$refs.viewModal.title = '已合并的待转费用报销单'
+            this.$refs.viewModal.title = '已合并的待转费用报销单' + '(按' + meargeType[groupType] + '合并)'
             this.$refs.viewModal.submitType = 'mearge'
             this.$refs.viewModal.setData(list, res.data)
           } else {

+ 1 - 0
src/views/salesManagement/waitCostOrder/viewSelectModal.vue

@@ -1,5 +1,6 @@
 <template>
   <a-modal
+    v-drag
     centered
     :footer="null"
     :maskClosable="false"