af-mobile-client-vue3 1.0.69 → 1.0.70

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.0.69",
+  "version": "1.0.70",
   "description": "Vue + Vite component lib",
   "license": "MIT",
   "engines": {

package/src/components/core/XMultiSelect/index.vue

@@ -120,7 +120,7 @@ const resultLabel = computed(()=>{
       :border="false"
       :is-link="$attrs.disabled === undefined"
       error-message-align="right"
-      @click="showPopu($attrs.disabled)"
+      @click="showPopu($attrs.readonly)"
     />
     <VanPopup v-model:show="show" position="bottom">
       <div class="van-picker__toolbar">

package/src/components/core/XSelect/index.vue

@@ -75,12 +75,11 @@ function cancel(val, index) {
   emits('cancel', val, index, resultValue.value)
 }
 function showPopu(disabled) {
-  columnsData.value = JSON.parse(JSON.stringify(props.columns))
   // resultValue.value = `${selectValue}`
   if (disabled !== undefined && disabled !== false)
     return false
-  else
-    show.value = !show.value
+  columnsData.value = JSON.parse(JSON.stringify(props.columns))
+  show.value = !show.value
 }
 
 // watch(() => selectValue, (newVal, _oldVal) => {
@@ -101,7 +100,7 @@ watch(() => resultValue, (newVal, _oldVal) => {
     :is-link="true"
     :border="props.border"
     error-message-align="right"
-    @click="showPopu($attrs.disabled)"
+    @click="showPopu($attrs.readonly)"
   />
   <VanPopup v-model:show="show" position="bottom">
     <VanField v-if="props.isSearch" v-model="searchVal" input-align="left" placeholder="搜索" @input="search" />

package/src/components/data/XForm/index.vue

@@ -1,147 +1,147 @@
-<script setup lang="ts">
-import {
-  Button as VanButton,
-  CellGroup as VanCellGroup,
-  Form as VanForm,
-} from 'vant'
-import type { FormInstance } from 'vant';
-import {computed, reactive, ref, defineEmits, defineProps, onBeforeMount, watch} from 'vue'
-import XFormItem from '@af-mobile-client-vue3/components/data/XFormItem/index.vue'
-import { useRoute } from 'vue-router'
-
-interface FormItem {
-  addOrEdit: string
-  isOnlyAddOrEdit?: boolean
-  type?: string
-  model?: string
-}
-const props = withDefaults(defineProps<{
-  groupFormItems?: object,
-  serviceName?: string,
-  formData?: object,
-  formName?: string
-}>(), {
-  groupFormItems: null,
-  serviceName: undefined,
-  formData: null,
-  formName: 'default'
-})
-const route = useRoute()
-const emits = defineEmits(['onSubmit'])
-const formRef = ref<FormInstance>()
-const myFormItems = ref<FormItem[]>([])
-const rules = reactive({})
-const form = ref({})
-const formGroupName = ref(null)
-const myServiceName = ref('')
-const loaded = ref(false)
-let myGetDataParams = reactive({})
-const mode = route.query.mode as string
-const realJsonData = computed(() => {
-  let list =  myFormItems.value.filter(item => {
-    return item.addOrEdit !== 'no'
-  })
-  return list
-})
-onBeforeMount( () => {
-  init({ formItems: props.groupFormItems, serviceName:props.serviceName, formData: props.formData, formName:props.formName })
-})
-function init(params) {
-  const {
-    formItems,
-    serviceName,
-    getDataParams = {},
-    formData = null,
-    formName = 'default'
-  } = params
-  loaded.value = false
-  myFormItems.value = JSON.parse(JSON.stringify(formItems.formJson)) as FormItem[]
-  myServiceName.value = serviceName
-  formGroupName.value = formName
-  for (let i = 0; i < realJsonData.value.length; i++) {
-    const item = realJsonData.value[i]
-    setFormProps(form, item)
-  }
-  if(formData){
-    form.value = formData
-  }
-  myGetDataParams = getDataParams
-  loaded.value = true
-}
-
-function setFormProps(form, item) {
-  form.value[item.model] = undefined
-  if (item.rule) {
-    rules[item.model] = []
-    let defaultValue
-    let message
-    switch (item.rule.type) {
-      case 'number':
-        message = '数字'
-        defaultValue = 0
-        break
-      case 'integer':
-        message = '整数'
-        defaultValue = 0
-        break
-      case 'float':
-        message = '小数'
-        defaultValue = 0.0
-        break
-      case 'string':
-        message = '字符串'
-        defaultValue = ''
-        break
-    }
-    rules[item.model].push({
-      type: item.rule.type,
-      message: `${item.name}必须为${message}`,
-      transform: (value) => {
-        if (value && value.length !== 0)
-          return Number(value)
-        else
-          return defaultValue
-      },
-      trigger: 'blur',
-    })
-  }
-}
-
-function onSubmit() {
-  emits('onSubmit', form.value)
-}
-async function validate() {
-  await formRef.value?.validate()
-}
-watch(()=>props.formData, (val)=>{
-  form.value = props.formData
-})
-defineExpose({ init, form, formGroupName, validate })
-</script>
-
-<template>
-  <VanForm @submit="onSubmit" ref="formRef">
-    <VanCellGroup inset>
-      <XFormItem
-        :mode="mode"
-        v-for="(item, index) in realJsonData"
-        :key="index"
-        v-model="form[item.model]"
-        :attr="item"
-        :rules="rules"
-        :service-name="myServiceName"
-        :get-data-params="myGetDataParams"
-      />
-    </VanCellGroup>
-    <div style="margin: 16px;" v-if="myFormItems.showSubmitBtn">
-      <VanButton round block type="primary" native-type="submit">
-        提交 {{myFormItems.showSubmitBtn}}
-      </VanButton>
-      <slot />
-    </div>
-  </VanForm>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import {
+  Button as VanButton,
+  CellGroup as VanCellGroup,
+  Form as VanForm,
+} from 'vant'
+import type { FormInstance } from 'vant';
+import {computed, reactive, ref, defineEmits, defineProps, onBeforeMount, watch} from 'vue'
+import XFormItem from '@af-mobile-client-vue3/components/data/XFormItem/index.vue'
+import { useRoute } from 'vue-router'
+
+interface FormItem {
+  addOrEdit: string
+  isOnlyAddOrEdit?: boolean
+  type?: string
+  model?: string
+}
+const props = withDefaults(defineProps<{
+  groupFormItems?: object,
+  serviceName?: string,
+  formData?: object,
+  formName?: string
+}>(), {
+  groupFormItems: null,
+  serviceName: undefined,
+  formData: null,
+  formName: 'default'
+})
+const route = useRoute()
+const emits = defineEmits(['onSubmit'])
+const formRef = ref<FormInstance>()
+const myFormItems = ref<FormItem[]>([])
+const rules = reactive({})
+const form = ref({})
+const formGroupName = ref(null)
+const myServiceName = ref('')
+const loaded = ref(false)
+let myGetDataParams = reactive({})
+const mode = route.query.mode as string
+const realJsonData = computed(() => {
+  let list =  myFormItems.value.filter(item => {
+    return item.addOrEdit !== 'no'
+  })
+  return list
+})
+onBeforeMount( () => {
+  init({ formItems: props.groupFormItems, serviceName:props.serviceName, formData: props.formData, formName:props.formName })
+})
+function init(params) {
+  const {
+    formItems,
+    serviceName,
+    getDataParams = {},
+    formData = null,
+    formName = 'default'
+  } = params
+  loaded.value = false
+  myFormItems.value = JSON.parse(JSON.stringify(formItems.formJson)) as FormItem[]
+  myServiceName.value = serviceName
+  formGroupName.value = formName
+  for (let i = 0; i < realJsonData.value.length; i++) {
+    const item = realJsonData.value[i]
+    setFormProps(form, item)
+  }
+  if(formData){
+    form.value = formData
+  }
+  myGetDataParams = getDataParams
+  loaded.value = true
+}
+
+function setFormProps(form, item) {
+  form.value[item.model] = undefined
+  if (item.rule) {
+    rules[item.model] = []
+    let defaultValue
+    let message
+    switch (item.rule.type) {
+      case 'number':
+        message = '数字'
+        defaultValue = 0
+        break
+      case 'integer':
+        message = '整数'
+        defaultValue = 0
+        break
+      case 'float':
+        message = '小数'
+        defaultValue = 0.0
+        break
+      case 'string':
+        message = '字符串'
+        defaultValue = ''
+        break
+    }
+    rules[item.model].push({
+      type: item.rule.type,
+      message: `${item.name}必须为${message}`,
+      transform: (value) => {
+        if (value && value.length !== 0)
+          return Number(value)
+        else
+          return defaultValue
+      },
+      trigger: 'blur',
+    })
+  }
+}
+
+function onSubmit() {
+  emits('onSubmit', form.value)
+}
+async function validate() {
+  await formRef.value?.validate()
+}
+watch(()=>props.formData, (val)=>{
+  form.value = props.formData
+})
+defineExpose({ init, form, formGroupName, validate })
+</script>
+
+<template>
+  <VanForm @submit="onSubmit" ref="formRef">
+    <VanCellGroup inset>
+      <XFormItem
+        :mode="mode"
+        v-for="(item, index) in realJsonData"
+        :key="index"
+        v-model="form[item.model]"
+        :attr="item"
+        :rules="rules"
+        :service-name="myServiceName"
+        :get-data-params="myGetDataParams"
+      />
+    </VanCellGroup>
+    <div style="margin: 16px;" v-if="!groupFormItems.showSubmitBtn || groupFormItems.showSubmitBtn===undefined ? true : false">
+      <VanButton round block type="primary" native-type="submit">
+        提交
+      </VanButton>
+      <slot />
+    </div>
+  </VanForm>
+</template>
+
+<style scoped>
+
+</style>

package/src/components/data/XFormGroup/index.vue

@@ -14,11 +14,13 @@ import {getConfigByName, query} from '@af-mobile-client-vue3/services/api/common
 const props = withDefaults(defineProps<{
   configName?: string
   serviceName?: string,
-  groupFormData?: object
+  groupFormData?: object,
+  showSubmit: boolean
 }>(), {
   configName: '',
   serviceName: undefined,
-  groupFormData: {}
+  groupFormData: {},
+  showSubmit: true
 })
 const emit = defineEmits(['submit'])
 const router = useRouter()
@@ -60,7 +62,7 @@ const submit = async () => {
         </div>
       </VanTab>
     </VanTabs>
-    <VanButton round block type="primary" @click="submit">
+    <VanButton round block type="primary" @click="submit" v-if="showSubmit">
       提交
     </VanButton>
   </div>
@@ -68,6 +70,7 @@ const submit = async () => {
 <style scoped lang="less">
 #x-form-group{
   background-color: rgb(247,248,250);
+  padding-bottom: 10px;
   .x-form-group-item{
     margin:20px 0;
   }

package/src/components/data/XFormItem/index.vue

@@ -140,6 +140,16 @@ onBeforeMount(() => {
 const labelData = computed(()=>{
   return props.showLabel?attr.name:null
 })
+const readonly = computed(()=>{
+  return attr.addOrEdit === 'readonly'
+})
+const placeholder = computed(()=>{
+  if (attr.addOrEdit === 'readonly') {
+    return ' 暂无内容 ~ '
+  }else{
+    return attr.placeholder ? attr.placeholder : `请选择${attr.name}`
+  }
+})
 const formatDate = date => `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
 
 function onCalendarConfirm(values) {
@@ -168,7 +178,7 @@ function init() {
 }
 
 function initRadioValue() {
-  if (mode === '新增/修改' && attr.type === 'radio' && !localValue.value) {
+  if ((mode === '新增' || mode === '修改') && attr.type === 'radio' && !localValue.value) {
     if (attr.keys && attr.keys.length > 0)
       localValue.value = attr.keys[0].value
     else if (option && option.value.length > 0)
@@ -266,7 +276,7 @@ function updateFile(files, _index) {
         :rules="[{ required: attr.rule.required === 'true', message: '至少选择一项' }]"
       >
         <template #input>
-          <van-checkbox-group v-model="localValue as any[]" direction="horizontal" shape="square">
+          <van-checkbox-group v-model="localValue as any[]" direction="horizontal" shape="square" :disabled="readonly">
             <VanCheckbox v-for="(item, index) in option" :key="index" style="padding: 2px" :name="item[columnsField.value]" :shape="rules?.[attr.model].shape" :value="item[columnsField.value]">
               {{ item[columnsField.text] }}
             </VanCheckbox>
@@ -292,7 +302,8 @@ function updateFile(files, _index) {
         v-else
         :label="labelData"
         v-model="localValue"
-        :placeholder="attr.placeholder ? attr.placeholder : `请选择${attr.name}`"
+        :readonly="readonly"
+        :placeholder="placeholder"
         :columns="option"
         :option="attr.option ? attr.option : columnsField"
         :rules="[{ required: attr.rule.required === 'true', message: '至少选择一项' }]"
@@ -308,7 +319,7 @@ function updateFile(files, _index) {
       :rules="[{ required: attr.rule.required === 'true', message: '必须选择一项' }]"
     >
       <template #input>
-        <VanRadioGroup v-model="localValue" direction="horizontal">
+        <VanRadioGroup v-model="localValue" direction="horizontal" :disabled="readonly">
           <VanRadio v-for="(item, index) in option" :key="index" style="padding: 2px" :name="item[columnsField.value]" :value="item[columnsField.value]">
             {{ item[columnsField.text] }}
           </VanRadio>
@@ -337,6 +348,7 @@ function updateFile(files, _index) {
       v-if="attr.type === 'stepper'"
       name="stepper"
       :label="labelData"
+      :readonly="readonly"
       :rules="[{ required: attr.rule.required === 'true', message: `未调整${attr.name}` }]"
     >
       <template #input>
@@ -349,6 +361,7 @@ function updateFile(files, _index) {
       v-if="attr.type === 'rate'"
       name="rate"
       :label="labelData"
+      :readonly="readonly"
       :rules="[{ required: attr.rule.required === 'true', message: `未进行${attr.name}评分` }]"
     >
       <template #input>
@@ -361,6 +374,7 @@ function updateFile(files, _index) {
       v-if="attr.type === 'slider'"
       name="slider"
       :label="labelData"
+      :readonly="readonly"
       :rules="[{ required: attr.rule.required === 'true', message: `未移动${attr.name}滑块` }]"
     >
       <template #input>
@@ -393,6 +407,7 @@ function updateFile(files, _index) {
       name="picker"
       :placeholder="attr.placeholder ? attr.placeholder : `请选择${attr.name}`"
       :label="labelData" readonly
+      :readonly="readonly"
       is-link
       @click="showPicker = true"
       :rules="[{ required: attr.rule.required === 'true', message: `未选择${attr.name}` }]"
@@ -402,7 +417,7 @@ function updateFile(files, _index) {
         v-model="localValue as Numeric[]"
         :title="attr.name"
         :columns="attr.selectKey"
-        :readonly="attr.readonly"
+        :readonly="readonly"
         :columns-field-names="attr.customFieldName ? attr.customFieldName : { text: 'text', value: 'value', children: 'children' }"
         :confirm-button-text="attr.confirmButtonText || attr.confirmButtonText === '' ? attr.confirmButtonText : '确认'"
         :cancel-button-text="attr.cancelButtonText || attr.cancelButtonText === '' ? attr.cancelButtonText : '取消'"
@@ -440,8 +455,8 @@ function updateFile(files, _index) {
       :label="labelData"
       readonly
       :is-link="true"
-      :placeholder="attr.placeholder ? attr.placeholder : `请选择${attr.name}`"
-      @click="showDatePicker = true"
+      :placeholder="placeholder"
+      @click="readonly ? null: showDatePicker = true"
       :rules="[{ required: attr.rule.required === 'true', message: '未选择日期' }]"
     />
     <VanPopup v-model:show="showDatePicker" position="bottom" teleport="body">
@@ -452,7 +467,6 @@ function updateFile(files, _index) {
         :confirm-button-text="attr.confirmButtonText ? attr.confirmButtonText : '确认'"
         :cancel-button-text="attr.cancelButtonText ? attr.cancelButtonText : '取消'"
         :columns-type="attr.columnsType ? attr.columnsType : ['year', 'month', 'day']"
-        :readonly="attr.readonly ? attr.readonly : false"
         @cancel="showDatePicker = false"
         @confirm="onDatePickerConfirm"
       />
@@ -518,7 +532,7 @@ function updateFile(files, _index) {
       is-link
       readonly
       :label="labelData"
-      @click="showArea = true"
+      @click="readonly ? null : showArea = true"
       :rules="[{ required: attr.rule.required === 'true', message: '未选择地区' }]"
     />
     <VanPopup v-model:show="showArea" position="bottom" teleport="body">
@@ -532,10 +546,11 @@ function updateFile(files, _index) {
     <!-- 单选下拉列表 -->
     <XSelect
       v-if="attr.type === 'select'"
-      v-model="localValue"
       :label="labelData"
+      v-model="localValue"
+      :readonly="readonly"
       clearable
-      :placeholder="attr.placeholder ? attr.placeholder : `请选择${attr.name}`"
+      :placeholder="placeholder"
       :columns="option"
       :option="attr.option ? attr.option : columnsField"
       :rules="[{ required: attr.rule.required === 'true', message: '必须选择一项' }]"
@@ -550,6 +565,7 @@ function updateFile(files, _index) {
       autosize
       :label="labelData"
       type="textarea"
+      :readonly="readonly"
       :maxlength="attr.maxlength"
       :placeholder="attr.placeholder ? attr.placeholder : `请输入${attr.name}`"
       show-word-limit
@@ -564,9 +580,9 @@ function updateFile(files, _index) {
       :label="labelData"
       :required="attr.required"
       :type="attr.type"
-      :readonly="attr.readonly"
+      :readonly="readonly"
       :disabled="attr.disabled"
-      :placeholder="attr.placeholder ? attr.placeholder : `请输入${attr.name}`"
+      :placeholder="placeholder"
       :error-message="attr.errorMessage"
       :clearable="attr.clearable"
       :rules="[{ required: attr.rule.required === 'true', message: `必须填写${attr.name}` }]"

package/src/views/component/XCellListView/index.vue

@@ -30,7 +30,7 @@ function toDetail(item) {
   console.log('item=====',item)
   router.push({
     name:'XFormView',
-    params:{id: item.ao_id,openid: 1},
+    params:{id: item.od_id,openid: 1},
     query:{formConfigName: configName, formServiceName: serviceName ,mode:'新增'},
   })
 }

package/src/views/component/XFormView/index.vue

@@ -1,24 +1,19 @@
 <script setup lang="ts">
-import {
-  Tabs as VanTabs,
-  Tab as VanTab,
-  Row as VanRow,
-  Button as VanButton
-} from 'vant'
-import { defineProps, watchEffect, onBeforeMount, ref, onMounted, watch, defineEmits } from 'vue'
+import { onBeforeMount, ref } from 'vue'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { runLogic } from '@af-mobile-client-vue3/services/api/common'
-import { useRoute } from 'vue-router'
+import {useRoute, useRouter} from 'vue-router'
 import { formatDate } from '@af-mobile-client-vue3/hooks/useCommon'
-import {getConfigByName, query} from '@af-mobile-client-vue3/services/api/common'
+import {showSuccessToast} from "vant";
 
-const router = useRoute()
+const route = useRoute()
+const router = useRouter()
 const formData = ref({})
 function initComponents () {
-  console.log('router.params=', router.params)
-  runLogic('getLngPurchaseOrderAuditGroupData', {id: router.params?.id}, 'af-gaslink').then((res) => {
+  console.log('router.params=', route.params)
+  runLogic('getLngPurchaseOrderAuditGroupData', {id: route.params?.id}, 'af-gaslink').then((res) => {
     console.log('调用logic完成==',res)
     formData.value = {...res}
     console.log('赋值完成===', formData.value)
@@ -42,6 +37,8 @@ const submit = (formData) => {
   console.log('param===', param)
   runLogic('lngPurchaseOrderAuditSubmit', param, 'af-gaslink').then((res) => {
     console.log('res===', res)
+    showSuccessToast('审核成功！')
+    router.go(-1)
   })
 }
 </script>