src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
@@ -48,10 +48,10 @@ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="applicationForm" title="设备保养计划表" width="80%" @close="closeDialog"> <div style="display: flex;align-items: center;"> <el-button v-if="operationType === 'edit'" size="small" type="primary" @click="addTableRow">添加</el-button> <el-button v-if="operationType === 'edit' || operationType === 'add'" size="small" type="primary" @click="addTableRow">添加</el-button> <span style="width: 60px;margin-left: 10px">年份:</span> <el-date-picker v-model="form.planYear" type="year" value-format="yyyy" clearable size="small" format="yyyy" placeholder="选择年" :disabled="operationType !== 'edit'"> placeholder="选择年" :disabled="operationType !== 'edit' && operationType !== 'add'"> </el-date-picker> </div> <div style="margin: 10px 0"> @@ -61,41 +61,41 @@ <el-table-column align="center" header-align="center" label="序号" type="index" width="60"></el-table-column> <el-table-column label="设备名称" min-width="170" prop="deviceName"> <template slot-scope="scope"> <el-input v-model="scope.row.deviceName" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.deviceName" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small"></el-input> </template> </el-table-column> <el-table-column label="设备编号" min-width="140" prop="deviceNumber"> <template slot-scope="scope"> <el-input v-model="scope.row.deviceNumber" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.deviceNumber" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small"></el-input> </template> </el-table-column> <el-table-column label="归属实验室" min-width="120" prop="storagePoint"> <template slot-scope="scope"> <el-input v-model="scope.row.storagePoint" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.storagePoint" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small"></el-input> </template> </el-table-column> <el-table-column label="保养关键部位" min-width="120" prop="maintenanceSite"> <template slot-scope="scope"> <el-input v-model="scope.row.maintenanceSite" :disabled="operationType !== 'edit'" clearable size="small" <el-input v-model="scope.row.maintenanceSite" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small" type="textarea"></el-input> </template> </el-table-column> <el-table-column label="保养内容" min-width="120" prop="maintenanceContent"> <template slot-scope="scope"> <el-input v-model="scope.row.maintenanceContent" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.maintenanceContent" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small" type="textarea"></el-input> </template> </el-table-column> <el-table-column label="保养周期" min-width="90" prop="maintenanceIntervals"> <template slot-scope="scope"> <el-input v-model="scope.row.maintenanceIntervals" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.maintenanceIntervals" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small"></el-input> </template> </el-table-column> <el-table-column fixed="right" label="操作" width="80" align="center" v-if="operationType === 'edit'"> <el-table-column label="操作" width="80" align="center" v-if="operationType === 'edit' || operationType === 'add'"> <template slot-scope="scope"> <el-button style="color: #f56c6c" type="text" @click="deleteRow(scope.$index)">删除</el-button> </template> @@ -104,7 +104,7 @@ </div> <span slot="footer" class="dialog-footer"> <el-button @click="closeDialog">取 消</el-button> <el-button v-if="operationType === 'edit'" :loading="submitFormLoading" type="primary" @click="submitForm">确 <el-button v-if="operationType === 'edit' || operationType === 'add'" :loading="submitFormLoading" type="primary" @click="submitForm">确 认</el-button> <el-button v-if="operationType === 'check'" :loading="submitFormLoading" type="primary" @click="checkStatus(0)">不通过</el-button> @@ -125,7 +125,7 @@ </el-table> <span slot="footer" class="dialog-footer"> <el-button @click="addEquipDia = false">取 消</el-button> <el-button v-if="operationType === 'edit'" :loading="submitFormLoading" type="primary" <el-button v-if="operationType === 'edit' || operationType === 'add'" :loading="submitFormLoading" type="primary" @click="changeMachineName">确 认</el-button> </span> src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
@@ -50,10 +50,10 @@ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="applicationForm" title="仪器设备量值溯源管理总体计划" width="80%" @close="closeDialog"> <div style="display: flex;align-items: center;"> <el-button v-if="operationType === 'edit'" size="small" type="primary" @click="addTableRow">添加</el-button> <el-button v-if="operationType === 'edit' || operationType === 'add'" size="small" type="primary" @click="addTableRow">添加</el-button> <span style="width: 60px;margin-left: 10px">年份:</span> <el-date-picker v-model="form.planYear" type="year" value-format="yyyy" clearable size="small" format="yyyy" placeholder="选择年" :disabled="operationType !== 'edit'"> placeholder="选择年" :disabled="operationType !== 'edit' && operationType !== 'add'"> </el-date-picker> </div> <div style="margin: 10px 0"> @@ -63,53 +63,53 @@ <el-table-column align="center" header-align="center" label="序号" type="index" width="60"></el-table-column> <el-table-column label="设备名称" min-width="170" prop="deviceId"> <template slot-scope="scope"> <el-input v-model="scope.row.deviceName" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.deviceName" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small"></el-input> </template> </el-table-column> <el-table-column label="型号" min-width="140" prop="specificationModel"> <template slot-scope="scope"> <el-input v-model="scope.row.specificationModel" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.specificationModel" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small"></el-input> </template> </el-table-column> <el-table-column label="设备编号" min-width="140" prop="managementNumber"> <template slot-scope="scope"> <el-input v-model="scope.row.managementNumber" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.managementNumber" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small"></el-input> </template> </el-table-column> <el-table-column label="技术指标参数" min-width="150" prop="technicalIndexParameters"> <template slot-scope="scope"> <el-input v-model="scope.row.technicalIndexParameters" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.technicalIndexParameters" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small" type="textarea"></el-input> </template> </el-table-column> <el-table-column label="技术指标要求" min-width="150" prop="technicalRequirements"> <template slot-scope="scope"> <el-input v-model="scope.row.technicalRequirements" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.technicalRequirements" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small" type="textarea"></el-input> </template> </el-table-column> <el-table-column label="检定周期" min-width="120" prop="verificationCycle"> <template slot-scope="scope"> <el-input v-model="scope.row.verificationCycle" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.verificationCycle" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small" type="textarea"></el-input> </template> </el-table-column> <el-table-column label="检定单位" min-width="90" prop="verificationUnit"> <template slot-scope="scope"> <el-input v-model="scope.row.verificationUnit" :disabled="operationType !== 'edit'" clearable <el-input v-model="scope.row.verificationUnit" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small" type="textarea"></el-input> </template> </el-table-column> <el-table-column label="备注" min-width="90" prop="remark"> <template slot-scope="scope"> <el-input v-model="scope.row.remark" :disabled="operationType !== 'edit'" clearable size="small" <el-input v-model="scope.row.remark" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small" type="textarea"></el-input> </template> </el-table-column> <el-table-column fixed="right" label="操作" width="80" align="center" v-if="operationType === 'edit'"> <el-table-column label="操作" width="80" align="center" v-if="operationType === 'edit' || operationType === 'add'"> <template slot-scope="scope"> <el-button style="color: #f56c6c" type="text" @click="deleteRow(scope.$index)">删除</el-button> </template> @@ -118,7 +118,7 @@ </div> <span slot="footer" class="dialog-footer"> <el-button @click="closeDialog">取 消</el-button> <el-button v-if="operationType === 'edit'" :loading="submitFormLoading" type="primary" @click="submitForm">确 <el-button v-if="operationType === 'edit' || operationType === 'add'" :loading="submitFormLoading" type="primary" @click="submitForm">确 认</el-button> <el-button v-if="operationType === 'check'" :loading="submitFormLoading" type="primary" @click="checkStatus(0)">不通过</el-button> @@ -138,7 +138,7 @@ </el-table> <span slot="footer" class="dialog-footer"> <el-button @click="addEquipDia = false">取 消</el-button> <el-button v-if="operationType === 'edit'" :loading="submitFormLoading" type="primary" <el-button v-if="operationType === 'edit' || operationType === 'add'" :loading="submitFormLoading" type="primary" @click="changeMachineName">确 认</el-button> </span> src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue
@@ -13,14 +13,14 @@ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="usageTableDia" title="设备保养计划表" width="80%" @close="closeDialog"> <div style="display: flex;align-items: center;"> <el-button size="small" type="primary" @click="addTableRow">添加</el-button> <el-button size="small" type="primary" @click="addTableRow" v-if="operationType !== 'check'">添加</el-button> <span style="width: 60px;margin-left: 10px">年份:</span> <el-date-picker v-model="form.impowerYear" type="year" value-format="yyyy" clearable size="small" format="yyyy" placeholder="选择年"> placeholder="选择年" :disabled="operationType === 'check'"> </el-date-picker> </div> <div style="margin: 10px 0"> <el-table ref="usageTableData" :data="usageTableData" id="templateParamTable" row-key="deviceId" <el-table ref="deviceImpowerDetails" :data="deviceImpowerDetails" id="templateParamTable" row-key="deviceId" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border height="560px" style="width: 100% ;"> <el-table-column align="center" header-align="center" label="序号" type="index" width="60"></el-table-column> @@ -30,15 +30,15 @@ size="small" :disabled="operationType === 'check'"></el-input> </template> </el-table-column> <el-table-column label="设备编号" min-width="140" prop="deviceNumber"> <el-table-column label="设备编号" min-width="140" prop="managementNumber"> <template slot-scope="scope"> <el-input v-model="scope.row.deviceNumber" clearable <el-input v-model="scope.row.managementNumber" clearable size="small" :disabled="operationType === 'check'"></el-input> </template> </el-table-column> <el-table-column label="规格型号" min-width="120" prop="model"> <el-table-column label="规格型号" min-width="120" prop="specificationModel"> <template slot-scope="scope"> <el-input v-model="scope.row.model" clearable <el-input v-model="scope.row.specificationModel" clearable size="small" :disabled="operationType === 'check'"></el-input> </template> </el-table-column> @@ -48,7 +48,7 @@ :disabled="operationType === 'check'"></el-input> </template> </el-table-column> <el-table-column label="被授权人" min-width="120" prop="delegatee"> <el-table-column label="被授权人" min-width="160" prop="delegatee"> <template slot-scope="scope"> <el-select v-model="scope.row.delegatedUserArr" clearable filterable multiple @@ -59,7 +59,7 @@ </el-select> </template> </el-table-column> <el-table-column fixed="right" label="操作" width="80" align="center"> <el-table-column label="操作" width="80" align="center" v-if="operationType !== 'check'"> <template slot-scope="scope"> <el-button style="color: #f56c6c" type="text" @click="deleteRow(scope.$index)">删除</el-button> </template> @@ -91,7 +91,7 @@ <el-table-column type="selection" width="55"></el-table-column> <el-table-column label="设备名称" prop="label" width="190"></el-table-column> <el-table-column prop="value" label="设备编号" width="130"></el-table-column> <el-table-column prop="managementNumber" label="归属实验室"></el-table-column> <el-table-column prop="storagePoint" label="归属实验室"></el-table-column> </el-table> <span slot="footer" class="dialog-footer"> <el-button @click="addEquipDia = false">取 消</el-button> @@ -140,6 +140,29 @@ { label: '授权人', prop: 'audit' }, { label: '授权日期', prop: 'auditDate' }, { dataType: 'tag', label: '授权状态', prop: 'status', formatData: (params) => { if (params === 1) { return '已授权' } else if (params == 0) { return '未授权' } else { return null } }, formatType: (params) => { if (params == 1) { return 'success' } else if (params === 0) { return 'danger' } else { return null } } }, { dataType: 'action', label: '操作', operation: [ @@ -149,12 +172,18 @@ clickFun: (row) => { this.openDia('edit', row); }, disabled: (row) => { return row.status === 1; }, }, { name: '授权', type: 'text', clickFun: (row) => { this.openDia('check', row); }, disabled: (row) => { return row.status === 1; }, }, { @@ -163,6 +192,9 @@ clickFun: (row) => { this.handleDeleteClick(row); }, disabled: (row) => { return row.status === 1; }, }, ] } @@ -170,7 +202,7 @@ responsibleOptions: [], operationType: '', usageTableDia: false, usageTableData: [], deviceImpowerDetails: [], submitFormLoading: false, addEquipDia: false, equipOptions: [], @@ -215,15 +247,18 @@ this.usageTableDia = true this.form = { impowerYear: '', usageTableData: [], deviceImpowerDetails: [], } this.usageTableData = [] this.deviceImpowerDetails = [] if (row) { this.impowerId = row.impowerId getImpowerDetail({ impowerId: this.impowerId }).then(res => { if (res.code === 200) { this.form = res.data this.usageTableData = this.form.usageTableData this.deviceImpowerDetails = this.form.deviceImpowerDetails this.deviceImpowerDetails.forEach(item => { this.$set(item, 'delegatedUserArr', item.delegatedUser.split(',')) }) } }).catch(error => { console.error(error) @@ -244,12 +279,12 @@ }, // 删除表格行 deleteRow(index) { this.usageTableData.splice(index, 1) this.deviceImpowerDetails.splice(index, 1) }, // 提交新增和修改 submitForm() { this.form.usageTableData = this.HaveJson(this.usageTableData) this.form.usageTableData.forEach((item) => { this.form.deviceImpowerDetails = this.HaveJson(this.deviceImpowerDetails) this.form.deviceImpowerDetails.forEach((item) => { item.delegatedUser = item.delegatedUserArr.join(',') }) this.submitFormLoading = true @@ -301,7 +336,7 @@ changeMachineName() { this.deviceMaintenancePlanDetails = [] this.selectionRows.map(val => { this.usageTableData.push({ deviceId: val.id, deviceName: val.label, deviceNumber: val.value, model: val.specificationModel, delegatedUserArr: this.delegatedUser }) this.deviceImpowerDetails.push({ deviceId: val.id, deviceName: val.label, managementNumber: val.value, specificationModel: val.specificationModel, delegatedUserArr: this.delegatedUser }) }) this.addEquipDia = false }, @@ -313,6 +348,7 @@ this.equipOptions = res.data.map(m => { m.value = m.managementNumber m.label = m.deviceName m.storagePoint = m.storagePoint return m }) } @@ -333,7 +369,7 @@ cancelButtonText: '取消', type: 'warning' }).then(() => { deleteImpower({ id: row.impowerId }).then(res => { deleteImpower({ impowerId: row.impowerId }).then(res => { this.$message({ type: 'success', message: '删除成功!'