ソースを参照

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

lilei 1 年間 前
コミット
341c156122

+ 10 - 7
src/views/dealerManagement/merchantInfoManagement/chooseTypeModal.vue

@@ -29,9 +29,11 @@
             placeholder="请选择价格级别"></v-select>
         </a-form-model-item>
         <a-form-model-item label="添加品类" prop="typeVal">
-          <a-checkbox v-for="(con,i) in filterList" :checked="con.checked" :key="con.id" @change="e=>onChangeType(e.target.checked,i)">
-            <span v-show="con.id!=4">{{ con.name }}</span>
-            <span v-show="con.id==4">
+          <span v-for="(con,i) in filterList" :key="con.id" >
+            <a-checkbox :checked="con.checked" @change="e=>onChangeType(e.target.checked,i)" v-show="con.id!=4">
+              {{ con.name }}
+            </a-checkbox>
+            <a-checkbox :checked="con.checked" @change="e=>onChangeType(e.target.checked,i)" v-show="con.id==4&&disabledList.length==0">
               <a-tooltip placement="rightTop">
                 <template slot="title">
                   <span>选择全品类后,未来新加入的品类也将自动默认为已选择状态,无需再次手动操作。</span>
@@ -39,8 +41,8 @@
                 <span>{{ con.name }}</span>
                 <a-icon type="question-circle" style="margin-left:5px;" />
               </a-tooltip>
-            </span>
-          </a-checkbox>
+            </a-checkbox>
+          </span>
         </a-form-model-item>
         <div class="typeListBox" v-show="form.typeVal!=4">
           <a-tree
@@ -89,7 +91,7 @@ export default {
       },
       rules: {
         priceLevel: [
-          { required: true, message: '请选择价格级', trigger: 'change' }
+          { required: true, message: '请选择价格级', trigger: 'change' }
         ],
         typeVal: [
           { required: true, message: '请选择产品品类', trigger: 'change' }
@@ -161,7 +163,7 @@ export default {
           if (formData.typeVal != '4') {
             const checkedArr = _this.changeCheckedList()
             if (checkedArr.length == 0) {
-              _this.$message.warning('请选择添加品类!')
+              _this.$message.warning('请添加品类!')
               return
             }
             const arr = []
@@ -275,6 +277,7 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$refs.ruleForm.resetFields()
+        this.checkedList = []
         this.filterList.map(item => item.checked = false)
         this.$emit('close')
       } else {

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

@@ -43,8 +43,8 @@
         <!-- 操作按钮 -->
         <div class="table-operator">
           <a-button type="primary" class="button-error" @click="chooseTModal">选择品类</a-button>
-          <span v-if="!showEmpty && $route.params.dealerLevel != 'SPECIAL'">
-            <a-button type="primary" class="button-info" @click="handleEdit()">批量编辑</a-button>
+          <span v-if="!showEmpty">
+            <a-button type="primary" v-if="$route.params.dealerLevel != 'SPECIAL'" class="button-info" @click="handleEdit()">批量编辑</a-button>
             <a-button type="primary" ghost class="button-error" @click="handleDel()">批量删除</a-button>
           </span>
         </div>
@@ -69,7 +69,7 @@
       </a-card>
     </a-spin>
     <!-- 选择产品分类 -->
-    <chooseTypeModal ref="chooseType" :openModal="openTypeModal" @close="openTypeModal=false" @ok="resetSearchForm" />
+    <chooseTypeModal ref="chooseType" :openModal="openTypeModal" @close="openTypeModal=false" @ok="getData" />
     <!-- 修改价格等级 -->
     <editPriceLevelModal :priceLevelVal="itemPriceLevel" :openModal="openPriceLevelModal" @close="closePriceLevelModal" @ok="handlePriceLevelOk" />
   </div>
@@ -138,10 +138,11 @@ export default {
       }
       const arr = [
         { title: '', field: '', key: 'acheck', width: 60, type: 'checkbox', align: 'center' },
-        { title: '品牌', field: 'productBrandName', key: 'a', align: 'center', width: 160, operationColumn: false, renderBodyCell: ({ row, column }) => { return row[column.field] || '--' } },
+        { title: '品牌', field: 'productBrandName', key: 'a', align: 'center', width: 160, operationColumn: false, renderBodyCell: ({ row, column }) => { return row[column.field] || '全品类' } },
         { title: '一级分类', field: 'productTypeName1', key: 'b', width: 160, align: 'center', operationColumn: false, renderBodyCell: ({ row, column }) => { return row[column.field] || '--' } },
         { 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) } }
       ]
       return arr
@@ -178,6 +179,7 @@ export default {
     },
     // 选择品类
     chooseTModal () {
+      this.selectedRowKeys = []
       this.openTypeModal = true
       this.$nextTick(() => {
         this.$refs.chooseType.getDisabledList()