-
+
+
+
-
-
+
{{ sarStandardsInfoEO.standName || '-' }}
{{ sarStandardsInfoEO.standEnName || '-' }}
@@ -1612,7 +1613,7 @@ export default {
this.dynamicHistoryCommentTable = res.data
this.historyCommentForm.revise = res.data[0].targetScore
- this.historyCommentForm.reviseReason = res.data[0].commentReason
+ this.historyCommentForm.reviseReason = res.data[0].commentReason ? (res.data[0].commentReason === '-'? '':res.data[0].commentReason) : res.data[0].commentReason
let averageScore = 0
res.data.forEach(item => {
@@ -1630,90 +1631,92 @@ export default {
},
tabsClickBtn(tab, event){
- // if (this.commentActiveName === 'dynamicComment'){
- // this.indexType = 'dynamic'
- // //查询评分表
- // const allData = {
- // lawId: this.$route.params.id,
- // userId: this.qualityFirstHistoryPeopleId,
- // evaluationType: this.indexType,
- // }
- // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
- // _this: this
- // }, res => {
- // this.qualityHistoryCommentTable = res.data
- // this.historyInfoLoading = false
- //
- // }, e => {
- // this.historyInfoLoading = false
- // })
- // }
- // else if (this.commentActiveName === 'historyComment'){
- // this.historyInfoLoading = true
- // this.indexType = 'quality'
- // //查询评分表
- // const allData = {
- // lawId: this.$route.params.id,
- // userId: this.dynamicFirstHistoryPeopleId,
- // evaluationType: this.indexType
- // }
- // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
- // _this: this
- // }, res => {
- // this.dynamicHistoryCommentTable = res.data
- // this.historyCommentForm.revise = res.data[0].targetScore
- // this.historyCommentForm.reviseReason = res.data[0].commentReason
- //
- // let averageScore = 0
- // res.data.forEach(item => {
- // if (item.valueType === 'number'){
- // averageScore += parseInt(item.targetScore)
- // }
- // })
- // averageScore = averageScore / 4
- // this.historyCommentForm.averageScore = averageScore
- // this.historyInfoLoading = false
- // }, e => {
- // this.historyInfoLoading = false
- // })
- // }
- //
- // //查询动态评价总平均分和质量评价总平均分
- // let standId = this.$route.params.id
- // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
- // _this: this
- // }, res => {
- // this.qualityCommentScore = res.data.quality.toFixed(3)/2
- // this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
- //
- // }, e => {
- // })
- //
- // // 刷新质量评价评分人表格和动态评价评分人表格
- // const qualityRequest = {
- // lawId: standId,
- // evaluationType: 'quality'
- // }
- // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
- // _this: this
- // }, res => {
- // this.qualityHistoryPeopleTable = res.data.records
- // this.qualityFirstHistoryPeopleId = res.data.records[0].userId
- //
- // }, e => {
- // })
- // const dynamicRequest = {
- // lawId: standId,
- // evaluationType: 'dynamic'
- // }
- // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
- // _this: this
- // }, res => {
- // this.dynamicHistoryPeopleTable = res.data.records
- // this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
- //
- // }, e => {
- // })
+ if (this.commentActiveName === 'dynamicComment'){
+ this.indexType = 'dynamic'
+ //查询评分表
+ const allData = {
+ lawId: this.$route.params.id,
+ userId: this.qualityFirstHistoryPeopleId,
+ evaluationType: this.indexType,
+ }
+ this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+ _this: this
+ }, res => {
+ this.qualityHistoryCommentTable = res.data
+ this.historyInfoLoading = false
+
+ }, e => {
+ this.historyInfoLoading = false
+ })
+ }else if (this.commentActiveName === 'historyComment'){
+ this.commentAverageScoreTag = '1'
+ this.tabsClick()
+ this.dynamicHistoryCommentTable = []
+ this.historyInfoLoading = true
+ this.indexType = 'quality'
+ //查询评分表
+ const allData = {
+ lawId: this.$route.params.id,
+ userId: this.dynamicFirstHistoryPeopleId,
+ evaluationType: this.indexType
+ }
+ this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+ _this: this
+ }, res => {
+ this.dynamicHistoryCommentTable = res.data
+ this.historyCommentForm.revise = res.data[0].targetScore
+ this.historyCommentForm.reviseReason = res.data[0].commentReason
+
+ let averageScore = 0
+ res.data.forEach(item => {
+ if (item.valueType === 'number'){
+ averageScore += parseInt(item.targetScore)
+ }
+ })
+ averageScore = averageScore / 4
+ this.historyCommentForm.averageScore = averageScore
+ this.historyInfoLoading = false
+ }, e => {
+ this.historyInfoLoading = false
+ })
+ }
+
+ //查询动态评价总平均分和质量评价总平均分
+ let standId = this.$route.params.id
+ this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
+ _this: this
+ }, res => {
+ this.qualityCommentScore = res.data.quality.toFixed(3)/2
+ this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+
+ }, e => {
+ })
+
+ // 刷新质量评价评分人表格和动态评价评分人表格
+ const qualityRequest = {
+ lawId: standId,
+ evaluationType: 'quality'
+ }
+ this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
+ _this: this
+ }, res => {
+ this.qualityHistoryPeopleTable = res.data.records
+ this.qualityFirstHistoryPeopleId = res.data.records[0].userId
+
+ }, e => {
+ })
+ const dynamicRequest = {
+ lawId: standId,
+ evaluationType: 'dynamic'
+ }
+ this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
+ _this: this
+ }, res => {
+ this.dynamicHistoryPeopleTable = res.data.records
+ this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
+
+ }, e => {
+ })
},
tabsClick(tab, event){
@@ -1739,6 +1742,7 @@ export default {
}
else if (this.commentAverageScoreTag === '2'){
this.indexType = 'dynamic'
+ this.dynamicHistoryCommentTable = []
//查询评分表
const allData = {
lawId: this.$route.params.id,
@@ -1748,19 +1752,23 @@ export default {
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
_this: this
}, res => {
- this.dynamicHistoryCommentTable = res.data
- this.historyCommentForm.revise = res.data[0].targetScore
- this.historyCommentForm.reviseReason = res.data[0].commentReason
+ if(res.data && res.data.length > 0){
+ this.dynamicHistoryCommentTable = res.data
+ this.historyCommentForm.revise = res.data[0].targetScore
+ this.historyCommentForm.reviseReason = res.data[0].commentReason
- let averageScore = 0
- res.data.forEach(item => {
- if (item.valueType === 'number'){
- averageScore += parseInt(item.targetScore)
- }
- })
- averageScore = averageScore / 4
- this.historyCommentForm.averageScore = averageScore
- this.historyInfoLoading = false
+ let averageScore = 0
+ res.data.forEach(item => {
+ if (item.valueType === 'number'){
+ averageScore += parseInt(item.targetScore)
+ }
+ })
+ averageScore = averageScore / 4
+ this.historyCommentForm.averageScore = averageScore
+ }else {
+ this.historyCommentForm.averageScore = 0
+ }
+ this.historyInfoLoading = false
}, e => {
this.historyInfoLoading = false
})
@@ -2287,7 +2295,7 @@ export default {
_this: this
}, res => {
this.sarStandardsInfoEO = res.data || {}
- if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) {
+ if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/QCBFC') !== -1) {
this.QFTP = true
}
// this.textOptions.forEach(item => {
@@ -3029,18 +3037,8 @@ export default {
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
_this: this
}, res => {
- if(res.data && res.data.length > 0){
- let averageScore = 0
- res.data.forEach(item=>{
- item.targetScore = Number(item.targetScore)/2
- averageScore += item.targetScore
- })
- this.businessCommentForm.averageScore = averageScore/4
- this.businessCommentTable = res.data
this.historyInfoLoading = false
this.$forceUpdate()
- }
-
}, e => {
this.historyInfoLoading = false
})
@@ -3141,9 +3139,11 @@ export default {
this.$http.get('sarEnterpriseStandardEvaluation/evaluation-index/getEvaluationIndex', {indexType:this.indexType}, {
_this: this
}, res => {
- this.businessCommentTable = res.data
- console.log(this.businessCommentTable)
- this.$forceUpdate()
+
+ if(res.data){
+ this.businessCommentTable = res.data
+ this.$forceUpdate()
+ }
}, e => {
})
this.sarStandardsInfoEO.id = this.$route.params.id
@@ -3445,8 +3445,8 @@ export default {
width: calc(~'100% - 225px');
& > .files-title{
width: calc(~'100% - 120px');
- min-height: 50px;
- line-height: 50px;
+ min-height: 32px;
+ line-height: 32px;
font-size: 16px;
color: #409EFF;
& > a{
diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue
index 7745be664..4c3b9b96d 100644
--- a/src/pages/details/otherLawsStandDetails/index.vue
+++ b/src/pages/details/otherLawsStandDetails/index.vue
@@ -3,7 +3,7 @@
@@ -40,27 +40,27 @@
-
{{ sarStandardsInfoEO.lawsNumber }}
-
{{ sarStandardsInfoEO.lawsNo || '-' }}
-
{{ sarStandardsInfoEO.lawsName || '-' }}
+
{{ sarStandardsInfoEO.lawsType }}
+
{{ sarStandardsInfoEO.lawsNumber }}
+
{{ sarStandardsInfoEO.lawsName || '-' }}
{{ sarStandardsInfoEO.lawsEnName || '-' }}
{{ sarStandardsInfoEO.issueTime || '-' }}
{{ sarStandardsInfoEO.issueCompany || '-' }}
-
{{ sarStandardsInfoEO.issueCompany || '-' }}
-
{{ sarStandardsInfoEO.commentCycleStart || '' }} - {{sarStandardsInfoEO.commentCycleEnd || ''}}
+
{{ formatDateFunc(sarStandardsInfoEO.commentCycleStart) || '' }} - {{formatDateFunc(sarStandardsInfoEO.commentCycleEnd) || ''}}
{{ sarStandardsInfoEO.standStatusShow || '-' }}
+ title=""
+ >文本状态{{ sarStandardsInfoEO.standStatusShow || '-' }}
{{ sarStandardsInfoEO.lawsBulletin || '-' }}
{{ sarStandardsInfoEO.lawsSyqy || '-' }}
{{ sarStandardsInfoEO.lawsSycx || '-' }}
-
{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}
-
{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}
-
{{ sarStandardsInfoEO.lawsYear || '-' }}
-
{{ sarStandardsInfoEO.lawsLabel || '-' }}
-
{{ sarStandardsInfoEO.lawsRemark || '-' }}
+
{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}
+
{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}
+
{{ sarStandardsInfoEO.lawsNo || '-' }}
+
{{ sarStandardsInfoEO.lawsYear || '-' }}
+
{{ sarStandardsInfoEO.lawsLabel || '-' }}
+
{{ sarStandardsInfoEO.lawsRemark || '-' }}
@@ -112,6 +112,15 @@
+
+
+
+ {{ item }}
+
+
+ -
+
{
- if (res.ok) {
- let name = ''
- let pageType = ''
- const standType = res.data.standType || 'BUSINESS'
- switch (standType) {
- case 'INLAND':
- name = 'OtherStandardDetails'
- pageType = 'INLAND_STAND'
- break
- case 'FOREIGN':
- name = 'OtherStandardDetails'
- pageType = 'FOREIGN_STAND'
- break
- case 'BUSINESS':
- name = 'OtherBussStandardDetails'
- pageType = 'BUSINESS_STAND'
- break
- }
+ if (res.ok && res.data) {
+ let name = 'OtherLawsStandDetails'
+ let pageType = 'FOREIGN_LAWS'
let routeUrl = this.$router.resolve({
name: name,
params: {
@@ -1678,8 +1679,6 @@ export default {
}
})
window.open(routeUrl.href, '_blank')
- } else {
- this.$message.error(res.message)
}
}, e => {
})
@@ -2015,7 +2014,7 @@ export default {
relateEvent () {
this.$http.get('lawss/sarUpdLog/getLogList', {
sarId: this.$route.params.id,
- sarType: 'BUSINESS'
+ sarType: 'FOREIGN_LAWS'
}, {
_this: this
}, res => {
@@ -2392,7 +2391,7 @@ export default {
min-height: 50px;
line-height: 50px;
font-size: 16px;
- color: #999999;
+ /*color: #999999;*/
word-break: break-all;
//overflow: hidden;
//white-space: nowrap;
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 384b80992..b785040db 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -64,15 +64,15 @@
sarStandardsInfoEO.standEnName || '-'
}}
-
-
+
+
-
+
+
+
+
+
+
+
+
@@ -273,7 +272,7 @@ export default {
this.$http.get('person/personCollect/page', {
pageNo: this.page,
pageSize: this.$store.getters.userInfo.configContent,
- modeType: 'LAWS_STAND',
+ modeType: 'FOREIGN_LAWS',
collectTitle: this.search.collectionLaws,
userId: this.$store.getters.userInfo.userId
}, {
diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
index eff67e633..dab85f964 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
@@ -139,7 +139,8 @@ export default {
pageNo: this.page,
pageSize: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId,
- collectTitle: this.search.name
+ collectTitle: this.search.name,
+ modeType: 'INLAND_STAND,FOREIGN_STAND,BUSINESS_STAND'
}, {
_this: this,
loading: 'loading'
diff --git a/src/pages/policyRegulation/index.vue b/src/pages/policyRegulation/index.vue
new file mode 100644
index 000000000..c75eca2c9
--- /dev/null
+++ b/src/pages/policyRegulation/index.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/policyRegulation/nationalPolicy/index.vue b/src/pages/policyRegulation/nationalPolicy/index.vue
new file mode 100644
index 000000000..e6fc85096
--- /dev/null
+++ b/src/pages/policyRegulation/nationalPolicy/index.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/policyRegulation/policyWorkGroup/index.vue b/src/pages/policyRegulation/policyWorkGroup/index.vue
new file mode 100644
index 000000000..2dd70eb39
--- /dev/null
+++ b/src/pages/policyRegulation/policyWorkGroup/index.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+ 政策工作组
+
+
+
+ 工作组统计
+
+
+
+
+
diff --git a/src/pages/policyRegulation/problemControl/index.vue b/src/pages/policyRegulation/problemControl/index.vue
new file mode 100644
index 000000000..2d0ce2e2c
--- /dev/null
+++ b/src/pages/policyRegulation/problemControl/index.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
diff --git a/src/pages/policyRegulation/standardTrackingList/index.vue b/src/pages/policyRegulation/standardTrackingList/index.vue
new file mode 100644
index 000000000..12b8507a8
--- /dev/null
+++ b/src/pages/policyRegulation/standardTrackingList/index.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
index b2636852d..fea768a4a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
@@ -575,7 +575,14 @@
if (valid) {
this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', {
- type: '2'
+ createUser: this.$store.getters.userInfo.userId,
+ createUserName: this.$store.getters.userInfo.userName,
+ type: '2',
+ json: JSON.stringify({
+ form: this.form,
+ roleForm: this.roleForm,
+ commentText1: this.commentText1
+ })
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index f96bd01c6..1619e062f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -14,6 +14,7 @@
@@ -568,14 +569,17 @@
itemsName1: '',
oldNumber: ''
},
- formRules: {
- itemsNum: [
- { required: true, message: '请输入标准号/政策号', trigger: 'change' },
- ],
- itemsName: [
- { required: true, message: '请输入标准名称/政策名称', trigger: 'change' },
- ],
- },
+ formRules: {
+ itemsNum: [
+ {required: true, message: '请输入标准号/政策号', trigger: 'change'},
+ ],
+ itemsName: [
+ {required: true, message: '请输入标准名称/政策名称', trigger: 'change'},
+ ],
+ endTime: [
+ {required: true, message: '请输入截止时间', trigger: 'change'},
+ ],
+ },
// 标准征求意见数据可库
standCommonlySearch: {
numOrName: '',
@@ -1103,7 +1107,16 @@
} else {
this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', {
- type: '9'
+ createUser: this.$store.getters.userInfo.userId,
+ createUserName: this.$store.getters.userInfo.userName,
+ type: '9',
+ json: JSON.stringify({
+ form: this.form,
+ roleForm: this.roleForm,
+ commentText1: this.commentText1,
+ itemList: this.itemList,
+ sarType: this.sarType
+ })
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index f3e40a0db..6e0476ced 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -1112,7 +1112,6 @@ export default {
} else {
this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', {
- id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '9',
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index e4b81cf05..129867b83 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -500,7 +500,10 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ console.log(data);
this.form.itemsNum = data.itemsNum || data.form.itemsNum
+ this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
+ this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText2 = data.commentText2 || ''
this.form.endTime = data.endTime || data.form.endTime
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 9d413ce8b..2a113aaf8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -905,6 +905,8 @@
this.AOLIGEI = data.AOLIGEI
this.commentText3 = data.commentText3 || ''
this.todoId = res.id
+ this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
+ this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
if (data.form) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 0ed030c01..a73dec473 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -486,6 +486,8 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.endTime = data.endTime || data.form.endTime
+ this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
+ this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText4 = data.commentText4 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index effb025f2..3ba94cc91 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -442,6 +442,8 @@
var json = this.json
json.zrApplyFlag = 1
json.commentText = this.commentText5
+ json.deptUserId = this.form.deptUserId
+ json.deptUserIdName = this.form.deptUserIdName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -482,9 +484,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ console.log(data);
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
+ this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
+ this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.commentText5 = data.commentText5 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 82b76cca8..e95490ffc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -486,6 +486,8 @@
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
+ this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
+ this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.commentText6 = data.commentText6 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
index 5238e9904..2e5b490eb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
@@ -533,6 +533,10 @@ export default {
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
+ qualityEngineer: '',
+ qualityEngineerName: '',
+ certifiedEngineer: '',
+ certifiedEngineerName: '',
fileType: "",
subFlag: 0,
projectSearch: {
@@ -698,11 +702,16 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
- item.commentText = ''
+ console.log(item);
this.$nextTick(() => {
if(item.form){
this.hisListForm = JSON.parse(JSON.stringify(item.form))
this.listForm = JSON.parse(JSON.stringify(item.form))
+ if(item.taskInfo === '被驳回之后的保存'){
+ this.commentText = item.commentText
+ }else{
+ this.commentText = ''
+ }
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
@@ -731,6 +740,10 @@ export default {
this.roleForm.dockUserName = item.dockUserName
this.roleForm.ministerUser = item.ministerUser
this.roleForm.ministerUserName = item.ministerUserName
+ this.certifiedEngineer = item.certifiedEngineer
+ this.certifiedEngineerName = item.certifiedEngineerName
+ this.qualityEngineerName = item.qualityEngineerName
+ this.qualityEngineer = item.qualityEngineer
this.submitFlag = '修改节点'
this.dataList.distributePerson = this.listForm.dataList[0].distributePerson
this.$http.get("SarStandItems/sar-stand-items/getFileType", {
@@ -897,6 +910,7 @@ export default {
this.saveLoading = true;
this.listForm.dataList = this.dataList
let _formData = new FormData();
+ _formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.uName);
_formData.append("prcType", "5");
@@ -920,7 +934,7 @@ export default {
_formData.append("taskIds", this.taskIds);
_formData.append("prcType", "5");
_formData.append("json", JSON.stringify({
- taskInfo: "选择已拆分标准",
+ taskInfo: "被驳回之后的保存",
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
@@ -1020,7 +1034,12 @@ export default {
commentText: this.commentText
}
};
- let json = this.hisListForm
+ this.listForm.dataList = this.dataList
+ this.listForm.qualityEngineer = this.qualityEngineer ? this.qualityEngineer : this.listForm.qualityEngineer
+ this.listForm.qualityEngineerName = this.qualityEngineerName ? this.qualityEngineerName : this.listForm.qualityEngineerName
+ this.listForm.certifiedEngineer = this.certifiedEngineer ? this.certifiedEngineer : this.listForm.certifiedEngineer
+ this.listForm.certifiedEngineerName = this.certifiedEngineerName ? this.certifiedEngineerName : this.listForm.certifiedEngineerName
+ let json = this.listForm
this.$http.post("lawss/activiti/completeTaskNew", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
index 21fccdec3..feaa57105 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
@@ -262,6 +262,9 @@
+
+
如果各项目符合法规情况相同,可同时勾选,第一个勾选项目合规排查结果,将代表所有勾选项目合规排查结果。
+
+
基础信息
@@ -817,7 +817,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,
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 94a2cc0be..b2a164b55 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -43,7 +43,7 @@
@@ -161,12 +161,12 @@
clearable
>
-
-
+
+
-
+
{{ item.name }}
@@ -314,7 +314,7 @@
clearable
>
-
+
{{ item.name }}
@@ -339,7 +339,7 @@
clearable
>
-
+
{{ item.name }}
@@ -364,7 +364,7 @@
clearable
>
-
+
{{ item.name }}
@@ -389,7 +389,7 @@
clearable
>
-
+
{{ item.name }}
@@ -416,7 +416,7 @@
clearable
>
-
+
{{ item.name }}
@@ -441,7 +441,7 @@
clearable
>
-
+
{{ item.name }}
@@ -468,7 +468,7 @@
clearable
>
-
+
{{ item.name }}
@@ -493,7 +493,7 @@
clearable
>
-
+
{{ item.name }}
@@ -518,7 +518,7 @@
clearable
>
-
+
{{ item.name }}
@@ -1059,6 +1059,8 @@
{
+ this.$refs.form.validateField('treeListName')
+ })
this.modalShowTree = false
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 7efec8e8c..8adb96b92 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -128,8 +128,8 @@
-
-
+
+
-
+
@@ -1375,6 +1375,8 @@
{
+ this.$refs.form.validateField('treeListName')
+ })
this.modalShowTree = false
}
@@ -2934,7 +2949,9 @@ export default {
this.modelFunc()
},
watch: {
-
+ 'form.treeListName'(val) {
+ console.log(this.form.treeListName)
+ },
'form.country': {
handler(val) {
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index 91b471bb3..90225c661 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -39,7 +39,6 @@
@@ -662,13 +661,14 @@ export default {
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
+ console.log(mes);
this.bpnId = this.$route.query.bpnId
if (mes.form.endTime) {
mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
} else {
mes.form.endTime = ''
}
- this.addFjList = mes.filesId
+ this.addFjList = mes.filesId || mes.form.filesId || ''
this.form.fjListName = mes.filesName
this.form = mes.form
this.roleForm = mes.roleForm
@@ -879,6 +879,7 @@ export default {
handleSave () {
this.saveLoading = true
let _formData = new FormData()
+ this.form.filesId = this.addFjList
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index 0b87159c2..a80b09eba 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -169,19 +169,6 @@
-
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 7471c5d4d..8e90c9433 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -37,7 +37,6 @@
disabled
v-model="form.endTime"
type="date"
- value-format="yyyy-MM-dd"
placeholder="请选择结束日期">
@@ -206,6 +205,7 @@ export default {
data() {
return {
commentText2: '',
+ onlyKey: '',
drawerModal: false,
histortData: [],
commentText: "",
@@ -330,6 +330,7 @@ export default {
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
+ this.form.onlyKey = this.onlyKey
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
@@ -350,9 +351,12 @@ export default {
if (valid) {
this.isSubmit = true;
var json = this.json;
+ json.onlyKey = this.onlyKey
json.commentText = this.commentText2;
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
+ json.presidentUser = this.form.presidentUser
+ json.presidentUserName = this.form.presidentUserName
json.introduce = false;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
@@ -377,7 +381,12 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
this.commentText2 = data.commentText2 || ''
+ this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+ this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
+ this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
+ this.form.startUser = data.form ? data.form.startUser : data.startUser
this.form.cid = data.form ? data.form.cid : data.cid
this.form.endTime = data.form ? data.form.endTime : data.endTime
this.form.fjList = data.form ? data.form.fjList : data.fjList
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index bcaf57f6f..7289b73bc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -35,7 +35,6 @@
@@ -701,9 +700,13 @@
this.submitShow = true
}
this.commentText3 = data.commentText3 || ''
+ this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+ this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
this.form.textType = data.form ? data.form.textType : data.textType
+ this.form.startUser = data.form ? data.form.startUser : data.startUser
+ this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
this.form.cid = data.form ? data.form.cid : data.cid
this.form.endTime = data.form ? data.form.endTime : data.endTime
this.todoId = res.id
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index 2842bf7de..2ced168e3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -34,7 +34,6 @@
{
if (valid) {
this.isSubmit = true
- var json = this.json
+ let json = this.json
+ json.info = this.data
json.commentText = this.commentText41
json.bzfgId = this.form.bzfgId
json.bzfgName = this.form.bzfgName
@@ -455,14 +455,16 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+ this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.commentText41 = data.commentText41 || ''
- this.form.bzfgId = data.startUser
- this.form.bzfgName = data.startUserName
+ this.form.bzfgId = data.startUser || data.form.startUser
+ this.form.bzfgName = data.startUserName || data.form.startUserName
this.json = data
this.data = data.info || data.data
}).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
index 3f274da50..dfe399d15 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
@@ -37,7 +37,6 @@
disabled
v-model="form.endTime"
type="date"
- value-format="yyyy-MM-dd"
placeholder="请选择结束日期">
@@ -397,7 +396,8 @@
},
handleSubmit() {
this.isSubmit = true
- var json = this.json
+ let json = this.json
+ json.info = this.data
json.commentText = this.commentText42
json.bzFlag = '0'
this.$http.post('lawss/activiti/completeTask', {
@@ -440,6 +440,8 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
+ this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+ this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.commentText42 = data.commentText42 || ''
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 12eea8b0b..51c43b171 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -35,7 +35,6 @@
@@ -256,9 +255,11 @@
@@ -340,7 +341,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process'
+import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew, saveTaskForPub } from "api/process";
import axios from "axios";
export default {
@@ -348,6 +349,7 @@ export default {
data() {
return {
standId: '',
+ onlyKey: '',
modaltitle2: '',
addType: '',
commentText4: '',
@@ -616,14 +618,41 @@ export default {
handleTabs(name) {
this.active = name
},
+ //保存事件
+ handleSave() {
+ this.saveLoading = true;
+ let _formData = new FormData();
+ let json = this.json
+ json.info = this.data
+ json.onlyKey = this.onlyKey
+ json.spId = this.form.spId
+ json.spName = this.form.spName
+ _formData.append("id", this.bpnId || "");
+ _formData.append("prcType", "3");
+ _formData.append("taskIds", this.taskIds);
+ _formData.append("json", JSON.stringify({
+ form: json,
+ commentText4: this.commentText4
+ }));
+ console.log(json);
+ saveTaskForPub(_formData).then(res => {
+ this.saveLoading = false;
+ this.$message.success("保存成功");
+ this.bpnId = res.result;
+ }).catch(e => {
+ this.saveLoading = false;
+ });
+ },
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
- var json = this.json
+ let json = this.json
json.actionFlag = 0
json.commentText = this.commentText4
json.spId = this.form.spId
+ json.info = this.data
+ json.onlyKey = this.onlyKey
json.spName = this.form.spName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -668,6 +697,7 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ console.log(data);
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
@@ -676,18 +706,27 @@ export default {
this.acceptShow = false
this.submitShow = true
}
- this.commentText4 = data.commentText4 || ''
+ this.commentText4 = data.commentText4 || ''
+ if(data.onlyKey){
+ this.onlyKey = data.onlyKey
+ }else{
+ this.onlyKey = data.form.onlyKey
+ }
+ this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+ this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
+ this.form.spId = data.form ? data.form.spId : ''
+ this.form.spName = data.form ? data.form.spName : ''
+ this.form.startUser = data.form ? data.form.startUser : data.startUser
+ this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
- this.form.spId = data.spId || ''
- this.form.spName = data.spName || ''
- this.json = data
+ this.json = data.form ? data.form : data
this.standId = data.standId
this.getItemList(data.standId,data.textType)
- this.data = data.info || data.data
+ this.data = data.info || data.form.info
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 8a1e1a8cc..97f4abc32 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -351,6 +351,7 @@
return {
clickFlag: false,
commentText5: '',
+ onlyKey: '',
options: [],
itemId: '',
modalshowflag2: false,
@@ -557,6 +558,7 @@
let _formData = new FormData();
let json = this.form;
json.data = this.data;
+ json.onlyKey = this.onlyKey
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
@@ -593,6 +595,7 @@
this.isSubmit = true;
var json = this.json;
json.oldinfo = this.oldData;
+ json.onlyKey = this.onlyKey
json.commentText = this.commentText5;
json.introduce = true;
this.$http.post("lawss/activiti/completeTask", {
@@ -617,13 +620,25 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
- console.log(data);
this.commentText5 = data.commentText5 || ''
+ this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
+ this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+ this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
this.form.textType = data.form ? data.form.textType : data.textType
this.form.cid = data.form ? data.form.cid : data.cid
this.form.endTime = data.form ? data.form.endTime : data.endTime
+ this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
+ endTime: this.form.endTime
+ }, {}, res => {
+ //返回0 流程未到截止日期 不能进行操作
+ if (res.message === '0') {
+ this.clickFlag = false
+ } else {
+ this.clickFlag = true
+ }
+ })
let newArr = data.info ? data.info : data.form.data
newArr.forEach(item => {
if (!item.source) {
@@ -637,16 +652,6 @@
this.json = data;
this.getItemList(data.standId,this.form.textValue)
this.data = newArr
- this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
- endTime: this.form.endTime
- }, {}, res => {
- //返回0 流程未到截止日期 不能进行操作
- if (res.message === '0') {
- this.clickFlag = false
- } else {
- this.clickFlag = true
- }
- })
if (data.introduce) {
} else {
this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 36a6218ce..94c00c6a9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -530,6 +530,8 @@
}).then(res => {
let data = JSON.parse(res.mesg);
this.commentText6 = data.commentText6 || ''
+ this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+ this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index c44978deb..dbd5afef8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -491,6 +491,8 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText7 = data.commentText7 || ''
+ this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+ this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
@@ -500,7 +502,7 @@ export default {
this.oldData = JSON.parse(JSON.stringify(newArr))
let arr = []
newArr.forEach(item => {
- if (item.state != '3') {
+ if (item.state !== '3') {
arr.push(item)
}
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index fef5ad6d0..36b705625 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -491,6 +491,8 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText8 = data.commentText8 || ''
+ this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+ this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 1a39fa879..9b62938e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -491,6 +491,8 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText9 = data.commentText9 || ''
+ this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+ this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
index 4cd0deff1..dd91a649a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
@@ -44,7 +44,7 @@
{{scope.$index + 1}}
@@ -52,14 +52,14 @@
+ min-width="150">
{{ scope.row.standCode | ellipsis }}
+ min-width="300">
{{ scope.row.standName | ellipsis }}
@@ -67,7 +67,7 @@
+ min-width="120">
{{ scope.row.qcdw | ellipsis2 }}
@@ -75,7 +75,7 @@
+ min-width="120">
{{ scope.row.qcrbuss | ellipsis2 }}
@@ -83,19 +83,19 @@
+ min-width="120">
{{ formatIssueDate(scope.row.issueTime)}}
+ min-width="120">
{{ formatIssueDate(scope.row.reviewTime) }}
+ min-width="100">
{{ filterOp(scope.row.reviewResults) }}
@@ -103,7 +103,7 @@
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
index 3d9de8452..103c34cd5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
@@ -145,11 +145,11 @@
clearable
>
-
+
- {{ item.name | ellipsis2 }}
-
-
+ {{ item.name }}
+
+
@@ -173,11 +173,11 @@
clearable
>
-
+
- {{ item.name | ellipsis2 }}
-
-
+ {{ item.name }}
+
+
@@ -203,11 +203,11 @@
clearable
>
-
+
- {{ item.name | ellipsis2 }}
-
-
+ {{ item.name }}
+
+
@@ -231,11 +231,11 @@
clearable
>
-
+
- {{ item.name | ellipsis2 }}
-
-
+ {{ item.name }}
+
+
@@ -372,11 +372,11 @@
clearable
>
-
+
- {{ item.name | ellipsis2 }}
-
-
+ {{ item.name }}
+
+
@@ -979,5 +979,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue
index 3f9d68ea1..b3f630612 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue
@@ -127,10 +127,10 @@
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -139,10 +139,10 @@
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -153,10 +153,10 @@
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -165,10 +165,10 @@
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -267,10 +267,10 @@
>
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -682,5 +682,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
index 72c0b65f6..ae15de933 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
@@ -125,10 +125,10 @@
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -137,10 +137,10 @@
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -151,10 +151,10 @@
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -163,10 +163,10 @@
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -265,10 +265,10 @@
>
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -685,5 +685,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index fafd2a81e..a3119788b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -183,7 +183,7 @@
clearable
>
-
+
@@ -207,7 +207,7 @@
clearable
>
-
+
@@ -232,7 +232,7 @@
clearable
>
-
+
@@ -255,7 +255,7 @@
clearable
>
-
+
@@ -395,7 +395,7 @@
clearable
>
-
+
@@ -801,7 +801,7 @@
label="文本状态"
width="130">
- {{ textStatusMap[scope.row.textStatusBuss] }}
+ {{ scope.row.standStatusShow }}
@@ -902,17 +902,19 @@
+ size="small"
+ @click="handleSearchStandard">
+ 查询
+
+
+ size="small"
+ @click="handleResetSearch">清空
+
@@ -1555,6 +1557,7 @@
return data
},
getStandInfoByReviseStatus(type) {
+ debugger
let date = new Date();
let year = date.getFullYear();
if(this.form.standStatus === '2'){
@@ -1588,6 +1591,7 @@
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.LSBBBUSSFileList = []
if(this.LSBBBUSSFileList && this.LSBBBUSSFileList.length > 0){
+ console.log(this.form.FBGBUSS)
this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
}else {
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -1599,6 +1603,7 @@
this.FBGBUSSName = ""
}
this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
+ console.log(this.LSBBBUSSFileList)
this.form.LSBBBUSS = this.form.FBGBUSS
this.form.LSBBBUSSName = this.form.FBGBUSSName
this.FBGBUSSFileList= []
@@ -1955,10 +1960,13 @@
assemble(ids,names){
let list= new Array();
if(ids && ids !== '' && names && names !== ''){
+ ids = ids.replaceAll(',,',',')
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i
{
if(res && res.data){
const bringData = res.data
-
+ this.FBGBUSSFileList=[]
+ this.BZSMBUSSFileList=[]
+ this.LSBBBUSSFileList=[]
+ this.QTWJBUSSFileList=[]
+ this.GLWJBUSSFileList=[]
+ this.XGDFileList=[]
const json = Object.assign(bringData, bringData.attrInfoMap);
this.form = JSON.parse(JSON.stringify(json))
this.form.prcNum = this.prcNum
@@ -2071,6 +2084,10 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+ this.form.XCSJBUSS = this.dateFormatter()
+ this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+ this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+ this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.standardDrawer = false
this.verifySarStandard = true
this.getStandInfoByReviseStatus('dr')
@@ -2963,18 +2980,20 @@
_this: this
}, res => {
if (res.success) {
- this.$message.success(res.message)
+ this.submitLoading = false
this.isSubmit = false
- // if (this.$route.query.bpnId !== '') {
- // let taskId = {
- // id: this.$route.query.bpnId
- // }
- // taskDel(taskId).then(res=>{
- // return res
- // })
- // }
+ if (this.$route.query.bpnId !== '') {
+ let taskId = {
+ id: this.$route.query.bpnId
+ }
+ taskDel(taskId).then(res=>{
+ return res
+ })
+ }
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } else {
+ this.$message.warning(res.data)
}
})
}
@@ -3059,6 +3078,9 @@
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
index b7b32187e..770305aa8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
@@ -99,10 +99,10 @@
-
-
{{ item.name | ellipsis2 }}
-
-
+
+ {{ item.name }}
+
+
@@ -111,10 +111,10 @@
-
-
{{ item.name | ellipsis2 }}
-
-
+
+ {{ item.name }}
+
+
@@ -125,10 +125,10 @@
-
-
{{ item.name | ellipsis2 }}
-
-
+
+ {{ item.name }}
+
+
@@ -137,10 +137,10 @@
-
-
{{ item.name | ellipsis2 }}
-
-
+
+ {{ item.name }}
+
+
@@ -283,10 +283,10 @@
-
-
{{ item.name | ellipsis2 }}
-
-
+
+ {{ item.name }}
+
+
@@ -428,11 +428,11 @@
-
-
{{ item.name | ellipsis22 }}
-
-
-
+
+ {{ item.name }}
+
+
+
@@ -671,5 +671,7 @@ export default {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
index 37ab0d64a..ddcacb8c7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
@@ -110,10 +110,10 @@
-
-
{{ item.name | ellipsis2 }}
-
-
+
+ {{ item.name }}
+
+
@@ -122,10 +122,10 @@
-
-
{{ item.name | ellipsis2 }}
-
-
+
+ {{ item.name }}
+
+
@@ -136,10 +136,10 @@
-
-
{{ item.name | ellipsis2 }}
-
-
+
+ {{ item.name }}
+
+
@@ -148,10 +148,10 @@
-
-
{{ item.name | ellipsis2 }}
-
-
+
+ {{ item.name }}
+
+
@@ -293,10 +293,10 @@
-
-
{{ item.name | ellipsis2 }}
-
-
+
+ {{ item.name }}
+
+
@@ -438,10 +438,10 @@
-
-
{{ item.name | ellipsis22 }}
-
-
+
+ {{ item.name }}
+
+
@@ -681,5 +681,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 927d8ad27..ddbbdeaad 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -144,7 +144,7 @@
clearable
>
-
+
@@ -168,7 +168,7 @@
clearable
>
-
+
@@ -193,7 +193,7 @@
clearable
>
-
+
@@ -216,7 +216,7 @@
clearable
>
-
+
@@ -423,7 +423,7 @@
clearable
>
-
+
@@ -791,7 +791,7 @@
label="文本状态"
width="130">
- {{ textStatusMap[scope.row.textStatusBuss] }}
+ {{ scope.row.standStatusShow }}
@@ -2537,7 +2537,12 @@
},
// 文件预览及下载
handleFilePreview(file) {
- const attId = file.response.data.id
+ let attId = ""
+ if(file && file.id){
+ attId = file.id
+ }else {
+ attId = file.response.data.id
+ }
if (this.preview) {
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
@@ -3047,6 +3052,9 @@
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index e8648d358..fa1fe072f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -736,7 +736,8 @@ export default {
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
- this.qblx_pageData = mes.qblx_pageData
+ this.qblx_pageData = mes.form ? mes.form : mes.qblx_pageData
+ this.fileInfoList = mes.form ? mes.form.qblxFile : mes.qblx_pageData.qblxFile
this.commentText = mes.commentText
this.roleForm = mes.roleForm
});
@@ -925,7 +926,7 @@ export default {
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
- _formData.append("id", this.bpnId || "");
+ this.qblx_pageData.qblxFile = this.fileInfoList
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "26");
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index 597c94aa6..16e3def2b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -23,7 +23,7 @@
:maxlength="500"/>
-
+
{{ item.name }}
@@ -538,7 +538,6 @@
+ placeholder="查询责任部门"
+ @click.native="choiceZRBM('ZRBMId', '查询责任部门', queryUnqualidiedData.responsibleUnit)">
@@ -317,6 +319,12 @@
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
+
-
-
-
-
-
-
-
-
@@ -407,7 +394,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: space-between;
- height: calc(~'100% - 103px');
+ height: calc(~'100% - 53px');
overflow: auto;
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue
index 7b845f766..8b2a545fa 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue
@@ -174,21 +174,6 @@
>
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 1e3af279e..9c95ed934 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -3,7 +3,7 @@
项目合规评估流程 - 项目
- 发起流程
+ 起草
@@ -825,8 +809,8 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
- id: item.id,
- pageType: "INLAND_STAND"
+ id: item.id || item.standId,
+ pageType: item.standType + '_STAND'
}
});
window.open(routeUrl.href, "_blank");
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index a2415001b..8138cfef5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -512,7 +512,7 @@
width="150"
label="新车型实施日期">
- {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
{{ scope.row.xcxssrq }}
@@ -521,7 +521,7 @@
width="150"
label="在产车实施日期">
- {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
{{ scope.row.zccssrq }}
@@ -925,8 +925,8 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
- id: item.id,
- pageType: "INLAND_STAND"
+ id: item.id || item.standId,
+ pageType: item.standType + '_STAND'
}
});
window.open(routeUrl.href, "_blank");
@@ -1262,8 +1262,8 @@ export default {
if(item.zrbm === '[]'){
item.zrbm = ''
}
- this.$set(item, 'zccssrq', item.zccssrqgj)
- this.$set(item, 'xcxssrq', item.xcxssrqgj)
+ this.$set(item, 'zccssrq', item.zccssrqgj || item.zccssrq)
+ this.$set(item, 'xcxssrq', item.xcxssrqgj || item.xcxssrq)
})
});
},
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index f423ef050..4c6689c4e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -832,8 +832,8 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
- id: item.id,
- pageType: "INLAND_STAND"
+ id: item.id || item.standId,
+ pageType: item.standType + '_STAND'
}
});
window.open(routeUrl.href, "_blank");
@@ -919,7 +919,9 @@ export default {
//提交事件
handleSubmit() {
this.dataList.forEach(item => {
- this.$set(item, 'standId', item.id)
+ if(!item.standId){
+ this.$set(item, 'standId', item.id)
+ }
})
this.isSubmit = true;
this.qdform.commentText = this.commentText;
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index 59ed78827..622a7657e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -832,8 +832,8 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
- id: item.id,
- pageType: "INLAND_STAND"
+ id: item.id || item.standId,
+ pageType: item.standType + '_STAND'
}
});
window.open(routeUrl.href, "_blank");
@@ -919,7 +919,9 @@ export default {
//提交事件
handleSubmit() {
this.dataList.forEach(item => {
- this.$set(item, 'standId', item.id)
+ if(!item.standId){
+ this.$set(item, 'standId', item.id)
+ }
})
this.isSubmit = true;
this.qdform.commentText = this.commentText;
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index 26f79189d..ef94c6db9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -824,8 +824,8 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
- id: item.id,
- pageType: "INLAND_STAND"
+ id: item.id || item.standId,
+ pageType: item.standType + '_STAND'
}
});
window.open(routeUrl.href, "_blank");
@@ -891,7 +891,9 @@ export default {
//提交事件
handleSubmit() {
this.dataList.forEach(item => {
- this.$set(item, 'standId', item.id)
+ if(!item.standId){
+ this.$set(item, 'standId', item.id)
+ }
})
this.isSubmit = true;
this.qdform.commentText = this.commentText;
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index 65862a3d8..2644b1e7f 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -34,10 +34,10 @@
>
-
+
@@ -63,12 +63,14 @@
+ start-placeholder="起始时间"
+ end-placeholder="结束时间"
+ value-format="yyyy-MM-dd"
+ :picker-options="pickerOptions">
@@ -96,10 +98,10 @@
clearable
>
-
+
@@ -200,32 +202,47 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -267,7 +284,7 @@
clearable
>
-
+
@@ -277,7 +294,7 @@
size="mini"
@click="fileUpload('ZCWBLAWS')"
style="margin-left: 10px; margin-top: 11px; float: right;">
-
+
@@ -290,7 +307,7 @@
clearable
>
-
+
@@ -300,7 +317,7 @@
size="mini"
@click="fileUpload('JDWJLAWS')"
style="margin-left: 10px; margin-top: 11px; float: right;">
-
+
@@ -315,7 +332,7 @@
clearable
>
-
+
@@ -325,7 +342,7 @@
size="mini"
@click="fileUpload('GCWBLAWS')"
style="margin-left: 10px; margin-top: 11px; float: right;">
-
+
@@ -339,14 +356,14 @@
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
+ {{'手动查找'}}
-
+
@@ -465,7 +482,7 @@
size="mini"
@click="fileUpload('GLWJLAWS')"
style="margin-left: 10px; margin-top: 11px; float: right;">
-
+
@@ -510,6 +527,19 @@
+
+
+
+
+
@@ -553,7 +583,7 @@
政策业务经理
-
+
@@ -562,19 +592,6 @@
-
-
-
-
-
-
-
-
@@ -671,14 +688,14 @@
align="center">
+ label="政策编号">
{{ scope.row.lawsNumber }}
+ label="政策名称">
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ scope.row.standStatusShow }}
@@ -772,10 +789,10 @@
:maxlength="100"
@keyup.enter.native="handleSearchStandard"/>
-
+
@@ -847,7 +864,7 @@
新增
带入
取消
+ 正在加载数据
+
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue
index 8b66bd7b8..4146782a4 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue
@@ -178,6 +178,7 @@
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList"
+ :type="1"
>
@@ -307,7 +308,7 @@ export default {
institutionIdList += ",";
institutionNameList += ",";
}
- institutionIdList += item.institutionId;
+ institutionIdList += item.idList;
institutionNameList += item.institutionName;
});
//蛀掉的
@@ -326,7 +327,7 @@ export default {
this.form.responUserList = idList;
this.form.responUserListName = nameList;
-
+ console.log(institutionNameList, '???')
this.form.institutionNameValid = institutionNameList.split(',');
},
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
index af9724566..0a52064f1 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
@@ -144,12 +144,25 @@
+
+
+ 新增
+
+
+ 编辑
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -318,6 +614,194 @@
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.lawName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -332,6 +816,88 @@ export default {
name: "zdrzbzORzchgxxmscStep5",
data() {
return {
+ ruleForm: {
+ multipleTableData: [],
+ },
+ selectList: [],
+ multipleTableTitle: '',
+ multipleTableItemDialog: false,
+ multipleTableItemForm: {
+ id: '',
+ yewu: '',
+ pingtai: '',
+ xiangmu: '',
+ xiangmumiaoshu: '',
+ dangqianjiedian: '',
+ G0: '',
+ G1: '',
+ G2: '',
+ G3: '',
+ G4: '',
+ G5: '',
+ G6: '',
+ G7: '',
+ G8: '',
+ G9: '',
+ G10: '',
+ G11: '',
+ G12: '',
+ G13: '',
+ gainianzhuangtai: '',
+ gainianzhuangtaiDate: '',
+ gainianxiudingjihua: '',
+ qitashuoming: ''
+ },
+ multipleTableItemData: {
+ yewu: '',
+ pingtai: '',
+ xiangmu: '',
+ xiangmumiaoshu: '',
+ dangqianjiedian: '',
+ G0: '',
+ G1: '',
+ G2: '',
+ G3: '',
+ G4: '',
+ G5: '',
+ G6: '',
+ G7: '',
+ G8: '',
+ G9: '',
+ G10: '',
+ G11: '',
+ G12: '',
+ G13: '',
+ gainianzhuangtai: '',
+ gainianzhuangtaiDate: '',
+ gainianxiudingjihua: '',
+ qitashuoming: ''
+ },
+ multipleTableItemFormRules: {
+ yewu: { required: true, message: '请输入业务名称', trigger: 'blur' },
+ pingtai: { required: true, message: '请输入业务名称', trigger: 'blur' },
+ xiangmu: { required: true, message: '请输入业务名称', trigger: 'blur' },
+ xiangmumiaoshu: { required: false, message: '请输入业务名称', trigger: 'blur' },
+ dangqianjiedian: { required: false, message: '请输入业务名称', trigger: 'blur' },
+ G0: { required: true, message: '请选择时间', trigger: 'change' },
+ G1: { required: true, message: '请选择时间', trigger: 'change' },
+ G2: { required: true, message: '请选择时间', trigger: 'change' },
+ G3: { required: true, message: '请选择时间', trigger: 'change' },
+ G4: { required: true, message: '请选择时间', trigger: 'change' },
+ G5: { required: true, message: '请选择时间', trigger: 'change' },
+ G6: { required: true, message: '请选择时间', trigger: 'change' },
+ G7: { required: true, message: '请选择时间', trigger: 'change' },
+ G8: { required: true, message: '请选择时间', trigger: 'change' },
+ G9: { required: true, message: '请选择时间', trigger: 'change' },
+ G10: { required: true, message: '请选择时间', trigger: 'change' },
+ G11: { required: true, message: '请选择时间', trigger: 'change' },
+ G12: { required: true, message: '请选择时间', trigger: 'change' },
+ G13: { required: true, message: '请选择时间', trigger: 'change' },
+ gainianzhuangtai: { required: true, message: '请输入业务名称', trigger: 'blur' },
+ gainianzhuangtaiDate: { required: true, message: '请选择时间', trigger: 'change' },
+ gainianxiudingjihua: { required: true, message: '请输入业务名称', trigger: 'blur' },
+ qitashuoming: { required: false, message: '请输入业务名称', trigger: 'blur' }
+ },
infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "",
@@ -372,6 +938,136 @@ export default {
ProcessTitle
},
methods: {
+ // 多选逻辑
+ selectChange(data) {
+ this.selectList = [];
+ for (let i = 0; i < data.length; i++) {
+ this.selectList.push(data[i].id);
+ }
+ },
+ // 表格新增
+ cancelAdd() {
+ this.$refs.multipleTableItemRef.clearValidate()
+ this.multipleTableItemDialog = false
+ },
+ addFormItem() {
+ this.$refs.multipleTableItemRef.validate(valid => {
+ if (valid) {
+ console.log( this.ruleForm.multipleTableData, ' this.ruleForm.multipleTableData')
+ this.multipleTableItemForm.id = Date.parse(new Date())
+ var dataItem = JSON.parse(JSON.stringify(this.multipleTableItemForm))
+ this.ruleForm.multipleTableData.push(dataItem)
+ this.$message.success('新增成功')
+ this.$refs.multipleTableItemRef.clearValidate()
+ this.multipleTableItemDialog = false
+ }
+ })
+ },
+ committeeAdd() {
+ this.multipleTableItemForm = {
+ id: '',
+ yewu: '',
+ pingtai: '',
+ xiangmu: '',
+ xiangmumiaoshu: '',
+ dangqianjiedian: '',
+ G0: '',
+ G1: '',
+ G2: '',
+ G3: '',
+ G4: '',
+ G5: '',
+ G6: '',
+ G7: '',
+ G8: '',
+ G9: '',
+ G10: '',
+ G11: '',
+ G12: '',
+ G13: '',
+ gainianzhuangtai: '',
+ gainianzhuangtaiDate: '',
+ gainianxiudingjihua: '',
+ qitashuoming: ''
+ }
+ this.multipleTableItemFormRules = {
+ yewu: { required: true, message: '请输入业务名称', trigger: 'blur' },
+ pingtai: { required: true, message: '请输入业务名称', trigger: 'blur' },
+ xiangmu: { required: true, message: '请输入业务名称', trigger: 'blur' },
+ xiangmumiaoshu: { required: false, message: '请输入业务名称', trigger: 'blur' },
+ dangqianjiedian: { required: false, message: '请输入业务名称', trigger: 'blur' },
+ G0: { required: true, message: '请选择时间', trigger: 'change' },
+ G1: { required: true, message: '请选择时间', trigger: 'change' },
+ G2: { required: true, message: '请选择时间', trigger: 'change' },
+ G3: { required: true, message: '请选择时间', trigger: 'change' },
+ G4: { required: true, message: '请选择时间', trigger: 'change' },
+ G5: { required: true, message: '请选择时间', trigger: 'change' },
+ G6: { required: true, message: '请选择时间', trigger: 'change' },
+ G7: { required: true, message: '请选择时间', trigger: 'change' },
+ G8: { required: true, message: '请选择时间', trigger: 'change' },
+ G9: { required: true, message: '请选择时间', trigger: 'change' },
+ G10: { required: true, message: '请选择时间', trigger: 'change' },
+ G11: { required: true, message: '请选择时间', trigger: 'change' },
+ G12: { required: true, message: '请选择时间', trigger: 'change' },
+ G13: { required: true, message: '请选择时间', trigger: 'change' },
+ gainianzhuangtai: { required: true, message: '请输入业务名称', trigger: 'blur' },
+ gainianzhuangtaiDate: { required: true, message: '请选择时间', trigger: 'change' },
+ gainianxiudingjihua: { required: true, message: '请输入业务名称', trigger: 'blur' },
+ qitashuoming: { required: false, message: '请输入业务名称', trigger: 'blur' }
+ }
+ this.infoTableDatas.forEach((item, index) => {
+ this.multipleTableItemFormRules['infoTableData' + index] = { required: true, message: '请输入', trigger: 'blur' }
+ })
+ this.multipleTableTitle = '添加标准'
+ this.multipleTableItemDialog = true
+ this.$nextTick(_ => {
+ this.$refs.multipleTableItemRef.clearValidate()
+ })
+ },
+ // 表格编辑
+ editFormItem() {
+ this.$refs.multipleTableItemRef.validate(valid => {
+ if (valid) {
+ var dataItem = JSON.parse(JSON.stringify(this.multipleTableItemForm))
+ this.ruleForm.multipleTableData.forEach((item, index) => {
+ if (item.id === dataItem.id) {
+ item = dataItem
+ }
+ })
+ this.$message.success('编辑成功')
+ this.$refs.multipleTableItemRef.clearValidate()
+ this.multipleTableItemDialog = false
+ }
+ })
+ },
+ committeeEdit() {
+ if (this.selectList.length === 1) {
+ this.multipleTableTitle = '编辑标准'
+ this.ruleForm.multipleTableData.forEach((item, index) => {
+ if (item.id === this.selectList[0]) {
+ this.multipleTableItemForm = item
+ }
+ })
+ this.multipleTableItemDialog = true
+ } else {
+ this.$message.warning('最多选择一条数据编辑')
+ }
+ },
+ // 表格删除
+ committeeDel() {
+ if (this.selectList.length > 0) {
+ this.selectList.forEach((item1, index1) => {
+ this.ruleForm.multipleTableData.forEach((item, index) => {
+ if (item.id === item1) {
+ this.ruleForm.multipleTableData.splice(index, 1)
+ }
+ })
+ })
+ this.$message.success('删除成功')
+ } else {
+ this.$message.warning('至少选择一条数据')
+ }
+ },
handleTransfer() {
this.drawerModal = true
},
@@ -438,6 +1134,24 @@ export default {
handleTabs(name) {
this.active = name;
},
+ // 验证表格
+ validateTableData() {
+ let flag = false
+ this.ruleForm.multipleTableData.forEach((item1, index1) => {
+ for (let item in item1) {
+ if (item === 'xiangmumiaoshu' || item === 'dangqianjiedian' || item === 'qitashuoming') {
+ continue
+ } else {
+ if (item1[item] === '' || item1[item] === undefined || item1[item] === null) {
+ flag = true
+ this.$message.warning('请完善表格')
+ break
+ }
+ }
+ }
+ })
+ return flag
+ },
//保存事件
handleSave() {
this.saveLoading = true;
@@ -446,6 +1160,8 @@ export default {
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
+ ...this.json,
+ table: this.ruleForm.multipleTableData,
form: this.form,
commentText: this.commentText
}));
@@ -458,6 +1174,13 @@ export default {
});
},
handleSubmit() {
+ if (this.ruleForm.multipleTableData.length === 0) {
+ this.$message.warning('请至少填写一条数据')
+ return
+ }
+ if (this.validateTableData() && this.feedbackDept === '2') {
+ return
+ }
this.$refs["zdrzbzORzchgxxmscForm"].validate((valid) => {
if (valid) {
let infoTableDatas = []
@@ -466,6 +1189,8 @@ export default {
localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas))
var json = this.json;
json.infoTableDatas = infoTableDatas
+ json.table = this.ruleForm.multipleTableData
+ json.zerenren = this.$store.getters.userInfo.userId
json.commentText = this.commentText;
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
@@ -517,15 +1242,19 @@ export default {
this.getFormFieldList(processForm)
}
let data = JSON.parse(res.mesg)
+ console.log(data, 'data')
this.infoTableDatas = JSON.parse(data.infoTableDatas)
+ console.log(this.infoTableDatas, 'infoTableDatas')
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.json = data
+ if (typeof Array(data.table) && data.feedbackDept === '2') {
+ this.ruleForm.multipleTableData = data.table || []
+ }
this.feedbackDept = this.json.feedbackDept
- console.log('485',this.feedbackDept)
}).catch(e => {
});
});
@@ -536,7 +1265,7 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item));
- this.form.cid = item.form.cid
+ this.form.cid = item.cid
});
},
},
@@ -597,7 +1326,7 @@ export default {
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
- overflow: auto;
+ // overflow: auto;
.tableTitle {
margin-bottom: 10px;
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue
index a050ababd..162296f37 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue
@@ -104,87 +104,206 @@
+ type="index"
+ label="序号"
+ width="55"
+ align="center">
-
-
+ show-overflow-tooltip
+ prop="G0"
+ label="G0"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G1"
+ label="G1"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G2"
+ label="G2"
+ min-width="150"
+ align="center"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -294,6 +413,9 @@ export default {
name: "zdrzbzORzchgxxmscStep6",
data() {
return {
+ ruleForm: {
+ multipleTableData: [],
+ },
infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "",
@@ -482,6 +604,9 @@ export default {
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.json = data
+ if (typeof Array(data.table) && data.feedbackDept === '2') {
+ this.ruleForm.multipleTableData = data.table
+ }
this.feedbackDept = this.json.feedbackDept
console.log('485',this.feedbackDept)
}).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue
index ea2403bc3..cef48c012 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue
@@ -116,87 +116,206 @@
+ type="index"
+ label="序号"
+ width="55"
+ align="center">
-
-
+ show-overflow-tooltip
+ prop="G0"
+ label="G0"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G1"
+ label="G1"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G2"
+ label="G2"
+ min-width="150"
+ align="center"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -304,6 +423,9 @@ export default {
name: "zdrzbzORzchgxxmscStep7",
data() {
return {
+ ruleForm: {
+ multipleTableData: [],
+ },
infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "",
@@ -492,6 +614,9 @@ export default {
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.json = data
+ if (typeof Array(data.table) && data.feedbackDept === '2') {
+ this.ruleForm.multipleTableData = data.table
+ }
this.feedbackDept = this.json.feedbackDept
}).catch(e => {
});
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue
index b4f05a86e..ecc8640f3 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue
@@ -110,87 +110,206 @@
+ type="index"
+ label="序号"
+ width="55"
+ align="center">
-
-
+ show-overflow-tooltip
+ prop="G0"
+ label="G0"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G1"
+ label="G1"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G2"
+ label="G2"
+ min-width="150"
+ align="center"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -300,6 +419,9 @@ export default {
name: "zdrzbzORzchgxxmscStep8",
data() {
return {
+ ruleForm: {
+ multipleTableData: [],
+ },
infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "",
@@ -495,6 +617,9 @@ export default {
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.json = data
+ if (typeof Array(data.table) && data.feedbackDept === '2') {
+ this.ruleForm.multipleTableData = data.table
+ }
this.feedbackDept = this.json.feedbackDept
console.log('485',this.feedbackDept)
}).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue
index d210f04cb..dc4bcd13f 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue
@@ -110,87 +110,206 @@
+ type="index"
+ label="序号"
+ width="55"
+ align="center">
-
-
+ show-overflow-tooltip
+ prop="G0"
+ label="G0"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G1"
+ label="G1"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G2"
+ label="G2"
+ min-width="150"
+ align="center"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -300,6 +419,9 @@ export default {
name: "zdrzbzORzchgxxmscStep9",
data() {
return {
+ ruleForm: {
+ multipleTableData: [],
+ },
infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "",
@@ -509,6 +631,9 @@ export default {
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.json = data
+ if (typeof Array(data.table) && data.feedbackDept === '2') {
+ this.ruleForm.multipleTableData = data.table
+ }
this.feedbackDept = this.json.feedbackDept
console.log('485',this.feedbackDept)
}).catch(e => {
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index c04f90478..b94996be7 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -190,7 +190,7 @@
企业标准相关流程
-
+
@@ -205,7 +205,7 @@
-
+
diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue
index a4e6089c1..96be90b23 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue
@@ -3,7 +3,7 @@
标准调研流程
- 对接人选择责任人
+ 任务分发