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:
super_liu
2021-12-27 15:03:02 +08:00
parent 05936aee1b 8e9426dc0f
commit 972834d4b1
42 changed files with 597 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+23 -7
View File
@@ -144,7 +144,7 @@
<h4>责任部门对接人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS">
<el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS('1')">
</el-input>
</div>
</el-form-item>
@@ -167,7 +167,7 @@
<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="choiceZRRS('2')"></el-input>
</div>
</el-form-item>
</el-card>
@@ -196,7 +196,7 @@
>
</ProcessFooter>
<Role-tree
is-title="选择责任部门对接人"
:is-title="drawerTitle2"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -261,6 +261,8 @@
name: "bzdyStep1-1",
data() {
return {
drawerTitle2: '',
type2: '',
foldFormFlag: false,
fileMadel2: false,
nodeList: [],
@@ -370,8 +372,13 @@
idList += item.id
nameList += item.name
})
this.roleForm.dockUserList = idList
this.roleForm.dockUserName = nameList
if (this.type2 === '1') {
this.roleForm.dockUserList = idList
this.roleForm.dockUserName = nameList
} else {
this.roleForm.directorUser = idList
this.roleForm.directorUserName = nameList
}
},
checkedRole (data) {
if (this.type === 'dockUser') {
@@ -389,9 +396,18 @@
}
},
choiceZRRS () {
this.type2 = type
this.nodeList2 = []
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
if (type === '1') {
this.drawerTitle2 = '选择责任部门对接人'
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
}
} else {
this.drawerTitle2 = '选择技术管理中心主任'
if ( this.roleForm.directorUser.length > 0) {
this.nodeList2 = this.roleForm.directorUser.split(',')
}
}
this.modalshowflag2 = true
},
src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
-3
View File
@@ -127,20 +127,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+25 -8
View File
@@ -144,7 +144,7 @@
<h4>责任部门对接人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任人" readonly="readonly" @click.native="choiceZRRS">
<el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任部门对接人" readonly="readonly" @click.native="choiceZRRS('1')">
</el-input>
</div>
</el-form-item>
@@ -167,7 +167,8 @@
<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="选择技术管理中心主任" readonly="readonly" @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
<!-- <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly" @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>-->
<el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly" @click.native="choiceZRRS('2')"></el-input>
</div>
</el-form-item>
</el-card>
@@ -197,7 +198,7 @@
>
</ProcessFooter>
<Role-tree
is-title="选择责任部门对接人"
:is-title="drawerTitle2"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -262,6 +263,8 @@ export default {
name: "bzdyStep1",
data() {
return {
drawerTitle2: '',
type2: '',
bpnId: '',
foldFormFlag: false,
fileMadel2: false,
@@ -362,8 +365,13 @@ export default {
idList += item.id
nameList += item.name
})
this.roleForm.dockUserList = idList
this.roleForm.dockUserName = nameList
if (this.type2 === '1') {
this.roleForm.dockUserList = idList
this.roleForm.dockUserName = nameList
} else {
this.roleForm.directorUser = idList
this.roleForm.directorUserName = nameList
}
},
checkedRole (data) {
if (this.type === 'dockUser') {
@@ -380,10 +388,19 @@ export default {
this.roleForm.presidentUserName = data[0].name
}
},
choiceZRRS () {
choiceZRRS (type) {
this.type2 = type
this.nodeList2 = []
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
if (type === '1') {
this.drawerTitle2 = '选择责任部门对接人'
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
}
} else {
this.drawerTitle2 = '选择技术管理中心主任'
if ( this.roleForm.directorUser.length > 0) {
this.nodeList2 = this.roleForm.directorUser.split(',')
}
}
this.modalshowflag2 = true
},
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
-3
View File
@@ -117,20 +117,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
-3
View File
@@ -155,20 +155,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+5 -8
View File
@@ -155,20 +155,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -374,14 +371,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.dyhz = data.form ? data.form.dyhz : ''
this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.form ? data.form.fileId : ''
this.form.fileName = data.form ? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.modelList = data.form ? data.form.modelList : []
this.form.file = data.form ? data.form.fileId : data.fileId
this.form.fileName = data.form ? data.form.fileName : data.fileName
this.form.fileId = data.form ? data.form.fileId : data.fileId
this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.fjList = data.fjList || data.form.fjList
}).catch(e => {
})
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
-3
View File
@@ -145,20 +145,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
-3
View File
@@ -140,20 +140,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
-3
View File
@@ -140,20 +140,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
-3
View File
@@ -140,20 +140,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
-3
View File
@@ -140,20 +140,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+1 -1
View File
@@ -420,7 +420,7 @@
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+1 -4
View File
@@ -277,20 +277,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -326,7 +323,7 @@
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+1 -1
View File
@@ -424,7 +424,7 @@
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭
</el-button>
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+1 -4
View File
@@ -189,20 +189,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -263,7 +260,7 @@
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+1 -4
View File
@@ -220,20 +220,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -420,7 +417,7 @@
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+1 -4
View File
@@ -212,20 +212,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -275,7 +272,7 @@
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1 -4
View File
@@ -212,20 +212,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -280,7 +277,7 @@
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+1 -4
View File
@@ -213,20 +213,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -279,7 +276,7 @@
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+10
View File
@@ -1315,6 +1315,14 @@ export default {
this.$message.warning("请勿重复添加数据");
} else {
this.dataList.push(item);
this.dataList.forEach(item => {
if(item.XCXSSRQ === null){
item.XCXSSRQ = ''
}
if(item.ZCCSSRQ === null){
item.ZCCSSRQ = ''
}
})
exits.push(item.id);
}
});
@@ -1368,11 +1376,13 @@ export default {
this.dataList.forEach(item => {
if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){
item.xcxssrqgj = ''
this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}
if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
item.zccssrqgj = ''
this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}else{
this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+12 -2
View File
@@ -1057,7 +1057,7 @@ export default {
this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList
this.listForm.dataList = this.dataList
var json = Object.assign(this.listForm, this.roleForm);
let json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
this.$refs["Form"].validate((valid) => {
@@ -1237,7 +1237,7 @@ export default {
this.standList.map(item => {
let newStand = false;
for (let itemKey of this.dataList) {
if (item.id == itemKey.id) {
if (item.id === itemKey.id) {
newStand = true;
break;
}
@@ -1246,6 +1246,14 @@ export default {
this.$message.warning("请勿重复添加数据");
} else {
this.dataList.push(item);
this.dataList.forEach(item => {
if(item.XCXSSRQ === null){
item.XCXSSRQ = ''
}
if(item.ZCCSSRQ === null){
item.ZCCSSRQ = ''
}
})
exits.push(item.id);
}
});
@@ -1300,11 +1308,13 @@ export default {
this.dataList.forEach(item => {
if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){
item.xcxssrqgj = ''
this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}
if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
item.zccssrqgj = ''
this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}else{
this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+9 -1
View File
@@ -616,6 +616,14 @@ export default {
_this.$message.warning("请勿重复添加数据");
} else {
_this.dataList.push(item);
_this.dataList.forEach(item => {
if(item.XCXSSRQ === null){
item.XCXSSRQ = ''
}
if(item.ZCCSSRQ === null){
item.ZCCSSRQ = ''
}
})
}
});
this.standardData = []
@@ -807,7 +815,7 @@ export default {
this.listForm.commentText = this.commentText
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
// this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+38 -1
View File
@@ -418,6 +418,29 @@
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '1'" label="修订本" prop="xdb" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.xdbName"
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('xdb')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
<!-- ************************************** 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
@@ -745,6 +768,17 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
<el-option
v-for="item in cyzbpmOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -1511,6 +1545,7 @@
qcdw: [], // 起草单位
wssmr: [], // 我司署名人
cysd: '', // 我司参与深度
cyzbpm:[],// 我司参与制标排名
cllx: [], // 适用车型
nylx: [],// 能源类型
sycpx: [],// 适用产品线
@@ -1616,6 +1651,7 @@
options:[]
}, // 适用认证
cysdOptions: [], // 我司参与深度
cyzbpmOptions:[], // 我司参与制标排名
cbcdOptions: [], // 采标程度
wssmrOptions: [], // 我司署名人
sycpxOptions: {
@@ -1679,7 +1715,7 @@
standNature: '', // 标准性质
standEnName: '', // 英文名称
standName: '', // 中文名称
signFlag: '1', // 是否需要会签
signFlag: '2', // 是否需要会签
issueTime: '', // 发布时间
isRelateAccess: '', // 是否纳入认证清单
standSystem: '',// 标准体系
@@ -2969,6 +3005,7 @@
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+52
View File
@@ -624,6 +624,29 @@
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '1'" label="修订本" prop="xdb" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.xdbName"
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('xdb')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
@@ -946,6 +969,17 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
<el-option
v-for="item in cyzbpmOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -1404,6 +1438,7 @@ export default {
jdwjFileList: [],
zbjbdFileList: [],
kwjFileList: [],
xdbFileList: [],
glwjFileList: [],
textStatus:'',//文本状态
textStatusMap: {}, // 文本状态id与name对应
@@ -1569,6 +1604,7 @@ export default {
qcdw: '', // 起草单位
wssmr: '', // 我司署名人
cysd: '', // 我司参与深度
cyzbpm:[],// 我司参与制标排名
cllx: '', // 适用车型
nylx: '',// 能源类型
sycpx: '',// 适用产品线
@@ -1618,6 +1654,7 @@ export default {
options:[]
}, // 适用认证
cysdOptions: [], // 我司参与深度
cyzbpmOptions:[], // 我司参与制标排名
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: {
@@ -2120,6 +2157,9 @@ export default {
case 'kwj':
this.kwjFileList=fileList;
break;
case 'xdb':
this.xdbFileList=fileList;
break;
case 'ca':
this.caFileList=fileList;
break;
@@ -2157,6 +2197,9 @@ export default {
case 'kwj':
this.kwjFileList=fileList;
break;
case 'xdb':
this.xdbFileList=fileList;
break;
case 'ca':
this.caFileList=fileList;
break;
@@ -2188,6 +2231,8 @@ export default {
this.fileList=this.zbjbdFileList;
}else if (type==='kwj'){
this.fileList=this.kwjFileList;
}else if (type==='xdb'){
this.fileList=this.xdbFileList;
}else if (type==='glwj'){
this.fileList=this.glwjFileList;
}
@@ -2388,6 +2433,9 @@ export default {
case 'kwj':
this.getFileList(value,this.kwjFileList);
break;
case 'xdb':
this.getFileList(value,this.xdbFileList);
break;
case 'jdwj':
this.getFileList(value,this.jdwjFileList);
break;
@@ -2491,6 +2539,9 @@ export default {
this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",")
this.form.kwjName=this.kwjFileList.map(item => item.name).join(",")
this.form.kwj=this.xdbFileList.map(item => item.response.data.id).join(",")
this.form.kwjName=this.xdbFileList.map(item => item.name).join(",")
this.form.ca=this.caFileList.map(item => item.response.data.id).join(",")
this.form.caName=this.caFileList.map(item => item.name).join(",")
@@ -2574,6 +2625,7 @@ export default {
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 起草单位
this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
-3
View File
@@ -169,20 +169,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
-3
View File
@@ -117,20 +117,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
-3
View File
@@ -204,20 +204,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
-3
View File
@@ -183,20 +183,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
-3
View File
@@ -175,20 +175,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
-3
View File
@@ -211,20 +211,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
-3
View File
@@ -206,20 +206,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
-3
View File
@@ -195,20 +195,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
-3
View File
@@ -195,20 +195,17 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+119 -27
View File
@@ -24,20 +24,60 @@
<el-option label="完成" value="完成"></el-option>
</el-select>
</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-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-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-form-item prop="standScope" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.standScope" placeholder="请选择标准范围">
<el-option label="N1" value="N1"></el-option>
<el-option label="N2" value="N2"></el-option>
<el-option label="N3" value="N3"></el-option>
<el-option label="M1" value="M1"></el-option>
<el-option label="M2" value="M2"></el-option>
<el-option label="M3" value="M3"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="useStand" label="是否采用标准" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select @change="useStandChange" v-model="qbfsForm.useStand" placeholder="请选择是否采用标准">
<el-option label="是" value="yes"></el-option>
<el-option label="否" value="no"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="!useShow" prop="indexBasis" label="简述指标依据" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.indexBasis"
placeholder="请输入指标依据"
:maxlength="500"/>
</el-form-item>
<!-- <el-form-item prop="useStand" label="采用何种标准" style="width: 100%; margin-right:10px"-->
<!-- class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="qbfsForm.useStand" placeholder="请选择采用何种标准">-->
<!-- <el-option-->
<!-- v-for="item in useOptions"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
<el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人" readonly
@click.native="choiceZRRS('1')">
</el-input>
</el-form-item>
<el-form-item prop="resPersonName" 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 v-model="qbfsForm.resPerson" style="display: none;"></el-input>
<el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
@click.native="choiceZRRS('2')">
@@ -109,7 +149,7 @@
<script>
import ProcessTitle from "process/components/ProcessTitle";
import MechanismTree from '@/components/mechanismTree'
import MechanismTree from "@/components/mechanismTree";
export default {
name: "establish",
@@ -120,6 +160,7 @@ export default {
props: ['message'],
data(){
return {
useShow: false,
modalshowflagZRBM: false,
nodeListZRBM: [],
drawerTitle2: '',
@@ -131,44 +172,92 @@ export default {
nodeList: [],
qcdwOptions: [],
qbfsForm: {
type: '5',
unit: '', // 单位
unitName: '',
esName: '', // 企标名称
planStatus: '', // 计划状态
reviseStatus: '', // 制修订状态
resPerson: '', // 评审责任人
resPersonName: '',
wgLeader: '', // 工作组组长
wgLeaderName: '',
draftTime: '', // 计划标准初稿完成时间
releaseTime: '', // 计划标准发布时间
drafter: '', // 起草人
drafterName: '',
newReason: '', //新增原因
type: "5",
unit: "", // 单位
unitName: "",
esName: "", // 企标名称
planStatus: "", // 计划状态
reviseStatus: "", // 制修订状态
standScope: "", //标准范围
useStand: "", //采用何种标准
indexBasis: '', //指标依据
resPerson: "", // 评审责任人
resPersonName: "",
wgLeader: "", // 工作组组长
wgLeaderName: "",
draftTime: "", // 计划标准初稿完成时间
releaseTime: "", // 计划标准发布时间
drafter: "", // 起草人
drafterName: "",
newReason: "" //新增原因
// remarks: '', // 备注
},
useOptions: [
{
value: "ISO",
label: "ISO"
}, {
value: "ESE",
label: "ESE"
}, {
value: "EC/EEC",
label: "EC/EEC"
}, {
value: "IEC",
label: "IEC"
}, {
value: "GB",
label: "GB"
}, {
value: "GB/T",
label: "GB/T"
}, {
value: "QC/T",
label: "QC/T"
}, {
value: "JT/T",
label: "JT/T"
}, {
value: "HJ",
label: "HJ"
}, {
value: "TB",
label: "团标"
},{
value: "QT",
label: "其他"
},
],
qbfsFormRules: {
unit: [
{required: true, message: '请选择起草单位', trigger: 'change'},
{ required: true, message: "请选择起草单位", trigger: "change" }
],
esName: [
{required: true, message: '请输入企标名称', trigger: 'blur'},
{ required: true, message: "请输入企标名称", trigger: "blur" }
],
planStatus: [
{required: true, message: '请选择计划状态', trigger: 'blur'},
{ required: true, message: "请选择计划状态", trigger: "blur" }
],
reviseStatus: [
{required: true, message: '请选择制修订状态', trigger: 'blur'},
{ required: true, message: "请选择制修订状态", trigger: "blur" }
],
standScope: [
{ required: true, message: "请选择标准范围", trigger: "blur" }
],
useStand: [
{ required: true, message: "请选择采用何种标准", trigger: "blur" }
],
indexBasis: [
{ required: true, message: "请输入指标依据", trigger: "blur" }
],
resPersonName: [
{required: true, message: '请输入评审责任人', trigger: 'blur'},
{ required: true, message: "请输入评审责任人", trigger: "blur" }
],
wgLeaderName: [
{required: true, message: '请输入工作组组长', trigger: 'blur'},
{ required: true, message: "请输入工作组组长", trigger: "blur" }
],
draftTime: [
{required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
{ required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" }
],
releaseTime: [
{required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
@@ -205,6 +294,9 @@ export default {
})
},
methods: {
useStandChange(){
this.useShow = !this.useShow
},
choiceZRBM(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)