-
-
-
- 删除
- 编辑
-
-
-
-
-
-
+
@@ -37,11 +37,11 @@
{{ children.title }}
@@ -58,9 +58,9 @@
{{ item.title }}
@@ -76,606 +76,569 @@
-
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 @@
- 暂无评估结果
不满足
-
-
满足
-
-
加载中...
@@ -170,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..c5282f73c 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -22,6 +22,85 @@
style="border-top:none;position: absolute;right: 36px;">
+
+
+
-
+
{
- 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() {
@@ -431,12 +453,15 @@ export default {
.comityTel_btn {
text-align: right;
}
- /deep/.el-input.is-disabled .el-input__inner {
- background-color: #fff ;
- }
- /deep/.el-textarea.is-disabled .el-textarea__inner {
+
+ /deep/ .el-input.is-disabled .el-input__inner {
background-color: #fff;
}
+
+ /deep/ .el-textarea.is-disabled .el-textarea__inner {
+ background-color: #fff;
+ }
+
/deep/ .el-table__body-wrapper {
height: auto !important;
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index fb8e342a1..797572dab 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 @@
基础信息
+
+
+
+
+
+
+
-
+
{
- 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 = {
+ passFlag: '0',
+ commentText: this.commentText,
+ hh_pageData: this.hh_pageData,
}
- })
+ this.$refs['hh_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() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 6e269cd45..edf146d99 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -97,15 +97,16 @@
-
-
+
@@ -170,6 +171,19 @@
+
-
-
-
- 加载中...
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
- {{ 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..c15071f96
--- /dev/null
+++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue
@@ -0,0 +1,567 @@
+
+
+
+
+
+
+ 加载中...
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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..6c91e0b35
--- /dev/null
+++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue
@@ -0,0 +1,565 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{ '-' }}
+
+
+
+
+
+ {{ scope.row.url }}
+
+
+ {{ 'http://' + scope.row.url }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 9a33fbf29..5ae648fb6 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -4,15 +4,13 @@
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{ '-' }}
+
+
+
+
+
+ {{ scope.row.url }}
+
+
+ {{ 'http://' + scope.row.url }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+ 编辑
+
+
+
+
+
+
+ 企标评价
+
+
+
+
+
+ {{scope.row.threeIndexTitle}}
+
+
+
+
+
+
+
+
+ {{ scope.row.targetScore * 2 }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ businessCommentForm.averageScore * 2 }}
+
+
+
+ 是
+ 否
+
+
+
更新记录
@@ -987,6 +1066,26 @@ export default {
},
data () {
return {
+ indexType: 'dynamic',
+ commentReason: '', // 评价理由
+ commentReason1: '', // 评价理由
+ commentReason2: '', // 评价理由
+ commentReason3: '', // 评价理由
+ commentReason4: '', // 评价理由
+ commentSubmitLoading: false,
+ targetScore: '', // 指标分值
+ targetScore1: '',
+ targetScore2: '',
+ targetScore3: '',
+ targetScore4: '',
+ businessCommentDialog: false,
+ businessCommentForm: {
+ averageScore: '', // 平均分值
+ revise: '',
+ reviseReason: '', // 修订理由
+ },
+ businessCommentTable: [],
+ commentTarget: '', // 评价指标
activeNames: ['基础信息','过程稿件','实施日期'],
activeState: true,
visiblePlanCheck: false,
@@ -1194,6 +1293,101 @@ export default {
watch: {
},
methods: {
+ targetScoreChange(row){
+ if (this.targetScore1 === '') {
+ this.targetScore1 = 0
+ }
+ if (this.targetScore2 === '') {
+ this.targetScore2 = 0
+ }
+ if (this.targetScore3 === '') {
+ this.targetScore3 = 0
+ }
+ if (this.targetScore4 === '') {
+ this.targetScore4 = 0
+ }
+ switch (row.threeIndexTitle){
+ case "企业标准内容完整、要求合理（指标、流程等。）":
+ this.targetScore1 = 0
+ this.targetScore1 = row.targetScore
+ break
+ case "企业标准便于实施应用":
+ this.targetScore2 = 0
+ this.targetScore2 = row.targetScore
+ break
+ case "标准编写规范，内容清晰易理解":
+ this.targetScore3 = 0
+ this.targetScore3 = row.targetScore
+ break
+ case "标准对我的实际工作很有帮助":
+ this.targetScore4 = 0
+ this.targetScore4 = row.targetScore
+ break
+ }
+ this.businessCommentForm.averageScore = (this.targetScore1 + this.targetScore2 + this.targetScore3 +this.targetScore4)/4
+
+
+ },
+ commentReasonChange(row){
+ if (row.threeIndexTitle === '企业标准内容完整、要求合理（指标、流程等。）'){
+ this.commentReason1 = row.commentReason
+ }
+ if (row.threeIndexTitle === '企业标准便于实施应用'){
+ this.commentReason2 = row.commentReason
+ }
+ if (row.threeIndexTitle === '标准编写规范，内容清晰易理解'){
+ this.commentReason3 = row.commentReason
+ }
+ if (row.threeIndexTitle === '标准对我的实际工作很有帮助'){
+ this.commentReason4 = row.commentReason
+ }
+
+ },
+ commentSubmit(){
+ //验证必填
+ let submitFlag = true
+ if (this.targetScore1 === '' || this.targetScore1 === 0 ||
+ this.targetScore2 === '' || this.targetScore2 === 0 ||
+ this.targetScore3 === '' || this.targetScore3 === 0 ||
+ this.targetScore4 === '' || this.targetScore4 === 0) {
+ submitFlag = false
+ this.$message.warning('请评价指标分值')
+ }else if (
+ (this.commentReason1 === '' && this.targetScore1 < 3) ||
+ (this.commentReason2 === '' && this.targetScore2 < 3) ||
+ (this.commentReason3 === '' && this.targetScore3 < 3) ||
+ (this.commentReason4 === '' && this.targetScore4 < 3)
+ ) {
+ submitFlag = false
+ this.$message.warning('请简述低分理由')
+ } else if (this.businessCommentForm.revise === ''){
+ submitFlag = false
+ this.$message.warning('请选择是否需要修订')
+ }else if (this.businessCommentForm.revise === '1' && this.businessCommentForm.reviseReason === ''){
+ submitFlag = false
+ this.$message.warning('请填写修订理由')
+ }
+ if (submitFlag === true) {
+ this.$message.success('通过')
+
+ const allData = {
+ tableData: this.businessCommentTable,
+ formData: JSON.stringify(this.businessCommentForm),
+ standId: this.sarStandardsInfoEO.id,
+ userId: this.$store.getters.userInfo.userId
+ }
+
+ console.log(allData)
+ this.$http.postData('sarEnterpriseStandardEvaluation/quality-evaluation/submitEvaluationForm', allData, {
+ _this: this
+ }, res => {
+ console.log(res)
+ }, e => {
+ })
+
+
+ }
+ },
child1Func(child1){
const list = []
if(child1 && child1.length > 1){
@@ -2189,6 +2383,14 @@ export default {
// }
},
async mounted () {
+ this.$http.get('sarEnterpriseStandardEvaluation/evaluation-index/getEvaluationIndex', {indexType:this.indexType}, {
+ _this: this
+ }, res => {
+ console.log('2371',res)
+ this.businessCommentTable = res.data
+ console.log(this.businessCommentTable)
+ }, e => {
+ })
this.sarStandardsInfoEO.id = this.$route.params.id
this.getOrgTreeSource()
this.standItemEO.standId = this.$route.params.id
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 @@
@@ -142,7 +140,7 @@ export default {
}
::v-deep {
.el-tabs__item {
- font-size: 14px;
+ font-size: 15px;
font-weight: 600;
/*color: #333333;*/
}
@@ -172,7 +170,7 @@ export default {
.right_wrapper {
display: flex;
flex-direction: column;
- width: 37vw;
+ width: 30vw;
height: 100%;
}
.search-condition {
@@ -185,7 +183,7 @@ export default {
/deep/.el-card__body {
padding: 0;
}
- .footer {
+ .home_footer {
height: 70px;
line-height: 33px;
//margin-top: 0.3vh;
diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index 8ebea20ce..86d86d981 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -50,6 +50,7 @@
@@ -69,6 +71,7 @@
编辑中
@@ -92,6 +96,7 @@
@@ -108,15 +113,21 @@
失败
-
+
-
+ 查看
+
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 5203e4016..6eccce155 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -153,24 +153,24 @@
{{ scope.row.itemsName }}
-
+
{{ scope.row.putTime ? scope.row.putTime.substring(0, 10) : '' }}
-
+
- {{ scope.row.ssrq ? scope.row.ssrq.substring(0,10) : '' }}
+ {{ scope.row.ssrq }}
-
+
- {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0,10) : '' }}
+ {{ scope.row.xcxssrq }}
-
+
- {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0,10) : '' }}
+ {{ scope.row.zccssrq }}
@@ -440,6 +440,7 @@ export default {
_this: this,
}, res => {
console.log('608',res)
+ // console.log('608',res.data.records[0].zccssrq.replace(' 00:00:00',''))
// 适用车型转换
for (let a = 0; a < res.data.records.length; a++) {
if (res.data.records[a].applyType !== null) {
@@ -454,6 +455,26 @@ export default {
}
}
}
+ for (let i = 0; i < res.data.records.length; i++) {
+ let putTimeReplaceTimes = res.data.records[i].putTime.length/19
+ let ssrqReplaceTimes = res.data.records[i].ssrq.length/19
+ let xcxssrqReplaceTimes = res.data.records[i].xcxssrq.length/19
+ let zccssrqReplaceTimes = res.data.records[i].zccssrq.length/19
+
+ for (let j = 0; j < putTimeReplaceTimes; j++) {
+ res.data.records[i].putTime = res.data.records[i].putTime.replace(' 00:00:00','')
+ }
+ for (let j = 0; j < ssrqReplaceTimes; j++) {
+ res.data.records[i].ssrq = res.data.records[i].ssrq.replace(' 00:00:00','')
+ }
+ for (let j = 0; j < xcxssrqReplaceTimes; j++) {
+ res.data.records[i].xcxssrq = res.data.records[i].xcxssrq.replace(' 00:00:00','')
+ }
+ for (let j = 0; j < zccssrqReplaceTimes; j++) {
+ res.data.records[i].zccssrq = res.data.records[i].zccssrq.replace(' 00:00:00','')
+ }
+
+ }
this.warningTableDatas = res.data.records
this.pageConfig.page = res.data.current
if ((this.warningTableDatas.length === 0 || this.warningTableDatas === []) && this.pageConfig.page !== 1) {
@@ -641,7 +662,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
@@ -650,9 +684,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 @@
+
+
+
-
+
@@ -31,7 +31,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
@@ -59,7 +59,7 @@
-
+
@@ -67,12 +67,12 @@
v-for="item in comityRoleOptions"
:key="item.value"
:label="item.label"
- :value="item.value"/>
+ :value="item.label"/>
-
+
@@ -80,12 +80,12 @@
v-for="item in comityStateOptions"
:key="item.value"
:label="item.label"
- :value="item.value"/>
+ :value="item.label"/>
-
+
@@ -93,12 +93,12 @@
v-for="item in comityKindOptions"
:key="item.value"
:label="item.label"
- :value="item.value"/>
+ :value="item.label"/>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
-
+
-
-
-
-
@@ -228,6 +228,19 @@
+
+ 提交
+
+ 取消
+
+
+
- {{ 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..508740324 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -29,9 +29,7 @@
- {{ item.prcName }}
+ {{ item.prcName }}
+ {{ item.prcName.substring(0,25)+'...' }}
-
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue
index 808fcac93..e3167ef54 100644
--- a/src/pages/processCenter/pages/components/ProcessMixin.vue
+++ b/src/pages/processCenter/pages/components/ProcessMixin.vue
@@ -21,6 +21,10 @@ export default {
label: "政策入库流程",
value: "laws1"
},
+ {
+ label: "企标制修订流程及企业标准库流程",
+ value: "buss1"
+ },
{
label: "标准征求意见流程",
value: "3"
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index d89dae681..cc3354d72 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -18,7 +18,7 @@
+
+
+
+
+
+
+
@@ -302,7 +315,7 @@
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
-
-
-
+
{{ 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 }} {{ ';' }}
+
+
+
+
+
+
-
+
选择人员
-
+
标准法规部主管领导
-
+
@@ -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
@@ -680,6 +698,7 @@ export default {
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) => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index 746fbfade..f4db8da41 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -17,68 +17,66 @@
-
-
-
-
- {{ rh_pageData.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
+
@@ -75,6 +63,16 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';' }}
+
+
+
+
-
+
-
+ 点击上传
+
+
+
+
+
+
@@ -303,6 +331,7 @@ export default {
workPath: '',
comityTel: [],
fillPeople: '',
+ fillPeopleId: '',
fillUnit: '',
fillDept: '',
fillPost: '',
@@ -310,7 +339,14 @@ export default {
fillMail: '',
fillLeader: '',
fillLeaderId: '',
- fillFile: '',
+ fillFile: [],
+ },
+ rh_rules: {
+ fillLeader: [
+ {required: true, message: "请选择参与人部门领导", trigger: 'blur'},
+ {trigger: 'change'}
+ ]
+
},
roleForm: {},
unqualidiedData: [],
@@ -324,6 +360,16 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+ commentText: '',
+ infoSourcesLength: '',
+
+ /** 上传相关 */
+ acceptShow: false,
+ // 上传路径
+ uploadPath: 'api/att/attFile/upload',
+ // 上传所储存文件数组
+ fillFileList: [],
+ newDataList: [],
}
},
computed: {
@@ -360,12 +406,15 @@ export default {
this.getFormFieldList(processForm)
})
},
- getFormFieldList (item) {
+ getFormFieldList(item) {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+ this.rh_pageData.fillLeader = ''
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.rh_pageData.comityFileNum = this.fileTextList
+ this.infoSourcesLength = this.rh_pageData.infoSources.length
+ // this.rh_pageData.comityFileNum = this.fillFileList
})
},
// 右上标签页面切换
@@ -379,7 +428,7 @@ export default {
this.drawerTitle = title
this.roleShowflag = true
},
- drawerCheck (data) {
+ drawerCheck(data) {
this.unqualidiedData.forEach(item => {
item.engineer = data[0].name
item.engineerId = data[0].id
@@ -413,6 +462,7 @@ export default {
roleList: this.roleForm,
selfUser: this.$store.getters.userInfo.userId,
charge: this.rh_pageData.fillLeaderId,
+ commentText: this.commentText,
rh_pageData: this.rh_pageData,
}
this.$refs['rh_pageData'].validate((valid) => {
@@ -431,22 +481,92 @@ export default {
});
}
})
- }
+
+ },
+ // 文件上传限制条件
+ handleBeforeUpload(file) {
+ var filename = file.name
+ var index1 = filename.lastIndexOf('.')
+ var index2 = filename.length
+ var fileSuffix = filename.substring(index1, index2)
+ // const fileSuffix = file.name.split('.')[1] // 后缀名
+ // 判断上传文件格式
+ if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ return true
+ } else {
+ this.spinShow = false
+ this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+ return false
+ }
+ // 判断文件上传大小
+ // eslint-disable-next-line no-unreachable
+ if (file.size / 1024 / 1024 <= 200) {
+ return true
+ } else {
+ this.$message.error('文件' + file.name + '大小不超过200M')
+ return false
+ }
+ return true
+ },
+ // 移除上传的文件
+ handleBeforeRemove(file, fileList) {
+ this.fileData = fileList
+ this.fillFileList.forEach((item, index) => {
+ if (item.name === file.name || item.id === file.id) {
+ this.fillFileList.splice(index, 1)
+ }
+ })
+ this.rh_pageData.fillFile = this.fillFileList
+ },
+ // 文件上传成功
+ handleOnsuccess(res, file, fileList) {
+ if (res.ok) {
+ if (this.fillFileList !== null) {
+ this.newDataList = this.fillFileList
+ this.newDataList.push({
+ id: res.data.attId,
+ name: res.data.standName
+ })
+ } else {
+ this.newDataList.push({
+ id: res.data.attId,
+ name: res.data.standName
+ })
+ }
+ this.rh_pageData.fillFile = this.newDataList
+ this.$message({
+ showClose: true,
+ message: res.message,
+ type: 'success'
+ })
+ this.fileMadel = 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/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
index f46729998..1bcb3f53c 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.comityFileNum || '-' }}
-
-
-
-
- {{ rh_pageData.comityFileName || '-' }}
-
-
-
@@ -78,8 +66,18 @@
+
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';' }}
+
+
+
+
-
-
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';' }}
+
+
+
+
-
- 批量删除
-
-
+
+
+
+
@@ -277,6 +286,11 @@ export default {
taskInfo: this.$route.query.taskInfo,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+
+ infoSourcesLength: '',
+
+ textTitle: '审批意见',
+ textHolder: '请输入审批意见'
}
},
computed: {
@@ -308,6 +322,10 @@ export default {
},
getData() {
+ if (this.taskInfo === '标准法规工程师汇总修订完毕') {
+ this.textTitle = '回执说明'
+ this.textHolder = '请输入回执说明'
+ }
const params = {
taskIds: this.taskIds,
pId: this.pId,
@@ -321,76 +339,60 @@ 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
+ });
+ }
+ })
+ }
},
// 提交按钮
@@ -398,6 +400,7 @@ export default {
let json = {
passFlag: '1',
rh_pageData: this.rh_pageData,
+ commentText: this.textarea,
roleList: this.roleForm
}
if (this.taskInfo === '标准法规部主管领导审核') {
@@ -512,6 +515,7 @@ export default {
/deep/ .el-table__body-wrapper {
height: auto !important;
}
+
.myPart_btn {
text-align: right;
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
index 898f3592e..3936aa516 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
@@ -79,7 +79,8 @@
- 点击上传
+ 点击上传
+ 查看附件
@@ -97,7 +98,8 @@
- 点击上传
+ 点击上传
+ 查看附件
@@ -603,7 +605,7 @@ export default {
handleSubmit() {
let json = {
hh_pageData: this.hh_pageData,
- // director: this.roleForm.engineerUserId,
+ director: this.roleForm.engineerUserId,
}
this.$refs['hh_pageData'].validate((valid) => {
if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
index a7e06d66d..aac1c3c67 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
@@ -102,7 +102,7 @@
+
+
+
+
@@ -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: {
@@ -352,10 +366,10 @@ export default {
{value: '1', label: '标准法规技术评估流程'},
],
feeKindOptions: [
- { value: '0', label: '列支1' },
- { value: '1', label: '列支2' },
- { value: '2', label: '列支3' },
- { value: '3', label: '列支4' },
+ {value: '0', label: '列支1'},
+ {value: '1', label: '列支2'},
+ {value: '2', label: '列支3'},
+ {value: '3', label: '列支4'},
],
/** 上传相关 */
acceptShow: false,
@@ -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,11 +421,21 @@ 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) {
- this.fileListData = val
- },*/
+ /* uploadFile(val) {
+ this.fileListData = val
+ },*/
// 文件上传限制条件
handleBeforeUpload(file) {
var filename = file.name
@@ -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
@@ -577,6 +610,7 @@ export default {
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) => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index ae2d7683e..76aa8a5dd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -59,23 +59,22 @@
-
- {{ ch_pageData.sort || '-'}}
+ 计划内
+ 计划外
-
+
+
+
+
+
@@ -201,7 +214,8 @@
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, saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
+
export default {
components: {
ProcessHeader,
@@ -230,6 +244,10 @@ export default {
taskInfo: this.$route.query.taskInfo,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+
+ uploadFileLength: '',
+ passTitle: '审批意见',
+ passHolder: '请输入审批意见'
}
},
computed: {
@@ -261,6 +279,10 @@ export default {
},
getData() {
+ if (this.taskInfo === '标准法规工程师修订完毕') {
+ this.passTitle = '回执说明',
+ this.passHolder = '请输入回执说明'
+ }
const params = {
taskIds: this.taskIds,
pId: this.pId,
@@ -270,9 +292,10 @@ export default {
this.getFormFieldList(processForm)
})
},
- getFormFieldList (item) {
+ 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 +316,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,46 +334,53 @@ 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,
+ commentText: this.textarea,
roleList: this.roleForm
}
if (this.taskInfo === '技术管理中心主任审批') {
@@ -363,6 +393,7 @@ export default {
} else {
json = {
ch_pageData: this.ch_pageData,
+ commentText: this.textarea,
roleList: this.roleForm
}
}
@@ -382,22 +413,33 @@ 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/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
new file mode 100644
index 000000000..0a9274da0
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
@@ -0,0 +1,2758 @@
+
+
-
+
-
+
@@ -305,7 +305,7 @@ export default {
//企业标准查询
getStandDataBtn(){
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
- reviseStatus: this.standardSearch.reviseStatus,
+ reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName,
page: this.page,
pageSize: this.pageSize,
@@ -336,15 +336,16 @@ export default {
}else if(this.selectList.length < 1){
this.$message.warning('请至少选择一条数据进行带入')
}else{
+ this.qbfsForm.esId = this.selectList[0].id
this.qbfsForm.esName = this.selectList[0].esName
this.qbfsForm.draftTime = this.selectList[0].draftTime
- this.qbfsForm.drafter = this.selectList[0].drafter
+ this.qbfsForm.drafterName = this.selectList[0].drafterName
this.qbfsForm.planStatus = this.selectList[0].planStatus
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
- this.qbfsForm.resPerson = this.selectList[0].resPerson
+ this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
this.qbfsForm.unit = this.selectList[0].unit
- this.qbfsForm.wgLeader = this.selectList[0].wgLeader
+ this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
}
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 306985a27..3625153cd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -37,10 +37,10 @@
-
+
-
+
-
+
@@ -327,7 +327,7 @@ export default {
//企业标准查询
getStandDataBtn(){
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
- reviseStatus: this.standardSearch.reviseStatus,
+ reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName,
page: this.page,
pageSize: this.pageSize,
@@ -358,15 +358,16 @@ export default {
}else if(this.selectList.length < 1){
this.$message.warning('请至少选择一条数据进行带入')
}else{
+ this.qbfsForm.esId = this.selectList[0].id
this.qbfsForm.esName = this.selectList[0].esName
this.qbfsForm.draftTime = this.selectList[0].draftTime
- this.qbfsForm.drafter = this.selectList[0].drafter
+ this.qbfsForm.drafterName = this.selectList[0].drafterName
this.qbfsForm.planStatus = this.selectList[0].planStatus
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
- this.qbfsForm.resPerson = this.selectList[0].resPerson
+ this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
this.qbfsForm.unit = this.selectList[0].unit
- this.qbfsForm.wgLeader = this.selectList[0].wgLeader
+ this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
}
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index e21492e45..bf18da11c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -1,91 +1,146 @@
-
合并企标信息
-
-
-
-
- 根据企标编号、名称查询
-
-
-
-
-
-
-
-
-
-
-
- 根据企标编号、名称、类别查询
-
-
-
-
-
-
-
-
-
-
-
- 合并后企标信息
-
+
+
+
+
+
+
@@ -310,6 +312,17 @@ export default {
props: ['message'],
data(){
return {
+ QCDWmodal: false,
+ QCDWValue: [],
+ QCDWList: [],
+ drawerTitle2: '',
+ drawerTitle: '',
+ type: '',
+ modalshowflag2: false,
+ modalshowflag: false,
+ nodeList2: [],
+ nodeList: [],
+ qcdwOptions: [],
standShow: false,
standShow2: false,
ListModel: false,
@@ -319,7 +332,44 @@ export default {
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
selectList: [],
- formRules: {},
+ qbfsFormRules: {
+ esName1: [
+ {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
+ ],
+ esName2: [
+ {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
+ ],
+ unit: [
+ {required: true, message: '请输入单位', trigger: 'blur'},
+ ],
+ esName: [
+ {required: true, message: '请输入企标名称', trigger: 'blur'},
+ ],
+ planStatus: [
+ {required: true, message: '请选择计划状态', trigger: 'change'},
+ ],
+ reviseStatus: [
+ {required: true, message: '请选择制修订状态', trigger: 'change'},
+ ],
+ resPersonName: [
+ {required: true, message: '请输入评审责任人', trigger: 'blur'},
+ ],
+ wgLeaderName: [
+ {required: true, message: '请输入工作组组长', trigger: 'blur'},
+ ],
+ draftTime: [
+ {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
+ ],
+ releaseTime: [
+ {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
+ ],
+ drafterName: [
+ {required: true, message: '请输入起草人', trigger: 'blur'},
+ ],
+ mergeReason: [
+ {required: true, message: '请输入合并原因', trigger: 'blur'},
+ ],
+ },
standinfoList: [],
standardSearch: {
reviseStatus: "",
@@ -334,6 +384,9 @@ export default {
isSubTime: "",
mergeReason: "",
company: "",
+ resPersonName: '',
+ drafterName: '',
+ wgLeaderName:'',
groupLeader: "",
drafterPeople: "",
formulateStatus: "",
@@ -357,21 +410,16 @@ export default {
reviewDate: '',
abolishCause:'',
},
- qbzxdForm2: {
- standCode: "",
- standName: "",
- enName: '',
- entCategory: '',
- replaceNumber: '',
- replacedNumber: '',
- releaseDate: '',
- implementDate: '',
- reviewDate: '',
- abolishCause:'',
- },
}
},
mounted() {
+ //查询下拉框数据
+ this.$http.get('sys/dictype/getDicTypeListCode', '',{
+ _this: this
+ }, res => {
+ console.log(res);
+ this.qcdwOptions = res.data.QCDW // 起草单位
+ })
this.getStandDataBtn()
},
@@ -385,6 +433,66 @@ export default {
}
},
methods: {
+ QCDWOK () {
+ let arr1 = []
+ if (this.qbfsForm.unit !== undefined) {
+ let str = this.qbfsForm.unit.replace(/，/g, ',')
+ arr1 = str.split(',')
+ }
+ let arr2 = arr1.concat(this.QCDWValue)
+ this.qbfsForm.unit = Array.from(new Set(arr2)).join(',')
+ this.QCDWmodal = false
+ },
+ QCDWClick () {
+ this.QCDWValue = []
+ this.QCDWmodal = true
+ },
+ choiceZRR() {
+ this.nodeList = [];
+ this.drawerTitle = '请选择工作组组长';
+ this.modalshowflag = true;
+ },
+ checkedRole(data) {
+ this.qbfsForm.wgLeader = data[0].id;
+ this.qbfsForm.wgLeaderName = data[0].name;
+ this.modalshowflag = false;
+ },
+ choiceZRRS(type) {
+ this.type = type
+ if(type === '1' ){
+ this.drawerTitle2 = '请选择起草人'
+ this.nodeList2 = [];
+ if (this.qbfsForm.drafter !== undefined) {
+ this.nodeList2 = this.qbfsForm.drafter.split(",");
+ }
+ }else if(type === '2'){
+ this.drawerTitle2 = '请选择评审责任人'
+ this.nodeList2 = [];
+ if (this.qbfsForm.resPerson !== undefined) {
+ this.nodeList2 = this.qbfsForm.resPerson.split(",");
+ }
+ }
+ this.modalshowflag2 = true;
+ },
+ checkedRole2(data) {
+ var idList = "";
+ var nameList = "";
+ data.forEach(item => {
+ if (nameList.length > 0) {
+ nameList += ",";
+ idList += ",";
+ }
+ idList += item.id;
+ nameList += item.name;
+ });
+ if(this.type === '1'){
+ this.qbfsForm.drafter = idList;
+ this.qbfsForm.drafterName = nameList;
+ }else if(this.type === '2'){
+ this.qbfsForm.resPerson = idList;
+ this.qbfsForm.resPersonName = nameList;
+ }
+ },
validateForm () {
let flag = null
this.$refs['qbfsForm'].validate((valid) => {
@@ -418,14 +526,16 @@ export default {
this.$message.warning('请至少选择一条数据进行带入')
}else{
if(this.showType === 'one'){
- this.qbzxdForm.esName = this.selectList[0].esName || '--'
- this.qbzxdForm.planStatus = this.selectList[0].planStatus || '--'
- this.qbzxdForm.reviseStatus = this.selectList[0].reviseStatus || '--'
+ this.qbfsForm.esId1 = this.selectList[0].id || '--'
+ this.qbfsForm.esName1 = this.selectList[0].esName || '--'
+ this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--'
+ this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--'
this.standShow = true
}else{
- this.qbzxdForm2.esName = this.selectList[0].esName || '--'
- this.qbzxdForm2.planStatus = this.selectList[0].planStatus || '--'
- this.qbzxdForm2.reviseStatus = this.selectList[0].reviseStatus || '--'
+ this.qbfsForm.esId2 = this.selectList[0].id || '--'
+ this.qbfsForm.esName2 = this.selectList[0].esName || '--'
+ this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--'
+ this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--'
this.standShow2 = true
}
this.ListModel = false
@@ -434,7 +544,7 @@ export default {
//企业标准查询
getStandDataBtn(){
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
- reviseStatus: this.standardSearch.reviseStatus,
+ reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName,
page: this.page,
pageSize: this.pageSize,
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index cfb23dd2a..f26e7448b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -37,10 +37,10 @@
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
new file mode 100644
index 000000000..9635ea314
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
@@ -0,0 +1,2758 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
new file mode 100644
index 000000000..acae858f6
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -0,0 +1,2713 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
new file mode 100644
index 000000000..1acc953ba
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -0,0 +1,2713 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
new file mode 100644
index 000000000..567943f56
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -0,0 +1,2713 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
new file mode 100644
index 000000000..860ad47b4
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
@@ -0,0 +1,2773 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
new file mode 100644
index 000000000..e44a9097c
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -0,0 +1,2713 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
new file mode 100644
index 000000000..49028e9ac
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -0,0 +1,2713 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
new file mode 100644
index 000000000..7c855f9a4
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
@@ -0,0 +1,2713 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
new file mode 100644
index 000000000..f6be43a03
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
@@ -0,0 +1,2758 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
new file mode 100644
index 000000000..25f890753
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -0,0 +1,2758 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
new file mode 100644
index 000000000..5d8f1c6a9
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -0,0 +1,2713 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
new file mode 100644
index 000000000..8c80bb053
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -0,0 +1,2713 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
new file mode 100644
index 000000000..b860db0f0
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
@@ -0,0 +1,2713 @@
+
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 企标制修订流程及企业标准库流程
+ 发起企标制修订流程
+
+
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 33ecbeebf..9c254a3a2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -37,10 +37,10 @@
+
+ 基础信息
+
+ 审批历史
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+ 过程稿件
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ scope.row.standStatusShow }}
+
+
+
+
+ 查看
+
+
+
+
+
+
-
- 立项信息
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index cc5897e1e..c22a3a49c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -3,86 +3,48 @@
+
+ 立项信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 手动查找
+
+
+
+
+
+ 根据企标编号、名称查询
+
+
+
+
+
+
+
+
+
+
+
+ 根据企标编号、名称、类别查询
+
+
+
+
+
+
+
+
+
+
+ 合并后企标信息
+
@@ -105,12 +67,11 @@
-
-
+
+
+
-
-
+
@@ -136,19 +106,16 @@
-
+
+
+
-
-
+
+
@@ -296,6 +263,41 @@
带入
+
+
+
+
+
+ 手动查找
+
+ 确认人
+产品工程经理
-
确认人
+产品工程经理
-
基础信息
@@ -44,6 +44,14 @@
clearable
>
+
@@ -215,7 +195,6 @@
{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
@@ -252,163 +231,424 @@
+ >
-
-
+
-
-
-
+
+
+
+
+
-
-
+
+ {
- // this.dataList = res.data.records;
- // this.dataList.forEach(item => {
- // // 责任部门转换
- // if (item.zrbm !== null || item.zrbm !== "") {
- // let k = (item.zrbm || "").split(",");
- // for (let i in this.zrbmOptions) {
- // for (let m = 0; m < k.length; m++) {
- // if (this.zrbmOptions[i].value === k[m]) {
- // k[m] = this.zrbmOptions[i].label;
- // }
- // item.zrbm = k.join(",");
- // }
- // }
- // }
- // });
- // });
- // },
+ getStandData() {
+ this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+ id: this.detailedId,
+ page: 1,
+ Size: 100
+ }, {
+ _this: this
+ }, res => {
+ this.dataList = res.data.records;
+ this.dataList.forEach(item => {
+ // 责任部门转换
+ if (item.zrbm !== null || item.zrbm !== "" ) {
+ let k = (item.zrbm || "").split(",");
+ for (let i in this.zrbmOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.zrbmOptions[i].value === k[m]) {
+ k[m] = this.zrbmOptions[i].label;
+ }
+ item.zrbm = k.join(",");
+ }
+ }
+ }
+ });
+ this.dataList.map(item => {
+ if(item.zrbm === '[]'){
+ item.zrbm = ''
+ }
+ })
+ });
+ },
// 接受按钮
handleAccept(){
this.isSubmit = true
@@ -679,26 +956,34 @@ export default {
},
//提交事件
handleSubmit() {
- this.isSubmit = true;
- this.qdform.commentText = this.commentText;
- this.qdform.dataList = this.dataList
- const json = JSON.stringify(this.qdform);
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- }, e => {
- });
+ this.dataList.forEach(item => {
+ this.$set(item, 'standId', item.id)
+ })
+ if(this.qdform.detailPeople === undefined){
+ this.$message.warning('请选择确认人')
+ }else{
+ this.isSubmit = true;
+ this.qdform.commentText = this.commentText;
+ this.qdform.dataList = this.dataList
+ const json = JSON.stringify(this.qdform);
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ }, e => {
+ });
+ }
},
addList() {
+ this.searchLawBtn()
this.standModel = true;
},
//批量删除
@@ -715,23 +1000,46 @@ export default {
this.projectStand.map(item => {
let index;
index = this.dataList.findIndex(items => {
- return items.standId === item.standId;
+ return items.id === item.id;
});
if (index > -1) {
this.dataList.splice(index, 1);
}
});
+ this.$refs.standSelection.clearSelection()
}).catch(() => {
});
}
},
//添加标准勾选框数据
- selectStand(data) {
- this.standList = data;
+ handleSelectTableChange (data) {
+ this.handleSelectTableList = data
+ console.log(this.handleSelectTableList);
},
selectStandChange(data){
this.projectStand = data
},
+ choiceZRRS() {
+ this.nodeList2 = [];
+ if (this.qdform.detailPeople) {
+ this.nodeList2 = this.qdform.detailPeople.split(",");
+ }
+ this.modalshowflag = true;
+ },
+ checkedRole2(data) {
+ var idList = "";
+ var nameList = "";
+ data.forEach(item => {
+ if (nameList.length > 0) {
+ nameList += ",";
+ idList += ",";
+ }
+ idList += item.id;
+ nameList += item.name;
+ });
+ this.qdform.detailPeople = idList;
+ this.qdform.detailPeopleName = nameList;
+ },
cancelStand() {
this.standModel = false;
},
@@ -764,52 +1072,138 @@ export default {
}
},
+ //手动查找的清空按钮
+ clearLawBtn(){
+ this.lawInfoTableLoading = true
+ this.handleSelectForm.lawNumber = ''
+ this.handleSelectForm.standNumber = ''
+ this.handleSelectForm.lawsNumber = ''
+ this.handleSelectForm.standCode = ''
+ //清空标准名称/政策名称的查询
+ this.handleSelectForm.lawName = ''
+ this.handleSelectForm.standName = ''
+ this.handleSelectForm.numberName = ''
+ this.searchLawBtn()
+ },
//添加标准的查询按钮
- search() {
- this.page = 1;
- this.getStand();
- },
- clearSearch() {
- this.standCommonlySearch = {
- standSort: "",
- standNumber: "",
- standType: ""
- };
- this.getStand();
- },
- pageChange(page) {
- this.page = page;
- this.getStand();
- },
- pageSizeChange(pageSize) {
- this.pageSize = pageSize;
- this.getStand();
- },
- //查询清单下的标准
- getStand() {
- this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
- id: this.detailedId,
- page: this.page,
- Size: this.pageSize,
- ...this.standCommonlySearch
- }, {
- _this: this
- }, res => {
- if (res.data === null) {
- this.standardData = "";
- this.totalDo = "";
- }
- this.standardData = res.data.records;
- this.standardData.forEach(item => {
- if (item.zccssrqgj === "-" || item.zccssrqgj === 'null' || item.zccssrqgj === 'undefined') {
- item.zccssrqgj = "";
+ searchLawBtn(){
+ console.log(this.handleSelectForm);
+ this.lawInfoTableLoading = true
+ if (this.handleSelectForm.dataSource === 'INLAND'){
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+ _this: this
+ },res=>{
+ console.log('国内标准库数据',res)
+ if (res.ok){
+ this.lawInfoTable = res.data.list
+ this.handleSelectForm.total = res.data.count
+ if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+ this.lawInfoTableLoading = true
+ this.handleSelectPageChange(1)
+ }else {
+ this.lawInfoTableLoading = false
+ this.lawInfoTableLoading = false
+ }
+ }else {
+ this.$message.error(res.message)
}
- if (item.xcxssrqgj === "-" || item.xcxssrqgj === 'null' || item.xcxssrqgj === 'undefined' ) {
- item.xcxssrqgj = "";
+ },e=>{
+ this.lawInfoTable = []
+ this.handleSelectForm.total = 0
+ })
+ }else if(this.handleSelectForm.dataSource === 'FOREIGN'){
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+ _this: this
+ },res=>{
+ if (res.ok){
+ this.lawInfoTable = res.data.list
+ this.handleSelectForm.total = res.data.count
+ if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+ this.lawInfoTableLoading = true
+ this.handleSelectPageChange(1)
+ }else {
+ this.lawInfoTableLoading = false
+ }
+ }else {
+ this.$message.error(res.message)
+ this.lawInfoTableLoading = false
}
- });
- this.total = res.data.total;
- });
+ },e=>{
+ this.lawInfoTable = []
+ this.handleSelectForm.total = 0
+ })
+ }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
+ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{
+ _this: this
+ },res=>{
+ if (res.ok){
+ this.lawInfoTable = res.data.list
+ this.handleSelectForm.total = res.data.count
+ if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+ this.lawInfoTableLoading = true
+ this.handleSelectPageChange(1)
+ }else {
+ this.lawInfoTableLoading = false
+ }
+ }else {
+ this.$message.error(res.message)
+ this.lawInfoTableLoading = false
+ }
+ },e=>{
+ this.lawInfoTable = []
+ this.handleSelectForm.total = 0
+ })
+ }else {
+ this.$message.warning('请先选择标准/政策来源')
+ }
+ },
+ handleSelectConfirm(){
+ if(this.handleSelectTableList.length < 1){
+ this.$message.warning('请至少选择一条数据进行添加')
+ }else{
+ this.standList.forEach(item =>{
+ if(item.ssrq === "-"){
+ item.ssrq = ''
+ }
+ if(item.zrbm === '[]'){
+ item.zrbm =''
+ }
+ })
+ this.handleSelectTableList.map(item => {
+ let addIndex
+ addIndex = this.dataList.findIndex(items =>{
+ return items.id === item.id
+ })
+ if(addIndex > -1){
+ this.$message.warning('请勿重复添加数据')
+ }else{
+ this.dataList.push(item)
+ }
+ })
+ this.standModel = false
+ }
+ },
+ dataSourceChange() {
+ this.handleSelectForm.page = 1
+ this.lawInfoTableLoading = true
+ this.handleSelectForm.standType = this.handleSelectForm.dataSource
+ this.searchLawBtn()
+ },
+ //根据标准编号的查询
+ lawNumberSearch() {
+ this.handleSelectForm.standNumber = this.handleSelectForm.lawNumber
+ this.handleSelectForm.lawsNumber = this.handleSelectForm.lawNumber
+ this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
+ },
+ handleSelectPageChange(page){
+ this.lawInfoTableLoading = true
+ this.handleSelectForm.page = page
+ this.searchLawBtn()
+ },
+ handleSelectPageSizeChange(pageSize){
+ this.lawInfoTableLoading = true
+ this.handleSelectForm.pageSize = pageSize
+ this.searchLawBtn()
},
},
computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index 50bfeb2b3..abd229140 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -2,7 +2,7 @@
项目清单确认流程
- 法规部经理审批
+ 确认人确认
填写信息
+
{{ scope.row.standName }}
@@ -89,8 +95,8 @@
{{ scope.row.standEnName }}
@@ -100,10 +106,9 @@
prop="ssrq"
width="190px"
align="center"
- sortable
label="标准实施日期">
- {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
+ label="标准是否涉及">
+
+
+
+
-
-
-
-
+ width="180"
+ label="备注">
+
+
+
+
-
+
{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
@@ -243,19 +248,422 @@
流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+ this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
+ this.setMap(res.data.WBZTCLASS);// 文本状态
+ this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
+ this.showLocalProductData(this.getLocalPro);
+ }, e => {
+ });
+ },
methods: {
+ formatIssueDate(str) {
+ const momentDate = this.$moment(str)
+ if (momentDate.isValid()) {
+ return this.$moment(str).format('YYYY-MM-DD')
+ } else {
+ return str
+ }
+ },
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
@@ -350,7 +807,7 @@ export default {
})
},
// 请求转换流程图
- processNum () {
+ processNum (row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
@@ -364,6 +821,18 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
+ //转办事件
+ handleTransfer(){
+ this.drawerModal = true
+ this.drawerTitle = '转办处理人'
+ this.selectPeople = row
+ },
+ // 将文本状态的id与name对应
+ setMap(data) {
+ data.forEach(item => {
+ this.$set(this.textStatusMap, item.value, item.label)
+ })
+ },
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -401,6 +870,15 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
+ let commitStatus = res.commitStatus
+ if(commitStatus && commitStatus > 0){
+ this.acceptShow = true
+ this.submitShow = false
+ }else {
+ this.acceptShow = false
+ this.submitShow = true
+ }
+ this.todoId = res.id
this.getFormFieldList(processForm);
}
}).catch(e => {
@@ -409,58 +887,111 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
+ console.log(item);
this.$nextTick(() => {
if(item.form === undefined){
this.qdform = JSON.parse(JSON.stringify(item));
this.qdform.prcNum = this.prcNum;
this.qdform.prcName = this.prcName;
- this.dataList = item.dataList
this.qdform["id"] = item.id;
- this.projectId = item.projectId
+ this.dataList = item.dataList
+ this.dataList.forEach(item => {
+ this.$set(item, 'involve', 'involve')
+ this.$set(item, 'remarks', '')
+ })
+ // this.projectId = item.projectId;
+ // //获取清单id 查询对应清单下的标准
+ // this.detailedId = item.detailedListId;
// this.getStandData();
}else{
this.qdform = item.form
this.dataList =item.form.dataList
- this.projectId = item.form.projectId
- // this.getStandData();
+ this.detailedId = item.form.detailedListId;
}
});
},
+ //查询清单下的标准
+ getStandData() {
+ this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+ _this: this
+ }, res => {
+ this.dataList = res.data.records;
+ this.dataList.forEach(item => {
+ // 责任部门转换
+ if (item.zrbm !== null || item.zrbm !== "" ) {
+ let k = (item.zrbm || "").split(",");
+ for (let i in this.zrbmOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.zrbmOptions[i].value === k[m]) {
+ k[m] = this.zrbmOptions[i].label;
+ }
+ item.zrbm = k.join(",");
+ }
+ }
+ }
+ });
+ this.dataList.map(item => {
+ if(item.zrbm === '[]'){
+ item.zrbm = ''
+ }
+ })
+ });
+ },
+ // 接受按钮
+ handleAccept(){
+ this.isSubmit = true
+ execTask({
+ todoId: this.todoId // 当前节点ID
+ }).then(res => {
+ if (res.sign && res.sign === '0') {
+ this.$message.success('接收成功')
+ this.$router.push('/processCenter')
+ }
+ this.isSubmit = false
+ })
+ },
+ //保存事件
+ handleSave() {
+ this.saveLoading = true;
+ let _formData = new FormData();
+ this.qdform.dataList = this.dataList
+ _formData.append("id", this.bpnId || "");
+ _formData.append("prcType", "10");
+ _formData.append('taskIds', this.taskIds)
+ _formData.append("json", JSON.stringify({
+ form: this.qdform,
+ commentText: this.commentText
+ }));
+ saveTaskForPub(_formData).then(res => {
+ this.saveLoading = false;
+ this.$message.success("保存成功");
+ this.bpnId = res.result;
+ }).catch(e => {
+ this.saveLoading = false;
+ });
+ },
+ handleRemark(){
+ this.dataList.map(item => {
+ if(item.involve === 'noInvolve'){
+ comFlag
+ }
+ })
+ },
//提交事件
handleSubmit() {
- this.isSubmit = true;
- this.qdform.passFlag = "0";
- this.qdform.commentText = this.commentText;
- this.qdform.dataList = this.dataList
- const json = JSON.stringify(this.qdform);
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
+ let comFlag = 0
+ this.dataList.map(item => {
+ if(item.involve === 'noInvolve' && item.remarks === ''){
+ comFlag++
}
- this.isSubmit = false;
- }, e => {
- });
- },
- //转办事件
- handleTransfer(){
- this.drawerModal = true
- this.drawerTitle = '转办处理人'
- this.selectPeople = row
- },
- //驳回事件
- beforeBack() {
- if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
- this.$message.warning("请填写审批意见");
- } else {
- this.qdform.passFlag = "1";
+ })
+ if(comFlag > 0){
+ this.$message.warning('请填写不涉及的备注信息')
+ }else{
+ this.isSubmit = true;
+ this.qdform.currentPerson = this.$store.getters.userInfo.userName;
this.qdform.commentText = this.commentText;
+ this.qdform.dataList = this.dataList
const json = JSON.stringify(this.qdform);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
@@ -473,13 +1004,44 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
+ this.isSubmit = false;
}, e => {
});
}
},
+ addList() {
+ this.searchLawBtn()
+ this.standModel = true;
+ },
+ //批量删除
+ delectList(){
+ if (this.projectStand.length < 1) {
+ this.$message.warning("请选择一条数据进行删除");
+ } else {
+ this.$confirm("您确认删除这些数据?", "提示", {
+ confirmButtonText: "确认",
+ confirmButtonClass: "common-button-primary",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ this.projectStand.map(item => {
+ let index;
+ index = this.dataList.findIndex(items => {
+ return items.id === item.id;
+ });
+ if (index > -1) {
+ this.dataList.splice(index, 1);
+ }
+ });
+ this.$refs.standSelection.clearSelection()
+ }).catch(() => {
+ });
+ }
+ },
//添加标准勾选框数据
- selectStand(data) {
- this.standList = data;
+ handleSelectTableChange (data) {
+ this.handleSelectTableList = data
+ console.log(this.handleSelectTableList);
},
selectStandChange(data){
this.projectStand = data
@@ -503,7 +1065,7 @@ export default {
this.standList.map(item => {
let addIndex
addIndex = this.dataList.findIndex(items =>{
- return items.standId === item.id
+ return items.id === item.id
})
if(addIndex > -1){
this.$message.warning('请勿重复添加数据')
@@ -516,56 +1078,141 @@ export default {
}
},
+ //手动查找的清空按钮
+ clearLawBtn(){
+ this.lawInfoTableLoading = true
+ this.handleSelectForm.lawNumber = ''
+ this.handleSelectForm.standNumber = ''
+ this.handleSelectForm.lawsNumber = ''
+ this.handleSelectForm.standCode = ''
+ //清空标准名称/政策名称的查询
+ this.handleSelectForm.lawName = ''
+ this.handleSelectForm.standName = ''
+ this.handleSelectForm.numberName = ''
+ this.searchLawBtn()
+ },
//添加标准的查询按钮
- search() {
- this.getStand();
- },
- clearSearch() {
- this.standCommonlySearch = {
- standSort: "",
- standNumber: "",
- standType: ""
- };
- this.getStand();
- },
- pageChange(page) {
- this.page = page;
- this.getStand();
- },
- pageSizeChange(pageSize) {
- this.pageSize = pageSize;
- this.getStand();
- },
- getStand(data) {
- this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
- id: this.detailedId,
- page: this.page,
- Size: this.pageSize,
- ...this.standCommonlySearch
- }, {
- _this: this
- }, res => {
- if (res.data === null) {
- this.standardData = "";
- this.totalDo = "";
- }
- this.standardData = res.data.records;
- this.standardData.forEach(item => {
- if (item.zccssrqgj === "-") {
- item.zccssrqgj = "";
+ searchLawBtn(){
+ this.lawInfoTableLoading = true
+ if (this.handleSelectForm.dataSource === 'INLAND'){
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+ _this: this
+ },res=>{
+ console.log('国内标准库数据',res)
+ if (res.ok){
+ this.lawInfoTable = res.data.list
+ this.handleSelectForm.total = res.data.count
+ if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+ this.lawInfoTableLoading = true
+ this.handleSelectPageChange(1)
+ }else {
+ this.lawInfoTableLoading = false
+ this.lawInfoTableLoading = false
+ }
+ }else {
+ this.$message.error(res.message)
}
- if (item.xcxssrqgj === "-") {
- item.xcxssrq = "";
+ },e=>{
+ this.lawInfoTable = []
+ this.handleSelectForm.total = 0
+ })
+ }else if(this.handleSelectForm.dataSource === 'FOREIGN'){
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+ _this: this
+ },res=>{
+ if (res.ok){
+ this.lawInfoTable = res.data.list
+ this.handleSelectForm.total = res.data.count
+ if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+ this.lawInfoTableLoading = true
+ this.handleSelectPageChange(1)
+ }else {
+ this.lawInfoTableLoading = false
+ }
+ }else {
+ this.$message.error(res.message)
+ this.lawInfoTableLoading = false
}
- });
- this.total = res.data.total;
- });
+ },e=>{
+ this.lawInfoTable = []
+ this.handleSelectForm.total = 0
+ })
+ }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
+ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{
+ _this: this
+ },res=>{
+ if (res.ok){
+ this.lawInfoTable = res.data.list
+ this.handleSelectForm.total = res.data.count
+ if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+ this.lawInfoTableLoading = true
+ this.handleSelectPageChange(1)
+ }else {
+ this.lawInfoTableLoading = false
+ }
+ }else {
+ this.$message.error(res.message)
+ this.lawInfoTableLoading = false
+ }
+ },e=>{
+ this.lawInfoTable = []
+ this.handleSelectForm.total = 0
+ })
+ }else {
+ this.$message.warning('请先选择标准/政策来源')
+ }
},
- // 将文本状态的id与name对应
- setMap(data) {
- data.forEach(item => {
- this.$set(this.textStatusMap, item.value, item.label);
- });
+ handleSelectConfirm(){
+ if(this.handleSelectTableList.length < 1){
+ this.$message.warning('请至少选择一条数据进行添加')
+ }else{
+ this.standList.forEach(item =>{
+ if(item.ssrq === "-"){
+ item.ssrq = ''
+ }
+ if(item.zrbm === '[]'){
+ item.zrbm =''
+ }
+ })
+ this.handleSelectTableList.map(item => {
+ let addIndex
+ addIndex = this.dataList.findIndex(items =>{
+ return items.id === item.id
+ })
+ if(addIndex > -1){
+ this.$message.warning('请勿重复添加数据')
+ }else{
+ this.dataList.push(item)
+ }
+ })
+ this.dataList.forEach(item => {
+ this.$set(item, 'involve', 'involve')
+ this.$set(item, 'remarks', '')
+ })
+ this.standModel = false
+ }
+ },
+ dataSourceChange() {
+ this.handleSelectForm.page = 1
+ this.lawInfoTableLoading = true
+ this.handleSelectForm.standType = this.handleSelectForm.dataSource
+ this.searchLawBtn()
+ },
+ //根据标准编号的查询
+ lawNumberSearch() {
+ this.handleSelectForm.standNumber = this.handleSelectForm.lawNumber
+ this.handleSelectForm.lawsNumber = this.handleSelectForm.lawNumber
+ this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
+ },
+ handleSelectPageChange(page){
+ this.lawInfoTableLoading = true
+ this.handleSelectForm.page = page
+ this.searchLawBtn()
+ },
+ handleSelectPageSizeChange(pageSize){
+ this.lawInfoTableLoading = true
+ this.handleSelectForm.pageSize = pageSize
+ this.searchLawBtn()
},
},
computed: {
@@ -573,23 +1220,7 @@ export default {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
- mounted() {
- this.processTable();
- this.getData();
- // 查询各下拉框数据
- this.$http.get("sys/dictype/getDicTypeListCode", "", {
- _this: this,
- loading: "loading"
- }, res => {
- this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
- this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
- this.standStateOptions = res.data.WBZTCLASS; // 文本状态
- this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
- this.setMap(this.standStateOptions);
- this.showLocalProductData(this.getLocalPro);
- }, e => {
- });
- }
+
};
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
new file mode 100644
index 000000000..2a2e58460
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -0,0 +1,1287 @@
+
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+ 清空
+
+
+
+ 数据获取中
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
- 清空
-
-
-
-
- 基础信息
@@ -50,10 +50,16 @@
+
+ 添加
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+ 清空
+
+
+
+ 数据获取中
+
+
+
+
+
+ 项目清单确认流程
+ 产品工程经理汇总
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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..d67d12061
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
@@ -0,0 +1,709 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+ {{ scope.row.standSort
+ }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
+ {{ scope.row.standSort }}
+ {{ scope.row.standNumber }}
+
+
+
+
+ {{ scope.row.standName }}
+
+
+
+
+ {{ scope.row.standEnName }}
+
+
+
+
+ {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+
+
+
+
+ {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
+
+
+
+
+ {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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/creatProcess/zcrk/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
index c65b895c7..28f3d1d1f 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
@@ -1092,7 +1092,6 @@
_this: this
}, res => {
if (res.success) {
- debugger
if(this.formTongGuo.approvalOpinion === '1'){
this.$message.warning("驳回成功")
this.isSubmit = false
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index efdfb9cb1..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 ? scope.row.ssrq.substring(0, 10) : '-' }}
+
+
+
+
+ {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
+
+
+
+
+ {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
@@ -298,6 +298,21 @@
+
+
+
+
+
+ ![]()
+
+
+
+ 企标制修订流程及企业标准库流程
+
+
@@ -379,6 +394,12 @@ export default {
this.$store.commit('setDetailMap', this.$route.path)
this.$store.commit('setHandleInfo')
switch (prcType) {
+ case 'buss1':
+ // 企标制修订流程及企业标准库流程
+ this.$router.push({
+ name: 'bussLibrary1'
+ })
+ break
case '2':
// 标准调研流程
this.$router.push({
diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue
new file mode 100644
index 000000000..0652e0c00
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue
@@ -0,0 +1,462 @@
+
+
{{ scope.row.standName }}
@@ -354,53 +354,53 @@
+ prop="issueTime"
+ sortable="custom"
+ width="120"
+ label="发布日期">
{{ formatIssueDate(scope.row.issueTime) }}
{{ formatIssueDate(scope.row.issueTime) }}
+ prop="ssrq"
+ sortable="custom"
+ width="120"
+ label="实施日期">
{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
- {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+ prop="xcxssrq"
+ sortable="custom"
+ width="150"
+ label="新车型实施日期">
{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
+ prop="zccssrq"
+ sortable="custom"
+ width="150"
+ label="在产车实施日期">
{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
+ prop="textStatus"
+ sortable="custom"
+ width="110"
+ label="文本状态">
@@ -416,8 +416,8 @@
{{
@@ -436,10 +436,10 @@
{{
@@ -454,10 +454,10 @@
+ prop="issueTime"
+ sortable="custom"
+ width="120"
+ label="发布日期">
@@ -815,7 +813,7 @@
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 4f10273ac..2dc1394e7 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -9,7 +9,6 @@
-
+ :filter-node-method="filterNode">
{{ node.label }}
@@ -185,8 +183,8 @@
fontWeight: 'bold', height: '48px'}"
@selection-change="standSelectChange"
@sort-change="sortChange">
+
@@ -1376,14 +1374,14 @@
{{ scope.row.issueTime || '' }}
@@ -1393,7 +1391,7 @@
prop="XCXSSRQ"
label="实施日期"
sortable
- width="200"
+ width="120"
align="center">
{{ formatText(scope.row.XCXSSRQ) }}
@@ -1402,7 +1400,7 @@
{{ textStatusMap[scope.row.textStatus] }}
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 29dc85311..b100be5e9 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -87,9 +87,9 @@
ref="multipleTable"
:data="localProTableList"
tooltip-effect="dark"
- style="width: 100%;height: inherit"
+ style="width: 100%"
border
- :max-height="400"
+ max-height="600"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
fontWeight: 'normal', height: '48px'}"
@selection-change="handleSelectionChange">
@@ -97,18 +97,23 @@
show-overflow-tooltip
prop="projectPlatfor"
align="center"
+ fixed="left"
+ min-width="100"
label="产品平台">
{{ scope.row.projectName }}
@@ -142,7 +147,7 @@
show-overflow-tooltip
prop="productLine"
label="产品线"
- min-width="120"
+ min-width="160"
align="center"
>
@@ -184,7 +189,7 @@
align="center"
label="项目经理">
-
+
@@ -1638,9 +1643,14 @@ export default {
}
}
}
-
+///deep/ .el-table--scrollable-x .el-table__body-wrapper {
+// overflow-x: scroll;
+//}
+///deep/.el-table__fixed {
+// height: 48px !important;
+//}
/deep/.el-table .el-table__body-wrapper {
- height: 86%;
+ height: 84%;
}
::v-deep .el-drawer__header {
& > span:first-child {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 3c9121860..0854650a0 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -10,7 +10,7 @@
- 产品平台1: {{ localProEO.projectPlatfor }}
+ 产品平台: {{ localProEO.projectPlatfor }}
项目编号: {{ localProEO.projectNumber }}
@@ -36,10 +36,11 @@
项目级别: {{ localProEO.projectLevel }}
- 项目经理: {{ localProEO.uname }}
- 项目计划开始时间: 产品线: {{ localProEO.productLine }}
+ 项目经理: {{ localProEO.uname }}
+ 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}
- 项目计划完成时间: 项目计划完成时间: {{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }}
@@ -100,12 +101,14 @@
@@ -166,6 +169,15 @@
+
+
+ {{ scope.row.endTimes ? scope.row.endTimes.substring(0,10) : '' }}
+
+
{{ scope.row.standSerialNumber }}
@@ -115,7 +116,7 @@
@@ -124,12 +125,12 @@
@@ -145,7 +146,7 @@
@@ -186,7 +187,7 @@
{{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
-
+
@@ -1120,7 +1121,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 +1141,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
@@ -1187,6 +1188,12 @@ export default {
color: #606266 !important;
}
#rectification-dataBase {
+ /deep/ .el-table__fixed {
+ height: 100% !important; //设置高优先，以覆盖内联样式
+ }
+ /deep/ .el-table__fixed-right {
+ height: 100% !important; //设置高优先，以覆盖内联样式
+ }
/deep/ .table-wrap {
.el-table__fixed {
height: calc(~'100% - 20px') !important;
diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index 3d2404d61..128f670dc 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -69,7 +69,7 @@
{{ scope.row.category }}
@@ -86,6 +86,7 @@
{{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
@@ -94,6 +95,7 @@
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 @@
+
+ 标准解读流程
+ 参会人员确认
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue
new file mode 100644
index 000000000..589e3dc2a
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue
@@ -0,0 +1,466 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+ 标准解读流程
+ 审批
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue
new file mode 100644
index 000000000..999b32bbc
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue
@@ -0,0 +1,529 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+ 标准解读流程
+ 审批
+ 会签
+ 审定
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue
new file mode 100644
index 000000000..b7c0ab1e9
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue
@@ -0,0 +1,506 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+ 标准解读流程
+ 参会人员确认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue
new file mode 100644
index 000000000..4fa6b87d6
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue
@@ -0,0 +1,448 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ hh_pageData.associaName || '-' }}
+
+
+
+
+ {{ hh_pageData.associaNameOne || '-' }}
+
+
+
+
+ {{ hh_pageData.associaNameTwo || '-' }}
+
+
+
+
+
+
+ {{ hh_pageData.partPeople || '-' }}
+
+
+
+
+ {{ hh_pageData.meetingStartTime || '-' }}
+
+
+
+
+
+
+ {{ hh_pageData.meetingName || '-' }}
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
new file mode 100644
index 000000000..c15538763
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
@@ -0,0 +1,472 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+ 标准解读流程
+ 责任负责人审批
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
new file mode 100644
index 000000000..fef41fc86
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
@@ -0,0 +1,485 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+ 标准解读流程
+ 审批
+ 会签
+ 审定
+
+
+
+
+
+
+
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 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+ 标准解读流程
+ 责任人审核
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue
new file mode 100644
index 000000000..2dd643d0f
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue
@@ -0,0 +1,473 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+ 拆分信息
+
+
+
+
+
+
+
+
+ 查看条款内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+ 隐藏基础信息
+ 展开基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 符合
+ 不符合
+
+ {{ 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 ? '已完成' : '未完成'}}
+
+
+
+
+
+
+ 标准解读流程
+ 分发负责人审核材料
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 081dd1ae8..12cd6fc57 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -227,6 +227,12 @@ export default {
if (prcType === '1') {
// 标准入库流程数据
this.toProcessDetail('bzrkStep5',row)
+ }else if(prcType === 'laws1'){
+ //政策入库
+ this.toProcessDetail('zcrkStep5',row)
+ }else if(prcType === 'buss1'){
+ //企标入库
+ this.toProcessDetail('bussLibraryDetail',row)
}else if(prcType === '4'){
//标准清单发布流程数据
this.toProcessDetail('bzqdfbStep1-4',row)
@@ -258,6 +264,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 f31618145..11f67461c 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -318,6 +318,152 @@ export default {
})
}
break
+ case 'buss1':
+ if (row.taskInfo === '企标编写') {
+ this.$router.push({
+ name: 'bussLibrary2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '企标汇总修订'){
+ this.$router.push({
+ name: 'bzrkStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '标准化员审批'){
+ this.$router.push({
+ name: 'bzrkStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '重新企标汇总修订'){
+ this.$router.push({
+ name: 'bzrkStepC3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '会签征求意见'){
+ this.$router.push({
+ name: 'bzrkStep5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '主起草人修订并组织评审'){
+ this.$router.push({
+ name: 'bzrkStep6',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '标准法规工程师复审'){
+ this.$router.push({
+ name: 'bzrkStep7',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '重新修订并组织评审'){
+ this.$router.push({
+ name: 'bzrkStepC6',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '技术委员会负责人/起草中心主任审核'){
+ this.$router.push({
+ name: 'bzrkStep8',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '标准法规部部长审核'){
+ this.$router.push({
+ name: 'bzrkStep9',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '专委会副主任/起草单位中心主任审定'){
+ this.$router.push({
+ name: 'bzrkStep10',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '专委会主任/总院院长或主管副院长批准'){
+ this.$router.push({
+ name: 'bzrkStep11',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '主起草人培训'){
+ this.$router.push({
+ name: 'bzrkStep12',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
case 'laws1':
if (row.taskInfo === '政策入库审批') {
this.$router.push({
@@ -834,7 +980,7 @@ export default {
})
} else if (row.taskInfo === '责任人审核') {
this.$router.push({
- name: 'bzjdStep4',
+ name: 'phoneBzjdStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -868,7 +1014,7 @@ export default {
}
break
case '10':
- if (row.taskInfo === '确认人确认') {
+ if (row.taskInfo === '产品工程经理分发清单') {
this.$router.push({
name: 'xmqdqrStep2',
query: {
@@ -879,7 +1025,7 @@ export default {
prcType: row.prcType
}
})
- } else if(row.taskInfo === '标准法规部经理审批'){
+ } else if(row.taskInfo === '确认人确认'){
this.$router.push({
name: 'xmqdqrStep3',
query: {
@@ -890,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/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index 7606c4c8b..734d5021f 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -325,8 +325,8 @@
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+ {{ scope.row.standSerialNumber }}
+
+
+
+
+ {{ scope.row.standName }}
+
+
+
+
+ {{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
{{ formatIssueDate(scope.row.issueTime) }}
@@ -471,61 +471,61 @@
+ prop="ssrq"
+ sortable="custom"
+ width="120"
+ label="实施日期">
{{
- scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
}}
{{
- scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
}}
- {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+ prop="xcxssrq"
+ sortable="custom"
+ width="150"
+ label="新车型实施日期">
{{
- scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
}}
{{
- scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
}}
{{
- scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
}}
+ prop="zccssrq"
+ sortable="custom"
+ width="150"
+ label="在产车实施日期">
{{
- scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
}}
{{
- scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
}}
{{
- scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
}}
+ prop="textStatus"
+ sortable="custom"
+ width="110"
+ label="文本状态">
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 8297e2464..0558a4442 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -177,7 +177,6 @@
type="selection"
width="55"
align="center"
- :selectable="selectable"
>
- {{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}
-
+ {{ scope.row.standNumber}}
+ {{ scope.row.lawsNumber}}
+ {{scope.row.standCode}}
{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}
@@ -213,6 +214,7 @@
prop="xcxssrqgj"
sortable
align="center"
+ width="150"
label="新车型实施日期">
{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}
@@ -224,6 +226,7 @@
prop="zccssrqgj"
sortable
align="center"
+ width="150"
label="在产车实施日期">
{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}
@@ -232,7 +235,7 @@
@@ -1641,6 +1644,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 +1653,7 @@ export default {
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}
@@ -1725,10 +1730,10 @@ export default {
}
},
// 数据搜索table判断checked状态
- selectable(row) {
- console.log('1723',row)
- return row.isRelateAccess === '1' || row.isRelateAccess === undefined
- },
+ // selectable(row) {
+ // console.log('1723',row)
+ // return row.isRelateAccess === '1' || row.isRelateAccess === undefined
+ // },
// 数据搜索 table select事件
sarAccessInfoSearchSelect(val) {
this.selectedAccInfoSearchList = val
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 70ec69b73..47de537fc 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -155,7 +155,6 @@
type="selection"
width="55"
align="center"
- :selectable="selectable"
>
- {{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}
+ {{ scope.row.standNumber}}
+ {{ scope.row.lawsNumber}}
+ {{scope.row.standCode}}
{
console.log('1640',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
@@ -1546,6 +1548,7 @@ export default {
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}
@@ -1621,10 +1624,10 @@ export default {
this.pageInfo()
}
},
- // 数据搜索table判断checked状态
- selectable (row) {
- return row.isRelateAccess === '1' || row.isRelateAccess === undefined
- },
+ // // 数据搜索table判断checked状态
+ // selectable (row) {
+ // return row.isRelateAccess === '1' || row.isRelateAccess === undefined
+ // },
// 数据搜索 table select事件
sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 360907b0e..c780396ed 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -200,7 +200,6 @@
type="selection"
width="55"
align="center"
- :selectable="selectable"
>
- {{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}
+ {{ scope.row.standNumber}}
+ {{ scope.row.lawsNumber}}
+ {{scope.row.standCode}}
{
console.log('1640',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
@@ -1644,6 +1646,7 @@ export default {
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
+ this.drawerTotal = res.data.count
}, e => {
})
}
@@ -1698,9 +1701,9 @@ export default {
}
},
// 数据搜索table判断checked状态
- selectable(row) {
- return row.isRelateAccess === '1' || row.isRelateAccess === undefined
- },
+ // selectable(row) {
+ // return row.isRelateAccess === '1' || row.isRelateAccess === undefined
+ // },
// 数据搜索 table select事件
sarAccessInfoSearchSelect(val) {
this.selectedAccInfoSearchList = val
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 9c9355a48..2eeed91c5 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -17,11 +17,10 @@
:indent="0"
:props="props"
:data="treeList"
- default-expanded-keys="['64df1d5522bb49c09af2']"
+ default-expanded-keys="['1']"
highlight-current
@node-click="treeClick"
- :filter-node-method="filterNode"
- :expand-on-click-node="false">
+ :filter-node-method="filterNode">
批量删除
+ v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">批量删除
+
@@ -404,6 +403,7 @@
:wrapperClosable="false"
size="800px"
@close="resetForm"
+ ref="standard"
append-to-body
>
@@ -772,7 +772,7 @@
>
起草单位
@@ -295,6 +350,15 @@
components: {},
data() {
return {
+ QCDWmodal: false,
+ QCDWValue: [],
+ QCDWList: [],
+ type: '',
+ drawerTitle: '',
+ modalshowflag2: false,
+ modalshowflag: false,
+ nodeList: [],
+ nodeList2: [],
loading: false,
submitLoading: false,
addDrawerTitle: '',
@@ -307,15 +371,18 @@
planStatus: '', // 计划状态
reviseStatus: '', // 制修订状态
resPerson: '', // 评审责任人
+ resPersonName: '',
wgLeader: '', // 工作组组长
+ wgLeaderName: '',
draftTime: '', // 计划标准初稿完成时间
releaseTime: '', // 计划标准发布时间
drafter: '', // 起草人
+ drafterName: '',
// remarks: '', // 备注
},
addFormRules: {
unit: [
- {required: true, message: '请输入单位', trigger: 'blur'},
+ {required: true, message: '请输入单位', trigger: 'change'},
],
esName: [
{required: true, message: '请输入企标名称', trigger: 'blur'},
@@ -327,19 +394,19 @@
{required: true, message: '请选择制修订状态', trigger: 'change'},
],
resPerson: [
- {required: true, message: '请输入评审责任人', trigger: 'blur'},
+ {required: true, message: '请选择评审责任人', trigger: 'change'},
],
wgLeader: [
- {required: true, message: '请输入工作组组长', trigger: 'blur'},
+ {required: true, message: '请选择工作组组长', trigger: 'change'},
],
draftTime: [
- {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
+ {required: true, message: '请输入计划标准初稿完成时间', trigger: 'change'},
],
releaseTime: [
{required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
],
drafter: [
- {required: true, message: '请输入起草人', trigger: 'blur'},
+ {required: true, message: '请选择起草人', trigger: 'change'},
],
},
form: {
@@ -358,6 +425,59 @@
props: {},
watch: {},
methods: {
+ QCDWOK () {
+ let arr1 = []
+ if (this.addForm.unit) {
+ let str = this.addForm.unit.replace(/，/g, ',')
+ arr1 = str.split(',')
+ }
+ let arr2 = arr1.concat(this.QCDWValue)
+ this.addForm.unit = Array.from(new Set(arr2)).join(',')
+ this.QCDWmodal = false
+ },
+ QCDWClick () {
+ this.QCDWValue = []
+ this.QCDWmodal = true
+ },
+ choiceZRR (type, title, id) {
+ this.nodeList = []
+ this.nodeList.push(id)
+ this.type = type
+ this.drawerTitle = title
+ this.modalshowflag = true
+ },
+ checkedRole (data) {
+ this.addForm.wgLeader = data[0].id
+ this.addForm.wgLeaderName = data[0].name
+ },
+ choiceZRRS (type, title, id) {
+ this.type = type
+ this.drawerTitle = title
+ this.nodeList2 = []
+ if (id) {
+ this.nodeList2 = id.split(',')
+ }
+ this.modalshowflag2 = true
+ },
+ checkedRole2 (data) {
+ var idList = ''
+ var nameList = ''
+ data.forEach( item => {
+ if (nameList.length > 0) {
+ nameList += ','
+ idList += ','
+ }
+ idList += item.id
+ nameList += item.name
+ })
+ if (this.type === 'resPerson') {
+ this.addForm.resPerson = idList
+ this.addForm.resPersonName = nameList
+ } else if (this.type === 'drafter') {
+ this.addForm.drafter = idList
+ this.addForm.drafterName = nameList
+ }
+ },
addDrawerSubmit () {
this.$refs['addForm'].validate((valid) => {
if (valid) {
@@ -376,9 +496,15 @@
}, res => {
this.submitLoading = false
if (res.ok) {
- this.addDrawer = false
- this.$message.success(tips + '成功')
- this.getData()
+ if (res.data === '操作成功') {
+ this.addDrawer = false
+ this.$message.success(tips + '成功')
+ this.getData()
+ } else {
+ this.addDrawer = false
+ this.$message.warning(res.data)
+ this.getData()
+ }
} else {
this.$message.warning(tips + '失败')
}
@@ -473,9 +599,12 @@
reviseStatus: command[0].reviseStatus, // 制修订状态
resPerson: command[0].resPerson, // 评审责任人
wgLeader: command[0].wgLeader, // 工作组组长
+ resPersonName: command[0].resPersonName, // 评审责任人
+ wgLeaderName: command[0].wgLeaderName, // 工作组组长
draftTime: command[0].draftTime, // 计划标准初稿完成时间
releaseTime: command[0].releaseTime, // 计划标准发布时间
- drafter: command[0].drafter, // 起草人
+ drafterName: command[0].drafterName, // 起草人
+ drafter: command[0].drafter,
}
break
case '删除':
@@ -525,6 +654,12 @@
computed: {},
mounted() {
this.getData()
+ this.$http.get('sys/dictype/getDicTypeListCode', '', {
+ _this: this
+ }, res => {
+ this.QCDWList = res.data.QCDW // 起草单位
+ }, e => {
+ })
},
}
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 3eb4b26f4..05f834799 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -21,8 +21,7 @@
default-expanded-keys="['64df1d5522bb49c09af6']"
highlight-current
@node-click="treeClick"
- :filter-node-method="filterNode"
- :expand-on-click-node="false">
+ :filter-node-method="filterNode">
{{ node.label }}
@@ -182,8 +181,8 @@
fontWeight: 'bold', height: '48px'}"
@selection-change="standSelectChange"
>
+
-
+
+
{{ formatIssueDate(scope.row.issueTime) }}
@@ -1084,7 +1092,7 @@
prop="XCXSSRQ"
label="实施日期"
sortable="custom"
- width="200"
+ width="120"
align="center">
{{ formatText(scope.row.XCXSSRQ) }}
@@ -1093,7 +1101,7 @@
{{ textStatusMap[scope.row.textStatus] }}
@@ -3313,7 +3321,6 @@ 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..7ad26bbaa 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">取消
+
+
+
+
+
+
+
+
+
+
{{ 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..d8715f4d2 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -91,6 +91,7 @@
tooltip-effect="dark"
height="100%"
border
+ max-height="100%"
class="table"
v-loading="myLoading.loadData"
@selection-change="standSelectChange"
@@ -106,7 +107,7 @@
+
+
+
+
+
+
+
+
+ {{ $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 950677be7..1ce65e1db 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',
@@ -907,6 +925,129 @@ const routes = [
title: '政策入库流程'
}
},
+ {
+ path: '/bussLibrary1',
+ name: 'bussLibrary1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },
+ {
+ path: '/bussLibrary2',
+ name: 'bussLibrary2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },
+ {
+ path: '/bussLibrary3',
+ name: 'bussLibrary3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibraryC3',
+ name: 'bussLibraryC3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibrary4',
+ name: 'bussLibrary4',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibrary5',
+ name: 'bussLibrary5',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibrary6',
+ name: 'bussLibrary6',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibraryC6',
+ name: 'bussLibraryC6',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibrary7',
+ name: 'bussLibrary7',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibrary8',
+ name: 'bussLibrary8',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibrary9',
+ name: 'bussLibrary9',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibrary10',
+ name: 'bussLibrary10',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibrary11',
+ name: 'bussLibrary11',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibrary12',
+ name: 'bussLibrary12',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },{
+ path: '/bussLibraryDetail',
+ name: 'bussLibraryDetail',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订流程及企业标准库流程'
+ }
+ },
{
path: '/bzdyStep1',
name: 'bzdyStep1',
@@ -1613,6 +1754,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: '外部标准化协会入会流程'
+ }
+ },
// 外部标准化协会参会流程
{
@@ -1669,6 +1819,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',
@@ -1687,7 +1846,28 @@ const routes = [
title: '外部标准化会后管理流程（审批）'
}
},
+ {
+ path: '/phoneBzjdStep4',
+ name: 'phoneBzjdStep4',
+ component: () => import('@/pages/processCenter/pages/phone/bzjd/step4.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '标准解读流程'
+ }
+ },
+ {
+ path: '/phoneWfhxStep5',
+ name: 'phoneWfhxStep5',
+ component: () => import('@/pages/processCenter/pages/phone/wfhxzg/step5.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '未符合项整改流程'
+ }
+ },
]
+
},
// 本地工具
{
@@ -1993,7 +2173,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) }}