FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Jaunty
2021-07-09 11:33:26 +08:00
parent 537bc1c7fe db8cd5ec3c
commit c8d3b349c9
10 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/index.vue
+1
View File
@@ -107,6 +107,7 @@
ref="tree2"
node-key="id"
class="filter-tree"
style="height: 100%; overflow: auto;"
v-if="modalPost"
:props="props"
:data="postList"
src/pages/config/pages/postManage/index.vue
+1
View File
@@ -102,6 +102,7 @@
ref="tree"
node-key="id"
class="filter-tree"
style="height: 100%; overflow: auto;"
v-if="modalRole"
:props="props"
:data="roleList"
src/pages/config/pages/roleManage/index.vue
+1
View File
@@ -206,6 +206,7 @@
class="filter-tree1"
:data="treeData"
:props="defaultProps"
style="height: 100%; overflow: auto;"
default-expand-all
check-strictly
node-key="id"
src/pages/login/index.vue
+1
View File
@@ -90,6 +90,7 @@ export default {
let userInfoStr = Base64.decode(res.data)
let userInfo2 = decodeURIComponent(userInfoStr)
let userInfoObj = JSON.parse(userInfo2)
userInfoObj.userId = userInfoObj.usid
this.setToken(userInfoObj.usid) // vuex存储token
this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => {
if (userInfo !== '' && userInfo !== null) {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+2 -1
View File
@@ -563,7 +563,7 @@
size="800px">
<el-tree
v-if="modalshowflag"
style="height: 100%;"
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
@@ -845,6 +845,7 @@ export default {
let json = this.listForm;
json.zrUserId = this.$store.getters.userInfo.userId;
json.jlUserId = this.$store.getters.userInfo.userId;
// (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
json.applyUpdUserId = this.$store.getters.userInfo.userId;
json.approvalOpinion = "";
json.prcCreateUser = this.$store.getters.userInfo.userId;
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+1 -1
View File
@@ -230,7 +230,7 @@
size="800px">
<el-tree
v-if="modalshowflag"
style="height: 100%;"
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+1 -1
View File
@@ -149,7 +149,7 @@
size="800px">
<el-tree
v-if="modalshowflag"
style="height: 100%;"
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+1 -1
View File
@@ -142,7 +142,7 @@
size="800px">
<el-tree
v-if="modalshowflag"
style="height: 100%;"
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+47 -9
View File
@@ -113,8 +113,8 @@
<h4>标准法法规业务经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择审核责任人"
@click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
<el-input v-model="roleForm.dockUserName" placeholder="选择业务经理"
@click.native="choiceZRR('dockUser', '选择业务经理', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
@@ -126,20 +126,56 @@
<h4>分发责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"
@click.native="choiceZRR('ministerUser', '选择标准法规工程师', roleForm.ministerUser)"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="责任人填写评估反馈" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>业务经理</h4>
<h4>责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
<el-input v-model="roleForm.directorUserName" placeholder="选择业务经理"
@click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
<el-input v-model="roleForm.directorUserName" placeholder="责任人"
@click.native="choiceZRR('directorUser', '选择责任人', roleForm.directorUser)"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="分发责任人进行任务分发" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
<h4>分发责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"
@click.native="choiceZRR('ministerUser', '选择标准法规工程师', roleForm.ministerUser)"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="产品线责任人审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>产品线责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
<!-- <el-input v-model="roleForm.directorUserName" placeholder="责任人"-->
<!-- @click.native="choiceZRR('directorUser', '选择分发责任人', roleForm.directorUser)"></el-input>-->
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="标准法规部领导审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>标准法规部领导</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
<el-input v-model="roleForm.directorUserName" placeholder="请选择标准法规部领导"
@click.native="choiceZRR('directorUser', '选择标准法规部领导', roleForm.directorUser)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -290,7 +326,7 @@
size="800px">
<el-tree
v-if="modalshowflag"
style="height: 100%;"
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
@@ -573,6 +609,8 @@ export default {
_this: this
}, res => {
this.productData = res.data
//分发责任人
// this.roleForm.directorUser = res.data.
// this.totalNo = res.data
}, e => {
src/sysConfig/index.js
+1 -1
View File
@@ -6,8 +6,8 @@
// 服务器地址
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
// const devIp = '192.168.10.248'
const devIp = '192.168.10.248'
const devIp = '192.168.10.30'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'