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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!53
This commit is contained in:
高嵩
2023-04-12 19:20:25 +08:00
parent 465265c7c3 4cb59e7c5a
commit 5ee6e06157
5 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/personal/pages/my-questions/index.vue
+4
View File
@@ -24,6 +24,7 @@
</el-form>
</div>
<div class="tab-box">
<!-- 第一层 -->
<el-tabs
type="border-card"
style="height: 100%"
@@ -34,6 +35,7 @@
>
<el-tab-pane name="myQue" label="我的提问">
<div style="height: 100%" v-if="activeName === 'myQue'">
<!-- 第二层 -->
<el-tabs
class="question-tabs"
type="border-card"
@@ -48,6 +50,7 @@
</div>
</div>
<div style="height: 100%" v-else-if="activeType === 'INLAND'">
<!-- 标准 - 第三层 -->
<el-tabs
class="question-box"
type="border-card"
@@ -67,6 +70,7 @@
</div>
</div>
<div style="height: 100%" v-else>
<!-- 问题 - 第四层 -->
<el-tabs
v-loading="tagsLoading"
class="question-box"
src/pages/personal/pages/my-questions/index2.vue
+12 -2
View File
@@ -151,10 +151,20 @@ export default {
},
checkedRole(data){
if(data[0].id){
let asdId = sessionStorage.getItem('queId')
// let asdId = sessionStorage.getItem('queId')
let asdId = this.asdId
const usid = data.reduce((init,item,index,arr)=>{
let result
if(index === arr.length - 1){
result = init + item.id
}else{
result = init + item.id + ','
}
return result
},'')
this.$http.postData('lawss/AskUser/insertAskUser',{
asdId: asdId,
usid: data[0].id,
usid,
},{
_this: this
}, res => {
src/pages/personal/pages/my-questions/index3.vue
+29 -1
View File
@@ -24,6 +24,7 @@
</el-form>
</div>
<div class="tab-box">
<!-- 第一层 -->
<el-tabs
type="border-card"
style="height: 100%"
@@ -49,6 +50,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'INLAND'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -108,6 +110,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'FOREIGN'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -167,6 +170,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'BUSINESS_STAND'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -226,6 +230,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'OTHER'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -282,6 +287,7 @@
</el-tab-pane>
<el-tab-pane name="myAns" label="我的回答">
<div style="height: 100%" v-if="activeName === 'myAns'">
<!-- 第二层 -->
<el-tabs
class="question-tabs"
type="border-card"
@@ -296,7 +302,9 @@
</div>
</div>
<div style="height: 100%" v-else-if="activeType === 'INLAND'">
<!-- 标准 - 第三层 -->
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -315,6 +323,7 @@
</div>
</div>
<div style="height: 100%" v-else>
<!-- 问题 - 第四层 -->
<el-tabs v-loading="tagsLoading"
class="question-box"
type="border-card"
@@ -361,6 +370,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'FOREIGN'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -425,6 +435,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'BUSINESS_STAND'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -489,6 +500,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'OTHER'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -567,6 +579,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'INLAND'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -625,6 +638,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'FOREIGN'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -683,6 +697,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'BUSINESS_STAND'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -741,6 +756,7 @@
</div>
<div style="height: 100%" v-else-if="activeType === 'OTHER'">
<el-tabs
v-loading="standardLoading"
class="question-box"
type="border-card"
v-model="activestand"
@@ -1267,6 +1283,7 @@ export default {
},
data(){
return{
standardLoading: false,
tagsLoading: false,
submitBtnLoading: false,
aiKey:1,
@@ -1354,6 +1371,7 @@ export default {
}else if(this.$route.query.type === 'FOREIGN_STAND'){
this.standType = 'FOREIGN'
}
this.standTypeChange()
let type = this.standType === 'FOREIGN' ? '海外标准' : this.standType === 'INLAND' ? '国内标准' : "企业标准"
this.selectById(this.$route.query.id,type).then(res =>{
this.handleSelectTableList = [res.data]
@@ -1368,6 +1386,7 @@ export default {
}else if(this.$route.query.type === 'FOREIGN_STAND'){
this.activeType = 'FOREIGN'
}
this.standTypeChange()
// this.activeType = this.$route.query.classification
// this.sourceClick()
this.activestand = this.$route.query.id
@@ -1428,9 +1447,18 @@ export default {
checkedRole(data){
if(data[0].id){
let asdId = sessionStorage.getItem('queId')
const usid = data.reduce((init,item,index,arr)=>{
let result
if(index === arr.length - 1){
result = init + item.id
}else{
result = init + item.id + ','
}
return result
},'')
this.$http.postData('lawss/AskUser/insertAskUser',{
asdId: asdId,
usid: data[0].id,
usid,
},{
_this: this
}, res => {
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+12 -7
View File
@@ -106,7 +106,7 @@
</template>
</el-table-column>
<el-table-column prop="resPersonName" label="评审责任人" width="150" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="wgLeaderName" label="工作组组长" width="150" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="wgLeaderName" label="技术委员会评审负责人" width="150" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="draftTime" label="计划标准初稿完成时间" min-width="180" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="releaseTime" label="计划标准发布时间" width="150" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="endTime" label="立项完成时间" min-width="150" align="center" show-overflow-tooltip></el-table-column>
@@ -221,10 +221,15 @@
@click.native="choiceZRRS('2')">
</el-input>
</el-form-item>
<el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="wgLeaderName" label="技术委员会评审负责人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<template v-slot:label>
<el-tooltip content="技术委员会评审负责人" placement="top">
<span>技术委员会评审负责人</span>
</el-tooltip>
</template>
<el-input :disabled="disabledXX" v-model="addQblxData.wgLeader" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="addQblxData.wgLeaderName" placeholder="请选择工作组组长"
@click.native="workGroupUnfold('workLeader', '选择工作组组长', addQblxData.wgLeader)"></el-input>
<el-input :disabled="disabledXX" v-model="addQblxData.wgLeaderName" placeholder="请选择技术委员会评审负责人"
@click.native="workGroupUnfold('workLeader', '选择技术委员会评审负责人', addQblxData.wgLeader)"></el-input>
</el-form-item>
<el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
<el-date-picker :disabled="disabledXX"
@@ -411,10 +416,10 @@
</div>
</el-upload>
</el-dialog>
<!--工作组组长-->
<!--技术委员会评审负责人-->
<Role-tree
check-box
is-title="请选择工作组组长"
is-title="请选择技术委员会评审负责人"
:is-visible.sync="workLeaderVisible"
:node-list="workLeaderNodeList"
@checkedRole="workLeaderCheckedRole" />
@@ -593,7 +598,7 @@ export default {
return date.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
},
//工作组组长
//技术委员会评审负责人
workLeaderVisible: false,
workLeaderNodeList: []
}
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+12 -7
View File
@@ -96,10 +96,15 @@
@click.native="choiceZRRS('2')">
</el-input>
</el-form-item>
<el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="wgLeaderName" label="技术委员会评审负责人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<template v-slot:label>
<el-tooltip content="技术委员会评审负责人" placement="top">
<span>技术委员会评审负责人</span>
</el-tooltip>
</template>
<el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
<el-input v-model="qbfsForm.wgLeaderName" clearable placeholder="请选择工作组组长"
@click.native="workGroupUnfold('workLeader', '选择工作组组长', qbfsForm.wgLeader)"></el-input>
<el-input v-model="qbfsForm.wgLeaderName" clearable placeholder="请选择技术委员会评审负责人"
@click.native="workGroupUnfold('workLeader', '选择技术委员会评审负责人', qbfsForm.wgLeader)"></el-input>
</el-form-item>
<el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
<el-date-picker
@@ -572,10 +577,10 @@
@checkedRole="checkedRolePeople"
:nodeList="nodeList"
></Role-tree>
<!--工作组组长-->
<!--技术委员会评审负责人-->
<Role-tree
check-box
is-title="工作组组长"
is-title="请选择技术委员会评审负责人"
:is-visible.sync="workLeaderVisible"
:node-list="workLeaderNodeList"
@checkedRole="workLeaderCheckedRole" />
@@ -759,7 +764,7 @@ export default {
{ required: true, message: "请输入评审责任人", trigger: "blur" }
],
wgLeaderName: [
{ required: true, message: "请输入工作组组长", trigger: "blur" }
{ required: true, message: "请输入技术委员会评审负责人", trigger: "blur" }
],
draftTime: [
{ required: true, message: "请选择计划标准初稿完成时间", trigger: "blur" }
@@ -792,7 +797,7 @@ export default {
{required: true, message: '请输入采用标准', trigger: 'blur'},
],
},
//工作组组长
//技术委员会评审负责人
workLeaderVisible: false,
workLeaderNodeList: []
}