|
@@ -14,16 +14,6 @@
|
|
|
</el-select>
|
|
|
</el-col>
|
|
|
|
|
|
-
|
|
|
- <!-- <el-col :span="3">
|
|
|
- <el-button>手动输入</el-button>
|
|
|
- </el-col> -->
|
|
|
- <!-- <el-col :span="6">
|
|
|
- <el-input v-model="form.course_input" placeholder="请输入课程名称" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="3">
|
|
|
- <el-button type="primary">搜索</el-button>
|
|
|
- </el-col> -->
|
|
|
</el-row>
|
|
|
<div style="max-height: 400px; overflow-y: auto; border: 1px solid #eee; padding: 8px; margin-bottom:0px">
|
|
|
<timetablemanage />
|
|
@@ -95,6 +85,10 @@
|
|
|
</el-table>
|
|
|
<el-button type="primary" @click="addItem">添加设备</el-button>
|
|
|
|
|
|
+ <div style="margin: 16px 0 8px 0; font-weight: bold">配件信息</div>
|
|
|
+ <el-input v-model="form.accessory_info" placeholder="请输入配件信息" :disabled="isView"/>
|
|
|
+
|
|
|
+
|
|
|
<!-- <div style="margin: 16px 0 8px 0; font-weight: bold">附件</div>
|
|
|
<el-upload
|
|
|
drag
|
|
@@ -121,37 +115,6 @@
|
|
|
</el-form>
|
|
|
|
|
|
|
|
|
- <!-- 审批信息流程展示 -->
|
|
|
- <div v-if="isView" style="margin-top: 24px; padding: 0 12px">
|
|
|
- <div style="font-weight: bold; margin-bottom: 12px">审批流程进度</div>
|
|
|
- <el-steps :active="activeStep" align-center>
|
|
|
- <el-step
|
|
|
- title="创建申请"
|
|
|
- :description="`创建时间:${ timeline.create }`"
|
|
|
- icon="CircleCheck"
|
|
|
- :status="activeStep >= 1 ? 'finish' : 'wait'"
|
|
|
- />
|
|
|
- <el-step
|
|
|
- title="待审批"
|
|
|
- description="待超级管理员审批"
|
|
|
- icon="CircleCheck"
|
|
|
- :status="activeStep >= 2 ? 'finish' : 'wait'"
|
|
|
- />
|
|
|
- <el-step
|
|
|
- title="审批通过"
|
|
|
- :description="`审批人:${timeline.approver},时间:${timeline.approve}`"
|
|
|
- icon="CircleCheck"
|
|
|
- :status="activeStep >= 3 ? 'finish' : 'wait'"
|
|
|
- />
|
|
|
- <el-step
|
|
|
- title="流程完成"
|
|
|
- description="流程已结束"
|
|
|
- icon="CircleCheck"
|
|
|
- :status="activeStep >= 4 ? 'finish' : 'wait'"
|
|
|
- />
|
|
|
- </el-steps>
|
|
|
- </div>
|
|
|
-
|
|
|
<template #footer>
|
|
|
<el-button @click="onCancel">关闭</el-button>
|
|
|
<el-button v-if="!isViewMode" type="primary" @click="onSave">提交</el-button>
|
|
@@ -307,6 +270,7 @@ const form = ref({
|
|
|
borrow_type:1,
|
|
|
course_input: '',
|
|
|
attachments:'',
|
|
|
+ accessory_info:''
|
|
|
});
|
|
|
const showSelectDeviceDialog = ref(false);
|
|
|
const isViewMode = computed(() => props.modelValue?.mode === 'view');
|
|
@@ -323,7 +287,7 @@ const rules = {
|
|
|
{ required: true, message: '请输入联系电话', trigger: 'change' },
|
|
|
],
|
|
|
team_members_count: [
|
|
|
- { required: true, message: '请输入团队人数', trigger: 'change' },
|
|
|
+ { required: true, message: '请输入团队人数', trigger: 'change' },
|
|
|
{
|
|
|
validator: (_rule, value, callback) => {
|
|
|
if (value <= 1) {
|
|
@@ -389,6 +353,7 @@ function resetForm() {
|
|
|
borrow_type: 1,
|
|
|
course_input: '',
|
|
|
attachments:'',
|
|
|
+ accessory_info:''
|
|
|
};
|
|
|
}
|
|
|
|
|
@@ -402,19 +367,12 @@ watch(() => props.visible, (v) => {
|
|
|
console.log("快照lastFormSnapshot.value::",props.lastFormSnapshot )
|
|
|
form.value = { ...props.lastFormSnapshot };
|
|
|
} else {
|
|
|
- // console.log("没有快照lastFormSnapshot.value::",props.lastFormSnapshot )
|
|
|
resetForm(); // 如果没有快照,初始化表单
|
|
|
}
|
|
|
}
|
|
|
}, { immediate: true });
|
|
|
|
|
|
|
|
|
-const timeline = ref({
|
|
|
- create: '',
|
|
|
- approve: '',
|
|
|
- approver: ''
|
|
|
-});
|
|
|
-const activeStep = ref(1);
|
|
|
|
|
|
watch(() => props.modelValue, async (val) => {
|
|
|
if (val && val.id && isView.value) {
|
|
@@ -423,17 +381,9 @@ watch(() => props.modelValue, async (val) => {
|
|
|
if (res.code === 2000 && res.data) {
|
|
|
const data = res.data;
|
|
|
Object.assign(form.value, data);
|
|
|
- timeline.value.create = data.create_datetime || '';
|
|
|
- timeline.value.approve = data.approve_time || '';
|
|
|
- timeline.value.approver = data.approver_info?.name || '审批人';
|
|
|
-
|
|
|
- activeStep.value = 1; // 创建
|
|
|
- if (data.status >= 1) activeStep.value = 2; // 待审批
|
|
|
- if (data.status >= 2) activeStep.value = 3; // 审批通过
|
|
|
- if (data.status >= 3) activeStep.value = 4; // 完成
|
|
|
}
|
|
|
} catch (e) {
|
|
|
- ElMessage.error('获取审批信息失败');
|
|
|
+ ElMessage.error('获取详细信息失败');
|
|
|
}
|
|
|
}else if(val&& isEdit.value){
|
|
|
try {
|
|
@@ -443,7 +393,7 @@ watch(() => props.modelValue, async (val) => {
|
|
|
Object.assign(form.value, data);
|
|
|
}
|
|
|
} catch (e) {
|
|
|
- ElMessage.error('获取审批信息失败');
|
|
|
+ ElMessage.error('获取详细信息失败');
|
|
|
}
|
|
|
}
|
|
|
}, { immediate: true });
|
|
@@ -452,6 +402,9 @@ function addItem() {
|
|
|
showSelectDeviceDialog.value = true;
|
|
|
}
|
|
|
function onDeviceSelected(devices) {
|
|
|
+ if (!form.value.items) {
|
|
|
+ form.value.items = [];
|
|
|
+ }
|
|
|
form.value.items.push(
|
|
|
...devices.map((d) => ({
|
|
|
device_category: d.category,
|