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