9b6e46cc by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 821ce37a bf14603e
......@@ -31,6 +31,66 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe782;</span>
<div class="name">系统管理</div>
<div class="code-name">&amp;#xe782;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6c9;</span>
<div class="name">下拉</div>
<div class="code-name">&amp;#xe6c9;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6cc;</span>
<div class="name">下拉 展开</div>
<div class="code-name">&amp;#xe6cc;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe77f;</span>
<div class="name">删除</div>
<div class="code-name">&amp;#xe77f;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe780;</span>
<div class="name">新增</div>
<div class="code-name">&amp;#xe780;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe781;</span>
<div class="name">编辑</div>
<div class="code-name">&amp;#xe781;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe77b;</span>
<div class="name"></div>
<div class="code-name">&amp;#xe77b;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe77c;</span>
<div class="name"></div>
<div class="code-name">&amp;#xe77c;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe77d;</span>
<div class="name">-</div>
<div class="code-name">&amp;#xe77d;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe77e;</span>
<div class="name">+</div>
<div class="code-name">&amp;#xe77e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe779;</span>
<div class="name">多幢</div>
<div class="code-name">&amp;#xe779;</div>
......@@ -297,6 +357,96 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont iconxitongguanli"></span>
<div class="name">
系统管理
</div>
<div class="code-name">.iconxitongguanli
</div>
</li>
<li class="dib">
<span class="icon iconfont iconxiala"></span>
<div class="name">
下拉
</div>
<div class="code-name">.iconxiala
</div>
</li>
<li class="dib">
<span class="icon iconfont iconxialazhankai"></span>
<div class="name">
下拉 展开
</div>
<div class="code-name">.iconxialazhankai
</div>
</li>
<li class="dib">
<span class="icon iconfont iconshanchu"></span>
<div class="name">
删除
</div>
<div class="code-name">.iconshanchu
</div>
</li>
<li class="dib">
<span class="icon iconfont iconxinzeng"></span>
<div class="name">
新增
</div>
<div class="code-name">.iconxinzeng
</div>
</li>
<li class="dib">
<span class="icon iconfont iconbianji"></span>
<div class="name">
编辑
</div>
<div class="code-name">.iconbianji
</div>
</li>
<li class="dib">
<span class="icon iconfont iconicon-test"></span>
<div class="name">
</div>
<div class="code-name">.iconicon-test
</div>
</li>
<li class="dib">
<span class="icon iconfont iconicon-test1"></span>
<div class="name">
</div>
<div class="code-name">.iconicon-test1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-"></span>
<div class="name">
-
</div>
<div class="code-name">.icon-
</div>
</li>
<li class="dib">
<span class="icon iconfont iconicon-test2"></span>
<div class="name">
+
</div>
<div class="code-name">.iconicon-test2
</div>
</li>
<li class="dib">
<span class="icon iconfont iconduochuang"></span>
<div class="name">
多幢
......@@ -651,6 +801,86 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconxitongguanli"></use>
</svg>
<div class="name">系统管理</div>
<div class="code-name">#iconxitongguanli</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconxiala"></use>
</svg>
<div class="name">下拉</div>
<div class="code-name">#iconxiala</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconxialazhankai"></use>
</svg>
<div class="name">下拉 展开</div>
<div class="code-name">#iconxialazhankai</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconshanchu"></use>
</svg>
<div class="name">删除</div>
<div class="code-name">#iconshanchu</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconxinzeng"></use>
</svg>
<div class="name">新增</div>
<div class="code-name">#iconxinzeng</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconbianji"></use>
</svg>
<div class="name">编辑</div>
<div class="code-name">#iconbianji</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconicon-test"></use>
</svg>
<div class="name"></div>
<div class="code-name">#iconicon-test</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconicon-test1"></use>
</svg>
<div class="name"></div>
<div class="code-name">#iconicon-test1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-"></use>
</svg>
<div class="name">-</div>
<div class="code-name">#icon-</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconicon-test2"></use>
</svg>
<div class="name">+</div>
<div class="code-name">#iconicon-test2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconduochuang"></use>
</svg>
<div class="name">多幢</div>
......
......@@ -6,6 +6,76 @@
"description": "",
"glyphs": [
{
"icon_id": "19005628",
"name": "系统管理",
"font_class": "xitongguanli",
"unicode": "e782",
"unicode_decimal": 59266
},
{
"icon_id": "15090431",
"name": "下拉",
"font_class": "xiala",
"unicode": "e6c9",
"unicode_decimal": 59081
},
{
"icon_id": "15090434",
"name": "下拉 展开",
"font_class": "xialazhankai",
"unicode": "e6cc",
"unicode_decimal": 59084
},
{
"icon_id": "18746513",
"name": "删除",
"font_class": "shanchu",
"unicode": "e77f",
"unicode_decimal": 59263
},
{
"icon_id": "18746514",
"name": "新增",
"font_class": "xinzeng",
"unicode": "e780",
"unicode_decimal": 59264
},
{
"icon_id": "18746515",
"name": "编辑",
"font_class": "bianji",
"unicode": "e781",
"unicode_decimal": 59265
},
{
"icon_id": "18744086",
"name": "➖",
"font_class": "icon-test",
"unicode": "e77b",
"unicode_decimal": 59259
},
{
"icon_id": "18744087",
"name": "➕",
"font_class": "icon-test1",
"unicode": "e77c",
"unicode_decimal": 59260
},
{
"icon_id": "18744088",
"name": "-",
"font_class": "-",
"unicode": "e77d",
"unicode_decimal": 59261
},
{
"icon_id": "18744089",
"name": "+",
"font_class": "icon-test2",
"unicode": "e77e",
"unicode_decimal": 59262
},
{
"icon_id": "18727148",
"name": "多幢",
"font_class": "duochuang",
......
......@@ -20,6 +20,36 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="xitongguanli" unicode="&#59266;" d="M402.318222 794.624A71.111111 71.111111 0 0 0 472.803556 856.291556h79.416888c35.726222 0 65.934222-26.567111 70.542223-62.008889l9.216-71.907556c40.789333-14.392889 78.506667-36.124444 111.502222-63.943111l66.844444 27.477333a71.111111 71.111111 0 0 0 88.576-30.264889l39.708445-68.721777a71.111111 71.111111 0 0 0-18.432-92.103111l-56.661334-43.235556a357.376 357.376 0 0 0-0.113777-129.649778l56.718222-43.804444a71.111111 71.111111 0 0 0 18.147555-91.818667l-39.708444-68.721778a71.111111 71.111111 0 0 0-88.974222-30.094222l-66.446222 27.704889c-32.938667-27.818667-70.712889-49.493333-111.502223-63.829333l-9.671111-72.135111a71.111111 71.111111 0 0 0-70.542222-61.610667H472.120889a71.111111 71.111111 0 0 0-70.542222 62.008889l-9.443556 73.159111a355.271111 355.271111 0 0 0-108.999111 63.601778l-69.12-28.444445a71.111111 71.111111 0 0 0-88.632889 30.264889l-39.708444 68.778667a71.111111 71.111111 0 0 0 18.488889 92.046222l59.619555 45.511111a357.489778 357.489778 0 0 0 0 125.155556l-59.562667 46.023111a71.111111 71.111111 0 0 0-18.204444 91.818666l39.765333 68.778667a71.111111 71.111111 0 0 0 88.917334 30.037333l68.721777-28.672a355.214222 355.214222 0 0 0 109.056 63.544889l9.898667 73.386667z m82.944-23.665778l-15.644444-115.882666-27.249778-7.395556a269.937778 269.937778 0 0 1-119.978667-69.973333l-20.195555-20.309334-108.828445 45.397334-27.249777-47.160889 93.582222-72.248889-7.224889-27.306667a270.677333 270.677333 0 0 1 0-138.069333l7.224889-27.534222-93.866667-71.68 27.192889-47.160889 109.169778 44.828444 20.081778-20.138666a269.937778 269.937778 0 0 1 119.921777-70.030223l27.420445-7.509333 14.961778-115.825778h54.442666l15.530667 115.256889 27.704889 7.224889a269.824 269.824 0 0 1 122.083555 69.916444l20.195556 20.081778 106.382222-44.373333 27.192889 47.160889-90.965333 70.257778 7.452444 27.477333a270.620444 270.620444 0 0 1 0.056889 141.767111l-7.452444 27.648 91.249777 69.688889-27.192889 47.160889-106.666666-43.804445-20.138667 20.024889a269.824 269.824 0 0 1-122.026667 69.973334l-27.875555 7.224888-14.848 115.313778H485.262222zM512 229.034667a156.444444 156.444444 0 1 1 0 312.888889 156.444444 156.444444 0 0 1 0-312.888889z m0 85.333333a71.111111 71.111111 0 1 0 0 142.222222 71.111111 71.111111 0 0 0 0-142.222222z" horiz-adv-x="1024" />
<glyph glyph-name="xiala" unicode="&#59081;" d="M682.666667 384l-341.333334 341.333333L341.333333 42.66666699999996z" horiz-adv-x="1024" />
<glyph glyph-name="xialazhankai" unicode="&#59084;" d="M512 213.333333l341.333333 341.333334H170.666667z" horiz-adv-x="1024" />
<glyph glyph-name="shanchu" unicode="&#59263;" d="M823.921778 643.413333v-645.575111c0-51.484444-41.699556-93.184-93.240889-93.184h-472.746667a93.240889 93.240889 0 0 0-93.297778 93.184V643.413333H49.607111a34.133333 34.133333 0 1 0 0 68.266667h886.499556a34.133333 34.133333 0 1 0 0-68.266667h-112.184889z m-68.266667 0H232.903111v-645.575111c0-13.767111 11.207111-24.917333 25.031111-24.917333h472.746667a24.974222 24.974222 0 0 1 25.031111 24.917333V643.413333zM435.2 781.255111a34.133333 34.133333 0 1 0 0 68.266667h112.469333a34.133333 34.133333 0 0 0 0-68.266667H435.2zM368.810667 460.629333a34.133333 34.133333 0 1 0 68.266666 0v-273.123555a34.133333 34.133333 0 1 0-68.266666 0v273.066666z m182.670222 0a34.133333 34.133333 0 0 0 68.266667 0v-273.123555a34.133333 34.133333 0 1 0-68.266667 0v273.066666z" horiz-adv-x="1024" />
<glyph glyph-name="xinzeng" unicode="&#59264;" d="M512-105.244444A489.244444 489.244444 0 1 1 512 873.244444a489.244444 489.244444 0 0 1 0-978.488888z m0 68.266666A420.977778 420.977778 0 1 0 512 804.977778a420.977778 420.977778 0 0 0 0-841.955556zM322.389333 349.866667h367.843556a34.133333 34.133333 0 0 1 0 68.266666H322.389333a34.133333 34.133333 0 1 1 0-68.266666zM472.177778 567.921778v-367.843556a34.133333 34.133333 0 0 1 68.266666 0V567.921778a34.133333 34.133333 0 1 1-68.266666 0z" horiz-adv-x="1024" />
<glyph glyph-name="bianji" unicode="&#59265;" d="M849.408 460.8a34.133333 34.133333 0 1 0 68.266667 0v-384.398222a108.088889 108.088889 0 0 0-108.088889-108.088889h-591.644445a108.088889 108.088889 0 0 0-108.088889 108.088889v591.644444c0 59.733333 48.355556 108.088889 108.088889 108.088889H552.96a34.133333 34.133333 0 1 0 0-68.266667H217.884444a39.822222 39.822222 0 0 1-39.822222-39.822222v-591.644444a39.822222 39.822222 0 0 1 39.822222-39.822222h591.644445a39.822222 39.822222 0 0 1 39.822222 39.822222V460.8z m-485.831111-286.549333a34.133333 34.133333 0 0 0-48.241778 48.298666l515.982222 515.584a34.133333 34.133333 0 0 0 48.184889-48.355555l-515.925333-515.527111z" horiz-adv-x="1024" />
<glyph glyph-name="icon-test" unicode="&#59259;" d="M512-110.434462C238.946462-110.434462 17.565538 110.907077 17.565538 384 17.565538 657.053538 238.907077 878.434462 512 878.434462c273.053538 0 494.434462-221.341538 494.434462-494.434462 0-273.053538-221.341538-494.434462-494.434462-494.434462z m0 43.638154c248.989538 0 450.796308 201.806769 450.796308 450.796308S760.989538 834.796308 512 834.796308 61.203692 632.989538 61.203692 384 263.010462-66.796308 512-66.796308zM703.015385 376.123077H339.495385a23.630769 23.630769 0 0 0 0 47.261538h363.52a23.630769 23.630769 0 1 0 0-47.261538z" horiz-adv-x="1024" />
<glyph glyph-name="icon-test1" unicode="&#59260;" d="M512-128C229.248-128 0 101.248 0 384S229.248 896 512 896s512-229.248 512-512-229.248-512-512-512z m0 47.274667c256.682667 0 464.725333 208.042667 464.725333 464.725333 0 256.682667-208.042667 464.725333-464.725333 464.725333C255.317333 848.725333 47.274667 640.682667 47.274667 384c0-256.682667 208.042667-464.725333 464.725333-464.725333z m35.413333 426.666666l-1.536-171.52a25.6 25.6 0 0 0-51.2 0.426667l1.493334 171.093333H325.12a25.6 25.6 0 0 0 0 51.2h171.52l1.536 171.52a25.6 25.6 0 0 0 51.2-0.426666l-1.493333-171.093334h171.093333a25.6 25.6 0 1 0 0-51.2h-171.52z" horiz-adv-x="1024" />
<glyph glyph-name="-" unicode="&#59261;" d="M512-128C229.248-128 0 101.248 0 384S229.248 896 512 896s512-229.248 512-512-229.248-512-512-512z m216.746667 497.066667a32 32 0 0 1 0 64H334.933333a32 32 0 1 1 0-64h393.813334z" horiz-adv-x="1024" />
<glyph glyph-name="icon-test2" unicode="&#59262;" d="M512-128C229.248-128 0 101.248 0 384S229.248 896 512 896s512-229.248 512-512-229.248-512-512-512z m47.317333 464.426667h165.205334a32 32 0 1 1 0 64h-164.650667l1.450667 164.608a32 32 0 0 1-64 0.597333l-1.450667-165.205333H330.666667a32 32 0 1 1 0-64h164.650666l-1.450666-164.650667a32 32 0 0 1 64-0.554667l1.450666 165.205334z" horiz-adv-x="1024" />
<glyph glyph-name="duochuang" unicode="&#59257;" d="M68.266667 793.6h546.133333v-819.2H68.266667v819.2z m68.266666-68.266667v-682.666666h409.6v682.666666H136.533333zM238.933333 622.933333h68.266667v-68.266666h-68.266667V622.933333z m136.533334 0h68.266666v-68.266666h-68.266666V622.933333zM238.933333 486.4h68.266667v-68.266667h-68.266667V486.4z m136.533334 0h68.266666v-68.266667h-68.266666V486.4zM238.933333 349.866667h68.266667v-68.266667h-68.266667V349.866667z m136.533334 0h68.266666v-68.266667h-68.266666V349.866667zM238.933333 213.333333h68.266667v-68.266666h-68.266667v68.266666z m136.533334 0h68.266666v-68.266666h-68.266666v68.266666zM546.133333 588.8h409.6v-614.4H546.133333v614.4z m68.266667-68.266667v-477.866666h273.066667v477.866666H614.4zM716.8 486.4h68.266667v-68.266667h-68.266667zM716.8 349.866667h68.266667v-68.266667h-68.266667zM716.8 213.333333h68.266667v-68.266666h-68.266667z" horiz-adv-x="1024" />
......
......@@ -2,24 +2,38 @@
<div class="temp">
<table class="tempTable" cellspacing="0" cellpadding="0" border="1">
<tr>
<td colspan="2" width="50px"><span class="table-title">权利人信息</span></td>
<td colspan="2"><span class="table-title">权利人信息</span></td>
<td colspan="2">共有方式</td>
<td colspan="8">
<el-row>
<el-col :span="16" class="fl">
<el-col :span="14" class="fl" style="line-height:32px">
<el-radio-group v-model="gyfs">
<el-radio :label="item.bsm" :disabled="qszt!='0' || item.disabled" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio>
</el-radio-group>
</el-col>
<el-col :span="4" class="fr" v-show="qszt=='0'">
<span class="span" @click="addRow">新增</span>
<span class="span" @click="changeRow">修改</span>
<span class="span" @click="delRow">删除</span>
</el-col>
<el-col :span="4" class="fr" v-show="qszt!='0'">
<span class="noEdit" >新增</span>
<span class="noEdit" >修改</span>
<span class="noEdit" >删除</span>
<el-col :span="10" class="fr">
<div v-show="qszt=='0'" class="fr" style="margin-right:20px">
<el-button size="mini" @click="addRow">
<i class="iconfont iconxinzeng"></i> 新增
</el-button>
<el-button size="mini" @click="changeRow">
<i class="iconfont iconbianji"></i> 编辑
</el-button>
<el-button size="mini" @click="delRow">
<i class="iconfont iconshanchu"></i> 删除
</el-button>
</div>
<div v-show="qszt!='0'" class="fr" style="margin-right:20px">
<el-button size="mini" disabled>
<i class="iconfont iconxinzeng"></i> 新增
</el-button>
<el-button size="mini" disabled>
<i class="iconfont iconbianji"></i> 编辑
</el-button>
<el-button size="mini" disabled>
<i class="iconfont iconshanchu"></i> 删除
</el-button>
</div>
</el-col>
</el-row>
</td>
......@@ -633,6 +647,10 @@
background-color: #fff;
font-size: 14px;
width: 100%;
table-layout: fixed;
.iconfont{
font-size: 14px!important;
}
.span {
color: #409eff;
margin-right: 10px;
......@@ -648,7 +666,7 @@
}
td {
text-align: center;
padding: 10px 0;
padding: 8px 0;
}
}
.table-title{
......@@ -678,7 +696,7 @@
}
.el-table td,
.el-table th {
padding: 6px 0;
padding: 12px 0;
color: #333 !important;
font-weight: normal;
}
......
......@@ -205,7 +205,7 @@ export default {
},
{
name: "系统管理",
icon: "iconfont iconzonghechaxun",
icon: "iconfont iconxitongguanli",
path: "/manage",
}
];
......
......@@ -169,7 +169,7 @@
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:disabled="formData.qszt!='0'"
:data="$store.state.gmjjhyflbsmList"
:props="treeProps"
:check-strictly="checkStrictly"
......
......@@ -608,27 +608,45 @@ export default {
if (e.className.indexOf("tdSelect") == -1) {
//未选中→选中
e.className = "tdSelect"; //加边框
if(this.isHbfg){
this.fghbChoosedList.push(hs);
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
}else{
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
switch (this.lpbParent) {
case 'isHbfg':
this.fghbChoosedList.push(hs);
break;
case 'isFwsxbg':
break;
case 'isCxlz':
break;
case 'isLpb':
break;
default:
break;
}
} else {
//选中→未选中
e.className = "";
if(this.isHbfg){
this.deleteArrOption(this.fghbChoosedList, hs)
this.deleteArrOption(this.hbsmList, bsm);
}else{
this.deleteArrOption(this.hbsmList, bsm);
switch (this.lpbParent) {
case 'isHbfg':
break;
case 'isFwsxbg':
break;
case 'isCxlz':
break;
case 'isLpb':
this.$parent.getHbsm(this.hbsmList, false);
break;
default:
break;
}
}
if(this.isHbfg){
}else{
this.$parent.getHbsm(this.hbsmList, false);
}
}, 200);
},
//户双击事件
......@@ -740,9 +758,7 @@ export default {
},
// 层选中事件
handleClickC(e, item) {
if (this.isHbfg) {
}else{
if (this.lpbParent == 'isLpb') {
//判断点击的层是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
......@@ -754,6 +770,8 @@ export default {
this.deleteArrOption(this.cbsmList, item.bsm);
}
this.$parent.getCbsm(this.cbsmList);
}else{
}
},
//关闭右键菜单
......@@ -922,8 +940,7 @@ export default {
//户重新落宗
handleCxlz(){
if (this.hbsmList.length <= 0) {
Message.warning("请选择操作户")
return
this.hbsmList.push(this.chData);
}
this.hcxlzVisible = true
}
......