Merge remote-tracking branch 'origin/main'

src/api/mold/ticketManagement/index.ts

@@ -6,11 +6,13 @@ export interface TicketManagementVO {
   planId?: string
   planNo?: string
   deviceName?: string
+  moldName?: string
   planType?: string | number
   configName?: string
   jobStatus?: string | number
   jobResult?: string
   jobUser?: string
+  operatorName?: string
   taskTime?: string
   taskEndTime?: string
   cancelReason?: string

src/locales/en.ts

@@ -2856,6 +2856,9 @@
       edit: 'Edit',
       approve: 'Approve',
       unapprove: 'Unapprove',
+      submit: 'Submit',
+      auditApprove: 'Pass',
+      auditReject: 'Reject',
       delete: 'Delete',
       export: 'Export',
       add: 'Add',
@@ -2898,6 +2901,12 @@
       unapproveConfirm: 'Confirm unapprove this stock in order?',
       approveSuccess: 'Approve successful',
       unapproveSuccess: 'Unapprove successful',
+      submitConfirm: 'Confirm submit this stock in order?',
+      submitSuccess: 'Submit successful',
+      auditApproveConfirm: 'Confirm pass this stock in order?',
+      auditRejectConfirm: 'Confirm reject this stock in order?',
+      auditApproveSuccess: 'Pass successful',
+      auditRejectSuccess: 'Reject successful',
       subMoldList: 'Sub Mold List',
       moldGroupList: 'Mold Group & Sub Mold List',
       moldGroupListTitle: 'Stock In Mold Group List'
@@ -2918,6 +2927,9 @@
       edit: 'Edit',
       approve: 'Approve',
       unapprove: 'Unapprove',
+      submit: 'Submit',
+      auditApprove: 'Pass',
+      auditReject: 'Reject',
       delete: 'Delete',
       export: 'Export',
       add: 'Add',
@@ -2956,6 +2968,12 @@
       validatorItemWarehouseRequired: 'Warehouse can not be empty',
       validatorItemMoldRequired: 'Mold can not be empty',
       validatorItemCountRequired: 'Quantity can not be empty',
+      submitConfirm: 'Confirm submit this stock out order?',
+      submitSuccess: 'Submit successful',
+      auditApproveConfirm: 'Confirm pass this stock out order?',
+      auditRejectConfirm: 'Confirm reject this stock out order?',
+      auditApproveSuccess: 'Pass successful',
+      auditRejectSuccess: 'Reject successful',
       moldGroupListTitle: 'Stock Out Mold Group List'
     },
 
@@ -3236,6 +3254,7 @@
 
     MoldWorkOrderInquiry: {
       moduleName: 'Work Order Inquiry',
+      basicInfo: 'Basic Information',
       planNo: 'Order No',
       planType: 'Type',
       planTypeInspect: 'Inspection',

src/locales/zh-CN.ts

@@ -2342,6 +2342,9 @@
       edit: '编辑',
       approve: '审批',
       unapprove: '反审批',
+      submit: '提交',
+      auditApprove: '通过',
+      auditReject: '不通过',
       delete: '删除',
       export: '导出',
       add: '新增',
@@ -2384,6 +2387,12 @@
       unapproveConfirm: '确定反审批该入库单吗？',
       approveSuccess: '审批成功',
       unapproveSuccess: '反审批成功',
+      submitConfirm: '确定提交该入库单吗？',
+      submitSuccess: '提交成功',
+      auditApproveConfirm: '确定通过该入库单吗？',
+      auditRejectConfirm: '确定不通过该入库单吗？',
+      auditApproveSuccess: '通过成功',
+      auditRejectSuccess: '不通过成功',
       subMoldList: '子模具列表',
       moldGroupList: '模具组及子模具列表',
       moldGroupListTitle: '入库模具组清单'
@@ -2404,6 +2413,9 @@
       edit: '编辑',
       approve: '审批',
       unapprove: '反审批',
+      submit: '提交',
+      auditApprove: '通过',
+      auditReject: '不通过',
       delete: '删除',
       export: '导出',
       add: '新增',
@@ -2442,6 +2454,12 @@
       validatorItemWarehouseRequired: '仓库不能为空',
       validatorItemMoldRequired: '模具不能为空',
       validatorItemCountRequired: '数量不能为空',
+      submitConfirm: '确定提交该出库单吗？',
+      submitSuccess: '提交成功',
+      auditApproveConfirm: '确定通过该出库单吗？',
+      auditRejectConfirm: '确定不通过该出库单吗？',
+      auditApproveSuccess: '通过成功',
+      auditRejectSuccess: '不通过成功',
       moldGroupListTitle: '出库模具组清单'
     },
 
