From 59eb5746394c73b4eb7396fe695d0cdb1f0c071e Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期三, 25 十月 2023 17:04:27 +0800 Subject: [PATCH] 已经处理的问题 --- src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue | 371 ++++++++++++++++++++++++++-------------------------- 1 files changed, 186 insertions(+), 185 deletions(-) diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue index 45604a6..0032a54 100644 --- a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue +++ b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue @@ -1,217 +1,218 @@ <template> <a-card - :bordered='false' - :class="'cust-erp-sub-tab'" + :bordered=true > - <!-- 鏌ヨ鍖哄煙 --> - <div class="table-page-search-wrapper"> + <a-spin :spinning='confirmLoading'> <a-form - layout="inline" - @keyup.enter.native="searchQuery" - > - <a-row :gutter="24"> + :form="form" + > + <a-row> + <a-col + :span='12' + > + <a-form-item + label='鏁呴殰绫诲瀷' + :labelCol='labelCol' + :wrapperCol='wrapperCol' + > + <j-dict-select-tag + allow-clear + placeholder='璇烽�夋嫨鏁呴殰绫诲瀷' + :triggerChange='true' + :disabled="isEdit" + dictCode="mom_eam_fault_type,name,id,del_flag!='1'" + v-decorator="['faultTypeId', validatorRules.faultTypeId ]" + /> + </a-form-item> + </a-col> + <a-col :span='12'> + <a-form-item + label='鏁呴殰鍒嗘瀽' + :labelCol='labelCol' + :wrapperCol='wrapperCol' + > + <a-textarea + placeholder='璇疯緭鍏ユ晠闅滃垎鏋�' + v-decorator="['faultCause', validatorRules.faultCause]" + :disabled="isEdit" + ></a-textarea> + </a-form-item> + </a-col> </a-row> - </a-form> - </div> - <!-- 鏌ヨ鍖哄煙-END --> - - <!-- 鎿嶄綔鎸夐挳鍖哄煙 --> - <div - class='table-operator' - v-if='mainId.id' - > - <a-dropdown v-if='selectedRowKeys.length > 0'> - <a-menu slot='overlay'> - <a-menu-item - key='1' - @click='batchDel' - > - <a-icon type='delete' /> - 鍒犻櫎 - </a-menu-item> - </a-menu> - <a-button style='margin-left: 8px'> 鎵归噺鎿嶄綔 - <a-icon type='down' /> - </a-button> - </a-dropdown> - </div> - - <!-- table鍖哄煙-begin --> - <div> - <!-- <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> - </div> --> - - <a-table - ref='table' - size='middle' - bordered - rowKey='id' - :scroll='{x:true}' - :columns='columns' - :dataSource='dataSource' - :pagination='ipagination' - :loading='loading' - @change='handleTableChange' - > - <!-- :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' --> - - <span - slot='action' - slot-scope='text, record' - > - <!-- <a @click='handleEdit(record)'>缂栬緫</a> - <a-divider type='vertical' /> --> - <a-popconfirm - title='纭畾鍒犻櫎鍚�?' - @confirm='() => handleDelete(record.id)' - > - <a :disabled="mainId.status=='4'">鍒犻櫎</a> - </a-popconfirm> - </span> - - </a-table> + <a-row> + <a-col :span='12'> + <a-form-item + label='缁翠慨鎺柦' + :labelCol='labelCol' + :wrapperCol='wrapperCol' + > + <a-textarea + placeholder='璇疯緭鍏ョ淮淇帾鏂�' + v-decorator="['maintenanceMeasures', validatorRules.maintenanceMeasures]" + :disabled="isEdit" + ></a-textarea> + </a-form-item> + </a-col> + <a-col :span='12'> + <a-form-item + label='缁翠繚鎰忚' + :labelCol='labelCol' + :wrapperCol='wrapperCol' + > + <a-textarea + v-decorator="['suggestion', validatorRules.suggestion]" + placeholder='璇疯緭鍏ョ淮淇濇剰瑙�' + :disabled="isEdit" + ></a-textarea> + </a-form-item> + </a-col> + </a-row> <a-button - style="width: 100%; margin-top: 16px; margin-bottom: 8px" - type="dashed" - icon="plus" - @click="handleAdd" - :disabled="mainId.status=='4' ||mainId.status=='2'" - >娣诲姞鏁呴殰鍒嗘瀽 + :style="{marginRight: '8px'}" + @click='handleEdit2()' + > + 缂栬緫 </a-button> - </div> - <repair-order-fault-analysis-report-model - ref='modalForm' - @ok='modalFormOk' - ></repair-order-fault-analysis-report-model> + + <a-button + @click='handleOk()' + type='primary' + :loading='confirmLoading' + >淇濆瓨 + </a-button> + </a-form> + </a-spin> </a-card> - </template> - <script> - -import { JeecgListMixin } from '@/mixins/JeecgListMixin' - - -import RepairOrderFaultAnalysisReportModel from './RepairOrderFaultAnalysisReportModel.vue' - +import pick from 'lodash.pick' +import { postAction, requestPut } from '@/api/manage' +import { duplicateCheck } from '@/api/api' +import { getAction } from '../../../../../api/manage' export default { name: 'RepairOrderFaultAnalysisList', - mixins: [JeecgListMixin], - components: { RepairOrderFaultAnalysisReportModel }, + components: { }, props: { - mainId: { - type: Object, + repairOrderId: { + type: String, + default:'', } }, - watch: { - mainId: { - immediate: true, - handler(val) { - console.log(val) - if (!this.mainId.id) { - - this.clearList() - } else { - - this.queryParam['repairOrderId'] = val.id - this.loadData(1) + watch:{ + repairOrderId:{ + immediate: true, + handler(val) { + this.form.resetFields(); + if(!this.repairOrderId){ + this.isEdit = false; + }else{ + this.loadData(val); + } } } - } }, - data() { return { description: '缁翠慨宸ュ崟绠$悊椤甸潰', - disableMixinCreated: true, - // 琛ㄥご - columns: [ - { - title: '#', - dataIndex: '', - key: 'rowIndex', - width: 60, - align: 'center', - customRender: function (t, r, index) { - return parseInt(index) + 1 - } - }, - { - title: '鏁呴殰鍘熷洜', - dataIndex: 'faultCauseName', - align: 'center', - width: 150, - ellipsis: true, - }, - { - title: '鏁呴殰绫诲瀷', - dataIndex: 'faultTypeName', - align: 'center', - width: 150, - ellipsis: true, - }, - { - title: '鏁呴殰鍒嗘瀽', - dataIndex: 'faultCause', - align: 'center', - width: 150, - ellipsis: true, - }, - { - title: '缁翠慨鎺柦', - dataIndex: 'maintenanceMeasures', - align: 'center', - width: 150, - ellipsis: true, - }, - { - title: '缁翠繚鏀硅繘鎰忚', - dataIndex: 'suggestion', - align: 'center', - width: 150, - ellipsis: true, - }, - { - title: '鎿嶄綔', - dataIndex: 'action', - align: 'center', - width: 147, - scopedSlots: { customRender: 'action' } - } - ], + confirmLoading:false, + model:{}, + form: this.$form.createForm(this), url: { - list: '/eam/repairOrder/listRepairOrderFaultAnalysisByMainId', - delete: '/eam/repairOrder/deleteRepairOrderFaultAnalysis', - deleteBatch: '/eam/repairOrder/deleteBatchRepairOrderFaultAnalysis', - exportXlsUrl: '/eam/repairOrder/exportRepairOrderFaultAnalysis', - importUrl: '/eam/repairOrder/importRepairOrderFaultAnalysis' + add:'/eam/repairOrderFaultAnalysis/add', + edit: '/eam/repairOrderFaultAnalysis/edit', + getInfo:'/eam/repairOrderFaultAnalysis/list', }, - dictOptions: {} - } - }, - created() { - }, - computed: { - importExcelUrl() { - return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId.id}` + dictOptions: {}, + isEdit:false, + validatorRules: { + faultCause: { + rules: [ + { required: true, message: '璇疯緭鍏ユ晠闅滃垎鏋�!' }, + { min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' }, + ] + }, + faultCauseId: { + rules: [ + { required: true, message: '璇烽�夋嫨鏁呴殰鍘熷洜!' }, + ] + }, + faultTypeId: { + rules: [ + { required: true, message: '璇烽�夋嫨鏁呴殰绫诲瀷!' }, + ] + }, + suggestion:{ + rules: [ + { required: true, message: '璇疯緭鍏ョ淮淇濇剰瑙�!' }, + { min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' }, + ] + }, + maintenanceMeasures:{ + rules: [ + { required: true, message: '璇疯緭鍏ョ淮淇帾鏂�!' }, + { min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' }, + ] + }, + }, + labelCol: { + xs: { span: 24 }, + sm: { span: 5 } + }, + wrapperCol: { + xs: { span: 24 }, + sm: { span: 16 } + }, } }, methods: { - clearList() { - this.dataSource = [] - this.selectedRowKeys = [] - this.ipagination.current = 1 + handleOk() { + const that = this; + // 瑙﹀彂琛ㄥ崟楠岃瘉 + this.form.validateFields((err, values) => { + if (!err) { + that.confirmLoading = true; + let formData = Object.assign(this.model, values); + let obj; + if (!this.model.id) { + formData.repairOrderId = this.repairOrderId; + obj = postAction(this.url.add, formData); + } else { + obj = requestPut(this.url.edit, formData, { id: this.model.id }); + } + obj.then((res) => { + if (res.success) { + that.$message.success(res.message); + that.$emit('ok'); + } else { + that.$message.warning(res.message); + } + }).finally(() => { + that.loadData(that.repairOrderId); + that.confirmLoading = false; + }) + } + }) }, - handleAdd: function () { - this.$refs.modalForm.add(this.mainId) - this.$refs.modalForm.title = '鏂板' - this.$refs.modalForm.disableSubmit = false + loadData(repairOrderId){ + let that = this; + getAction(that.url.getInfo,{repairOrderId:repairOrderId}).then(res=>{ + if(res.success){ + if(res.result.records.length!==0){ + that.isEdit=true; + that.form.setFieldsValue(pick(res.result.records[0], 'faultCause', 'faultTypeId', 'suggestion', 'maintenanceMeasures','id')) + that.model = Object.assign({}, res.result.records[0]); + that.isEdit=true; + }else{ + that.isEdit=false; + } + } + }) }, + handleEdit2(){ + this.isEdit=false; + } + }, - } } </script> <style scoped> -- Gitblit v1.9.3