From f27ae4aa1a3b72bf8dc934efd6f084ba5a101a48 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 03 十一月 2023 09:10:13 +0800
Subject: [PATCH] modified: src/api/basic/post.js modified: src/views/basic/division/division-form.vue modified: src/views/basic/param/index.vue modified: src/views/basic/param/param-form.vue modified: src/views/basic/post/index.vue modified: src/views/basic/post/post-form.vue modified: src/views/basic/staff/index.vue modified: src/views/basic/staff/staff-form.vue modified: src/views/basic/warehouse/warehouse-form.vue modified: src/views/technology/document/document-form.vue
---
src/views/basic/param/param-form.vue | 98 ++++++++++++++++++++++++++++--------------------
1 files changed, 57 insertions(+), 41 deletions(-)
diff --git a/src/views/basic/param/param-form.vue b/src/views/basic/param/param-form.vue
index fa7f914..e7a113e 100644
--- a/src/views/basic/param/param-form.vue
+++ b/src/views/basic/param/param-form.vue
@@ -1,27 +1,25 @@
<template>
- <el-dialog
- v-diadrag
- :title="!dataForm.id ? '鏂板' : '淇敼'"
- :close-on-click-modal="false"
- :visible.sync="visible"
- >
- <el-form
- :model="dataForm"
- :rules="dataRule"
- ref="dataForm"
- label-width="80px"
- class="l-mes"
- >
+ <el-dialog v-diadrag :title="!dataForm.id ? '鏂板' : '淇敼'" :close-on-click-modal="false" :visible.sync="visible">
+ <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="80px" class="l-mes">
<el-form-item label="鍙傛暟缂栧彿" prop="code">
<el-input v-model="dataForm.code" placeholder="鍙傛暟缂栧彿"></el-input>
</el-form-item>
<el-form-item label="鍙傛暟椤�" prop="parameterItem">
- <el-input
- v-model="dataForm.parameterItem"
- placeholder="鍙傛暟椤�"
- ></el-input>
+ <el-input v-model="dataForm.parameterItem" placeholder="鍙傛暟椤�"></el-input>
</el-form-item>
- <el-form-item label="鍙傛暟绫诲瀷" prop="type">
+ <el-form-item label="浜岀骇鍙傛暟" prop="secondId">
+ <el-select v-model="dataForm.secondId" multiple collapse-tags style="width: 100%;" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in optionsSecond" :key="item.id" :label="item.label" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="涓夌骇绾у弬鏁�" prop="thirdId">
+ <el-select v-model="dataForm.thirdId" multiple collapse-tags style="width: 100%;" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in optionsThird" :key="item.id" :label="item.label" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="鍙傛暟绫诲瀷" prop="type">
<el-select
v-model="dataForm.type"
filterable
@@ -66,7 +64,7 @@
</el-form-item>
<el-form-item label="鍗曚綅" prop="unit">
<el-input v-model="dataForm.unit" placeholder="鍗曚綅"></el-input>
- </el-form-item>
+ </el-form-item> -->
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">鍙栨秷</el-button>
@@ -84,11 +82,15 @@
return {
typeOptions: [],
dictOptions: [],
+ optionsSecond: [],
+ optionsThird: [],
visible: false,
dataForm: {
id: 0,
code: '',
parameterItem: '',
+ secondId: null,
+ thirdId: null,
type: '',
parameterFormat: '',
unit: '',
@@ -98,6 +100,8 @@
updateTime: '',
dict: ''
},
+ secondParam: null,
+ thirdParam: null,
dataRule: {
code: [
{ required: true, message: '鍙傛暟缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }
@@ -105,10 +109,10 @@
parameterItem: [
{ required: true, message: '鍙傛暟椤逛笉鑳戒负绌�', trigger: 'blur' }
],
- type: [
- { required: true, message: '鍙傛暟绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }
- ],
- unit: [{ required: true, message: '鍗曚綅涓嶈兘涓虹┖', trigger: 'blur' }]
+ // type: [
+ // { required: true, message: '鍙傛暟绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }
+ // ],
+ // unit: [{ required: true, message: '鍗曚綅涓嶈兘涓虹┖', trigger: 'blur' }]
},
clickDateArr: []
}
@@ -116,6 +120,16 @@
created() {
this.getParamType()
this.getDictOptions()
+ remote('second_param').then((response) => {
+ if (response.data.code === 0) {
+ this.optionsSecond = response.data.data
+ }
+ })
+ remote('third_param').then((response) => {
+ if (response.data.code === 0) {
+ this.optionsThird = response.data.data
+ }
+ })
},
methods: {
init(id) {
@@ -171,7 +185,7 @@
if (this.clickDateArr.length > 1) {
if (
this.clickDateArr[this.clickDateArr.length - 1] -
- this.clickDateArr[this.clickDateArr.length - 2] <
+ this.clickDateArr[this.clickDateArr.length - 2] <
2000
) {
// 灏忎簬2绉掑垯璁や负閲嶅鎻愪氦
@@ -185,23 +199,24 @@
if (!response.data.data) {
this.addOrUpdate()
} else {
- // 澧炲姞鍙傛暟椤瑰唴瀹归噸澶嶆彁绀�
- this.$confirm(
- '鍙傛暟椤瑰唴瀹归噸澶嶏紝缂栧彿锛�' +
- response.data.data +
- '锛岃纭鏄惁缁х画',
- '鎻愮ず',
- {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- closeOnClickModal: false,
- type: 'warning'
- }
- )
- .then(() => {
- this.addOrUpdate()
- })
- .catch(() => {})
+ this.message.error('缂栧彿閲嶅锛�')
+ // // 澧炲姞鍙傛暟椤瑰唴瀹归噸澶嶆彁绀�
+ // this.$confirm(
+ // '鍙傛暟椤瑰唴瀹归噸澶嶏紝缂栧彿锛�' +
+ // response.data.data +
+ // '锛岃纭鏄惁缁х画',
+ // '鎻愮ず',
+ // {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // closeOnClickModal: false,
+ // type: 'warning'
+ // }
+ // )
+ // .then(() => {
+ // this.addOrUpdate()
+ // })
+ // .catch(() => { })
}
})
}
@@ -221,6 +236,7 @@
}
})
} else {
+
addObj(this.dataForm).then((response) => {
const data = response.data.data
if (data.code === 0) {
--
Gitblit v1.9.3