@@ -2722,6 +2740,7 @@
 
     MoldWorkOrderInquiry: {
       moduleName: '工单查询',
+      basicInfo: '基本信息',
       planNo: '单号',
       planType: '类型',
       planTypeInspect: '点检',

src/views/erp/mold/MoldBrandForm.vue

@@ -63,7 +63,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item :label="t('MoldManagement.MoldBrandFormPage.drawings')" prop="drawings">
-            <UploadImgs v-model="drawingsValue" :limit="9" width="96px" height="96px" />
+            <UploadFile v-model="drawingsValue" :limit="9" :file-type="drawingFileTypes" :is-show-tip="false" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -253,6 +253,7 @@ const formData = ref<MoldBrandVO>({
 
 const manualFileTypes = ['pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt']
 const videoFileTypes = ['mp4', 'avi', 'mov', 'wmv', 'flv', 'mkv', 'webm']
+const drawingFileTypes = ['dwg', 'dxf', 'step', 'stp', 'igs', 'iges']
 
 const splitAssetValue = (value: unknown): string[] => {
   if (!value) return []
@@ -277,9 +278,23 @@ const splitAssetValue = (value: unknown): string[] => {
 
 const normalizeAssetString = (value: unknown) => splitAssetValue(value).join(',')
 
+// 图纸字段专用处理函数，支持 JSON 格式
+const parseDrawingValue = (value: unknown): string => {
+  if (!value) return ''
+  if (typeof value === 'string') {
+    const trimmed = value.trim()
+    if (trimmed.startsWith('{') || trimmed.startsWith('[')) {
+      return trimmed
+    }
+    // 旧格式，直接返回
+    return trimmed
+  }
+  return JSON.stringify(value)
+}
+
 const drawingsValue = computed({
-  get: () => splitAssetValue((formData.value as any).drawings),
+  get: () => parseDrawingValue((formData.value as any).drawings),
-  set: (value: any) => { ;(formData.value as any).drawings = normalizeAssetString(value) }
+  set: (value: any) => { (formData.value as any).drawings = parseDrawingValue(value) }
 })
 
 const operationManualValue = computed({
@@ -455,7 +470,7 @@ const submitForm = async () => {
     const payload: MoldBrandVO = {
       ...formData.value,
       productIds: Array.isArray(formData.value.productIds) ? formData.value.productIds : [],
-      drawings: normalizeAssetString((formData.value as any).drawings),
+      drawings: (formData.value as any).drawings,
       operationManual: normalizeAssetString((formData.value as any).operationManual),
       operationVideo: normalizeAssetString((formData.value as any).operationVideo),
       isEnable: Boolean(formData.value.isEnable)

src/views/erp/mold/detail/brand.vue

@@ -305,15 +305,11 @@
               </el-tab-pane>
               <el-tab-pane :label="t('MoldManagement.MoldBrandDetail.tabDrawings')" name="drawings">
                 <el-table :data="drawingRows" :stripe="true" :show-overflow-tooltip="true">
-                  <el-table-column :label="t('MoldManagement.MoldBrandDetail.drawings')" prop="url" min-width="180">
+                  <el-table-column :label="t('MoldManagement.MoldBrandDetail.drawings')" prop="url" min-width="220">
                     <template #default="scope">
-                      <el-image
+                      <el-link :href="scope.row.url" target="_blank" type="primary" :underline="false">
-                        :src="scope.row.url"
+                        {{ scope.row.name }}
-                        :preview-src-list="drawingRows.map((item) => item.url)"
+                      </el-link>
-                        preview-teleported
-                        fit="cover"
-                        class="mold-brand-asset-image"
-                      />
                     </template>
                   </el-table-column>
                 </el-table>
@@ -469,6 +465,33 @@ const getAssetName = (url: string) => {
 }
 
 const parseAssetRows = (value: any) => {
+  if (!value) return []
+  
+  const text = String(value).trim()
+  if (text.startsWith('{') || text.startsWith('[')) {
+    try {
+      const parsed = JSON.parse(text)
+      if (Array.isArray(parsed)) {
+        return parsed.map((item) => {
+          if (item && typeof item === 'object' && item.fileUrl) {
+            return {
+              url: String(item.fileUrl),
+              name: item.fileName ? String(item.fileName) : getAssetName(item.fileUrl)
+            }
+          }
+          return null
+        }).filter(Boolean)
+      }
+      if (parsed && typeof parsed === 'object' && parsed.fileUrl) {
+        return [{
+          url: String(parsed.fileUrl),
+          name: parsed.fileName ? String(parsed.fileName) : getAssetName(parsed.fileUrl)
+        }]
+      }
+    } catch {}
+  }
+  
+  // 旧格式处理
   return parseAssetUrls(value).map((url) => ({
     url,
     name: getAssetName(url)

src/views/erp/stock/out/StockOutForm.vue

@@ -192,7 +192,7 @@ const formRules = reactive({
 const disabled = computed(() => formType.value === 'detail')
 const formRef = ref() // 表单 Ref
 const userList = ref<UserVO[]>([]) // 经办人列表
-const WAREHOUSE_DOCUMENT_TYPES = 'warehouse_document_types'
+const WAREHOUSE_DOCUMENT_TYPES = 'warehouse_document_out_types'
 const options = computed(() => getStrDictOptions(WAREHOUSE_DOCUMENT_TYPES))
 watch(options, (items) => {
   if (formType.value === 'create' && !formData.value.outType && items.length) {

src/views/erp/stock/out/index.vue

@@ -359,7 +359,7 @@ const queryParams = reactive({
   outType: undefined,
   creator: undefined
 })
-const WAREHOUSE_DOCUMENT_TYPES = 'warehouse_document_types'
+const WAREHOUSE_DOCUMENT_TYPES = 'warehouse_document_out_types'
 const stockOutTypeOptions = computed(() => getStrDictOptions(WAREHOUSE_DOCUMENT_TYPES))
 const outTypeToInfoKey = (outType: string) => {
   const map: Record<string, string> = {

src/views/mes/moldget/index.vue

@@ -206,7 +206,7 @@
           <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column :label="t('MoldManagement.MoldGet.operate')" align="center" fixed="right" width="220">
+      <el-table-column :label="t('MoldManagement.MoldGet.operate')" align="center" fixed="right" width="300">
         <template #default="scope">
           <el-button
             link
@@ -220,34 +220,43 @@
             type="primary"
             @click="openForm('update', scope.row.id)"
             v-hasPermi="['erp:stock-out:update']"
-            v-if="scope.row.status === 10"
+            v-if="Number(scope.row.status) === 10"
           >
             {{ t('MoldManagement.MoldGet.edit') }}
           </el-button>
           <el-button
+            v-if="[0, 1].includes(Number(scope.row.status))"
+            link
+            type="primary"
+            @click="handleUpdateStatus(scope.row.id, 10)"
+            v-hasPermi="['erp:stock-out:update-status']"
+          >
+            {{ t('MoldManagement.MoldGet.submit') }}
+          </el-button>
+          <el-button
+            v-if="Number(scope.row.status) === 10"
             link
             type="primary"
             @click="handleUpdateStatus(scope.row.id, 20)"
             v-hasPermi="['erp:stock-out:update-status']"
-            v-if="scope.row.status === 10"
           >
-            {{ t('MoldManagement.MoldGet.approve') }}
+            {{ t('MoldManagement.MoldGet.auditApprove') }}
           </el-button>
-          <!-- <el-button
+          <el-button
+            v-if="Number(scope.row.status) === 10"
             link
             type="danger"
-            @click="handleUpdateStatus(scope.row.id, 10)"
+            @click="handleUpdateStatus(scope.row.id, 1)"
             v-hasPermi="['erp:stock-out:update-status']"
-            v-else
           >
-            {{ t('MoldManagement.MoldGet.unapprove') }}
+            {{ t('MoldManagement.MoldGet.auditReject') }}
-          </el-button> -->
+          </el-button>
           <el-button
             link
             type="danger"
             @click="handleDelete([scope.row.id])"
             v-hasPermi="['erp:stock-out:delete']"
-            v-if="scope.row.status === 10"
+            v-if="Number(scope.row.status) === 10"
           >
             {{ t('MoldManagement.MoldGet.delete') }}
           </el-button>
@@ -366,14 +375,27 @@ const handleDelete = async (ids: number[]) => {
   } catch {}
 }
 
-/** 审批/反审批操作 */
+/** 状态更新操作 */
 const handleUpdateStatus = async (id: number, status: number) => {
   try {
-    // 审批的二次确认
+    const actionMap: Record<number, { confirm: string; success: string }> = {
-    await message.confirm(`确定${status === 20 ? '审批' : '反审批'}该出库单吗？`)
+      10: {
-    // 发起审批
+        confirm: t('MoldManagement.MoldGet.submitConfirm'),
+        success: t('MoldManagement.MoldGet.submitSuccess')
+      },
+      20: {
+        confirm: t('MoldManagement.MoldGet.auditApproveConfirm'),
+        success: t('MoldManagement.MoldGet.auditApproveSuccess')
+      },
+      1: {
+        confirm: t('MoldManagement.MoldGet.auditRejectConfirm'),
+        success: t('MoldManagement.MoldGet.auditRejectSuccess')
+      }
+    }
+    const action = actionMap[status]
+    await message.confirm(action.confirm)
     await StockOutApi.updateStockOutStatus(id, status)
-    message.success(`${status === 20 ? '审批' : '反审批'}成功`)
+    message.success(action.success)
     // 刷新列表
     await getList()
   } catch {}

src/views/mes/moldreturn/index.vue

@@ -129,7 +129,7 @@
               <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
             </template>
           </el-table-column>
-          <el-table-column :label="t('MoldManagement.MoldReturn.operate')" align="center" fixed="right" width="220">
+          <el-table-column :label="t('MoldManagement.MoldReturn.operate')" align="center" fixed="right" width="300">
             <template #default="scope">
               <el-button link @click="openForm('detail', scope.row.id)" v-hasPermi="['erp:stock-out:query']">
                 {{ t('MoldManagement.MoldReturn.detail') }}
@@ -138,18 +138,18 @@
                 v-hasPermi="['erp:stock-out:update']" :disabled="scope.row.status === 20">
                 {{ t('MoldManagement.MoldReturn.edit') }}
               </el-button>
+              <el-button link type="primary" @click="handleUpdateStatus(scope.row.id, 10)"
+                v-hasPermi="['erp:stock-in:update-status']" v-if="[0, 1].includes(Number(scope.row.status))">
+                {{ t('MoldManagement.MoldReturn.submit') }}
+              </el-button>
               <el-button link type="primary" @click="handleUpdateStatus(scope.row.id, 20)"
-                v-hasPermi="['erp:stock-out:update-status']" v-if="scope.row.status === 10">
+                v-hasPermi="['erp:stock-in:update-status']" v-if="Number(scope.row.status) === 10">
-                {{ t('MoldManagement.MoldReturn.approve') }}
+                {{ t('MoldManagement.MoldReturn.auditApprove') }}
+              </el-button>
+              <el-button link type="danger" @click="handleUpdateStatus(scope.row.id, 1)"
+                v-hasPermi="['erp:stock-in:update-status']" v-if="Number(scope.row.status) === 10">
+                {{ t('MoldManagement.MoldReturn.auditReject') }}
               </el-button>
-              <!-- <el-button
-            link
-            type="danger"
-            @click="handleUpdateStatus(scope.row.id, 10)"
-            v-hasPermi="['erp:stock-out:update-status']"
-          >
-            {{ t('MoldManagement.MoldReturn.unapprove') }}
-          </el-button> -->
               <el-button link type="danger" @click="handleDelete([scope.row.id])" v-hasPermi="['erp:stock-out:delete']">
                 {{ t('MoldManagement.MoldReturn.delete') }}
               </el-button>
@@ -262,14 +262,27 @@ const handleDelete = async (ids: number[]) => {
   } catch { }
 }
 
-/** 审批/反审批操作 */
+/** 状态更新操作 */
 const handleUpdateStatus = async (id: number, status: number) => {
   try {
-    const confirmText = status === 20 ? t('MoldManagement.MoldReturn.approveConfirm') : t('MoldManagement.MoldReturn.unapproveConfirm')
+    const actionMap: Record<number, { confirm: string; success: string }> = {
-    await message.confirm(confirmText)
+      10: {
+        confirm: t('MoldManagement.MoldReturn.submitConfirm'),
+        success: t('MoldManagement.MoldReturn.submitSuccess')
+      },
+      20: {
+        confirm: t('MoldManagement.MoldReturn.auditApproveConfirm'),
+        success: t('MoldManagement.MoldReturn.auditApproveSuccess')
+      },
+      1: {
+        confirm: t('MoldManagement.MoldReturn.auditRejectConfirm'),
+        success: t('MoldManagement.MoldReturn.auditRejectSuccess')
+      }
+    }
+    const action = actionMap[status]
+    await message.confirm(action.confirm)
     await StockInApi.updateStockInStatus(id, status)
-    const successText = status === 20 ? t('MoldManagement.MoldReturn.approveSuccess') : t('MoldManagement.MoldReturn.unapproveSuccess')
+    message.success(action.success)
-    message.success(successText)
     // 刷新列表
     await getList()
   } catch { }

src/views/mold/workOrderInquiry/components/TicketResultDialog.vue

@@ -1,123 +1,171 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="1500px">
+  <div class="ticket-result-page">
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :row-key="getRowKey">
+    <ContentWrap>
-      <el-table-column type="index" :label="t('MoldManagement.TicketResultDialog.index')" align="center" width="70" />
+      <div class="ticket-result-header">
-      <el-table-column :label="t('MoldManagement.TicketResultDialog.inspectionItemName')" align="center" prop="inspectionItemName" min-width="200"  sortable />
+        <el-button @click="handleClose">{{ t('common.back') }}</el-button>
-      <el-table-column :label="t('MoldManagement.TicketResultDialog.inspectionMethod')" align="center" prop="inspectionMethod" min-width="160">
+        <span class="ticket-result-title">{{ pageTitle }}</span>
-        <template #default="scope">
+      </div>
-          <dict-tag type="Inspection_method" :value="scope.row.inspectionMethod" />
+
-        </template>
+      <el-descriptions :title="t('MoldManagement.MoldWorkOrderInquiry.basicInfo')" :column="4" border>
-      </el-table-column>
+        <el-descriptions-item :label="t('MoldManagement.MoldWorkOrderInquiry.planNo')">
-      <el-table-column :label="t('MoldManagement.TicketResultDialog.judgmentCriteria')" align="center" prop="judgmentCriteria" min-width="180" />
+          {{ currentRow?.planNo || '-' }}
-      <el-table-column :label="t('MoldManagement.TicketResultDialog.inspectionResult')" align="center" prop="inspectionResult" min-width="140">
+        </el-descriptions-item>
-        <template #default="scope">
+        <el-descriptions-item :label="t('MoldManagement.MoldWorkOrderInquiry.moldName')">
-          <el-tag v-if="String(scope.row.inspectionResult) === '0'" type="info">{{ t('MoldManagement.TicketResultDialog.inspectionResultPending') }}</el-tag>
+          {{ currentRow?.moldName || '-' }}
-          <el-tag v-else-if="String(scope.row.inspectionResult) === '1'" type="success">{{ t('MoldManagement.TicketResultDialog.inspectionResultPass') }}</el-tag>
+        </el-descriptions-item>
-          <el-tag v-else-if="String(scope.row.inspectionResult) === '2'" type="danger">{{ t('MoldManagement.TicketResultDialog.inspectionResultFail') }}</el-tag>
+        <el-descriptions-item :label="t('MoldManagement.MoldWorkOrderInquiry.planType')">
-          <span v-else>-</span>
+          <el-tag v-if="String(currentRow?.planType) === '1'" type="primary">
-        </template>
+            {{ t('MoldManagement.MoldWorkOrderInquiry.planTypeInspect') }}
-      </el-table-column>
+          </el-tag>
-      <el-table-column :label="t('MoldManagement.TicketResultDialog.images')" align="center" prop="images" min-width="260">
+          <el-tag v-else-if="String(currentRow?.planType) === '2'" type="success">
-        <template #default="scope">
+            {{ t('MoldManagement.MoldWorkOrderInquiry.planTypeMaintain') }}
-          <div
-            v-if="String(scope.row.inspectionResult) === '0'"
-            v-loading="isImageUploading(String(scope.row.id))"
-            element-loading-text="上传中"
-            class="ticket-result-images"
-            :class="{ 'is-full': (imageMap[String(scope.row.id)] || []).length >= 3 }"
-          >
-            <UploadImgs
-              v-model="imageMap[String(scope.row.id)]"
-              :limit="3"
-              width="64px"
-              height="64px"
-              @uploading-change="setImageUploading(String(scope.row.id), $event)"
-            />
-          </div>
-          <div v-else-if="parseImages(scope.row.images).length" class="ticket-result-images">
-            <el-image
-              v-for="image in parseImages(scope.row.images)"
-              :key="image"
-              :src="image"
-              :preview-src-list="parseImages(scope.row.images)"
-              preview-teleported
-              fit="cover"
-              class="ticket-result-image"
-            />
-          </div>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="t('EquipmentManagement.DvSubject.valueType')" align="center" prop="valueType" width="120" sortable>
-        <template #default="scope">
-          <el-tag
-            v-if="scope.row.valueType !== undefined && scope.row.valueType !== null && String(scope.row.valueType) !== ''"
-            effect="light" :type="getTagType('value_types', scope.row.valueType)"
-            :color="getTagColor('value_types', scope.row.valueType)"
-            :style="getTagStyle('value_types', scope.row.valueType)" disable-transitions>
-            {{ getTagLabel('value_types', scope.row.valueType) }}
           </el-tag>
           <span v-else>-</span>
-        </template>
+        </el-descriptions-item>
-      </el-table-column>
+        <el-descriptions-item :label="t('MoldManagement.MoldWorkOrderInquiry.jobStatus')">
-      <el-table-column :label="t('MoldManagement.TicketResultDialog.inputValue')" align="center" min-width="150">
+          <dict-tag :type="'job_status'" :value="jobStatus" />
-        <template #default="scope">
+        </el-descriptions-item>
-          <el-input
+        <el-descriptions-item :label="t('MoldManagement.MoldWorkOrderInquiry.configName')">
-            v-if="String(scope.row.valueType) === '0' || String(scope.row.valueType) === '2'"
+          {{ currentRow?.configName || '-' }}
-            v-model="scope.row.textInput"
+        </el-descriptions-item>
-            :disabled="String(scope.row.inspectionResult) !== '0'"
+        <el-descriptions-item :label="t('MoldManagement.MoldWorkOrderInquiry.operatorName')">
-            clearable
+          {{ currentRow?.operatorName || '-' }}
-            :placeholder="t('common.inputText')"
+        </el-descriptions-item>
-          />
+        <el-descriptions-item :label="t('MoldManagement.MoldWorkOrderInquiry.taskTime')">
-          <span v-else>-</span>
+          {{ formatDisplayTime(currentRow?.taskTime) }}
-        </template>
+        </el-descriptions-item>
-      </el-table-column>
+        <el-descriptions-item :label="t('MoldManagement.MoldWorkOrderInquiry.taskEndTime')">
-      <el-table-column :label="t('MoldManagement.TicketResultDialog.remark')" align="center" prop="remark" min-width="180">
+          {{ formatDisplayTime(currentRow?.taskEndTime) }}
-        <template #default="scope">
+        </el-descriptions-item>
-          <el-input v-if="String(scope.row.inspectionResult) === '0'" v-model="scope.row.remark" clearable :placeholder="t('common.inputText')" />
+        <el-descriptions-item :label="t('MoldManagement.MoldWorkOrderInquiry.jobResult')">
-          <span v-else>{{ scope.row.remark || '-' }}</span>
+          <el-tag v-if="currentRow?.jobResult == '1' || currentRow?.jobResult == 'OK'" type="success">
-        </template>
+            {{ t('MoldManagement.MoldWorkOrderInquiry.jobResultOk') }}
-      </el-table-column>
+          </el-tag>
-      <el-table-column :label="t('MoldManagement.TicketResultDialog.operate')" align="center" min-width="220" fixed="right">
+          <el-tag v-else-if="currentRow?.jobResult == '2' || currentRow?.jobResult == 'NG'" type="danger">
-        <template #default="scope">
+            {{ t('MoldManagement.MoldWorkOrderInquiry.jobResultNg') }}
-          <el-radio-group v-if="String(scope.row.inspectionResult) === '0'" v-model="decisionMap[String(scope.row.id)]">
+          </el-tag>
-            <el-radio :label="'1'">{{ t('MoldManagement.TicketResultDialog.pass') }}</el-radio>
-            <el-radio :label="'2'">{{ t('MoldManagement.TicketResultDialog.fail') }}</el-radio>
-          </el-radio-group>
           <span v-else>-</span>
-        </template>
+        </el-descriptions-item>
-      </el-table-column>
+        <el-descriptions-item v-if="String(jobStatus) === '4'"
-    </el-table>
+          :label="t('MoldManagement.MoldWorkOrderInquiry.cancelReason')" :span="3">
-
+          {{ cancelReason || '-' }}
-    <el-pagination
+        </el-descriptions-item>
-	      v-show="total > 0" v-model:current-page="queryParams.pageNo" v-model:page-size="queryParams.pageSize"
+      </el-descriptions>
-	      :background="true" :page-sizes="[10, 20, 30, 50, 100]" :pager-count="7" :total="total"
+    </ContentWrap>
-	      class="mt-15px mb-15px flex justify-end" layout="total, sizes, prev, pager, next, jumper"
+
-	      @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+    <ContentWrap>
-
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :row-key="getRowKey">
-	    <div v-if="String(jobStatus) === '4'" class="mt-10px text-14px">
+        <el-table-column type="index" :label="t('MoldManagement.TicketResultDialog.index')" align="center" width="70" />
-	      <span>{{ t('MoldManagement.MoldWorkOrderInquiry.jobStatus') }}：</span>
+        <el-table-column :label="t('MoldManagement.TicketResultDialog.inspectionItemName')" align="center"
-	      <dict-tag :type="'job_status'" :value="jobStatus" />
+          prop="inspectionItemName" min-width="200" sortable />
-	      <span class="ml-20px">取消原因：</span>
+        <el-table-column :label="t('MoldManagement.TicketResultDialog.inspectionMethod')" align="center"
-	      <span>{{ cancelReason || '-' }}</span>
+          prop="inspectionMethod" min-width="160">
-	    </div>
+          <template #default="scope">
-
+            <dict-tag type="Inspection_method" :value="scope.row.inspectionMethod" />
-    <template #footer>
+          </template>
-      <el-button @click="dialogVisible = false">{{ t('MoldManagement.TicketResultDialog.cancel') }}</el-button>
+        </el-table-column>
-      <el-button v-if="String(jobStatus) === '0'" type="primary" @click="handleSave" :loading="submitLoading" :disabled="hasImageUploading">{{ t('MoldManagement.TicketResultDialog.save') }}</el-button>
+        <el-table-column :label="t('MoldManagement.TicketResultDialog.judgmentCriteria')" align="center"
-    </template>
+          prop="judgmentCriteria" min-width="180" />
-  </Dialog>
+        <el-table-column :label="t('MoldManagement.TicketResultDialog.inspectionResult')" align="center"
+          prop="inspectionResult" min-width="140">
+          <template #default="scope">
+            <el-tag v-if="String(scope.row.inspectionResult) === '0'" type="info">{{
+              t('MoldManagement.TicketResultDialog.inspectionResultPending') }}</el-tag>
+            <el-tag v-else-if="String(scope.row.inspectionResult) === '1'" type="success">{{
+              t('MoldManagement.TicketResultDialog.inspectionResultPass') }}</el-tag>
+            <el-tag v-else-if="String(scope.row.inspectionResult) === '2'" type="danger">{{
+              t('MoldManagement.TicketResultDialog.inspectionResultFail') }}</el-tag>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="t('MoldManagement.TicketResultDialog.images')" align="center" prop="images"
+          min-width="260">
+          <template #default="scope">
+            <div v-if="String(scope.row.inspectionResult) === '0'" v-loading="isImageUploading(String(scope.row.id))"
+              element-loading-text="上传中" class="ticket-result-images"
+              :class="{ 'is-full': (imageMap[String(scope.row.id)] || []).length >= 3 }">
+              <UploadImgs v-model="imageMap[String(scope.row.id)]" :limit="3" width="64px" height="64px"
+                @uploading-change="setImageUploading(String(scope.row.id), $event)" />
+            </div>
+            <div v-else-if="parseImages(scope.row.images).length" class="ticket-result-images">
+              <el-image v-for="image in parseImages(scope.row.images)" :key="image" :src="image"
+                :preview-src-list="parseImages(scope.row.images)" preview-teleported fit="cover"
+                class="ticket-result-image" />
+            </div>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="t('EquipmentManagement.DvSubject.valueType')" align="center" prop="valueType"
+          width="120" sortable>
+          <template #default="scope">
+            <el-tag
+              v-if="scope.row.valueType !== undefined && scope.row.valueType !== null && String(scope.row.valueType) !== ''"
+              effect="light" :type="getTagType('value_types', scope.row.valueType)"
+              :color="getTagColor('value_types', scope.row.valueType)"
+              :style="getTagStyle('value_types', scope.row.valueType)" disable-transitions>
+              {{ getTagLabel('value_types', scope.row.valueType) }}
+            </el-tag>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="t('MoldManagement.TicketResultDialog.inputValue')" align="center" min-width="150">
+          <template #default="scope">
+            <el-input v-if="String(scope.row.valueType) === '0' || String(scope.row.valueType) === '2'"
+              v-model="scope.row.textInput" :disabled="String(scope.row.inspectionResult) !== '0'" clearable
+              :placeholder="t('common.inputText')" />
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="t('MoldManagement.TicketResultDialog.remark')" align="center" prop="remark"
+          min-width="180">
+          <template #default="scope">
+            <el-input v-if="String(scope.row.inspectionResult) === '0'" v-model="scope.row.remark" clearable
+              :placeholder="t('common.inputText')" />
+            <span v-else>{{ scope.row.remark || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="t('MoldManagement.TicketResultDialog.operate')" align="center" min-width="220"
+          fixed="right">
+          <template #default="scope">
+            <el-radio-group v-if="String(scope.row.inspectionResult) === '0'"
+              v-model="decisionMap[String(scope.row.id)]">
+              <el-radio :label="'1'">{{ t('MoldManagement.TicketResultDialog.pass') }}</el-radio>
+              <el-radio :label="'2'">{{ t('MoldManagement.TicketResultDialog.fail') }}</el-radio>
+            </el-radio-group>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination v-show="total > 0" v-model:current-page="queryParams.pageNo"
+        v-model:page-size="queryParams.pageSize" :background="true" :page-sizes="[10, 20, 30, 50, 100]" :pager-count="7"
+        :total="total" class="mt-15px mb-15px flex justify-end" layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+
+      <div class="ticket-result-footer">
+        <el-button v-if="String(jobStatus) === '0'" type="primary" @click="handleSave" :loading="submitLoading"
+          :disabled="hasImageUploading">
+          {{ t('MoldManagement.TicketResultDialog.save') }}
+        </el-button>
+      </div>
+    </ContentWrap>
+  </div>
 </template>
 
 <script setup lang="ts">
-import { TicketManagementApi, TicketResultVO } from '@/api/mold/ticketManagement'
+import { TicketManagementApi, TicketManagementVO, TicketResultVO } from '@/api/mold/ticketManagement'
+import { formatDate } from '@/utils/formatTime'
 import { getStrDictOptions } from '@/utils/dict'
 import { isHexColor } from '@/utils/color'
 import { useDictStoreWithOut } from '@/store/modules/dict'
 
-defineOptions({ name: 'TicketResultDialog' })
+defineOptions({ name: 'TicketResultModule' })
 
-const emit = defineEmits(['success'])
+const emit = defineEmits(['success', 'closed'])
+const props = defineProps<{
+  ticketRow?: TicketManagementVO
+  title?: string
+}>()
 
 const { t } = useI18n()
 const message = useMessage()
@@ -125,16 +173,16 @@ const message = useMessage()
 const dictStore = useDictStoreWithOut()
 const dictReady = ref(false)
 
-const dialogVisible = ref(false)
+const pageTitle = computed(() => props.title || t('MoldManagement.TicketResultDialog.moduleName'))
-const dialogTitle = ref('检验结果')
 const loading = ref(false)
 const submitLoading = ref(false)
 
 const list = ref<TicketResultVO[]>([])
 const total = ref(0)
-const managementId = ref<number | undefined>(undefined)
+const currentRow = computed(() => props.ticketRow)
-const jobStatus = ref<string | number | undefined>(undefined)
+const managementId = computed(() => props.ticketRow?.id)
-const cancelReason = ref<string | undefined>(undefined)
+const jobStatus = computed(() => props.ticketRow?.jobStatus)
+const cancelReason = computed(() => props.ticketRow?.cancelReason)
 const decisionMap = reactive<Record<string, '1' | '2' | undefined>>({})
 const imageMap = reactive<Record<string, string[]>>({})
 const imageUploadingMap = reactive<Record<string, boolean>>({})
@@ -189,34 +237,29 @@ const queryParams = reactive({
   pageSize: 10
 })
 
-const open = async (options: { managementId: number; title?: string; jobStatus?: string | number; cancelReason?: string }) => {
+const resetResultState = () => {
-  dialogVisible.value = true
-  dialogTitle.value = options.title || t('MoldManagement.TicketResultDialog.moduleName')
-  managementId.value = options.managementId
-  jobStatus.value = options.jobStatus
-  cancelReason.value = options.cancelReason
   for (const key of Object.keys(decisionMap)) delete decisionMap[key]
   for (const key of Object.keys(imageMap)) delete imageMap[key]
   for (const key of Object.keys(imageUploadingMap)) delete imageUploadingMap[key]
+  list.value = []
+  total.value = 0
   queryParams.pageNo = 1
-  await getList()
 }
 
-defineExpose({ open })
-
 onMounted(async () => {
   await dictStore.setDictMap()
   dictReady.value = true
 })
 
 const getList = async () => {
-  if (!managementId.value) return
+  const id = managementId.value
+  if (!id) return
   loading.value = true
   try {
     const data = await TicketManagementApi.getTicketResultsPage({
       pageNo: queryParams.pageNo,
       pageSize: queryParams.pageSize,
-      managementId: managementId.value
+      managementId: id
     })
     list.value = data.list
     total.value = data.total
@@ -233,6 +276,15 @@ const getList = async () => {
   }
 }
 
+watch(
+  () => props.ticketRow?.id,
+  async (id) => {
+    resetResultState()
+    if (id) await getList()
+  },
+  { immediate: true }
+)
+
 const handleSizeChange = () => {
   queryParams.pageNo = 1
   getList()
@@ -260,7 +312,6 @@ const handleSave = async () => {
   try {
     await TicketManagementApi.batchUpdateTicketResults(payload)
     message.success(t('MoldManagement.TicketResultDialog.updateSuccess'))
-    dialogVisible.value = false
     emit('success')
   } catch {
     message.error(t('MoldManagement.TicketResultDialog.updateFail'))
@@ -269,6 +320,14 @@ const handleSave = async () => {
   }
 }
 
+const handleClose = () => {
+  emit('closed')
+}
+
+const formatDisplayTime = (value: any) => {
+  return value ? formatDate(value) : '-'
+}
+
 const getRowKey = (row: TicketResultVO) => {
   return String(row.id ?? '')
 }
@@ -311,5 +370,25 @@ const parseImages = (value: any): string[] => {
   height: 64px;
   border: 1px solid var(--el-border-color-lighter);
   border-radius: 6px;
+  margin-right: 6px;
+}
+
+.ticket-result-header {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-bottom: 16px;
+}
+
+.ticket-result-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+.ticket-result-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
 }
 </style>

src/views/mold/workOrderInquiry/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <template v-if="!resultVisible">
   <ContentWrap>
     <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" min-label-width="68px">
       <el-form-item :label="t('MoldManagement.MoldWorkOrderInquiry.planNo')" prop="planNo">
@@ -106,7 +107,15 @@
     <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
   </ContentWrap>
 
-  <TicketResultDialog ref="resultDialogRef" @success="getList" />
+  </template>
+
+  <TicketResultDialog
+    v-else
+    :ticket-row="selectedResultRow"
+    :title="resultTitle"
+    @success="handleResultSuccess"
+    @closed="handleResultClosed"
+  />
 </template>
 
 <script setup lang="ts">
@@ -137,6 +146,15 @@ const list = ref<TicketManagementVO[]>([])
 const total = ref(0)
 const selectedIds = ref<number[]>([])
 const cancelLoading = ref(false)
+const resultVisible = ref(false)
+const selectedResultRow = ref<TicketManagementVO>()
+const resultTitle = computed(() => {
+  const row = selectedResultRow.value
+  if (!row) return t('MoldManagement.MoldWorkOrderInquiry.inspectResultTitle')
+  return row.planNo
+    ? `${t('MoldManagement.MoldWorkOrderInquiry.inspectResultTitlePrefix')}${row.planNo}`
+    : t('MoldManagement.MoldWorkOrderInquiry.inspectResultTitle')
+})
 
 const queryParams = reactive({
   pageNo: 1,
@@ -205,19 +223,22 @@ const handleBatchCancel = async () => {
   }
 }
 
-const resultDialogRef = ref<InstanceType<typeof TicketResultDialog>>()
+const handleRowClick = (row: TicketManagementVO, column: any) => {
-
-const handleRowClick = async (row: TicketManagementVO, column: any) => {
   if (column?.type === 'selection') return
   if (!row?.id) return
-  await resultDialogRef.value?.open({
+  selectedResultRow.value = row
-    managementId: row.id,
+  resultVisible.value = true
-    jobStatus: row.jobStatus,
+}
-    cancelReason: row.cancelReason,
+
-    title: row.planNo
+const handleResultClosed = () => {
-      ? `${t('MoldManagement.MoldWorkOrderInquiry.inspectResultTitlePrefix')}${row.planNo}`
+  resultVisible.value = false
-      : t('MoldManagement.MoldWorkOrderInquiry.inspectResultTitle')
+  selectedResultRow.value = undefined
-  })
+}
+
+const handleResultSuccess = async () => {
+  resultVisible.value = false
+  selectedResultRow.value = undefined
+  await getList()
 }
 
 onMounted(async () => {