-
-
-
- 删除
- 编辑
-
-
-
-
-
-
+
@@ -37,11 +37,11 @@
{{ children.title }}
@@ -58,9 +58,9 @@
{{ item.title }}
@@ -76,606 +76,569 @@
-
diff --git a/src/components/treeSelect/treeSelectModule.vue b/src/components/treeSelect/treeSelectModule.vue
index 4f5a0142d..30e0c8a03 100644
--- a/src/components/treeSelect/treeSelectModule.vue
+++ b/src/components/treeSelect/treeSelectModule.vue
@@ -177,7 +177,7 @@
if (node.level >= 1) {
setTimeout(() => {
- this.getChildByList(node.data.level,node.data.id, resolve);
+ this.getChildByList(node.data.level,node.data.id,node.data.model, resolve);
}, 500);
return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。
}
@@ -194,8 +194,8 @@
}
})
},
- getChildByList( level,id,resolve) { // 获取子节点请求
- let params = {level : level,id :id,type : this.type};
+ getChildByList( level,id,model,resolve) { // 获取子节点请求
+ let params = {level : level,id :id,type : this.type,model :model};
this.$http.get(this.urlChild, params, {
_this: this
}, res => {
diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue
index 71ea7a573..49ecb9778 100644
--- a/src/pages/config/pages/linkManage/index.vue
+++ b/src/pages/config/pages/linkManage/index.vue
@@ -1,393 +1,68 @@
-
+
+
+
-
-
-
- 加载中...
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.url }}
-
- {{ scope.row.url }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue
new file mode 100644
index 000000000..04cf53df1
--- /dev/null
+++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue
@@ -0,0 +1,566 @@
+
+
+
+
+
+
+ 加载中...
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue
new file mode 100644
index 000000000..f5c67b7fb
--- /dev/null
+++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue
@@ -0,0 +1,564 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{ '-' }}
+
+
+
+
+
+ {{ scope.row.url }}
+
+
+ {{ 'http://' + scope.row.url }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 8c64e0cd7..5ae648fb6 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -1,17 +1,16 @@
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{ '-' }}
+
+
+
+
+
+ {{ scope.row.url }}
+
+
+ {{ 'http://' + scope.row.url }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+ 编辑
+
+
+
+
+
+
+ 暂无评估结果
不满足
-
+
+ {{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}
+
@@ -56,19 +58,16 @@
-
满足
-
@@ -99,7 +98,6 @@
-
加载中...
@@ -166,12 +164,5 @@ export default {
//width: 1200px;
//margin: 0 auto;
height: 100%;
- .content{
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- height: calc(~'50% - 30px');
- overflow: auto;
- }
}
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index d215e83d8..cf109226c 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -22,6 +22,56 @@
style="border-top:none;position: absolute;right: 36px;">
+
+
+
-
+
{
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
+ this.uploadFileLength = this.ch_pageData.fileTextList.length
this.ch_pageData.myPartRole = [{
fillPeopleId: this.ch_pageData.fillPeopleId,
fillPeople: this.ch_pageData.fillPeople,
@@ -292,56 +294,64 @@ export default {
},
// 退回按钮
handleSubmitNo() {
- let json = {
- member: this.selfUser,
- passFlag: '0',
- roleList: this.roleForm,
- commentText: this.textarea,
- ch_pageData: this.ch_pageData,
- }
- this.$refs['ch_pageData'].validate((valid) => {
- if (valid) {
- this.isBack = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('退回成功')
- this.$router.push("/processCenter");
- }
- this.isBack = false
- });
+ if (this.textarea === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ member: this.selfUser,
+ passFlag: '0',
+ roleList: this.roleForm,
+ commentText: this.textarea,
+ ch_pageData: this.ch_pageData,
}
- })
+ this.$refs['ch_pageData'].validate((valid) => {
+ if (valid) {
+ this.isBack = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('退回成功')
+ this.$router.push("/processCenter");
+ }
+ this.isBack = false
+ });
+ }
+ })
+ }
},
// 提交按钮
handleSubmit() {
- let json = {
- member: this.selfUser,
- passFlag: '1',
- engineerSum: this.roleForm.startUser,
- roleList: this.roleForm,
- commentText: this.textarea,
- ch_pageData: this.ch_pageData,
- }
- this.$refs['ch_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.textarea === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ member: this.selfUser,
+ passFlag: '1',
+ engineerSum: this.roleForm.startUser,
+ roleList: this.roleForm,
+ commentText: this.textarea,
+ ch_pageData: this.ch_pageData,
}
- })
+ this.$refs['ch_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
index ee1c0f053..a8c3901ba 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
@@ -59,18 +59,18 @@
-
- {{ ch_pageData.sort || '-' }}
+ 计划内
+ 计划外
@@ -126,6 +126,19 @@
+
+ 企标评价
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
更新记录
@@ -987,6 +1037,19 @@ export default {
},
data () {
return {
+ targetScore: '',
+ businessCommentDialog: false,
+ businessCommentForm: {},
+ revise: '',
+ businessCommentTable: [{
+ commentTarget: '企业标准内容完整、要求合理（指标、流程等。）',
+ }, {
+ commentTarget: '企业标准便于实施应用',
+ }, {
+ commentTarget: '标准编写规范，内容清晰易理解',
+ }, {
+ commentTarget: '标准对我的实际工作很有帮助',
+ }],
activeNames: ['基础信息','过程稿件','实施日期'],
activeState: true,
visiblePlanCheck: false,
@@ -1194,6 +1257,9 @@ export default {
watch: {
},
methods: {
+ targetScoreChange(row){
+ console.log('1234',row)
+ },
child1Func(child1){
const list = []
if(child1 && child1.length > 1){
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index ebfc39406..dd9c0b8d1 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3,7 +3,10 @@
+
+
+
-
+
{
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+ this.infoSourcesLength = this.rh_pageData.infoSources.length
this.rh_pageData.myPartRole = [{
+ fillPeopleId: this.rh_pageData.fillPeopleId,
fillPeople: this.rh_pageData.fillPeople,
fillUnit: this.rh_pageData.fillUnit,
fillDept: this.rh_pageData.fillDept,
@@ -331,57 +334,73 @@ export default {
// 退回按钮
handleSubmitNo() {
- let json = {
- member: this.selfUser,
- passFlag: '0',
- roleList: this.roleForm,
- commentText: this.textarea,
- rh_pageData: this.rh_pageData,
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.isBack = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('退回成功')
- this.$router.push("/processCenter");
- }
- this.isBack = false
- });
+ if(this.textarea === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ member: this.selfUser,
+ passFlag: '0',
+ roleList: this.roleForm,
+ commentText: this.textarea,
+ rh_pageData: this.rh_pageData,
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isBack = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('退回成功')
+ this.$router.push("/processCenter");
+ }
+ this.isBack = false
+ });
+ }
+ })
+ }
+
},
// 提交按钮
handleSubmit() {
- let json = {
- member: this.selfUser,
- passFlag: '1',
- engineerSum: this.roleForm.startUser,
- roleList: this.roleForm,
- commentText: this.textarea,
- rh_pageData: this.rh_pageData,
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if(this.textarea === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ member: this.selfUser,
+ passFlag: '1',
+ engineerSum: this.roleForm.startUser,
+ roleList: this.roleForm,
+ commentText: this.textarea,
+ rh_pageData: this.rh_pageData,
}
- })
- }
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
+ },
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
index e8160495e..fae37b7b7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
@@ -15,18 +15,6 @@
-
-
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
@@ -75,6 +63,16 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
@@ -154,6 +152,19 @@
+
+
+
+
+
+
+
+
+
+
+
-
+
+ v-model="commentText">
@@ -217,7 +216,7 @@ export default {
ch_pageData: {},
ch_rules: {},
nodeList: [],
- textContent: '',
+ commentText: '',
isBack: false,
isSubmit: false,
@@ -228,6 +227,7 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+ uploadFileLength: ''
}
},
computed: {
@@ -272,61 +272,72 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
+ this.uploadFileLength = this.ch_pageData.fileTextList.length
this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
})
},
// 退回按钮
handleSubmitNo() {
- let json = {
- roleList: this.roleForm,
- memberId: this.$store.getters.userInfo.userId,
- passFlag: '0',
- commentText: this.textContent,
- ch_pageData: this.ch_pageData,
- }
- this.$refs['ch_pageData'].validate((valid) => {
- if (valid) {
- this.isBack = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('退回成功')
- this.$router.push("/processCenter");
- }
- this.isBack = false
- });
+ if (this.commentText === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ roleList: this.roleForm,
+ memberId: this.$store.getters.userInfo.userId,
+ passFlag: '0',
+ commentText: this.commentText,
+ ch_pageData: this.ch_pageData,
}
- })
+ this.$refs['ch_pageData'].validate((valid) => {
+ if (valid) {
+ this.isBack = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('退回成功')
+ this.$router.push("/processCenter");
+ }
+ this.isBack = false
+ });
+ }
+ })
+ }
+
},
// 提交按钮
handleSubmit() {
- let json = {
- roleList: this.roleForm,
- memberId: this.$store.getters.userInfo.userId,
- passFlag: '1',
- commentText: this.textContent,
- ch_pageData: this.ch_pageData,
- }
- this.$refs['ch_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.commentText === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ roleList: this.roleForm,
+ memberId: this.$store.getters.userInfo.userId,
+ passFlag: '1',
+ commentText: this.commentText,
+ ch_pageData: this.ch_pageData,
}
- })
+ this.$refs['ch_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
+
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
index 96acc61f8..d828e443a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
@@ -59,18 +59,18 @@
-
- {{ ch_pageData.sort || '-' }}
+ 计划内
+ 计划外
@@ -123,9 +123,10 @@
-
+
+
- {{ sarStandardsInfoEO.standSortShow || '' }} {{
+ {{ sarStandardsInfoEO.standSortShow || '' }} {{
+ sarStandardsInfoEO.standNumber
+ }} 《{{ sarStandardsInfoEO.standName }}》
+ {{ sarStandardsInfoEO.standSortShow || '' }} {{
sarStandardsInfoEO.standNumber
}}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》
@@ -46,7 +49,7 @@
-
+ +
{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear @@ -106,7 +109,7 @@ - {{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }} + {{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}
{{
sarStandardsInfoEO.issueTime || '-'
@@ -3599,13 +3602,14 @@ export default {
}
& > div:not(.modular-item-more) {
- /*border-bottom: 1px solid #E5E5E5;*/
+ //英文名称变粗
+ border-bottom: 1px solid #E5E5E5;
min-height: 43px;
line-height: 43px;
.modular-content-p-name {
display: inline-block;
- width: 220px;
+ width: 213px;
height: 43px;
line-height: 43px;
font-size: 16px;
@@ -3619,10 +3623,10 @@ export default {
.modular-content-p-val {
display: inline-block;
width: calc(~'100% - 225px');
- min-height: 50px;
- line-height: 50px;
- font-size: 16px;
- color: #999999;
+ //min-height: 50px;
+ //line-height: 50px;
+ //font-size: 16px;
+ //color: #999999;
word-break: break-all;
//overflow: hidden;
//white-space: nowrap;
@@ -3636,9 +3640,10 @@ export default {
& > .files-title {
width: calc(~'100% - 120px');
- min-height: 50px;
- line-height: 50px;
- font-size: 16px;
+ //报批稿撑开
+ //min-height: 50px;
+ //line-height: 50px;
+ //font-size: 16px;
color: #409EFF;
& > a {
@@ -3668,7 +3673,8 @@ export default {
.decomposition-btn {
position: absolute;
- top: 10px;
+ //报批稿撑开
+ //top: 10px;
right: 0;
padding: 0 10px;
height: 30px;
diff --git a/src/pages/home/components/EnterCard.vue b/src/pages/home/components/EnterCard.vue
index fe2ef511c..4f533f55d 100644
--- a/src/pages/home/components/EnterCard.vue
+++ b/src/pages/home/components/EnterCard.vue
@@ -3,7 +3,7 @@
@@ -106,7 +106,7 @@ export default {
width: 18vm;
height: 40px;
color: #333333;
- font-size: 14px;
+ font-size: 15px;
border: 0;
border-radius: 3px;
background-color: #FFFFFF;
diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue
index 01d59e84a..1b36284bd 100644
--- a/src/pages/home2/components/solicitopinions/index.vue
+++ b/src/pages/home2/components/solicitopinions/index.vue
@@ -21,7 +21,7 @@
label="序号"
type="index"
align="center"
- width="50">
+ width="55">
-
+
{{ label }}
@@ -67,7 +67,7 @@
diff --git a/src/pages/home2/components/navMenu/index.vue b/src/pages/home2/components/navMenu/index.vue
index de912b2bc..cfe0c4c93 100644
--- a/src/pages/home2/components/navMenu/index.vue
+++ b/src/pages/home2/components/navMenu/index.vue
@@ -77,7 +77,7 @@
height: 40px;
line-height: 40px;
background: #fff;
- font-size: 14px;
+ font-size: 15px;
border-radius: 10px;
}
.menu-wrap {
@@ -92,11 +92,11 @@
margin-bottom: 0;
}
.wx-card {
- height: 70px;
+ height: 50px;
width: 33.333333%;
}
.wx-card1 {
- height: 70px;
+ height: 50px;
width: 33.333333%;
}
.menu-item {
diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index 0fe974c71..b78c54f8b 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -21,7 +21,7 @@
label="序号"
type="index"
align="center"
- width="50">
+ width="55">
@@ -614,7 +615,7 @@ export default {
break
//项目清单确认流程
case '10' :
- if(row.taskInfo === '确认人确认'){
+ if(row.taskInfo === '产品工程经理分发清单'){
this.$router.push({
name: 'xmqdqrStep2',
query: {
@@ -625,7 +626,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '标准法规部经理审批') {
+ } else if (row.taskInfo === '确认人确认') {
this.$router.push({
name: 'xmqdqrStep3',
query: {
@@ -636,6 +637,17 @@ export default {
prcType: row.prcType
}
})
+ }else if(row.taskInfo === '标准法规部经理审批'){
+ this.$router.push({
+ name: 'xmqdqrStep5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}
break
case '14':
@@ -1284,9 +1296,10 @@ export default {
display: inline-block;
margin: 15px;
color: #333333;
- font-size: 14px;
+ font-size: 15px;
}
.more {
+ font-size: 15px;
float: right;
color: #4788c0;
margin: 15px 15px;
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index ee56d41a2..c56aee185 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -172,7 +172,7 @@ export default {
.right_wrapper {
display: flex;
flex-direction: column;
- width: 37vw;
+ width: 30vw;
height: 100%;
}
.search-condition {
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 6dd0f6fcf..308c3e146 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -402,6 +402,19 @@ export default {
},
//查找适用车型
searchBtnClick() {
+ if (this.dynamic.putTime === null) {
+ this.dynamic.putTime = []
+ }
+ if (this.dynamic.SSRQ === null) {
+ this.dynamic.SSRQ = []
+ }
+ if (this.dynamic.XCXSSRQ === null) {
+ this.dynamic.XCXSSRQ = []
+ }
+ if (this.dynamic.ZCCSSRQ === null) {
+ this.dynamic.ZCCSSRQ = []
+ }
+
this.warningTableLoading = true
this.$http.get('sys/EarlyWarning/getStandWarning', {
...this.pageConfig,
@@ -628,7 +641,20 @@ export default {
}, {
_this: this
}, res => {
- console.log('805',res)
+ // 适用车型转换
+ for (let a = 0; a < res.data.records.length; a++) {
+ if (res.data.records[a].applyType !== null) {
+ let k = (res.data.records[a].applyType || "").split(",");
+ for (let i in this.energyKindOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.energyKindOptions[i].value === k[m]) {
+ k[m] = this.energyKindOptions[i].label;
+ }
+ res.data.records[a].applyType = k.join(",");
+ }
+ }
+ }
+ }
this.warningTableDatas = res.data.records
this.pageConfig.page = res.data.current
this.pageConfig.pageSize = res.data.size
@@ -637,9 +663,8 @@ export default {
this.warningTableLoading = false
}, e => {
});
-
});
-
+ this.searchBtnClick()
}
};
diff --git a/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue b/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue
new file mode 100644
index 000000000..f419a885f
--- /dev/null
+++ b/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue
@@ -0,0 +1,83 @@
+
+
+
- {{ item.prcName }}
+ {{ item.prcName }}
+ {{ item.prcName.substring(0,25)+'...' }}
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index d89dae681..f5ebeacff 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -67,7 +67,7 @@
v-for="item in comityRoleOptions"
:key="item.value"
:label="item.label"
- :value="item.value"/>
+ :value="item.label"/>
@@ -80,7 +80,7 @@
v-for="item in comityStateOptions"
:key="item.value"
:label="item.label"
- :value="item.value"/>
+ :value="item.label"/>
@@ -93,7 +93,7 @@
v-for="item in comityKindOptions"
:key="item.value"
:label="item.label"
- :value="item.value"/>
+ :value="item.label"/>
@@ -161,7 +161,7 @@
+
+
+
@@ -196,7 +196,7 @@
align="center"
label="联络人">
-
+
+
+
+
@@ -469,6 +482,8 @@ export default {
nodeListOne: [],
isSubmit: false,
saveLoading: false,
+
+ commentText: '',
}
},
@@ -530,6 +545,7 @@ export default {
this.fileTextList.splice(index, 1)
}
})
+ this.rh_pageData.infoSources = this.fileTextList
},
// 文件上传成功
handleOnsuccess(res, file, fileList) {
@@ -547,6 +563,7 @@ export default {
})
}
this.fileListData.fileText = this.newDataList
+ this.rh_pageData.infoSources = this.newDataList
this.$message({
showClose: true,
message: res.message,
@@ -663,7 +680,8 @@ export default {
_formData.append('prcType', '20')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
- rh_pageData: this.rh_pageData
+ rh_pageData: this.rh_pageData,
+ commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
@@ -675,41 +693,46 @@ export default {
},
// 提交按钮
handleSubmit() {
- let json = {
- prcCreateUser: this.$store.getters.userInfo.userId,
- prcCreateUserName: this.$store.getters.userInfo.userName,
- roleList: this.roleForm,
- rh_pageData: this.rh_pageData,
- directorList: this.rh_pageData.comityInRoleId,
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.$refs['roleForm'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const paramsInfo = {
- type: '20'
- }
- startProcess(paramsInfo).then(res => {
- this.taskID = res.data
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskID)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- })
- })
- } else {
- this.$message.warning('请完成流程信息的人员选择')
- }
- })
+ if (this.commentText === '') {
+ this.$message.warning('请输入回执说明')
+ } else {
+ let json = {
+ prcCreateUser: this.$store.getters.userInfo.userId,
+ prcCreateUserName: this.$store.getters.userInfo.userName,
+ roleList: this.roleForm,
+ rh_pageData: this.rh_pageData,
+ commentText: this.commentText,
+ directorList: this.rh_pageData.comityInRoleId,
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.$refs['roleForm'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const paramsInfo = {
+ type: '20'
+ }
+ startProcess(paramsInfo).then(res => {
+ this.taskID = res.data
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskID)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ })
+ })
+ } else {
+ this.$message.warning('请完成流程信息的人员选择')
+ }
+ })
+ }
+ })
+ }
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index 746fbfade..93313835a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -15,18 +15,6 @@
-
-
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
@@ -75,8 +63,18 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
-
-
+
{
- if (valid) {
- this.isBack = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('退回成功')
- this.$router.push("/processCenter");
- }
- this.isBack = false
- });
+ if (this.commentText === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ roleList: this.roleForm,
+ memberId: this.$store.getters.userInfo.userId,
+ passFlag: '0',
+ commentText: this.commentText,
+ rh_pageData: this.rh_pageData,
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isBack = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('退回成功')
+ this.$router.push("/processCenter");
+ }
+ this.isBack = false
+ });
+ }
+ })
+ }
},
// 提交按钮
handleSubmit() {
- let json = {
- roleList: this.roleForm,
- memberId: this.$store.getters.userInfo.userId,
- passFlag: '1',
- commentText: this.commentText,
- rh_pageData: this.rh_pageData,
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.commentText === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ roleList: this.roleForm,
+ memberId: this.$store.getters.userInfo.userId,
+ passFlag: '1',
+ commentText: this.commentText,
+ rh_pageData: this.rh_pageData,
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index fb8e342a1..5898f8ed8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -14,19 +14,7 @@
基础信息
+
+
+
+
-
-
-
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
+
@@ -75,6 +63,16 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
-
+
+
+
+
+
@@ -303,6 +315,7 @@ export default {
workPath: '',
comityTel: [],
fillPeople: '',
+ fillPeopleId: '',
fillUnit: '',
fillDept: '',
fillPost: '',
@@ -312,6 +325,13 @@ export default {
fillLeaderId: '',
fillFile: '',
},
+ rh_rules: {
+ fillLeader: [
+ {required: true, message: "请选择参与人部门领导", trigger: 'blur'},
+ { trigger: 'change' }
+ ]
+
+ },
roleForm: {},
unqualidiedData: [],
roleShowflag: false,
@@ -324,6 +344,8 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+ commentText: '',
+ infoSourcesLength: ''
}
},
computed: {
@@ -364,7 +386,9 @@ export default {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
+ this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+ this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList
})
},
@@ -409,29 +433,41 @@ export default {
},
// 提交按钮
handleSubmit() {
- let json = {
- roleList: this.roleForm,
- selfUser: this.$store.getters.userInfo.userId,
- charge: this.rh_pageData.fillLeaderId,
- rh_pageData: this.rh_pageData,
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.commentText === '') {
+ this.$message.warning('请输入回执说明')
+ } else {
+ let json = {
+ roleList: this.roleForm,
+ selfUser: this.$store.getters.userInfo.userId,
+ charge: this.rh_pageData.fillLeaderId,
+ rh_pageData: this.rh_pageData,
}
- })
- }
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
+
+ },
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
index 6148c73ab..e1b2a0e03 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
@@ -15,18 +15,6 @@
-
-
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
@@ -75,6 +63,16 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
@@ -116,7 +114,7 @@
+
+
+
+
@@ -294,6 +305,10 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+ deleteDataList: [],
+
+ infoSourcesLength: '',
+ commentText: ''
}
},
computed: {
@@ -338,6 +353,7 @@ export default {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+ this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList
})
},
@@ -356,7 +372,7 @@ export default {
this.deleteDataList.map(item => {
let index;
index = this.rh_pageData.myPartRole.findIndex(items => {
- return items.id === item;
+ return items === item;
});
if (index > -1) {
this.rh_pageData.myPartRole.splice(index, 1);
@@ -374,13 +390,32 @@ export default {
},
// 保存按钮
handleSave() {
+ this.saveLoading = true
+ let _formData = new FormData()
+ _formData.append('taskIds', this.taskIds)
+ _formData.append('json', JSON.stringify({
+ rh_pageData: this.rh_pageData,
+ roleList: this.roleForm,
+ commentText: this.commentText
+ }))
+ saveTaskForPub(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ this.bpnId = res.result
+ }).catch(e => {
+ this.saveLoading = false
+ })
},
// 提交按钮
handleSubmit() {
+ if (this.commentText === '') {
+ this.$message.warning('请输入回执说明')
+ } else {
let json = {
leader: this.roleForm.leaderUserId,
rh_pageData: this.rh_pageData,
roleList: this.roleForm,
+ commentText: this.commentText
}
this.$refs['rh_pageData'].validate((valid) => {
if (valid) {
@@ -398,7 +433,17 @@ export default {
});
}
})
- }
+ }
+
+ },
+
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
new file mode 100644
index 000000000..dbf22f849
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
@@ -0,0 +1,507 @@
+
+
-
-
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
@@ -78,8 +66,18 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
-
-
+
+
+ 外部标准化协会入会流程
+ 批准
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
index f46729998..3a8594b69 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
@@ -18,18 +18,6 @@
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ rh_pageData.comityName || '-' }}
+
+
+
+
+ {{ rh_pageData.comityState || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityKind || '-' }}
+
+
+
+
+ {{ rh_pageData.comityMake.makeQualification || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityMake.makeRole || '' }}
+
+
+
+
+ {{ rh_pageData.comityMake.makeCost || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityMake.makeDuties || '-' }}
+
+
+
+
+ {{ rh_pageData.comityMake.makeTime || '-' }}
+
+
+
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
-
- 批量删除
-
-
+
+
+
+
@@ -277,6 +279,11 @@ export default {
taskInfo: this.$route.query.taskInfo,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+
+ infoSourcesLength: '',
+
+ textTitle: '审批意见',
+ textHolder: '请输入审批意见'
}
},
computed: {
@@ -308,6 +315,10 @@ export default {
},
getData() {
+ if (this.taskInfo === '标准法规工程师汇总修订完毕') {
+ this.textTitle = '回执说明'
+ this.textHolder = '请输入回执说明'
+ }
const params = {
taskIds: this.taskIds,
pId: this.pId,
@@ -321,114 +332,107 @@ export default {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+ this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList
})
},
- /** 批量删除 */
- del_paryForm() {
- if (this.deleteDataList.length < 1) {
- this.$message.warning("请选择一条数据进行删除");
- } else {
- this.$confirm("您确认删除这些数据?", "提示", {
- confirmButtonText: "确认",
- confirmButtonClass: "common-button-primary",
- cancelButtonText: "取消",
- type: "warning"
- }).then(() => {
- let exits = [];
- this.deleteDataList.map(item => {
- let index;
- index = this.rh_pageData.myPartRole.findIndex(items => {
- return items.id === item;
- });
- if (index > -1) {
- this.rh_pageData.myPartRole.splice(index, 1);
- }
- exits.push(item);
- });
- this.deleteDataList = [];
- }).catch(() => {
- });
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
-
selectedDelete(val) {
this.deleteDataList = val
},
// 退回按钮
handleSubmitNo() {
- let json = {
- passFlag: '0',
- rh_pageData: this.rh_pageData,
- roleList: this.roleForm
- }
- if (this.taskInfo === '标准法规部主管领导审核') {
- json.manageDepartmentList = this.roleForm.feeUserId
- } else if (this.taskInfo === '费用管理部门会签') {
- json.manageDepartment = this.$store.getters.userInfo.userId
- json.president = this.roleForm.engineerUserId
- } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
- json.engineerSumDone = this.roleForm.startUser
+ if (this.textarea === '') {
+ this.$message.warning('请输入反馈意见')
} else {
- json = {
+ let json = {
+ passFlag: '0',
rh_pageData: this.rh_pageData,
roleList: this.roleForm
}
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.isBack = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isBack = false
- });
+ if (this.taskInfo === '标准法规部主管领导审核') {
+ json.manageDepartmentList = this.roleForm.feeUserId
+ } else if (this.taskInfo === '费用管理部门会签') {
+ json.manageDepartment = this.$store.getters.userInfo.userId
+ json.president = this.roleForm.engineerUserId
+ } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+ json.engineerSumDone = this.roleForm.startUser
+ } else {
+ json = {
+ rh_pageData: this.rh_pageData,
+ roleList: this.roleForm
+ }
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isBack = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isBack = false
+ });
+ }
+ })
+ }
},
// 提交按钮
handleSubmit() {
- let json = {
- passFlag: '1',
- rh_pageData: this.rh_pageData,
- roleList: this.roleForm
- }
- if (this.taskInfo === '标准法规部主管领导审核') {
- json.manageDepartmentList = this.roleForm.feeUserId
- } else if (this.taskInfo === '费用管理部门会签') {
- json.manageDepartment = this.$store.getters.userInfo.userId
- json.president = this.roleForm.engineerUserId
- } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
- json.engineerSumDone = this.roleForm.startUser
+ if (this.textarea === '') {
+ if (this.taskInfo === '标准法规工程师汇总修订完毕') {
+ this.$message.warning('请输入回执说明')
+ } else {
+ this.$message.warning('请输入反馈意见')
+ }
} else {
- json = {
+ let json = {
+ passFlag: '1',
rh_pageData: this.rh_pageData,
+ commentText: this.textarea,
roleList: this.roleForm
}
- }
- this.$refs['rh_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.taskInfo === '标准法规部主管领导审核') {
+ json.manageDepartmentList = this.roleForm.feeUserId
+ } else if (this.taskInfo === '费用管理部门会签') {
+ json.manageDepartment = this.$store.getters.userInfo.userId
+ json.president = this.roleForm.engineerUserId
+ } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+ json.engineerSumDone = this.roleForm.startUser
+ } else {
+ json = {
+ rh_pageData: this.rh_pageData,
+ roleList: this.roleForm
+ }
}
- })
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 6e269cd45..ce7cc3e85 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -97,7 +97,8 @@
-
+
@@ -170,6 +171,19 @@
+
+
+
+
@@ -319,7 +333,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
-import {startProcess, saveTaskFirst, completeTask} from '@/api/process.js'
+import {startProcess, queryTaskFirst, saveTaskFirst, completeTask} from '@/api/process.js'
export default {
components: {
@@ -393,6 +407,13 @@ export default {
roleShowflagOne: false,
isSubmit: false,
saveLoading: false,
+ commentText: ''
+ }
+ },
+ mounted() {
+ this.bpnId = this.$route.query.bpnId
+ if (this.bpnId !== undefined) {
+ this.getData()
}
},
methods: {
@@ -400,6 +421,16 @@ export default {
handleTabs(name) {
this.active = name
},
+ getData() {
+ queryTaskFirst({
+ bpnId: this.$route.query.bpnId
+ }).then(res => {
+ let mes = JSON.parse(res.mes)
+ this.ch_pageData = mes.ch_pageData
+ this.commentText = mes.commentText
+ this.roleForm = mes.roleForm
+ });
+ },
//上传按钮
/* uploadFile(val) {
@@ -557,10 +588,12 @@ export default {
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
- _formData.append('prcType', '20')
+ _formData.append('prcType', '21')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
- ch_pageData: this.ch_pageData
+ ch_pageData: this.ch_pageData,
+ commentText: this.commentText
+
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
@@ -572,39 +605,44 @@ export default {
},
/** 提交按钮*/
handleSubmit() {
- let json = {
- prcCreateUser: this.$store.getters.userInfo.userId,
- prcCreateUserName: this.$store.getters.userInfo.userName,
- roleList: this.roleForm,
- ch_pageData: this.ch_pageData,
- directorList: this.roleForm.dockUser,
- }
- this.$refs['ch_pageData'].validate((valid) => {
- if (valid) {
- this.$refs['roleForm'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const paramsInfo = {
- type: '21'
- }
- startProcess(paramsInfo).then(res => {
- this.taskID = res.data
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskID)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- })
- })
- }
- })
+ if (this.commentText === '') {
+ this.$message.warning('请输入回执说明')
+ } else {
+ let json = {
+ prcCreateUser: this.$store.getters.userInfo.userId,
+ prcCreateUserName: this.$store.getters.userInfo.userName,
+ roleList: this.roleForm,
+ ch_pageData: this.ch_pageData,
+ commentText: this.commentText,
+ directorList: this.roleForm.dockUser,
}
- })
+ this.$refs['ch_pageData'].validate((valid) => {
+ if (valid) {
+ this.$refs['roleForm'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const paramsInfo = {
+ type: '21'
+ }
+ startProcess(paramsInfo).then(res => {
+ this.taskID = res.data
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskID)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ })
+ })
+ }
+ })
+ }
+ })
+ }
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index ae2d7683e..85d3a435c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -59,19 +59,18 @@
-
- {{ ch_pageData.sort || '-'}}
+ 计划内
+ 计划外
@@ -104,14 +103,14 @@
+
+
+
+
@@ -269,7 +283,12 @@ export default {
fillLeader: '',
fillFile: '',
},
- ch_rules: {},
+ ch_rules: {
+ fillLeader: [
+ {required: true, message: "请选择参与人部门领导", trigger: 'blur'},
+ { trigger: 'change' }
+ ]
+ },
detailData: [],
loading: false,
@@ -284,6 +303,9 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+
+ uploadFileLength: '',
+ commentText: ''
}
},
computed: {
@@ -327,6 +349,7 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
+ this.uploadFileLength = this.ch_pageData.fileTextList.length
this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
@@ -356,6 +379,7 @@ export default {
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
roleList: this.roleForm,
+ commentText: this.commentText,
selfUser: this.$store.getters.userInfo.userId,
charge: this.ch_pageData.fillLeaderId,
ch_pageData: this.ch_pageData,
@@ -370,28 +394,34 @@ export default {
},
// 提交按钮
handleSubmit() {
- let json = {
- roleList: this.roleForm,
- selfUser: this.$store.getters.userInfo.userId,
- charge: this.ch_pageData.fillLeaderId,
- ch_pageData: this.ch_pageData,
- }
- this.$refs['ch_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.commentText === '') {
+ this.$message.warning('请输入回执说明')
+ } else {
+ let json = {
+ roleList: this.roleForm,
+ selfUser: this.$store.getters.userInfo.userId,
+ commentText: this.commentText,
+ charge: this.ch_pageData.fillLeaderId,
+ ch_pageData: this.ch_pageData,
}
- })
+ this.$refs['ch_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
+
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
index bf3e176f4..0e6e1971c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
@@ -59,18 +59,18 @@
-
- {{ ch_pageData.sort || '-' }}
+ 计划内
+ 计划外
@@ -109,7 +109,7 @@
+
+
+
+
@@ -210,7 +223,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js'
+import { startProcess, saveTaskForPub,completeTask, inboundLiaisonDetail } from '@/api/process.js'
export default {
components: {
ProcessHeader,
@@ -237,6 +250,9 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+
+ uploadFileLength: '',
+ commentText: ''
}
},
computed: {
@@ -280,6 +296,7 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
+ this.uploadFileLength = this.ch_pageData.fileTextList.length
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
// this.ch_pageData.comityFileNum = this.fileTextList
})
@@ -318,30 +335,51 @@ export default {
},
// 保存按钮
handleSave() {
+ this.saveLoading = true
+ let _formData = new FormData()
+ _formData.append('taskIds', this.taskIds)
+ _formData.append('json', JSON.stringify({
+ ch_pageData: this.ch_pageData,
+ roleList: this.roleForm,
+ commentText: this.commentText
+ }))
+ saveTaskForPub(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ this.bpnId = res.result
+ }).catch(e => {
+ this.saveLoading = false
+ })
},
// 提交按钮
handleSubmit() {
- let json = {
- leader: this.roleForm.leaderUserId,
- ch_pageData: this.ch_pageData,
- roleList: this.roleForm,
- }
- this.$refs['ch_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.commentText === '') {
+ this.$message.warning('请输入审批意见')
+ } else {
+ let json = {
+ leader: this.roleForm.leaderUserId,
+ ch_pageData: this.ch_pageData,
+ commentText: this.commentText,
+ roleList: this.roleForm,
}
- })
+ this.$refs['ch_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
+
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue
new file mode 100644
index 000000000..9104f1397
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue
@@ -0,0 +1,377 @@
+
+
-
- {{ ch_pageData.sort || '-' }}
+ 计划内
+ 计划外
@@ -111,6 +111,19 @@
+
+ 外部标准化协会参会流程
+ 批准
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
index 105a1410d..eea516e65 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
@@ -62,18 +62,18 @@
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ ch_pageData.meetingName || '-' }}
+
+
+
+
+ {{ ch_pageData.primaryUnit || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.associaName || '-' }}
+
+
+
+
+ {{ ch_pageData.meetingStartTime || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.meetingPlace || '-' }}
+
+
+
+
+ {{ ch_pageData.feeStand || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.feeKind || '-' }}
+
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';'}}
+
+
+
+
+
+
+
+ 计划内
+ 计划外
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
@@ -230,6 +243,10 @@ export default {
taskInfo: this.$route.query.taskInfo,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+
+ uploadFileLength: '',
+ passTitle: '审批意见',
+ passHolder: '请输入审批意见'
}
},
computed: {
@@ -261,6 +278,10 @@ export default {
},
getData() {
+ if (this.taskInfo === '标准法规工程师修订完毕') {
+ this.passTitle = '回执说明',
+ this.passHolder = '请输入回执说明'
+ }
const params = {
taskIds: this.taskIds,
pId: this.pId,
@@ -273,6 +294,7 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
+ this.uploadFileLength = this.ch_pageData.fileTextList.length
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
// this.ch_pageData.comityFileNum = this.fileTextList
})
@@ -293,7 +315,7 @@ export default {
this.deleteDataList.map(item => {
let index;
index = this.ch_pageData.myPartRole.findIndex(items => {
- return items.id === item;
+ return items === item;
});
if (index > -1) {
this.ch_pageData.myPartRole.splice(index, 1);
@@ -311,77 +333,90 @@ export default {
},
// 退回按钮
handleSubmitNo() {
- let json = {
- passFlag: '0',
- ch_pageData: this.ch_pageData,
- roleList: this.roleForm
- }
- if (this.taskInfo === '技术管理中心主任审批') {
- json.manageDepartmentList = this.roleForm.feeUserId
- } else if (this.taskInfo === '费用管理部门会签') {
- json.manageDepartment = this.$store.getters.userInfo.userId
- json.president = this.roleForm.engineerUserId
- } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
- json.engineerSumDone = this.roleForm.startUser
+ if (this.textarea === '') {
+ this.$message.warning('请输入审批意见')
} else {
- json = {
+ let json = {
+ passFlag: '0',
ch_pageData: this.ch_pageData,
+ commentText: this.textarea,
roleList: this.roleForm
}
- }
- this.$refs['ch_pageData'].validate((valid) => {
- if (valid) {
- this.isBack = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isBack = false
- });
+ if (this.taskInfo === '技术管理中心主任审批') {
+ json.manageDepartmentList = this.roleForm.feeUserId
+ } else if (this.taskInfo === '费用管理部门会签') {
+ json.manageDepartment = this.$store.getters.userInfo.userId
+ json.president = this.roleForm.engineerUserId
+ } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+ json.engineerSumDone = this.roleForm.startUser
+ } else {
+ json = {
+ ch_pageData: this.ch_pageData,
+ commentText: this.textarea,
+ roleList: this.roleForm
+ }
}
- })
+ this.$refs['ch_pageData'].validate((valid) => {
+ if (valid) {
+ this.isBack = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isBack = false
+ });
+ }
+ })
+ }
},
// 提交按钮
handleSubmit() {
- let json = {
- passFlag: '1',
- ch_pageData: this.ch_pageData,
- roleList: this.roleForm
- }
- if (this.taskInfo === '技术管理中心主任审批') {
- json.manageDepartmentList = this.roleForm.feeUserId
- } else if (this.taskInfo === '费用管理部门会签') {
- json.manageDepartment = this.$store.getters.userInfo.userId
- json.president = this.roleForm.engineerUserId
- } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
- json.engineerSumDone = this.roleForm.startUser
+ if (this.textarea === '') {
+ this.$message.warning('请输入审批意见')
} else {
- json = {
+ let json = {
+ passFlag: '1',
ch_pageData: this.ch_pageData,
+ commentText: this.textarea,
roleList: this.roleForm
}
- }
- this.$refs['ch_pageData'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskId', this.taskIds)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
- this.isSubmit = false
- });
+ if (this.taskInfo === '技术管理中心主任审批') {
+ json.manageDepartmentList = this.roleForm.feeUserId
+ } else if (this.taskInfo === '费用管理部门会签') {
+ json.manageDepartment = this.$store.getters.userInfo.userId
+ json.president = this.roleForm.engineerUserId
+ } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+ json.engineerSumDone = this.roleForm.startUser
+ } else {
+ json = {
+ ch_pageData: this.ch_pageData,
+ commentText: this.textarea,
+ roleList: this.roleForm
+ }
}
- })
+ this.$refs['ch_pageData'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ });
+ }
+ })
+ }
+
}
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index ecf021766..fca2bdbc0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -325,12 +325,6 @@
submitBTNText="同意"
>
- 海外标准入库
-
+
-
@@ -414,28 +379,21 @@
v-model="form.kwjName"
clearable
>
-
@@ -446,28 +404,21 @@
v-model="form.jdwjName"
clearable
>
-
@@ -771,27 +708,20 @@
v-model="form.glwjName"
clearable
>
-
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传文件
-
-
-
-
-
-
- 点击上传
-
+
@@ -1125,7 +1055,8 @@
-
+
+
-
+
-
+
-
+
+
-
+
@@ -1222,21 +1155,22 @@
+ align="center"
+ min-width="30">
{{ textStatusMap[scope.row.textStatus] }}
-
-
- 查看
-
-
-
+
+
+
+
+
+
+
+
+
+
{
+ this.form = JSON.parse(JSON.stringify(item))
+ this.defaultCheckedKeys = [this.form.standSystem]
+ this.defaultCheckedKeys1 = [this.form.cycvppsbm]
+ this.defaultCheckedKeys2 = [this.form.kccvppsbm]
+ this.defaultCheckedKeys3 = [this.form.dybxh]
+ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+ this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+ if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){
+ this.form.country=this.form.country.split(",");
+ }
+ this.form.prcNum = this.prcNum
+ this.form.prcName = this.prcName
+ this.form['id'] = item.id
+
+ // 遍历对象初始化文件信息
+ for(const p in this.form) {
+ if (typeof (this.form[p ]) != "function") {
+ this.initializeFileList(p,this.form[p]);
+ }
+ }
+
+ })
+ },
// 将文本状态的id与name对应
setMap(data){
data.forEach(item => {
@@ -1892,7 +1854,7 @@
this.verifySarStandard = true
this.clearFormData(this.form)
break
- // 带入
+ // 带入（确认）
case 2:
if (this.standardCheckedList.length === 1) {
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
@@ -1905,7 +1867,6 @@
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
-
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
@@ -1924,6 +1885,10 @@
this.key3++
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
+ console.log(this.form)
+ this.form.ssrq = this.form.ssrq?this.$moment(this.form.ssrq).format("YYYY-MM-DD"):null
+ this.form.zccssrq = this.form.zccssrq?this.$moment(this.form.zccssrq).format("YYYY-MM-DD"):null
+ this.form.xcxssrq = this.form.xcxssrq?this.$moment(this.form.xcxssrq).format("YYYY-MM-DD"):null
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = bringData.id
@@ -2857,6 +2822,11 @@
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
new file mode 100644
index 000000000..7691ed962
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
@@ -0,0 +1,713 @@
+
+
-
+
+
+
+
+
+
+
@@ -1947,6 +2002,9 @@ export default {
},
data() {
return {
+ QCDWValue: [],
+ QCDWmodal: false,
+ QCDWList: [],
OCRSubmitLoading: false,
OCRSubmitButton: '',
OCRType: '',
@@ -2651,6 +2709,21 @@ export default {
}
},
methods: {
+ QCDWOK() {
+ let arr1 = []
+ if (this.sarStandardsInfoEO['QCDW']) {
+ let str = this.sarStandardsInfoEO['QCDW'].replace(/，/g, ',')
+ arr1 = str.split(',')
+ }
+ let arr2 = arr1.concat(this.QCDWValue)
+ this.sarStandardsInfoEO['QCDW'] = Array.from(new Set(arr2)).join(',')
+ this.QCDWmodal = false
+ },
+ QCDWClick(row) {
+ this.QCDWValue = []
+ this.QCDWmodal = true
+ this.QCDWList = row
+ },
setWBType(type) {
let text = ''
for (let a = 0; a < this.OCRoptions.length; a++) {
@@ -3248,6 +3321,7 @@ export default {
})
})
this.dynamicFormField = displayLocation
+ console.log(this.dynamicFormField);
this.loading = false
})
})
diff --git a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue
index 9a2d65b9d..5c27786fe 100644
--- a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue
+++ b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue
@@ -146,7 +146,6 @@
@click="clearSearch"
>
-
-
-
+ :filter-node-method="filterNode">
{{ node.label }}
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index f9eefc43b..36a2dd59a 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -19,13 +19,13 @@
@@ -101,27 +101,33 @@
label="计划状态"
align="center"
width="150">
+
+
+
+
@@ -180,7 +186,7 @@
@@ -199,38 +205,38 @@
-
-
+
+
+
-
-
-
-
-
-
-
@@ -285,6 +306,40 @@
@click="addDrawerClose">取消
+
+
@@ -1117,7 +1047,7 @@
+
+ {{ item.name }}
+
+
+
+
+
+
+ 项目清单确认流程
+ 产品经理汇总
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 3840da988..066ed5db3 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -127,7 +127,7 @@
+
+ 基础信息
+ 审批历史
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+ {{ scope.row.standSort
+ }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
+ {{ scope.row.standSort }}
+ {{ scope.row.standNumber }}
+
+
+
+
+ {{ scope.row.standName }}
+
+
+
+
+ {{ scope.row.standEnName }}
+
+
+
+
+ {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue
new file mode 100644
index 000000000..002c2edbe
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue
@@ -0,0 +1,548 @@
+
+
+
@@ -698,7 +697,6 @@
:disabled="formdisableflag"
>
-
责任部门
-
-->
+
+
+ 起草单位
+
+
+
+
+ 标准解读流程
+ 责任人审核
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 081dd1ae8..586eed8cc 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -258,6 +258,12 @@ export default {
}else if(prcType === '10'){
//项目清单确认
this.toProcessDetail('xmqdqrStep1-3',row)
+ } else if(prcType === '20') {
+ // 入会流程
+ this.toProcessDetail('bzrhStep6-1',row)
+ } else if(prcType === '21') {
+ // 参会流程
+ this.toProcessDetail('bzchStep6-1',row)
}
} else {
this.$message.warning('当前流程未全部办理完成，无法查看')
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index b3465c084..11f67461c 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -980,7 +980,7 @@ export default {
})
} else if (row.taskInfo === '责任人审核') {
this.$router.push({
- name: 'bzjdStep4',
+ name: 'phoneBzjdStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -1014,7 +1014,7 @@ export default {
}
break
case '10':
- if (row.taskInfo === '确认人确认') {
+ if (row.taskInfo === '产品工程经理分发清单') {
this.$router.push({
name: 'xmqdqrStep2',
query: {
@@ -1025,7 +1025,7 @@ export default {
prcType: row.prcType
}
})
- } else if(row.taskInfo === '标准法规部经理审批'){
+ } else if(row.taskInfo === '确认人确认'){
this.$router.push({
name: 'xmqdqrStep3',
query: {
@@ -1036,6 +1036,28 @@ export default {
prcType: row.prcType
}
})
+ }else if(row.taskInfo === '产品工程经理汇总清单'){
+ this.$router.push({
+ name: 'xmqdqrStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if(row.taskInfo === '标准法规部经理审批'){
+ this.$router.push({
+ name: 'xmqdqrStep5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}
break
case 'laws2':
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 8297e2464..d676a1cca 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1641,6 +1641,7 @@ export default {
}, res => {
console.log('1640',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
@@ -1649,6 +1650,7 @@ export default {
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 70ec69b73..cc186c817 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1538,6 +1538,7 @@ export default {
}, res => {
console.log('1640',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
@@ -1546,6 +1547,7 @@ export default {
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 360907b0e..25941adfd 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1636,6 +1636,7 @@ export default {
}, res => {
console.log('1640',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
@@ -1644,6 +1645,7 @@ export default {
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 344e5e8cb..e6c26d318 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -20,8 +20,7 @@
default-expanded-keys="['64df1d5522bb49c09af2']"
highlight-current
@node-click="treeClick"
- :filter-node-method="filterNode"
- :expand-on-click-node="false">
+ :filter-node-method="filterNode">
批量删除
+ v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">批量删除
+
+ 基础信息
+ 审批历史
+
+
+ 拆分信息
+
+
+
+
+
+
+
+
+ 查看条款内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+ 隐藏基础信息
+ 展开基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 符合
+ 不符合
+
+ {{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}
+
+ {{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 手动查找
+
+ {{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}
+
{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}
+
+
+
+
+
+
+
+
+
+
+ 手动查找
+
+
-
diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue
index 2fbd07e11..e70d082ba 100644
--- a/src/pages/regulatoryRepository/nonConfomity/index.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/index.vue
@@ -1,77 +1,77 @@
- 符合
+ 符合
不符合
-
+
-
-
-
-
-
-
-
-
+
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 64976940d..fe11fec51 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -1120,7 +1120,7 @@ export default {
this.roleShowflag = true
},
drawerCheck(data) {
- this.addForm.dutyEngineer = data[0].name.slice(0,data[0].name.indexOf('('))
+ this.addForm.dutyEngineer = data[0].name
this.roleShowflag = false
},
/** 选择认证工程师和质量工程师 */
@@ -1140,7 +1140,7 @@ export default {
idList += ','
}
idList += item.id
- nameList += item.name.slice(0,item.name.indexOf('('))
+ nameList += item.name
})
if (this.type === 'authEngineer') {
this.addForm.authEngineer = nameList
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index 3f55f76e4..b9c174ee1 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -7,9 +7,9 @@
+
+
+
+
+
+
+
+
+ {{ $t("m.generalSearch") }}{{ $t("m.advancedSearch") }} + class="senior">{{ $t("m.advancedSearch") }}
@@ -27,8 +27,8 @@
{{ $t("m.clearQuery") }}
-
-
+
+
@@ -39,9 +39,9 @@
{{ $t("m.standAll") }}
-
+
{{ $t("m.enterpriseStandard") }}
@@ -75,11 +75,11 @@
-
@@ -144,10 +144,10 @@
-
-
+
+
@@ -462,16 +462,16 @@
-
-
+
+
@@ -832,11 +832,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -938,23 +938,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -974,8 +974,8 @@
+ v-if="!kindtext && this.selectIndex === 'INLAND_STAND' && this.buyRoleFlag === 0 && (this.resultData === null || this.resultData.length === 0)"
+ class="toBuyClass">
{{ $t("m.noQueryResult") }}！
@@ -984,50 +984,50 @@
+ tooltip-effect="dark"
+ border
+ :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+ :data="resultData"
+ style="width: 100%"
+ v-loading="tableLoading">
+ align="center"
+ type="index"
+ width="50">
{{ selectIndex === 'INLAND_LAWS' ? scope.row.lawsNumber : scope.row.numbershow}}
+ align="center"
+ :label="$t('m.itemNumber')"
+ show-overflow-tooltip
+ v-if="selectIndex === 'items'">
{{ scope.row.itemsNum
}}
+ align="center"
+ :label="$t('m.entryName')"
+ v-if="selectIndex === 'items'">
{{ scope.row.itemsName
}}
+ align="center"
+ :label="$t('m.newModelImplementationDate')"
+ v-if="selectIndex === 'items'"
+ width="140">
{{ $dateFormat(new Date(scope.row.newcarPutTime), "yyyy-MM-dd") }}
@@ -1036,10 +1036,10 @@
+ align="center"
+ :label="$t('m.implementationDateOfProductionVehicle')"
+ v-if="selectIndex === 'items'"
+ width="140">
{{ $dateFormat(new Date(scope.row.productPutTime), "yyyy-MM-dd") }}
@@ -1048,28 +1048,28 @@
+ align="center"
+ :label="$t('m.clauseRequirements')"
+ v-if="selectIndex === 'items'"
+ width="200">
{{ scope.row.parts
}}
+ align="center"
+ :label="$t('m.applicableModels')"
+ v-if="selectIndex === 'items'"
+ width="200">
{{ scope.row.applyArcticShow }}
{{ selectIndex === 'INLAND_LAWS' ? scope.row.lawsName : scope.row.nameshow
@@ -1077,10 +1077,10 @@
+ align="center"
+ :label="$t('m.issueTime')"
+ v-if="selectIndex !== 'items'"
+ width="130">
取消收藏
收藏
-
+
@@ -388,10 +388,10 @@
label: '海外标准法规', // value没改
value: 'bussstand'
},
- {
- label: '国内外政策',
- value: 'laws'
- },
+ // {
+ // label: '国内外政策',
+ // value: 'laws'
+ // },
{
label: '企业标准',
value: 'enterprise'
@@ -420,10 +420,10 @@
label: '海外标准法规', // value没改
value: 'bussstand'
},
- {
- label: '国内外政策',
- value: 'laws'
- },
+ // {
+ // label: '国内外政策',
+ // value: 'laws'
+ // },
{
label: '企业标准',
value: 'enterprise'
@@ -760,10 +760,10 @@
label: '海外标准法规',
value: 'bussstand'
},
- {
- label: '国内外政策',
- value: 'laws'
- },
+ // {
+ // label: '国内外政策',
+ // value: 'laws'
+ // },
{
label: '企业标准',
value: 'enterprise'
@@ -1099,7 +1099,7 @@
"JASO","JIS","GSO","GOST","ΓOCT","TP","SASO","UAE","CONTRAN","DENATRAN",
"ABNT NBR","NBR","INMETRO","CONAMA","Normative Instruction","ADR"];
const bussStandVerify = ["Q/FT A","Q/FT B","Q/FT E","Q/FT F","Q/FT G","Q/FT M",
- "Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"];
+ "Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"];
if(data[key]){
console.log(data[key])
const list = []
diff --git a/src/router/index.js b/src/router/index.js
index de739f1be..8da1a1b18 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -736,6 +736,33 @@ const routes = [
title: '项目清单确认流程'
}
},
+ {
+ path: '/xmqdqrStep3',
+ name: 'xmqdqrStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '项目清单确认流程'
+ }
+ },
+ {
+ path: '/xmqdqrStep4',
+ name: 'xmqdqrStep4',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue'),
+ meta: {
+ requireAuth: true,
+ title: '项目清单确认流程'
+ }
+ },
+ {
+ path: '/xmqdqrStep5',
+ name: 'xmqdqrStep5',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue'),
+ meta: {
+ requireAuth: true,
+ title: '项目清单确认流程'
+ }
+ },
{
path: '/xmqdqrStep1-1',
name: 'xmqdqrStep1-1',
@@ -763,15 +790,6 @@ const routes = [
title: '项目清单确认流程'
}
},
- {
- path: '/xmqdqrStep3',
- name: 'xmqdqrStep3',
- component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue'),
- meta: {
- requireAuth: true,
- title: '项目清单确认流程'
- }
- },
{
path: '/wfhxzgStep1',
name: 'wfhxzgStep1',
@@ -1728,6 +1746,15 @@ const routes = [
title: '外部标准化协会入会流程（审批)'
}
},
+ {
+ path: '/bzrhStep6-1',
+ name: 'bzrhStep6-1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会入会流程'
+ }
+ },
// 外部标准化协会参会流程
{
@@ -1784,6 +1811,15 @@ const routes = [
title: '外部标准化协会参会流程（审定）'
}
},
+ {
+ path: '/bzchStep6-1',
+ name: 'bzchStep6-1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会参会流程'
+ }
+ },
{
path: '/bzhhStep1',
name: 'bzhhStep1',
@@ -1802,7 +1838,18 @@ const routes = [
title: '外部标准化会后管理流程（审批）'
}
},
+ {
+ path: '/phoneBzjdStep4',
+ name: 'phoneBzjdStep4',
+ component: () => import('@/pages/processCenter/pages/phone/bzjd/step4.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '标准解读流程'
+ }
+ },
]
+
},
// 本地工具
{
@@ -2108,7 +2155,6 @@ const routes = [
menuId: 'PCZKM8TQJAH5UP5EAXTJ'
}
},
-
// 工作组
{
path: '/workingGroup',
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 23bedc3ed..6485c1a23 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,16 +6,17 @@
// 服务器地址
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
-// const devIp = '192.168.10.249'
-const devIp = '62.234.136.153'
-// const devInterfacePORT = '9999'
-const devInterfacePORT = '8033'
+// const devIp = '192.168.10.248'
+// const devIp = '62.234.136.153'
+// const devInterfacePORT = '8033'
+const devIp = '10.19.11.243'
+const devInterfacePORT = '4304'
// 配置 idm 认证
const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
// 配置 前端服务
-const devWebUrl = 'http://62.234.136.153:8038/#/'
+const devWebUrl = 'https://srms.foton.com.cn/#/'
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
-const webLoginType = 'dev'
+const webLoginType = 'idm'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'
@@ -38,10 +39,10 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
-const prodIp = '62.234.136.153'
-const prodInterfacePORT = '8033'
-// const prodIp = 'slrs.foton.com.cn'
-// const prodInterfacePORT = ''
+// const prodIp = '62.234.136.153'
+// const prodInterfacePORT = '8033'
+const prodIp = 'srms.foton.com.cn'
+const prodInterfacePORT = ''
// 判断环境
const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -49,13 +50,13 @@ const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT
const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT
module.exports = {
- baseUrl: 'http://' + serverIP + ':' + interfacePORT,
+ baseUrl: 'https://' + serverIP + ':' + interfacePORT,
webLoginType: webLoginType,
ssoLoginUrlDev: ssoLogin + devWebUrl,
ssoLoginUrl: ssoLogin,
devWebUrl: devWebUrl,
- serverUrl: 'http://' + serverIP, // 服务器IP地址
- interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
+ serverUrl: 'https://' + serverIP, // 服务器IP地址
+ interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址,
simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址
multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址
@@ -64,5 +65,5 @@ module.exports = {
webSocket: webSocket + ':' + devInterfacePORT + '/websocket/socketServer', // webSocket连接
enterprise: enterprise, // GQ广汽 SJZX数据中心
theme: theme, // 主题
- processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow`
+ processInterfaceURL: `https://${serverIP}:${processPort}/bat-wkflow`
}
{{ $dateFormat(new Date(scope.row.issueTime), "yyyy-MM-dd") }}
@@ -1089,9 +1089,9 @@
+ align="center"
+ :label="selectIndex === 'INLAND_LAWS' ? '新车实施日期' :$t('m.putTime')"
+ width="130">
{{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : (selectIndex === 'INLAND_LAWS' ? scope.row.XCXSSRQLAWS : scope.row.putTime)), "yyyy-MM-dd") }}
@@ -1100,81 +1100,81 @@
+ align="center"
+ width="180"
+ :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')">
-
-
-
@@ -1235,1238 +1235,981 @@
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index efcb33c68..2399ac2a6 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -127,10 +127,10 @@
:label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))"
width="200">
-
+
{{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}
-
-
-
-
-
- 查看
-
- 收藏
-
-
- 取消收藏
-
-
-
-
-
-
-
-
-
-
- 查看
-
- 收藏
-
-
- 取消收藏
-
-
-
-
-
-
-
- 查看
-
-
+ align="center"
+ :label="$t('m.action')"
+ width="200">
+
+
+
+
+
+
+
+
+ 查看
- 收藏
+ 收藏
- 取消收藏
+ 取消收藏
- 收藏
-
-
-
+
+
+
+
+
+
+
+
+ 查看
+
+ 收藏
+
+
+ 取消收藏
+
+
+
+
+
+
+
+ 查看
+
+
+
+ 收藏
+
+
+ 取消收藏
+
+ 收藏
+
+
+
- {{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}
+ {{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}