From 44246a2082c74db213faa0e2c97445ec1173068b Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 23 八月 2023 11:53:55 +0800
Subject: [PATCH] 新增编码类型
---
Source/UBCS-WEB/src/views/code/code.vue | 1
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 7 +++
Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue | 25 ++++++++----
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 43 +++++++++++++++------
4 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index b72f827..b53cf1a 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -50,7 +50,7 @@
// 榛樿绂佺敤鍏冪礌
disabledProp: {
type: Array,
- default: () => ["id","lcstatus"],
+ default: () => ["id", "lcstatus"],
},
templateOid: {
type: String,
@@ -80,6 +80,11 @@
type: Object,
default: () => ({}),
},
+ // 涓�琛屾斁鍑犱釜琛ㄥ崟
+ trendsSpan: {
+ type: Number,
+ default: 8,
+ },
},
data() {
return {
@@ -103,9 +108,6 @@
date: "date",
refer: "refer",
},
- // 鍋囨暟鎹�
- testItems: [],
- trendsSpan: 8,
defaultValue: {},
// 琛ㄥ崟灞炴��
attributes: [],
@@ -115,9 +117,20 @@
mounted() {
this.handleResize();
},
+ computed: {
+ localTrendsSpan() {
+ if (this.trendsSpan) {
+ return this.trendsSpan;
+ } else {
+ let windowWidth = document.body.clientWidth;
+ return 24 / Math.floor(windowWidth / 500);
+ }
+ },
+ },
methods: {
// 娓叉煋琛ㄥ崟妯℃澘
templateRender(formItemList) {
+ console.log(formItemList, "formItemList");
// 鏃犻渶鍒嗙粍鏁版嵁
let column = [];
let group = [];
@@ -137,7 +150,8 @@
if (
formItem.type === "combox" &&
formItem.comboxKey &&
- (!Array.isArray(formItem.dicData) || formItem.dicData.length === 0) &&(!Array.isArray(formItem.data) || formItem.data.length === 0)
+ (!Array.isArray(formItem.dicData) || formItem.dicData.length === 0) &&
+ (!Array.isArray(formItem.data) || formItem.data.length === 0)
) {
dictKeys.push({ dictKey: formItem.comboxKey, field: formItem.field });
}
@@ -145,9 +159,9 @@
if (this.disabledProp.includes(formItem.field)) {
formItem.readOnly = true;
}
- if(formItem.field=='lcstatus'){
- formItem.field=formItem.field+'_text';
- formItem.readOnly=true;
+ if (formItem.field == "lcstatus") {
+ formItem.field = formItem.field + "_text";
+ formItem.readOnly = true;
}
// 璁剧疆琛ㄥ崟鏍￠獙鐨勮鍒欙紝鏂囨湰
let message = "璇烽�夋嫨";
@@ -190,7 +204,11 @@
options: formItem.referConfig,
}
: {},
- span: formItem.span ? formItem.span : formItem.type === "textarea" ? 24 : this.trendsSpan,
+ span: formItem.span
+ ? formItem.span
+ : formItem.type === "textarea"
+ ? 24
+ : this.localTrendsSpan,
rules: [
{
required: formItem.required,
@@ -217,6 +235,7 @@
}
});
this.slotColumnList = slotColumnList;
+ console.log(column, "column");
this.$set(this.option, "column", column);
this.$set(this.option, "group", group);
this.updateIndex++;
@@ -260,9 +279,9 @@
},
// 鏍规嵁灞忓箷鍔ㄦ�侀厤缃〃鍗曞竷灞�
handleResize() {
- let windowWidth = document.body.clientWidth;
- this.trendsSpan = 24 / Math.floor(windowWidth / 500);
- this.updateIndex++;
+ // let windowWidth = document.body.clientWidth;
+ // this.trendsSpan = 24 / Math.floor(windowWidth / 500);
+ // this.updateIndex++;
},
// 鍓嶅悗缂�
preOrSufFixShow(type, val) {
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index e41a812..d2585c3 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -137,7 +137,10 @@
codefixedsec: "combox",
codeclassifysec: "refer",
codevariablesec: "text",
+ codeattrsec: "text",
+ codelevelsec: "text",
coderefersec: "refer",
+ codedatesec: "date"
},
selfColumnConfig: {
function: {
@@ -156,6 +159,7 @@
label: "name",
maxlength: "codeSecLength",
data: "fixedValueVOList",
+ dateFormate: "codeDateFormatStr"
},
directVoluation: {
search: true,
@@ -265,6 +269,9 @@
"codeclassifysec",
"codevariablesec",
"coderefersec",
+ "codeattrsec",
+ "codelevelsec",
+ "codedatesec"
];
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
index d0a25f4..4885780 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
@@ -8,6 +8,7 @@
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="鏈�澶ф祦姘村彿" name="codeApply">
<form-template v-bind="$attrs" type="add" :selfColumnType="selfColumnType"
+ :trendsSpan="24"
:selfColumnConfig="selfColumnConfig" ref="CodeApply" @getFormData="getCodeApplyFormData"
@referConfigDataUpdate="referConfigDataUpdate"></form-template>
</el-tab-pane>
@@ -48,7 +49,7 @@
},
selfColumnConfig: {
handler(newval) {
- console.log('selfColumnConfig', newval)
+ // console.log('selfColumnConfig', newval)
},
immediate: true,
deep: true
@@ -69,7 +70,10 @@
codefixedsec: "combox",
codeclassifysec: "refer",
codevariablesec: "text",
+ codeattrsec: "text",
+ codelevelsec: "text",
coderefersec: "refer",
+ codedatesec: "date",
},
selfColumnConfig: {
function: {
@@ -88,6 +92,7 @@
label: "name",
maxlength: "codeSecLength",
data: "fixedValueVOList",
+ dateFormate: "codeDateFormatStr"
},
directVoluation: {
search: true,
@@ -102,23 +107,25 @@
methods: {
// 鑾峰彇鐮佹
async apiGetCode() {
+ this.activeName = "codeApply";
const response = await getCodePrice({ ruleOid: this.ruleOid })
const res = response.data
if (res.success && res.code === 200) {
- console.log(response)
const typeList = [
"codefixedsec",
"codeclassifysec",
"codevariablesec",
"coderefersec",
+ "codeattrsec",
+ "codelevelsec",
+ "codedatesec"
];
this.secVOList = (res.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
);
- console.log(this.secVOList)
if (this.secVOList.length > 0) {
// this.showCodeApply = true;
- this.activeName = "codePrice";
+
this.$nextTick(() => {
this.$refs.CodeApply.templateRender(this.secVOList);
});
@@ -128,14 +135,14 @@
}
},
handleClick(tab, event) {
- console.log(event)
+ // console.log(event)
},
getCodeApplyFormData(codeApplyForm) {
this.codeApplyForm = codeApplyForm;
},
// 鍙傜収缁勪欢鏁版嵁鍙樻洿
referConfigDataUpdate(data) {
- console.log(data)
+ // console.log(data)
const { field } = data;
this.secVOList = this.secVOList.map((item) => {
if (item.parentClassifySecOid === field) {
@@ -144,7 +151,7 @@
}
return item;
});
- console.log(this.secVOList)
+ // console.log(this.secVOList)
this.$refs.CodeApply.templateRender(this.secVOList);
},
isRequired(item) {
@@ -165,7 +172,7 @@
}
},
getReferConfig(item) {
- console.log(item)
+ // console.log(item)
let params = {};
if (item.secType == "codeclassifysec") {
params = {
@@ -214,7 +221,7 @@
} else if (item.secType == "coderefersec") {
params = JSON.parse(item.referValueInfo);
}
- console.log(params)
+ // console.log(params)
return params;
},
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 4b4fadd..1ee6b0d 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -658,6 +658,7 @@
<div v-show="form.secType==='codedatesec' ? true:false">
<el-form-item label="鏃ユ湡鏍煎紡:" :label-width="rightFormLabelWidth" required>
<el-input ref="codeDateFormatStr" v-model="form.codeDateFormatStr" :readonly="basicSecOnlyRead"></el-input>
+ <span style="font-size: 12px;color: red"><i class="el-icon-warning"></i><i>鏃ユ湡鏍煎紡璇烽伒瀹� <a style="color: red;text-decoration: underline" target="_blank" href="https://v2.avuejs.com/form/form-date/#%E6%97%A5%E6%9C%9F%E6%A0%BC%E5%BC%8F%E5%8C%96">璇ユ爣鍑�</a></i></span>
</el-form-item>
</div>
<!-- 鍒嗙被鐮佹 -->
--
Gitblit v1.9.3