| 7 天以前 | zhaowei |  |
| 7 天以前 | zhaowei |  |
| 7 天以前 | zhaowei | |
| 8 天以前 | zhangherong | |
| src/views/eam/equipment/EamEquipmentLedger.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/eam/equipment/modules/EamEquipmentModal.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/eam/technical/modules/EamTechnicalStatusEvaluationOrderModal.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/flowable/workflow/FlowCompleted.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/eam/equipment/EamEquipmentLedger.vue
@@ -115,8 +115,13 @@ <a-switch checked-children="是" un-checked-children="否" :checked="Boolean(+text)" disabled/> </template> <!--操作系统--> <!--灭火器--> <template slot="fireExtinguisher" slot-scope="text"> <a-switch checked-children="是" un-checked-children="否" :checked="Boolean(+text)" disabled/> </template> <!--真空热处理炉--> <template slot="trueHeatTreatment" slot-scope="text"> <a-switch checked-children="是" un-checked-children="否" :checked="Boolean(+text)" disabled/> </template> @@ -170,7 +175,7 @@ mixins: [JeecgListMixin], components: { ResumeDrawer, EamEquipmentModal, EamEquipmentModal }, data() { return { @@ -282,6 +287,12 @@ dataIndex: 'system' }, { title: '真空热处理炉', align: 'center', dataIndex: 'trueHeatTreatment', scopedSlots: { customRender: 'trueHeatTreatment' } }, { title: '设备端口', align: 'center', dataIndex: 'equipmentPort' @@ -341,7 +352,7 @@ title: '资产制造商', align: 'center', dataIndex: 'manufacturingEnterprise', scopedSlots: { customRender: 'manufacturingEnterprise' }, scopedSlots: { customRender: 'manufacturingEnterprise' } }, { title: '资产来源国家', src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -85,7 +85,8 @@ </a-col> <a-col :span="customSpan"> <a-form-model-item label="灭火器"> <j-dict-select-tag dict-code="yn" type="radio" v-model="model.fireExtinguisher"/> <j-dict-select-tag dict-code="yn" type="radio" v-model="model.fireExtinguisher" @change="handleRadioChange($event,'fireExtinguisherExpirationDate')"/> </a-form-model-item> </a-col> <a-col :span="customSpan"> @@ -100,7 +101,8 @@ <a-row> <a-col :span="customSpan"> <a-form-model-item label="操作系统"> <j-dict-select-tag dict-code="yn " type="radio" v-model="model.operationSystem"/> <j-dict-select-tag dict-code="yn " type="radio" v-model="model.operationSystem" @change="handleRadioChange($event,'system')"/> </a-form-model-item> </a-col> <a-col :span="customSpan"> @@ -109,20 +111,24 @@ </a-form-model-item> </a-col> <a-col :span="customSpan"> <a-form-model-item label="真空热处理炉"> <j-dict-select-tag dict-code="yn " type="radio" v-model="model.trueHeatTreatment"/> </a-form-model-item> </a-col> <a-col :span="customSpan"> <a-form-model-item label="设备端口"> <a-input placeholder="请输入设备端口" v-model="model.equipmentPort"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="坐标数量"> <a-input-number placeholder="请输入坐标数量" v-model="model.coordinateNum" :min="0" :max="12" style="width: 100%"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="重量"> <a-input-number placeholder="请输入重量" v-model="model.equipmentWeight" :min="0" style="width: 100%"/> @@ -138,14 +144,15 @@ <a-input placeholder="请输入功能位置" v-model="model.functionalLocation"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="安装位置"> <a-input placeholder="请输入安装位置" v-model="model.installationPosition"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="出厂日期"> <a-date-picker v-model="model.leaveFactoryDate" value-format="YYYY-MM-DD" style="width:100%"/> @@ -161,14 +168,15 @@ <a-input placeholder="请输入资金来源" v-model="model.fundingSource"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="验收日期"> <a-date-picker v-model="model.acceptanceCheckDate" value-format="YYYY-MM-DD" style="width:100%"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="出厂编号"> <a-input placeholder="请输入出厂编号" v-model="model.factoryNumber"/> @@ -184,14 +192,15 @@ <a-input placeholder="请输入资产来源国家" v-model="model.originCountry"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="设备规格"> <a-input placeholder="请输入设备规格" v-model="model.equipmentSpecification"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="总功率(KW)"> <a-input-number placeholder="请输入总功率(KW)" v-model="model.equipmentPower" :min="0" @@ -208,14 +217,15 @@ <a-date-picker v-model="model.warrantyEndDate" value-format="YYYY-MM-DD" style="width:100%"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="资产状态"> <j-dict-select-tag dict-code="asset_status" placeholder="请选择资产状态" v-model="model.assetStatus"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="本次三保日期"> <a-date-picker v-model="model.latestThirdMaintenance" value-format="YYYY-MM-DD" @@ -233,15 +243,16 @@ style="width: 100%"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="技术状态"> <j-dict-select-tag placeholder="请选择技术状态" dict-code="equipment_technology_status" v-model="model.technologyStatus"/> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="customSpan"> <a-form-model-item label="本次技术鉴定日期"> <a-date-picker v-model="model.latestTechnologyCheck" value-format="YYYY-MM-DD" @@ -359,7 +370,8 @@ //初始化默认值 this.model = { operationSystem: 1, fireExtinguisher: 0 fireExtinguisher: 0, trueHeatTreatment: 0 } this.visible = true }, @@ -370,6 +382,15 @@ this.visible = true }, /**\ * 单选框值发生改变时触发 * @param value 单选框值 * @param key 单选框关联字段 */ handleRadioChange(value, key) { if (value == '0') delete this.model[key] }, handleOk() { const that = this // 触发表单验证 src/views/eam/technical/modules/EamTechnicalStatusEvaluationOrderModal.vue
@@ -171,6 +171,7 @@ }, getDetailDataByOrderId({ id }) { this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = [] this.model.standardId = id this.spinning = true getAction(this.url.detail, { standardId: id }) src/views/flowable/workflow/FlowCompleted.vue
@@ -110,7 +110,7 @@ { title: '流程发起人名称', align: 'center', dataIndex: 'startUserName', dataIndex: 'proposer_dictText', width: 250 }, { src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
@@ -4,8 +4,8 @@ @cancel="handleCancel" centered cancelText="关闭"> <a-spin :spinning="spinning"> <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-row :gutter="24"> <a-col :span="8"> <a-row id="outer-row" :gutter="24"> <a-col :span="8" class="scroll-col"> <a-tabs> <a-tab-pane tab="基础信息"> <a-row> @@ -44,17 +44,20 @@ </a-tabs> </a-col> <a-col :span="model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'?10:16"> <a-col :span="model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION'?10:16" class="scroll-col"> <a-tabs :active-key="activeTabKey" @change="handleTabChange"> <a-tab-pane :key="1" tab="安全装置检查" forceRender v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='safety_equipment_check'||!Boolean(selectShenpiData.taskDefKey)"> v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='safety_equipment_check_confirm'||!Boolean(selectShenpiData.taskDefKey)"> <j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source :height="300" :dataSource="detail.safetyEquipmentCheckList" :columns="detail.safetyEquipmentCheckColumns"> <template v-slot:safetyEquipmentCheckResult="props"> <j-dict-select-tag v-model="props.row.safetyEquipmentCheckResult" :disabled="disableSubmit" <j-dict-select-tag v-model="props.row.safetyEquipmentCheckResult" placeholder="请选择检查结果" :disabled="disableSubmit||(model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')||(model.evaluationStatus=='UNDER_EVALUATION'&&selectShenpiData.taskDefKey=='safety_equipment_check_confirm')" @change="$refs['editableDetailTable'+activeTabKey].validateTable()" dictCode="yes_no_none" style="width: 100%"/> </template> @@ -72,8 +75,7 @@ </a-form-model-item> </a-col> <a-col :span="24"> <a-form-model-item prop="safetyCheckConfirmComment" :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="确认意见"> <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="确认意见"> <a-textarea placeholder="请输入意见" v-model="model.safetyCheckConfirmComment"/> </a-form-model-item> </a-col> @@ -83,12 +85,13 @@ </a-tab-pane> <a-tab-pane :key="2" tab="设备精度检查" forceRender v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='equipment_precision_check'||!Boolean(selectShenpiData.taskDefKey)"> v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='equipment_precision_check_confirm'||!Boolean(selectShenpiData.taskDefKey)"> <j-vxe-table ref="editableDetailTable2" rowNumber bordered alwaysEdit keep-source :height="300" :dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns"> <template v-slot:precisionCheckResult="props"> <a-input-number v-model="props.row.precisionCheckResult" :disabled="disableSubmit" <a-input-number v-model="props.row.precisionCheckResult" :disabled="disableSubmit||(model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')||(model.evaluationStatus=='UNDER_EVALUATION'&&selectShenpiData.taskDefKey=='equipment_precision_check_confirm')" @blur="$refs['editableDetailTable'+activeTabKey].validateTable()" placeholder="请输入检查结果" style="width: 100%"/> </template> @@ -117,12 +120,13 @@ </a-tab-pane> <a-tab-pane :key="3" tab="其他检查" forceRender v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='other_check'||!Boolean(selectShenpiData.taskDefKey)"> v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='other_check_confirm'||!Boolean(selectShenpiData.taskDefKey)"> <j-vxe-table ref="editableDetailTable3" rowNumber bordered alwaysEdit keep-source :height="300" :dataSource="detail.otherCheckList" :columns="detail.otherCheckColumns"> <template v-slot:otherCheckResult="props"> <a-textarea v-model="props.row.otherCheckResult" :rows="1" :disabled="disableSubmit" <a-textarea v-model="props.row.otherCheckResult" :rows="1" :disabled="disableSubmit||(model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')||(model.evaluationStatus=='UNDER_EVALUATION'&&selectShenpiData.taskDefKey=='other_check_confirm')" @blur="$refs['editableDetailTable'+activeTabKey].validateTable()" placeholder="请输入检查结果" :autoSize="false"/> @@ -159,7 +163,8 @@ </a-tabs> </a-col> <a-col :span="6" v-if="model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'"> <a-col :span="6" v-if="model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION'"> <a-tabs> <a-tab-pane tab="维修工确认"> <a-row> @@ -349,8 +354,8 @@ imageSrc: null, activeTabKey: 1, validatorRules: { confirmDealType: [ { required: true, message: '请选择通过或驳回!' } safetyCheckConfirmResult: [ { required: true, message: '请选择确认类型' } ], confirmComment: [ { required: true, message: '请输入确认意见!' } @@ -541,7 +546,7 @@ .catch(err => { this.$notification.error({ message: '消息', description: res.message description: err.message }) }) }, @@ -577,13 +582,16 @@ this.$refs.form.validate(valid => { if (valid) { that.confirmLoading = that.spinning = true for (let index = 1; index <= 3; index++) { if (that.$refs['editableDetailTable' + index]) { this.model.tableDetailList = that.$refs['editableDetailTable' + index].getTableData() break // 仅在鉴定中状态传递表格列表 if (this.model.evaluationStatus == 'UNDER_EVALUATION') { for (let index = 1; index <= 3; index++) { if (that.$refs['editableDetailTable' + index]) { this.model.tableDetailList = that.$refs['editableDetailTable' + index].getTableData() break } } } console.log('model', this.model.tableDetailList) httpAction(this.url.approval, this.model, 'put') .then((res) => { @@ -682,8 +690,29 @@ } </script> <style scoped> <style scoped lang="less"> /deep/ .ant-select-dropdown-menu { text-align: left; } /deep/ .ant-spin-nested-loading { height: 100%; .ant-spin-container { height: 100%; .ant-form { height: 100%; #outer-row { height: 100%; .scroll-col { height: 100%; overflow: auto; } } } } } </style>
