From 3457909638c660c0cfcb521b6104ab64c679b914 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 19 九月 2023 16:23:16 +0800
Subject: [PATCH] 修改页面左右展示比例
---
src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue | 252 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 172 insertions(+), 80 deletions(-)
diff --git a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
index bd4fd00..c8e3d28 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
@@ -1,38 +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'"
- />-->
- <a-select
- :placeholder="'璇烽�夋嫨鐢宠閮ㄩ棬'"
- :options="this.departs"
+ <!-- <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%"
- v-model='model.departId'
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨鐢宠閮ㄩ棬"
+ tree-default-expand-all
+ 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>
@@ -41,24 +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'
- :rowNumber='true'
- :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'>
@@ -68,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>
@@ -81,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],
@@ -92,6 +100,8 @@
},
data() {
return {
+ treeData: [],
+ bordered: true,
departs: [],
labelCol: {
xs: { span: 24 },
@@ -133,6 +143,7 @@
title: '澶囦欢缂栫爜',
key: 'spareNum',
fixed: 'left',
+ align: 'center',
type: JVXETypes.normal,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
@@ -141,6 +152,7 @@
{
title: '澶囦欢鍚嶇О',
key: 'spareName',
+ align: 'center',
fixed: 'left',
type: JVXETypes.normal,
width: '200px',
@@ -151,6 +163,7 @@
title: '鍨嬪彿',
key: 'model',
type: JVXETypes.normal,
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -159,61 +172,69 @@
title: '瑙勬牸',
key: 'specification',
type: JVXETypes.normal,
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitIdName',
type: JVXETypes.normal,
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitId',
type: JVXETypes.hidden,
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
- {
- title: '杈呭崟浣�',
- key: 'auxiliaryUnitIdName',
- type: JVXETypes.normal,
- width: '200px',
- placeholder: '璇疯緭鍏�${title}',
- defaultValue: ''
- },
- {
- title: '杈呭崟浣�',
- key: 'auxiliaryUnitId',
- type: JVXETypes.hidden,
- 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',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0,
- formatter({ cellValue, row, column }) {
+ /* 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)
- if (cellValue != null) {
- let conversionRatio = row.conversionRatio
-
- row.auxiliaryQuantity = Math.abs(cellValue * conversionRatio)
-
- }
- return cellValue
-
- },
+ }
+ console.log(cellValue)
+ return cellValue
+ }, */
validateRules: [
{
required: true,
@@ -231,18 +252,20 @@
]
},
- {
- title: '杈呮暟閲�',
- key: 'auxiliaryQuantity',
- type: JVXETypes.normal,
- width: '200px',
- 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',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -251,6 +274,7 @@
title: '鎹㈢畻姣斾緥',
key: 'conversionRatio',
type: JVXETypes.hidden,
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -260,6 +284,7 @@
title: '闇�姹傛棩鏈�',
key: 'requirementTime',
type: JVXETypes.date,
+ align: 'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: '',
@@ -277,7 +302,9 @@
add: '/spare/sparePartRequirement/add',
edit: '/spare/sparePartRequirement/edit',
queryById: '/spare/sparePartRequirement/queryById',
- getSysDeparts: "/eam/equipment/getSysDeparts",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+ getSysDeparts: '/eam/equipment/getSysDeparts',
+ getNum: '/eam/sysIdentity/getNumNew',
sparesScrapRequirementDetail: {
list: '/spare/sparePartRequirement/querySparesScrapRequirementDetailByMainId'
}
@@ -310,9 +337,69 @@
})
},
created() {
- this.getSysDeparts()
+ this.initOptions()
+ this.initNum()
},
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 });
+ }
+ })
+ });
+ }
+ }, */
+
+ initNum() {
+ getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => {
+ if (res.success) {
+ this.model.num = res.message
+
+ /* this.model.setFieldsValue({ num: res.message }); */
+ }
+ })
+ },
+
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
getSysDeparts() {
getAction(this.url.getSysDeparts).then((res) => {
if (res.success) {
@@ -359,8 +446,6 @@
auxiliaryUnitId: data[i].auxiliaryUnitId,
mainUnitIdName: data[i].mainUnitId_dictText,
auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText,
- mainQuantity: data[i].mainQuantity,
- auxiliaryQuantity: data[i].auxiliaryQuantity,
requirementTime: data[i].requirementTime,
conversionRatio: data[i].conversionRatio
@@ -391,8 +476,8 @@
//鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
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) => {
@@ -424,6 +509,13 @@
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)
+ }
+ } */
}
}
</script>
--
Gitblit v1.9.3