新增羊只，转群功能完善

src/views/produce/manage_sheep/trans_group/index.vue

@@ -107,9 +107,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="转群原因" prop="reason">
-          <el-select v-model="form.reason" placeholder="请选择转群原因">
-            <el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+          <el-select v-model="form.reason" placeholder="请选择转群原因" clearable>
+            <el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="技术员" prop="technician">
@@ -134,15 +133,16 @@
       <el-form-item label="羊只id">
         <el-input v-model="approveForm.sheepId" disabled />
       </el-form-item>
-      <el-form-item label="转入羊舍">
-        <el-input v-model="approveForm.foldTo" disabled />
-      </el-form-item>
       <el-form-item label="转出羊舍">
-        <el-input v-model="approveForm.foldFrom" disabled />
+        <el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
+      </el-form-item>
+      <el-form-item label="转入羊舍">
+        <el-input :value="sheepfoldNameMap[approveForm.foldTo] || approveForm.foldTo" disabled />
       </el-form-item>
       <el-form-item label="转群原因">
         <el-select v-model="approveForm.reason" disabled>
-          <el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label" :value="dict.value" />
+          <el-option :label="trans_group_reason.find(d => d.value == approveForm.reason)?.label || ''"
+            :value="approveForm.reason" />
         </el-select>
       </el-form-item>
       <el-form-item label="技术员">
@@ -165,6 +165,7 @@
 import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from "@/api/produce/manage_sheep/trans_group/trans_group"
 import { listSheepfold_management as listSheepfold } from '@/api/sheepfold_management/sheepfold_management';
 
+
 const { proxy } = getCurrentInstance()
 const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status')
 
@@ -284,9 +285,12 @@ function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
   getTrans_group(_id).then(response => {
-    form.value = response.data
+    const data = response.data
+    data.foldFrom = Number(data.foldFrom)
+    data.foldTo = Number(data.foldTo)
+    data.reason = String(data.reason) 
+    form.value = data
     open.value = true
-    title.value = "修改转群记录"
   })
 }
 
@@ -329,7 +333,6 @@ function handleExport() {
   }, `trans_group_${new Date().getTime()}.xlsx`);
 }
 
-getList()
 
 // 审批记录的对话框
 const approveDialog = ref(false);
@@ -337,7 +340,6 @@ const approveForm = ref({});
 
 // 审批按钮操作
 function handleApprove(row) {
-  // 打开审批对话框
   approveForm.value = { ...row };
   approveDialog.value = true;
 }
@@ -366,7 +368,7 @@ function handleApproveReject() {
   });
 }
 
-//羊舍名称
+//加载所有羊舍
 const sheepfoldOptions = ref([]);
 
 function getSheepfoldOptions() {
@@ -376,7 +378,32 @@ function getSheepfoldOptions() {
 }
 
 onMounted(() => {
-  getList();
   getSheepfoldOptions();
 });
+
+
+const sheepfoldNameMap = ref({})
+
+function loadSheepfoldMap() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldNameMap.value = res.rows.reduce((acc, item) => {
+      acc[item.id] = item.sheepfoldName
+      return acc
+    }, {})
+  })
+}
+
+onMounted(() => {
+  nextTick(() => {
+    if (trans_group_reason.value && trans_group_reason.value.length) {
+      trans_group_reason.value.forEach(item => {
+        item.value = Number(item.value)
+      })
+    }
+    loadSheepfoldMap()
+  })
+})
+
+
+getList()
 </script>