-
产出品信息
-
-
-
-
-
-
-
- 已选择 {{ landNums }} 个地块
-
-
- 面积总计（亩）：{{ totalArea }}
-
-
- 产量总计（公斤）：{{ yieldSeed }}
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
+
+
-
-
-
- {{ dialogForm.cropName }}
- {{ dialogForm.area }}
- {{ dialogForm.regionCode }}
- {{ dialogForm.regionName }}
- {{ dialogForm.gridId }}
- {{ dialogForm.gridName }}
- {{ dialogForm.landId }}
- {{ dialogForm.landName }}
- {{ dialogForm.propertyName }}
- {{ dialogForm.propertyPhone }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -114,374 +86,229 @@
-
diff --git a/sub-government-affairs-service/src/views/trace/products/enterprise/index copy已对接口.vue b/sub-government-affairs-service/src/views/trace/products/enterprise/index copy已对接口.vue
new file mode 100644
index 0000000..cee3bec
--- /dev/null
+++ b/sub-government-affairs-service/src/views/trace/products/enterprise/index copy已对接口.vue
@@ -0,0 +1,428 @@
+
+
+
+
+
+
+ {{ dialogForm.regionCode }}
+ {{ dialogForm.regionName }}
+ {{ dialogForm.gridId }}
+ {{ dialogForm.gridName }}
+ {{ dialogForm.landId }}
+ {{ dialogForm.landName }}
+
+
+ {{ dialogForm.businessEntityCode }}
+ {{ dialogForm.businessEntityName }}
+
-
-
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 搜索
+ 重置
- 产量信息
- 基础信息
品质信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/trace/products/enterprise/index.vue b/sub-government-affairs-service/src/views/trace/products/enterprise/index.vue
index cee3bec..f384560 100644
--- a/sub-government-affairs-service/src/views/trace/products/enterprise/index.vue
+++ b/sub-government-affairs-service/src/views/trace/products/enterprise/index.vue
@@ -6,8 +6,8 @@
-
+
+ 溯源企业管理
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+ 农药用药详情
+ 检测信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -112,16 +127,23 @@
import { ref, reactive, computed, onMounted, onBeforeUnmount, nextTick } from 'vue';
import tableComponent from '@/components/tableComponent.vue';
import { ElMessage } from 'element-plus';
-import { getLandList } from '@/apis/inputSuppliesApi/supervisionOfInputs';
-import { getTraceCompanyList, addTraceCompany, editTraceCompany, deleteTraceCompany } from '@/apis/trace/products';
-import { getLandInfo } from '@/apis/land';
+import inputSuppliesApi from '@/apis/inputSuppliesApi';
+const { getMaterailTypes } = inputSuppliesApi;
+import {
+ getFertilizeUseRegulatoryRecords,
+ fertilizeUseRegulatorySave,
+ editFertilizeUseRegulatory,
+ delFertilizeUseRegulatory,
+ getLandList,
+} from '@/apis/inputSuppliesApi/supervisionOfInputs';
+import request from '@/utils/axios';
import { GetDictTypeInfo } from '@/apis/system/dictType';
import { useApp } from '@/hooks';
const app = useApp();
// 查询条件
const formInline = reactive({
- keyword: '',
+ name: '',
current: 1,
size: 10,
});
@@ -135,21 +157,79 @@ const resetForm = () => {
};
// 表格数据
-const tableData = ref([]);
+const tableData = ref([
+ {
+ batchCode: 'QY-GM-001',
+ productTypes: '耿马蔗香食品有限公司',
+ name: '有限责任公司',
+ purchaseDate: '91530925MA6P8E1234',
+ number: '杨志明',
+ Unit: '刀玉兰',
+ baseCode: '188-8786-1234',
+ 厂址: '云南省临沧市耿马县勐永镇工业园区',
+ 入驻时间: '2023-05-10 00:00:00',
+ 申请时间: '2023-04-25 00:00:00',
+ },
+ {
+ batchCode: 'QY-GM-002',
+ productTypes: '耿马绿丰食品加工厂',
+ name: '个体工商户',
+ purchaseDate: '92530925L3D5F9876',
+ number: '李红梅',
+ Unit: '岩温罕',
+ baseCode: '159-8723-4567',
+ 厂址: '云南省临沧市耿马县孟定镇',
+ 入驻时间: '2022-11-15 00:00:00',
+ 申请时间: '2022-10-30 00:00:00',
+ },
+ {
+ batchCode: 'QY-GM-003',
+ productTypes: '耿马辣味坊食品厂',
+ name: '个人独资企业',
+ purchaseDate: '91530925G7H2K6543',
+ number: '张丽华',
+ Unit: '罕香',
+ baseCode: '137-8765-3210',
+ 厂址: '云南省临沧市耿马县四排山乡',
+ 入驻时间: '2024-02-20 00:00:00',
+ 申请时间: '2024-01-18 00:00:00',
+ },
+ {
+ batchCode: 'QY-GM-004',
+ productTypes: '耿马山野农产加工厂',
+ name: '有限责任公司',
+ purchaseDate: '91530925N9J4R7890',
+ number: '周建国',
+ Unit: '俸春燕',
+ baseCode: '182-8834-5678',
+ 厂址: '云南省临沧市耿马县贺派乡',
+ 入驻时间: '2023-08-05 00:00:00',
+ 申请时间: '2023-07-22 00:00:00',
+ },
+ {
+ batchCode: 'QY-GM-005',
+ productTypes: '耿马原生茶业',
+ name: '农民专业合作社',
+ purchaseDate: '93530925P5K6T2345',
+ number: '赵志强',
+ Unit: '艾叶',
+ baseCode: '151-8790-4321',
+ 厂址: '云南省临沧市耿马县大兴乡',
+ 入驻时间: '2022-09-12 00:00:00',
+ 申请时间: '2022-08-28 00:00:00',
+ },
+]);
const selectedIds = ref([]);
const tableLoading = ref(false);
const tableTotal = ref(0);
const columns = ref([
- { prop: 'comCode', label: '企业编码' },
- { prop: 'comName', label: '企业名称' },
- { prop: 'comType', label: '企业类型' },
- { prop: 'uscc', label: '统一社会信用代码' },
- { prop: 'legalName', label: '法人信息' },
- { prop: 'contactName', label: '联系人' },
- { prop: 'phone', label: '电话' },
- { prop: 'address', label: '厂址' },
- { prop: 'tenancyTime', label: '入驻时间' },
- { prop: 'applyTime', label: '申请时间' },
+ { prop: 'batchCode', label: '企业编码' },
+ { prop: 'productTypes', label: '生产商' },
+ { prop: 'name', label: '企业类型' },
+ { prop: 'purchaseDate', label: '统一社会信用代码' },
+ { prop: 'number', label: '法人信息' },
+ { prop: 'Unit', label: '联系人' },
+ { prop: 'baseCode', label: '电话' },
{ prop: 'action', label: '操作', slotName: 'action', width: 100, fixed: 'right' },
]);
const handlePaginationChange = ({ page, pageSize }) => {
@@ -158,18 +238,37 @@ const handlePaginationChange = ({ page, pageSize }) => {
loadData();
};
const loadData = async () => {
- tableLoading.value = true;
- try {
- let response = await getTraceCompanyList(formInline);
- tableLoading.value = false;
- if (response.code == 200) {
- tableData.value = response.data.records;
- tableTotal.value = response.data.total;
+ // tableLoading.value = true;
+ // try {
+ // let response = await getFertilizeUseRegulatoryRecords(formInline);
+ // tableLoading.value = false;
+ // if (response.code == 200) {
+ // tableData.value = response.data.records;
+ // tableTotal.value = response.data.total;
+ // }
+ // } catch (error) {
+ // tableLoading.value = false;
+ // console.error(error);
+ // }
+};
+
+const extractThirdLevelChildren = (dataArray) => {
+ let result = [];
+ // 遍历第一层数组
+ for (const level1 of dataArray) {
+ // 检查第一层是否有children且是数组
+ if (level1.children && Array.isArray(level1.children)) {
+ // 遍历第二层数组
+ for (const level2 of level1.children) {
+ // 检查第二层是否有children且是数组
+ if (level2.children && Array.isArray(level2.children)) {
+ // 将第三层的所有对象添加到结果数组中
+ result.push(...level2.children);
+ }
+ }
}
- } catch (error) {
- tableLoading.value = false;
- console.error(error);
}
+ return result;
};
const seedTypeChange = () => {
console.log(formInline.seedTypeId);
@@ -180,90 +279,100 @@ const dialogFormVisible = ref(false);
const dialogRef = ref(null);
const dialogTitle = ref('新增');
const formDisabled = ref(false);
+const landSelectRef = ref(null);
const nowSelectRow = ref({});
const dialogForm = reactive({
- comCode: '', //企业编码
- comName: '', //企业名称
- comType: '', //企业类型
- uscc: '', //统一社会信用代码
- legalName: '', //法人信息
- contactName: '', //联系人
+ regionCode: '', //所属行政区域代码
+ regionName: '', //所属行政区域名称
+ gridId: '', //所属网格代码
+ gridName: '', //所属网格名称
+ landId: '', //地块id
+ landName: '', //地块名称
+ name: '', //姓名
phone: '', //联系方式
- address: '', //厂址
- tenancyTime: '', //入驻时间
- applyTime: '', //申请时间
+ fertilizeId: '', //肥料名称id
+ fertilizeName: '', //肥料名称
+ useNumber: 1, //使用量
+ useUnit: 'g', //使用量单位
+ useTime: '', //使用时间
+ businessEntityCode: '', //经营主体编码
+ businessEntityName: '', //经营主体名称
+ detectionTime: '', //检测时间
+ detectionResult: '', //检测结果'
+ detectionUnit: '', //检测单位
+ detectionReport: '', //检测报告
});
-const initDialogForm = { ...dialogForm };
-console.log(initDialogForm);
const dialogFormRules = ref({
- comName: [{ required: true, message: '请输入', trigger: 'blur' }],
- uscc: [
- { required: true, message: '请输入', trigger: 'blur' },
- {
- validator: (rule, value, callback) => {
- if (!/^[0-9A-Za-z]+$/.test(value)) {
- callback(new Error('企业信用代码只能包含数字和字母'));
- } else if (value.length !== 18) {
- // 可选：限制18位长度
- callback(new Error('企业信用代码必须为18位'));
- } else {
- callback();
- }
- },
- trigger: 'blur',
- },
- ],
- legalName: [{ required: true, message: '请输入', trigger: 'blur' }],
- contactName: [{ required: true, message: '请输入', trigger: 'blur' }],
- phone: [
- { required: true, message: '请输入', trigger: 'blur' },
- {
- pattern: /^1[3-9]\d{9}$/,
- message: '请输入正确的11位手机号',
- trigger: 'blur',
- },
- ],
- address: [{ required: true, message: '请输入', trigger: 'blur' }],
- tenancyTime: [{ required: true, message: '请选择入驻时间', trigger: 'blur' }],
- applyTime: [{ required: true, message: '请选择申请时间', trigger: 'blur' }],
- comType: [
+ fertilizeId: [{ required: true, message: '请输入肥料编号', trigger: 'blur' }],
+ fertilizeName: [{ required: true, message: '请输入肥料名称', trigger: 'blur' }],
+ useNumber: [{ required: true, message: '请输入使用量', trigger: ['change', 'blur'] }],
+ useTime: [{ required: true, message: '请选择使用时间', trigger: 'blur' }],
+ detectionTime: [{ required: true, message: '请选择检测时间', trigger: ['change', 'blur'] }],
+ detectionResult: [
{
required: true,
- message: '请选择',
+ message: '请选择检测结果',
trigger: 'blur',
},
],
+ detectionUnit: [{ required: true, message: '请输入检测单位', trigger: 'blur' }],
});
const addItem = async () => {
- restDialogForm();
- dialogTitle.value = '新增';
- formDisabled.value = false;
- dialogFormVisible.value = true;
+ ElMessage.success('点击新增!');
+ // restDialogForm();
+ // dialogTitle.value = '新增';
+ // formDisabled.value = false;
+ // dialogFormVisible.value = true;
};
const seeDetails = async (row) => {
- // ElMessage.success('查看详情!');
- console.log('查看详情的行: ', row);
- dialogTitle.value = '详情';
- formDisabled.value = true;
- Object.assign(dialogForm, row);
- dialogFormVisible.value = true;
+ ElMessage.success('查看详情!');
+ // dialogTitle.value = '详情';
+ // formDisabled.value = true;
+ // dialogForm.landId = row.landId;
+ // getDetails();
+ // setDialogForm2();
+ // dialogFormVisible.value = true;
};
const handleEdit = (row) => {
- // ElMessage.success('点击编辑!');
+ ElMessage.success('点击编辑!');
console.log('要编辑的行: ', row);
- nowSelectRow.value = row;
- dialogTitle.value = '编辑';
- formDisabled.value = false;
- Object.assign(dialogForm, row);
- dialogFormVisible.value = true;
+ // nowSelectRow.value = row;
+ // dialogTitle.value = '编辑';
+ // formDisabled.value = false;
+ // dialogForm.landId = row.landId;
+ // getDetails();
+ // setDialogForm2();
+ // dialogFormVisible.value = true;
};
const setDialogForm = (row) => {
- Object.assign(dialogForm, row);
+ dialogForm.regionCode = row.gridAreaCode;
+ dialogForm.regionName = row.fullRegionName;
+ dialogForm.gridId = row.gridId;
+ dialogForm.gridName = row.gridName;
+ dialogForm.landId = row.id;
+ dialogForm.landName = row.landName;
+ dialogForm.name = row.propertyName;
+ dialogForm.phone = row.propertyPhone;
+ dialogForm.businessEntityCode = row.businessEntityCode ?? '';
+ dialogForm.businessEntityName = row.businessEntityName ?? '';
+};
+const setDialogForm2 = (row) => {
+ dialogForm.fertilizeId = row.fertilizeId;
+ dialogForm.fertilizeName = row.fertilizeName;
+ dialogForm.useNumber = row.useNumber;
+ dialogForm.useUnit = row.useUnit;
+ dialogForm.useTime = row.useTime;
+ dialogForm.detectionTime = row.detectionTime;
+ dialogForm.detectionResult = row.detectionResult;
+ dialogForm.detectionUnit = row.detectionUnit;
+ dialogForm.detectionReport = row.detectionReport ?? '';
};
// 获取地块信息
const getDetails = async () => {
- let response = await getLandInfo(dialogForm.landId);
+ let response = await request({
+ url: `/land-resource/landManage/getLandInfo?landId=${dialogForm.landId}`,
+ });
console.log(response);
if (response.code == 200) {
if (response.data) {
@@ -298,7 +407,7 @@ const handleDelete = (row) => {
};
const deleteGoods = async (ids) => {
try {
- let res = await deleteTraceCompany(ids);
+ let res = await delFertilizeUseRegulatory(ids);
return res;
} catch (error) {
return false;
@@ -306,6 +415,10 @@ const deleteGoods = async (ids) => {
};
const onSaveCategory = () => {
console.log(dialogForm);
+ if (dialogForm.landId == '') {
+ landSelectRef.value.handleChange();
+ return;
+ }
dialogRef.value.validate(async (valid, fields) => {
if (valid) {
try {
@@ -313,10 +426,10 @@ const onSaveCategory = () => {
console.log(param);
let response;
if (dialogTitle.value == '新增') {
- response = await addTraceCompany(param);
+ response = await fertilizeUseRegulatorySave(param);
} else {
param.id = nowSelectRow.value.id;
- response = await editTraceCompany(param);
+ response = await editFertilizeUseRegulatory(param);
}
if (response?.code == 200) {
cancelDialog();
@@ -340,10 +453,49 @@ const cancelDialog = async () => {
dialogFormVisible.value = false;
};
const restDialogForm = () => {
- Object.assign(dialogForm, initDialogForm);
+ Object.assign(dialogForm, {
+ regionCode: '', //所属行政区域代码
+ regionName: '', //所属行政区域名称
+ gridId: '', //所属网格代码
+ gridName: '', //所属网格名称
+ landId: '', //地块id
+ landName: '', //地块名称
+ name: '', //姓名
+ phone: '', //联系方式
+ fertilizeId: '', //肥料名称id
+ fertilizeName: '', //肥料名称
+ useNumber: 1, //使用量
+ useUnit: 'g', //使用量单位
+ useTime: '', //使用时间
+ businessEntityCode: '', //经营主体编码
+ businessEntityName: '', //经营主体名称
+ detectionTime: '', //检测时间
+ detectionResult: '', //检测结果'
+ detectionUnit: '', //检测单位
+ detectionReport: '', //检测报告
+ });
nowSelectRow.value = ref({});
};
+const seedTypeList = ref([]);
+const seedTypeDialogList = ref([]);
+const getSeedTypeList = async () => {
+ try {
+ let response = await getMaterailTypes({ moduleType: '4' });
+ console.log(response);
+ if (response.code == 200) {
+ if (response.data?.length > 0) {
+ seedTypeDialogList.value = response.data[0].children;
+ let result = extractThirdLevelChildren(response.data);
+ seedTypeList.value = result;
+ console.log(seedTypeDialogList.value);
+ }
+ }
+ } catch (error) {
+ console.error(error);
+ }
+};
+
const unitList = ref([
{ dictCode: '52', dictValue: 'g' },
{ dictCode: '53', dictValue: 'kg' },
@@ -380,8 +532,9 @@ const getEntityOptions = async () => {
onMounted(() => {
onSubmit();
- // getLandsList();
- // getEntityOptions();
+ getLandsList();
+ getEntityOptions();
+ // getSeedTypeList();
});
diff --git a/sub-government-affairs-service/src/views/trace/products/harvest-batch/index.vue b/sub-government-affairs-service/src/views/trace/products/harvest-batch/index.vue
index ed9d713..4053d95 100644
--- a/sub-government-affairs-service/src/views/trace/products/harvest-batch/index.vue
+++ b/sub-government-affairs-service/src/views/trace/products/harvest-batch/index.vue
@@ -1,30 +1,30 @@
-
- {{ dialogForm.traceCode }}
- {{ dialogForm.productName }}
- {{ dialogForm.specs }}
- {{ dialogForm.produceDate }}
- {{ dialogForm.expiryDateTime }}
- {{ dialogForm.manufacturerCode }}
- {{ dialogForm.manufacturer }}
- {{ dialogForm.factoryAddress }}
+
+
+
+ {{ dialogForm.regionCode }}
+ {{ dialogForm.regionName }}
+ {{ dialogForm.gridId }}
+ {{ dialogForm.gridName }}
+ {{ dialogForm.landId }}
+ {{ dialogForm.landName }}
-
+ {{ dialogForm.businessEntityCode }}
+ {{ dialogForm.businessEntityName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
采收批次管理
+采收批次查询
-
-
@@ -152,25 +152,23 @@ import { ElMessage } from 'element-plus';
import inputSuppliesApi from '@/apis/inputSuppliesApi';
const { getMaterailTypes } = inputSuppliesApi;
import {
+ getFertilizeUseRegulatoryRecords,
fertilizeUseRegulatorySave,
editFertilizeUseRegulatory,
delFertilizeUseRegulatory,
getLandList,
} from '@/apis/inputSuppliesApi/supervisionOfInputs';
-import { getQualityManageList, getQualityInfo } from '@/apis/trace/products';
+import request from '@/utils/axios';
import { GetDictTypeInfo } from '@/apis/system/dictType';
import { useApp } from '@/hooks';
const app = useApp();
-import imgUrl from '@/assets/images/trace/testReport.png';
// 查询条件
const formInline = reactive({
harvestBatch: '',
- productName: '',
+ name: '',
seedTypeId: '',
- qualityTime: '',
- countryOfOrigin: '',
- businessEntity: '',
+ date1: '',
current: 1,
size: 10,
});
@@ -184,21 +182,120 @@ const resetForm = () => {
};
// 表格数据
-const tableData = ref();
+const tableData = ref([
+ {
+ batchCode: 'GM2025041201',
+ productTypes: '黄皮甘蔗',
+ name: '合格',
+ purchaseDate: '质检报告1',
+ number: '农残检测',
+ Unit: '耿马县农产品质检中心',
+ baseCode: '农药残留量',
+ baseName: '李红梅',
+ plotCode: '2025-04-13 00:00:00',
+ plotName: '未检出农药残留，符合国家标准',
+ },
+ {
+ batchCode: 'GM2025041802',
+ productTypes: '圆茄',
+ name: '合格',
+ purchaseDate: '质检报告2',
+ number: '微生物检测',
+ Unit: '耿马县农产品质检中心',
+ baseCode: '大肠杆菌、沙门氏菌',
+ baseName: '刀玉兰',
+ plotCode: '2025-04-19 00:00:00',
+ plotName: '未检出有害微生物，符合国家标准',
+ },
+ {
+ batchCode: 'GM2025041503',
+ productTypes: '小米辣',
+ name: '合格',
+ purchaseDate: '质检报告3',
+ number: '农残检测',
+ Unit: '耿马县农产品质检中心',
+ baseCode: '农药残留量',
+ baseName: '马晓芳',
+ plotCode: '2025-04-16 00:00:00',
+ plotName: '农药残留量低于国家标准',
+ },
+ {
+ batchCode: 'GM2025042004',
+ productTypes: '丝瓜',
+ name: '合格',
+ purchaseDate: '质检报告4',
+ number: '农残检测',
+ Unit: '耿马县农产品质检中心',
+ baseCode: '农药残留量',
+ baseName: '黄文斌',
+ plotCode: '2025-04-21 00:00:00',
+ plotName: '未检出农药残留，符合国家标准',
+ },
+ {
+ batchCode: 'GM2025041705',
+ productTypes: '苦瓜',
+ name: '合格',
+ purchaseDate: '质检报告5',
+ number: '农残检测',
+ Unit: '耿马县农产品质检中心',
+ baseCode: '农药残留量',
+ baseName: '李四',
+ plotCode: '2025-04-18 00:00:00',
+ plotName: '农药残留量低于国家标准',
+ },
+ {
+ batchCode: 'GM2025042206',
+ productTypes: '香蕉',
+ name: '合格',
+ purchaseDate: '质检报告6',
+ number: '微生物检测',
+ Unit: '耿马县农产品质检中心',
+ baseCode: '大肠杆菌、沙门氏菌',
+ baseName: '杨志明',
+ plotCode: '2025-04-23 00:00:00',
+ plotName: '未检出有害微生物，符合国家标准',
+ },
+ {
+ batchCode: 'GM2025041907',
+ productTypes: '榴莲',
+ name: '合格',
+ purchaseDate: '质检报告7',
+ number: '农残检测',
+ Unit: '耿马县农产品质检中心',
+ baseCode: '农药残留量',
+ baseName: '张丽华',
+ plotCode: '2025-04-20 00:00:00',
+ plotName: '农药残留量低于国家标准',
+ },
+ {
+ batchCode: 'GM2025042108',
+ productTypes: '芒果',
+ name: '合格',
+ purchaseDate: '质检报告8',
+ number: '农残检测',
+ Unit: '耿马县农产品质检中心',
+ baseCode: '农药残留量',
+ baseName: '周建国',
+ plotCode: '2025-04-22 00:00:00',
+ plotName: '未检出农药残留，符合国家标准',
+ },
+]);
const selectedIds = ref([]);
const tableLoading = ref(false);
const tableTotal = ref(0);
const columns = ref([
- { prop: 'harvestBatch', label: '采收批次编码' },
- { prop: 'productName', label: '原材料名称' },
- { prop: 'qualityReportUrl', label: '质检报告', slotName: 'qualityReportUrl' },
- { prop: 'qualityTypeName', label: '质检类型' },
- { prop: 'qualityUnit', label: '质检机构' },
- { prop: 'qualityProject', label: '质检项目' },
- { prop: 'qualityPerson', label: '质检人' },
- { prop: 'qualityTime', label: '质检时间' },
- { prop: 'qualityDescribe', label: '质检说明', width: 200 },
- // { prop: 'action', label: '操作', slotName: 'action', width: 100, fixed: 'right' },
+ { prop: 'batchCode', label: '采收批次编码' },
+ { prop: 'productTypes', label: '原材料名称' },
+ { prop: 'name', label: '质检结果' },
+ { prop: 'purchaseDate', label: '质检报告', slotName: 'purchaseDate' },
+ { prop: 'number', label: '质检类型' },
+ { prop: 'Unit', label: '质检机构' },
+ { prop: 'baseCode', label: '质检项目' },
+ { prop: 'baseName', label: '质检人' },
+ // { prop: 'baseAddress', label: '基地地址' },
+ { prop: 'plotCode', label: '质检时间' },
+ { prop: 'plotName', label: '质检说明', width: 200 },
+ { prop: 'action', label: '操作', slotName: 'action', width: 100, fixed: 'right' },
]);
const handlePaginationChange = ({ page, pageSize }) => {
formInline.current = page;
@@ -206,18 +303,18 @@ const handlePaginationChange = ({ page, pageSize }) => {
loadData();
};
const loadData = async () => {
- tableLoading.value = true;
- try {
- let response = await getQualityManageList(formInline);
- tableLoading.value = false;
- if (response.code == 200) {
- tableData.value = response.data.records;
- tableTotal.value = response.data.total;
- }
- } catch (error) {
- tableLoading.value = false;
- console.error(error);
- }
+ // tableLoading.value = true;
+ // try {
+ // let response = await getFertilizeUseRegulatoryRecords(formInline);
+ // tableLoading.value = false;
+ // if (response.code == 200) {
+ // tableData.value = response.data.records;
+ // tableTotal.value = response.data.total;
+ // }
+ // } catch (error) {
+ // tableLoading.value = false;
+ // console.error(error);
+ // }
};
const extractThirdLevelChildren = (dataArray) => {
@@ -286,15 +383,6 @@ const dialogFormRules = ref({
detectionUnit: [{ required: true, message: '请输入检测单位', trigger: 'blur' }],
});
-const srcList = ref([]);
-const showPreview = ref(false);
-
-const seeImg = (row) => {
- console.log(row);
- srcList.value = [row.qualityReportUrl ?? imgUrl];
- showPreview.value = true;
-};
-
const addItem = async () => {
ElMessage.success('点击新增!');
// restDialogForm();
@@ -347,7 +435,9 @@ const setDialogForm2 = (row) => {
};
// 获取地块信息
const getDetails = async () => {
- let response = await getQualityInfo(dialogForm.landId);
+ let response = await request({
+ url: `/land-resource/landManage/getLandInfo?landId=${dialogForm.landId}`,
+ });
console.log(response);
if (response.code == 200) {
if (response.data) {
@@ -509,7 +599,7 @@ onMounted(() => {
onSubmit();
getLandsList();
getEntityOptions();
- getSeedTypeList();
+ // getSeedTypeList();
});
diff --git a/sub-government-affairs-service/src/views/trace/products/packaging/index.vue b/sub-government-affairs-service/src/views/trace/products/packaging/index.vue
index 1ac343d..82d48ce 100644
--- a/sub-government-affairs-service/src/views/trace/products/packaging/index.vue
+++ b/sub-government-affairs-service/src/views/trace/products/packaging/index.vue
@@ -7,43 +7,25 @@
-
-
-
-
-
- {{ dialogForm.plantationInfoVO?.id ?? '' }}
- {{ dialogForm.plantationInfoVO?.name ?? '' }}
- {{ dialogForm.plantationInfoVO?.regionName ?? '' }}
- {{ dialogForm.plantationInfoVO?.gridName ?? '' }}
- {{ dialogForm.plantationInfoVO?.location ?? '' }}
- {{ dialogForm.plantationInfoVO?.coordinate ?? '' }}
- {{ dialogForm.plantationInfoVO?.climate ?? '' }}
- {{ dialogForm.plantationInfoVO?.altitude ?? '' }}
- {{ dialogForm.plantationInfoVO?.area ?? '' }}
- {{ dialogForm.plantationInfoVO?.landName ?? '' }}
- {{ dialogForm.plantationInfoVO?.url ?? '' }}
-
-
- {{ dialogForm.enterpriseCooperativeVO?.id ?? '' }}
- {{ dialogForm.enterpriseCooperativeVO?.comType ?? '' }}
- {{ dialogForm.enterpriseCooperativeVO?.businessName ?? '' }}
- {{ dialogForm.enterpriseCooperativeVO?.contactPerson ?? '' }}
- {{ dialogForm.enterpriseCooperativeVO?.phone ?? '' }}
-
-
-
- {{ dialogForm.enterpriseCooperativeVO?.id ?? '' }}
- {{ dialogForm.enterpriseCooperativeVO?.comType ?? '' }}
-
-
- {{ dialogForm.enterpriseCooperativeVO?.id ?? '' }}
- {{ dialogForm.enterpriseCooperativeVO?.comType ?? '' }}
-
- ![]()
-
-
-
-
- ![]()
-
-
-
+ 农药用药详情
+ 检测信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+