|
@@ -59,6 +59,7 @@
|
|
|
<el-radio v-if="type == '1' || type == '2'" v-model="authType" label="2"
|
|
|
style="margin: 10px">特殊权限</el-radio>
|
|
|
<div id="limit">
|
|
|
+ <div style="margin-right: 10px;margin-left: 10px;display: inline-block;color: red;">注:分配的行的权限不能重复</div>
|
|
|
<div v-for="(item, index) in limitList">
|
|
|
<div style="margin-right: 10px;margin-left: 10px;display: inline-block;">负责人:</div>
|
|
|
<el-button v-if="type == '1' || type == '2'" type="primary"
|
|
@@ -113,10 +114,10 @@
|
|
|
<el-dialog title="选择填报人" :visible.sync="noLimitDialog" width="100%" :destroy-on-close="true"
|
|
|
:modal-append-to-body="false" :close-on-click-modal="false">
|
|
|
<div style="max-height:500px ;">
|
|
|
- <deptTreeUserNew v-if="authType == '1'" @treeCheck="treeCheckonly" :defaultList="defaultList"
|
|
|
- :type="depttype" :closeList="closeList" :oneORmore="authType" treeListType="1"></deptTreeUserNew>
|
|
|
- <deptTreeUserNew v-if="authType == '2'" @treeCheck="treeCheckonly" :defaultList="defaultList"
|
|
|
- :type="depttype" :closeList="closeList" :oneORmore="authType" treeListType="1"></deptTreeUserNew>
|
|
|
+ <!-- <deptTreeUserNew v-if="authType == '1'" @treeCheck="treeCheckonly" :defaultList="defaultList"
|
|
|
+ :type="depttype" :closeList="closeList" :oneORmore="authType" treeListType="1"></deptTreeUserNew> -->
|
|
|
+ <deptTreeUserNew @treeCheck="treeCheckonly" :defaultList="defaultList" :type="depttype"
|
|
|
+ :closeList="closeList" oneORmore="2" treeListType="1"></deptTreeUserNew>
|
|
|
|
|
|
<div slot="footer" style="text-align: right;padding-bottom: 20px">
|
|
|
<el-button @click="noLimitDialog = false">取 消</el-button>
|
|
@@ -803,9 +804,9 @@ export default {
|
|
|
}
|
|
|
} else if (this.authType == '2') {
|
|
|
this.limitList.map((o) => {
|
|
|
- console.log(o.userIds);
|
|
|
+ // console.log(o.userIds);
|
|
|
console.log(o.editStart);
|
|
|
- console.log(o.editStartCol);
|
|
|
+ console.log(o.editEnd);
|
|
|
let str = o.editStartCol + o.editEndCol
|
|
|
if (o.userIds == null || o.userIds[0].key == null) {
|
|
|
this.$message({
|
|
@@ -879,6 +880,34 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
})
|
|
|
+ // let arr = []
|
|
|
+ // this.limitList.map((o) => {
|
|
|
+ // for (var i = o.editStart; i <= o.editEnd; i++) {
|
|
|
+ // arr.push(i);
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // console.log(arr);
|
|
|
+
|
|
|
+ // let arr2 = arr.sort();
|
|
|
+ // for (let i = 0; i < arr2.length; i++) {
|
|
|
+
|
|
|
+ // if (typeof (arr2[i]) === 'number') {
|
|
|
+ // arr2[i] = arr2[i].toString()
|
|
|
+ // }
|
|
|
+ // if (typeof (arr2[i + 1]) === 'number') {
|
|
|
+ // arr2[i + 1] = arr2[i + 1].toString()
|
|
|
+ // }
|
|
|
+ // console.log(typeof (arr2[i]));
|
|
|
+ // console.log((arr2[i]));
|
|
|
+ // if (arr2[i] === arr2[i + 1]) {
|
|
|
+ // this.$message({
|
|
|
+ // message: '分配的行的权限不能重复',
|
|
|
+ // type: 'error'
|
|
|
+ // });
|
|
|
+ // this.success = false;
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
console.log(this.limitList);
|
|
|
}
|
|
|
if (this.success) {
|