DeXun/GEAR-OA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix: 设备管理bug修复

Browse Source
This commit is contained in:
砂糖
2025-09-24 15:23:07 +08:00
parent d660009610
commit 429081460a
22 changed files with 163 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gear-ui3/src/components/UserSelect/multi.vue
View File

@@ -57,7 +57,7 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<KLPTable v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
@@ -79,13 +79,13 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</KLPTable> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" v-model:page="queryParams.pageNum"
:limit.sync="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</el-col> </el-col>
@@ -100,12 +100,12 @@
<script> <script>
import { listUser } from "@/api/system/user"; import { listUser } from "@/api/system/user";
import { deptTreeSelect as treeselect } from "@/api/system/user"; import { deptTreeSelect as treeselect } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect"; // import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; // import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "UserMultiSelect", name: "UserMultiSelect",
components: { Treeselect }, // components: { Treeselect },
data() { data() {
return { return {
showFlag:false, showFlag:false,

14
gear-ui3/src/components/UserSelect/single.vue
View File

@@ -57,7 +57,7 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<KLPTable v-loading="loading" :data="userList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick"> <el-table v-loading="loading" :data="userList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center" > <el-table-column width="55" align="center" >
<template v-slot="scope"> <template v-slot="scope">
<el-radio v-model="selectedId" :label="scope.row.userId" @change="handleRowChange(scope.row)">{{""}}</el-radio> <el-radio v-model="selectedId" :label="scope.row.userId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
@@ -82,13 +82,13 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</KLPTable> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" v-model:page="queryParams.pageNum"
:limit.sync="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</el-col> </el-col>
@@ -103,12 +103,12 @@
<script> <script>
import { listUser } from "@/api/system/user"; import { listUser } from "@/api/system/user";
import { deptTreeSelect as treeselect } from "@/api/system/user"; import { deptTreeSelect as treeselect } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect"; // import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; // import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "UserSingleSelect", name: "UserSingleSelect",
components: { Treeselect }, // components: { Treeselect },
data() { data() {
return { return {
showFlag:false, showFlag:false,

8
gear-ui3/src/components/dvplanSelect/index.vue
View File

@@ -29,7 +29,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<KLPTable v-loading="loading" :data="checkplanList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick"> <el-table v-loading="loading" :data="checkplanList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center" > <el-table-column width="55" align="center" >
<template v-slot="scope"> <template v-slot="scope">
<el-radio v-model="selectedPlanId" :label="scope.row.planId" @change="handleRowChange(scope.row)">{{""}}</el-radio> <el-radio v-model="selectedPlanId" :label="scope.row.planId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
@@ -94,13 +94,13 @@
>停用</el-button> >停用</el-button>
</template> </template>
</el-table-column> </el-table-column>
</KLPTable> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" v-model:page="queryParams.pageNum"
:limit.sync="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />

8
gear-ui3/src/components/dvsubjectSelect/multi.vue
View File

@@ -29,7 +29,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<KLPTable v-loading="loading" :data="dvsubjectList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dvsubjectList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目编码" align="center" prop="subjectCode" /> <el-table-column label="项目编码" align="center" prop="subjectCode" />
<el-table-column label="项目类型" align="center" prop="subjectType"> <el-table-column label="项目类型" align="center" prop="subjectType">
@@ -45,13 +45,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
</KLPTable> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" v-model:page="queryParams.pageNum"
:limit.sync="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

8
gear-ui3/src/components/dvsubjectSelect/single.vue
View File

@@ -29,7 +29,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<KLPTable v-loading="loading" :data="dvsubjectList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick"> <el-table v-loading="loading" :data="dvsubjectList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center" > <el-table-column width="55" align="center" >
<template v-slot="scope"> <template v-slot="scope">
<el-radio v-model="selectedId" :label="scope.row.subjectId" @change="handleRowChange(scope.row)">{{""}}</el-radio> <el-radio v-model="selectedId" :label="scope.row.subjectId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
@@ -40,13 +40,13 @@
<el-table-column label="项目内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/> <el-table-column label="项目内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
<el-table-column label="标准" align="center" prop="subjectStandard" :show-overflow-tooltip="true"/> <el-table-column label="标准" align="center" prop="subjectStandard" :show-overflow-tooltip="true"/>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
</KLPTable> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" v-model:page="queryParams.pageNum"
:limit.sync="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

16
gear-ui3/src/components/machinerySelect/index.vue
View File

@@ -57,7 +57,7 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<KLPTable v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="设备编码" width = "120" align="center" key="machineryCode" prop="machineryCode"> <el-table-column label="设备编码" width = "120" align="center" key="machineryCode" prop="machineryCode">
</el-table-column> </el-table-column>
@@ -75,13 +75,13 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</KLPTable> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" v-model:page="queryParams.pageNum"
:limit.sync="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</el-col> </el-col>
@@ -94,18 +94,12 @@
</template> </template>
<script> <script>
import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachinery } from "@/api/mes/dv/machinery"; import { listMachinery } from "@/api/mes/dv/machinery";
import { listMachinerytype } from "@/api/mes/dv/machinerytype"; import { listMachinerytype } from "@/api/mes/dv/machinerytype";
// import { listAllWorkshop } from "@/api/mes/md/workshop";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "MachinerySelect", name: "MachinerySelect",
dicts: ['sys_yes_no','mes_machinery_status'], dicts: ['sys_yes_no','mes_machinery_status'],
components: { Treeselect },
data() { data() {
return { return {
showFlag: false, showFlag: false,

15
gear-ui3/src/components/machinerySelect/single.vue
View File

@@ -66,7 +66,7 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<KLPTable v-loading="loading" :data="machineryList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick"> <el-table v-loading="loading" :data="machineryList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="50" align="center" > <el-table-column width="50" align="center" >
<template v-slot="scope"> <template v-slot="scope">
<el-radio v-model="selectedMachineryId" :label="scope.row.machineryId" @change="handleRowChange(scope.row)">{{""}}</el-radio> <el-radio v-model="selectedMachineryId" :label="scope.row.machineryId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
@@ -88,13 +88,13 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</KLPTable> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" v-model:page="queryParams.pageNum"
:limit.sync="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</el-col> </el-col>
@@ -107,17 +107,12 @@
</template> </template>
<script> <script>
import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachinery } from "@/api/mes/dv/machinery"; import { listMachinery } from "@/api/mes/dv/machinery";
import { listMachinerytype } from "@/api/mes/dv/machinerytype"; import { listMachinerytype } from "@/api/mes/dv/machinerytype";
// import { listAllWorkshop } from "@/api/mes/md/workshop";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "MachinerySelectSingle", name: "MachinerySelectSingle",
dicts: ['sys_yes_no','mes_machinery_status'], dicts: ['sys_yes_no','mes_machinery_status'],
components: { Treeselect },
data() { data() {
return { return {
showFlag: false, showFlag: false,

14
gear-ui3/src/views/dv/checkplan/index.vue
View File

@@ -88,7 +88,7 @@
<el-table v-loading="loading" :data="checkplanList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="checkplanList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="方案编号" align="center" prop="planCode" > <el-table-column label="方案编号" align="center" prop="planCode" >
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
@@ -97,22 +97,22 @@
</el-table-column> </el-table-column>
<el-table-column label="方案名称" align="center" prop="planName" /> <el-table-column label="方案名称" align="center" prop="planName" />
<el-table-column label="方案类型" align="center" width="120px" prop="planType"> <el-table-column label="方案类型" align="center" width="120px" prop="planType">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="dv_plan_type" :value="scope.row.planType"/> <dict-tag :options="dv_plan_type" :value="scope.row.planType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="开始日期" align="center" prop="startDate" width="180"> <el-table-column label="开始日期" align="center" prop="startDate" width="180">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结束日期" align="center" prop="endDate" width="180"> <el-table-column label="结束日期" align="center" prop="endDate" width="180">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="频率" width="100px" align="center" prop="cycleType"> <el-table-column label="频率" width="100px" align="center" prop="cycleType">
<template slot-scope="scope"> <template #default="scope">
<span style="display: inline-flex;"> <span style="display: inline-flex;">
{{scope.row.cycleCount}} {{scope.row.cycleCount}}
<dict-tag :options="mes_cycle_type" :value="scope.row.cycleType"/> <dict-tag :options="mes_cycle_type" :value="scope.row.cycleType"/>
@@ -120,12 +120,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="mes_order_status" :value="scope.row.status"/> <dict-tag :options="mes_order_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="130px" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="130px" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"

2
gear-ui3/src/views/dv/checkplan/machinery.vue
View File

@@ -33,7 +33,7 @@
<el-table-column label="规格型号" align="center" prop="machinerySpec" /> <el-table-column label="规格型号" align="center" prop="machinerySpec" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"

2
gear-ui3/src/views/dv/checkplan/subject.vue
View File

@@ -32,7 +32,7 @@
<el-table-column label="项目内容" align="center" width="350px" prop="subjectContent" :show-overflow-tooltip="true"/> <el-table-column label="项目内容" align="center" width="350px" prop="subjectContent" :show-overflow-tooltip="true"/>
<el-table-column label="标准" align="center" width="300px" prop="subjectStandard" :show-overflow-tooltip="true"/> <el-table-column label="标准" align="center" width="300px" prop="subjectStandard" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" v-if="optType !='view'" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" v-if="optType !='view'" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"

20
gear-ui3/src/views/dv/checkrecord/index.vue
View File

@@ -83,7 +83,7 @@
<el-table v-loading="loading" :data="checkrecordList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="checkrecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="设备编码" align="center" prop="machineryCode" > <el-table-column label="设备编码" align="center" prop="machineryCode" >
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
@@ -97,17 +97,17 @@
<el-table-column label="计划名称" align="center" prop="planName" /> <el-table-column label="计划名称" align="center" prop="planName" />
<el-table-column label="点检人" align="center" prop="nickName" /> <el-table-column label="点检人" align="center" prop="nickName" />
<el-table-column label="点检时间" align="center" prop="checkTime" width="180"> <el-table-column label="点检时间" align="center" prop="checkTime" width="180">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="mes_order_status" :value="scope.row.status"/> <dict-tag :options="mes_order_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -221,14 +221,18 @@ import CheckplanSelect from "@/components/dvplanSelect/index.vue";
import CheckRecordLine from "./line.vue"; import CheckRecordLine from "./line.vue";
import UserSingleSelect from "@/components/userSelect/single.vue" import UserSingleSelect from "@/components/userSelect/single.vue"
import {formatDate} from "@/utils"; import {formatDate} from "@/utils";
import useUserStore from '@/store/modules/user'
export default { export default {
name: "Checkrecord", name: "Checkrecord",
components:{ MachinerySelectSingle, CheckplanSelect, CheckRecordLine, UserSingleSelect}, components:{ MachinerySelectSingle, CheckplanSelect, CheckRecordLine, UserSingleSelect},
setup() { setup() {
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { mes_order_status } = proxy.useDict("mes_order_status"); const { mes_order_status } = proxy.useDict("mes_order_status");
const userStore = useUserStore();
return { return {
mes_order_status mes_order_status,
userStore
} }
}, },
data() { data() {
@@ -326,9 +330,9 @@ export default {
updateBy: null, updateBy: null,
updateTime: null updateTime: null
}; };
this.form.userId= this.$store.state.user.id; this.form.userId= this.userStore.id;
this.form.nickName= this.$store.state.user.nick; this.form.nickName= this.userStore.nickName;
this.form.userName= this.$store.state.user.name; this.form.userName= this.userStore.name;
}, },
created() { created() {
this.getList(); this.getList();

4
gear-ui3/src/views/dv/checkrecord/line.vue
View File

@@ -39,13 +39,13 @@
<el-table-column label="检查内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/> <el-table-column label="检查内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
<el-table-column label="标准" align="center" prop="subjectStandard" /> <el-table-column label="标准" align="center" prop="subjectStandard" />
<el-table-column label="点检结果" align="center" prop="checkStatus" > <el-table-column label="点检结果" align="center" prop="checkStatus" >
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="dv_cm_result_status" :value="scope.row.checkStatus"/> <dict-tag :options="dv_cm_result_status" :value="scope.row.checkStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="异常描述" align="center" prop="checkResult" :show-overflow-tooltip="true" /> <el-table-column label="异常描述" align="center" prop="checkResult" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" v-if="optType !== 'view'" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" v-if="optType !== 'view'" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"

8
gear-ui3/src/views/dv/machinery/components/Checkplan.vue
View File

@@ -5,23 +5,23 @@
<el-table-column label="计划编码" align="center" prop="planCode" :show-overflow-tooltip="true"></el-table-column> <el-table-column label="计划编码" align="center" prop="planCode" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计划名称" align="center" width="200px" prop="planName" :show-overflow-tooltip="true"/> <el-table-column label="计划名称" align="center" width="200px" prop="planName" :show-overflow-tooltip="true"/>
<el-table-column label="开始日期" align="center" prop="startDate" width="180"> <el-table-column label="开始日期" align="center" prop="startDate" width="180">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结束日期" align="center" prop="endDate" width="180"> <el-table-column label="结束日期" align="center" prop="endDate" width="180">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="频率" align="center" prop="cycleType"> <el-table-column label="频率" align="center" prop="cycleType">
<template slot-scope="scope"> <template #default="scope">
{{scope.row.cycleCount}} {{scope.row.cycleCount}}
<dict-tag :options="mes_cycle_type" :value="scope.row.cycleType"/> <dict-tag :options="mes_cycle_type" :value="scope.row.cycleType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="mes_order_status" :value="scope.row.status"/> <dict-tag :options="mes_order_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>

18
gear-ui3/src/views/dv/machinery/components/Repair.vue
View File

@@ -4,41 +4,33 @@
<el-table-column label="维修单编号" width="120px" align="center" prop="repairCode" /> <el-table-column label="维修单编号" width="120px" align="center" prop="repairCode" />
<el-table-column label="维修单名称" width="150px" align="center" prop="repairName" :show-overflow-tooltip="true"/> <el-table-column label="维修单名称" width="150px" align="center" prop="repairName" :show-overflow-tooltip="true"/>
<el-table-column label="报修日期" align="center" prop="requireDate" width="120"> <el-table-column label="报修日期" align="center" prop="requireDate" width="120">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.requireDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.requireDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="维修完成日期" align="center" prop="finishDate" width="120"> <el-table-column label="维修完成日期" align="center" prop="finishDate" width="120">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.finishDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.finishDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="验收日期" align="center" prop="confirmDate" width="120"> <el-table-column label="验收日期" align="center" prop="confirmDate" width="120">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="维修结果" align="center" prop="repairResult"> <el-table-column label="维修结果" align="center" prop="repairResult">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="mes_repair_result" :value="scope.row.repairResult"/> <dict-tag :options="mes_repair_result" :value="scope.row.repairResult"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="维修人员" align="center" prop="acceptedBy" /> <el-table-column label="维修人员" align="center" prop="acceptedBy" />
<el-table-column label="验收人员" align="center" prop="confirmBy" /> <el-table-column label="验收人员" align="center" prop="confirmBy" />
<el-table-column label="单据状态" align="center" prop="status"> <el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="mes_order_status" :value="scope.row.status"/> <dict-tag :options="mes_order_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- v-model:page="queryParams.pageNum"-->
<!-- v-model:limit="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
</div> </div>
</template> </template>

42
gear-ui3/src/views/dv/machinery/index.vue
View File

@@ -97,7 +97,7 @@
<el-table v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="设备编码" width = "120" align="center" key="machineryCode" prop="machineryCode"> <el-table-column label="设备编码" width = "120" align="center" key="machineryCode" prop="machineryCode">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -108,14 +108,14 @@
<el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" /> <el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
<el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" /> <el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
<el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName" :show-overflow-tooltip="true" /> <!-- <el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName" :show-overflow-tooltip="true" /> -->
<el-table-column label="设备状态" align="center" key="status" prop="status" > <el-table-column label="设备状态" align="center" key="status" prop="status" >
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="mes_machinery_status" :value="scope.row.status"/> <dict-tag :options="mes_machinery_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="160"> <el-table-column label="创建时间" align="center" prop="createTime" width="160">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -125,7 +125,7 @@
width="160" width="160"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -193,13 +193,15 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="设备分类" prop="machineryTypeId"> <el-form-item label="设备分类" prop="machineryTypeId">
<treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" disabled v-if="optType=='view'" /> <el-tree-select v-model="form.machineryTypeId" :data="machineryTypeOptions" :props="{label: 'machineryTypeName', value: 'machineryTypeId'}" disabled v-if="optType=='view'" />
<treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" placeholder="请选择所属分类" v-else :disable-branch-nodes='true' /> <el-tree-select v-model="form.machineryTypeId" :data="machineryTypeOptions" :props="{label: 'machineryTypeName', value: 'machineryTypeId'}" placeholder="请选择所属分类" v-else :disable-branch-nodes='true' />
<!-- <treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" disabled v-if="optType=='view'" /> -->
<!-- <treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" placeholder="请选择所属分类" v-else :disable-branch-nodes='true' /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="所属车间" prop="workshopId"> <el-form-item label="所属车间" prop="workshopId">
<el-select v-model="form.workshopId" @change="changeWorkshop" placeholder="请选择车间"> <el-select v-model="form.workshopId" @change="changeWorkshop" placeholder="请选择车间">
<el-option <el-option
@@ -210,7 +212,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设备状态" prop="status"> <el-form-item label="设备状态" prop="status">
<el-select v-model="form.status" placeholder="请选择设备状态"> <el-select v-model="form.status" placeholder="请选择设备状态">
@@ -323,8 +325,8 @@ import { listMachinerytype } from "@/api/mes/dv/machinerytype";
// import { listAllWorkshop } from "@/api/mes/md/workshop"; // import { listAllWorkshop } from "@/api/mes/md/workshop";
// import {genCode} from "@/api/system/autocode/rule" // import {genCode} from "@/api/system/autocode/rule"
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect"; // import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; // import "@riophae/vue-treeselect/dist/vue-treeselect.css";
// import BarcodeImg from "@/components/barcodeImg/index.vue"; // import BarcodeImg from "@/components/barcodeImg/index.vue";
import CheckPlan from "./components/Checkplan.vue" import CheckPlan from "./components/Checkplan.vue"
import Repair from "./components/Repair.vue" import Repair from "./components/Repair.vue"
@@ -335,7 +337,7 @@ import Repair from "./components/Repair.vue"
export default { export default {
name: "Machinery", name: "Machinery",
components: { Treeselect, CheckPlan, Repair }, components: { CheckPlan, Repair },
setup() { setup() {
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { sys_yes_no, mes_machinery_status } = proxy.useDict("sys_yes_no", "mes_machinery_status"); const { sys_yes_no, mes_machinery_status } = proxy.useDict("sys_yes_no", "mes_machinery_status");
@@ -429,9 +431,9 @@ export default {
machineryName: [ machineryName: [
{ required: true, message: "设备名称不能为空", trigger: "blur" } { required: true, message: "设备名称不能为空", trigger: "blur" }
], ],
workshopId: [ // workshopId: [
{ required: true, message: "车间不能为空",trigger: "blur"} // { required: true, message: "车间不能为空",trigger: "blur"}
], // ],
machineryTypeId: [ machineryTypeId: [
{ required: true, message: "设备分类不能为空", trigger: "blur" }, { required: true, message: "设备分类不能为空", trigger: "blur" },
], ],
@@ -524,7 +526,7 @@ export default {
delete node.children; delete node.children;
} }
return { return {
id: node.machineryTypeId, value: node.machineryTypeId,
label: node.machineryTypeName, label: node.machineryTypeName,
children: node.children children: node.children
}; };
@@ -532,10 +534,10 @@ export default {
/** 查询设备类型下拉树结构 */ /** 查询设备类型下拉树结构 */
getTreeselect() { getTreeselect() {
listMachinerytype().then(response => { listMachinerytype().then(response => {
debugger;
this.machineryTypeOptions = []; this.machineryTypeOptions = [];
const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0]; const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0];
this.machineryTypeOptions.push(data); console.log(data);
this.machineryTypeOptions = data.children;
}); });
}, },
// 筛选节点 // 筛选节点
@@ -564,7 +566,7 @@ export default {
machineryTypeId: null, machineryTypeId: null,
machineryTypeCode: null, machineryTypeCode: null,
machineryTypeName: null, machineryTypeName: null,
workshopId: null, workshopId: '1',
workshopCode: null, workshopCode: null,
workshopName: null, workshopName: null,
lastMaintenTime: null, lastMaintenTime: null,
@@ -619,7 +621,6 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
debugger;
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
// this.getWorkshops(); // this.getWorkshops();
@@ -664,7 +665,6 @@ export default {
this.getList(); this.getList();
}); });
} else { } else {
debugger;
addMachinery(this.form).then(response => { addMachinery(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;

53
gear-ui3/src/views/dv/machinerytype/index.vue
View File

@@ -10,7 +10,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="enableFlag"> <el-form-item label="是否启用" prop="enableFlag">
<el-select v-model="queryParams.enableFlag" placeholder="选择是或否" clearable> <el-select v-model="queryParams.enableFlag" style="width: 100px" placeholder="选择是或否" clearable>
<el-option <el-option
v-for="dict in sys_yes_no" v-for="dict in sys_yes_no"
:key="dict.value" :key="dict.value"
@@ -25,6 +25,39 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
size="mini"
@click="handleAdd"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="machinerytypeList" :data="machinerytypeList"
@@ -35,13 +68,13 @@
<el-table-column label="设备类型编码" prop="machineryTypeCode" /> <el-table-column label="设备类型编码" prop="machineryTypeCode" />
<el-table-column label="设备类型名称" align="center" prop="machineryTypeName" /> <el-table-column label="设备类型名称" align="center" prop="machineryTypeName" />
<el-table-column label="是否启用" align="center" prop="enableFlag" > <el-table-column label="是否启用" align="center" prop="enableFlag" >
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="sys_yes_no" :value="scope.row.enableFlag"/> <dict-tag :options="sys_yes_no" :value="scope.row.enableFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -71,7 +104,8 @@
<el-row> <el-row>
<el-col :span="24" v-if="form.parentTypeId !== 0"> <el-col :span="24" v-if="form.parentTypeId !== 0">
<el-form-item label="父类型" prop="parentTypeId"> <el-form-item label="父类型" prop="parentTypeId">
<treeselect v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" /> <!-- <treeselect v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" /> -->
<el-tree-select v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -118,15 +152,15 @@
<script> <script>
import { listMachinerytype, getMachinerytype, delMachinerytype, addMachinerytype, updateMachinerytype } from "@/api/mes/dv/machinerytype"; import { listMachinerytype, getMachinerytype, delMachinerytype, addMachinerytype, updateMachinerytype } from "@/api/mes/dv/machinerytype";
import Treeselect from "@riophae/vue-treeselect"; // import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; // import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "Machinerytype", name: "Machinerytype",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],
components: { // components: {
Treeselect // Treeselect
}, // },
setup() { setup() {
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { sys_yes_no } = proxy.useDict("sys_yes_no"); const { sys_yes_no } = proxy.useDict("sys_yes_no");
@@ -247,6 +281,7 @@ export default {
this.form.parentTypeId = row.machineryTypeId; this.form.parentTypeId = row.machineryTypeId;
} else { } else {
this.form.parentTypeId = 0; this.form.parentTypeId = 0;
this.form.ancestors = 0;
} }
this.open = true; this.open = true;
this.title = "添加设备类型"; this.title = "添加设备类型";

19
gear-ui3/src/views/dv/maintenrecord/index.vue
View File

@@ -86,7 +86,7 @@
<el-table v-loading="loading" :data="maintenrecordList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="maintenrecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="设备编码" align="center" prop="machineryCode" > <el-table-column label="设备编码" align="center" prop="machineryCode" >
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
@@ -98,18 +98,18 @@
<el-table-column label="规格型号" align="center" prop="machinerySpec" /> <el-table-column label="规格型号" align="center" prop="machinerySpec" />
<el-table-column label="计划名称" align="center" prop="planName" /> <el-table-column label="计划名称" align="center" prop="planName" />
<el-table-column label="保养时间" align="center" prop="maintenTime" width="180"> <el-table-column label="保养时间" align="center" prop="maintenTime" width="180">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.maintenTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.maintenTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="保养人" align="center" prop="nickName" /> <el-table-column label="保养人" align="center" prop="nickName" />
<el-table-column label="状态" align="center" prop="status" > <el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="mes_order_status" :value="scope.row.status"/> <dict-tag :options="mes_order_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -222,14 +222,17 @@ import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
import CheckplanSelect from "@/components/dvplanSelect/index.vue"; import CheckplanSelect from "@/components/dvplanSelect/index.vue";
import UserSingleSelect from "@/components/userSelect/single.vue" import UserSingleSelect from "@/components/userSelect/single.vue"
import MaintenRecordLine from "./line.vue" import MaintenRecordLine from "./line.vue"
import useUserStore from '@/store/modules/user'
export default { export default {
name: "Maintenrecord", name: "Maintenrecord",
components: {MachinerySelectSingle, CheckplanSelect, UserSingleSelect, MaintenRecordLine}, components: {MachinerySelectSingle, CheckplanSelect, UserSingleSelect, MaintenRecordLine},
setup() { setup() {
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { mes_order_status } = proxy.useDict("mes_order_status"); const { mes_order_status } = proxy.useDict("mes_order_status");
const userStore = useUserStore();
return { return {
mes_order_status mes_order_status,
userStore
} }
}, },
data() { data() {
@@ -295,9 +298,9 @@ export default {
reset() { reset() {
this.form = { this.form = {
recordId: null, planId: null, planCode: null, planName: null, planType: null, machineryId: null, machineryCode: null, machineryName: null, machineryBrand: null, machinerySpec: null, maintenTime: null, userId: null, userName: null, nickName: null, status: "PREPARE", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null }; recordId: null, planId: null, planCode: null, planName: null, planType: null, machineryId: null, machineryCode: null, machineryName: null, machineryBrand: null, machinerySpec: null, maintenTime: null, userId: null, userName: null, nickName: null, status: "PREPARE", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
this.form.userId= this.$store.state.user.id; this.form.userId= this.userStore.id;
this.form.nickName= this.$store.state.user.nick; this.form.nickName= this.userStore.nickName;
this.form.userName= this.$store.state.user.name; this.form.userName= this.userStore.name;
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */

2
gear-ui3/src/views/dv/maintenrecord/line.vue
View File

@@ -41,7 +41,7 @@
<el-table-column label="保养结果" align="center" prop="maintenStatus" /> <el-table-column label="保养结果" align="center" prop="maintenStatus" />
<el-table-column label="异常描述" align="center" prop="maintenResult" /> <el-table-column label="异常描述" align="center" prop="maintenResult" />
<el-table-column label="操作" align="center" v-if="optType != 'view'" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" v-if="optType != 'view'" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"

12
gear-ui3/src/views/dv/repair/index.vue
View File

@@ -100,34 +100,34 @@
<el-table-column label="设备编码" align="center" prop="machineryCode" /> <el-table-column label="设备编码" align="center" prop="machineryCode" />
<el-table-column label="设备名称" align="center" prop="machineryName" /> <el-table-column label="设备名称" align="center" prop="machineryName" />
<el-table-column label="报修日期" align="center" prop="requireDate" width="120"> <el-table-column label="报修日期" align="center" prop="requireDate" width="120">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.requireDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.requireDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="维修完成日期" align="center" prop="finishDate" width="120"> <el-table-column label="维修完成日期" align="center" prop="finishDate" width="120">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.finishDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.finishDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="验收日期" align="center" prop="confirmDate" width="120"> <el-table-column label="验收日期" align="center" prop="confirmDate" width="120">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="维修结果" align="center" prop="repairResult"> <el-table-column label="维修结果" align="center" prop="repairResult">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="mes_repair_result" :value="scope.row.repairResult"/> <dict-tag :options="mes_repair_result" :value="scope.row.repairResult"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="维修人员" align="center" prop="acceptedBy" /> <el-table-column label="维修人员" align="center" prop="acceptedBy" />
<el-table-column label="验收人员" align="center" prop="confirmBy" /> <el-table-column label="验收人员" align="center" prop="confirmBy" />
<el-table-column label="单据状态" align="center" prop="status"> <el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="mes_order_status" :value="scope.row.status"/> <dict-tag :options="mes_order_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"

4
gear-ui3/src/views/dv/repair/line.vue
View File

@@ -28,7 +28,7 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目名称" align="center" prop="subjectName" /> <el-table-column label="项目名称" align="center" prop="subjectName" />
<el-table-column label="故障描述" align="center" prop="malfunction" > <el-table-column label="故障描述" align="center" prop="malfunction" >
<!-- <template slot-scope="scope">--> <!-- <template #default="scope">-->
<!-- <el-input type="textarea">{{scope.row.malfunction}}</el-input>--> <!-- <el-input type="textarea">{{scope.row.malfunction}}</el-input>-->
<!-- </template>--> <!-- </template>-->
</el-table-column> </el-table-column>
@@ -37,7 +37,7 @@
</el-table-column> </el-table-column>
<el-table-column label="维修情况" align="center" prop="repairDes" /> <el-table-column label="维修情况" align="center" prop="repairDes" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"

14
gear-ui3/src/views/dv/specialEquipment/specialEquipment.vue
View File

@@ -139,17 +139,17 @@
<el-table-column label="规格型号" align="center" prop="specificationModel" /> <el-table-column label="规格型号" align="center" prop="specificationModel" />
<el-table-column label="制造单位" align="center" prop="manufacturer" /> <el-table-column label="制造单位" align="center" prop="manufacturer" />
<!-- <el-table-column label="制造日期" align="center" prop="productionDate" width="98"> <!-- <el-table-column label="制造日期" align="center" prop="productionDate" width="98">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="安装日期" align="center" prop="installationDate" width="98"> <el-table-column label="安装日期" align="center" prop="installationDate" width="98">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.installationDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.installationDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column>--> </el-table-column>-->
<el-table-column label="投入使用日期" align="center" prop="useStartDate" width="98"> <el-table-column label="投入使用日期" align="center" prop="useStartDate" width="98">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.useStartDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.useStartDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -158,23 +158,23 @@
<!-- <el-table-column label="附件路径" align="center" prop="attachment" />--> <!-- <el-table-column label="附件路径" align="center" prop="attachment" />-->
<el-table-column label="检验周期" align="center" prop="inspectionCycle" /> <el-table-column label="检验周期" align="center" prop="inspectionCycle" />
<el-table-column label="上次检验时间" align="center" prop="lastInspectionTime" width="98"> <el-table-column label="上次检验时间" align="center" prop="lastInspectionTime" width="98">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.lastInspectionTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.lastInspectionTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="下次检验时间" align="center" prop="nextInspectionTime" width="98"> <!-- <el-table-column label="下次检验时间" align="center" prop="nextInspectionTime" width="98">
<template slot-scope="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.nextInspectionTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.nextInspectionTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column>--> </el-table-column>-->
<el-table-column label="当前状态" align="center" prop="currentStatus"> <el-table-column label="当前状态" align="center" prop="currentStatus">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="special_equipment_type" :value="scope.row.currentStatus"/> <dict-tag :options="special_equipment_type" :value="scope.row.currentStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"

6
gear-ui3/src/views/dv/subject/index.vue
View File

@@ -79,7 +79,7 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目编码" align="center" prop="subjectCode" /> <el-table-column label="项目编码" align="center" prop="subjectCode" />
<el-table-column label="项目类型" align="center" prop="subjectType"> <el-table-column label="项目类型" align="center" prop="subjectType">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="mes_dvsubject_type" :value="scope.row.subjectType"/> <dict-tag :options="mes_dvsubject_type" :value="scope.row.subjectType"/>
</template> </template>
</el-table-column> </el-table-column>
@@ -87,13 +87,13 @@
<el-table-column label="项目内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/> <el-table-column label="项目内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
<el-table-column label="标准" align="center" prop="subjectStandard" :show-overflow-tooltip="true"/> <el-table-column label="标准" align="center" prop="subjectStandard" :show-overflow-tooltip="true"/>
<el-table-column label="是否启用" align="center" prop="enableFlag"> <el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope"> <template #default="scope">
<dict-tag :options="sys_yes_no" :value="scope.row.enableFlag"/> <dict-tag :options="sys_yes_no" :value="scope.row.enableFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template #default="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"