浏览代码

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

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

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/chooseTypeModal.vue

@@ -58,7 +58,7 @@
       </a-form-model>
       <div class="btn-cont">
         <a-button id="chooseType-modal-back" @click="isShow = false" >取消</a-button>
-        <a-button type="primary" style="margin-left: 15px;" id="chooseType-modal-save" @click="handleSave">确定</a-button>
+        <a-button type="primary" style="margin-left: 15px;" id="chooseType-modal-save" @click="handleSave">保存</a-button>
       </div>
     </a-spin>
   </a-modal>

+ 6 - 2
src/views/dealerManagement/merchantInfoManagement/permissionSettingNew.vue

@@ -115,7 +115,7 @@ export default {
     columns () {
       const _this = this
       // 操作按钮
-      const actionFormat = function (record, data, h) {
+      const actionFormat = function (record, data) {
         if (_this.$route.params.dealerLevel != 'SPECIAL') {
           return (
             <div>
@@ -143,7 +143,7 @@ export default {
         { title: '二级分类', field: 'productTypeName2', key: 'c', width: 160, align: 'center', operationColumn: false, renderBodyCell: ({ row, column }) => { return row[column.field] || '--' } },
         { title: '三级分类', field: 'productTypeName3', key: 'd', width: 160, align: 'center', operationColumn: false, renderBodyCell: ({ row, column }) => { return row[column.field] || '--' } },
         { title: '价格级别', field: 'priceLevelDictValue', key: 'd', width: 160, align: 'center', operationColumn: false, renderBodyCell: ({ row, column }) => { return row[column.field] || '--' } },
-        { title: '操作', field: 'action', width: 100, key: 'e', align: 'center', fixed: 'right', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return actionFormat(row, row[column.field], h) } }
+        { title: '操作', field: 'action', width: 100, key: 'e', align: 'center', fixed: 'right', operationColumn: false, renderBodyCell: ({ row, column }) => { return actionFormat(row, row[column.field]) } }
       ]
       return arr
     },
@@ -179,6 +179,10 @@ export default {
     },
     // 选择品类
     chooseTModal () {
+      if (this.dataSource.length === 1 && this.dataSource[0] && !this.dataSource[0].productBrandSn) {
+        this.$message.warning('选择全品类后,不能再添加其他品类!')
+        return
+      }
       this.selectedRowKeys = []
       this.openTypeModal = true
       this.$nextTick(() => {