yangg 1 месяц назад
Родитель
Сommit
3ff0d9232c
1 измененных файлов с 15 добавлено и 6 удалено
  1. 15 6
      src/views/system/borrow/component/CollectEquipment/index.vue

+ 15 - 6
src/views/system/borrow/component/CollectEquipment/index.vue

@@ -51,11 +51,11 @@
                                 <el-input v-model="form.external_borrower_phone" :placeholder="isView?'':'请输入联系电话'" :disabled="true" />
                             </el-form-item>
                         </el-col>
-                      <!--   <el-col :span="8">
+                        <el-col :span="8">
                             <el-form-item label="借用部门" prop="borrower_dept">
                                 <el-input v-model="form.borrower_dept" placeholder="请输入借用部门" :disabled="true" />
                             </el-form-item>
-                        </el-col> -->
+                        </el-col>
                         <el-col :span="8">
                             <el-form-item label="预计归还时间" prop="expected_end_time">
                                 <el-date-picker v-model="form.expected_end_time" type="date" 
@@ -242,7 +242,8 @@
                 <el-row :gutter="16" style="margin-top: 16px">
                     <el-col :span="24">
                         <div style="font-weight: bold; margin-bottom: 8px">实借配件信息</div>
-                        <el-input v-model="form.accessories" :disabled="isView" type="textarea" :placeholder="isView?'':'请输入实借配件信息'" />
+                        <el-input v-if="isCollect" v-model="collectAccessories" :disabled="isView" type="textarea" :placeholder="isView?'':'请输入实借配件信息'" />
+                        <el-input v-else v-model="form.accessories" :disabled="isView" type="textarea" :placeholder="isView?'':'请输入实借配件信息'" />
                     </el-col>
                     <el-col :span="24" style="margin-top: 16px">
                         <div style="font-weight: bold; margin-bottom: 8px">备注</div>
@@ -599,6 +600,8 @@ const searchText = ref('');
 const deviceList = ref<DeviceListItem[]>([]);
 const accessoryInfo = ref('');
 const remark = ref('');
+// 领取模式下的“实借配件信息”本地输入,不回显历史
+const collectAccessories = ref('');
 
 // 归还设备相关数据
 const returnSearchText = ref('');
@@ -1017,9 +1020,9 @@ const rules = {
   emergency_phone: [
     { required: true, message: '请输入联系电话', trigger: 'change' },
   ],
-  borrower_dept: [
+  /* borrower_dept: [
     { required: true, message: '请输入借用部门', trigger: 'change' },
-  ],
+  ], */
   expected_end_time: [
     { required: true, message: '请输选择归还时间', trigger: 'change' },
   ],
@@ -1070,6 +1073,10 @@ watch(() => props.modelValue, async (val) => {
 				const data = res.data;
 				Object.assign(form.value, data);
         buildSteps(data);
+                // 领取模式下不回显历史配件内容
+                if (isCollect.value) {
+                  collectAccessories.value = '';
+                }
 				timeline.value.create = data.create_datetime || '';
 				timeline.value.approve = data.approve_time || '';
         const approverinfo = data.approver_info ?? data.admin_approver_info
@@ -1263,6 +1270,8 @@ function onCancel() {
     returnSearchText.value = '';
     // 清理备注
     remark.value = '';
+    // 清理领取模式配件信息
+    collectAccessories.value = '';
     returnRemark.value = '';
     // 重置状态
     returnStatus.value = '未归还';
@@ -1321,7 +1330,7 @@ function onSubmit() {
         item_id:form.value.id,
         device_assignments: allDevices,
         remark:remark.value,
-        accessories:form.value.accessories,
+        accessories: collectAccessories.value,
     };
 
     CollectEquipment(submitData).then((res: ApiResponse) => {