From 479a6ca57a82e1208551aec68584d2cbce69633c Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期三, 20 七月 2022 18:16:36 +0800
Subject: [PATCH] 添加修改页面
---
src/views/IntelligentXjSys/basicDataManagement/rfId/index.vue | 72 ++++++--------
src/views/basicRightsManagement/personnelShiftManagement/shiftManagement/index.vue | 1
src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue | 2
src/router/route.ts | 30 +++++
src/views/IntelligentXjSys/basicDataManagement/inspection/index.vue | 2
src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue | 34 +++++-
src/views/IntelligentXjSys/basicDataManagement/facilityArea/index.vue | 58 +++++-----
src/views/basicRightsManagement/personnelShiftManagement/holidayManagement/index.vue | 1
src/views/basicRightsManagement/personnelShiftManagement/workingHours/index.vue | 1
src/views/IntelligentXjSys/basicDataManagement/indicator/index.vue | 77 ++++++++-------
src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue | 1
src/views/basicRightsManagement/personnelShiftManagement/teamManagement/index.vue | 1
12 files changed, 158 insertions(+), 122 deletions(-)
diff --git a/src/router/route.ts b/src/router/route.ts
index f08f8f9..e0a9d7d 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -291,11 +291,35 @@
},
},
{
- path: '/inspectionManagement',
- name: 'inspectionManagement',
- component: () => import('/@/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue'),
+ path: '/rfId',
+ name: 'rfId',
+ component: () => import('/@/views/IntelligentXjSys/basicDataManagement/rfId/index.vue'),
+ meta: {
+ title: 'RFID管理'
+ },
+ },
+ {
+ path: '/inspection',
+ name: 'inspection',
+ component: () => import('/@/views/IntelligentXjSys/basicDataManagement/inspection/index.vue'),
meta: {
title: '巡检点管理'
},
+ },
+ {
+ path: '/indicator',
+ name: 'indicator',
+ component: () => import('/@/views/IntelligentXjSys/basicDataManagement/indicator/index.vue'),
+ meta: {
+ title: '巡检指标管理'
+ },
+ },
+ {
+ path: '/facilityArea',
+ name: 'facilityArea',
+ component: () => import('/@/views/IntelligentXjSys/basicDataManagement/facilityArea/index.vue'),
+ meta: {
+ title: '设施区域管理'
+ },
}
];
diff --git a/src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue b/src/views/IntelligentXjSys/basicDataManagement/facilityArea/index.vue
similarity index 86%
copy from src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue
copy to src/views/IntelligentXjSys/basicDataManagement/facilityArea/index.vue
index 8deee76..132693f 100644
--- a/src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue
+++ b/src/views/IntelligentXjSys/basicDataManagement/facilityArea/index.vue
@@ -4,12 +4,10 @@
<el-row class="homeCard">
<el-col :span="12">
<div class="grid-content topInfo">
- <el-input v-model="searchName" placeholder="巡检点名称"></el-input>
- <el-select v-model="searchPlace" placeholder="所属区域设施">
- <el-option label="风机系统" value="风机系统" />
- <el-option label="A车间" value="A车间" />
- <el-option label="B车间" value="B车间" />
- <el-option label="C车间" value="C车间" />
+ <el-input v-model="searchName" placeholder="设施区域名称"></el-input>
+ <el-select v-model="searchPlace" placeholder="设施区域类型">
+ <el-option label="设备" value="设备" />
+ <el-option label="区域" value="区域" />
</el-select>
<el-button type="primary">查询</el-button>
<el-button plain>重置</el-button>
@@ -35,8 +33,8 @@
>
<el-table-column type="selection" width="55" />
<el-table-column type="index" width="80" label="序号"/>
- <el-table-column property="name" label="巡检点名称"/>
- <el-table-column property="area" label="所属设备区域"/>
+ <el-table-column property="name" label="设施区域名称"/>
+ <el-table-column property="type" label="设施区域类型"/>
<el-table-column property="rfid" label="关联RFID"/>
<el-table-column property="creater" label="创建人"/>
<el-table-column property="createTime" label="创建时间" sortable/>
@@ -66,15 +64,15 @@
</div>
</div>
</el-scrollbar>
- <el-dialog v-model="dialogDetails" title="巡检点信息">
+ <el-dialog v-model="dialogDetails" title="设施区域">
<el-form :model="details" label-width="120px">
- <el-form-item label="巡检点名称">
+ <el-form-item label="设施区域名称">
<el-input v-model="details.name" readonly/>
</el-form-item>
- <el-form-item label="所属设备区域">
- <el-input v-model="details.area" readonly/>
+ <el-form-item label="设施区域类型">
+ <el-input v-model="details.type" readonly/>
</el-form-item>
- <el-form-item label="RFID">
+ <el-form-item label="关联RFID">
<el-input v-model="details.rfid" type="textarea" readonly/>
</el-form-item>
<el-form-item label="创建人">
@@ -94,24 +92,26 @@
</el-form-item>
</el-form>
</el-dialog>
- <el-dialog v-model="dialogAddRecord" title="巡检点编辑" @close="closeAdd">
+ <el-dialog v-model="dialogAddRecord" title="设施区域编辑" @close="closeAdd">
<el-form :model="addRecord" label-width="120px" ref="addRef" :rules="addRules">
- <el-form-item label="巡检点名称" prop="name">
+ <el-form-item label="设施区域名称" prop="name">
<el-input
v-model="addRecord.name"
>
</el-input>
</el-form-item>
- <el-form-item label="所属设施区域" prop="area">
- <el-select v-model="addRecord.area">
- <el-option label="风机系统" value="风机系统" />
- <el-option label="A车间" value="A车间" />
+ <el-form-item label="设施区域类型" prop="type">
+ <el-select v-model="addRecord.type">
+ <el-option label="设备" value="设备" />
+ <el-option label="区域" value="区域" />
</el-select>
</el-form-item>
<el-form-item label="关联RFID" prop="rfid">
- <el-select v-model="addRecord.rfid">
- <el-option label="风机系统A标签" value="风机系统A标签" />
- <el-option label="A车间A标签" value="A车间A标签" />
+ <el-select v-model="addRecord.rfid" multiple>
+ <el-option label="风机系统1标签" value="风机系统1标签" />
+ <el-option label="风机系统2标签" value="风机系统2标签"/>
+ <el-option label="风机系统3标签" value="风机系统3标签"/>
+ <el-option label="A场所1标签" value="A场所1标签"/>
</el-select>
</el-form-item>
<el-form-item>
@@ -189,18 +189,18 @@
const tableData = reactive(
[
{
- name: '73011',
- area: '风机系统',
- rfid: '风机系统A标签',
+ name: '风机系统',
+ type: '设备',
+ rfid: ['风机系统1标签','风机系统2标签'],
creater: '张三',
createTime: '2022-07-14 12:23:03',
updater: '李四',
updateTime: '2022-07-16 14:23:03'
},
{
- name: '73012',
- area: 'A车间',
- rfid: 'A车间A标签',
+ name: 'A场所',
+ type: '区域',
+ rfid: ['A场所1标签'],
creater: '李四',
createTime: '2022-07-16 12:23:03',
updater: '张三',
@@ -211,7 +211,7 @@
const addRef = ref<FormInstance>()
const addRules = reactive<FormRules>({
name:[{required: true, message: '该内容不能为空',trigger:'blur'}],
- area:[{required: true, message: '该内容不能为空',trigger:'blur'}],
+ type:[{required: true, message: '该内容不能为空',trigger:'blur'}],
rfid:[{required: true, message: '该内容不能为空',trigger:'blur'}]
})
const dialogDetails = ref(false)
diff --git a/src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue b/src/views/IntelligentXjSys/basicDataManagement/indicator/index.vue
similarity index 84%
copy from src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue
copy to src/views/IntelligentXjSys/basicDataManagement/indicator/index.vue
index 8deee76..63819f9 100644
--- a/src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue
+++ b/src/views/IntelligentXjSys/basicDataManagement/indicator/index.vue
@@ -2,15 +2,9 @@
<div class="home-container">
<el-scrollbar height="100%">
<el-row class="homeCard">
- <el-col :span="12">
+ <el-col :span="8">
<div class="grid-content topInfo">
- <el-input v-model="searchName" placeholder="巡检点名称"></el-input>
- <el-select v-model="searchPlace" placeholder="所属区域设施">
- <el-option label="风机系统" value="风机系统" />
- <el-option label="A车间" value="A车间" />
- <el-option label="B车间" value="B车间" />
- <el-option label="C车间" value="C车间" />
- </el-select>
+ <el-input v-model="searchName" placeholder="巡检指标名称"></el-input>
<el-button type="primary">查询</el-button>
<el-button plain>重置</el-button>
</div>
@@ -35,9 +29,9 @@
>
<el-table-column type="selection" width="55" />
<el-table-column type="index" width="80" label="序号"/>
- <el-table-column property="name" label="巡检点名称"/>
- <el-table-column property="area" label="所属设备区域"/>
- <el-table-column property="rfid" label="关联RFID"/>
+ <el-table-column property="name" label="指标名称"/>
+ <el-table-column property="type" label="指标类型"/>
+ <el-table-column property="unit" label="指标单位"/>
<el-table-column property="creater" label="创建人"/>
<el-table-column property="createTime" label="创建时间" sortable/>
<el-table-column property="updater" label="更新人"/>
@@ -66,16 +60,16 @@
</div>
</div>
</el-scrollbar>
- <el-dialog v-model="dialogDetails" title="巡检点信息">
+ <el-dialog v-model="dialogDetails" title="巡检指标">
<el-form :model="details" label-width="120px">
- <el-form-item label="巡检点名称">
+ <el-form-item label="指标名称">
<el-input v-model="details.name" readonly/>
</el-form-item>
- <el-form-item label="所属设备区域">
- <el-input v-model="details.area" readonly/>
+ <el-form-item label="指标类型">
+ <el-input v-model="details.type" readonly/>
</el-form-item>
- <el-form-item label="RFID">
- <el-input v-model="details.rfid" type="textarea" readonly/>
+ <el-form-item label="指标单位">
+ <el-input v-model="details.unit" readonly/>
</el-form-item>
<el-form-item label="创建人">
<el-input v-model="details.creater" readonly/>
@@ -94,24 +88,28 @@
</el-form-item>
</el-form>
</el-dialog>
- <el-dialog v-model="dialogAddRecord" title="巡检点编辑" @close="closeAdd">
+ <el-dialog v-model="dialogAddRecord" title="巡检指标编辑" @close="closeAdd">
<el-form :model="addRecord" label-width="120px" ref="addRef" :rules="addRules">
- <el-form-item label="巡检点名称" prop="name">
+ <el-form-item label="指标名称" prop="name">
<el-input
v-model="addRecord.name"
>
</el-input>
</el-form-item>
- <el-form-item label="所属设施区域" prop="area">
- <el-select v-model="addRecord.area">
- <el-option label="风机系统" value="风机系统" />
- <el-option label="A车间" value="A车间" />
+ <el-form-item label="指标类型" prop="type">
+ <el-select v-model="addRecord.type">
+ <el-option label="温度" value="温度" />
+ <el-option label="压力" value="压力" />
+ <el-option label="震动" value="震动" />
+ <el-option label="声音" value="声音" />
</el-select>
</el-form-item>
- <el-form-item label="关联RFID" prop="rfid">
- <el-select v-model="addRecord.rfid">
- <el-option label="风机系统A标签" value="风机系统A标签" />
- <el-option label="A车间A标签" value="A车间A标签" />
+ <el-form-item label="指标单位" prop="unit">
+ <el-select v-model="addRecord.unit">
+ <el-option label="℃" value="℃" />
+ <el-option label="Pa" value="Pa"/>
+ <el-option label="mms" value="mms"/>
+ <el-option label="dB" value="dB"/>
</el-select>
</el-form-item>
<el-form-item>
@@ -189,18 +187,27 @@
const tableData = reactive(
[
{
- name: '73011',
- area: '风机系统',
- rfid: '风机系统A标签',
+ name: '设备温度',
+ type: '温度',
+ unit: '℃',
creater: '张三',
createTime: '2022-07-14 12:23:03',
updater: '李四',
updateTime: '2022-07-16 14:23:03'
},
{
- name: '73012',
- area: 'A车间',
- rfid: 'A车间A标签',
+ name: '车间温度',
+ type: '温度',
+ unit: '℃',
+ creater: '李四',
+ createTime: '2022-07-16 12:23:03',
+ updater: '张三',
+ updateTime: '2022-07-18 14:23:03'
+ },
+ {
+ name: '车间压力',
+ type: '压力',
+ unit: 'Pa',
creater: '李四',
createTime: '2022-07-16 12:23:03',
updater: '张三',
@@ -211,8 +218,8 @@
const addRef = ref<FormInstance>()
const addRules = reactive<FormRules>({
name:[{required: true, message: '该内容不能为空',trigger:'blur'}],
- area:[{required: true, message: '该内容不能为空',trigger:'blur'}],
- rfid:[{required: true, message: '该内容不能为空',trigger:'blur'}]
+ type:[{required: true, message: '该内容不能为空',trigger:'blur'}],
+ unit:[{required: true, message: '该内容不能为空',trigger:'blur'}]
})
const dialogDetails = ref(false)
const dialogAddRecord = ref(false)
diff --git a/src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue b/src/views/IntelligentXjSys/basicDataManagement/inspection/index.vue
similarity index 99%
rename from src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue
rename to src/views/IntelligentXjSys/basicDataManagement/inspection/index.vue
index 8deee76..d558469 100644
--- a/src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue
+++ b/src/views/IntelligentXjSys/basicDataManagement/inspection/index.vue
@@ -75,7 +75,7 @@
<el-input v-model="details.area" readonly/>
</el-form-item>
<el-form-item label="RFID">
- <el-input v-model="details.rfid" type="textarea" readonly/>
+ <el-input v-model="details.rfid" readonly/>
</el-form-item>
<el-form-item label="创建人">
<el-input v-model="details.creater" readonly/>
diff --git a/src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue b/src/views/IntelligentXjSys/basicDataManagement/rfId/index.vue
similarity index 83%
copy from src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue
copy to src/views/IntelligentXjSys/basicDataManagement/rfId/index.vue
index 8deee76..8e2e365 100644
--- a/src/views/IntelligentXjSys/basicDataManagement/inspectionManagement/index.vue
+++ b/src/views/IntelligentXjSys/basicDataManagement/rfId/index.vue
@@ -4,13 +4,8 @@
<el-row class="homeCard">
<el-col :span="12">
<div class="grid-content topInfo">
- <el-input v-model="searchName" placeholder="巡检点名称"></el-input>
- <el-select v-model="searchPlace" placeholder="所属区域设施">
- <el-option label="风机系统" value="风机系统" />
- <el-option label="A车间" value="A车间" />
- <el-option label="B车间" value="B车间" />
- <el-option label="C车间" value="C车间" />
- </el-select>
+ <el-input v-model="searchName" placeholder="RFID名称"></el-input>
+ <el-input v-model="searchPlace" placeholder="RFID编码"></el-input>
<el-button type="primary">查询</el-button>
<el-button plain>重置</el-button>
</div>
@@ -35,9 +30,8 @@
>
<el-table-column type="selection" width="55" />
<el-table-column type="index" width="80" label="序号"/>
- <el-table-column property="name" label="巡检点名称"/>
- <el-table-column property="area" label="所属设备区域"/>
- <el-table-column property="rfid" label="关联RFID"/>
+ <el-table-column property="name" label="RFID名称"/>
+ <el-table-column property="rfid" label="RFID编码" sortable/>
<el-table-column property="creater" label="创建人"/>
<el-table-column property="createTime" label="创建时间" sortable/>
<el-table-column property="updater" label="更新人"/>
@@ -66,16 +60,13 @@
</div>
</div>
</el-scrollbar>
- <el-dialog v-model="dialogDetails" title="巡检点信息">
+ <el-dialog v-model="dialogDetails" title="RFID">
<el-form :model="details" label-width="120px">
- <el-form-item label="巡检点名称">
+ <el-form-item label="RFID名称">
<el-input v-model="details.name" readonly/>
</el-form-item>
- <el-form-item label="所属设备区域">
- <el-input v-model="details.area" readonly/>
- </el-form-item>
<el-form-item label="RFID">
- <el-input v-model="details.rfid" type="textarea" readonly/>
+ <el-input v-model="details.rfid" readonly/>
</el-form-item>
<el-form-item label="创建人">
<el-input v-model="details.creater" readonly/>
@@ -94,25 +85,13 @@
</el-form-item>
</el-form>
</el-dialog>
- <el-dialog v-model="dialogAddRecord" title="巡检点编辑" @close="closeAdd">
+ <el-dialog v-model="dialogAddRecord" title="RFID编辑" @close="closeAdd">
<el-form :model="addRecord" label-width="120px" ref="addRef" :rules="addRules">
- <el-form-item label="巡检点名称" prop="name">
- <el-input
- v-model="addRecord.name"
- >
- </el-input>
+ <el-form-item label="RFID名称" prop="name">
+ <el-input v-model="addRecord.name"></el-input>
</el-form-item>
- <el-form-item label="所属设施区域" prop="area">
- <el-select v-model="addRecord.area">
- <el-option label="风机系统" value="风机系统" />
- <el-option label="A车间" value="A车间" />
- </el-select>
- </el-form-item>
- <el-form-item label="关联RFID" prop="rfid">
- <el-select v-model="addRecord.rfid">
- <el-option label="风机系统A标签" value="风机系统A标签" />
- <el-option label="A车间A标签" value="A车间A标签" />
- </el-select>
+ <el-form-item label="RFID编码" prop="rfid">
+ <el-input v-model="addRecord.rfid"></el-input>
</el-form-item>
<el-form-item>
<el-button type="warning" @click="dialogAddRecord = false" size="default" plain>取消</el-button>
@@ -189,18 +168,32 @@
const tableData = reactive(
[
{
- name: '73011',
- area: '风机系统',
- rfid: '风机系统A标签',
+ name: '风机系统1标签',
+ rfid: '123456789ABC01',
creater: '张三',
createTime: '2022-07-14 12:23:03',
updater: '李四',
updateTime: '2022-07-16 14:23:03'
},
{
- name: '73012',
- area: 'A车间',
- rfid: 'A车间A标签',
+ name: '风机系统2标签',
+ rfid: '123456789ABC02',
+ creater: '张三',
+ createTime: '2022-07-14 12:23:03',
+ updater: '李四',
+ updateTime: '2022-07-16 14:23:03'
+ },
+ {
+ name: '风机系统3标签',
+ rfid: '123456789ABC03',
+ creater: '张三',
+ createTime: '2022-07-14 12:23:03',
+ updater: '李四',
+ updateTime: '2022-07-16 14:23:03'
+ },
+ {
+ name: 'A车间1标签',
+ rfid: '123456789ABC04',
creater: '李四',
createTime: '2022-07-16 12:23:03',
updater: '张三',
@@ -211,7 +204,6 @@
const addRef = ref<FormInstance>()
const addRules = reactive<FormRules>({
name:[{required: true, message: '该内容不能为空',trigger:'blur'}],
- area:[{required: true, message: '该内容不能为空',trigger:'blur'}],
rfid:[{required: true, message: '该内容不能为空',trigger:'blur'}]
})
const dialogDetails = ref(false)
diff --git a/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue b/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue
index 0ef9dc1..378c311 100644
--- a/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue
+++ b/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue
@@ -279,8 +279,9 @@
<el-table-column property="rfid" label="关联RFID"/>
<el-table-column property="norm" label="巡检指标"/>
<el-table-column property="reference" label="数据参考值"/>
- <el-table-column fixed="right" label="操作" align="center" width="80">
+ <el-table-column fixed="right" label="操作" align="center" width="100">
<template #default="scope">
+ <el-button link type="primary" size="small" :icon="Edit" @click="editInspection(index,scope.$index ,scope.row)">修改</el-button>
<el-button link type="danger" size="small" :icon="Delete" @click="deleteInspection(index,scope.$index)">删除</el-button>
</template>
</el-table-column>
@@ -340,6 +341,9 @@
</el-dialog>
<el-dialog v-model="dialogAddInspection" title="新增巡检点" @close="closeAddInspection">
<el-form :model="addInspection" label-width="120px" ref="addInspectionRef" :rules="addInspectionRules">
+ <el-form-item label="输入巡检点排序" prop="sort">
+ <el-input-number v-model="addInspection.sort" :min="1" :max="999" placeholder="巡检点排序"/>
+ </el-form-item>
<el-form-item label="选择巡检点" prop="name">
<el-select v-model="addInspection.name">
<el-option label="73011" value="73011" />
@@ -347,8 +351,13 @@
<el-option label="73013" value="73013" />
</el-select>
</el-form-item>
- <el-form-item label="输入巡检点排序" prop="sort">
- <el-input-number v-model="addInspection.sort" :min="1" :max="999" placeholder="请输入用于确定该巡检点位置的序号"/>
+ <el-form-item label="选择巡检指标" prop="norm">
+ <el-select v-model="addInspection.norm">
+ <el-option label="风机声音" value="风机声音" />
+ <el-option label="设备温度" value="设备温度" />
+ <el-option label="压力" value="压力" />
+ <el-option label="震动" value="震动" />
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="warning" @click="dialogAddInspection = false" size="default" plain>取消</el-button>
@@ -557,6 +566,7 @@
})
const addInspectionRules = reactive<FormRules>({
name:[{required: true, message: '该内容不能为空',trigger:'blur'}],
+ norm:[{required: true, message: '该内容不能为空',trigger:'blur'}],
sort:[{required: true, message: '该内容不能为空',trigger:'blur'}]
})
const dialogDetails = ref(false)
@@ -607,8 +617,6 @@
})
return
}else{
- if(addRecord.value.type == '固定班'){delete addRecord.value.shiftSteps}
- console.log(addRecord.value,'addRecord')
tableData[chosenIndex.value] = addRecord.value
}
}
@@ -692,8 +700,13 @@
await formEl.validate((valid, fields) => {
if (valid) {
if(addRecord.value.shiftSteps[chosenShiftIndex.value].inspectorData){
- addRecord.value.shiftSteps[chosenShiftIndex.value].inspectorData.unshift(addInspection.value)
- addRecord.value.shiftSteps[chosenShiftIndex.value].inspectorData.sort(compare('sort'))
+ if(chosenInspectionIndex.value == -1){
+ addRecord.value.shiftSteps[chosenShiftIndex.value].inspectorData.unshift(addInspection.value)
+ addRecord.value.shiftSteps[chosenShiftIndex.value].inspectorData.sort(compare('sort'))
+ }else{
+ addRecord.value.shiftSteps[chosenShiftIndex.value].inspectorData[chosenInspectionIndex.value] = addInspection.value
+ addRecord.value.shiftSteps[chosenShiftIndex.value].inspectorData.sort(compare('sort'))
+ }
}else{
addRecord.value.shiftSteps[chosenShiftIndex.value].inspectorData = []
addRecord.value.shiftSteps[chosenShiftIndex.value].inspectorData.unshift(addInspection.value)
@@ -709,7 +722,12 @@
chosenShiftIndex.value = i
chosenInspectionIndex.value = index
deleteInspectionDialog.value = true
- console.log(chosenShiftIndex.value,chosenInspectionIndex.value)
+ }
+ const editInspection =(i,index, row)=>{
+ chosenShiftIndex.value = i
+ chosenInspectionIndex.value = index
+ dialogAddInspection.value = true
+ addInspection.value = JSON.parse(JSON.stringify(row))
}
const conFirmInspectionDelete=()=>{
addRecord.value.shiftSteps[chosenShiftIndex.value].inspectorData.splice( chosenInspectionIndex.value,1)
diff --git a/src/views/basicRightsManagement/personnelShiftManagement/holidayManagement/index.vue b/src/views/basicRightsManagement/personnelShiftManagement/holidayManagement/index.vue
index a93ad45..1c82f55 100644
--- a/src/views/basicRightsManagement/personnelShiftManagement/holidayManagement/index.vue
+++ b/src/views/basicRightsManagement/personnelShiftManagement/holidayManagement/index.vue
@@ -305,7 +305,6 @@
.home-container {
height: 100%;
overflow: hidden;
- padding: 20px;
.homeCard{
width: 100%;
padding: 20px;
diff --git a/src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue b/src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue
index 6e43c0a..4679574 100644
--- a/src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue
+++ b/src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue
@@ -301,7 +301,6 @@
.home-container {
height: 100%;
overflow: hidden;
- padding: 20px;
.homeCard{
width: 100%;
padding: 20px;
diff --git a/src/views/basicRightsManagement/personnelShiftManagement/shiftManagement/index.vue b/src/views/basicRightsManagement/personnelShiftManagement/shiftManagement/index.vue
index 4fa92bd..8ab69a5 100644
--- a/src/views/basicRightsManagement/personnelShiftManagement/shiftManagement/index.vue
+++ b/src/views/basicRightsManagement/personnelShiftManagement/shiftManagement/index.vue
@@ -442,7 +442,6 @@
.home-container {
height: 100%;
overflow: hidden;
- padding: 20px;
.homeCard{
width: 100%;
padding: 20px;
diff --git a/src/views/basicRightsManagement/personnelShiftManagement/teamManagement/index.vue b/src/views/basicRightsManagement/personnelShiftManagement/teamManagement/index.vue
index 96a6435..d4f963a 100644
--- a/src/views/basicRightsManagement/personnelShiftManagement/teamManagement/index.vue
+++ b/src/views/basicRightsManagement/personnelShiftManagement/teamManagement/index.vue
@@ -310,7 +310,6 @@
.home-container {
height: 100%;
overflow: hidden;
- padding: 20px;
.homeCard{
width: 100%;
padding: 20px;
diff --git a/src/views/basicRightsManagement/personnelShiftManagement/workingHours/index.vue b/src/views/basicRightsManagement/personnelShiftManagement/workingHours/index.vue
index 0f9254e..1c4f628 100644
--- a/src/views/basicRightsManagement/personnelShiftManagement/workingHours/index.vue
+++ b/src/views/basicRightsManagement/personnelShiftManagement/workingHours/index.vue
@@ -275,7 +275,6 @@
.home-container {
height: 100%;
overflow: hidden;
- padding: 20px;
.homeCard{
width: 100%;
padding: 20px;
diff --git a/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue b/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue
index 676466b..f3aa472 100644
--- a/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue
+++ b/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue
@@ -141,6 +141,7 @@
reportForm.value.editeTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
tableData.push(reportForm.value)
}else{
+ reportForm.value.editeTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
tableData[rowIndex.value] = reportForm.value
}
dialogAddForm.value = false
@@ -153,7 +154,6 @@
dialogAddForm.value = true
rowIndex.value = index
reportForm.value = JSON.parse(JSON.stringify(row))
- reportForm.value.editeTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
}
const deleteRow = (index)=>{
tableData.splice( index,1)
--
Gitblit v1.9.2