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

Merge branch 'develop_new' into develop

Browse Source
This commit is contained in:
liyawei
2022-11-22 22:24:15 +08:00
parent e088a8672f 057853f197
commit 888d6861fd
25 changed files with 7069 additions and 3341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/onlineEdit/index.js
+1 -1
View File
@@ -20,7 +20,7 @@ export default (id,nodeName,userId,userName) => {
editFileInfo.pId = editFileInfo.pid editFileInfo.pId = editFileInfo.pid
} }
const nowTime = new Date().getTime() const nowTime = new Date().getTime()
window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
} }
}).catch(e => { }).catch(e => {
}) })
src/pages/processCenter/pages/components/ProcessFooter.vue
+16
View File
@@ -97,6 +97,15 @@
v-if="showOver3" v-if="showOver3"
>驳回</el-button> >驳回</el-button>
</el-popover> </el-popover>
<el-button
type="primary"
size="small"
class="common-button-primary"
icon="el-icon-check"
@click="handleReceive"
:loading="submitLoading"
v-if="showReceive"
>接收任务</el-button>
<el-button <el-button
type="danger" type="danger"
size="small" size="small"
@@ -215,6 +224,10 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
showReceive: {
type: Boolean,
default: false
},
visible: { visible: {
type: Boolean, type: Boolean,
default: false default: false
@@ -383,6 +396,9 @@ export default {
handleSubmit() { handleSubmit() {
this.$emit('submit') this.$emit('submit')
}, },
handleReceive() {
this.$emit('receive')
},
handleAccept() { handleAccept() {
this.$emit('accept') this.$emit('accept')
}, },
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+4 -1
View File
@@ -31,7 +31,10 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" > <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template> <template>
<div style="padding-left: 10px; color: #666666;">{{ !form.reviseStatus || form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div> <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>
<div style="padding-left: 10px; color: #666666;" v-else></div>
</template> </template>
</el-form-item> </el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+4 -1
View File
@@ -19,7 +19,10 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" > <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template> <template>
<div style="padding-left: 10px; color: #666666;">{{ !form.reviseStatus || form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div> <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>
<div style="padding-left: 10px; color: #666666;" v-else></div>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+4 -1
View File
@@ -24,7 +24,10 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" > <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template> <template>
<div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div> <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>
<div style="padding-left: 10px; color: #666666;" v-else></div>
</template> </template>
</el-form-item> </el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+4 -1
View File
@@ -18,7 +18,10 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" > <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template> <template>
<div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div> <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>
<div style="padding-left: 10px; color: #666666;" v-else></div>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+3408
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+3268 -3111
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+5 -1
View File
@@ -2683,6 +2683,7 @@
*/ */
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
console.log(item);
this.form = JSON.parse(JSON.stringify(item)) this.form = JSON.parse(JSON.stringify(item))
this.form.topId = this.pId this.form.topId = this.pId
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
@@ -2801,7 +2802,10 @@
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
} }
this.formKey++ this.formKey++
}else { } else if(this.form.reviseStatus === '3'){
this.form.standCode = this.form.standCode
this.formKey++
} else {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, {
_this: this _this: this
}, res => { }, res => {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+10 -10
View File
@@ -423,22 +423,22 @@ export default {
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus || '', reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
planStatus: '0', planStatus: '1,2,3,6',
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
_this: this, _this: this,
}, res => { }, res => {
this.standinfoList = [] this.standinfoList = res.data.list
//展示的数据只能是未开始的 //展示的数据只能是未开始的
res.data.list.forEach(item => { // res.data.list.forEach(item => {
if(item.planStatus === '0'){ // if(item.planStatus === '0'){
if(item.isRelate && item.isRelate === 'null'){ // if(item.isRelate && item.isRelate === 'null'){
item.isRelate = "" // item.isRelate = ""
} // }
this.standinfoList.push(item) // this.standinfoList.push(item)
} // }
}) // })
this.total = this.standinfoList.length this.total = this.standinfoList.length
}) })
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+10 -8
View File
@@ -445,19 +445,19 @@ export default {
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus || '', reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
planStatus: '0', planStatus: '1,2,3,6',
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
_this: this, _this: this,
}, res => { }, res => {
this.standinfoList = [] this.standinfoList = res.data.list
//展示的数据只能是未开始的 //展示的数据只能是未开始的
res.data.list.forEach(item => { // res.data.list.forEach(item => {
if(item.planStatus === '0'){ // if(item.planStatus === '0'){
this.standinfoList.push(item) // this.standinfoList.push(item)
} // }
}) // })
this.total = this.standinfoList.length this.total = this.standinfoList.length
}) })
@@ -501,7 +501,9 @@ export default {
} }
this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.rqbName = this.selectList[0].rqbName
this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate if(this.qbfsForm.isRelate){
this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate
}
this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.useLevel = this.selectList[0].useLevel
this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
this.qbfsForm.technologic = this.selectList[0].technologic this.qbfsForm.technologic = this.selectList[0].technologic
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+2 -2
View File
@@ -431,8 +431,8 @@ export default {
props: ['message'], props: ['message'],
data(){ data(){
const validateFsOnlineFile = async (rule, value, callback) => { const validateFsOnlineFile = async (rule, value, callback) => {
if(this.qbfsForm.FSD){ if(this.qbfsForm.LXD){
let fileObj = await this.processEditFile(this.qbfsForm.FSD) let fileObj = await this.processEditFile(this.qbfsForm.LXD)
if (fileObj) { if (fileObj) {
const editFileInfo = fileObj const editFileInfo = fileObj
if (editFileInfo && editFileInfo.editStatus === '1') { if (editFileInfo && editFileInfo.editStatus === '1') {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+9 -8
View File
@@ -1081,19 +1081,20 @@ export default {
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus || '', reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
planStatus: '0', planStatus: '1,2,3,6',
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
_this: this, _this: this,
}, res => { }, res => {
this.standinfoList = [] this.standinfoList = res.data.list
//展示的数据只能是未开始的 // this.standinfoList = []
res.data.list.forEach(item => { // //展示的数据只能是未开始的
if(item.planStatus === '0'){ // res.data.list.forEach(item => {
this.standinfoList.push(item) // if(item.planStatus === '0'){
} // this.standinfoList.push(item)
}) // }
// })
this.total = this.standinfoList.length this.total = this.standinfoList.length
this.replaceLoading = false this.replaceLoading = false
}) })
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+1 -1
View File
@@ -432,7 +432,7 @@ export default {
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus || '', reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
planStatus: '0', planStatus: '1,2,3,6',
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+20 -18
View File
@@ -95,7 +95,7 @@
<el-card> <el-card>
<el-form-item prop="countersignerName" style="margin-bottom: 0"> <el-form-item prop="countersignerName" style="margin-bottom: 0">
<h4>创新技术委员会成员/标准体系工作组成员(必选)</h4> <h4>创新技术委员会成员/标准体系工作组成员(必选)</h4>
<h4>二级研发(部所所长、总工、中心主任/研究院院长)(必选)</h4> <h4>二级研发(部所所长、总工、中心主任/研究院院长)(可选)</h4>
<h4>质量相关人员(可选)</h4> <h4>质量相关人员(可选)</h4>
<h4>制造部相关人员(可选)</h4> <h4>制造部相关人员(可选)</h4>
<h4>采购部相关人员(可选)</h4> <h4>采购部相关人员(可选)</h4>
@@ -127,30 +127,30 @@
:color="roleForm.approver ? '#66b1ff' : ''"> :color="roleForm.approver ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="approverName" style="margin-bottom: 0"> <el-form-item prop="approverName" style="margin-bottom: 0">
<h4>总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长</h4> <h4>标准法规部高级经理</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.approver" style="display: none;"></el-input> <el-input :disabled="disabledXX" v-model="roleForm.approver" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.approverName" readonly placeholder="选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长" <el-input :disabled="disabledXX" v-model="roleForm.approverName" readonly placeholder="选择标准法规部高级经理"
@click.native="choiceZRR('approver', '选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', roleForm.approver)"> @click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="抄送" placement="top"
:color="roleForm.engineer ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="engineerName" style="margin-bottom: 0">
<h4>相关单位、工程研究总院标准法规部</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.engineer" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.engineerName" readonly placeholder="选择相关单位、工程研究总院标准法规部"
@click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<!-- <el-timeline-item timestamp="抄送" placement="top"-->
<!-- :color="roleForm.engineer ? '#66b1ff' : ''">-->
<!-- <el-card>-->
<!-- <el-form-item prop="engineerName" style="margin-bottom: 0">-->
<!-- <h4>相关单位、工程研究总院标准法规部</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.engineer" style="display: none;"></el-input>-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.engineerName" readonly placeholder="选择相关单位、工程研究总院标准法规部"-->
<!-- @click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
</el-form> </el-form>
</el-timeline> </el-timeline>
</div> </div>
@@ -534,6 +534,7 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
qbzxdFrom.commentText = this.commentText; qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
let json = Object.assign(qbzxdFrom, this.roleForm); let json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
@@ -588,6 +589,7 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
qbzxdFrom.commentText = this.commentText; qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
var json = Object.assign(qbzxdFrom, this.roleForm); var json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+14 -14
View File
@@ -519,20 +519,20 @@ export default {
} }
this.qbfsForm.commentText = this.commentText this.qbfsForm.commentText = this.commentText
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
json: json, json: json,
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false this.isSubmit = false
}, e => { }, e => {
}); });
}, },
beforeBack(){ beforeBack(){
if(!this.commentText){ if(!this.commentText){
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+59 -51
View File
@@ -125,7 +125,7 @@
placeholder="请选择立项完成时间"> placeholder="请选择立项完成时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="tsJsonName" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
style="display: none;" style="display: none;"
v-model="qbfsForm.tsJson"> v-model="qbfsForm.tsJson">
@@ -193,19 +193,19 @@
v-model="qbfsForm.esMatingRelations" v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2> ></custom-input-for-all-standards2>
</template> </template>
<!-- <el-form-item label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- type="textarea"--> <!-- type="textarea"-->
<!-- v-model="qbfsForm.newReason"--> <!-- v-model="qbfsForm.newReason"-->
<!-- placeholder="请输入立项原因"--> <!-- placeholder="请输入立项原因"-->
<!-- :maxlength="500"/>--> <!-- :maxlength="500"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="立项单" prop="LXDName" class="add-form-item form-item-disabled"> <el-form-item label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">--> <!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>--> <!-- <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>-->
<!-- </span>--> <!-- </span>-->
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>
</span> </span>
@@ -558,6 +558,12 @@
@checkedRole="checkedRolePeoples" @checkedRole="checkedRolePeoples"
:nodeList="nodeList2" :nodeList="nodeList2"
></Role-tree> ></Role-tree>
<Mechanism-tree v-if="!disabledXX"
is-title="选择起草责任单位"
:is-visible.sync="modalshowflagZRBM"
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
<!-- 单选人--> <!-- 单选人-->
<Role-tree <Role-tree
check-box check-box
@@ -757,7 +763,7 @@ export default {
endTime: [ endTime: [
{ required: true, message: "请选择立项完成时间", trigger: "change" } { required: true, message: "请选择立项完成时间", trigger: "change" }
], ],
tsJson: [ tsJsonName: [
{ required: true, message: "请选择体系结构", trigger: "change" } { required: true, message: "请选择体系结构", trigger: "change" }
], ],
area: [ area: [
@@ -842,53 +848,54 @@ export default {
if (res.success) { if (res.success) {
const _formData = new FormData() const _formData = new FormData()
_formData.append('infoJson', JSON.stringify(this.qbfsForm)) _formData.append('infoJson', JSON.stringify(this.qbfsForm))
processCreatePlan(_formData).then(res => { // processCreatePlan(_formData).then(res => {
this.qbfsForm.planId = res.data // this.qbfsForm.planId = res.data
if (res.code === '200' || res.message === '入库成功'){ // if (res.code === '200' || res.message === '入库成功'){
this.isSubmit = true; this.isSubmit = true;
this.qbfsForm.type = '5' this.qbfsForm.type = '5'
this.qbfsForm.commentText = this.commentText; this.qbfsForm.commentText = this.commentText;
let json = Object.assign(this.qbfsForm, this.roleForm); this.qbfsForm.addFlag = '0'
this.$http.post("lawss/activiti/startProcessRollBack", { let json = Object.assign(this.qbfsForm, this.roleForm);
createUser: this.$store.getters.userInfo.userId, this.$http.post("lawss/activiti/startProcessRollBack", {
createUserName: this.$store.getters.userInfo.userName, createUser: this.$store.getters.userInfo.userId,
type: '25', createUserName: this.$store.getters.userInfo.userName,
json: JSON.stringify({ type: '25',
roleForm: this.roleForm, json: JSON.stringify({
qbfsForm: this.qbfsForm, roleForm: this.roleForm,
commentText: this.commentText qbfsForm: this.qbfsForm,
}) commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.success) {
this.$http.post("lawss/activiti/completeTask", { this.$message.success("提交成功");
taskIds: res.data, if (this.bpnId !== '') {
userId: this.$store.getters.userInfo.userId, let taskId = {
json: JSON.stringify(json) id: this.bpnId
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success("企标制修订立项计划-立项已完成");
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
} }
}); taskDel(taskId).then(res=>{
return res
})
}
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
// this.isSubmit = false;
} }
}); });
} }
}) });
// }
// })
} }
this.isSubmit = false // this.isSubmit = false
}, e => { }, e => {
}); });
} else { } else {
@@ -1205,6 +1212,7 @@ export default {
this.QYBZget() this.QYBZget()
}, },
choiceZRBM(type, title, id) { choiceZRBM(type, title, id) {
console.log(1);
this.nodeListZRBM = [] this.nodeListZRBM = []
this.nodeListZRBM.push(id) this.nodeListZRBM.push(id)
this.drawerTitle = title this.drawerTitle = title
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+14 -1
View File
@@ -282,6 +282,18 @@
placeholder="请输入项目名称" placeholder="请输入项目名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用车型" class="search-item search-item-last">
<el-select :disabled="disabledXX" v-model="projectSearch.carType"
placeholder="请选择适用车型" filterable clearable>
<el-option
v-for="(item, index) in energyKindOptions"
:key="index.value"
:value="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button :disabled="disabledXX" <el-button :disabled="disabledXX"
type="primary" type="primary"
@@ -863,7 +875,8 @@ export default {
projectName: "", projectName: "",
managementHostName: "", //管理主体 managementHostName: "", //管理主体
developmentHostName: "", //开发主体 developmentHostName: "", //开发主体
categoryName: "" //项目细分类 categoryName: "", //项目细分类
carType: ""
}, },
qdform: { qdform: {
projectId:"", projectId:"",
src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+4 -1
View File
@@ -429,7 +429,10 @@ export default {
case 'buss1': case 'buss1':
// 企标制修订-技术标准 // 企标制修订-技术标准
this.$router.push({ this.$router.push({
name: 'bussLibrary1' name: 'bussLibrary1',
query:{
reviseStatus:'3'
},
}) })
break break
case 'buss2': case 'buss2':
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+12
View File
@@ -2200,6 +2200,18 @@ export default {
} }
}) })
} }
else if(row.taskInfo === '技术标准起草') {
this.$router.push({
name: 'qbzxdjhgkStep6',
query:{
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break break
} }
}, },
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+22 -7
View File
@@ -898,14 +898,29 @@ export default {
break break
//企标制修订计划管控 //企标制修订计划管控
case '25': case '25':
this.$router.push({ if(mes !== null && mes.taskInfo !== null && mes.taskInfo !== undefined) {
name: 'qbzxdjhgkStep1', if (mes.taskInfo === '技术标准起草'){
query: { this.$router.push({
type: '25', name: 'qbzxdjhgkStep6',
processName: '企标制修订计划管控', query: {
bpnId: id type: '25',
processName: '企标制修订计划管控',
bpnId: id,
verifySarStandard: true,
}
})
}else {
this.$router.push({
name: 'qbzxdjhgkStep1',
query: {
type: '25',
processName: '企标制修订计划管控',
bpnId: id
}
})
} }
}) }
break break
//企标制修订立项计划 //企标制修订立项计划
case '26': case '26':
src/pages/regulatoryRepository/dataCenter/index.vue
+126 -94
View File
@@ -63,11 +63,19 @@
<div class="search-area"> <div class="search-area">
<el-form :modal="dataCenterSearch" :inline="true"> <el-form :modal="dataCenterSearch" :inline="true">
<el-form-item label="类型:"> <el-form-item label="类型:">
<el-input <!-- <el-input-->
size="small" <!-- size="small"-->
v-model="dataCenterSearch.dataType" <!-- v-model="dataCenterSearch.dataType"-->
placeholder="请输入类型" <!-- placeholder="请输入类型"-->
></el-input> <!-- ></el-input>-->
<el-select size="small" v-model="dataCenterSearch.dataType" filterable placeholder="请输入类型" style="width: 100%;">
<el-option
v-for="(item, index) in cbcdOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="资料标题:"> <el-form-item label="资料标题:">
<el-input <el-input
@@ -77,16 +85,32 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上传时间:"> <el-form-item label="上传开始时间:">
<!-- <el-date-picker-->
<!-- v-model="dataCenterSearch.dataUploadTime"-->
<!-- clearable-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="daterange"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期">-->
<!-- </el-date-picker>-->
<el-date-picker <el-date-picker
v-model="dataCenterSearch.dataUploadTime" v-model="dataCenterSearch.startDataUploadTime"
clearable
value-format="yyyy-MM-dd"
size="small" size="small"
type="daterange" type="date"
range-separator="至" value-format="yyyy-MM-dd"
start-placeholder="开始日期" placeholder="请选择上传开始时间">
end-placeholder="结束日期"> </el-date-picker>
</el-form-item>
<el-form-item label="上传结束时间:">
<el-date-picker
v-model="dataCenterSearch.endDataUploadTime"
size="small"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择上传结束时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@@ -231,21 +255,21 @@
</div> </div>
</el-drawer> </el-drawer>
<el-drawer <el-drawer
:title="attributeTitle" :title="attributeTitle"
:wrapperClosable="false" :wrapperClosable="false"
:visible.sync="showInfoModal" :visible.sync="showInfoModal"
size="800px" size="800px"
:styles="styles" :styles="styles"
:close="cancelModel" :close="cancelModel"
> >
<div style="height: 92%;margin-left: 3%"> <div style="height: 92%;margin-left: 3%">
<el-form <el-form
ref="attributeEO" ref="attributeEO"
:model="attributeEO" :model="attributeEO"
:rules="attributeEOFormRules" :rules="attributeEOFormRules"
class="label-input-form" class="label-input-form"
label-width="130px" label-width="130px"
v-if="showInfoModal" v-if="showInfoModal"
> >
<el-form-item label="所属目录" prop="treeId" class="add-form-item"> <el-form-item label="所属目录" prop="treeId" class="add-form-item">
<el-select ref="treeSelect" class="tree-select" v-model="attributeEO.treeId" value-key="id" placeholder="请选择所属目录"> <el-select ref="treeSelect" class="tree-select" v-model="attributeEO.treeId" value-key="id" placeholder="请选择所属目录">
@@ -267,61 +291,61 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="类型" label="类型"
prop="dataType" prop="dataType"
class="add-form-item" class="add-form-item"
> >
<el-input <el-input
v-model="attributeEO.dataType" v-model="attributeEO.dataType"
placeholder="请输入类型" placeholder="请输入类型"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="资料标题" label="资料标题"
prop="dataTitle" prop="dataTitle"
class="add-form-item" class="add-form-item"
> >
<el-input <el-input
v-model="attributeEO.dataTitle" v-model="attributeEO.dataTitle"
placeholder="请输入资料标题" placeholder="请输入资料标题"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="资料说明" label="资料说明"
prop="dataExplain" prop="dataExplain"
class="add-form-item" class="add-form-item"
> >
<el-input <el-input
type="textarea" type="textarea"
:autosize="{ minRows: 1, maxRows: 10}" :autosize="{ minRows: 1, maxRows: 10}"
resize="none" resize="none"
style="width: 95%" style="width: 95%"
maxlength="4000" maxlength="4000"
show-word-limit show-word-limit
v-model="attributeEO.dataExplain" v-model="attributeEO.dataExplain"
placeholder="请输入资料说明" placeholder="请输入资料说明"
clearable clearable
/> />
<el-button icon="el-icon-delete" circle type="danger" size="mini" @click="attributeEO.dataExplain = ''"></el-button> <el-button icon="el-icon-delete" circle type="danger" size="mini" @click="attributeEO.dataExplain = ''"></el-button>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="附件" label="附件"
prop="attachFileId" prop="attachFileId"
class="add-form-item" class="add-form-item"
> >
<el-upload <el-upload
class="upload-demo" class="upload-demo"
action="/api/att/attFile/uploadNew" action="/api/att/attFile/uploadNew"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-preview="handlePreview" :on-preview="handlePreview"
:on-remove="handleRemove" :on-remove="handleRemove"
multiple multiple
:limit="50" :limit="50"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:on-success="uploadSuccess" :on-success="uploadSuccess"
:file-list="fileList"> :file-list="fileList">
<el-button size="small" type="primary">点击上传</el-button> <el-button size="small" type="primary">点击上传</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
@@ -409,6 +433,7 @@ export default {
total: 0 total: 0
}, },
dataCenterTable: [], dataCenterTable: [],
cbcdOptions: [],
productModelAdd: { productModelAdd: {
name: '', name: '',
parentId: '', parentId: '',
@@ -730,12 +755,17 @@ export default {
}, },
searchInfo() { searchInfo() {
this.loading = true this.loading = true
if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){ // if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] // this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] // this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
}else{ // }else{
this.dataCenterSearch.startDataUploadTime ='' // this.dataCenterSearch.startDataUploadTime =''
this.dataCenterSearch.endDataUploadTime = '' // this.dataCenterSearch.endDataUploadTime = ''
// }
if(this.dataCenterSearch.endDataUploadTime < this.dataCenterSearch.startDataUploadTime){
this.$message.warning('结束时间不能小于开始时间')
this.loading = false
return
} }
this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, { this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, {
_this: this _this: this
@@ -806,35 +836,35 @@ export default {
if (valid) { if (valid) {
if (this.attributeTitle === '新增'){ if (this.attributeTitle === '新增'){
this.$http.postData( this.$http.postData(
'fileMaterialCenter/file-material', 'fileMaterialCenter/file-material',
this.attributeEO, this.attributeEO,
{ {
_this: this, _this: this,
}, },
(res) => { (res) => {
if (res.ok) { if (res.ok) {
this.$message.success('新增成功') this.$message.success('新增成功')
this.submitLoading = false this.submitLoading = false
this.cancelModel() this.cancelModel()
this.searchInfo() this.searchInfo()
}
} }
}
) )
}else { }else {
this.$http.putData( this.$http.putData(
'fileMaterialCenter/file-material', 'fileMaterialCenter/file-material',
this.attributeEO, this.attributeEO,
{ {
_this: this, _this: this,
}, },
(res) => { (res) => {
if (res.ok) { if (res.ok) {
this.$message.success('修改成功') this.$message.success('修改成功')
this.submitLoading = false this.submitLoading = false
this.cancelModel() this.cancelModel()
this.searchInfo() this.searchInfo()
}
} }
}
) )
} }
}else{ }else{
@@ -868,7 +898,7 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
#dataCenter { #dataCenter {
/deep/ .el-input--small .el-input__inner { /deep/ .el-input--small .el-input__inner {
width: 160px; width: 160px;
} }
background-color: white; background-color: white;
@@ -1032,7 +1062,9 @@ export default {
} }
} }
} }
/deep/.el-input__inner{
width: 180px !important;
}
/deep/ .icon-tree { /deep/ .icon-tree {
margin: 0 5px 0 10px; margin: 0 5px 0 10px;
position: relative; position: relative;
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+33 -1
View File
@@ -11,7 +11,7 @@
<el-option label="修订中" value="2"></el-option> <el-option label="修订中" value="2"></el-option>
<el-option label="已取消" value="3"></el-option> <el-option label="已取消" value="3"></el-option>
<el-option label="已完成" value="4"></el-option> <el-option label="已完成" value="4"></el-option>
<el-option label="立项已完成" value="5"></el-option> <!-- <el-option label="立项已完成" value="5"></el-option>-->
<el-option label="计划已确认" value="6"></el-option> <el-option label="计划已确认" value="6"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -1220,7 +1220,9 @@
tips = '添加' tips = '添加'
} }
let arr = JSON.parse(JSON.stringify(this.addForm)) let arr = JSON.parse(JSON.stringify(this.addForm))
this.addForm.unitName = arr.unitName
arr.area = arr.area.join(',') arr.area = arr.area.join(',')
this.addForm = {...this.addForm}
this.$http.post(url, this.addForm, { this.$http.post(url, this.addForm, {
_this: this _this: this
}, res => { }, res => {
@@ -1230,6 +1232,36 @@
this.addDrawer = false this.addDrawer = false
this.$message.success(tips + '成功') this.$message.success(tips + '成功')
this.getData() this.getData()
if(this.DrawerType === 'add'){
this.addForm.addFlag = '1'
this.addForm.prcCreateUser = this.$store.getters.userInfo.userId
this.addForm.prcCreateUserName = this.$store.getters.userInfo.userName
this.addForm.nowEsId = res.message
this.addForm.type = '5'
var json = Object.assign(this.addForm)
this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '25',
json: JSON.stringify({
qbfsForm: this.addForm
})
}, {}, res => {
if (res.ok) {
this.$http.post('lawss/activiti/completeTask', {
taskIds: res.data,
userId : this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
// this.$message.success(res.message)
}
})
}
})
}
} else { } else {
this.addDrawer = false this.addDrawer = false
this.$message.warning(res.data) this.$message.warning(res.data)
src/router/index.js
+9
View File
@@ -2275,6 +2275,15 @@ const routes = [
title: '企标制修订计划管控流程' title: '企标制修订计划管控流程'
} }
}, },
{
path: '/qbzxdjhgkStep6',
name: 'qbzxdjhgkStep6',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue'),
meta: {
requireAuth: true,
title: '企标制修订计划管控流程'
}
},
{ {
path: '/qbzxdjhgkStep1-5', path: '/qbzxdjhgkStep1-5',
name: 'qbzxdjhgkStep1-5', name: 'qbzxdjhgkStep1-5',
src/sysConfig/index.js
+10 -8
View File
@@ -8,10 +8,10 @@
// const devInterfacePORT = '10005' // const devInterfacePORT = '10005'
// const devIp = '192.168.1.42' // const devIp = '192.168.1.42'
// const devInterfacePORT = '9999' // const devInterfacePORT = '9999'
// const devIp = '39.98.140.126' const devIp = '10.10.10.46'
// const devInterfacePORT = '4202' const devInterfacePORT = '4202'
const devIp = '10.0.3.10' // const devIp = '10.0.3.10'
const devInterfacePORT = '10086' // const devInterfacePORT = '10086'
// const devIp = '62.234.136.153' // const devIp = '62.234.136.153'
// const devInterfacePORT = '8033' // const devInterfacePORT = '8033'
// 配置 idm 认证 // 配置 idm 认证
@@ -22,8 +22,8 @@ const devWebUrl = 'http://62.234.136.153:8038/#/'
const webLoginType = 'dev' const webLoginType = 'dev'
// 配置onlyOffice 前端服务 // 配置onlyOffice 前端服务
// const onlyOfficeUrl = 'http://127.0.0.1:8080' const onlyOfficeUrl = 'http://127.0.0.1:8080'
const onlyOfficeUrl = 'http://10.10.10.46:8103' // const onlyOfficeUrl = 'http://10.10.10.46:8103'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -47,8 +47,10 @@ const processPort = '17210'
*****************************************************************/ *****************************************************************/
// 生产环境配置 // 生产环境配置
const prodIp = '39.98.140.126' // const prodIp = '39.98.140.126'
const prodInterfacePORT = '4201' // const prodInterfacePORT = '4201'
const prodIp = '10.10.10.46'
const prodInterfacePORT = '4202'
// const prodIp = 'slrs.foton.com.cn' // const prodIp = 'slrs.foton.com.cn'
// const prodInterfacePORT = '' // const prodInterfacePORT = ''