|
@@ -73,7 +73,7 @@
|
|
|
|
|
|
<el-form-item class="info-line online" v-if="!disableStatus">
|
|
|
<span>填报人</span>
|
|
|
- <deptTree :closeList="closeList" class="tree" @treeCheck="treeCheck">
|
|
|
+ <deptTree :closeList="closeList" class="tree" @treeCheck="treeCheck" :defaultList="defaultList" :fillLists="fillLists">
|
|
|
</deptTree>
|
|
|
<div class="tree treeUser">
|
|
|
<p v-for="(item,index) in treeList" :key="index">{{item.receiveName}}
|
|
@@ -127,7 +127,7 @@
|
|
|
import mySearch from "../../../components/search.vue";
|
|
|
import myMessage from "../../../components/myMessage.vue"
|
|
|
import toolList from '../../../components/toolList'
|
|
|
- import deptTree from "../../../components/deptTreeUser.vue"
|
|
|
+ import deptTree from "../../../components/deptTreeUserNew.vue"
|
|
|
import deptTreep from "../../../components/deptTreeP.vue"
|
|
|
|
|
|
export default {
|
|
@@ -186,7 +186,8 @@
|
|
|
deptList: [],
|
|
|
companyFlag: '',
|
|
|
dialogStatusp: false,
|
|
|
- choone: {}
|
|
|
+ choone: {},
|
|
|
+ fillLists:[]
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -219,9 +220,10 @@
|
|
|
fillName: this.treeList[i].label,
|
|
|
})
|
|
|
}
|
|
|
+
|
|
|
+ JSON.parse(JSON.stringify(param.fillList))
|
|
|
// for (let i = 0; i < this.treeList.length; i++) {
|
|
|
// for (let ii = 0; ii < this.treeListp.length; ii++) {
|
|
|
- // console.log(this.treeList);
|
|
|
// if (this.treeListp[i].loginNoStr == this.treeList[ii].receiveNo) {
|
|
|
// this.$message({
|
|
|
// message: '负责人和填报人重复!',
|
|
@@ -275,16 +277,16 @@
|
|
|
type: 'success'
|
|
|
});
|
|
|
_this.infolist = {};
|
|
|
- _this.treeList = [];
|
|
|
- _this.treeListp = [];
|
|
|
+ // _this.treeList = [];
|
|
|
+ // _this.treeListp = [];
|
|
|
_this.dialogStatus = false;
|
|
|
_this.getList({}, 1);
|
|
|
}
|
|
|
});
|
|
|
} else if (v === 2) {
|
|
|
this.infolist = {};
|
|
|
- this.treeList = [];
|
|
|
- this.treeListp = [];
|
|
|
+ // this.treeList = [];
|
|
|
+ // this.treeListp = [];
|
|
|
this.dialogStatus = false;
|
|
|
}
|
|
|
},
|
|
@@ -360,7 +362,6 @@
|
|
|
this.treeListp.splice(x, 1)
|
|
|
} else {
|
|
|
this.treeListp.push(v);
|
|
|
- // console.log(this.treeListp)
|
|
|
}
|
|
|
},
|
|
|
jumpfw(v) {
|
|
@@ -373,7 +374,7 @@
|
|
|
this.setabList("填报进度跟踪", "/reportProgress?woNo=" + v.woNo);
|
|
|
},
|
|
|
jumpjd(v) {
|
|
|
- console.log(v.receiverGroupName)
|
|
|
+ // console.log(v.receiverGroupName)
|
|
|
this.$router.push({
|
|
|
path: "/speedOfProgress",
|
|
|
query: {
|
|
@@ -444,7 +445,7 @@
|
|
|
this.getList(this.params, this.pageSize);
|
|
|
},
|
|
|
//申请
|
|
|
- dialogCheck(v, n) {
|
|
|
+ dialogCheck(v, n) {
|
|
|
this.choone = n;
|
|
|
if (v === 1) {
|
|
|
this.titname = '查看';
|
|
@@ -454,6 +455,7 @@
|
|
|
this.disableStatus = false;
|
|
|
}
|
|
|
this.dialogStatus = true;
|
|
|
+
|
|
|
this.$http({
|
|
|
url: "/market/cMemberWo/queryMemeberWoInfo",
|
|
|
method: "post",
|
|
@@ -468,11 +470,35 @@
|
|
|
this.infolist.time = [res.data.startTime, res.data.endTime];
|
|
|
this.infolist.opNo = this.userInfo.loginNo;
|
|
|
this.infolist.opName = this.userInfo.loginName;
|
|
|
-
|
|
|
+ // this.defaultList = []
|
|
|
+ // this.defaultList.push({
|
|
|
+ // deptCode: "00440089005200000000",
|
|
|
+ // deptName: "中国移动通信集团黑龙江有限公司\\哈尔滨分公司\\综合部",
|
|
|
+ // id: "694817329862230016",
|
|
|
+ // label: "郭有为",
|
|
|
+ // receiveName: "郭有为",
|
|
|
+ // receiveNo: "guoyouwei",
|
|
|
+ // type: 1,
|
|
|
+ // })
|
|
|
+
|
|
|
+ // this.treeList = this.defaultList
|
|
|
+ this.fillLists = []
|
|
|
+ this.infolist.fillList.forEach(item=>{
|
|
|
+ this.fillLists.push({
|
|
|
+ fillName: item.fillName,
|
|
|
+ fillNo: item.fillNo,
|
|
|
+ receiveNo: item.fillNo,
|
|
|
+ receiveName:item.fillName,
|
|
|
+ label: item.fillName
|
|
|
+ })
|
|
|
+
|
|
|
+ })
|
|
|
+ this.treeList = this.fillLists
|
|
|
//地市范围
|
|
|
if (this.companyFlag == '0') {
|
|
|
this.$http({
|
|
|
url: "/sysmgr/csysdept/queryRegionDeptList",
|
|
|
+ async:false,
|
|
|
method: "post",
|
|
|
headers: {
|
|
|
"Content-Type": "application/json",
|
|
@@ -480,11 +506,21 @@
|
|
|
data: {},
|
|
|
}).then((res) => {
|
|
|
this.deptList = res.data[0].children;
|
|
|
+ this.deptList.forEach(item=>{
|
|
|
+ this.infolist.dutyList.forEach(m=>{
|
|
|
+ if(m.groupId == item.o){
|
|
|
+
|
|
|
+ item = Object.assign(item,{loginNoStr: m.dutyNo, loginNameStr: m.dutyName})
|
|
|
+ this.treeListp.push(item);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
});
|
|
|
} else {
|
|
|
- this.$http({
|
|
|
+ this.$http({
|
|
|
url: "/sysmgr/csysdept/queryListByParent",
|
|
|
method: "post",
|
|
|
+ async:false,
|
|
|
headers: {
|
|
|
"Content-Type": "application/json",
|
|
|
},
|
|
@@ -493,8 +529,19 @@
|
|
|
},
|
|
|
}).then((res) => {
|
|
|
this.deptList = res.data;
|
|
|
+ this.deptList.forEach(item=>{
|
|
|
+ this.infolist.dutyList.forEach(m=>{
|
|
|
+ if(m.groupId == item.o){
|
|
|
+ item = Object.assign(item,{loginNoStr: m.dutyNo, loginNameStr: m.dutyName})
|
|
|
+ this.treeListp.push(item);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
+
|
|
|
});
|
|
|
}
|
|
|
+
|
|
|
//区县进入查人
|
|
|
// if(this.companyFlag == '2'){
|
|
|
// this.$http({
|
|
@@ -579,6 +626,16 @@
|
|
|
},
|
|
|
mounted() {
|
|
|
this.getUser();
|
|
|
+ // this.defaultList.push({
|
|
|
+ // deptCode: "",
|
|
|
+ // deptName: "",
|
|
|
+ // id: "",
|
|
|
+ // label: "",
|
|
|
+ // receiveName: "",
|
|
|
+ // receiveNo: "",
|
|
|
+ // type: 1,
|
|
|
+ // checked:true
|
|
|
+ // })
|
|
|
},
|
|
|
created() {
|
|
|
|