diff --git a/sub-government-affairs-service/src/apis/coding.js b/sub-government-affairs-service/src/apis/coding.js index a927a22..d0b5ac9 100644 --- a/sub-government-affairs-service/src/apis/coding.js +++ b/sub-government-affairs-service/src/apis/coding.js @@ -63,10 +63,19 @@ export function ExportEntity(params = {}) { } /** - * @Title: 详情 + * @Title: 采收详情 */ export function GetEntity(params = {}) { return request(`/trace/code/farmMange/qualityCheck/${params?.id}`, { method: 'GET', }); } + +/** + * @Title: 溯源详情 + */ +export function GetTraceDetail(params = {}) { + return request(`/trace/code/farmMange/originalCodeInfo/${params?.id}`, { + method: 'GET', + }); +} diff --git a/sub-government-affairs-service/src/utils/index.js b/sub-government-affairs-service/src/utils/index.js index dfac7e9..51cef0a 100644 --- a/sub-government-affairs-service/src/utils/index.js +++ b/sub-government-affairs-service/src/utils/index.js @@ -3,7 +3,7 @@ * @Author: zenghua.wang * @Date: 2022-02-23 21:12:37 * @LastEditors: zenghua.wang - * @LastEditTime: 2025-02-10 14:42:53 + * @LastEditTime: 2025-02-11 16:18:41 */ import lodash from 'lodash'; import dayjs from 'dayjs'; @@ -293,6 +293,16 @@ export const obj2Param = (json) => { export const getAssetsFile = (url) => { return new URL(`../assets/${url}`, import.meta.url); }; +/** + * @Title 替换图片url字段值 + * @param {*} url + * @returns + */ +export const setUploadField = (url) => { + // if (isEmpty(url) || url.includes('http')) return null; + if (isEmpty(url)) return null; + return url; +}; /** * @Title: 下载文件 * @param {void} url: diff --git a/sub-government-affairs-service/src/views/trace/breeding/coding/index.vue b/sub-government-affairs-service/src/views/trace/breeding/coding/index.vue index 98106d2..eafbbff 100644 --- a/sub-government-affairs-service/src/views/trace/breeding/coding/index.vue +++ b/sub-government-affairs-service/src/views/trace/breeding/coding/index.vue @@ -306,11 +306,11 @@ const state = reactive({ rows: 4, overHidden: true, width: 200, - rules: { - required: true, - message: '请输入', - trigger: 'blur', - }, + // rules: { + // required: true, + // message: '请输入', + // trigger: 'blur', + // }, }, { label: '创建时间', @@ -362,7 +362,7 @@ const state = reactive({ }); // 加载 -const loadData = async () => { +const loadData = () => { state.loading = true; delete state.query.datetime; GetEntityList(state.query) diff --git a/sub-government-affairs-service/src/views/trace/breeding/coding/info.vue b/sub-government-affairs-service/src/views/trace/breeding/coding/info.vue index f1f3d4b..83d39dc 100644 --- a/sub-government-affairs-service/src/views/trace/breeding/coding/info.vue +++ b/sub-government-affairs-service/src/views/trace/breeding/coding/info.vue @@ -36,24 +36,20 @@ const app = useApp(); const crudRef = ref(null); const state = reactive({ loading: false, - // query: { - // current: 1, - // size: 10, - // }, options: { ...CRUD_OPTIONS, - index: false, + index: true, addBtn: false, refreshBtn: false, selection: false, menu: false, column: [ - { - label: '溯源码', - prop: 'id', - width: 200, - fixed: true, - }, + // { + // label: '序号', + // prop: 'id', + // width: 200, + // fixed: true, + // }, { label: '采收批次', prop: 'harvestBatch', @@ -109,14 +105,6 @@ const state = reactive({ prop: 'qualityReportUrl', slot: true, }, - { - label: '检测说明', - prop: 'qualityDescribe', - type: 'textarea', - overHidden: true, - resize: 'none', - width: 200, - }, { label: '质检人', prop: 'qualityPerson', @@ -126,13 +114,16 @@ const state = reactive({ prop: 'qualityTime', width: 200, }, + { + label: '检测说明', + prop: 'qualityDescribe', + type: 'textarea', + overHidden: true, + resize: 'none', + width: 200, + }, ], }, - // pageData: { - // total: 0, - // currentPage: 1, - // pageSize: 10, - // }, data: {}, list: [], }); diff --git a/sub-government-affairs-service/src/views/trace/breeding/quality/form.vue b/sub-government-affairs-service/src/views/trace/breeding/quality/form.vue index 8a10fb3..3bdffc8 100644 --- a/sub-government-affairs-service/src/views/trace/breeding/quality/form.vue +++ b/sub-government-affairs-service/src/views/trace/breeding/quality/form.vue @@ -23,7 +23,7 @@