From 2b4abfa6fc83152b800a7696636fe682b7ec6cbf Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 一月 2024 16:39:50 +0800
Subject: [PATCH] 问题项修改
---
src/views/eam/modules/precisionParametersTemplate/PrecisionParametersTemplateEditForm.vue | 424 +++++++++++++++++++++++++++-------------------------
1 files changed, 222 insertions(+), 202 deletions(-)
diff --git a/src/views/eam/modules/precisionParametersTemplate/PrecisionParametersTemplateEditForm.vue b/src/views/eam/modules/precisionParametersTemplate/PrecisionParametersTemplateEditForm.vue
index a6421e9..174a8f4 100644
--- a/src/views/eam/modules/precisionParametersTemplate/PrecisionParametersTemplateEditForm.vue
+++ b/src/views/eam/modules/precisionParametersTemplate/PrecisionParametersTemplateEditForm.vue
@@ -2,7 +2,12 @@
<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 :gutter="24">
<a-col :span="12">
<a-form-model-item
@@ -12,15 +17,15 @@
prop="num"
>
<a-auto-complete
- v-model="model.num"
- :data-source="numList"
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ョ簿搴﹀弬鏁版ā鏉跨紪鐮�"
- @search="onSearchNums"
+ v-model="model.num"
+ :data-source="numList"
+ :disabled="formDisabled"
+ placeholder="璇疯緭鍏ョ簿搴﹀弬鏁版ā鏉跨紪鐮�"
+ @search="onSearchNums"
/>
</a-form-model-item>
</a-col>
- <a-col :span="12" >
+ <a-col :span="12">
<a-form-model-item
label="鍚嶇О"
:labelCol="labelCol"
@@ -55,9 +60,16 @@
</a-row>
</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]"
@@ -72,218 +84,226 @@
bordered
:alwaysEdit="true"
:toolbarConfig='toolbarConfig'
- >
+ >
<!-- @valueChange="changeDate" -->
<template slot='toolbarPrefix'>
- <a-button type='primary' @click='precisionParametersDetailSelect' :disabled="formDisabled" icon="plus">閫夋嫨绮惧害鍙傛暟
+ <a-button
+ type='primary'
+ @click='precisionParametersDetailSelect'
+ :disabled="formDisabled"
+ icon="plus"
+ >閫夋嫨绮惧害鍙傛暟
</a-button>
</template>
</j-vxe-table>
</a-tab-pane>
</a-tabs>
- <j-select-precision-parameters-modal @selectionRows='selectionRows' ref='JSelectPrecisionParametersModal' ></j-select-precision-parameters-modal>
+ <j-select-precision-parameters-modal
+ @selectionRows='selectionRows'
+ ref='JSelectPrecisionParametersModal'
+ ></j-select-precision-parameters-modal>
</a-spin>
</template>
<script>
- import { getAction } from '@/api/manage'
- import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
- import { duplicateCheck } from '@/api/api'
- import { JVXETypes } from '@/components/jeecg/JVxeTable'
- import { getRefPromise,VALIDATE_FAILED} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
- import { validateDuplicateValue } from '@/utils/util'
- import JFormContainer from '@/components/jeecg/JFormContainer'
-
-
- import dayjs from 'dayjs'
- import JSelectPrecisionParametersModal from './JSelectPrecisionParametersModal'
- export default {
- name: 'PrecisionParameters',
- mixins: [JVxeTableModelMixin],
- components: {
- JFormContainer,
- dayjs,
- JSelectPrecisionParametersModal
- },
- data() {
- return {
- toolbarConfig: {
+import { getAction } from '@/api/manage'
+import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
+import { duplicateCheck } from '@/api/api'
+import { JVXETypes } from '@/components/jeecg/JVxeTable'
+import { getRefPromise, VALIDATE_FAILED } from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
+import { validateDuplicateValue } from '@/utils/util'
+import JFormContainer from '@/components/jeecg/JFormContainer'
+
+
+import dayjs from 'dayjs'
+import JSelectPrecisionParametersModal from './JSelectPrecisionParametersModal'
+export default {
+ name: 'PrecisionParameters',
+ mixins: [JVxeTableModelMixin],
+ components: {
+ JFormContainer,
+ dayjs,
+ JSelectPrecisionParametersModal
+ },
+ data() {
+ return {
+ toolbarConfig: {
// prefix 鍓嶇紑锛泂uffix 鍚庣紑
slot: ['prefix', 'suffix'],
// add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
btn: ['remove', 'clearSelection']
- },
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 },
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 },
- },
- model:{
- },
- // 鏂板鏃跺瓙琛ㄩ粯璁ゆ坊鍔犲嚑琛岀┖鏁版嵁
- addDefaultRowNum: 0,
- validatorRules: {
- num: [
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ model: {
+ },
+ // 鏂板鏃跺瓙琛ㄩ粯璁ゆ坊鍔犲嚑琛岀┖鏁版嵁
+ addDefaultRowNum: 0,
+ validatorRules: {
+ num: [
{ required: true, message: '璇疯緭鍏ョ紪鐮�!' },
{ min: 1, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateNum },
],
- name: [
+ name: [
{ required: true, message: '璇疯緭鍏ュ悕绉�!' },
{ min: 1, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
],
- },
- refKeys: ['precisionParametersList', ],
- tableKeys:['precisionParametersList', ],
- activeKey: 'precisionParametersList',
- precisionParameters: {
- loading: false,
- dataSource: [],
- columns: [
- {
- title: 'id',
- key: 'id',
- type: JVXETypes.hidden,
- disabled:true,
- align:'center',
- },
- {
- title: '妫�楠岄」鐩悕绉�',
- key: 'precisionParametersName',
- type: JVXETypes.normal,
- width:"350px",
- placeholder: '璇疯緭鍏�${title}',
- disabled:true,
- align:'center',
- defaultValue:'',
- },
- {
- title: '鏂瑰悜',
- key: 'precisionParametersUda1',
- type: JVXETypes.normal,
- width:"350px",
- placeholder: '璇疯緭鍏�${title}',
- disabled:true,
- align:'center',
- defaultValue:'',
- },
- {
- title: '鍏佸樊锛坢m锛�',
- key: 'tolerance',
- type: JVXETypes.input,
- width:"350px",
- placeholder: '璇疯緭鍏�${title}',
- align:'center',
- validateRules: [
- { handler({ cellValue, row, column }, callback, target) {
- const regex = /^[+]?\d*\.?\d+\/[+]?\d*\.?\d+$/;
- if (!new RegExp(regex).test(cellValue)&&cellValue!=null) {
- callback(false, '鍏佸樊瑕佺鍚堛�愪笂闄�/璺濈銆戠殑濉啓瑙勫垯锛屽: 0.16/300') // false = 鏈�氳繃锛屽彲浠ヨ窡鑷畾涔夋彁绀�
- } else {
- callback(true) // true = 閫氳繃楠岃瘉
- }
- },
- message: '${title}榛樿鎻愮ず'
- },
- ]
- },
- ]
- },
- url: {
- getNums:'/eam/precisionParametersTemplate/getNums',
- add: '/eam/precisionParametersTemplate/addNew',
- edit:'/eam/precisionParametersTemplate/editNew',
- precisionParametersList: {
- list: '/eam/precisionParametersTemplateDetail/listByPrecisionParametersTemplateId'
+ },
+ refKeys: ['precisionParametersList',],
+ tableKeys: ['precisionParametersList',],
+ activeKey: 'precisionParametersList',
+ precisionParameters: {
+ loading: false,
+ dataSource: [],
+ columns: [
+ {
+ title: 'id',
+ key: 'id',
+ type: JVXETypes.hidden,
+ disabled: true,
+ align: 'center',
},
+ {
+ title: '妫�楠岄」鐩悕绉�',
+ key: 'precisionParametersName',
+ type: JVXETypes.normal,
+ width: "350px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled: true,
+ align: 'center',
+ defaultValue: '',
+ },
+ {
+ title: '鏂瑰悜',
+ key: 'precisionParametersUda1',
+ type: JVXETypes.normal,
+ width: "350px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled: true,
+ align: 'center',
+ defaultValue: '',
+ },
+ {
+ title: '鍏佸樊锛坢m锛�',
+ key: 'tolerance',
+ type: JVXETypes.input,
+ width: "350px",
+ placeholder: '璇疯緭鍏�${title}',
+ align: 'center',
+ // validateRules: [
+ // { handler({ cellValue, row, column }, callback, target) {
+ // const regex = /^[+]?\d*\.?\d+\/[+]?\d*\.?\d+$/;
+ // if (!new RegExp(regex).test(cellValue)&&cellValue!=null) {
+ // callback(false, '鍏佸樊瑕佺鍚堛�愪笂闄�/璺濈銆戠殑濉啓瑙勫垯锛屽: 0.16/300') // false = 鏈�氳繃锛屽彲浠ヨ窡鑷畾涔夋彁绀�
+ // } else {
+ // callback(true) // true = 閫氳繃楠岃瘉
+ // }
+ // },
+ // message: '${title}榛樿鎻愮ず'
+ // },
+ // ]
+ },
+ ]
+ },
+ url: {
+ getNums: '/eam/precisionParametersTemplate/getNums',
+ add: '/eam/precisionParametersTemplate/addNew',
+ edit: '/eam/precisionParametersTemplate/editNew',
+ precisionParametersList: {
+ list: '/eam/precisionParametersTemplateDetail/listByPrecisionParametersTemplateId'
},
- numList:[],
+ },
+ numList: [],
+ }
+ },
+ props: {
+ //琛ㄥ崟绂佺敤
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ },
+ },
+ computed: {
+ formDisabled() {
+ return this.disabled
+ },
+ },
+ created() {
+ },
+ methods: {
+ addBefore() {
+ this.precisionParameters
+
+ },
+ getAllTable() {
+ let values = this.tableKeys.map(key => getRefPromise(this, key))
+ return Promise.all(values)
+ },
+ /** 璋冪敤瀹宔dit()鏂规硶涔嬪悗浼氳嚜鍔ㄨ皟鐢ㄦ鏂规硶 */
+ editAfter() {
+ this.$nextTick(() => {
+ })
+ // 鍔犺浇瀛愯〃鏁版嵁
+ if (this.model.id) {
+ let params = {
+ precisionParametersTemplateId: this.model.id,
+ pageSize: 9999,
+ }
+ this.requestSubTableData(this.url.precisionParametersList.list, params, this.precisionParameters)
+ }
+ if (this.model.num == '') {
+ this.model.id = ''
}
},
- props: {
- //琛ㄥ崟绂佺敤
- disabled: {
- type: Boolean,
- default: false,
- required: false
- },
- },
- computed: {
- formDisabled(){
- return this.disabled
- },
- },
- created () {
- },
- methods: {
- addBefore(){
- this.precisionParameters
-
- },
- getAllTable() {
- let values = this.tableKeys.map(key => getRefPromise(this, key))
- return Promise.all(values)
- },
- /** 璋冪敤瀹宔dit()鏂规硶涔嬪悗浼氳嚜鍔ㄨ皟鐢ㄦ鏂规硶 */
- editAfter() {
- this.$nextTick(() => {
- })
- // 鍔犺浇瀛愯〃鏁版嵁
- if (this.model.id) {
- let params = {
- precisionParametersTemplateId: this.model.id,
- pageSize:9999,
+ //鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
+ validateSubForm(allValues) {
+ return new Promise((resolve, reject) => {
+ Promise.all([
+ ]).then(() => {
+ resolve(allValues)
+ }).catch(e => {
+ if (e.error === VALIDATE_FAILED) {
+ // 濡傛灉鏈夋湭閫氳繃琛ㄥ崟楠岃瘉鐨勫瓙琛紝灏辫嚜鍔ㄨ烦杞埌瀹冩墍鍦ㄧ殑tab
+ this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+ } else {
+ console.error(e)
}
- this.requestSubTableData(this.url.precisionParametersList.list, params, this.precisionParameters)
+ })
+ })
+ },
+ /** 鏁寸悊鎴恌ormData */
+ classifyIntoFormData(allValues) {
+ let main = Object.assign(this.model, allValues.formValue)
+ let details = allValues.tablesValue[0].tableData;
+ for (var i = 0; i < details.length; i++) {
+ details[i].sort = i + 1;
+ if (details[i].tolerance != null && details[i].tolerance != '' && details[i].tolerance != undefined) {
+ var inf = details[i].tolerance.split('/');
+ var distance = inf[1];
+ var upper = inf[0];
+ details[i].distance = parseFloat(distance);
+ details[i].upper = parseFloat(upper);
+ details[i].lower = 0;
}
- if(this.model.num==''){
- this.model.id = ''
- }
- },
- //鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
- validateSubForm(allValues){
- return new Promise((resolve,reject)=>{
- Promise.all([
- ]).then(() => {
- resolve(allValues)
- }).catch(e => {
- if (e.error === VALIDATE_FAILED) {
- // 濡傛灉鏈夋湭閫氳繃琛ㄥ崟楠岃瘉鐨勫瓙琛紝灏辫嚜鍔ㄨ烦杞埌瀹冩墍鍦ㄧ殑tab
- this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
- } else {
- console.error(e)
- }
- })
- })
- },
- /** 鏁寸悊鎴恌ormData */
- classifyIntoFormData(allValues) {
- let main = Object.assign(this.model, allValues.formValue)
- let details = allValues.tablesValue[0].tableData;
- for(var i=0;i<details.length;i++){
- details[i].sort=i+1;
- if(details[i].tolerance!=null&&details[i].tolerance!=''&&details[i].tolerance!=undefined){
- var inf = details[i].tolerance.split('/');
- var distance = inf[1];
- var upper = inf[0];
- details[i].distance = parseFloat(distance);
- details[i].upper = parseFloat(upper);
- details[i].lower = 0;
- }
- }
- return {
- ...main, // 灞曞紑
- precisionParametersTemplateDetailList: details,
- }
- },
- validateError(msg){
- this.$message.error(msg)
- },
- precisionParametersDetailSelect() {
+ }
+ return {
+ ...main, // 灞曞紑
+ precisionParametersTemplateDetailList: details,
+ }
+ },
+ validateError(msg) {
+ this.$message.error(msg)
+ },
+ precisionParametersDetailSelect() {
let ids = []
let tableData = this.$refs.precisionParametersList.getTableData()
for (let i = 0; i < tableData.length; i++) {
@@ -304,10 +324,10 @@
var precisionParameters = {}
if (tableStr.indexOf(data[i].id) == -1) {
precisionParameters = {
- precisionParametersId:data[i].id,
+ precisionParametersId: data[i].id,
precisionParametersName: data[i].name,
- precisionParametersUda1:data[i].precisionParametersUda1,
- precisionParametersTemplateId:this.model.id,
+ precisionParametersUda1: data[i].precisionParametersUda1,
+ precisionParametersTemplateId: this.model.id,
}
}
addRows.push(precisionParameters)
@@ -319,11 +339,11 @@
this.addSelected(data)
},
- onSearchNums(searchText){
- getAction(this.url.getNums,{searchText:searchText}).then(res=>{
- if(res.success){
- this.numList = res.result
- }
+ onSearchNums(searchText) {
+ getAction(this.url.getNums, { searchText: searchText }).then(res => {
+ if (res.success) {
+ this.numList = res.result
+ }
})
},
@@ -345,8 +365,8 @@
})
},
- }
}
+}
</script>
<style scoped>
--
Gitblit v1.9.3