af-mobile-client-vue3 1.6.21 → 1.6.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.6.21",
+  "version": "1.6.23",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/views/SafeInspection/SecurityCertificate/index.vue

@@ -1335,6 +1335,7 @@ function organizeSubmitData() {
       depids: checkerInfo.depids,
       orgs: checkerInfo.orgs,
       orgid: checkerInfo.orgid,
+      ename: checkerInfo.ename,
     },
     onSiteDate: onSiteDate.value,
     safeCheckVersion: safeCheckVersion.value,

package/src/views/SafeInspection/SecurityFormItem/FormItem.vue

@@ -98,6 +98,8 @@ const formType = {
   text: 'text', // 表单项类型
   number: 'number',
   date: 'date',
+  year: 'year',
+  yearMonth: 'yearMonth',
   radio: 'radio',
   checkbox: 'checkbox',
   multipleSelect: 'multipleSelect',
@@ -117,11 +119,27 @@ const debouncedCustomFunc = ref<((ctx: any, cfg: any, userDetail: any, safeConfi
 // 拍照/上传相关信息
 const cameraData = ref(undefined)
 // 日期选择器默认值
-const datePickerDefault = ref([
-  dayjs().format('YYYY'),
-  dayjs().format('MM'),
-  dayjs().format('DD'),
-])
+const datePickerDefault = ref<string[]>([])
+
+watch(() => currentVal[dataStructure.fieldType], (type) => {
+  if (type === formType.year)
+    datePickerDefault.value = [dayjs().format('YYYY')]
+  else if (type === formType.yearMonth)
+    datePickerDefault.value = [dayjs().format('YYYY'), dayjs().format('MM')]
+  else if (type === formType.date)
+    datePickerDefault.value = [dayjs().format('YYYY'), dayjs().format('MM'), dayjs().format('DD')]
+  else
+    datePickerDefault.value = []
+}, { immediate: true })
+
+const columnsType = computed(() => {
+  const type = currentVal[dataStructure.fieldType]
+  if (type === formType.year)
+    return ['year'] as any
+  if (type === formType.yearMonth)
+    return ['year', 'month'] as any
+  return ['year', 'month', 'day'] as any
+})
 
 function safeParseJson(jsonStr: any): any {
   if (typeof jsonStr !== 'string')
@@ -141,6 +159,8 @@ function confirm(selVal, selObj) {
 
   switch (currentVal[dataStructure.fieldType]) {
     case formType.date:
+    case formType.year:
+    case formType.yearMonth:
       currentVal.value = selVal.selectedValues.join('-')
       selVal = currentVal.value
       showPicker.value = false
@@ -249,7 +269,7 @@ const datePickerMaxDate = computed(() => {
     @blur="confirm"
   />
   <VanField
-    v-else-if="currentVal[dataStructure.fieldType] === formType.date"
+    v-else-if="currentVal[dataStructure.fieldType] === formType.date || currentVal[dataStructure.fieldType] === formType.year || currentVal[dataStructure.fieldType] === formType.yearMonth"
     v-model="currentVal[dataStructure.fieldValue]"
     center
     is-link
@@ -392,7 +412,7 @@ const datePickerMaxDate = computed(() => {
   </VanField>
   <!--  {{ currentVal }} -->
   <VanPopup v-model:show="showPicker" position="bottom">
-    <VanDatePicker v-model="datePickerDefault" :min-date="datePickerMinDate" :max-date="datePickerMaxDate" @confirm="confirm" @cancel="showPicker = false" />
+    <VanDatePicker v-model="datePickerDefault" :columns-type="columnsType" :min-date="datePickerMinDate" :max-date="datePickerMaxDate" @confirm="confirm" @cancel="showPicker = false" />
   </VanPopup>
   <slot :item="currentVal" />
 </template>