diff --git a/src/views/dms/dmsBaseMaintStation/index.vue b/src/views/dms/dmsBaseMaintStation/index.vue
index 24cc275..fddb189 100644
--- a/src/views/dms/dmsBaseMaintStation/index.vue
+++ b/src/views/dms/dmsBaseMaintStation/index.vue
@@ -56,7 +56,7 @@
-
+
@@ -178,7 +178,7 @@ const columns = ref([
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `设备类型`, visible: true },
- { key: 3, label: `保养标准ID`, visible: true },
+ { key: 3, label: `保养标准编号`, visible: true },
{ key: 4, label: `部位编号`, visible: true },
{ key: 5, label: `部位名称`, visible: true },
{ key: 6, label: `激活标识`, visible: true },
@@ -198,6 +198,7 @@ const initFormData: DmsBaseMaintStationForm = {
maintStationName: undefined,
activeFlag: '1',
remark: undefined,
+ maintStandardCode: undefined,
maintProjectIds: []
}
const data = reactive>({
@@ -211,6 +212,7 @@ const data = reactive
-
- 新增
-
-
- 修改
-
+
+
+
+
+
+
删除
@@ -115,63 +115,63 @@
-
-
+
+
-
+
+
+
+
+
+
{{ parseTime(scope.row.applyTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
{{ parseTime(scope.row.realBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
{{ parseTime(scope.row.requireEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
-
+
-
+
-
-
+
+
-
+
@@ -181,15 +181,15 @@
-
+
-
+
+
@@ -370,29 +370,29 @@ const dialog = reactive({
// 列显隐信息
const columns = ref([
{ key: 0, label: `主键标识`, visible: false },
- { key: 1, label: `租户编号`, visible: false },
- { key: 2, label: `工单编号`, visible: true },
- { key: 3, label: `工单类型`, visible: true },
- { key: 4, label: `报修来源类型`, visible: true },
- { key: 5, label: `报修来源ID`, visible: false },
- { key: 6, label: `流程定义`, visible: false },
- { key: 7, label: `设备`, visible: true },
- { key: 8, label: `申请人`, visible: true },
- { key: 9, label: `申请时间`, visible: true },
- { key: 10, label: `实际开始时间`, visible: true },
- { key: 11, label: `实际完成时间`, visible: true },
- { key: 12, label: `要求完成时间`, visible: true },
- { key: 13, label: `工单状态`, visible: true },
- { key: 14, label: `审批状态`, visible: true },
- { key: 15, label: `确认状态`, visible: true },
- { key: 16, label: `确认人`, visible: true },
- { key: 17, label: `激活标识`, visible: true },
- { key: 18, label: `备注`, visible: true },
- { key: 19, label: `创建部门`, visible: false },
- { key: 20, label: `创建人`, visible: false },
- { key: 21, label: `创建时间`, visible: false },
- { key: 22, label: `更新人`, visible: false },
- { key: 23, label: `更新时间`, visible: false },
+ // { key: 1, label: `租户编号`, visible: false },
+ { key: 1, label: `工单编号`, visible: true },
+ { key: 2, label: `工单类型`, visible: true },
+ // { key: 3, label: `报修来源类型`, visible: true },
+ // { key: 5, label: `报修来源ID`, visible: false },
+ { key: 3, label: `流程定义`, visible: false },
+ { key: 4, label: `设备`, visible: true },
+ { key: 5, label: `申请人`, visible: true },
+ { key: 6, label: `申请时间`, visible: true },
+ { key: 7, label: `实际开始时间`, visible: true },
+ { key: 8, label: `实际完成时间`, visible: true },
+ { key: 9, label: `要求完成时间`, visible: false },
+ { key: 10, label: `工单状态`, visible: true },
+ { key: 11, label: `审批状态`, visible: true },
+ { key: 12, label: `确认状态`, visible: true },
+ { key: 13, label: `确认人`, visible: true },
+ { key: 14, label: `激活标识`, visible: true },
+ { key: 15, label: `备注`, visible: false },
+ // { key: 19, label: `创建部门`, visible: false },
+ // { key: 20, label: `创建人`, visible: false },
+ // { key: 21, label: `创建时间`, visible: false },
+ // { key: 22, label: `更新人`, visible: false },
+ // { key: 23, label: `更新时间`, visible: false },
]);
const initFormData: DmsBillsFaultInstanceForm = {
@@ -696,14 +696,14 @@ const needProcessButton = (row: DmsBillsFaultInstanceVO) => {
// 处理工单:跳转到dmsFaultInstanceActivity页面
const handleProcess = (row: DmsBillsFaultInstanceVO) => {
let processType = '';
-
+
// 判断处理类型
if (row.approveStatus === '1') {
processType = 'approval'; // 审批
} else if (row.billsStatus === '2' && row.repairConfirm === '0' && row.approveStatus === '2') {
processType = 'confirm'; // 确认
}
-
+
if (processType) {
router.push({
path: '/dms/dmsFaultInstanceActivity',
diff --git a/src/views/dms/dmsBillsInspectInstance/index.vue b/src/views/dms/dmsBillsInspectInstance/index.vue
index 5379c09..a892648 100644
--- a/src/views/dms/dmsBillsInspectInstance/index.vue
+++ b/src/views/dms/dmsBillsInspectInstance/index.vue
@@ -73,12 +73,12 @@
-
- 新增
-
-
- 修改
-
+
+
+
+
+
+
删除
@@ -99,7 +99,7 @@
-
+
@@ -299,6 +299,7 @@ const initFormData: DmsBillsInspectInstanceForm = {
realEndTime: undefined,
inspectStatus: undefined,
remark: undefined,
+ routeName: undefined,
}
const data = reactive>({
form: {...initFormData},
@@ -316,6 +317,7 @@ const data = reactive
-
- 新增
-
-
- 修改
-
+
+
+
+
+
+
删除
@@ -133,8 +133,8 @@
-
-
+
+
@@ -255,11 +255,11 @@