diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 6eccce155..70920b1d3 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -439,8 +439,6 @@ 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) {
@@ -455,26 +453,6 @@ 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) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue
new file mode 100644
index 000000000..736bfb5b7
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue
@@ -0,0 +1,611 @@
+
+
+
+ 企标复审流程
+ 工作组组长审批
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.name }}
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
+
+
+ 审核信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
index 965223069..952d7543c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
@@ -207,7 +207,7 @@
type="primary"
class="common-button-primary"
size="small"
- @click="getStandDataBtn">
+ @click="getStandDataBtns">
查询
@@ -225,7 +225,7 @@
tooltip-effect="dark"
style="width: 100%"
border
- height="100%"
+ class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@@ -461,6 +461,20 @@ export default {
this.getStandDataBtn()
this.ListModel = true;
},
+ getStandDataBtns(){
+ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
+ standCode: this.standardSearch.standCode,
+ standName: this.standardSearch.standName,
+ page: 1,
+ pageSize: this.pageSize,
+ }, {
+ _this: this,
+ }, res => {
+ this.page = 1
+ this.standinfoList = res.data.list
+ this.total = res.data.count
+ })
+ },
//企业标准查询this.standardSearch,
getStandDataBtn(){
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
@@ -478,6 +492,7 @@ export default {
},
//企业标准清空
clearSearch(){
+ this.page = 1
this.standardSearch = {
standCode: '',
standName: ''
@@ -792,7 +807,16 @@ export default {
width: 210px;
}
}
-
+ .table-height{
+ height: calc(~'100% - 65px');
+ overflow: auto;
+ }
+ .el-table::before {
+ content: '';
+ position: absolute;
+ background-color: #EBEEF5;
+ z-index: 0;
+ }
.demo-drawer-content {
margin-top: 10px;
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
index eeee1fbd4..4678b8f00 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
@@ -174,7 +174,7 @@
-
+
+
+
+ 企标废止流程
+ 标准法规部部长审核
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
+
+
+ 审核信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
index 3df3dc672..dc828cc1e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
@@ -30,7 +30,8 @@
@@ -38,6 +39,7 @@
v-model="standardSearch.standName"
placeholder="请输入中文名称"
clearable
+ readonly
>
@@ -225,7 +227,7 @@
type="primary"
class="common-button-primary"
size="small"
- @click="getStandDataBtn">
+ @click="getStandDataBtns">
查询
@@ -243,7 +245,7 @@
tooltip-effect="dark"
style="width: 100%"
border
- height="100%"
+ class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@@ -498,6 +500,20 @@ export default {
this.getStandDataBtn()
this.ListModel = true;
},
+ getStandDataBtns(){
+ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
+ standCode: this.standardSearch.standCode,
+ standName: this.standardSearch.standName,
+ page: 1,
+ pageSize: this.pageSize,
+ }, {
+ _this: this,
+ }, res => {
+ this.page = 1
+ this.standinfoList = res.data.list
+ this.total = res.data.count
+ })
+ },
//企业标准查询
getStandDataBtn(){
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
@@ -515,6 +531,7 @@ export default {
},
//企业标准清空
clearSearch(){
+ this.page = 1
this.standardSearch = {
standCode: '',
standName: ''
@@ -857,7 +874,16 @@ export default {
width: 210px;
}
}
-
+ .table-height{
+ height: calc(~'100% - 65px');
+ overflow: auto;
+ }
+ .el-table::before {
+ content: '';
+ position: absolute;
+ background-color: #EBEEF5;
+ z-index: 0;
+ }
.demo-drawer-content {
margin-top: 10px;
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
index 6b17384ce..791ce3969 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
@@ -144,7 +144,7 @@
-
+
+
+
+ 企标制修订计划管控
+ 标准法规部部长批准
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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 12cd6fc57..4169ed788 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -270,6 +270,15 @@ export default {
} else if(prcType === '21') {
// 参会流程
this.toProcessDetail('bzchStep6-1',row)
+ } else if(prcType === '23'){
+ //企标复审
+ this.toProcessDetail('qbzxdjhgkStep1-5',row)
+ }else if(prcType === '24'){
+ //企标废止
+ this.toProcessDetail('qbfzStep1-7',row)
+ }else if(prcType === '25'){
+ //企标制修订计划管控
+ this.toProcessDetail('qbzxdjhgkStep1-5',row)
}
} else {
this.$message.warning('当前流程未全部办理完成,无法查看')
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index aec6aa9e2..35cb33d8c 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -270,8 +270,8 @@
{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
+ style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ : '-' }}
+ {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ : '-' }}
{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
+ style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }}
+ {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }}
import('@/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标复审流程'
+ }
+ },
//企标废止流程
{
path: '/qbfzStep1',
@@ -1664,6 +1673,15 @@ const routes = [
title: '企标废止流程'
}
},
+ {
+ path: '/qbfzStep1-7',
+ name: 'qbfzStep1-7',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标废止流程'
+ }
+ },
//企标制修订计划管控流程
{
path: '/qbzxdjhgkStep1',
@@ -1710,6 +1728,15 @@ const routes = [
title: '企标制修订计划管控流程'
}
},
+ {
+ path: '/qbzxdjhgkStep1-5',
+ name: 'qbzxdjhgkStep1-5',
+ component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标制修订计划管控流程'
+ }
+ },
// 外部标准化协会入会流程
{
path: '/bzrhStep1',