Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/integrated/lostAndFound/form.vue

@@ -29,11 +29,17 @@
   </el-form-item>
   </el-col>
 
-<!--         <el-col :span="12" class="mb20">-->
-<!--           <el-form-item label="状态" prop="status">-->
-<!--             <el-input v-model="form.status" placeholder="请输入状态"/>-->
-<!--           </el-form-item>-->
-<!--         </el-col>-->
+         <el-col :span="12" class="mb20">
+           <el-form-item label="状态" prop="status">
+             <el-switch
+               v-model="form.status"
+               :active-value="1"
+               :inactive-value="0"
+               active-text="已领取"
+               inactive-text="待领取"
+             />
+           </el-form-item>
+         </el-col>
     <el-col :span="24" class="mb20">
   <el-form-item label="描述" prop="description">
     <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入描述"></editor>
@@ -75,7 +81,7 @@ const form = reactive({
 	  picUrl: '',
 	  sort: '',
 	  description: '',
-	  status: '',
+	  status: 0, // 默认待领取
 	  dateFound: '',
 	  location: '',
 });
@@ -128,7 +134,10 @@ const getlostAndFoundData = (id: string) => {
   // 获取数据
   loading.value = true
   getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
+    const data = res.data
+    // 确保状态值为数字类型
+    data.status = Number(data.status)
+    Object.assign(form, data)
   }).finally(() => {
     loading.value = false
   })

src/views/supermarketerp/supermarketSpu/components/package-unit.vue

@@ -59,6 +59,11 @@
 					<el-input v-model.trim="row.unit" />
 				</template>
 			</vxe-column>
+      <vxe-column field="taste" title="口味" :edit-render="{ autoFocus: 'input', placeholder: '请输入口味' }">
+        <template #edit="{ row }">
+          <el-input v-model.trim="row.taste" />
+        </template>
+      </vxe-column>
 			<vxe-column field="status" title="状态" :edit-render="{}">
 				<template #edit="{ row }">
 					<el-select v-model="row.status">
@@ -118,6 +123,7 @@ export interface rowVU {
 	isNew?: boolean
 	isBase?: boolean | null
 	flag?: string
+  taste?: string
 }
 
 const packageUnitList = defineModel<rowVU[]>("modelValue", {