Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
83da5cd3 by 田浩浩
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

2 parents 1c56475d 560bdac5
Inline Side-by-side
Showing 5 changed files with 125 additions and 150 deletions
...@@ -4,13 +4,12 @@ class data extends filter { ...@@ -4,13 +4,12 @@ class data extends filter {
4 constructor() { 4 constructor() {
5 super() 5 super()
6 } 6 }
7 columns() { 7 columns () {
8 return { 8 return [
9 title: "建设用地使用权、宅基地使用权登记信息",
10 columns: [
11 { 9 {
12 prop: "ssywh", 10 prop: "ssywh",
13 label: "上手业务号" 11 label: "上手业务号",
12 width: "120"
14 }, 13 },
15 { 14 {
16 prop: "dah", 15 prop: "dah",
...@@ -64,14 +63,6 @@ class data extends filter { ...@@ -64,14 +63,6 @@ class data extends filter {
64 prop: "syqqzsj", 63 prop: "syqqzsj",
65 label: "使用权起止时间", 64 label: "使用权起止时间",
66 }, 65 },
67 // {
68 // prop: "syqjssj",
69 // label: "使用权结束时间",
70 // },
71 // {
72 // prop: "tdsyqx",
73 // label: "土地使用期限",
74 // },
75 { 66 {
76 prop: "tdsyqx", 67 prop: "tdsyqx",
77 label: "土地使用期限", 68 label: "土地使用期限",
...@@ -101,8 +92,6 @@ class data extends filter { ...@@ -101,8 +92,6 @@ class data extends filter {
101 label: "附记", 92 label: "附记",
102 }, 93 },
103 ] 94 ]
104
105 }
106 } 95 }
107 } 96 }
108 97
......
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
12 </div> 12 </div>
13 </div> 13 </div>
14 <div class="xxTableBox"> 14 <div class="xxTableBox">
15 <table class="xxTable" :width="tableWidth"> 15 <table class="xxTable">
16 <tr> 16 <tr>
17 <th rowspan="3">业务类型</th> 17 <th rowspan="3">业务类型</th>
18 </tr> 18 </tr>
19 <!-- 第一行表头 --> 19 <!-- 第一行表头 -->
20 <tr class="one" id=""> 20 <tr class="one">
21 <th v-for="(item, index) in ths" :key="index" :class="[item.class, item.type == '临时' ? 'linshiIcon' : '']"> 21 <th v-for="(item, index) in ths" :key="index" :class="[item.class, item.type == '临时' ? 'linshiIcon' : '']">
22 <div class="icon" v-if="item.type == '临时'">{{ item.type }}</div> 22 <div class="icon" v-if="item.type == '临时'">正在办理</div>
23 {{ item.type }} 23 {{ item.type }}
24 </th> 24 </th>
25 </tr> 25 </tr>
...@@ -49,55 +49,65 @@ ...@@ -49,55 +49,65 @@
49 </template> 49 </template>
50 50
51 <script> 51 <script>
52 import { mapGetters } from "vuex"; 52 import { datas } from "./jsydsyq";
53 import { datas } from "./jsydsyqQlxx";
54 import { getJsydsyqList } from "@/api/zhcx.js"; 53 import { getJsydsyqList } from "@/api/zhcx.js";
55 export default { 54 export default {
56 name: "djxxTable", 55 name: "jsydsyq",
57 props: {
58 showType: "",
59 },
60 data () { 56 data () {
61 return { 57 return {
62 checkList: ["临时", "现势", "历史"], 58 checkList: ["临时", "现势", "历史"],
63 tableWidth: 810,
64 type: datas.columns(),
65 tableData: [], 59 tableData: [],
66 showTableData: [], 60 showTableData: [],
67 ths: [], 61 ths: [],
68 showThs: [],
69 columns: [], 62 columns: [],
70 title: "", 63 title: "建设用地使用权、宅基地使用权登记信息",
64 emptyData: {
65 ssywh: '',
66 dah: '',
67 ywh: '',
68 bdcdyh: "",
69 zl: "",
70 qlrlx: '',
71 qlrmc: "",
72 qlrzjzl: "",
73 qlrzjhm: "",
74 gyfs: "",
75 mj: null,
76 qlxz: '',
77 ytmc: "",
78 syqqzsj: null,
79 tdsyqx: null,
80 qdjg: null,
81 djyy: '',
82 bdcqzh: null,
83 djsj: '',
84 dbr: '',
85 fj: "",
86 qllxmc: "",
87 djlxmc: '',
88 qszt: "",
89 }
71 }; 90 };
72 }, 91 },
73 computed: { 92 async created () {
74 ...mapGetters(["djbxx"]),
75 },
76 watch: {
77 showType: {
78 handler (newVlue) {
79 // 清空值 93 // 清空值
80 this.tableData = []; 94 this.tableData = [];
81 this.ths = []; 95 this.ths = [];
82 this.columns = this.type[newVlue].columns; 96 this.columns = datas.columns();
83 this.title = this.type[newVlue].title; 97 let res = await getJsydsyqList({
84 this.checkList = ["临时", "现势", "历史"];
85 this.tableWidth = 810;
86 let detail;
87 if (newVlue === "JSYDSYQ") {
88 getJsydsyqList({
89 bdcdyid: "2b33851f4edfd468ceef4d68c370bd41", 98 bdcdyid: "2b33851f4edfd468ceef4d68c370bd41",
90 qllx: "A03", 99 qllx: "A03",
91 qszt: ["1"] 100 qszt: ["1"]
92 }).then((res) => { 101 })
93 if (res.code === 200) { 102 let resList = res.result.result ? res.result.result : []
94 detail = res.result; 103 if (resList.length < 3) {
104 let num = 3 - resList.length
105 for (let i = 0; i < num; i++) {
106 resList.push(this.emptyData)
95 } 107 }
96 });
97 } else {
98 detail = this.djbxx.detail.qlxxs[newVlue];
99 } 108 }
100 detail.forEach((item) => { 109 let detail = resList
110 detail.length > 0 && detail.forEach((item) => {
101 this.tableData.push(item); 111 this.tableData.push(item);
102 if (item.qszt == "0") { 112 if (item.qszt == "0") {
103 this.ths.push({ 113 this.ths.push({
...@@ -126,61 +136,9 @@ export default { ...@@ -126,61 +136,9 @@ export default {
126 } 136 }
127 }); 137 });
128 this.showTableData = this.tableData; 138 this.showTableData = this.tableData;
129 this.showThs = this.ths;
130 let width = (this.tableData.length - 3) * 223 + this.tableWidth;
131 this.tableWidth = this.tableData.length > 3 ? width : 810;
132 },
133 immediate: true,
134 },
135 }, 139 },
136 methods: { 140 methods: {
137 checkChange () { 141 checkChange () {
138 var checkKey = [];
139 this.ths = [];
140 this.tableWidth = 810;
141 this.checkList.forEach((item) => {
142 if (item == "临时") {
143 checkKey.push("0");
144 }
145 if (item == "现势") {
146 checkKey.push("1");
147 }
148 if (item == "历史") {
149 checkKey.push("2");
150 }
151 });
152 this.showTableData = this.tableData.filter((item) =>
153 checkKey.includes(item.qszt)
154 );
155 this.showTableData.forEach((item) => {
156 if (item.qszt == "0") {
157 this.ths.push({
158 type: "临时",
159 qllxmc: item.qllxmc,
160 djlxmc: item.djlxmc,
161 prop: "linshi",
162 class: "linshi",
163 });
164 } else if (item.qszt == "1") {
165 this.ths.push({
166 type: "现势",
167 qllxmc: item.qllxmc,
168 djlxmc: item.djlxmc,
169 prop: "xianshi",
170 class: "xianshi",
171 });
172 } else if (item.qszt == "2") {
173 this.ths.push({
174 type: "历史",
175 qllxmc: item.qllxmc,
176 djlxmc: item.djlxmc,
177 prop: "lishi",
178 class: "lishi",
179 });
180 }
181 });
182 let width = (this.showTableData.length - 3) * 223 + this.tableWidth;
183 this.tableWidth = this.showTableData.length > 3 ? width : 810;
184 }, 142 },
185 }, 143 },
186 }; 144 };
...@@ -195,14 +153,12 @@ export default { ...@@ -195,14 +153,12 @@ export default {
195 color: #333; 153 color: #333;
196 154
197 .tableBox { 155 .tableBox {
198 width: 810px;
199 margin: 0 auto; 156 margin: 0 auto;
200 display: flex; 157 display: flex;
201 flex-wrap: wrap; 158 flex-wrap: wrap;
202 159
203 .title { 160 .title {
204 width: 100%; 161 width: 100%;
205 font-family: "Arial Negreta", "Arial Normal", "Arial", sans-serif;
206 font-weight: 700; 162 font-weight: 700;
207 font-size: 16px; 163 font-size: 16px;
208 text-align: center; 164 text-align: center;
...@@ -221,24 +177,28 @@ export default { ...@@ -221,24 +177,28 @@ export default {
221 } 177 }
222 178
223 .xxTableBox { 179 .xxTableBox {
224 width: 810px;
225 overflow-x: scroll; 180 overflow-x: scroll;
181 width: 100%;
226 } 182 }
227 183
228 // .xxTable > tr th:not(:first-child) {
229 // width: 223px;
230 // }
231 .xxTable>tr:first-child th { 184 .xxTable>tr:first-child th {
232 width: 140px; 185 width: 140px;
233 } 186 }
234 187
188 tr td {
189 border: 1px solid #ccc;
190 }
191
235 .xxTable { 192 .xxTable {
193 // border-spacing: 0;
236 border-spacing: 1px; 194 border-spacing: 1px;
195 width: 100%;
237 196
238 tr>th { 197 tr>th {
239 background: #464c5b; 198 background: #464c5b;
240 color: #fff; 199 color: #fff;
241 font-size: 16px; 200 font-size: 16px;
201 height: 60px;
242 } 202 }
243 203
244 th.linshi, 204 th.linshi,
...@@ -276,19 +236,19 @@ export default { ...@@ -276,19 +236,19 @@ export default {
276 display: block; 236 display: block;
277 width: 0; 237 width: 0;
278 height: 0; 238 height: 0;
279 border-width: 0px 0px 45px 45px; 239 border-width: 0px 0px 55px 55px;
280 border-style: none solid solid; 240 border-style: none solid solid;
281 border-color: transparent transparent #fe9400; 241 border-color: transparent transparent #fe9400;
282 position: absolute; 242 position: absolute;
283 top: 0px; 243 top: 0;
284 right: 3px; 244 right: 0;
285 transform: rotate(-90deg); 245 transform: rotate(-90deg);
286 } 246 }
287 247
288 .icon { 248 .icon {
289 position: absolute; 249 position: absolute;
290 top: 8px; 250 top: 13px;
291 right: 6px; 251 right: -4px;
292 transform: rotate(45deg); 252 transform: rotate(45deg);
293 color: #fff; 253 color: #fff;
294 font-size: 12px; 254 font-size: 12px;
...@@ -300,6 +260,7 @@ export default { ...@@ -300,6 +260,7 @@ export default {
300 height: 40px; 260 height: 40px;
301 padding: 4px; 261 padding: 4px;
302 font-size: 13px; 262 font-size: 13px;
263 width: 140px;
303 } 264 }
304 265
305 >tr:nth-child(odd) td { 266 >tr:nth-child(odd) td {
......
...@@ -6,24 +6,24 @@ ...@@ -6,24 +6,24 @@
6 <div class="slxx_title">受理信息</div> 6 <div class="slxx_title">受理信息</div>
7 <el-row :gutter="10"> 7 <el-row :gutter="10">
8 <el-col :span="8"> 8 <el-col :span="8">
9 <el-form-item label="业务号：" prop="ywh"> 9 <el-form-item :class="flag? 'marginBot0': ''" label="业务号：" prop="ywh">
10 <el-input disabled v-model="ruleForm.ywh"></el-input> 10 <el-input disabled v-model="ruleForm.ywh"></el-input>
11 </el-form-item> 11 </el-form-item>
12 </el-col> 12 </el-col>
13 <el-col :span="8"> 13 <el-col :span="8">
14 <el-form-item label="受理人员：" prop="slry"> 14 <el-form-item :class="flag? 'marginBot0': ''" label="受理人员：" prop="slry">
15 <el-input disabled v-model="ruleForm.slry"></el-input> 15 <el-input disabled v-model="ruleForm.slry"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 <el-col :span="8"> 18 <el-col :span="8">
19 <el-form-item label="受理时间：" prop="slsj"> 19 <el-form-item :class="flag? 'marginBot0': ''" label="受理时间：" prop="slsj">
20 <el-input disabled v-model="ruleForm.slsj"></el-input> 20 <el-input disabled v-model="ruleForm.slsj"></el-input>
21 </el-form-item> 21 </el-form-item>
22 </el-col> 22 </el-col>
23 </el-row> 23 </el-row>
24 <el-row :gutter="10"> 24 <el-row :gutter="10">
25 <el-col :span="8"> 25 <el-col :span="8">
26 <el-form-item label="权利类型：" prop="qllx"> 26 <el-form-item :class="flag? 'marginBot0': ''" label="权利类型：" prop="qllx">
27 <el-select disabled v-model="ruleForm.qllx" filterable clearable placeholder="请选择权利类型"> 27 <el-select disabled v-model="ruleForm.qllx" filterable clearable placeholder="请选择权利类型">
28 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 28 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
29 </el-option> 29 </el-option>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 </el-form-item> 31 </el-form-item>
32 </el-col> 32 </el-col>
33 <el-col :span="8"> 33 <el-col :span="8">
34 <el-form-item label="登记类型：" prop="djlx"> 34 <el-form-item :class="flag? 'marginBot0': ''" label="登记类型：" prop="djlx">
35 <el-select disabled v-model="ruleForm.djlx" filterable clearable placeholder="请选择登记类型"> 35 <el-select disabled v-model="ruleForm.djlx" filterable clearable placeholder="请选择登记类型">
36 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 36 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
37 </el-option> 37 </el-option>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 </el-form-item> 39 </el-form-item>
40 </el-col> 40 </el-col>
41 <el-col :span="8"> 41 <el-col :span="8">
42 <el-form-item label="登记情形：" prop="djqx"> 42 <el-form-item :class="flag? 'marginBot0': ''" label="登记情形：" prop="djqx">
43 <el-input disabled v-model="ruleForm.djqxmc"></el-input> 43 <el-input disabled v-model="ruleForm.djqxmc"></el-input>
44 </el-form-item> 44 </el-form-item>
45 </el-col> 45 </el-col>
...@@ -47,34 +47,34 @@ ...@@ -47,34 +47,34 @@
47 <div class="slxx_title">不动产单元情况</div> 47 <div class="slxx_title">不动产单元情况</div>
48 <el-row :gutter="10"> 48 <el-row :gutter="10">
49 <el-col :span="8"> 49 <el-col :span="8">
50 <el-form-item label="宗地代码：" prop="zddm"> 50 <el-form-item :class="flag? 'marginBot0': ''" label="宗地代码：" prop="zddm">
51 <el-input disabled v-model="ruleForm.zddm"></el-input> 51 <el-input disabled v-model="ruleForm.zddm"></el-input>
52 </el-form-item> 52 </el-form-item>
53 </el-col> 53 </el-col>
54 <el-col :span="8"> 54 <el-col :span="8">
55 <el-form-item label="不动产单元号：" prop="bdcdyh"> 55 <el-form-item :class="flag? 'marginBot0': ''" label="不动产单元号：" prop="bdcdyh">
56 <el-input disabled v-model="ruleForm.bdcdyh"></el-input> 56 <el-input disabled v-model="ruleForm.bdcdyh"></el-input>
57 </el-form-item> 57 </el-form-item>
58 </el-col> 58 </el-col>
59 <el-col :span="8"> 59 <el-col :span="8">
60 <el-form-item label="权利性质：" prop="qlxzmc"> 60 <el-form-item :class="flag? 'marginBot0': ''" label="权利性质：" prop="qlxzmc">
61 <el-input disabled v-model="ruleForm.qlxzmc"></el-input> 61 <el-input disabled v-model="ruleForm.qlxzmc"></el-input>
62 </el-form-item> 62 </el-form-item>
63 </el-col> 63 </el-col>
64 </el-row> 64 </el-row>
65 <el-row :gutter="10"> 65 <el-row :gutter="10">
66 <el-col :span="8"> 66 <el-col :span="8">
67 <el-form-item label="宗地面积：" prop="zdmj"> 67 <el-form-item :class="flag? 'marginBot0': ''" label="宗地面积：" prop="zdmj">
68 <el-input disabled v-model="ruleForm.zdmj"></el-input> 68 <el-input disabled v-model="ruleForm.zdmj"></el-input>
69 </el-form-item> 69 </el-form-item>
70 </el-col> 70 </el-col>
71 <el-col :span="8"> 71 <el-col :span="8">
72 <el-form-item label="土地用途：" prop="tdyt"> 72 <el-form-item :class="flag? 'marginBot0': ''" label="土地用途：" prop="tdyt">
73 <el-input disabled v-model="ruleForm.tdyt"></el-input> 73 <el-input disabled v-model="ruleForm.tdyt"></el-input>
74 </el-form-item> 74 </el-form-item>
75 </el-col> 75 </el-col>
76 <el-col :span="8"> 76 <el-col :span="8">
77 <el-form-item label="权利设定方式：" prop="qlsdfs"> 77 <el-form-item :class="flag? 'marginBot0': ''" label="权利设定方式：" prop="qlsdfs">
78 <el-select disabled v-model="ruleForm.qlsdfs" filterable clearable placeholder="请选择权利设定方式"> 78 <el-select disabled v-model="ruleForm.qlsdfs" filterable clearable placeholder="请选择权利设定方式">
79 <el-option v-for="item in qlsdfsOption" :key="item.value" :label="item.label" :value="item.value"> 79 <el-option v-for="item in qlsdfsOption" :key="item.value" :label="item.label" :value="item.value">
80 </el-option> 80 </el-option>
...@@ -84,33 +84,33 @@ ...@@ -84,33 +84,33 @@
84 </el-row> 84 </el-row>
85 <el-row :gutter="10"> 85 <el-row :gutter="10">
86 <el-col :span="8"> 86 <el-col :span="8">
87 <el-form-item label="取得价格：" prop="qdjg"> 87 <el-form-item :class="flag? 'marginBot0': ''" label="取得价格：" prop="qdjg">
88 <el-input disabled v-model="ruleForm.qdjg"></el-input> 88 <el-input disabled v-model="ruleForm.qdjg"></el-input>
89 </el-form-item> 89 </el-form-item>
90 </el-col> 90 </el-col>
91 91
92 <el-col :span="16"> 92 <el-col :span="16">
93 <el-form-item label="坐落：" prop="zl"> 93 <el-form-item :class="flag? 'marginBot0': ''" label="坐落：" prop="zl">
94 <el-input disabled v-model="ruleForm.zl"></el-input> 94 <el-input disabled v-model="ruleForm.zl"></el-input>
95 </el-form-item> 95 </el-form-item>
96 </el-col> 96 </el-col>
97 </el-row> 97 </el-row>
98 <el-row :gutter="10"> 98 <el-row :gutter="10">
99 <el-col :span="8"> 99 <el-col :span="8">
100 <el-form-item label="使用期限：" prop="tdsyqx"> 100 <el-form-item :class="flag? 'marginBot0': ''" label="使用期限：" prop="tdsyqx">
101 <el-input disabled v-model="ruleForm.tdsyqx"></el-input> 101 <el-input disabled v-model="ruleForm.tdsyqx"></el-input>
102 </el-form-item> 102 </el-form-item>
103 </el-col> 103 </el-col>
104 104
105 <el-col :span="16"> 105 <el-col :span="16">
106 <el-form-item label="使用权起止时间：" prop="qssj"> 106 <el-form-item :class="flag? 'marginBot0': ''" label="使用权起止时间：" prop="qssj">
107 <el-input disabled v-model="ruleForm.syqqzsj"></el-input> 107 <el-input disabled v-model="ruleForm.syqqzsj"></el-input>
108 </el-form-item> 108 </el-form-item>
109 </el-col> 109 </el-col>
110 </el-row> 110 </el-row>
111 <el-row :gutter="10"> 111 <el-row :gutter="10">
112 <el-col> 112 <el-col>
113 <el-form-item label="附记：" prop="fj"> 113 <el-form-item :class="flag? 'marginBot0': ''" label="附记：" prop="fj">
114 <el-input type="textarea" v-model="ruleForm.fj"></el-input> 114 <el-input type="textarea" v-model="ruleForm.fj"></el-input>
115 </el-form-item> 115 </el-form-item>
116 </el-col> 116 </el-col>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
118 <div class="slxx_title">权利人信息</div> 118 <div class="slxx_title">权利人信息</div>
119 <el-row :gutter="10"> 119 <el-row :gutter="10">
120 <el-col :span="14"> 120 <el-col :span="14">
121 <el-form-item label="共有方式："> 121 <el-form-item :class="flag? 'marginBot0': ''" label="共有方式：">
122 <el-radio-group v-model="ruleForm.gyfs"> 122 <el-radio-group v-model="ruleForm.gyfs">
123 <el-radio label="1">单独所有</el-radio> 123 <el-radio label="1">单独所有</el-radio>
124 <el-radio label="2">共同共有</el-radio> 124 <el-radio label="2">共同共有</el-radio>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 </el-form-item> 127 </el-form-item>
128 </el-col> 128 </el-col>
129 <el-col :span="5" v-show="ruleForm.gyfs=='2'"> 129 <el-col :span="5" v-show="ruleForm.gyfs=='2'">
130 <el-form-item label="是否分别持证："> 130 <el-form-item :class="flag? 'marginBot0': ''" label="是否分别持证：">
131 <el-radio-group v-model="ruleForm.sffbcz"> 131 <el-radio-group v-model="ruleForm.sffbcz">
132 <el-radio label="1">是</el-radio> 132 <el-radio label="1">是</el-radio>
133 <el-radio label="0">否</el-radio> 133 <el-radio label="0">否</el-radio>
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
135 </el-form-item> 135 </el-form-item>
136 </el-col> 136 </el-col>
137 <el-col :span="5" v-show="ruleForm.gyfs=='2'"> 137 <el-col :span="5" v-show="ruleForm.gyfs=='2'">
138 <el-form-item label="持证人："> 138 <el-form-item :class="flag? 'marginBot0': ''" label="持证人：">
139 <el-select v-model="ruleForm.czr" placeholder="持证人"> 139 <el-select v-model="ruleForm.czr" placeholder="持证人">
140 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value"> 140 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
141 </el-option> 141 </el-option>
...@@ -147,14 +147,14 @@ ...@@ -147,14 +147,14 @@
147 <div class="slxx_title">登记原因</div> 147 <div class="slxx_title">登记原因</div>
148 <el-row :gutter="10"> 148 <el-row :gutter="10">
149 <el-col> 149 <el-col>
150 <el-form-item label="登记原因：" prop="djyy"> 150 <el-form-item :class="flag? 'marginBot0': ''" label="登记原因：" prop="djyy">
151 <el-input class="textArea" type="textarea" v-model="ruleForm.djyy"></el-input> 151 <el-input class="textArea" type="textarea" v-model="ruleForm.djyy"></el-input>
152 </el-form-item> 152 </el-form-item>
153 </el-col> 153 </el-col>
154 </el-row> 154 </el-row>
155 </div> 155 </div>
156 <el-row> 156 <el-row>
157 <el-form-item class="btn"> 157 <el-form-item :class="flag? 'marginBot0': ''" class="btn">
158 <el-button type="primary" @click="onSubmit">保存</el-button> 158 <el-button type="primary" @click="onSubmit">保存</el-button>
159 </el-form-item> 159 </el-form-item>
160 </el-row> 160 </el-row>
...@@ -245,6 +245,7 @@ export default { ...@@ -245,6 +245,7 @@ export default {
245 margin-right: 10px; 245 margin-right: 10px;
246 } 246 }
247 247
248
248 /deep/.el-select { 249 /deep/.el-select {
249 width: 100%; 250 width: 100%;
250 } 251 }
...@@ -253,6 +254,10 @@ export default { ...@@ -253,6 +254,10 @@ export default {
253 margin-bottom: 8px; 254 margin-bottom: 8px;
254 } 255 }
255 256
257 .marginBot0 {
258 margin-bottom: 0 !important;
259 }
260
256 .slxx { 261 .slxx {
257 box-sizing: border-box; 262 box-sizing: border-box;
258 padding-right: 15px; 263 padding-right: 15px;
...@@ -271,10 +276,10 @@ export default { ...@@ -271,10 +276,10 @@ export default {
271 .slxx_title { 276 .slxx_title {
272 border-bottom: 1px solid $borderColor; 277 border-bottom: 1px solid $borderColor;
273 padding-left: 10px; 278 padding-left: 10px;
274 padding-bottom: 15px; 279 padding-bottom: 5px;
275 margin-bottom: 15px; 280 margin-bottom: 10px;
276 margin-top: 5px; 281 margin-top: 5px;
277 font-size: 18px; 282 font-size: 16px;
278 font-weight: 500; 283 font-weight: 500;
279 color: #4a4a4a; 284 color: #4a4a4a;
280 } 285 }
......
...@@ -164,9 +164,9 @@ export default { ...@@ -164,9 +164,9 @@ export default {
164 164
165 .spyj_title { 165 .spyj_title {
166 text-align: center; 166 text-align: center;
167 font-size: 24px; 167 font-size: 18px;
168 display: block; 168 display: block;
169 margin: 30px 0; 169 margin: 5px;
170 } 170 }
171 171
172 /deep/.el-form-item { 172 /deep/.el-form-item {
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
58 <p class="splitScreen tabsList-title">材料信息</p> 58 <p class="splitScreen tabsList-title">材料信息</p>
59 <div class="splitScreen"></div> 59 <div class="splitScreen"></div>
60 </div> 60 </div>
61 <<<<<<< HEAD
61 <el-tabs v-model="activeName" @tab-click="activeClick"> 62 <el-tabs v-model="activeName" @tab-click="activeClick">
62 <el-tab-pane 63 <el-tab-pane
63 :label="item.name" 64 :label="item.name"
...@@ -83,6 +84,18 @@ ...@@ -83,6 +84,18 @@
83 </div> 84 </div>
84 </el-tab-pane> 85 </el-tab-pane>
85 </el-tabs> 86 </el-tabs>
87 =======
88 <div style="width:100%">
89 <el-tabs v-model="activeName" @tab-click='activeClick'>
90 <el-tab-pane :label="item.name" :name="item.value" v-for="(item, index) in tabList" :key="index">
91 </el-tab-pane>
92 </el-tabs>
93 <div class="splitScreen-con">
94 <component ref='slxx' v-if="activeName == 'slsq'" :is="editItem" :flag="flag" :key="key" />
95 <component :is="editItem" :key="key" />
96 </div>
97 </div>
98 >>>>>>> 560bdac56422758a7b06eb466a42296662fac954
86 </div> 99 </div>
87 </div> 100 </div>
88 <zc ref="zcDialogRef" v-model="zcDialog" :queryForm="queryForm" /> 101 <zc ref="zcDialogRef" v-model="zcDialog" :queryForm="queryForm" />
...@@ -132,8 +145,12 @@ export default { ...@@ -132,8 +145,12 @@ export default {
132 }, 145 },
133 watch: { 146 watch: {
134 activeName: { 147 activeName: {
135 handler(newName, oldName) { 148 handler (newName, oldName) {
136 this.editItem = this.loadView(newName); 149 if (newName === 'qlxx') {
150 this.editItem = this.loadViewSlsq()
151 } else {
152 this.editItem = this.loadView(newName)
153 }
137 }, 154 },
138 immediate: true, 155 immediate: true,
139 }, 156 },
...@@ -153,14 +170,13 @@ export default { ...@@ -153,14 +170,13 @@ export default {
153 that.id = id; 170 that.id = id;
154 var formdata = new FormData(); 171 var formdata = new FormData();
155 formdata.append("bsmSlsq", id); 172 formdata.append("bsmSlsq", id);
156 leftMenu(formdata).then((res) => { 173 leftMenu(formdata).then(res => {
157 console.log(res, "eeeeeeeeeeee");
158 if (res.code === 200) { 174 if (res.code === 200) {
159 this.unitData = res.result ? res.result : []; 175 this.unitData = res.result ? res.result : [];
160 setTimeout(() => { 176 setTimeout(() => {
161 that.$refs?.slxx[0].list(that.unitData && that.unitData[0].bsmSldy); 177 that.$refs.slxx?.[0].list(that.unitData?.[0]?.bsmSldy)
162 this.taskId = that.unitData[0].taskId; 178 this.taskId = that.unitData?.[0]?.taskId
163 this.bsmBusiness = that.unitData[0].bsmBusiness; 179 this.bsmBusiness = that.unitData?.[0]?.bsmBusiness
164 }, 300); 180 }, 300);
165 } 181 }
166 }); 182 });
...@@ -173,8 +189,8 @@ export default { ...@@ -173,8 +189,8 @@ export default {
173 formdata.append("bestepid", bestepid); 189 formdata.append("bestepid", bestepid);
174 stepExpandInfo(formdata).then((res) => { 190 stepExpandInfo(formdata).then((res) => {
175 if (res.code === 200) { 191 if (res.code === 200) {
176 this.tabList1 = [...res.result.form]; 192 this.tabList1 = [...res.result.form]
177 this.tabList = res.result.form; 193 this.tabList = res.result.form
178 this.headerleftList = res.result.button; 194 this.headerleftList = res.result.button;
179 this.headerRightList = res.result.operation; 195 this.headerRightList = res.result.operation;
180 } 196 }
...@@ -237,6 +253,9 @@ export default { ...@@ -237,6 +253,9 @@ export default {
237 return (r) => 253 return (r) =>
238 require.ensure([], () => r(require(`./components/${view}.vue`))); 254 require.ensure([], () => r(require(`./components/${view}.vue`)));
239 }, 255 },
256 loadViewSlsq () {
257 return r => require.ensure([], () => r(require('../../components/jsydsyq/jsydsyq.vue')))
258 },
240 }, 259 },
241 }; 260 };
242 </script> 261 </script>
...@@ -261,13 +280,15 @@ export default { ...@@ -261,13 +280,15 @@ export default {
261 font-size: 12px; 280 font-size: 12px;
262 } 281 }
263 282
264 /deep/.el-tabs__content { 283 /deep/.el-tabs__header {
265 height: calc(100vh - 135px) !important; 284 margin: 0 !important;
266 } 285 }
267 286
287
268 .splitScreen-con { 288 .splitScreen-con {
269 padding: 0 15px; 289 padding: 0 15px;
270 box-sizing: border-box; 290 box-sizing: border-box;
291 height: calc(100% - 350px);
271 } 292 }
272 293
273 .fqsq { 294 .fqsq {
...@@ -358,7 +379,6 @@ export default { ...@@ -358,7 +379,6 @@ export default {
358 .tabsList-left { 379 .tabsList-left {
359 border-right: 1px solid #ebeef5; 380 border-right: 1px solid #ebeef5;
360 position: relative; 381 position: relative;
361 width: 250px;
362 box-sizing: border-box; 382 box-sizing: border-box;
363 383
364 ul { 384 ul {
......