From d176f0e4db7013d4e06cba8b7107e84ee2e8e085 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 27 二月 2026 17:46:13 +0800
Subject: [PATCH] 设备保养-任务记录增加备注字段； 供应商档案增加供应商类型字段，由字典维护；
---
src/views/equipmentManagement/upkeep/index.vue | 5 +++++
src/views/equipmentManagement/upkeep/Form/PlanModal.vue | 16 ++++++++++++++++
src/views/basicData/supplierManage/components/HomeTab.vue | 7 ++-----
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/basicData/supplierManage/components/HomeTab.vue b/src/views/basicData/supplierManage/components/HomeTab.vue
index 85c3265..e1923e8 100644
--- a/src/views/basicData/supplierManage/components/HomeTab.vue
+++ b/src/views/basicData/supplierManage/components/HomeTab.vue
@@ -170,10 +170,7 @@
<el-col :span="12">
<el-form-item label="渚涘簲鍟嗙被鍨嬶細" prop="supplierType">
<el-select v-model="form.supplierType" placeholder="璇烽�夋嫨" clearable>
- <el-option label="鐢�" value="鐢�" />
- <el-option label="涔�" value="涔�" />
- <el-option label="涓�" value="涓�" />
- <el-option label="涓�" value="涓�" />
+ <el-option :label="item.label" :value="item.value" v-for="(item,index) in supplier_type" :key="index" />
</el-select>
</el-form-item>
</el-col>
@@ -258,7 +255,7 @@
import FilesDia from "../filesDia.vue";
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
-
+const { supplier_type } = proxy.useDict("supplier_type");
const tableColumn = ref([
{
label: "渚涘簲鍟嗗悕绉�",
diff --git a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
index 19095b9..43eb4f6 100644
--- a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
@@ -67,6 +67,20 @@
clearable
/>
</el-form-item>
+ <el-form-item label="澶囨敞">
+ <el-input
+ v-model="form.remark"
+ type="textarea"
+ :rows="3"
+ placeholder="璇疯緭鍏ュ娉�"
+ :rules="[
+ {
+ max: 100,
+ message: '鏈�澶�100涓瓧绗�',
+ }
+ ]"
+ />
+ </el-form-item>
</el-form>
</FormDialog>
</template>
@@ -108,6 +122,7 @@
maintenancePlanTime: undefined, // 璁″垝淇濆吇鏃ユ湡
createUser: undefined, // 褰曞叆浜�
status: 0, //淇濅慨鐘舵��
+ remark: ''
});
const setDeviceModel = (deviceId) => {
@@ -128,6 +143,7 @@
form.maintenancePlanTime = dayjs(data.maintenancePlanTime).format(
"YYYY-MM-DD HH:mm:ss"
);
+ form.remark = data.remark;
};
// 鐢ㄦ埛鍒楄〃
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 543e37b..5044f06 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -405,6 +405,11 @@
dataType: "slot",
slot: "statusRef",
},
+ {
+ label: "澶囨敞",
+ align: "center",
+ prop: "remark",
+ },
{
fixed: "right",
label: "鎿嶄綔",
--
Gitblit v1.9.3