diff --git a/src/components/CalendarField.vue b/src/components/CalendarField.vue
index 4c32fbf..bab9462 100644
--- a/src/components/CalendarField.vue
+++ b/src/components/CalendarField.vue
@@ -1,23 +1,23 @@
-
-
-
-
+
+
+
+
diff --git a/src/components/PickerDictCheckboxField.vue b/src/components/PickerDictCheckboxField.vue
new file mode 100644
index 0000000..8ba4115
--- /dev/null
+++ b/src/components/PickerDictCheckboxField.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/PickerDictField.vue b/src/components/PickerDictField.vue
new file mode 100644
index 0000000..e765b50
--- /dev/null
+++ b/src/components/PickerDictField.vue
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/ProcessCommonLayout.vue b/src/components/ProcessCommonLayout.vue
index ab86dba..f54c73e 100644
--- a/src/components/ProcessCommonLayout.vue
+++ b/src/components/ProcessCommonLayout.vue
@@ -21,7 +21,7 @@
-
+
@@ -97,6 +97,32 @@ export default {
this.personnelInfoData = res.result
}
})
+ },
+ // 获取人员对象,无校验
+ getDataObj () {
+ const personnelObj = {}
+ for (const item of this.personnelInfoData) {
+ // 该属性还没有人就给他赋值
+ if ((item.canChoose || item.sort === 1) && !personnelObj[item.variableName]) {
+ personnelObj[item.variableName] = item.linkUserIds
+ }
+ }
+ return personnelObj
+ },
+ // 有校验的获取人员对象
+ getDataObjVerify () {
+ let personnelObj = {}
+ for (const item of this.personnelInfoData) {
+ // 该属性还没有人就给他赋值
+ if ((item.canChoose || item.sort === 1) && !personnelObj[item.variableName]) {
+ personnelObj[item.variableName] = item.linkUserIds
+ }
+ }
+ if (!Object.values(personnelObj).every(v => !!v)) {
+ this.$message(this.$t('pleaseEnterPersonnelInfo'))
+ personnelObj = false
+ }
+ return personnelObj
}
}
}
@@ -173,6 +199,9 @@ export default {
margin: 0;
padding: 0.26rem 0.21rem;
color: #1D2129;
+ font-size: 0.32rem;
+ font-weight: 600;
+ line-height: 0.38rem;
}
}
.van-step__circle-container {