af-mobile-client-vue3 1.5.95 → 1.5.97

package/package.json

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

package/src/components/data/contract/addcontract.vue

@@ -4,6 +4,7 @@ import XSelect from '@af-mobile-client-vue3/components/core/XSelect/index.vue'
 import FilePreview from '@af-mobile-client-vue3/components/data/FilePreview/index.vue'
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import { getConfigByName, runLogic } from '@af-mobile-client-vue3/services/api/common'
+import { useStepStore } from '@af-mobile-client-vue3/stores/modules/step'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { showToast, Button as VanButton, CellGroup as VanCellGroup, Dialog as VanDialog, Loading as VanLoading } from 'vant'
 import { computed, onMounted, ref } from 'vue'
@@ -27,7 +28,8 @@ const route = useRoute()
 const userInfo = useUserStore().getUserInfo()
 // 获取操作员信息
 const currUser = useUserStore().getLogin().f
-const workflowId = computed(() => route.query.workflowId?.toString() || '')
+const stepStore = useStepStore()
+const workflowId = ref(route.query.workflowId?.toString() || stepStore.getWorkflowId() || '')
 const userId = computed(() => route.query.userId?.toString() || '')
 // 合同名称
 const f_contract_name = ref('')
@@ -142,7 +144,7 @@ async function onSignSubmit() {
 
 onMounted(() => {
   runLogic('getUserinfoByid', {
-    condition: ` ui.f_userinfo_id = '${userId.value}' `,
+    condition: ` (ui.f_userinfo_id = '${userId.value}' or ui.f_workflow_id = '${workflowId.value}') `,
   }, 'af-system').then((row: any) => {
     if (row.length > 0) {
       userRecord.value = row

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

@@ -1,11 +1,14 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
-import { computed } from 'vue'
+import { useStepStore } from '@af-mobile-client-vue3/stores/modules/step'
+import { computed, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
 const router = useRouter()
 const configName = 'userinfoContractCRUD'
 const serviceName = 'af-system'
+const stepStore = useStepStore()
+const workflowId = ref(useRoute().query.workflowId?.toString() || stepStore.getWorkflowId() || '')
 const userId = computed(() => useRoute().query.userId?.toString() || '')
 function addContract() {
   router.push({
@@ -32,6 +35,7 @@ function previewContract(res) {
     :custom-add="true"
     :fix-query-form="{
       c_f_userinfo_id: userId,
+      c_f_process_id: workflowId,
     }"
     @add="addContract"
     @preview-contract="previewContract"

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

@@ -2639,6 +2639,7 @@ provide('provideParent', {
                     :user-detail="userDetail"
                     :model-value="componentInitData"
                     :is-view-mode="isReadOnly"
+                    :extra-data="row?.extraData || {}"
                     :object-type-map="object_type_map"
                     @value-change="(selVal, selObj, currentVal, payload) => { valueChange(currentVal, pIndex, payload) }"
                     @device-deleted="cleanupDeletedDeviceData"

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

@@ -74,6 +74,10 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
+  extraData: {
+    type: Object,
+    default: () => ({}),
+  },
 })
 
 /**
@@ -171,7 +175,9 @@ onMounted(() => {
  * 配置获取成功后调用normalizeFormDataBySteps进行数据初始化
  */
 function init() {
-  getConfigByName('photoAiRecognitionForm', (res: any) => {
+  const fromConfig = props.extraData?.checkAiSlotFrom || 'photoAiRecognitionForm'
+  console.warn('fromConfig', fromConfig)
+  getConfigByName(fromConfig, (res: any) => {
     console.warn('>>>>res', res)
     photoAiRecognitionConfig.value = res
     console.warn('>>>>stepColumns', stepColumns)