yangjun
/
dbsd_kczx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx 

# Conflicts:
#	src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenEditForm.vue
This commit is contained in:
yangjun 2024-08-23 13:45:37 +08:00
parent eb3c8300fe c5d04072e7
commit d0b1b8fb76
3 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue
View File

@ -24,9 +24,9 @@
自增表格 9
-->
<a-row>
<a-col :span="24" v-for="(item, index) in zyJxdgMainTable.dataSource" :key="index" >
<a-col :span="24" v-for="(item, index) in zyJxdgMainTable.dataSource" :key="index" style="border:1px solid #f5f5f5;margin:5px 0; background:#fbfbfb;border-radius:5px;">
<a-row c>
<a-col :span="24" style="margin-bottom:15px;height:40px; margin-top:15px; background-color:rgba(1, 156, 136, 0.1);">
<a-col :span="24" style="margin-bottom:15px;height:40px; background-color:#f5f7fa;border-left:3px solid #19a789;">
<span class="title">{{ item.title }}</span>
</a-col>
<!-- 单行文本 1 -->
@ -69,7 +69,7 @@
<a-button type="primary" @click="handleDhwb(item)" class="increase">添加</a-button>
</a-col>
<a-col v-for="(item2, index2) in item.list" :key="index2" >
<a-input placeholder="请输入内容" v-model:value="item2.title" style="width: 80%; margin: 0 10px 10px 0px;" @blur="handleGlxm(item)"></a-input>
<a-input placeholder="请输入内容" v-model:value="item2.title" class="Sheet" style="width: 80%; margin: 0 10px 10px 15px; " @blur="handleGlxm(item)"></a-input>
<a-button type="danger" @click="handleDhwbDel(item, index2)" style="margin:10px 0;text-align:right;">删除</a-button>
</a-col>
</a-row>
@ -132,7 +132,7 @@
<a-col :span="24">
<span class="tishi">
{{ item.tsy }}
<span>{{ item.tsy }}</span>
</span>
</a-col>
</a-row>
@ -507,11 +507,16 @@ export default defineComponent({
}
.tishi {
width: 100%;
display: flex;
flex-direction: column;
text-align: left;
margin: 5px;
margin: 10px 0;
}
.tishi span{
margin: 0 15px;
font-size: 12px;
color: #fd8f02;
margin-top: -4px;
text-align: center;
padding: 6px 0;
color: #ff9924;
}
.increase{
position: absolute;
@ -521,4 +526,8 @@ export default defineComponent({
.place-dele{
margin:10px 0;
}
.Sheet{
color:#91949a;
border-radius: 4px;
}
</style>

5
src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenEditForm.vue
View File

@ -27,7 +27,7 @@
<a-row>
<a-col :span="24" v-for="(item, index) in zyJxdgMainTable.dataSource" :key="index">
<a-row>
<a-col :span="24" style="margin-bottom: 15px; height: 40px; margin-top: 15px; background-color: rgba(1, 156, 136, 0.1)">
<a-col :span="24" style="margin-bottom:15px;height:40px; margin-top:15px; background-color:#f3faf9;">
<span class="title">{{ item.title }}</span>
</a-col>
<!-- 单行文本 1 -->
@ -566,10 +566,11 @@ export default defineComponent({
flex-direction: column;
text-align: left;
margin: 5px;
margin: 10px 0;
}
.tishi span {
font-size: 12px;
color: #fd8f02;
color: #ff9924;
}
.increase {
position: absolute;

27
src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue
View File

@ -21,16 +21,16 @@
</a-form>
<a-row>
<a-col :span="24" style="text-align:left; margin-left:10px;">
<a-col :span="24" style="text-align:left;">
<a-button type="primary" @click="handleOneType" preIcon="ant-design:plus-outlined">新增项目</a-button>
<div style="color: red;">
<div>说明：</div>
<div>1.关联第几个项目：若根据某个项目自动生成关联关系，请选择指定项目！</div>
<div>2.是否是被关联项目：如果被其他项目关联，请选择是，否则不起效！</div>
<div>3.被关联项目禁用问题：目前只支持文本及表格进行关联，富文本、表单、多行文本不支持被关联！</div>
<div style="background:#fff4e6; border:1px solid #ffe8ca; border-radius: 8px; padding:10px; margin:10px 0;">
<div style="font-weight: bold;">说明：</div>
<div class="explain-word">1.关联第几个项目：若根据某个项目自动生成关联关系，请选择指定项目！</div>
<div class="explain-word">2.是否是被关联项目：如果被其他项目关联，请选择是，否则不起效！</div>
<div class="explain-word">3.被关联项目禁用问题：目前只支持文本及表格进行关联，富文本、表单、多行文本不支持被关联！</div>
</div>
</a-col>
<a-col :span="24" v-for="(item,index) in zyJxdgMainTable.dataSource" :key="index">
<a-col :span="24" v-for="(item,index) in zyJxdgMainTable.dataSource" :key="index" style="border:1px solid #f5f5f5;padding:10px;margin:5px 0; background:#fbfbfb;border-radius:5px;">
<a-row style="margin:10px;">
<a-col :span="6" style="padding-right:10px;">
<a-input v-model:value="item.title" placeholder="请输入标题" :disabled="disabled" class="input-title"/>
@ -294,14 +294,21 @@
}
.input-title{
margin-bottom: 10px;
color: #555;
}
.fields-add{
margin:0 0 8px 0;
color: #777;
margin:0 0 10px 0;
color: #95989e;
border: 1px solid #e1e4eb;
border-radius: 4px;
}
.Prompt-language{
color: #bda787;
font-size: 12px;
font-size:14px;
padding: 6px;
}
.explain-word{
color:#ff9924;
font-size:12px;
}
</style>