From ddd7e6f6c57c2f39305e94a74650e28bbf31f9e7 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 12 三月 2024 16:24:29 +0800
Subject: [PATCH] 问题项修改
---
src/views/eam/EquipmentListOfFilesCarousel.vue | 15
src/views/eam/EquipmentListOfPressureVessel.vue | 15
src/views/eam/EquipmentListOfTester.vue | 15
src/views/eam/EquipmentListOfProduct.vue | 15
src/views/eam/EquipmentListOfTruck.vue | 15
src/views/eam/EquipmentListOfEnvProEquipment.vue | 15
src/views/eam/EquipmentListOfCrane.vue | 15
src/views/eam/EquipmentListOfAll.vue | 16
src/views/eam/EquipmentListOfRide.vue | 15
src/views/eam/EquipmentListOfWeldingMachine.vue | 15
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 63 ++-
src/views/eam/EquipmentListOfMetrological.vue | 15
src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue | 19
src/views/eam/FaultInfoList.vue | 755 +++++++++++++++++++++----------------------
14 files changed, 593 insertions(+), 410 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index c2a2ca1..b1edc06 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -248,6 +248,22 @@
></j-date>
</a-form-model-item>
</a-col>
+ <!-- 鎸夌淮淇彮缁勬绱� -->
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/EquipmentListOfCrane.vue b/src/views/eam/EquipmentListOfCrane.vue
index 7ae791e..3bc8dd3 100644
--- a/src/views/eam/EquipmentListOfCrane.vue
+++ b/src/views/eam/EquipmentListOfCrane.vue
@@ -215,6 +215,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/EquipmentListOfEnvProEquipment.vue b/src/views/eam/EquipmentListOfEnvProEquipment.vue
index 8123347..4d9db75 100644
--- a/src/views/eam/EquipmentListOfEnvProEquipment.vue
+++ b/src/views/eam/EquipmentListOfEnvProEquipment.vue
@@ -230,6 +230,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index 698a4d8..6663501 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -230,6 +230,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/EquipmentListOfMetrological.vue b/src/views/eam/EquipmentListOfMetrological.vue
index 71c665d..0cff59c 100644
--- a/src/views/eam/EquipmentListOfMetrological.vue
+++ b/src/views/eam/EquipmentListOfMetrological.vue
@@ -230,6 +230,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/EquipmentListOfPressureVessel.vue b/src/views/eam/EquipmentListOfPressureVessel.vue
index dd9729f..789cf8e 100644
--- a/src/views/eam/EquipmentListOfPressureVessel.vue
+++ b/src/views/eam/EquipmentListOfPressureVessel.vue
@@ -230,6 +230,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/EquipmentListOfProduct.vue b/src/views/eam/EquipmentListOfProduct.vue
index b2b21bc..c6747e3 100644
--- a/src/views/eam/EquipmentListOfProduct.vue
+++ b/src/views/eam/EquipmentListOfProduct.vue
@@ -230,6 +230,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/EquipmentListOfRide.vue b/src/views/eam/EquipmentListOfRide.vue
index d955b25..810f4c8 100644
--- a/src/views/eam/EquipmentListOfRide.vue
+++ b/src/views/eam/EquipmentListOfRide.vue
@@ -230,6 +230,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index 675006b..32bf370 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -230,6 +230,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/EquipmentListOfTruck.vue b/src/views/eam/EquipmentListOfTruck.vue
index 63c687c..0a8ee53 100644
--- a/src/views/eam/EquipmentListOfTruck.vue
+++ b/src/views/eam/EquipmentListOfTruck.vue
@@ -230,6 +230,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/EquipmentListOfWeldingMachine.vue b/src/views/eam/EquipmentListOfWeldingMachine.vue
index 734e51c..babd213 100644
--- a/src/views/eam/EquipmentListOfWeldingMachine.vue
+++ b/src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -230,6 +230,21 @@
></j-date>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag!='1'"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</div>
diff --git a/src/views/eam/FaultInfoList.vue b/src/views/eam/FaultInfoList.vue
index da26492..71d38ce 100644
--- a/src/views/eam/FaultInfoList.vue
+++ b/src/views/eam/FaultInfoList.vue
@@ -1,14 +1,8 @@
<template>
- <a-card
- title="璁惧浜嬫晠鐧昏琛�"
- :bordered="false"
- >
+ <a-card :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
<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-col
:xl='6'
@@ -47,16 +41,16 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button
- type='primary'
- @click='searchQuery'
- icon='search'
- >鏌ヨ</a-button>
- <a-button
- type='primary'
- @click='searchReset'
- icon='reload'
- style='margin-left: 8px'
- >閲嶇疆</a-button>
+ type='primary'
+ @click='searchQuery'
+ icon='search'
+ >鏌ヨ</a-button>
+ <a-button
+ type='primary'
+ @click='searchReset'
+ icon='reload'
+ style='margin-left: 8px'
+ >閲嶇疆</a-button>
<!-- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('璁惧浜嬫晠鐧昏')">瀵煎嚭</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
@@ -74,15 +68,9 @@
<!-- 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
@@ -97,400 +85,399 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
- @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"
- >
- <a
- @click="handleEdit(record)"
- v-if="record.isConfirm!=='yes'"
- v-has="'fault:update'"
- >褰曞叆</a>
-
- <a-divider type="vertical" />
- <a @click="handleDetail(record)">璇︽儏</a>
- <a-divider type="vertical" />
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)" v-if="record.isConfirm=='no'" v-has="'fault:update'">褰曞叆</a>
+ <a-divider type="vertical" v-if="record.isConfirm=='no'"/>
<a-popconfirm
- title="纭缁撴灉鍚庝笉鍙啀褰曞叆锛岀‘璁ゅ悧?"
+ title="纭鎻愪氦鍚�?"
+ @confirm="() => handleSubmit(record)"
+ >
+ <a v-if="record.isConfirm=='no'" v-has="'fault:update'">鎻愪氦</a>
+ </a-popconfirm>
+ <a-divider type="vertical" v-if="record.isConfirm=='no'" />
+ <a-popconfirm
+ title="纭椹冲洖鍚�?"
+ @confirm="() => handleReject(record)"
+ >
+ <a v-if="record.isConfirm=='sub'" v-has="'fault:confirm'">椹冲洖</a>
+ </a-popconfirm>
+ <a-divider type="vertical" v-if="record.isConfirm=='sub'" />
+ <a-popconfirm
+ title="纭缁撴灉骞惰繘鍏ラ獙鏀舵祦绋嬪悧?"
@confirm="() => handleConfirm(record)"
>
- <a
- v-if="record.isConfirm!=='yes'"
- v-has="'fault:confirm'"
- >纭</a>
+ <a v-if="record.isConfirm=='sub'" v-has="'fault:confirm'">纭</a>
</a-popconfirm>
+ <a-divider type="vertical" />
+ <a @click="handleDetail(record)">璇︽儏</a>
</span>
</a-table>
</div>
- <fault-info-modal
- ref="modalForm"
- @ok="modalFormOk"
- ></fault-info-modal>
+ <fault-info-modal ref="modalForm" @ok="modalFormOk"></fault-info-modal>
</a-card>
</template>
<script>
-import '@/assets/less/TableExpand.less'
-import { mixinDevice } from '@/utils/mixin'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import FaultInfoModal from './modules/FaultInfoModal'
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import FaultInfoModal from './modules/FaultInfoModal'
import { putAction } from '../../api/manage'
-export default {
- name: 'FaultInfoList',
- mixins: [JeecgListMixin, mixinDevice],
- components: {
- FaultInfoModal
- },
- data() {
- return {
- description: '璁惧浜嬫晠鐧昏绠＄悊椤甸潰',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- align: "center",
- customRender: function (t, r, index) {
- return parseInt(index) + 1;
+ export default {
+ name: 'FaultInfoList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ FaultInfoModal
+ },
+ data () {
+ return {
+ description: '璁惧浜嬫晠鐧昏绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'鍗曟嵁鍙�',
+ align:"center",
+ dataIndex: 'num'
+ },
+ {
+ title:'璐ㄩ噺闅愭偅纭鍗�',
+ align:"center",
+ dataIndex: 'quanlityId_dictText'
+ },
+ {
+ title:'鐢熶骇鍗曚綅',
+ align:"center",
+ dataIndex: 'departId_dictText'
+ },
+ {
+ title:'璁惧鍚嶇О',
+ align:"center",
+ dataIndex: 'equipName'
+ },
+ {
+ title:'璁惧鍨嬪彿',
+ align:"center",
+ dataIndex: 'equipModel'
+ },
+ {
+ title:'缁熶竴缂栧彿',
+ align:"center",
+ dataIndex: 'equipNum'
+ },
+ {
+ title:'宸ュ尯',
+ align:"center",
+ dataIndex: 'area1_dictText'
+ },
+ {
+ title:'鍗曞厓/宸ユ',
+ align:"center",
+ dataIndex: 'area2'
+ },
+ {
+ title:'缁翠慨璐圭敤',
+ align:"center",
+ dataIndex: 'cost'
+ },
+ {
+ title:'鎿嶄綔鑰�',
+ align:"center",
+ dataIndex: 'operator_dictText'
+ },
+ {
+ title:'鍑虹敓骞存湀',
+ align:"center",
+ dataIndex: 'birthday'
+ },
+ {
+ title:'宸ヤ綔鏃堕棿',
+ align:"center",
+ dataIndex: 'workStartTime'
+ },
+ // {
+ // title:'鎿嶄綔鍛樻槸鍚︽湁鎿嶄綔璇�',
+ // align:"center",
+ // dataIndex: 'isCertificate'
+ // },
+ // {
+ // title:'鏄惁鏂數閲嶅惎',
+ // align:"center",
+ // dataIndex: 'isOutage'
+ // },
+ // {
+ // title:'鍔犲伐杩囩▼涓殑鍙樺姩鍥犵礌',
+ // align:"center",
+ // dataIndex: 'factor'
+ // },
+ // {
+ // title:'鍏蜂綋鏇存敼鍐呭',
+ // align:"center",
+ // dataIndex: 'modifyContent'
+ // },
+ // {
+ // title:'鍙戠敓浜嬫晠鏃惰澶囨墍鎵ц鐨勭▼搴�',
+ // align:"center",
+ // dataIndex: 'equipmentProcess'
+ // },
+ // {
+ // title:'鍙戠敓浜嬫晠鏃剁殑鐜拌薄',
+ // align:"center",
+ // dataIndex: 'phenomenon'
+ // },
+ // {
+ // title:'閲囧彇鎺柦1',
+ // align:"center",
+ // dataIndex: 'method1'
+ // },
+ // {
+ // title:'閲囧彇鎺柦2',
+ // align:"center",
+ // dataIndex: 'method2'
+ // },
+ // {
+ // title:'閲囧彇鎺柦3',
+ // align:"center",
+ // dataIndex: 'method3'
+ // },
+ // {
+ // title:'浜嬫晠鎵�閫犳垚鐨勭粨鏋�',
+ // align:"center",
+ // dataIndex: 'result'
+ // },
+ // {
+ // title:'寮�濮嬫鏌ユ椂闂�',
+ // align:"center",
+ // dataIndex: 'startCheckTime',
+ // customRender:function (text) {
+ // return !text?"":(text.length>10?text.substr(0,10):text)
+ // }
+ // },
+ // {
+ // title:'鍙戠敓浜嬫晠鍚庤澶囩殑鐘舵��',
+ // align:"center",
+ // dataIndex: 'equipmentStatus'
+ // },
+ // {
+ // title:'缁翠慨浜哄憳瀵逛簨鏁呯殑鍒嗘瀽',
+ // align:"center",
+ // dataIndex: 'anlysis'
+ // },
+ // {
+ // title:'缁翠慨浜哄憳妫�鏌ョ粨鏋�',
+ // align:"center",
+ // dataIndex: 'checkResult'
+ // },
+ // {
+ // title:'浜嬫晠鍘熷洜鍒嗘瀽杩囩▼涓墍閲囧彇鐨勭浉鍏宠涓�',
+ // align:"center",
+ // dataIndex: 'active'
+ // },
+ // {
+ // title:'寤鸿閲囧彇鐨勬帾鏂藉強鏃堕棿鑺傜偣',
+ // align:"center",
+ // dataIndex: 'suggest'
+ // },
+ // {
+ // title:'浜嬫晠鍙戠敓鍘熷洜鍒嗘瀽鐨勬牳瀵�',
+ // align:"center",
+ // dataIndex: 'judgment'
+ // },
+ // {
+ // title:'涓嶅悓鐨勬剰瑙佸強鍒嗘瀽',
+ // align:"center",
+ // dataIndex: 'differentJudgment'
+ // },
+ // {
+ // title:'鏁存敼鎺柦',
+ // align:"center",
+ // dataIndex: 'updateMethod'
+ // },
+ // {
+ // title:'浜嬫晠缁撹',
+ // align:"center",
+ // dataIndex: 'finalResult'
+ // },
+ // {
+ // title:'缁翠慨璐ｄ换浜�',
+ // align:"center",
+ // dataIndex: 'engineer'
+ // },
+ // {
+ // title:'鎶�鏈礋璐ｄ汉',
+ // align:"center",
+ // dataIndex: 'mechanic'
+ // },
+ // {
+ // title:'宸ラ暱',
+ // align:"center",
+ // dataIndex: 'workLeader'
+ // },
+ // {
+ // title:'涓績涓讳换',
+ // align:"center",
+ // dataIndex: 'centerLeader'
+ // },
+ // {
+ // title:'缁勯暱',
+ // align:"center",
+ // dataIndex: 'teamLeader'
+ // },
+ // {
+ // title:'缁翠慨绔欑珯闀�',
+ // align:"center",
+ // dataIndex: 'repairLeader'
+ // },
+ // {
+ // title:'绠＄悊瀹や笟鍔＄粡鐞�',
+ // align:"center",
+ // dataIndex: 'equipLeader'
+ // },
+ // {
+ // title:'杩愯淇濋殰閮ㄤ富绠￠瀵�',
+ // align:"center",
+ // dataIndex: 'guaranteeLeader'
+ // },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' }
}
+ ],
+ url: {
+ list: "/li/faultInfo/list",
+ delete: "/li/faultInfo/delete",
+ deleteBatch: "/li/faultInfo/deleteBatch",
+ exportXlsUrl: "/li/faultInfo/exportXls",
+ importExcelUrl: "li/faultInfo/importExcel",
+ confirm: "li/faultInfo/confirm"
+
},
- {
- title: '鍗曟嵁鍙�',
- align: "center",
- dataIndex: 'num'
- },
- {
- title: '璐ㄩ噺闅愭偅纭鍗�',
- align: "center",
- dataIndex: 'quanlityId_dictText'
- },
- {
- title: '鐢熶骇鍗曚綅',
- align: "center",
- dataIndex: 'departId'
- },
- {
- title: '璁惧鍚嶇О',
- align: "center",
- dataIndex: 'equipName'
- },
- {
- title: '璁惧鍨嬪彿',
- align: "center",
- dataIndex: 'equipModel'
- },
- {
- title: '缁熶竴缂栧彿',
- align: "center",
- dataIndex: 'equipNum'
- },
- {
- title: '宸ュ尯',
- align: "center",
- dataIndex: 'area1'
- },
- {
- title: '鍗曞厓/宸ユ',
- align: "center",
- dataIndex: 'area2'
- },
- {
- title: '缁翠慨璐圭敤',
- align: "center",
- dataIndex: 'cost'
- },
- {
- title: '鎿嶄綔鑰�',
- align: "center",
- dataIndex: 'operator_dictText'
- },
- {
- title: '鍑虹敓骞存湀',
- align: "center",
- dataIndex: 'birthday'
- },
- {
- title: '宸ヤ綔鏃堕棿',
- align: "center",
- dataIndex: 'workStartTime'
- },
- // {
- // title:'鎿嶄綔鍛樻槸鍚︽湁鎿嶄綔璇�',
- // align:"center",
- // dataIndex: 'isCertificate'
- // },
- // {
- // title:'鏄惁鏂數閲嶅惎',
- // align:"center",
- // dataIndex: 'isOutage'
- // },
- // {
- // title:'鍔犲伐杩囩▼涓殑鍙樺姩鍥犵礌',
- // align:"center",
- // dataIndex: 'factor'
- // },
- // {
- // title:'鍏蜂綋鏇存敼鍐呭',
- // align:"center",
- // dataIndex: 'modifyContent'
- // },
- // {
- // title:'鍙戠敓浜嬫晠鏃惰澶囨墍鎵ц鐨勭▼搴�',
- // align:"center",
- // dataIndex: 'equipmentProcess'
- // },
- // {
- // title:'鍙戠敓浜嬫晠鏃剁殑鐜拌薄',
- // align:"center",
- // dataIndex: 'phenomenon'
- // },
- // {
- // title:'閲囧彇鎺柦1',
- // align:"center",
- // dataIndex: 'method1'
- // },
- // {
- // title:'閲囧彇鎺柦2',
- // align:"center",
- // dataIndex: 'method2'
- // },
- // {
- // title:'閲囧彇鎺柦3',
- // align:"center",
- // dataIndex: 'method3'
- // },
- // {
- // title:'浜嬫晠鎵�閫犳垚鐨勭粨鏋�',
- // align:"center",
- // dataIndex: 'result'
- // },
- // {
- // title:'寮�濮嬫鏌ユ椂闂�',
- // align:"center",
- // dataIndex: 'startCheckTime',
- // customRender:function (text) {
- // return !text?"":(text.length>10?text.substr(0,10):text)
- // }
- // },
- // {
- // title:'鍙戠敓浜嬫晠鍚庤澶囩殑鐘舵��',
- // align:"center",
- // dataIndex: 'equipmentStatus'
- // },
- // {
- // title:'缁翠慨浜哄憳瀵逛簨鏁呯殑鍒嗘瀽',
- // align:"center",
- // dataIndex: 'anlysis'
- // },
- // {
- // title:'缁翠慨浜哄憳妫�鏌ョ粨鏋�',
- // align:"center",
- // dataIndex: 'checkResult'
- // },
- // {
- // title:'浜嬫晠鍘熷洜鍒嗘瀽杩囩▼涓墍閲囧彇鐨勭浉鍏宠涓�',
- // align:"center",
- // dataIndex: 'active'
- // },
- // {
- // title:'寤鸿閲囧彇鐨勬帾鏂藉強鏃堕棿鑺傜偣',
- // align:"center",
- // dataIndex: 'suggest'
- // },
- // {
- // title:'浜嬫晠鍙戠敓鍘熷洜鍒嗘瀽鐨勬牳瀵�',
- // align:"center",
- // dataIndex: 'judgment'
- // },
- // {
- // title:'涓嶅悓鐨勬剰瑙佸強鍒嗘瀽',
- // align:"center",
- // dataIndex: 'differentJudgment'
- // },
- // {
- // title:'鏁存敼鎺柦',
- // align:"center",
- // dataIndex: 'updateMethod'
- // },
- // {
- // title:'浜嬫晠缁撹',
- // align:"center",
- // dataIndex: 'finalResult'
- // },
- // {
- // title:'缁翠慨璐ｄ换浜�',
- // align:"center",
- // dataIndex: 'engineer'
- // },
- // {
- // title:'鎶�鏈礋璐ｄ汉',
- // align:"center",
- // dataIndex: 'mechanic'
- // },
- // {
- // title:'宸ラ暱',
- // align:"center",
- // dataIndex: 'workLeader'
- // },
- // {
- // title:'涓績涓讳换',
- // align:"center",
- // dataIndex: 'centerLeader'
- // },
- // {
- // title:'缁勯暱',
- // align:"center",
- // dataIndex: 'teamLeader'
- // },
- // {
- // title:'缁翠慨绔欑珯闀�',
- // align:"center",
- // dataIndex: 'repairLeader'
- // },
- // {
- // title:'绠＄悊瀹や笟鍔＄粡鐞�',
- // align:"center",
- // dataIndex: 'equipLeader'
- // },
- // {
- // title:'杩愯淇濋殰閮ㄤ富绠￠瀵�',
- // align:"center",
- // dataIndex: 'guaranteeLeader'
- // },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align: "center",
- fixed: "right",
- width: 147,
- scopedSlots: { customRender: 'action' }
- }
- ],
- url: {
- list: "/li/faultInfo/list",
- delete: "/li/faultInfo/delete",
- deleteBatch: "/li/faultInfo/deleteBatch",
- exportXlsUrl: "/li/faultInfo/exportXls",
- importExcelUrl: "li/faultInfo/importExcel",
- confirm: "li/faultInfo/confirm"
-
- },
- dictOptions: {},
- superFieldList: [],
- }
- },
- created() {
+ dictOptions:{},
+ superFieldList:[],
+ }
+ },
+ created() {
this.getSuperFieldList();
- },
- computed: {
- importExcelUrl: function () {
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
- },
- methods: {
- initDictConfig() {
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
},
- getSuperFieldList() {
- let fieldList = [];
- fieldList.push({ type: 'string', value: 'num', text: '缂栫爜' })
- fieldList.push({ type: 'string', value: 'qId', text: '璐ㄩ噺闅愭偅纭鍗旾D' })
- fieldList.push({ type: 'string', value: 'cost', text: '缁翠慨璐圭敤' })
- fieldList.push({ type: 'string', value: 'isCertificate', text: '鎿嶄綔鍛樻槸鍚︽湁鎿嶄綔璇�' })
- fieldList.push({ type: 'string', value: 'isOutage', text: '鏄惁鏂數閲嶅惎' })
- fieldList.push({ type: 'string', value: 'factor', text: '鍔犲伐杩囩▼涓殑鍙樺姩鍥犵礌' })
- fieldList.push({ type: 'string', value: 'modifyContent', text: '鍏蜂綋鏇存敼鍐呭' })
- fieldList.push({ type: 'string', value: 'equipmentProcess', text: '鍙戠敓浜嬫晠鏃惰澶囨墍鎵ц鐨勭▼搴�' })
- fieldList.push({ type: 'string', value: 'phenomenon', text: '鍙戠敓浜嬫晠鏃剁殑鐜拌薄' })
- fieldList.push({ type: 'string', value: 'method1', text: '閲囧彇鎺柦1' })
- fieldList.push({ type: 'string', value: 'method2', text: '閲囧彇鎺柦2' })
- fieldList.push({ type: 'string', value: 'method3', text: '閲囧彇鎺柦3' })
- fieldList.push({ type: 'string', value: 'result', text: '浜嬫晠鎵�閫犳垚鐨勭粨鏋�' })
- fieldList.push({ type: 'date', value: 'startCheckTime', text: '寮�濮嬫鏌ユ椂闂�' })
- fieldList.push({ type: 'string', value: 'equipmentStatus', text: '鍙戠敓浜嬫晠鍚庤澶囩殑鐘舵��' })
- fieldList.push({ type: 'string', value: 'anlysis', text: '缁翠慨浜哄憳瀵逛簨鏁呯殑鍒嗘瀽' })
- fieldList.push({ type: 'string', value: 'checkResult', text: '缁翠慨浜哄憳妫�鏌ョ粨鏋�' })
- fieldList.push({ type: 'string', value: 'active', text: '浜嬫晠鍘熷洜鍒嗘瀽杩囩▼涓墍閲囧彇鐨勭浉鍏宠涓�' })
- fieldList.push({ type: 'string', value: 'suggest', text: '寤鸿閲囧彇鐨勬帾鏂藉強鏃堕棿鑺傜偣' })
- fieldList.push({ type: 'string', value: 'judgment', text: '浜嬫晠鍙戠敓鍘熷洜鍒嗘瀽鐨勬牳瀵�' })
- fieldList.push({ type: 'string', value: 'differentJudgment', text: '涓嶅悓鐨勬剰瑙佸強鍒嗘瀽' })
- fieldList.push({ type: 'string', value: 'updateMethod', text: '鏁存敼鎺柦' })
- fieldList.push({ type: 'string', value: 'finalResult', text: '浜嬫晠缁撹' })
- fieldList.push({ type: 'string', value: 'operater', text: '鎿嶄綔鑰�' })
- fieldList.push({ type: 'string', value: 'engineer', text: '缁翠慨璐ｄ换浜�' })
- fieldList.push({ type: 'string', value: 'mechanic', text: '鎶�鏈礋璐ｄ汉' })
- fieldList.push({ type: 'string', value: 'workLeader', text: '宸ラ暱' })
- fieldList.push({ type: 'string', value: 'centerLeader', text: '涓績涓讳换' })
- fieldList.push({ type: 'string', value: 'teamLeader', text: '缁勯暱' })
- fieldList.push({ type: 'string', value: 'repairLeader', text: '缁翠慨绔欑珯闀�' })
- fieldList.push({ type: 'string', value: 'equipLeader', text: '绠＄悊瀹や笟鍔＄粡鐞�' })
- fieldList.push({ type: 'string', value: 'guaranteeLeader', text: '杩愯淇濋殰閮ㄤ富绠￠瀵�' })
- this.superFieldList = fieldList
- },
- handleConfirm(record) {
- putAction(this.url.confirm, record).then(res => {
- if (res.result) {
- this.$message.success('纭鎴愬姛');
- this.loadData();
- } else {
- this.$message.error('纭鍑虹幇寮傚父')
- }
- })
- },
+ methods: {
+ initDictConfig(){
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'string',value:'num',text:'缂栫爜'})
+ fieldList.push({type:'string',value:'qId',text:'璐ㄩ噺闅愭偅纭鍗旾D'})
+ fieldList.push({type:'string',value:'cost',text:'缁翠慨璐圭敤'})
+ fieldList.push({type:'string',value:'isCertificate',text:'鎿嶄綔鍛樻槸鍚︽湁鎿嶄綔璇�'})
+ fieldList.push({type:'string',value:'isOutage',text:'鏄惁鏂數閲嶅惎'})
+ fieldList.push({type:'string',value:'factor',text:'鍔犲伐杩囩▼涓殑鍙樺姩鍥犵礌'})
+ fieldList.push({type:'string',value:'modifyContent',text:'鍏蜂綋鏇存敼鍐呭'})
+ fieldList.push({type:'string',value:'equipmentProcess',text:'鍙戠敓浜嬫晠鏃惰澶囨墍鎵ц鐨勭▼搴�'})
+ fieldList.push({type:'string',value:'phenomenon',text:'鍙戠敓浜嬫晠鏃剁殑鐜拌薄'})
+ fieldList.push({type:'string',value:'method1',text:'閲囧彇鎺柦1'})
+ fieldList.push({type:'string',value:'method2',text:'閲囧彇鎺柦2'})
+ fieldList.push({type:'string',value:'method3',text:'閲囧彇鎺柦3'})
+ fieldList.push({type:'string',value:'result',text:'浜嬫晠鎵�閫犳垚鐨勭粨鏋�'})
+ fieldList.push({type:'date',value:'startCheckTime',text:'寮�濮嬫鏌ユ椂闂�'})
+ fieldList.push({type:'string',value:'equipmentStatus',text:'鍙戠敓浜嬫晠鍚庤澶囩殑鐘舵��'})
+ fieldList.push({type:'string',value:'anlysis',text:'缁翠慨浜哄憳瀵逛簨鏁呯殑鍒嗘瀽'})
+ fieldList.push({type:'string',value:'checkResult',text:'缁翠慨浜哄憳妫�鏌ョ粨鏋�'})
+ fieldList.push({type:'string',value:'active',text:'浜嬫晠鍘熷洜鍒嗘瀽杩囩▼涓墍閲囧彇鐨勭浉鍏宠涓�'})
+ fieldList.push({type:'string',value:'suggest',text:'寤鸿閲囧彇鐨勬帾鏂藉強鏃堕棿鑺傜偣'})
+ fieldList.push({type:'string',value:'judgment',text:'浜嬫晠鍙戠敓鍘熷洜鍒嗘瀽鐨勬牳瀵�'})
+ fieldList.push({type:'string',value:'differentJudgment',text:'涓嶅悓鐨勬剰瑙佸強鍒嗘瀽'})
+ fieldList.push({type:'string',value:'updateMethod',text:'鏁存敼鎺柦'})
+ fieldList.push({type:'string',value:'finalResult',text:'浜嬫晠缁撹'})
+ fieldList.push({type:'string',value:'operater',text:'鎿嶄綔鑰�'})
+ fieldList.push({type:'string',value:'engineer',text:'缁翠慨璐ｄ换浜�'})
+ fieldList.push({type:'string',value:'mechanic',text:'鎶�鏈礋璐ｄ汉'})
+ fieldList.push({type:'string',value:'workLeader',text:'宸ラ暱'})
+ fieldList.push({type:'string',value:'centerLeader',text:'涓績涓讳换'})
+ fieldList.push({type:'string',value:'teamLeader',text:'缁勯暱'})
+ fieldList.push({type:'string',value:'repairLeader',text:'缁翠慨绔欑珯闀�'})
+ fieldList.push({type:'string',value:'equipLeader',text:'绠＄悊瀹や笟鍔＄粡鐞�'})
+ fieldList.push({type:'string',value:'guaranteeLeader',text:'杩愯淇濋殰閮ㄤ富绠￠瀵�'})
+ this.superFieldList = fieldList
+ },
+ handleConfirm(record) {
+ record.isConfirm = 'yes';
+ putAction(this.url.confirm, record).then(res => {
+ if (res.result) {
+ this.$message.success('纭鎴愬姛');
+ this.loadData();
+ } else {
+ this.$message.error('纭鍑虹幇寮傚父')
+ }
+ })
+ },
+ handleSubmit(record) {
+ record.isConfirm = "sub";
+ putAction(this.url.confirm, record).then(res => {
+ if (res.result) {
+ this.$message.success('鎻愪氦鎴愬姛');
+ this.loadData();
+ } else {
+ this.$message.error('鎻愪氦鍑虹幇寮傚父')
+ }
+ })
+ },
+ handleReject(record) {
+ record.isConfirm = "no";
+ putAction(this.url.confirm, record).then(res => {
+ if (res.result) {
+ this.$message.success('椹冲洖鎴愬姛');
+ this.loadData();
+ } else {
+ this.$message.error('椹冲洖鍑虹幇寮傚父')
+ }
+ })
+ },
+ }
}
-}
</script>
<style scoped>
-@import '~@assets/less/common.less';
+ @import '~@assets/less/common.less';
</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 2a4b56a..b3556ea 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -430,30 +430,46 @@
</a-col>
<a-col :span="6">
<a-form-model-item
- label="鎶�鏈姸鎬侀壌瀹氬懆鏈�"
+ label="楠屾敹鏃ユ湡"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="acceptanceCheckDate"
+ >
+ <a-date-picker
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨楠屾敹鏃ユ湡"
+ style="width: 100%;"
+ v-model="model.acceptanceCheckDate"
+ @change="dateChange"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鎶�鏈姸鎬佹瀹氬懆鏈�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="checkPeriod"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨鎶�鏈姸鎬侀壌瀹氬懆鏈� "
+ placeholder="璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈� "
:triggerChange="true"
dictCode="check_period"
- :disabled="true"
v-model="model.checkPeriod"
+ @change="dateChange"
/>
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item
- label="涓嬫鎶�鏈壌瀹氭椂闂�"
+ label="涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="nextTechnologyStatusQualificationTime"
>
<j-date
- :disabled="formDisabled"
+ :disabled="true"
style="width: 100%;"
placeholder="璇烽�夋嫨鏃ユ湡"
class="query-group-cust"
@@ -588,22 +604,6 @@
placeholder="璇疯緭鍏ュ嚭鍘傛棩鏈�"
style="width: 100%;"
v-model="model.leaveFactoryDate"
- />
- </a-form-model-item>
- </a-col>
-
- <a-col :span="6">
- <a-form-model-item
- label="楠屾敹鏃ユ湡"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="acceptanceCheckDate"
- >
- <a-date-picker
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ラ獙鏀舵棩鏈�"
- style="width: 100%;"
- v-model="model.acceptanceCheckDate"
/>
</a-form-model-item>
</a-col>
@@ -1039,7 +1039,13 @@
],
system: [
{ required: true, message: '璇疯緭鍏ョ郴缁�!' },
- ]
+ ],
+ acceptanceCheckDate: [
+ { required: true, message: '璇烽�夋嫨楠屾敹鏃ユ湡!' },
+ ],
+ checkPeriod: [
+ { required: true, message: '璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈�!' },
+ ],
},
url: {
add: "/eam/equipment/add",
@@ -1283,6 +1289,19 @@
})
}
},
+ //璁＄畻涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂达紝涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�=楠屾敹鏃ユ湡+鎶�鏈姸鎬佹瀹氬懆鏈�
+ dateChange() {
+ var acceptanceCheckDate = this.model.acceptanceCheckDate;
+ var checkPeriod = this.model.checkPeriod;
+ if (acceptanceCheckDate !== null && acceptanceCheckDate !== '' && checkPeriod !== null && checkPeriod !== '') {
+ var nextTechnologyStatusQualificationTime = moment(acceptanceCheckDate).add(checkPeriod, 'days').format('YYYY-MM-DD');
+ this.model.nextTechnologyStatusQualificationTime = nextTechnologyStatusQualificationTime;
+ this.model = Object.assign({}, this.model);
+ }else{
+ this.model.nextTechnologyStatusQualificationTime = '';
+ this.model = Object.assign({}, this.model);
+ }
+ },
categoryChange(value) {
getAction(this.url.getCategoryFlag, { id: value }).then(res => {
if (res.result.equipmentCategoryUda1 === 'weldingMachine') {
diff --git a/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue b/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
index 9d62e6c..c42fb4e 100644
--- a/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
+++ b/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
@@ -22,10 +22,10 @@
:sm="8"
>
<a-form-item label="鍗曟嵁鍙�">
- <j-input
+ <a-input
placeholder="璇疯緭鍏ュ崟鎹彿妫�绱�"
v-model="queryParam.num"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
@@ -34,10 +34,21 @@
:sm="8"
>
<a-form-item label="璁惧鍚嶇О">
- <j-input
+ <a-input
placeholder="璇疯緭鍏ヨ澶囧悕绉版绱�"
v-model="queryParam.equipmentName"
- ></j-input>
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�"
+ v-model="queryParam.equipmentNum"
+ ></a-input>
</a-form-item>
</a-col>
<a-col
--
Gitblit v1.9.3