From 28189102d735bfc2c41720d1ef292bd9024b49f2 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 18 四月 2024 11:21:01 +0800
Subject: [PATCH] 1、首页 （1）设备级看板单击设备效率统计仪表盘图标跳转至统计分析页面并根据唯一编号筛选页面对应数据 （2）设备级看板点击设备班次按钮跳转至工作日历页面并根据设备编号筛选页面对应数据 （3）增加所有层级看板图表数据加载动画 （4）公司级以及分厂级看板利用率胶囊以及上月OEE车间单柱图表轴线刻度最大值采用动态设置方式而非固定100% （5）工段级看板上月OEE单柱图表轴线刻度最大值采用动态设置方式而非固定100% （6）工段级看板单击前7天利用率图表跳转至统计分析页面并根据唯一编号筛选页面对应数据 （7）工段级看板单击上月OEE图表跳转至设备综合效率分析页面并根据唯一编号筛选页面对应数据 2、调整全局导航栏页签间距，以便能在不超出导航栏的情况下同时放置更多页面页签
---
src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue | 255 ++++++++++++++++++++++++++++++---------------------
1 files changed, 150 insertions(+), 105 deletions(-)
diff --git a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
index 29ded9d..12d4781 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
@@ -1,46 +1,46 @@
<template>
- <a-spin :spinning='confirmLoading'>
- <j-form-container :disabled='formDisabled'>
+ <a-spin :spinning="confirmLoading">
+ <j-form-container :disabled="formDisabled">
<!-- 涓昏〃鍗曞尯鍩� -->
- <a-form-model ref='form' :model='model' :rules='validatorRules' slot='detail'>
+ <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
- <a-col :span='12'>
- <a-form-model-item label='鍗曟嵁鍙�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='num'>
- <a-input v-model='model.num' placeholder='璇疯緭鍏ュ崟鎹彿'></a-input>
+ <a-col :span="12">
+ <a-form-model-item label="鍗曟嵁鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+ <a-input v-model="model.num" placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚" :disabled="true"></a-input>
</a-form-model-item>
</a-col>
- <a-col :span='12'>
- <a-form-model-item label='鐢宠閮ㄩ棬' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='departId'>
+ <a-col :span="12">
+ <a-form-model-item label="鐢宠閮ㄩ棬" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId">
<!-- <a-input v-model="model.departId" placeholder="璇疯緭鍏ラ鐢ㄩ儴闂↖D" ></a-input>-->
-<!-- <j-dict-select-tag
- allow-clear
- :placeholder="'璇烽�夋嫨鐢宠閮ㄩ棬'"
- v-model='model.departId'
- dictCode="sys_depart,depart_name,id,del_flag!='1'"
- />-->
+ <!-- <j-dict-select-tag
+ allow-clear
+ :placeholder="'璇烽�夋嫨鐢宠閮ㄩ棬'"
+ v-model='model.departId'
+ dictCode="sys_depart,depart_name,id,del_flag!='1'"
+ />-->
<a-tree-select
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
:tree-data="treeData"
placeholder="璇烽�夋嫨鐢宠閮ㄩ棬"
tree-default-expand-all
- v-model='model.departId'
+ v-model="model.departId"
/>
-<!-- <a-select
- :placeholder="'璇烽�夋嫨鐢宠閮ㄩ棬'"
- :options="this.departs"
- style="width: 100%"
- v-model='model.departId'
- />-->
+ <!-- <a-select
+ :placeholder="'璇烽�夋嫨鐢宠閮ㄩ棬'"
+ :options="this.departs"
+ style="width: 100%"
+ v-model='model.departId'
+ />-->
</a-form-model-item>
</a-col>
- <a-col :span='12'>
- <a-form-model-item label='澶囨敞' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='remark'>
+ <a-col :span="12">
+ <a-form-model-item label="澶囨敞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
<!-- <a-input v-model="model.userId" placeholder="璇疯緭鍏ラ鐢ㄤ汉鍛業D" ></a-input>-->
<a-textarea
allow-clear
:placeholder="'璇疯緭鍏ュ娉�'"
- v-model='model.remark'
+ v-model="model.remark"
/>
</a-form-model-item>
</a-col>
@@ -49,26 +49,26 @@
</a-form-model>
</j-form-container>
<!-- 瀛愯〃鍗曞尯鍩� -->
- <a-tabs v-model='activeKey' @change='handleChangeTabs'>
- <a-tab-pane tab='澶囦欢鎶ュ簾鏄庣粏琛�' :key='refKeys[0]' :forceRender='true'>
+ <a-tabs v-model="activeKey" @change="handleChangeTabs">
+ <a-tab-pane tab="澶囦欢鎶ュ簾鏄庣粏琛�" :key="refKeys[0]" :forceRender="true">
<j-vxe-table
keep-source
- :ref='refKeys[0]'
- :loading='sparesScrapRequirementDetailTable.loading'
- :columns='sparesScrapRequirementDetailTable.columns'
- :dataSource='sparesScrapRequirementDetailTable.dataSource'
- :maxHeight='300'
- :disabled='formDisabled'
- :alwaysEdit='true'
- :rowNumber='true'
- :bordered='bordered'
- :rowSelection='true'
- :toolbar='true'
- :toolbarConfig='toolbarConfig'
+ :ref="refKeys[0]"
+ :loading="sparesScrapRequirementDetailTable.loading"
+ :columns="sparesScrapRequirementDetailTable.columns"
+ :dataSource="sparesScrapRequirementDetailTable.dataSource"
+ :maxHeight="300"
+ :disabled="formDisabled"
+ :alwaysEdit="true"
+ :rowNumber="true"
+ :bordered="bordered"
+ :rowSelection="true"
+ :toolbar="true"
+ :toolbarConfig="toolbarConfig"
>
- <template slot='toolbarPrefix'>
- <a-button type='primary' @click='selectEquipmentList' :disabled='formDisabled'>閫夋嫨澶囦欢
+ <template slot="toolbarPrefix">
+ <a-button type="primary" @click="selectEquipmentList" :disabled="formDisabled">閫夋嫨澶囦欢
</a-button>
</template>
<!-- <template slot='toolbarPrefix'>
@@ -78,8 +78,7 @@
</j-vxe-table>
</a-tab-pane>
</a-tabs>
- <spare-select-list ref='SparesSelectModal'></spare-select-list>
- <!-- <spare-requirement-select-modal ref='SpareRequirementSelecModal'></spare-requirement-select-modal>-->
+ <spare-select-list ref="SparesSelectModal"></spare-select-list>
</a-spin>
</template>
@@ -91,7 +90,6 @@
import JFormContainer from '@comp/jeecg/JFormContainer'
import SpareSelectList from './SpareSelectList'
import { getAction } from '@api/manage'
-/*import SpareRequirementSelectModal from './SpareRequirementSelectModal'*/
export default {
name: 'SparePartScrapRequirementForm',
mixins: [JVxeTableModelMixin],
@@ -102,8 +100,8 @@
},
data() {
return {
- treeData:[],
- bordered:true,
+ treeData: [],
+ bordered: true,
departs: [],
labelCol: {
xs: { span: 24 },
@@ -145,7 +143,7 @@
title: '澶囦欢缂栫爜',
key: 'spareNum',
fixed: 'left',
- align:'center',
+ align: 'center',
type: JVXETypes.normal,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
@@ -154,7 +152,7 @@
{
title: '澶囦欢鍚嶇О',
key: 'spareName',
- align:'center',
+ align: 'center',
fixed: 'left',
type: JVXETypes.normal,
width: '200px',
@@ -165,7 +163,7 @@
title: '鍨嬪彿',
key: 'model',
type: JVXETypes.normal,
- align:'center',
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -174,7 +172,7 @@
title: '瑙勬牸',
key: 'specification',
type: JVXETypes.normal,
- align:'center',
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -184,7 +182,7 @@
title: '鍗曚綅',
key: 'mainUnitIdName',
type: JVXETypes.normal,
- align:'center',
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -193,50 +191,50 @@
title: '鍗曚綅',
key: 'mainUnitId',
type: JVXETypes.hidden,
- align:'center',
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
- /* {
- title: '杈呭崟浣�',
- key: 'auxiliaryUnitIdName',
- align:'center',
- type: JVXETypes.normal,
- width: '200px',
- placeholder: '璇疯緭鍏�${title}',
- defaultValue: ''
- },
- {
- title: '杈呭崟浣�',
- key: 'auxiliaryUnitId',
- type: JVXETypes.hidden,
- align:'center',
- width: '200px',
- placeholder: '璇疯緭鍏�${title}',
- defaultValue: ''
- }, */
+ /* {
+ title: '杈呭崟浣�',
+ key: 'auxiliaryUnitIdName',
+ align:'center',
+ type: JVXETypes.normal,
+ width: '200px',
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue: ''
+ },
+ {
+ title: '杈呭崟浣�',
+ key: 'auxiliaryUnitId',
+ type: JVXETypes.hidden,
+ align:'center',
+ width: '200px',
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue: ''
+ }, */
{
title: '涓绘暟閲�',
key: 'mainQuantity',
type: JVXETypes.inputNumber,
- align:'center',
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0,
-/* Function({cellValue, row, column}){
- console.log(cellValue)
- console.log(row)
- console.log(column)
- if (cellValue != null) {
- let conversionRatio = row.conversionRatio
- console.log(conversionRatio)
- row.auxiliaryQuantity = Math.abs(cellValue * conversionRatio)
+ /* Function({cellValue, row, column}){
+ console.log(cellValue)
+ console.log(row)
+ console.log(column)
+ if (cellValue != null) {
+ let conversionRatio = row.conversionRatio
+ console.log(conversionRatio)
+ row.auxiliaryQuantity = Math.abs(cellValue * conversionRatio)
- }
- console.log(cellValue)
- return cellValue
- }, */
+ }
+ console.log(cellValue)
+ return cellValue
+ }, */
validateRules: [
{
required: true,
@@ -254,20 +252,20 @@
]
},
- /* {
- title: '杈呮暟閲�',
- key: 'auxiliaryQuantity',
- type: JVXETypes.normal,
- width: '200px',
- align:'center',
- placeholder: '璇疯緭鍏�${title}',
- defaultValue: 0
- }, */
+ /* {
+ title: '杈呮暟閲�',
+ key: 'auxiliaryQuantity',
+ type: JVXETypes.normal,
+ width: '200px',
+ align:'center',
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue: 0
+ }, */
{
title: '澶囦欢id',
key: 'sparePartId',
type: JVXETypes.hidden,
- align:'center',
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -276,7 +274,7 @@
title: '鎹㈢畻姣斾緥',
key: 'conversionRatio',
type: JVXETypes.hidden,
- align:'center',
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -286,7 +284,7 @@
title: '闇�姹傛棩鏈�',
key: 'requirementTime',
type: JVXETypes.date,
- align:'center',
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: '',
@@ -305,7 +303,8 @@
edit: '/spare/sparePartRequirement/edit',
queryById: '/spare/sparePartRequirement/queryById',
loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
- getSysDeparts: "/eam/equipment/getSysDeparts",
+ getSysDeparts: '/eam/equipment/getSysDeparts',
+ getNum: '/eam/sysIdentity/getNumNew',
sparesScrapRequirementDetail: {
list: '/spare/sparePartRequirement/querySparesScrapRequirementDetailByMainId'
}
@@ -341,6 +340,46 @@
this.initOptions()
},
methods: {
+
+ /* edit(record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.disableSubmit = false;
+ this.auxiliaryUnits = record.auxiliaryUnits
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model,
+ 'num',
+ 'name',
+ 'specification',
+ 'model',
+ 'constructorId',
+ 'mainUnitId',
+ 'auxiliaryUnitId',
+ 'conversionRatio',
+ 'validityPeriod',
+ 'validityPeriodUnitId',
+ 'inventoryUpperLimit',
+ 'inventoryLowerLimit',
+ 'economicOrderQuantity',
+ 'purchaseLeadTime',
+ 'inventoryWarnLimit',
+ 'remark'));
+ });
+ if (record.id) {
+ this.codeDisable = true;
+ } else {
+ this.codeDisable = false;
+ this.$nextTick(() => {
+ getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => {
+ if (res.success) {
+ this.form.setFieldsValue({ num: res.message });
+ }
+ })
+ });
+ }
+ }, */
+
initOptions() {
getAction(this.url.loadOptions).then(res => {
if (res.success) {
@@ -421,13 +460,19 @@
if (this.model.id) {
let params = { id: this.model.id }
this.requestSubTableData(this.url.sparesScrapRequirementDetail.list, params, this.sparesScrapRequirementDetailTable)
+ }else{
+ getAction(this.url.getNum, { type: 'SparePartRequirement', length: '4' }).then((res) => {
+ if (res.success) {
+ this.model.num = res.message
+ }
+ })
}
},
//鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
validateSubForm(allValues) {
let tableData = this.$refs.sparesScrapRequirementDetail.getTableData()
- if(tableData.length == 0){
- this.$message.warning("璇锋坊鍔犲姞鎶ュ簾鏄庣粏!");
+ if (tableData.length == 0) {
+ this.$message.warning('璇锋坊鍔犲姞鎶ュ簾鏄庣粏!')
return
}
return new Promise((resolve, reject) => {
@@ -458,14 +503,14 @@
this.visible = false
this.$emit('close')
this.$refs.form.clearValidate()
- },
-/* changeAuxiliaryQuantity(target){
- console.log(target.columnIndex)
- let num=target.columnIndex
- if (target.columnIndex ===num){
- target.row.auxiliaryQuantity=Math.abs(target.row.conversionRatio*target.row.mainQuantity)
- }
- } */
+ }
+ /* changeAuxiliaryQuantity(target){
+ console.log(target.columnIndex)
+ let num=target.columnIndex
+ if (target.columnIndex ===num){
+ target.row.auxiliaryQuantity=Math.abs(target.row.conversionRatio*target.row.mainQuantity)
+ }
+ } */
}
}
</script>
--
Gitblit v1.9.3