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:
shenyanpei
2021-12-06 15:19:55 +08:00
parent 2ebdb180f1 c2209234c6
commit e3f4405e2d
11 changed files with 80 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+4 -2
View File
@@ -31,7 +31,7 @@
></el-input>
</el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option>
@@ -47,6 +47,7 @@
</el-form-item>
<el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.draftTime"
type="date"
value-format="yyyy-MM-dd"
@@ -64,7 +65,7 @@
</el-col>
<el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-select disabled v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
<el-option label="完成" value="完成"></el-option>
@@ -88,6 +89,7 @@
</el-form-item>
<el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.releaseTime"
type="date"
value-format="yyyy-MM-dd"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+6 -4
View File
@@ -31,7 +31,7 @@
></el-input>
</el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option>
@@ -47,6 +47,7 @@
</el-form-item>
<el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.draftTime"
type="date"
value-format="yyyy-MM-dd"
@@ -71,8 +72,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
<el-option label="完成" value="完成"></el-option>
@@ -96,6 +97,7 @@
</el-form-item>
<el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.releaseTime"
type="date"
value-format="yyyy-MM-dd"
@@ -141,7 +143,7 @@
></el-input>
</el-form-item>
<el-form-item label="制修订状态" class="search-item search-item-last">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+2 -2
View File
@@ -191,10 +191,10 @@ export default {
{required: true, message: '请输入企标名称', trigger: 'blur'},
],
planStatus: [
{required: true, message: '请选择计划状态', trigger: 'change'},
{required: true, message: '请选择计划状态', trigger: 'blur'},
],
reviseStatus: [
{required: true, message: '请选择制修订状态', trigger: 'change'},
{required: true, message: '请选择制修订状态', trigger: 'blur'},
],
resPersonName: [
{required: true, message: '请输入评审责任人', trigger: 'blur'},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+9 -5
View File
@@ -532,11 +532,15 @@ export default {
this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--'
this.standShow = true
}else{
this.qbfsForm.esId2 = this.selectList[0].id || '--'
this.qbfsForm.esName2 = this.selectList[0].esName || '--'
this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--'
this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--'
this.standShow2 = true
if(this.qbfsForm.esName1 === this.selectList[0].esName ){
this.$message.warning('您选择的合并企标已经存在,请更改!')
}else{
this.qbfsForm.esId2 = this.selectList[0].id || '--'
this.qbfsForm.esName2 = this.selectList[0].esName || '--'
this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--'
this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--'
this.standShow2 = true
}
}
this.ListModel = false
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+5 -3
View File
@@ -31,7 +31,7 @@
></el-input>
</el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option>
@@ -47,6 +47,7 @@
</el-form-item>
<el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.draftTime"
type="date"
value-format="yyyy-MM-dd"
@@ -63,7 +64,7 @@
</el-col>
<el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-select disabled v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
<el-option label="完成" value="完成"></el-option>
@@ -87,6 +88,7 @@
</el-form-item>
<el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.releaseTime"
type="date"
value-format="yyyy-MM-dd"
@@ -257,7 +259,7 @@ export default {
renameEs: [
{required: true, message: '请输入更名后企标名称', trigger:'blur'},
],
cancelReason: [
renameReason: [
{required: true, message: '请输入更名原因', trigger:'blur'},
]
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+6 -6
View File
@@ -36,24 +36,24 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.drafter"
v-model="qbfsForm.drafterName"
placeholder="请输入起草人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.resPerson"
v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="wgLeader" 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">
<el-input
disabled
v-model="qbfsForm.wgLeader"
v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+27 -2
View File
@@ -12,10 +12,11 @@
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<process-title v-if="showFlag">
<template slot="title">基础信息</template>
</process-title>
<el-form
v-if="showFlag"
class="label-input-form prc-content-border"
label-width="150px"
>
@@ -54,6 +55,7 @@
</el-collapse>
</div>
</div>
<loading :loading="formLoading">数据加载中...</loading>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
@@ -273,7 +275,9 @@ export default {
commentText: "",
comName: "merge",
qbfsForm: {},
formLoading: false,
approvalFlag: false,
showFlag: true,
taskId: '',
bpnId: '',
drawerTitle: "",
@@ -316,8 +320,8 @@ export default {
if(this.taskId){
this.approvalFlag = true
this.processTable()
this.getData();
}
this.getData();
},
methods: {
processTable() {
@@ -344,6 +348,8 @@ export default {
});
},
getData() {
this.formLoading = true
this.showFlag = false
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
@@ -362,7 +368,25 @@ export default {
*/
getFormFieldList(item) {
this.$nextTick(() => {
switch (item.type){
case '1':
this.comName = "merge"
break
case '2':
this.comName = "delay"
break
case '3':
this.comName = "cancel"
break
case '4':
this.comName = "rename"
break
case '5':
this.comName = "establish"
break
}
this.qbfsForm = item;
this.formLoading = false;
this.roleForm.dockUser = item.dockUser;
this.roleForm.dockUserName = item.dockUserName;
this.roleForm.countersigner = item.countersigner;
@@ -446,6 +470,7 @@ export default {
if (valid) {
this.isSubmit = true;
var json = Object.assign(qbzxdFrom, this.roleForm);
console.log(json);
this.$http.get("lawss/activiti/startProcess", { type: "25" }, {
_this: this
}, res => {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+3 -3
View File
@@ -39,21 +39,21 @@
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.drafter"
v-model="qbfsForm.drafterName"
placeholder="请输入起草人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.resPerson"
v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.wgLeader"
v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+6 -6
View File
@@ -36,24 +36,24 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.drafter"
v-model="qbfsForm.drafterName"
placeholder="请输入起草人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.resPerson"
v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="wgLeader" 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">
<el-input
disabled
v-model="qbfsForm.wgLeader"
v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+6 -6
View File
@@ -36,24 +36,24 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.drafter"
v-model="qbfsForm.drafterName"
placeholder="请输入起草人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.resPerson"
v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="wgLeader" 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">
<el-input
disabled
v-model="qbfsForm.wgLeader"
v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+6 -6
View File
@@ -36,24 +36,24 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.drafter"
v-model="qbfsForm.drafterName"
placeholder="请输入起草人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.resPerson"
v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="wgLeader" 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">
<el-input
disabled
v-model="qbfsForm.wgLeader"
v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长"
:maxlength="500"/>
</el-form-item>