From 6a2eb659b46f279fb87cfc0ee470e661315ffc54 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 22 三月 2024 10:06:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue | 35 ++
src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue | 39 +++
src/views/eam/modules/maintenancePlan/DailyMaintenanceStandardDetail.vue | 74 +++---
src/views/eam/modules/maintenancePlan/StandardSelect.vue | 62 ++++
src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue | 66 +++++
src/views/eam/EquipmentMaintenancePlanList.vue | 39 +++
src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue | 6
src/views/eam/Daily3MaintenanceOrderList.vue | 12
src/views/eam/EquipmentMaintenancePlanDetailList.vue | 319 +++++++++++++++-----------
src/views/eam/modules/malfunctionRepair/AcceptModel.vue | 21 +
10 files changed, 478 insertions(+), 195 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index fe515cf..2d5a16a 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -579,12 +579,12 @@
// align: "center",
// dataIndex: 'workingHourQuota'
// },
- // {
- // title: '璁″垝寮�濮嬫椂闂�',
- // align: "center",
- // dataIndex: 'planStartTime',
- // //width: '120px',
- // },
+ {
+ title: '璁″垝寮�濮嬫椂闂�',
+ align: "center",
+ dataIndex: 'planStartTime',
+ //width: '120px',
+ },
// {
// title: '璁″垝缁撴潫鏃堕棿',
// align: "center",
diff --git a/src/views/eam/EquipmentMaintenancePlanDetailList.vue b/src/views/eam/EquipmentMaintenancePlanDetailList.vue
index 4b92518..01051f5 100644
--- a/src/views/eam/EquipmentMaintenancePlanDetailList.vue
+++ b/src/views/eam/EquipmentMaintenancePlanDetailList.vue
@@ -1,8 +1,14 @@
<template>
- <a-card :bordered="false" :class="'cust-erp-sub-tab'">
+ <a-card
+ :bordered="false"
+ :class="'cust-erp-sub-tab'"
+ >
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
+ >
<a-row :gutter="24">
</a-row>
</a-form>
@@ -10,7 +16,10 @@
<!-- 鏌ヨ鍖哄煙-END -->
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator" v-if="mainId">
+ <div
+ class="table-operator"
+ v-if="mainId"
+ >
<!-- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
@@ -22,9 +31,15 @@
<!-- table鍖哄煙-begin -->
<div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <div
+ class="ant-alert ant-alert-info"
+ style="margin-bottom: 16px;"
+ >
<i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
- <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ <a
+ style="margin-left: 24px"
+ @click="onClearSelected"
+ >娓呯┖</a>
</div>
<a-table
@@ -38,34 +53,64 @@
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange">
+ @change="handleTableChange"
+ >
- <template slot="htmlSlot" slot-scope="text">
+ <template
+ slot="htmlSlot"
+ slot-scope="text"
+ >
<div v-html="text"></div>
</template>
- <template slot="imgSlot" slot-scope="text,record">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ <template
+ slot="imgSlot"
+ slot-scope="text,record"
+ >
+ <span
+ v-if="!text"
+ style="font-size: 12px;font-style: italic;"
+ >鏃犲浘鐗�</span>
+ <img
+ v-else
+ :src="getImgView(text)"
+ :preview="record.id"
+ height="25px"
+ alt=""
+ style="max-width:80px;font-size: 12px;font-style: italic;"
+ />
</template>
- <template slot="fileSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <template
+ slot="fileSlot"
+ slot-scope="text"
+ >
+ <span
+ v-if="!text"
+ style="font-size: 12px;font-style: italic;"
+ >鏃犳枃浠�</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
- @click="downloadFile(text)">
+ @click="downloadFile(text)"
+ >
涓嬭浇
</a-button>
</template>
- <span slot="action" slot-scope="text, record">
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
<!-- <a-divider type="vertical" />
<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
<a>鍒犻櫎</a>
</a-popconfirm> -->
- <a @click="handleEdit(record)" :disabled="mainStatus!=='distributed'">璁″垝鍙樻洿</a>
+ <a
+ @click="handleEdit(record)"
+ :disabled="mainStatus!=='distributed'"
+ >璁″垝鍙樻洿</a>
</span>
<span
slot="num"
@@ -78,139 +123,145 @@
</span>
</a-table>
</div>
- <standard-detail-model :mainId="standardId" ref="standardDetail"></standard-detail-model>
- <maintenance-plan-change-model ref="modalForm" @ok="modalFormOk"></maintenance-plan-change-model>
+ <standard-detail-model
+ :mainId="standardId"
+ ref="standardDetail"
+ ></standard-detail-model>
+ <maintenance-plan-change-model
+ ref="modalForm"
+ @ok="modalFormOk"
+ ></maintenance-plan-change-model>
</a-card>
</template>
<script>
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import StandardDetailModel from './modules/maintenancePlan/StandardDetailModel'
- import MaintenancePlanChangeModel from './modules/maintenancePlan/MaintenancePlanChangeModel.vue'
- export default {
- name: "EquipmentMaintenancePlanDetailList",
- mixins:[JeecgListMixin],
- components: {StandardDetailModel, MaintenancePlanChangeModel},
- props:{
- mainId:{
- type:String,
- default:'',
- required:false
- },
- mainStatus:{
- type:String,
- default:'',
- required:false
- }
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import StandardDetailModel from './modules/maintenancePlan/StandardDetailModel'
+import MaintenancePlanChangeModel from './modules/maintenancePlan/MaintenancePlanChangeModel.vue'
+export default {
+ name: "EquipmentMaintenancePlanDetailList",
+ mixins: [JeecgListMixin],
+ components: { StandardDetailModel, MaintenancePlanChangeModel },
+ props: {
+ mainId: {
+ type: String,
+ default: '',
+ required: false
},
- watch:{
- mainId:{
- immediate: true,
- handler(val) {
- if(!this.mainId){
- this.clearList()
- }else{
- this.queryParam['planId'] = val
- this.loadData(1);
- }
+ mainStatus: {
+ type: String,
+ default: '',
+ required: false
+ }
+ },
+ watch: {
+ mainId: {
+ immediate: true,
+ handler(val) {
+ if (!this.mainId) {
+ this.clearList()
+ } else {
+ this.queryParam['planId'] = val
+ this.loadData(1);
}
}
- },
- data () {
- return {
- description: '淇濆吇璁″垝绠＄悊椤甸潰',
- disableMixinCreated:true,
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:45,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title:'淇濆吇鏍囧噯',
- align:"center",
- dataIndex: 'standardNum',
- width:250,
- scopedSlots: { customRender: 'num' }
- },
- {
- title:'璁惧缁熶竴缂栫爜',
- align:"center",
- dataIndex: 'equipmentNum',
- width:250,
- },
- {
- title:'璁惧鍚嶇О',
- align:"center",
- dataIndex: 'equipmentName',
- width:250,
- },
- {
- title:'璁惧鍨嬪彿',
- align:"center",
- dataIndex: 'model',
- width:250,
- },
- {
- title:'璁″垝寮�濮嬫椂闂�',
- align:"center",
- dataIndex: 'planStartTime',
- width:280,
- },
- {
- title:'璁″垝缁撴潫鏃堕棿',
- align:"center",
- dataIndex: 'planEndTime',
- width:280,
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:200,
- scopedSlots: { customRender: 'action' },
+ }
+ },
+ data() {
+ return {
+ description: '淇濆吇璁″垝绠＄悊椤甸潰',
+ disableMixinCreated: true,
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 45,
+ align: "center",
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1;
}
- ],
- url: {
- list: "/eam/equipmentMaintenancePlan/listEquipmentMaintenancePlanDetailByMainId",
- delete: "/eam/equipmentMaintenancePlan/deleteEquipmentMaintenancePlanDetail",
- deleteBatch: "/eam/equipmentMaintenancePlan/deleteBatchEquipmentMaintenancePlanDetail",
- exportXlsUrl: "/eam/equipmentMaintenancePlan/exportEquipmentMaintenancePlanDetail",
- importUrl: "/eam/equipmentMaintenancePlan/importEquipmentMaintenancePlanDetail",
},
- dictOptions:{
+ {
+ title: '淇濆吇鏍囧噯',
+ align: "center",
+ dataIndex: 'standardNum',
+ width: 250,
},
- standardId:''
- }
- },
- created() {
- },
- computed: {
- importExcelUrl(){
- return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
- }
- },
- methods: {
- clearList(){
- this.dataSource=[]
- this.selectedRowKeys=[]
- this.ipagination.current = 1
+ // scopedSlots: { customRender: 'num' }
+ {
+ title: '璁惧缁熶竴缂栫爜',
+ align: "center",
+ dataIndex: 'equipmentNum',
+ width: 250,
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: "center",
+ dataIndex: 'equipmentName',
+ width: 250,
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ align: "center",
+ dataIndex: 'model',
+ width: 250,
+ },
+ {
+ title: '璁″垝寮�濮嬫椂闂�',
+ align: "center",
+ dataIndex: 'planStartTime',
+ width: 280,
+ },
+ {
+ title: '璁″垝缁撴潫鏃堕棿',
+ align: "center",
+ dataIndex: 'planEndTime',
+ width: 280,
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: "center",
+ fixed: "right",
+ width: 200,
+ scopedSlots: { customRender: 'action' },
+ }
+ ],
+ url: {
+ list: "/eam/equipmentMaintenancePlan/listEquipmentMaintenancePlanDetailByMainId",
+ delete: "/eam/equipmentMaintenancePlan/deleteEquipmentMaintenancePlanDetail",
+ deleteBatch: "/eam/equipmentMaintenancePlan/deleteBatchEquipmentMaintenancePlanDetail",
+ exportXlsUrl: "/eam/equipmentMaintenancePlan/exportEquipmentMaintenancePlanDetail",
+ importUrl: "/eam/equipmentMaintenancePlan/importEquipmentMaintenancePlanDetail",
},
- handleShowDetail(record){
- this.standardId = record.standardId
- this.$refs.standardDetail.visible = true;
- }
+ dictOptions: {
+ },
+ standardId: ''
+ }
+ },
+ created() {
+ },
+ computed: {
+ importExcelUrl() {
+ return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+ }
+ },
+ methods: {
+ clearList() {
+ this.dataSource = []
+ this.selectedRowKeys = []
+ this.ipagination.current = 1
+ },
+ handleShowDetail(record) {
+ this.standardId = record.standardId
+ this.$refs.standardDetail.visible = true;
}
}
+}
</script>
<style scoped>
- @import '~@assets/less/common.less'
+@import '~@assets/less/common.less';
</style>
diff --git a/src/views/eam/EquipmentMaintenancePlanList.vue b/src/views/eam/EquipmentMaintenancePlanList.vue
index 5d10f17..0b94b4a 100644
--- a/src/views/eam/EquipmentMaintenancePlanList.vue
+++ b/src/views/eam/EquipmentMaintenancePlanList.vue
@@ -23,6 +23,23 @@
></j-input>
</a-form-item>
</a-col>
+ <!-- 鎸夊垱寤烘椂闂磋寖鍥存绱� -->
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24">
+ <a-form-item label="鍒涘缓鏃堕棿">
+ <a-range-picker
+ v-model="ranges"
+ style="width:100%"
+ format="YYYY-MM-DD HH:mm:ss"
+ showTime
+ placeholder="璇烽�夋嫨鍒涘缓鏃堕棿"
+ @change="changeDate"
+ />
+ </a-form-item>
+ </a-col>
<a-col
:xl="6"
:lg="7"
@@ -37,6 +54,8 @@
/>
</a-form-item>
</a-col>
+
+
<a-col
:xl="6"
:lg="7"
@@ -267,6 +286,7 @@
data() {
return {
description: '淇濆吇璁″垝绠＄悊椤甸潰',
+ ranges:[],
// 琛ㄥご
columns: [
{
@@ -383,6 +403,11 @@
this.equipmentMaintenancePlanDetailMainId = selectionRows[0]['id']
this.mainStatus = selectionRows[0]['status']
},
+ searchReset() {
+ this.queryParam = {}
+ this.ranges = []
+ this.loadData()
+ },
loadData(arg) {
if (!this.url.list) {
this.$message.error("璇疯缃畊rl.list灞炴��!")
@@ -466,7 +491,19 @@
}).finally(res => {
this.loadData();
})
- }
+ },
+ // 灏唕anges杞寲涓哄紑濮嬫椂闂村拰缁撴潫鏃堕棿
+ changeDate() {
+ if (this.ranges.length === 0) {
+ this.queryParam.beginTime = ''
+ this.queryParam.endTime = ''
+ } else {
+ //鍚庣鎶ヨ繖涓敊rejected value ["2024-03-14T06:26:38.692Z"]
+ this.queryParam.beginTime = this.ranges[0].format('YYYY-MM-DD')
+ this.queryParam.endTime = this.ranges[1].format('YYYY-MM-DD')
+ }
+ },
+
}
}
</script>
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
index 627783b..fe0f077 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
@@ -197,8 +197,7 @@
<a-input v-model="model.sparePart" />
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
+
<a-col :span="12">
<a-form-item
:labelCol="{ span: 8 }"
@@ -213,7 +212,10 @@
/>
</a-form-item>
</a-col>
- <a-col :span="12">
+ </a-row>
+ <a-row :gutter="24">
+
+ <!-- <a-col :span="12">
<a-form-item
:labelCol="{ span: 8 }"
:wrapperCol="{ span: 4 }"
@@ -225,6 +227,35 @@
@change="handle5Switch(model.meetProcessRequire)"
:checked="model.meetProcessRequire == '1'"
/>
+ </a-form-item>
+ </a-col> -->
+ <a-col :span="12">
+ <a-form-item
+ style="font-size: large;font-style: normal;font-size: 15px;"
+ :labelCol="{ span: 8 }"
+ :wrapperCol="{ span: 12 }"
+ label="鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰"
+ >
+ <j-dict-select-tag
+ style="font-size: large;font-style: normal;font-size: 15px;width: 100%"
+ allow-clear
+ :triggerChange="true"
+ dictCode="meet_process_require"
+ v-model="model.meetProcessRequire"
+ />
+
+ </a-form-item>
+ </a-col>
+ <a-col
+ v-if="model.meetProcessRequire =='3'"
+ :span="12"
+ >
+ <a-form-item
+ :labelCol="{ span: 8 }"
+ :wrapperCol="{ span: 12 }"
+ label="鑷畾涔夎鏄庯細"
+ >
+ <a-input v-model="model.meetProcessRequireRemark" />
</a-form-item>
</a-col>
</a-row>
@@ -377,6 +408,7 @@
dataSource: [],
model: {},
departs: [],
+
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
@@ -488,6 +520,7 @@
if (res.success) {
this.dataSource = res.result[0].precisionInspectionDetails
this.model = Object.assign(this.model, res.result[0]);
+ this.model = Object.assign({}, this.model);
}
})
},
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
index a9d7d6a..64de24a 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
@@ -104,8 +104,9 @@
<a-select-option value="2">鏈�氳繃</a-select-option>
</a-select>
<a-input
- v-if="col.dataIndex == 'firstInspect'"
- @change="(e)=>handleChange(e, record.key, col, index)"
+ v-if="col.dataIndex == 'firstInspect' && record.firstInspect == '2'"
+ :value="record.firstNotPass"
+ @change="(e)=>handleChange2(e, record.key, col, index)"
:disabled="false"
placeholder="璇峰～鍐欓獙鏀舵湭閫氳繃鍘熷洜"
/>
@@ -118,7 +119,13 @@
<a-select-option value="1">閫氳繃</a-select-option>
<a-select-option value="2">鏈�氳繃</a-select-option>
</a-select>
-
+ <!-- <a-input
+ v-if="col.dataIndex == 'secondInspect' && record.secondInspect == '2'"
+ :value="record.secondNotPass"
+ @change="(e)=>handleChange2(e, record.key, col, index)"
+ :disabled="false"
+ placeholder="璇峰～鍐欓獙鏀舵湭閫氳繃鍘熷洜"
+ /> -->
</div>
</template>
</a-table>
@@ -383,6 +390,7 @@
},
handleChange(value, key, column, index) {
+ debugger
let that = this;
const temp = [...that.dataSource];
const target = temp.filter(item => key === item.key)[index];
@@ -397,7 +405,8 @@
target['standard'] = value.target.value;
}
if (column.dataIndex == 'firstInspect') {
- target[column.dataIndex] = value;
+ debugger
+ target["firstInspect"] = value;
}
if (column.dataIndex == 'secondInspect') {
target[column.dataIndex] = value;
@@ -407,6 +416,24 @@
}
},
+ handleChange2(value, key, column, index, record) {
+ let that = this;
+ const temp = [...that.dataSource];
+ const target = temp.filter(item => key === item.key)[index];
+ if (target) {
+ // target[column.dataIndex] = value;
+ if ('firstInspect' == column.dataIndex) {
+ target['firstNotPass'] = value.target.value;
+ }
+ // if ('secondInspect' == column.dataIndex) {
+ // target['secondNotPass'] = value.target.value;
+ // }
+
+ //鏄剧ず甯﹁繃鏉ョ殑鏁版嵁
+ that.dataSource = temp;
+ }
+ },
+
getSysFileName() {
getAction(this.url.getSysFileName, { name: '19' }).then((res) => {
if (res.success) {
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue b/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
index 2b4b448..e7eb44d 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
@@ -531,7 +531,8 @@
add: "/eam/dailyMaintenanceOrder/add",
edit: "/eam/dailyMaintenanceOrder/edit",
getCycleByStandardId: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
- getMaintenanceProjectList: "/eam/dailyMaintenanceOrder/getMaintenanceProjectId",
+ // getMaintenanceProjectList: "/eam/dailyMaintenanceOrder/getMaintenanceProjectId",
+ getMaintenanceProjectList: "/eam/calibrationOrder/getTwoMaintenancePlanList",
getSysDeparts: "/eam/dailyMaintenanceOrder/getSysDeparts",
list: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
getNum: '/eam/sysIdentity/getNumNew'
@@ -682,7 +683,8 @@
handle3Change(val) {
let data = this.form.getFieldsValue(['maintenanceStandardId']);
- getAction(this.url.getMaintenanceProjectList, { maintenanceStandardId: data.maintenanceStandardId, maintenanceCycleId: val }).then((res) => {
+ // getAction(this.url.getMaintenanceProjectList, { maintenanceStandardId: data.maintenanceStandardId, maintenanceCycleId: val }).then((res) => {
+ getAction(this.url.getMaintenanceProjectList).then((res) => {
if (res.success) {
this.dataSource = res.result;
if (res.result.length == 0) {
diff --git a/src/views/eam/modules/maintenancePlan/DailyMaintenanceStandardDetail.vue b/src/views/eam/modules/maintenancePlan/DailyMaintenanceStandardDetail.vue
index 04431af..df50131 100644
--- a/src/views/eam/modules/maintenancePlan/DailyMaintenanceStandardDetail.vue
+++ b/src/views/eam/modules/maintenancePlan/DailyMaintenanceStandardDetail.vue
@@ -129,19 +129,19 @@
return parseInt(index) + 1;
}
},
- {
- title: '閮ㄤ綅',
- align: "center",
- dataIndex: 'location',
- width: 150,
- },
- {
- title: '绀烘剰鍥�',
- align: "center",
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- width: 150,
- },
+ // {
+ // title: '閮ㄤ綅',
+ // align: "center",
+ // dataIndex: 'location',
+ // width: 150,
+ // },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: "center",
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // width: 150,
+ // },
{
title: '淇濆吇椤圭洰',
align: "center",
@@ -155,31 +155,31 @@
dataIndex: 'standard',
width: 150,
},
- {
- title: '鏂规硶',
- align: "center",
- dataIndex: 'maintenanceMethodName',
- width: 150,
+ // {
+ // title: '鏂规硶',
+ // align: "center",
+ // dataIndex: 'maintenanceMethodName',
+ // width: 150,
- },
- {
- title: '宸ュ叿',
- align: "center",
- dataIndex: 'maintenanceTool',
- width: 150,
- },
- {
- title: '瀹夊叏瑕佹眰',
- align: "center",
- dataIndex: 'maintenanceRequire',
- width: 150,
- },
- {
- title: '宸ユ椂瀹氶',
- align: "center",
- dataIndex: 'workingHourQuota',
- width: 150,
- },
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: "center",
+ // dataIndex: 'maintenanceTool',
+ // width: 150,
+ // },
+ // {
+ // title: '瀹夊叏瑕佹眰',
+ // align: "center",
+ // dataIndex: 'maintenanceRequire',
+ // width: 150,
+ // },
+ // {
+ // title: '宸ユ椂瀹氶',
+ // align: "center",
+ // dataIndex: 'workingHourQuota',
+ // width: 150,
+ // },
{
title: '淇濆吇鍛ㄦ湡',
align: "center",
diff --git a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
index af9b878..4dbe70c 100644
--- a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
+++ b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
@@ -22,6 +22,26 @@
></a-input>
</a-form-model-item>
</a-col>
+ <!-- 閫夋嫨妗嗛�夐」涓�0锛氭墍鏈夎澶� 1锛氶儴鍒嗚澶� -->
+ <a-col :span="12">
+ <a-form-model-item
+ label="淇濆吇璁惧閫夋嫨"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="selectOption"
+ >
+ <a-select
+ v-model="model.selectOption"
+ placeholder="璇烽�夋嫨淇濆吇璁惧"
+ >
+ <a-select-option
+ v-for="item in selectOptions"
+ :key="item.value"
+ :value="item.value"
+ >{{item.label}}</a-select-option>
+ </a-select>
+ </a-form-model-item>
+ </a-col>
<a-col :span="12">
<a-form-model-item
label="璁″垝鍗曠被鍨�"
@@ -36,6 +56,24 @@
dictCode="maintenance_type"
v-model="model.type"
@change="(e)=>handleClearTable(e)"
+ />
+ </a-form-model-item>
+ </a-col>
+ <!-- 璁″垝寮�濮嬫椂闂达紝璁″垝缁撴潫鏃堕棿 -->
+ <a-col :span="12">
+ <a-form-model-item
+ label="璁″垝鏃堕棿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="ranges"
+ >
+ <a-range-picker
+ v-model="model.ranges"
+ style="width:100%"
+ format="YYYY-MM-DD HH:mm:ss"
+ showTime
+ :placeholder="[ '璁″垝寮�濮嬫椂闂�', '璁″垝缁撴潫鏃堕棿']"
+ @change="changeDate"
/>
</a-form-model-item>
</a-col>
@@ -71,7 +109,7 @@
<a-button
type='primary'
@click='standardSelect'
- :disabled="formDisabled||model.type===null||model.type===undefined||model.type===''"
+ :disabled="formDisabled||model.type===null||model.type===undefined||model.type===''||model.selectOption!=='1'"
icon="plus"
>璁惧-淇濆吇鏍囧噯
</a-button>
@@ -109,6 +147,11 @@
},
data() {
return {
+ ranges: [],
+ selectOptions: [
+ { label: '鎵�鏈夎澶�', value: '0' },
+ { label: '閮ㄥ垎璁惧', value: '1' }
+ ],
toolbarConfig: {
// prefix 鍓嶇紑锛泂uffix 鍚庣紑
slot: ['prefix', 'suffix'],
@@ -135,6 +178,12 @@
],
type: [
{ required: true, message: '璇烽�夋嫨璁″垝鍗曠被鍨�!' },
+ ],
+ selectOption: [
+ { required: true, message: '璇烽�夋嫨淇濆吇璁惧!' },
+ ],
+ ranges: [
+ { required: true, message: '璇烽�夋嫨璁″垝鏃堕棿!' },
],
},
refKeys: ['equipmentMaintenancePlanDetail',],
@@ -321,7 +370,7 @@
let ids = []
let tableData = this.$refs.equipmentMaintenancePlanDetail.getTableData()
for (let i = 0; i < tableData.length; i++) {
- ids.push(tableData[i].standardId)
+ ids.push(tableData[i].equipmentId)
}
this.$refs.standardSelectModel.showModal(ids)
this.$refs.standardSelectModel.title = '閫夋嫨璁惧'
@@ -335,8 +384,10 @@
var equipmentMaintenancePlanDetail = {}
if (tableStr.indexOf(data[i].id) == -1) {
equipmentMaintenancePlanDetail = {
+ id: data[i].id,
standardId: data[i].id,
standardNum: data[i].num,
+ equipmentId: data[i].equipmentId,
equipmentNum: data[i].equipmentNum,
equipmentName: data[i].equipmentName,
model: data[i].equipmentModel,
@@ -376,6 +427,17 @@
}
})
},
+ //涓昏〃璁″垝寮�濮嬫椂闂村拰璁″垝缁撴潫鏃堕棿鍙橈紝瀛愯〃璁″垝寮�濮嬫椂闂村拰璁″垝缁撴潫鏃堕棿涔熷彉
+ changeDate(date, dateString) {
+ this.model.beginTime = dateString[0];
+ this.model.endTime = dateString[1];
+ let tableData = this.$refs.equipmentMaintenancePlanDetail.getTableData()
+ for (let i = 0; i < tableData.length; i++) {
+ let row = this.$refs.equipmentMaintenancePlanDetail.getRowById(tableData[i].standardId);
+ row.planStartTime = dateString[0]
+ row.planEndTime = dateString[1]
+ }
+ },
handleClearTable(e) {
this.equipmentMaintenancePlanDetailTable.dataSource = []
diff --git a/src/views/eam/modules/maintenancePlan/StandardSelect.vue b/src/views/eam/modules/maintenancePlan/StandardSelect.vue
index 0f3e8a3..59a841e 100644
--- a/src/views/eam/modules/maintenancePlan/StandardSelect.vue
+++ b/src/views/eam/modules/maintenancePlan/StandardSelect.vue
@@ -8,7 +8,7 @@
@cancel="close"
style="top:50px"
cancelText="鍏抽棴"
- :width="1500"
+ :width="2000"
>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
@@ -18,7 +18,7 @@
>
<a-row :gutter="24">
<a-col
- :md="8"
+ :md="6"
:sm="6"
>
<a-form-item label="缁熶竴缂栫爜">
@@ -29,7 +29,7 @@
</a-form-item>
</a-col>
<a-col
- :md="8"
+ :md="6"
:sm="6"
>
<a-form-item label="璁惧鍚嶇О">
@@ -39,6 +39,39 @@
/>
</a-form-item>
</a-col>
+ <!-- 鎸変腑蹇冩煡璇� -->
+ <a-col
+ :md="6"
+ :sm="6" >
+ <a-form-item label="涓績">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨涓績"
+ :triggerChange="true"
+ dictCode="mom_base_area,name,id,del_flag!='1' and type='1'"
+ v-model="queryParam.workCenterId"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6">
+ <a-form-model-item
+ label="涓嬫涓変繚鏃堕棿"
+ prop="ranges"
+ >
+ <a-range-picker
+ v-model="ranges"
+ style="width:100%"
+ format="YYYY-MM-DD HH:mm:ss"
+ showTime
+ :placeholder="[ '寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
+ @change="changeDate"
+ />
+ </a-form-model-item>
+ </a-col>
+
+
<a-col :md="3">
<span
style="float: left;overflow: hidden;"
@@ -98,6 +131,7 @@
return {
queryParam: {
},
+ ranges: [],
columns: [
{
title: '#',
@@ -157,6 +191,20 @@
dataIndex: 'technologyStatus_dictText',
width: 100
},
+ //涓嬫涓変繚鏃堕棿
+ {
+ title: '涓嬫涓変繚鏃堕棿',
+ align: 'center',
+ dataIndex: 'nextThirdMaintenanceTime',
+ width: 200
+ },
+ //涓績
+ {
+ title: '涓績',
+ align: 'center',
+ dataIndex: 'workCenterId_dictText',
+ width: 200
+ },
],
selectedRowKeys: [],
oldSlelectRows: [],
@@ -183,7 +231,7 @@
visible: false,
loading: false,
url: {
- list: '/eam/equipment/showEquipmentList',
+ list: '/eam/equipment/planEquipmentList',
getStandards: '/eam/equipmentMaintenancePlan/getStandards'
},
}
@@ -263,9 +311,11 @@
searchReset(num) {
let that = this;
this.queryParam = [];
+ this.ranges = [];
if (num !== 0) {
that.loadData(1);
}
+
that.selectborrowIds = [];
},
close() {
@@ -309,6 +359,10 @@
},
+ changeDate(date, dateString) {
+ this.queryParam.startTime = dateString[0].format('YYYY-MM-DD HH:mm:ss');
+ this.queryParam.endTime = dateString[1].format('YYYY-MM-DD HH:mm:ss');
+ },
onSelectChange(selectionRows) {
this.selectionRows = selectionRows;
},
diff --git a/src/views/eam/modules/malfunctionRepair/AcceptModel.vue b/src/views/eam/modules/malfunctionRepair/AcceptModel.vue
index e9674f0..d392958 100644
--- a/src/views/eam/modules/malfunctionRepair/AcceptModel.vue
+++ b/src/views/eam/modules/malfunctionRepair/AcceptModel.vue
@@ -27,9 +27,23 @@
</a-input>
</a-form-model-item>
</a-col>
+ <!-- 楠屾敹鎰忚涓�1锛氬悓鎰� 锛�2锛氶┏浼� -->
<a-col :span="24">
<a-form-model-item
label="楠屾敹鎰忚"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="errUda4"
+ >
+ <a-radio-group v-model="model.errUda4">
+ <a-radio value="1">鍚屾剰</a-radio>
+ <a-radio value="2">椹冲洖</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item
+ label="鎰忚"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="errUda5"
@@ -37,7 +51,7 @@
<a-textarea
v-model="model.errUda5"
rows="4"
- placeholder="楠屾敹鎰忚"
+ placeholder="鎰忚"
/>
</a-form-model-item>
</a-col>
@@ -92,13 +106,16 @@
confirmLoading: false,
validatorRules: {
errUda5: [
- { required: true, message: "璇疯緭鍏ラ獙鏀舵剰瑙�" },
+ { required: true, message: "璇疯緭鍏ユ剰瑙�" },
{ min: 0, max: 100, message: '闀垮害涓嶈秴杩� 100 涓瓧绗�' },
],
errUda3: [
{ required: true, message: "璇疯緭鍏ュ悕绉�" },
{ min: 0, max: 10, message: '鍚嶇О涓嶈秴杩� 10 涓瓧绗�' },
],
+ errUda4: [
+ { required: true, message: "璇烽�夋嫨楠屾敹鎰忚" },
+ ],
},
url: {
accept: "/eam/equipmentReportRepair/accept",
--
Gitblit v1.9.3