From 9c67a9d48ec6a71e2d4edf11fae3f5e802a97bff Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 19 十一月 2024 16:35:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 164 +++++++++++++++++++++++++++++-------------------------
1 files changed, 87 insertions(+), 77 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
index 0e8b0c5..26cf5bf 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
@@ -75,28 +75,25 @@
<el-button icon="el-icon-edit" plain size="mini" style="height: 28px;"
type="primary"></el-button>
</div>
-
<el-input
v-if="item.itemType === 'textarea' || item.itemType === 'richtext' || item.itemType === 'webeditor'"
v-model="item.value"
- :placeholder="item.text"
- :rows="2"
- type="textarea">
+ :placeholder="item.text">
</el-input>
-
- <el-input-number v-if="item.itemType === 'number'" v-model="item.value" :max="99999"
- :min="1"></el-input-number>
+ <el-input-number v-if="item.itemType === 'number'" v-model="item.value" :max="99999" :min="1"
+ size="mini"></el-input-number>
<el-input v-if="item.itemType === 'password'" v-model="input" placeholder="璇疯緭鍏ュ瘑鐮�"
show-password></el-input>
<el-radio v-if="item.itemType === 'radio'" v-model="item.value"></el-radio>
<el-checkbox v-if="item.itemType === 'checkbox'" v-model="item.value"></el-checkbox>
<el-select v-if="item.itemType === 'select' || item.itemType === 'multiselect'"
- v-model="item.value" :disabled="true" placeholder="璇烽�夋嫨" size="mini">
+ v-model="item.value" :disabled="false" placeholder="璇烽�夋嫨" size="mini">
</el-select>
<el-date-picker
v-if="item.itemType === 'date' || item.itemType === 'datetime'"
v-model="item.value"
:placeholder="item.itemType === 'date' ? '璇烽�夋嫨鏃ユ湡' : '璇烽�夋嫨鏃ユ湡鏃堕棿'"
+ class="formItemMargin"
type="date">
</el-date-picker>
@@ -108,6 +105,7 @@
step: '00:15',
end: '18:30'
}"
+ class="formItemMargin"
placeholder="閫夋嫨鏃堕棿">
</el-time-select>
<el-button v-if="item.itemType === 'file'"
@@ -142,15 +140,20 @@
<basic-container>
<div style="height: 660px; overflow-y: auto;padding-right: 10px">
<h3>璁剧疆</h3>
+ <h4 style="color: red">灞炴�ц缃俊鎭悗闇�鍗曞嚮鍙充笅瑙掑簲鐢ㄦ寜閽繘琛屽簲鐢�</h4>
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="85px">
<el-row style="border-bottom: 1px solid #878585;padding-bottom: 10px">
<el-col :span="24">
<el-form-item label="浣跨敤瀛楁">
- <div style="display: flex">
+ <div style="display: flex;align-items: center">
<el-input v-model="form.text" :readonly="true" placeholder="璇疯緭鍏ヤ娇鐢ㄥ瓧娈�" size="mini"></el-input>
- <el-checkbox v-model="form.itemIsEditable" style="margin-left: 5px; margin-right: 5px">鍙
+ <el-checkbox v-model="form.itemIsEditable" false-label="0"
+ style="margin-left: 5px; margin-right: 5px"
+ true-label="1">鍙
</el-checkbox>
- <el-checkbox v-model="form.itemIsRequired" style="margin-left: 5px;margin-right: 0px">蹇呭～
+ <el-checkbox v-model="form.itemIsRequired" false-label="0"
+ style="margin-left: 5px;margin-right: 0px"
+ true-label="1">蹇呭～
</el-checkbox>
</div>
</el-form-item>
@@ -705,75 +708,75 @@
append-to-body="true"
class="avue-dialog"
title="棰勮"
- width="80%">
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-row>
- <el-col v-for="(item,index) in formList" :key="index" :span="topForm.columnNumber">
- <el-form-item :class="['hiddenLabel', { 'active-border': activeItem.text === item.text }]"
- :label="item.itemName + '锛�'"
- style="padding-left: 5px" @click.native="formItemClick(item,index)">
- <el-input
- v-if="item.itemType === 'text' ||
+ width="60%">
+ <div style="height: 600px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-row>
+ <el-col v-for="(item,index) in formList" :key="index" :span="topForm.columnNumber">
+ <el-form-item :label="item.itemName + '锛�'" style="padding-left: 5px">
+ <el-input
+ v-if="item.itemType === 'text' ||
item.itemType === 'custom' ||
item.itemType === 'customform'||
item.itemType === 'hidden' ||
item.itemType === 'specialCharacter'"
- v-model="item.value" :placeholder="item.text"
- size="mini"></el-input>
+ v-model="item.value" :placeholder="item.text"
+ size="mini"></el-input>
- <div v-if="item.itemType === 'textbtn'" style="display: flex;align-items: center">
- <el-input v-model="item.value" :placeholder="item.text" size="mini"></el-input>
- <el-button icon="el-icon-edit" plain size="mini" style="height: 28px;"
- type="primary"></el-button>
- </div>
+ <div v-if="item.itemType === 'textbtn'" style="display: flex;align-items: center">
+ <el-input v-model="item.value" :placeholder="item.text" size="mini"></el-input>
+ <el-button icon="el-icon-edit" plain size="mini" style="height: 28px;"
+ type="primary"></el-button>
+ </div>
- <el-input
- v-if="item.itemType === 'textarea' || item.itemType === 'richtext' || item.itemType === 'webeditor'"
- v-model="item.value"
- :placeholder="item.text"
- :rows="2"
- type="textarea">
- </el-input>
+ <el-input
+ v-if="item.itemType === 'textarea' || item.itemType === 'richtext' || item.itemType === 'webeditor'"
+ v-model="item.value"
+ :placeholder="item.text">
+ </el-input>
- <el-input-number v-if="item.itemType === 'number'" v-model="item.value" :max="99999"
- :min="1"></el-input-number>
- <el-input v-if="item.itemType === 'password'" v-model="input" placeholder="璇疯緭鍏ュ瘑鐮�"
- show-password></el-input>
- <el-radio v-if="item.itemType === 'radio'" v-model="item.value"></el-radio>
- <el-checkbox v-if="item.itemType === 'checkbox'" v-model="item.value"></el-checkbox>
- <el-select v-if="item.itemType === 'select' || item.itemType === 'multiselect'"
- v-model="item.value" :disabled="true" placeholder="璇烽�夋嫨" size="mini">
- </el-select>
- <el-date-picker
- v-if="item.itemType === 'date' || item.itemType === 'datetime'"
- v-model="item.value"
- :placeholder="item.itemType === 'date' ? '璇烽�夋嫨鏃ユ湡' : '璇烽�夋嫨鏃ユ湡鏃堕棿'"
- type="date">
- </el-date-picker>
+ <el-input-number v-if="item.itemType === 'number'" v-model="item.value" :max="99999" :min="1"
+ size="mini"></el-input-number>
+ <el-input v-if="item.itemType === 'password'" v-model="input" placeholder="璇疯緭鍏ュ瘑鐮�"
+ show-password></el-input>
+ <el-radio v-if="item.itemType === 'radio'" v-model="item.value"></el-radio>
+ <el-checkbox v-if="item.itemType === 'checkbox'" v-model="item.value"></el-checkbox>
+ <el-select v-if="item.itemType === 'select' || item.itemType === 'multiselect'"
+ v-model="item.value" placeholder="璇烽�夋嫨" size="mini">
+ <el-option v-for="(i,k) in item.itemKeyValueList" :key="l" :label="i.value"
+ :value="i.key"></el-option>
+ </el-select>
+ <el-date-picker
+ v-if="item.itemType === 'date' || item.itemType === 'datetime'"
+ v-model="item.value"
+ :placeholder="item.itemType === 'date' ? '璇烽�夋嫨鏃ユ湡' : '璇烽�夋嫨鏃ユ湡鏃堕棿'"
+ type="date">
+ </el-date-picker>
- <el-time-select
- v-if="item.itemType === 'time'"
- v-model="item.value"
- :picker-options="{
+ <el-time-select
+ v-if="item.itemType === 'time'"
+ v-model="item.value"
+ :picker-options="{
start: '08:30',
step: '00:15',
end: '18:30'
}"
- placeholder="閫夋嫨鏃堕棿">
- </el-time-select>
- <el-button v-if="item.itemType === 'file'"
- v-model="item.value" plain size="mini" type="primary">
- 涓婁紶鏂囦欢
- </el-button>
- <el-button v-if="item.itemType === 'multiFile'"
- v-model="item.value" plain size="mini" type="primary">
- 澶氭枃浠朵笂浼�
- </el-button>
+ placeholder="閫夋嫨鏃堕棿">
+ </el-time-select>
+ <el-button v-if="item.itemType === 'file'"
+ v-model="item.value" plain size="mini" type="primary">
+ 涓婁紶鏂囦欢
+ </el-button>
+ <el-button v-if="item.itemType === 'multiFile'"
+ v-model="item.value" plain size="mini" type="primary">
+ 澶氭枃浠朵笂浼�
+ </el-button>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
</el-dialog>
<el-dialog
@@ -807,10 +810,9 @@
<script>
import {getObjTypeQTs, getTreeAttributes, savePortalVI, refPersonOrgTree} from "@/api/UI/formDefine/api";
+import {gridAttribute} from "@/api/modeling/attributePool/api";
import func from "@/util/func";
import basicOption from "@/util/basic-option";
-import {gridAttribute} from "@/api/modeling/attributePool/api";
-import {getSysModelTreeMenuByPID} from "@/api/systemModel/mangeModel/api";
export default {
name: "formDialog",
@@ -1113,7 +1115,10 @@
text: data.text,
oid: data.oid,
itemType: 'text',
- itemName: data.data.name
+ itemName: data.data.name,
+ itemCols: "1",
+ itemIsEditable:"0",
+ itemIsRequired:"0",
}
console.log(data);
const isDuplicate = this.formList.some(item => item.text === data.text);
@@ -1130,10 +1135,9 @@
this.activeItem = item;
this.activeItemIndex = index;
this.form = {...item};
- console.log(item);
-
- // console.log(item,index);
this.topForm.position = index += 1;
+ // this.$forceUpdate();
+ console.log(this.form);
},
// 璁剧疆鏄剧ず琛屾暟
@@ -1201,7 +1205,7 @@
this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹繘琛屽垹闄�');
return;
}
- this.formList = this.formList.filter(item => item.text != this.activeItem.text);
+ this.formList = this.formList.filter(item => item.text !== this.activeItem.text);
this.activeItem = {};
this.form = {};
},
@@ -1307,7 +1311,7 @@
viType: 1, // 瑙嗗浘绫诲瀷
viTypeText: "琛ㄥ崟", // 瑙嗗浘涓枃鍚嶇О
prm: {
- formQtName: '', // 鏌ヨ妯℃澘鍚嶇О
+ formQtName: this.form.qtName, // 鏌ヨ妯℃澘鍚嶇О
showCols: this.topForm.showColumn,
prmItemList: this.formList
},
@@ -1317,6 +1321,7 @@
this.$message.success(res.data.obj);
this.visible = false;
this.closeDialog();
+ this.$emit('updataTable');
}
})
// this.visible = false;
@@ -1330,9 +1335,7 @@
}
if (!this.form.text) {
this.$message.error('璇峰湪鍙充晶閫夋嫨鏁版嵁鍚庤繘琛屾搷浣滐紒');
- return;
}
-
},
// 鑷畾涔夌粍浠朵慨鏀规樉绀虹被鍨�
@@ -1419,9 +1422,12 @@
this.$message.error('璇锋坊鍔犱竴鏉℃暟鎹繘琛屼繚瀛橈紒');
return;
}
+
+
this.formList = this.formList.map(item =>
item.text === this.form.text ? this.form : item
);
+ console.log(this.formList);
this.$message.success('搴旂敤鎴愬姛');
},
@@ -1527,4 +1533,8 @@
font-size: 14px
}
+.formItemMargin {
+ margin: 10px 0 10px 0;
+}
+
</style>
--
Gitblit v1.9.3