diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 5ae648fb6..7fe30ebb5 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -32,12 +32,12 @@
>
- {{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.researchCompletionTime ? $moment(scope.row.researchCompletionTime).format("YYYY-MM-DD") : "" }}
-
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ 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.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
- {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+ {{ scope.row.ssrq }}
@@ -368,7 +360,7 @@
label="新车型实施日期">
{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
+ {{ scope.row.xcxssrq }}
{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
+ {{ scope.row.zccssrq }}
{{
- scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
+ scope.row.ssrq
}}
{{
- scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
+ scope.row.ssrq
}}
- {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+ {{ scope.row.ssrq }}
@@ -474,13 +466,13 @@
label="新车型实施日期">
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
@@ -490,13 +482,13 @@
label="在产车实施日期">
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
@@ -563,9 +555,9 @@
width="120"
>
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+ {{scope.row.issueTime}}
+ {{scope.row.issueTime}}
+ {{scope.row.issueTime}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
+ {{scope.row.putTime}}
+ {{scope.row.putTime}}
+ {{scope.row.putTime}}
+
-
- {{ 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.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
- {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+ {{ scope.row.ssrq }}
@@ -389,7 +372,7 @@
label="新车型实施日期">
{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
+ {{ scope.row.xcxssrq }}
{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
+ {{ scope.row.zccssrq }}
{{
- scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
+ scope.row.ssrq
}}
{{
- scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
+ scope.row.ssrq
}}
- {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+ {{ scope.row.ssrq }}
@@ -495,13 +478,13 @@
label="新车型实施日期">
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
@@ -511,13 +494,13 @@
label="在产车实施日期">
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
@@ -584,9 +567,9 @@
width="120"
>
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+ {{scope.row.issueTime}}
+ {{scope.row.issueTime}}
+ {{scope.row.issueTime}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
+ {{scope.row.putTime}}
+ {{scope.row.putTime}}
+ {{scope.row.putTime}}
{
- if(item.ssrq === "-"){
- item.ssrq = ''
- }
- if(item.zrbm === '[]'){
- item.zrbm =''
- }
- })
- this.standList.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
- }
-
- },
+ // okStand() {
+ // if(this.standList.length < 1){
+ // this.$message.warning('请至少选择一条数据进行添加')
+ // }else{
+ // this.standList.forEach(item =>{
+ // if(item.ssrq === "-"){
+ // item.ssrq = ''
+ // }
+ // if(item.zrbm === '[]'){
+ // item.zrbm =''
+ // }
+ // })
+ // this.standList.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
+ // }
+ //
+ // },
//手动查找的清空按钮
clearLawBtn(){
this.lawInfoTableLoading = true
@@ -1162,6 +1145,7 @@ export default {
this.$message.warning('请先选择标准/政策来源')
}
},
+ //添加标准带入事件
handleSelectConfirm(){
if(this.handleSelectTableList.length < 1){
this.$message.warning('请至少选择一条数据进行添加')
@@ -1175,6 +1159,8 @@ export default {
}
})
this.handleSelectTableList.map(item => {
+ this.$set(item, 'involve', 'involve')
+ this.$set(item, 'remarks', '')
let addIndex
addIndex = this.dataList.findIndex(items =>{
return items.id === item.id
@@ -1185,10 +1171,6 @@ export default {
this.dataList.push(item)
}
})
- this.dataList.forEach(item => {
- this.$set(item, 'involve', 'involve')
- this.$set(item, 'remarks', '')
- })
this.standModel = false
}
},
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index 2a2e58460..4fa29cf5e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -107,27 +107,18 @@
width="190px"
align="center"
label="标准实施日期">
-
- {{ 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.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
- {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+ {{ scope.row.ssrq }}
@@ -373,7 +364,7 @@
label="新车型实施日期">
{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
+ {{ scope.row.xcxssrq }}
{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
+ {{ scope.row.zccssrq }}
{{
- scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
+ scope.row.ssrq
}}
{{
- scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
+ scope.row.ssrq
}}
- {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+ {{ scope.row.ssrq }}
@@ -479,13 +470,13 @@
label="新车型实施日期">
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
@@ -495,13 +486,13 @@
label="在产车实施日期">
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
@@ -568,9 +559,9 @@
width="120"
>
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+ {{scope.row.issueTime}}
+ {{scope.row.issueTime}}
+ {{scope.row.issueTime}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
+ {{scope.row.putTime}}
+ {{scope.row.putTime}}
+ {{scope.row.putTime}}
-
- {{ 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) : '-' }}
-
+
+
+
+ 加入标准化协会备案流程
+ 标准法规工程师审核
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ 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/phone/jrbzhxh/step4.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue
new file mode 100644
index 000000000..86697848d
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue
@@ -0,0 +1,657 @@
+
+
+
+
+ 加入标准化协会备案流程
+ 标准法规工程师审核
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ 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/phone/wbsm/step3.vue b/src/pages/processCenter/pages/phone/wbsm/step3.vue
new file mode 100644
index 000000000..feb758afb
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/wbsm/step3.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue
new file mode 100644
index 000000000..f78968e5e
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue
@@ -0,0 +1,715 @@
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 35cb33d8c..52208b187 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -243,8 +243,8 @@
{{ formatIssueDate(scope.row.issueTime) }}
- {{ formatIssueDate(scope.row.issueTime) }}
+ style="color: #F56C6C">{{ scope.row.issueTime }}
+ {{ scope.row.issueTime }}
{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
- {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
+ style="color: #F56C6C">{{ scope.row.SSRQ }}
+ {{ scope.row.SSRQ }}
@@ -270,8 +270,8 @@
{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ : '-' }}
- {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ : '-' }}
+ style="color: #F56C6C">{{ scope.row.XCXSSRQ }}
+ {{ scope.row.XCXSSRQ }}
{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }}
- {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }}
+ style="color: #F56C6C">{{ scope.row.ZCCSSRQ }}
+ {{ scope.row.ZCCSSRQ }}
import('@/pages/processCenter/pages/phone/xmqdqr/step5.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '项目清单确认流程'
+ }
+ },
+ {
+ path: '/phoneGrbzhxhStep3',
+ name: 'phoneGrbzhxhStep3',
+ component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step3.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '加入标准化协会信息提报流程'
+ }
+ },
+ {
+ path: '/phoneGrbzhxhStep4',
+ name: 'phoneGrbzhxhStep4',
+ component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step4.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '加入标准化协会信息提报流程'
+ }
+ },
{
path: '/phoneWfhxStep5',
name: 'phoneWfhxStep5',