From 7183ac93ac12e540a17d9e71fd2b04c2610b0a24 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 24 八月 2023 16:39:04 +0800
Subject: [PATCH] qsw 故障报修修改
---
src/views/eam/modules/malfunctionRepair/FaultDescriptionList.vue | 135 +++++++++++++++++++++++++++++++++
src/views/eam/MalfunctionRepair.vue | 16 ++--
src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue | 67 +++++++---------
3 files changed, 174 insertions(+), 44 deletions(-)
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index a716e69..b855dd3 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -82,7 +82,7 @@
<!-- :rowSelection="rowSelection" -->
<!-- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" -->
- <template
+ <!-- <template
slot="htmlSlot"
slot-scope="text"
>
@@ -123,7 +123,7 @@
>
涓嬭浇
</a-button>
- </template>
+ </template> -->
<span
slot="action"
@@ -228,7 +228,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import MalfunctionRepairModal from './modules/malfunctionRepair/MalfunctionRepaireModal'
-import FaultDescriptionList from './FaultDescriptionList'
+import FaultDescriptionList from './modules/malfunctionRepair/FaultDescriptionList'
import ApprovelModal from './modules/malfunctionRepair/ApprovelModal'
export default {
@@ -312,11 +312,11 @@
align: "center",
dataIndex: 'faultTime'
},
- // {
- // title: '鏄惁鍋滄満寰呬慨',
- // align: "center",
- // dataIndex: 'isStop_dictText',
- // },
+ {
+ title: '鏄惁鍋滄満寰呬慨',
+ align: "center",
+ dataIndex: 'isStopName',
+ },
{
title: '鍒涘缓浜�',
align: "center",
diff --git a/src/views/eam/modules/malfunctionRepair/FaultDescriptionList.vue b/src/views/eam/modules/malfunctionRepair/FaultDescriptionList.vue
new file mode 100644
index 0000000..64ed6f3
--- /dev/null
+++ b/src/views/eam/modules/malfunctionRepair/FaultDescriptionList.vue
@@ -0,0 +1,135 @@
+<template>
+ <a-card :bordered="false">
+ <a-row
+ type="flex"
+ :gutter="16"
+ >
+ <a-col
+ :md="12"
+ :sm="24"
+ >
+ <div>
+ <a-form-item label="鏁呴殰鎴栨搷浣滆繃绋嬭鎯咃細">
+ <a-textarea
+ allow-clear
+ :disabled="true"
+ rows="4"
+ v-model="faultDetails"
+ ></a-textarea>
+ </a-form-item>
+ </div>
+ </a-col>
+ </a-row>
+ </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { deleteAction, getAction, downFile, getFileAccessHttpUrl, httpAction } from '@/api/manage'
+
+export default {
+ name: 'FaultDescriptionList',
+ mixins: [JeecgListMixin, mixinDevice],
+ components: {
+ },
+ data() {
+ return {
+ description: '鏁呴殰鎻忚堪绠＄悊椤甸潰',
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: "center",
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1;
+ }
+ },
+ {
+ title: '鏁呴殰璇︽儏',
+ align: "center",
+ dataIndex: 'faultDetails'
+ },
+ // {
+ // title: '鏁呴殰鐓х墖',
+ // align: "center",
+ // dataIndex: 'photo'
+ // },
+ ],
+ url: {
+ list: "/eam/faultDescription/list",
+ },
+ faultId: '',
+ faultDetails: '',
+ photo: ''
+ }
+ },
+ created() {
+ },
+ computed: {
+ },
+ methods: {
+ loadData(arg) {
+ if (!this.url.list) {
+ this.$message.error('璇疯缃畊rl.list灞炴��!')
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1
+ }
+ var params = this.getQueryParams() //鏌ヨ鏉′欢
+ this.loading = true
+ getAction(this.url.list, params)
+ .then(res => {
+ if (res.success) {
+ //update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ this.dataSource = res.result.records
+ if (this.dataSource != null && this.dataSource != "") {
+ this.faultDetails = this.dataSource[0].faultDetails
+ this.photo = this.dataSource[0].photo
+ } else {
+ this.faultDetails = ""
+ this.photo = ""
+ }
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+ //update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ .finally(() => {
+ this.loading = false
+ })
+ },
+
+ },
+ watch: {
+ faultId() {
+ this.queryParam = {};
+ this.queryParam.faultId = this.faultId;
+ this.loadData(1);
+ },
+ }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
index 564aa50..ba98bf4 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
@@ -26,7 +26,7 @@
</a-form-item>
</a-col>
<a-col :span="24/2">
- <!-- <a-form-item
+ <a-form-item
label="鏄惁鍋滄満缁翠慨"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -39,7 +39,12 @@
dictCode="is_stop"
v-decorator="['isStop', validatorRules.isStop]"
/>
- </a-form-item> -->
+ </a-form-item>
+
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="24/2">
<a-form-item
label="璁惧缂栫爜"
:labelCol="labelCol"
@@ -52,6 +57,22 @@
@search="onSearchEquipmentList()"
:read-only="true"
v-decorator="['equipmentNum', validatorRules.equipmentNum]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24/2">
+ <a-form-item
+ label="鏁呴殰鏃堕棿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-date
+ :disabled="disableSubmit"
+ style="width: 100%"
+ placeholder="璇烽�夋嫨鏁呴殰鏃堕棿"
+ :showTime="true"
+ dateFormat="YYYY-MM-DD HH:mm:ss"
+ v-decorator="['faultTime', validatorRules.faultTime]"
/>
</a-form-item>
</a-col>
@@ -171,22 +192,7 @@
/>
</a-form-item>
</a-col>
- <a-col :span="24/2">
- <a-form-item
- label="鏁呴殰鏃堕棿"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <j-date
- :disabled="disableSubmit"
- style="width: 100%"
- placeholder="璇烽�夋嫨鏁呴殰鏃堕棿"
- :showTime="true"
- dateFormat="YYYY-MM-DD HH:mm:ss"
- v-decorator="['faultTime', validatorRules.faultTime]"
- />
- </a-form-item>
- </a-col>
+
</a-row>
<a-row :gutter="24">
<a-col :span="24/2">
@@ -220,24 +226,13 @@
</a-form-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
label="鏁呴殰鐓х墖"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <!-- <j-image-upload-self
- :isMultiple="false"
- v-decorator="['photo', {}]"
- @ok="uploadOk"
- >
- </j-image-upload-self> -->
- <!-- <j-image-upload
- :isMultiple="false"
- @ok="uploadOk"
- v-decorator="['photo', {}]"
- /> -->
<j-image-upload
:disabled="disableSubmit"
:isMultiple="true"
@@ -246,7 +241,7 @@
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
</a-form>
</a-spin>
@@ -316,11 +311,11 @@
{ required: true, message: '璇疯緭鍏ュ叆搴撳崟缂栧彿!' },
]
},
- // isStop: {
- // rules: [
- // { required: true, message: '璇烽�夋嫨鏄惁鍋滄満!' },
- // ]
- // },
+ isStop: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鏄惁鍋滄満!' },
+ ]
+ },
equipmentNum: {
rules: [
{ required: true, message: '璇烽�夋嫨璁惧!' },
--
Gitblit v1.9.3