fiex:补考前培商品选择BUG

src/views/Marketing/goods/commodityManageMent/add/index.vue

@@ -1319,7 +1319,7 @@
           <el-table-column label="" width="45" align="center">
             <template scope="scope">
               <el-radio
-                :disabled="scope.row.goodsStatus === 0"
+                :disabled="scope.row.selectStatus === 0"
                 :label="scope.row.goodsId"
                 v-model="goodsId"
                 @change.native="getGoodsId(scope.$index, scope.row)"
@@ -2092,11 +2092,11 @@ export default {
         }
         var data = JSON.parse(JSON.stringify(this.formDataBK));
         this.$api.inquireGoodslistGoods(data).then((res) => {
-          for (let i = 0; i < res.rows.length; i++) {
-            if (res.rows[i].goodsId === this.getNewGoodsId) {
-              res.rows[i].goodsStatus = 1;
-            }
-          }
+          // for (let i = 0; i < res.rows.length; i++) {
+          //   if (res.rows[i].goodsId === this.getNewGoodsId) {
+          //     res.rows[i].goodsStatus = 1;
+          //   }
+          // }
           this.goodsList = res.rows;
           this.total5 = res.total;
           resolve();

src/views/Marketing/goods/commodityManageMent/edit/index.vue

@@ -1334,7 +1334,7 @@
           <el-table-column label="" width="45" align="center">
             <template scope="scope">
               <el-radio
-                :disabled="scope.row.goodsStatus === 0"
+                :disabled="scope.row.selectStatus === 0"
                 :label="scope.row.goodsId"
                 v-model="goodsId"
                 @change.native="getGoodsId(scope.$index, scope.row)"
@@ -2088,7 +2088,7 @@ export default {
         this.$api.inquireGoodslistGoods(data).then((res) => {
           for (let i = 0; i < res.rows.length; i++) {
             if (res.rows[i].goodsId === this.getNewGoodsId) {
-              res.rows[i].goodsStatus = 1;
+              res.rows[i].selectStatus = 1;
             }
           }
           this.goodsList = res.rows;

src/views/systemManagement/roleManagement/index.vue

@@ -28,7 +28,7 @@
     <el-dialog
       @closed="loadingClose"
       :visible.sync="dialogVisible"
-      width="460px"
+      width="860px"
       :show-close="false"
       :close-on-click-modal="false"
     >
@@ -41,106 +41,106 @@
         </div>
       </div>
       <div>
-        <el-form
-          label-position="right"
-          label-width="100px"
-          :model="listData"
-          :rules="rules"
-          ref="listData"
-        >
-          <el-form-item
-            v-for="(items, indexs) in listitem"
-            :key="indexs"
-            :label="items.label"
-            :prop="items.prop"
-          >
-            <el-radio-group
-              v-if="items.scope === 'status'"
-              v-model="listData[items.prop]"
+        <el-row :gutter="10">
+          <el-form
+            label-position="right"
+            label-width="100px"
+            :model="listData"
+            :rules="rules"
+            ref="listData"
+            ><el-col
+              :span="12"
+              v-for="(items, indexs) in listitem"
+              :key="indexs"
             >
-              <el-radio
-                v-for="(item, index) in items.options"
-                :key="index"
-                :label="item.value"
-                :disabled="statusPop === 2"
-                >{{ item.label }}</el-radio
-              >
-            </el-radio-group>
-            <div v-else-if="items.scope === 'tree'">
-              <el-checkbox
-                v-model="menuExpand"
-                @change="handleCheckedTreeExpand($event, 'menu')"
-                >展开/折叠</el-checkbox
-              >
-              <el-checkbox
-                v-model="menuNodeAll"
-                @change="handleCheckedTreeNodeAll($event, 'menu')"
-                >全选/全不选</el-checkbox
-              >
-              <!-- <el-checkbox
+              <el-form-item :label="items.label" :prop="items.prop">
+                <el-radio-group
+                  v-if="items.scope === 'status'"
+                  v-model="listData[items.prop]"
+                >
+                  <el-radio
+                    v-for="(item, index) in items.options"
+                    :key="index"
+                    :label="item.value"
+                    :disabled="statusPop === 2"
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+                <div v-else-if="items.scope === 'tree'">
+                  <el-checkbox
+                    v-model="menuExpand"
+                    @change="handleCheckedTreeExpand($event, 'menu')"
+                    >展开/折叠</el-checkbox
+                  >
+                  <el-checkbox
+                    v-model="menuNodeAll"
+                    @change="handleCheckedTreeNodeAll($event, 'menu')"
+                    >全选/全不选</el-checkbox
+                  >
+                  <!-- <el-checkbox
                 v-model="listData.menuCheckStrictly"
                 @change="handleCheckedTreeConnect($event, 'menu')"
                 >父子联动</el-checkbox
               > -->
-              <el-tree
-                class="tree-border"
-                :data="menuOptions"
-                show-checkbox
-                ref="menu"
-                node-key="id"
-                empty-text="加载中，请稍后"
-                :props="defaultProps"
-              ></el-tree>
-            </div>
-            <div v-else-if="items.scope === 'treeInfo'">
-              <el-checkbox
-                v-model="menuExpandInfo"
-                @change="handleCheckedTreeExpandInfo($event, 'info')"
-                >展开/折叠</el-checkbox
-              >
-              <el-checkbox
-                v-model="menuNodeAll"
-                @change="handleCheckedTreeNodeAllInfo($event, 'info')"
-                >全选/全不选</el-checkbox
-              >
-              <!-- <el-checkbox
+                  <el-tree
+                    class="tree-border"
+                    :data="menuOptions"
+                    show-checkbox
+                    ref="menu"
+                    node-key="id"
+                    empty-text="加载中，请稍后"
+                    :props="defaultProps"
+                  ></el-tree>
+                </div>
+                <div v-else-if="items.scope === 'treeInfo'">
+                  <el-checkbox
+                    v-model="menuExpandInfo"
+                    @change="handleCheckedTreeExpandInfo($event, 'info')"
+                    >展开/折叠</el-checkbox
+                  >
+                  <el-checkbox
+                    v-model="menuNodeAllInfo"
+                    @change="handleCheckedTreeNodeAllInfo($event, 'info')"
+                    >全选/全不选</el-checkbox
+                  >
+                  <!-- <el-checkbox
                 v-model="listData.menuCheckStrictly"
                 @change="handleCheckedTreeConnect($event, 'menu')"
                 >父子联动</el-checkbox
               > -->
-              <!-- :check-strictly="!listData.menuCheckStrictly"👇 -->
-              <el-tree
-                class="tree-border"
-                :data="menuOptionsInfo"
-                show-checkbox
-                ref="info"
-                node-key="onlyId"
-                empty-text="加载中，请稍后"
-                :props="defaultProps"
-              ></el-tree>
-            </div>
-            <el-input
-              :disabled="statusPop === 2"
-              v-else-if="items.scope === 'textarea'"
-              type="textarea"
-              v-model="listData[items.prop]"
-            ></el-input>
-            <el-input-number
-              style="width: 100%"
-              :disabled="statusPop === 2"
-              v-else-if="items.scope === 'numberIndex'"
-              v-model="listData[items.prop]"
-              controls-position="right"
-              :min="0"
-              :max="99"
-            ></el-input-number>
-            <el-input
-              :disabled="statusPop === 2"
-              v-else
-              v-model="listData[items.prop]"
-            ></el-input>
-          </el-form-item>
-        </el-form>
+                  <!-- :check-strictly="!listData.menuCheckStrictly"👇 -->
+                  <el-tree
+                    class="tree-border"
+                    :data="menuOptionsInfo"
+                    show-checkbox
+                    ref="info"
+                    node-key="onlyId"
+                    empty-text="加载中，请稍后"
+                    :props="defaultProps"
+                  ></el-tree>
+                </div>
+                <el-input
+                  :disabled="statusPop === 2"
+                  v-else-if="items.scope === 'textarea'"
+                  type="textarea"
+                  v-model="listData[items.prop]"
+                ></el-input>
+                <el-input-number
+                  style="width: 100%"
+                  :disabled="statusPop === 2"
+                  v-else-if="items.scope === 'numberIndex'"
+                  v-model="listData[items.prop]"
+                  controls-position="right"
+                  :min="0"
+                  :max="99"
+                ></el-input-number>
+                <el-input
+                  :disabled="statusPop === 2"
+                  v-else
+                  v-model="listData[items.prop]"
+                ></el-input>
+              </el-form-item> </el-col></el-form
+        ></el-row>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="close">取 消</el-button>
@@ -719,6 +719,8 @@ export default {
   }
 }
 .tree-border {
+  max-height: 450px;
+  overflow: auto;
   margin-top: 5px;
   border: 1px solid #e5e6e7;
   background: #ffffff none;