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 09:53:21 +08:00
parent f2c134fb2b 889f07eaea
commit 880ffa2f5f
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,7 +498,7 @@ export default defineComponent({
<style scoped lang="less" >
.title {
width: 80%;
font-size: 18px;
font-size: 16px;
font-weight: bold;
padding-left: 10px;
position: relative;

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

@ -68,7 +68,7 @@
<a-col v-else-if="item.type === '6'" :span="24">
<a-row>
<a-col>
<a-button type="primary" @click="handleDhwb(item)" class="increase" preIcon="ant-design:plus-outlined">添加</a-button>
<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>
@ -80,7 +80,7 @@
<a-col v-else-if="item.type === '7'" :span="24">
<a-row>
<a-col>
<a-button type="primary" @click="handleDhfwb(item)" class="increase" preIcon="ant-design:plus-outlined">添加</a-button>
<a-button type="primary" @click="handleDhfwb(item)" class="increase" >添加</a-button>
</a-col>
<a-col v-for="(item2, index2) in item.list" :key="index2">
<j-editor placeholder="请输入内容" v-model:value="item2.title" :disabled="disabled" style="width: 500px; height: 200px" />
@ -92,7 +92,7 @@
<a-col v-else-if="item.type === '8'" :span="24">
<a-row>
<a-col>
<a-button type="primary" @click="handleDhwbArea(item)" class="increase" preIcon="ant-design:plus-outlined">添加</a-button>
<a-button type="primary" @click="handleDhwbArea(item)" class="increase">添加</a-button>
</a-col>
<a-col v-for="(item2, index2) in item.list" :key="index2" style="text-align:right;" >
<a-textarea placeholder="请输入内容" v-model:value="item2.title" :disabled="disabled" />
@ -103,7 +103,7 @@
<!-- 自增表格 9 -->
<a-col v-else-if="item.type === '9'" :span="24">
<div><a-button type="primary" @click="handleZzbg(item)" class="increase" preIcon="ant-design:plus-outlined">新增</a-button> </div>
<div><a-button type="primary" @click="handleZzbg(item)" class="increase">新增</a-button> </div>
<a-table :columns="getTableZzColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
@ -117,7 +117,7 @@
</a-col>
<!-- 自增表格（两列关联） 10 -->
<a-col v-else-if="item.type === '10'" :span="24">
<div><a-button type="primary" @click="handleZzbg(item)" class="increase" preIcon="ant-design:plus-outlined">新增</a-button> </div>
<div><a-button type="primary" @click="handleZzbg(item)" class="increase">新增</a-button> </div>
<a-table :columns="getTableZzColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">

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

@ -47,10 +47,10 @@
<a-col :span="6">
<j-dict-select-tag type='select' v-model:value="item.sfsglxm" dictCode="yn" libelName="是否是被关联项目" :disabled="disabled || item.type == '2' || item.type == '3' || item.type == '4' || item.type == '7' || item.guanlian == '8' "/>
</a-col>
<a-col :span="18">
<a-col :span="21">
<a-input v-model:value="item.tsy" placeholder="请输入提示语" :disabled="disabled" class="Prompt-language" />
</a-col>
<a-col :span="6">
<a-col :span="3">
<a-button type="danger" @click="handleOneDel(item,index)" style="margin-left:10px">删除</a-button>
</a-col>
<!--
@ -67,15 +67,15 @@
-->
<a-col v-if="item.type==='4' || item.type==='5' || item.type==='9'|| item.type==='10'">
<a-row>
<a-col :span="24">
<a-col :span="24" style="margin:15px 0 0px 0px;">
<a-button type="primary" @click="handleTwoType(item)" class="margin10" preIcon="ant-design:plus-outlined">新增字段</a-button>
</a-col>
<a-col :span="24" v-for="(twoItem,index2) in item.zyJxdgPzxxList" :key="index2">
<a-row>
<a-col :span="18">
<a-col :span="21">
<a-input v-model:value="twoItem.title" placeholder="请输入选项" :disabled="disabled" class="fields-add"/>
</a-col>
<a-col :span="6">
<a-col :span="3">
<a-button type="danger" @click="handleTwoDel(item,index2)" style="margin-left:10px">删除</a-button>
</a-col>
</a-row>