Merge branch 'master' of http://120.26.64.82:10880/BFFE/SMAirports

src/views/newRole/css/index.scss

@@ -186,6 +186,22 @@
               height: 64px;
               margin-bottom: 20px;
             }
+            ::v-deep .multipleTable {
+              .DisabledSelection .cell .el-checkbox__inner {
+                display: none;
+                position: relative;
+              }
+              .DisabledSelection .cell:before {
+                content: "是否可用";
+                position: absolute;
+                left: 50%;
+                margin-left: -28px;
+              }
+              .cell{
+                text-align: center;
+                color: #303133;
+              }
+            }
           }
         }
       }

src/views/newRole/index.vue

@@ -86,14 +86,14 @@
               </div>
             </div>
             <div class="newService-content-left-bottom">
-              <el-table ref="multipleTable" :data="checkArrs" border stripe :maxHeight="tableHeight" tooltip-effect="dark" style="width: 100%;" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" label="选中" width="55">
+              <el-table ref="multipleTable" class="multipleTable" :data="checkArrs" border stripe :maxHeight="tableHeight" tooltip-effect="dark" style="width: 100%;" @selection-change="handleSelectionChange">
+                <el-table-column label-class-name="DisabledSelection" type="selection" width="100">
                 </el-table-column>
                 <el-table-column prop="columnLabel" label="列名">
                 </el-table-column>
                 <el-table-column label="行授权">
                   <template slot-scope="scope">
-                    <el-input size="small" placeholder="请输入内容" v-model="scope.row.columnName" clearable>
+                    <el-input size="small" placeholder="请输入内容" v-model="scope.row.rowauth" clearable>
                     </el-input>
                   </template>
                 </el-table-column>
@@ -428,6 +428,7 @@ export default {
         }
         this.tipMsg(code)
       }
+      // this.checkArrs = []
     },
     async setItem (node, data) {
       if (this.dataObj.role_ID) {
@@ -437,9 +438,10 @@ export default {
           const res = await this.getQueryList(SERVICE_ID.authTreeId, [{ auth_id: data.auth_id }, { role_id: this.dataObj.role_ID }], ['auth_id', 'role_id'])
           if (res && res.length) {
             const resmsg = []
-            result.forEach(item => {
+            result.forEach((item) => {
               res.forEach(p => {
-                if (item.columnName == p.columnname) {
+                if (item.queryTemplateColumnSetID == p.queryTemplateColumnSetID) {
+                  item.rowauth = p.rowauth
                   resmsg.push(item)
                 }
               })
@@ -479,20 +481,30 @@ export default {
         }
       }
     },
-    sendCheckData (arr) {
+    sendCheckData (arr, type = false) {
       const newData = []
       arr.forEach(item => {
-        const obj = {
-          "role_id": this.dataObj.role_ID,
-          "role_name": this.dataObj.role_name,
-          "role_status": this.dataObj.role_status,
-          "auth_id": this.treeCheckObj.auth_id,
-          "auth_type": this.treeCheckObj.auth_type,
-          "queryTemplateColumnSetID": item.queryTemplateColumnSetID,
-          "columnLabel": item.columnLabel,
-          "columnname": item.columnName
+        if (type) {
+          const obj = {
+            "role_id": this.dataObj.role_ID,
+            "auth_id": this.treeCheckObj.auth_id,
+            "queryTemplateColumnSetID": item.queryTemplateColumnSetID,
+          }
+          newData.push(obj)
+        } else {
+          const obj = {
+            "role_id": this.dataObj.role_ID,
+            "role_name": this.dataObj.role_name,
+            "role_status": this.dataObj.role_status,
+            "auth_id": this.treeCheckObj.auth_id,
+            "auth_type": this.treeCheckObj.auth_type,
+            "queryTemplateColumnSetID": item.queryTemplateColumnSetID,
+            "columnLabel": item.columnLabel,
+            "columnname": item.columnName,
+            "rowauth": item.rowauth
+          }
+          newData.push(obj)
         }
-        newData.push(obj)
       })
       return newData
     },
@@ -512,7 +524,7 @@ export default {
     },
     async handleColSave () {
       const result = this.sendCheckData(this.multipleTable)
-      const dis = this.sendCheckData(this.checkGroups)
+      const dis = this.sendCheckData(this.checkGroups, true)
       if (dis && dis.length) {
         await this.getChangeList(SERVICE_ID.authTreeId, dis, 3)
       }

src/views/table/components/advanceQuery.vue

@@ -18,7 +18,7 @@
               <template slot-scope="scope">
                 <el-form-item :prop="'params.' + scope.$index + '.' + col.prop" :rules="paramsForm.validateRules[col.prop]">
                   <template v-if="col.prop === 'comparisonOperator' || col.inputType[scope.$index] === 'select'">
-                    <el-select v-model="scope.row[col.prop]" placeholder="请选择" @change="
+                    <el-select clearable v-model="scope.row[col.prop]" placeholder="请选择" @change="
                           value => {
                             selectChangeHandler(value, scope.$index, index)
                           }
@@ -27,7 +27,7 @@
                     </el-select>
                   </template>
                   <template v-else-if="col.inputType === 'select'">
-                    <el-select v-model="scope.row[col.prop]" placeholder="请选择" @change="
+                    <el-select clearable v-model="scope.row[col.prop]" placeholder="请选择" @change="
                           value => {
                             selectChangeHandler(value, scope.$index, index)
                           }
@@ -36,10 +36,10 @@
                     </el-select>
                   </template>
                   <template v-else-if="['varchar', 'text', 'longtext'].includes(col.inputType[scope.$index])">
-                    <el-input v-model="scope.row[col.prop]" placeholder="请输入" :disabled="col.prop === 'paramValue' && paramsForm.disabled[scope.$index]" />
+                    <el-input clearable v-model="scope.row[col.prop]" placeholder="请输入" :disabled="col.prop === 'paramValue' && paramsForm.disabled[scope.$index]" />
                   </template>
                   <template v-else-if="col.inputType[scope.$index] === 'number'">
-                    <el-input v-model="scope.row[col.prop]" placeholder="请输入" :disabled="col.prop === 'paramValue' && paramsForm.disabled[scope.$index]" @keydown.native="inputHold(scope.row[col.prop])" @input="inputLimit(scope.row[col.prop], scope.$index)" @blur="inputFix(scope.row[col.prop], scope.$index)" />
+                    <el-input clearable v-model="scope.row[col.prop]" placeholder="请输入" :disabled="col.prop === 'paramValue' && paramsForm.disabled[scope.$index]" @keydown.native="inputHold(scope.row[col.prop])" @input="inputLimit(scope.row[col.prop], scope.$index)" @blur="inputFix(scope.row[col.prop], scope.$index)" />
                   </template>
                   <template v-else-if="col.inputType[scope.$index] === 'date'">
                     <el-date-picker v-model="scope.row[col.prop]" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择" :clearable="false" :picker-options="datePickerOptions(scope.$index, index)" @change="