lilei 1 年之前
父节点
当前提交
f2d2258861

+ 6 - 3
src/views/salesManagement/waitCostOrder/list.vue

@@ -90,7 +90,6 @@
     <div class="affix-cont" :style="{padding:hideFooter?0:'7px 0 4px'}">
       <a-button
         style="width: 100px;"
-        :disabled="!hasSelect"
         type="primary"
         class="button-info"
         @click="handleView()"
@@ -174,7 +173,7 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '号', dataIndex: 'no', width: '5%', align: 'center', customRender: function (text) { return text || '--' }},
+        { title: '号', dataIndex: 'no', width: '5%', align: 'center', customRender: function (text) { return text || '--' }},
         { title: '销售单号', dataIndex: 'salesBillNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '费用类型', dataIndex: 'convertExpenseAccountTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' }},
@@ -182,7 +181,7 @@ export default {
         { title: '促销名称', dataIndex: 'promotionTitle', width: '17%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '促销简称', dataIndex: 'promotionDescription', width: '17%', align: 'left', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '规则简称', dataIndex: 'promotionRuleDescription', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, sorter: true },
-        { title: '规则类型', dataIndex: 'promotionRuleTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销类型', dataIndex: 'promotionRuleTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       return arr
@@ -254,6 +253,10 @@ export default {
     },
     // 查看
     handleView () {
+      if(!this.hasSelect){
+        this.$message.warning('请先勾选!')
+        return
+      }
       this.showViewModal = true
       this.$refs.viewModal.setData(this.rowSelectionInfo&&this.rowSelectionInfo.selectedRows)
     },

+ 2 - 2
src/views/salesManagement/waitCostOrder/viewSelectModal.vue

@@ -20,7 +20,7 @@
         <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 style="margin-left: 10px" @click="isShow=false">关闭</a-button>
+        <a-button type="primary" class="button-info" style="margin-left: 10px" @click="isShow=false">确定</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -68,7 +68,7 @@
                 { title: '促销名称', field: 'promotionTitle',key: "f", width: 150, align: 'left',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
                 { title: '促销简称', field: 'promotionDescription',key: "g", width: 150, align: 'left',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
                 { title: '规则简称', field: 'promotionRuleDescription',key: "h", width: 150, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
-                { title: '规则类型', field: 'promotionRuleTypeDictValue',key: "l", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}}
+                { title: '促销类型', field: 'promotionRuleTypeDictValue',key: "l", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}}
             ]
         return arr
       }