|
|
@@ -243,7 +243,7 @@
|
|
|
<el-col :span="24">
|
|
|
<div style="font-weight: bold; margin-bottom: 8px">实借配件信息</div>
|
|
|
<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-input v-else v-model="form.pre_borrow_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>
|
|
|
@@ -336,7 +336,7 @@
|
|
|
<el-row :gutter="16" style="margin-top: 16px">
|
|
|
<el-col :span="16">
|
|
|
<div style="font-weight: bold; margin-bottom: 8px">实借配件信息</div>
|
|
|
- <el-input v-model="form.accessories" :disabled="isView" :placeholder="isView?'':'请输入实借配件信息'" />
|
|
|
+ <el-input v-model="form.pre_borrow_accessories" :disabled="isView" :placeholder="isView?'':'请输入实借配件信息'" />
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<div style="font-weight: bold; margin-bottom: 8px">当前状态</div>
|
|
|
@@ -524,6 +524,7 @@ interface FormData {
|
|
|
};
|
|
|
borrower_damage_count?: number;
|
|
|
accessories?: string;
|
|
|
+ pre_borrow_accessories?:string;
|
|
|
latest_renewal?: {
|
|
|
renewal_days?: number | string;
|
|
|
renewal_reason?: string;
|
|
|
@@ -705,19 +706,19 @@ function buildSteps(data: any) {
|
|
|
|
|
|
if (data.status >= 2&&data.status!=3 && data.borrow_type!=1) {
|
|
|
// 将审批记录倒序排列
|
|
|
- const reversedApprovalRecords = [...data.approval_records].reverse();
|
|
|
+ const reversedApprovalRecords = [...data.approval_records]
|
|
|
reversedApprovalRecords.forEach((item:any,index:number) => {
|
|
|
if(item.status === 1){
|
|
|
- if(index === 0){
|
|
|
+ if(index == 1){
|
|
|
steps.value.push({
|
|
|
title: '审批通过',
|
|
|
- description: `审批人:${item.app_user_approver_name},时 间:${item.approve_time},领取仓库:${getWarehouseName(data.warehouse)||'暂无仓库'}`,
|
|
|
+ description: `审批人:${item.app_user_approver_name},时 间:${item.approve_time}`,
|
|
|
status: 'finish'
|
|
|
});
|
|
|
}else{
|
|
|
steps.value.push({
|
|
|
title: '审批通过',
|
|
|
- description: `审批人:${item.approver_name},时 间:${item.create_datetime}`,/* ,领取仓库:${getWarehouseName(data.warehouse)||'暂无仓库'} */
|
|
|
+ description: `审批人:${item.approver_name},时 间:${item.create_datetime},领取仓库:${getWarehouseName(data.warehouse)||'暂无仓库'}`,/* ,领取仓库:${getWarehouseName(data.warehouse)||'暂无仓库'} */
|
|
|
status: 'finish'
|
|
|
});
|
|
|
}
|
|
|
@@ -1389,7 +1390,7 @@ function onSubmit() {
|
|
|
item_id:form.value.id,
|
|
|
device_assignments: allDevices,
|
|
|
remark:remark.value,
|
|
|
- accessories: collectAccessories.value,
|
|
|
+ pre_borrow_accessories: collectAccessories.value,
|
|
|
};
|
|
|
|
|
|
CollectEquipment(submitData).then((res: ApiResponse) => {
|
|
|
@@ -1416,6 +1417,7 @@ function onSubmit() {
|
|
|
team_type: form.value.team_type,
|
|
|
})),
|
|
|
accessory_info: accessoryInfo.value,
|
|
|
+ pre_borrow_accessories:collectAccessories.value,
|
|
|
remark: remark.value,
|
|
|
expected_start_time: dayjs().format('YYYY-MM-DD HH:mm:ss')
|
|
|
};
|
|
|
@@ -1453,7 +1455,7 @@ function onSubmit() {
|
|
|
id: form.value.id,
|
|
|
items: allDevices,
|
|
|
status: returnStatus.value,
|
|
|
- accessories: form.value.accessories,
|
|
|
+ pre_borrow_accessories: form.value.pre_borrow_accessories,
|
|
|
};
|
|
|
|
|
|
ReturnEquipment(submitData).then(async (res: ApiResponse) => {
|