diff --git a/src/components/hzwlComponents/DataRangePickerFormItem.vue b/src/components/hzwlComponents/DataRangePickerFormItem.vue
new file mode 100644
index 000000000..fd228e55b
--- /dev/null
+++ b/src/components/hzwlComponents/DataRangePickerFormItem.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/DatePickerFormItem.vue b/src/components/hzwlComponents/DatePickerFormItem.vue
new file mode 100644
index 000000000..6e7678164
--- /dev/null
+++ b/src/components/hzwlComponents/DatePickerFormItem.vue
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/DatePickerGroupFormItem.vue b/src/components/hzwlComponents/DatePickerGroupFormItem.vue
new file mode 100644
index 000000000..693058fe4
--- /dev/null
+++ b/src/components/hzwlComponents/DatePickerGroupFormItem.vue
@@ -0,0 +1,163 @@
+
+
+
+
+
+
+
+
+
+ {{ tag }}
+
+
+
+
+
+
+
+
+ 增加日期
+
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/DepartmentFormItem.vue b/src/components/hzwlComponents/DepartmentFormItem.vue
new file mode 100644
index 000000000..22a5238b8
--- /dev/null
+++ b/src/components/hzwlComponents/DepartmentFormItem.vue
@@ -0,0 +1,89 @@
+
+
+
+
+ >
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/InputForStandardsForLaws.vue b/src/components/hzwlComponents/InputForStandardsForLaws.vue
new file mode 100644
index 000000000..eefbeb2b6
--- /dev/null
+++ b/src/components/hzwlComponents/InputForStandardsForLaws.vue
@@ -0,0 +1,385 @@
+
+
+
+
+ 手动查找
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+
+
+
+
+
+
+
+
+ {{ $moment(scope.row.issueTime).format('YYYY-MM-DD') }}
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/InputFormItem.vue b/src/components/hzwlComponents/InputFormItem.vue
new file mode 100644
index 000000000..d61f6ac89
--- /dev/null
+++ b/src/components/hzwlComponents/InputFormItem.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/ReceiptDescription.vue b/src/components/hzwlComponents/ReceiptDescription.vue
new file mode 100644
index 000000000..643b31f14
--- /dev/null
+++ b/src/components/hzwlComponents/ReceiptDescription.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/SelectFormItem.vue b/src/components/hzwlComponents/SelectFormItem.vue
new file mode 100644
index 000000000..91e8bb389
--- /dev/null
+++ b/src/components/hzwlComponents/SelectFormItem.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/SelectMultipleFormItem.vue b/src/components/hzwlComponents/SelectMultipleFormItem.vue
new file mode 100644
index 000000000..571dbd025
--- /dev/null
+++ b/src/components/hzwlComponents/SelectMultipleFormItem.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/TimeLineFormItem.vue b/src/components/hzwlComponents/TimeLineFormItem.vue
new file mode 100644
index 000000000..954bdd84f
--- /dev/null
+++ b/src/components/hzwlComponents/TimeLineFormItem.vue
@@ -0,0 +1,96 @@
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/UploadFormItem.vue b/src/components/hzwlComponents/UploadFormItem.vue
new file mode 100644
index 000000000..0f3c08d5d
--- /dev/null
+++ b/src/components/hzwlComponents/UploadFormItem.vue
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/personFormItem.vue b/src/components/hzwlComponents/personFormItem.vue
new file mode 100644
index 000000000..67c388836
--- /dev/null
+++ b/src/components/hzwlComponents/personFormItem.vue
@@ -0,0 +1,104 @@
+
+
+
+
+ >
+
+
+
+
+
+
+
+
diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue
index 07529e5ec..8973261c4 100644
--- a/src/pages/details/otherLawsStandDetails/index.vue
+++ b/src/pages/details/otherLawsStandDetails/index.vue
@@ -57,7 +57,7 @@
{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}
{{ sarStandardsInfoEO.lawsYear || '-' }}
{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}
- {{ sarStandardsInfoEO.NotisyncNumLink || '-' }}
+ {{ sarStandardsInfoEO.notisyncNumLink || '-' }}
{{ sarStandardsInfoEO.lawsBulletin || '-' }}
{{ sarStandardsInfoEO.lawsLabel || '-' }}
{{ sarStandardsInfoEO.lawsRemark || '-' }}
diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue
index fe6a45b7b..b384238f0 100644
--- a/src/pages/policyRegulation/policy/components/editDrawer.vue
+++ b/src/pages/policyRegulation/policy/components/editDrawer.vue
@@ -219,8 +219,8 @@
-
-
+
@@ -443,12 +443,12 @@
-
+ >
@@ -551,8 +551,9 @@
import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandardsForLaws'
import CustomInput from '@/components/CustomFormComponents/Input'
-import CusTomDataPickerGroup
- from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
+// import CusTomDataPickerGroup
+// from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
+import DatePickerGroupFormItem from "@/components/hzwlComponents/DatePickerGroupFormItem";
import CustomDatePick from '@/components/CustomFormComponents/DatePicker'
import CustomFile from '@/components/CustomFormComponents/File'
import CustomTextarea from '@/components/CustomFormComponents/Textarea'
@@ -1022,7 +1023,8 @@ export default {
CustomSVPPS,
CustomInputForStandards,
CustomInput,
- CusTomDataPickerGroup,
+ // CusTomDataPickerGroup,
+ DatePickerGroupFormItem,
CustomDatePick,
CustomFile,
CustomTextarea,
@@ -1629,8 +1631,6 @@ export default {
})
},
choice(type, title, nameId) {
- console.log(nameId)
- // 管理员(admin),张兰英(zhanglanying) => ['admin', 'zhanglanying']
this.nodeList = []
if (nameId) {
let nameId1 = nameId.split(',')
@@ -1642,6 +1642,7 @@ export default {
idList.push(b)
})
idList = idList.join(',')
+ // 管理员(admin),张兰英(zhanglanying) => ['admin', 'zhanglanying']
this.nodeList = idList.split(',')
}
this.choiceTitle = title
@@ -1677,6 +1678,7 @@ export default {
}
this.$set(this.sarLawsStandEO, field, nameList)
if (this.choiceTitle === '选择投稿人') {
+ // 带入投稿单位
this.sarLawsStandEO.TGDWLAWSID = this.unique(data.map(item => item.topUnitId)).join(",")
this.sarLawsStandEO.TGDWLAWS = this.unique(data.map(item => item.topUnit)).join(",")
}
diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/Basic.vue b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/Basic.vue
new file mode 100644
index 000000000..dcc85bb81
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/Basic.vue
@@ -0,0 +1,222 @@
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 根据编号、名称、文本状态查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/EffectiveDate.vue b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/EffectiveDate.vue
new file mode 100644
index 000000000..02770c213
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/EffectiveDate.vue
@@ -0,0 +1,80 @@
+
+
+
+ 实施日期
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/PersonInfo.vue b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/PersonInfo.vue
new file mode 100644
index 000000000..b0d242dde
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/PersonInfo.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/Range.vue b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/Range.vue
new file mode 100644
index 000000000..a04418042
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/Range.vue
@@ -0,0 +1,94 @@
+
+
+
+ 适用范围
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/RelatesInfo.vue b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/RelatesInfo.vue
new file mode 100644
index 000000000..d465e0884
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/RelatesInfo.vue
@@ -0,0 +1,69 @@
+
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/SearchResult.vue b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/SearchResult.vue
new file mode 100644
index 000000000..972e88ed8
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/SearchResult.vue
@@ -0,0 +1,297 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+
+
+
数据获取中
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/TextInfo.vue b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/TextInfo.vue
new file mode 100644
index 000000000..2baafb497
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/components/TextInfo.vue
@@ -0,0 +1,66 @@
+
+
+
+ 文本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step1.vue
new file mode 100644
index 000000000..b2077b085
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step1.vue
@@ -0,0 +1,465 @@
+
+
+
+ 政策入库流程
+ 发起流程
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
index a28361a66..7ae17c290 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
@@ -450,7 +450,8 @@ export default {
case 'laws1':
// 政策入库流程
this.$router.push({
- name: 'zcrkStep1'
+ // name: 'zcrkStep1'
+ name: 'zcrk1'
})
break
case '1':
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue
index 5634cf75f..84a9876e8 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue
@@ -4,7 +4,7 @@
diff --git a/src/router/index.js b/src/router/index.js
index b5ee5df89..ff4d2eac3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1142,6 +1142,15 @@ const routes = [
title: '标准入库流程'
}
},
+ {
+ path: '/zcrk1',
+ name: 'zcrk1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/hzwl-zcrk/step1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策入库流程'
+ }
+ },
{
path: '/zcrkStep1',
name: 'zcrkStep1',