Commit c3420b95 by yuhao

单点登录提交

parent 5e6bed3d
...@@ -48,6 +48,13 @@ ...@@ -48,6 +48,13 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="form_line1"> <div class="form_line1">
<el-form-item label="线索描述:"
style="width:38%;"
prop="xsms">
{{baseInfoDetail.xsms||'--'}}
</el-form-item>
</div>
<div class="form_line1">
<el-form-item label="线索类型:" <el-form-item label="线索类型:"
prop="xslx"> prop="xslx">
{{baseInfoDetail.xslxStr||'--'}} {{baseInfoDetail.xslxStr||'--'}}
...@@ -60,13 +67,6 @@ ...@@ -60,13 +67,6 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="form_line1"> <div class="form_line1">
<el-form-item label="线索描述:"
style="width:38%;"
prop="xsms">
{{baseInfoDetail.xsms||'--'}}
</el-form-item>
</div>
<div class="form_line1">
<el-form-item label="录入人姓名:" <el-form-item label="录入人姓名:"
prop="lrxm"> prop="lrxm">
{{baseInfoDetail.xxdjryXm||'--'}} {{baseInfoDetail.xxdjryXm||'--'}}
......
...@@ -361,9 +361,9 @@ export default { ...@@ -361,9 +361,9 @@ export default {
if (this.userInfo.grade == 'D') { if (this.userInfo.grade == 'D') {
this.leftMenus[0].children.push(...this.leftMenusXj) this.leftMenus[0].children.push(...this.leftMenusXj)
} }
// else if (this.userInfo.grade == 'S' || this.userInfo.grade == 'D') { if (this.userInfo.grade == 'S') {
// this.leftMenus[0].children.push(this.leftMenusXj) this.leftMenus = this.leftMenus.filter(item => item.id != 'querySpgl')
// } }
console.log(this.leftMenus, 11222); console.log(this.leftMenus, 11222);
this.$store.commit("user/SET_LeftMenu", this.leftMenus); this.$store.commit("user/SET_LeftMenu", this.leftMenus);
this.$store.commit("user/SET_Header", '合成研判管理'); this.$store.commit("user/SET_Header", '合成研判管理');
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<el-button class="hbyp" <el-button class="hbyp"
type="text" type="text"
size="mini" size="mini"
v-if="userInfo.grade=='D'&&(scope.scope.xzzt=='4'||scope.scope.xzzt=='9'||scope.scope.xzzt=='11')||userInfo.grade=='S'&&(scope.scope.xzzt=='9')" v-if="userInfo.grade=='D'&&(scope.scope.xzzt=='4'||scope.scope.xzzt=='11')||userInfo.grade=='S'&&(scope.scope.xzzt=='4'||scope.scope.xzzt=='9')"
@click="toFk(scope.scope)">反馈</el-button> @click="toFk(scope.scope)">反馈</el-button>
</template> </template>
</Mytable> </Mytable>
...@@ -146,9 +146,6 @@ export default { ...@@ -146,9 +146,6 @@ export default {
width: '100%', width: '100%',
options: [ options: [
{ {
label: '草稿',
value: '0'
}, {
label: '待审批', label: '待审批',
value: '1' value: '1'
}, },
...@@ -156,11 +153,17 @@ export default { ...@@ -156,11 +153,17 @@ export default {
label: '审批不通过', label: '审批不通过',
value: '2' value: '2'
}, { }, {
label: '待反馈', label: '待本级反馈',
value: '4' value: '4'
}, { }, {
label: '已反馈', label: '本级已反馈',
value: '5' value: '5'
}, {
label: '待上级反馈',
value: '9'
}, {
label: '上级已反馈',
value: '11'
}, },
] ]
}, },
...@@ -406,6 +409,15 @@ export default { ...@@ -406,6 +409,15 @@ export default {
hasChildren: false, hasChildren: false,
}, },
], ],
optionsSj: [
{
label: '待本级反馈',
value: '9'
}, {
label: '本级已反馈',
value: '11'
},
]
} }
}, },
created () { created () {
...@@ -413,6 +425,10 @@ export default { ...@@ -413,6 +425,10 @@ export default {
if (this.userInfo.grade == 'D') { if (this.userInfo.grade == 'D') {
this.leftMenus[0].children.unshift(...this.leftMenusBj) this.leftMenus[0].children.unshift(...this.leftMenusBj)
} }
if (this.userInfo.grade == 'S') {
this.formConfig[0].options = this.optionsSj
this.leftMenus = this.leftMenus.filter(item => item.id != 'querySpgl')
}
this.$store.commit("user/SET_LeftMenu", this.leftMenus); this.$store.commit("user/SET_LeftMenu", this.leftMenus);
this.$store.commit("user/SET_Header", '合成研判管理'); this.$store.commit("user/SET_Header", '合成研判管理');
......
...@@ -55,26 +55,11 @@ export default { ...@@ -55,26 +55,11 @@ export default {
let two = `${userInfo.ip} ${time}`; let two = `${userInfo.ip} ${time}`;
Watermark.set(xmmc, one, two); Watermark.set(xmmc, one, two);
if (res.data.grade == 'X' || res.data.grade == 'D') {
// this.$router.push('apply'); this.$router.push("/queryHcyp");
this.$router.push({ } else if (res.data.grade == 'S' || res.data.grade == 'D') {
path: self.$route.query.path || 'apply', this.$router.push("/queryHcypXj");
query: { }
asjbh: self.$route.query.asjbh,
sjh: self.$route.query.sjh,
zczlbh: self.$route.query.zczlbh,
shsexsbh: self.$route.query.shsexsbh,
xxzjbh: self.$route.query.xxzjbh,
asjxgrybh: self.$route.query.asjxgrybh,
xsbh: self.$route.query.xsbh,
type: self.$route.query.type,
module: self.$route.query.module,
xsType: self.$route.query.xsType,
operation: self.$route.query.operation,
id: self.$route.query.id,
dqhm: self.$route.query.dqhm
},
});
} }
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment