Merge branch 'refs/heads/dev-2.19.0' into dev

src/views/grainQualityManagement/storehouseWholeInspectEdit.vue

@@ -8,6 +8,7 @@
 	import { just_required, number_required, required_array } from '@/utils/rules'
 	import { deleteField, genKey } from '@/utils/systemUtils'
 	import { getDetail } from '@/api/grainQualityManagement/storehouseWholeInspect'
+	import {getNameByIdSync} from "@/utils/systemEnum";
 
 	const props = defineProps({
 		visible: {
@@ -165,7 +166,6 @@
 	const getData = () => {
 		getDetail(props.editData.id).then((resp) => {
 			const items = resp.items
-
 			if (resp.zbjgpd) {
 				resp.zbjgpd = resp.zbjgpd.split('|')
 			}
@@ -199,6 +199,8 @@
 			basicStorehouseId: null, // integer(int32) basic_storehouse的id；仓房id
 			bgcjsj: null, // string(date-time) 报告出具时间，格式：yyyy-MM-dd
 			bz: null, // string 备注
+			address: null, // string 库区地址
+			modifyDate: null, // string 入库日期
 			checkResult: null, // integer(int32) 检验结果
 			createdate: null, // string(date-time) 创建日期
 			dbsl: null, // number 代表数量，单位：公斤
@@ -216,14 +218,16 @@
 			jyyj: null, // string 检验依据，1：国标,
 			orgId: null, // integer(int32) 库区id
 			orgName: null, // string 库区名称
-			produceArea: null, // string 产地
+			// produceArea: null, // string 产地
+			gb: null, // string 产地
 			qfrq: null, // string 签发日期，格式：yyyy-MM-dd
 			qydbh: null, // string 抽样单编号；扦样单编号
 			qyqy: null, // string 扦样区域
 			qyrxm: null, // string 抽样人员；扦样人姓名
 			qysj: null, // string(date-time) 抽样日期；扦样时间，格式：yyyy-MM-dd
-			receiveYear: null, // string 收获年度
-			rkrq: null, // string(date-time) 入库日期，格式：yyyy-MM-dd
+			// receiveYear: null, // string 收获年度
+			scnf: null, // string 收获年度
+			// rkrq: null, // string(date-time) 入库日期，格式：yyyy-MM-dd
 			samplePackageModel: null, // string 样品包装型号
 			sampleStatus: null, // string 样品状态
 			sfzcccnx: null, // string 是否正常存储年限，0：否,
@@ -252,7 +256,7 @@
 		grainGradeId: just_required,
 		xzId: just_required,
 		produceArea: just_required,
-		rkrq: just_required,
+		modifyDate: just_required,
 		jydw: just_required,
 		jyyj: just_required,
 		jysj: just_required,
@@ -350,8 +354,8 @@
 					</a-form-item>
 				</a-col>
 				<a-col :span="8">
-					<a-form-item label="库区地址" name="registeredAddress">
-						<a-input :disabled="readonly" v-model:value="formData.registeredAddress" />
+					<a-form-item label="库区地址" name="address">
+						<a-input :disabled="readonly" v-model:value="formData.address" />
 					</a-form-item>
 				</a-col>
 			</a-row>
@@ -424,18 +428,20 @@
 
 			<a-row :gutter="42">
 				<a-col :span="8">
-					<a-form-item label="入库日期" name="rkrq">
-						<a-date-picker v-model:value="formData.rkrq" valueFormat="YYYY-MM-DD" :disabled="readonly" />
+					<a-form-item label="入库日期" name="modifyDate">
+						<a-date-picker v-model:value="formData.modifyDate" valueFormat="YYYY-MM-DD" :disabled="readonly" />
 					</a-form-item>
 				</a-col>
 				<a-col :span="8">
-					<a-form-item label="收获年度" name="receiveYear">
-						<a-date-picker v-model:value="formData.receiveYear" picker="year" valueFormat="YYYY" :disabled="readonly" />
+					<a-form-item label="收获年度" name="scnf">
+						<a-input :disabled="readonly" v-model:value="formData.scnf" />
+<!--						<a-input :disabled="readonly" :value="getNameByIdSync(formData.scnf).name" />-->
+<!--						<a-date-picker v-model:value="formData.receiveYear" picker="year" valueFormat="YYYY" :disabled="readonly" />-->
 					</a-form-item>
 				</a-col>
 				<a-col :span="8">
-					<a-form-item label="产地" name="produceArea">
-						<a-input :disabled="readonly" v-model:value="formData.produceArea" />
+					<a-form-item label="产地" name="gb">
+						<a-input :disabled="readonly" v-model:value="formData.gb" />
 					</a-form-item>
 				</a-col>
 			</a-row>