d499b0ca by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 2282194a ff0c5ac9
1 { 1 {
2 "TITLE": "不动产登记系统", 2 "TITLE": "不动产登记系统",
3 "SERVERAPI": "/bdcdj-th", 3 "SERVERAPI": "/bdcdj",
4 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0" 4 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
5 } 5 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -180,6 +180,10 @@ div:focus { ...@@ -180,6 +180,10 @@ div:focus {
180 } 180 }
181 } 181 }
182 182
183 .flex {
184 display: flex;
185 }
186
183 aside { 187 aside {
184 background: #eef1f6; 188 background: #eef1f6;
185 padding: 8px 24px; 189 padding: 8px 24px;
......
1 <!--
2 功能:初始化功能描述
3 作者:calliope
4 -->
5 <template>
6 <div class='ywdialog'>
7 <el-link type="danger">{{formData.message}}</el-link>
8 <el-table
9 v-if="formData.result"
10 :data="formData.result"
11 height="200">
12 <el-table-column
13 prop="bdcdyh"
14 label="不动产单元号">
15 </el-table-column>
16 <el-table-column
17 prop="verifyErrorMessage"
18 label="状态">
19 </el-table-column>
20 </el-table>
21 </div>
22 </template>
23 <script>
24 export default {
25 props: {
26 formData: {
27 type: Object,
28 default: {}
29 }
30 }
31 }
32 </script>
33 <style scoped lang='scss'>
34 @import "~@/styles/public.scss";
35 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -9,16 +9,16 @@ ...@@ -9,16 +9,16 @@
9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
10 <el-row> 10 <el-row>
11 <el-col :span="8"> 11 <el-col :span="8">
12 <el-form-item label="义务人类型1" prop="sqrlx"> 12 <el-form-item label="义务人类型" prop="ywrlx">
13 <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择"> 13 <el-select clearable v-model="ruleForm.ywrlx" class="width100" placeholder="请选择">
14 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 14 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode">
15 </el-option> 15 </el-option>
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 <el-col :span="8"> 19 <el-col :span="8">
20 <el-form-item label="姓名/名称" prop="sqrmc"> 20 <el-form-item label="姓名/名称" prop="ywrmc">
21 <el-input v-model="ruleForm.sqrmc" maxlegth="15"></el-input> 21 <el-input v-model="ruleForm.ywrmc" maxlegth="15"></el-input>
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 <el-col :span="8"> 24 <el-col :span="8">
...@@ -157,8 +157,8 @@ ...@@ -157,8 +157,8 @@
157 return { 157 return {
158 myValue: this.value, 158 myValue: this.value,
159 ruleForm: { 159 ruleForm: {
160 sqrlx: "", 160 ywrlx: "",
161 sqrmc: "", 161 ywrmc: "",
162 zjzl: "", 162 zjzl: "",
163 zjh: "", 163 zjh: "",
164 dh: "", 164 dh: "",
...@@ -178,8 +178,8 @@ ...@@ -178,8 +178,8 @@
178 dlrzjh: "", 178 dlrzjh: "",
179 }, 179 },
180 rules: { 180 rules: {
181 sqrlx: [{ required: true, message: "义务人类型", trigger: "change" }], 181 ywrlx: [{ required: true, message: "义务人类型", trigger: "change" }],
182 sqrmc: [{ required: true, message: "姓名/名称", trigger: "blur" }], 182 ywrmc: [{ required: true, message: "姓名/名称", trigger: "blur" }],
183 zjzl: [{ required: true, message: "证件种类", trigger: "change" }], 183 zjzl: [{ required: true, message: "证件种类", trigger: "change" }],
184 zjh: [{ required: true, message: "证件号", trigger: "blur" }], 184 zjh: [{ required: true, message: "证件号", trigger: "blur" }],
185 }, 185 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:41:20 4 * @LastEditTime: 2023-05-17 10:41:20
5 --> 5 -->
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 } 70 }
71 }, 71 },
72 { 72 {
73 prop: "sqrmc", 73 prop: "qlrmc",
74 label: "姓名/名称" 74 label: "姓名/名称"
75 }, 75 },
76 { 76 {
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 this.$nextTick(() => { 121 this.$nextTick(() => {
122 if (val.length == 0 || !val) { 122 if (val.length == 0 || !val) {
123 that.tableDataList = _.cloneDeep([{ 123 that.tableDataList = _.cloneDeep([{
124 sqrmc: '', 124 qlrmc: '',
125 dlrzjlx: '', 125 dlrzjlx: '',
126 dlrzjh: '', 126 dlrzjh: '',
127 fr: '' 127 fr: ''
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 <div>请选择查封不动产信息,请选择上手权利信息</div> 42 <div>请选择查封不动产信息,请选择上手权利信息</div>
43 <div class="triangle"></div> 43 <div class="triangle"></div>
44 </div> 44 </div>
45 <el-row :gutter="10" v-if="ruleForm.ztQlxx!=null"> 45 <el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
46 <el-col :span="8"> 46 <el-col :span="8">
47 <el-form-item label="权利人:"> 47 <el-form-item label="权利人:">
48 <el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input> 48 <el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 </el-form-item> 59 </el-form-item>
60 </el-col> 60 </el-col>
61 </el-row> 61 </el-row>
62 <el-row :gutter="10" v-if="ruleForm.ztQlxx!=null"> 62 <el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
63 <el-col :span="8"> 63 <el-col :span="8">
64 <el-form-item label="权利类型:"> 64 <el-form-item label="权利类型:">
65 <el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input> 65 <el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
76 </el-form-item> 76 </el-form-item>
77 </el-col> 77 </el-col>
78 </el-row> 78 </el-row>
79 <el-row :gutter="10" v-if="ruleForm.ztQlxx!=null"> 79 <el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
80 <el-col :span="8"> 80 <el-col :span="8">
81 <el-form-item label="不动产单元号:"> 81 <el-form-item label="不动产单元号:">
82 <el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input> 82 <el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
115 </el-col> 115 </el-col>
116 </el-row> 116 </el-row>
117 <el-row :gutter="10"> 117 <el-row :gutter="10">
118 <el-col :span="8"> 118 <!-- <el-col :span="8">
119 <el-form-item label="权利类型:"> 119 <el-form-item label="权利类型:">
120 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 120 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
121 </el-form-item> 121 </el-form-item>
...@@ -141,6 +141,53 @@ ...@@ -141,6 +141,53 @@
141 <el-form-item label="不动产权证号:"> 141 <el-form-item label="不动产权证号:">
142 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 142 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
143 </el-form-item> 143 </el-form-item>
144 </el-col> -->
145 <el-col :span="8">
146 <el-form-item label="登记机构:">
147 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
148 </el-form-item>
149 </el-col>
150 <el-col :span="8">
151 <el-form-item label="查封机关">
152 <el-input v-model="ruleForm.cfdj.cfjg"></el-input>
153 </el-form-item>
154 </el-col>
155 <el-col :span="8">
156 <el-form-item label="查封类型">
157 <el-select v-model="ruleForm.cfdj.cflx">
158 <el-option
159 v-for="item in dictData['A32']"
160 :key="item.dcode"
161 :label="item.dname"
162 :value="item.dcode"
163 ></el-option>
164 </el-select>
165 </el-form-item>
166 </el-col>
167 <el-col :span="8">
168 <el-form-item label="查封文号">
169 <el-input v-model="ruleForm.cfdj.cfwh"></el-input>
170 </el-form-item>
171 </el-col>
172 <el-col :span="8">
173 <el-form-item label="查封起始时间">
174 <el-input v-model="ruleForm.cfdj.cfqssj"></el-input>
175 </el-form-item>
176 </el-col>
177 <el-col :span="8">
178 <el-form-item label="查封结束时间">
179 <el-input v-model="ruleForm.cfdj.cfjssj"></el-input>
180 </el-form-item>
181 </el-col>
182 <el-col :span="8">
183 <el-form-item label="查封期限">
184 <el-input v-model="ruleForm.cfdj.cfqx"></el-input>
185 </el-form-item>
186 </el-col>
187 <el-col :span="8">
188 <el-form-item label="查封范围">
189 <el-input v-model="ruleForm.cfdj.cffw"></el-input>
190 </el-form-item>
144 </el-col> 191 </el-col>
145 <el-col :span="8"> 192 <el-col :span="8">
146 <el-form-item label="区县代码:"> 193 <el-form-item label="区县代码:">
...@@ -152,6 +199,36 @@ ...@@ -152,6 +199,36 @@
152 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 199 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
153 </el-form-item> 200 </el-form-item>
154 </el-col> 201 </el-col>
202 <el-col :span="8">
203 <el-form-item label="解封业务号">
204 <el-input v-model="ruleForm.cfdj.jfywh"></el-input>
205 </el-form-item>
206 </el-col>
207 <el-col :span="8">
208 <el-form-item label="解封机关">
209 <el-input v-model="ruleForm.cfdj.jfjg"></el-input>
210 </el-form-item>
211 </el-col>
212 <el-col :span="8">
213 <el-form-item label="解封文件">
214 <el-input v-model="ruleForm.cfdj.jfwj"></el-input>
215 </el-form-item>
216 </el-col>
217 <el-col :span="8">
218 <el-form-item label="解封文号">
219 <el-input v-model="ruleForm.cfdj.jfwh"></el-input>
220 </el-form-item>
221 </el-col>
222 <el-col :span="8">
223 <el-form-item label="解封登簿人">
224 <el-input v-model="ruleForm.cfdj.jfdbr"></el-input>
225 </el-form-item>
226 </el-col>
227 <el-col :span="8">
228 <el-form-item label="解封登记时间">
229 <el-input v-model="ruleForm.cfdj.jfdjsj"></el-input>
230 </el-form-item>
231 </el-col>
155 <el-col :span="8"> 232 <el-col :span="8">
156 <el-form-item label="登簿人:"> 233 <el-form-item label="登簿人:">
157 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 234 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-05 10:05:46 4 * @LastEditTime: 2023-07-05 16:15:28
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
36 </el-form-item> 36 </el-form-item>
37 </el-col> 37 </el-col>
38 </el-row> 38 </el-row>
39 <div class="slxx_title title-block"> 39 <div class="slxx_title title-block flex">
40 抵押不动产情况 40 抵押不动产情况 <el-divider direction="vertical"></el-divider>
41 <el-row :gutter="10"> 41 <el-row :gutter="10">
42 <el-col :span="8"> 42 <el-col :span="8">
43 <el-form-item label="抵押不动产信息:"> 43 <el-form-item label="抵押不动产信息:">
......
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
203 /> 203 />
204 </div> 204 </div>
205 </div> 205 </div>
206 <el-row class="btn"> 206 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
207 <el-form-item> 207 <el-form-item>
208 <el-button type="primary" @click="onSubmit">保存</el-button> 208 <el-button type="primary" @click="onSubmit">保存</el-button>
209 </el-form-item> 209 </el-form-item>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-04 15:04:59 4 * @LastEditTime: 2023-07-05 16:57:08
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
20 <script> 20 <script>
21 import { datas } from "../../javascript/zsyl.js"; 21 import { datas } from "../../javascript/zsyl.js";
22 import { getSlsqBdcqzList } from "@/api/bdcqz.js" 22 import { getSlsqBdcqzList } from "@/api/bdcqz.js"
23 import { log } from 'bpmn-js-token-simulation';
24 export default { 23 export default {
25 name: "zsyl", 24 name: "zsyl",
26 props: { 25 props: {
......
...@@ -5,15 +5,78 @@ ...@@ -5,15 +5,78 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
8 <lb-table 8 <el-table
9 :column="InformationTable" 9 :data="tableDataList"
10 border
10 :pagination="false" 11 :pagination="false"
11 :key="key" 12 :key="key"
13 :header-cell-style="{'text-align':'center'}"
12 :heightNumSetting="true" 14 :heightNumSetting="true"
13 :minHeight="150" 15 :minHeight="150"
14 :data="tableDataList" 16 height="150"
17 style="width: 100%"
15 > 18 >
16 </lb-table> 19 <el-table-column
20 prop="index"
21 width="50"
22 :render-header="renderHeader"
23 >
24 <template slot-scope="scope">
25 <i
26 class="el-icon-minus pointer"
27 @click="deleClick(scope.$index, scope.row)"
28 ></i>
29 </template>
30 </el-table-column>
31 <el-table-column prop="yt" label="土地用途" min-width="100">
32 <template slot-scope="scope">
33 <treeselect
34 v-model="tdyt"
35 noOptionsText="暂无数据"
36 placeholder=""
37 :show-count="true"
38 :options="dictData['tdyt']"
39 :normalizer="normalizer"
40 :appendToBody="true" z-index="9999"
41 @input="addrow(scope.row)"
42 />
43 </template>
44 </el-table-column>
45 <el-table-column prop="qssj" label="土地使用起始时间" min-width="100">
46 <template slot-scope="scope">
47 <el-date-picker
48 v-model='scope.row.qssj'
49 type="date"
50 placeholder="选择日期"
51 value-format="yyyy/MM/dd HH:mm:ss"
52 format="yyyy/MM/dd"
53 @blur="addrow(scope.row)">
54 </el-date-picker>
55 </template>
56 </el-table-column>
57 <el-table-column prop="jssj" label="土地使用结束时间" min-width="100">
58 <template slot-scope="scope">
59 <el-date-picker
60 v-model='scope.row.jssj'
61 type="date"
62 placeholder="选择日期"
63 value-format="yyyy/MM/dd HH:mm:ss"
64 format="yyyy/MM/dd"
65 @blur="addrow(scope.row)">
66 </el-date-picker>
67 </template>
68 </el-table-column>
69 <el-table-column prop="syqx" label="土地使用期限" min-width="100">
70 <template slot-scope="scope">
71 <el-input
72 class="item"
73 v-model="scope.row.syqx"
74 placeholder="请输入内容"
75 @blur="addrow(scope.row)">
76 ></el-input>
77 </template>
78 </el-table-column>
79 </el-table>
17 </div> 80 </div>
18 </template> 81 </template>
19 <script> 82 <script>
...@@ -32,6 +95,8 @@ export default { ...@@ -32,6 +95,8 @@ export default {
32 }, 95 },
33 data() { 96 data() {
34 return { 97 return {
98 // 键名转换,方法默认是label和children进行树状渲染
99 tdyt:null,
35 key: 0, 100 key: 0,
36 newdata: { 101 newdata: {
37 yt: "", 102 yt: "",
...@@ -40,118 +105,15 @@ export default { ...@@ -40,118 +105,15 @@ export default {
40 syqx: "", 105 syqx: "",
41 }, 106 },
42 tableDataList: [], 107 tableDataList: [],
43 InformationTable: [ 108 normalizer(node) {
44 { 109 if (node.children == null || node.children == "null") {
45 width: "50", 110 delete node.children;
46 renderHeader: (h, scope) => { 111 }
47 return ( 112 return {
48 <div> 113 id: node.dcode,
49 {" "} 114 label: node.dname,
50 {this.$route.query.viewtype == 1 ? ( 115 };
51 "序号" 116 },
52 ) : (
53 <i
54 class="el-icon-plus pointer"
55 onClick={() => {
56 this.addClick();
57 }}
58 ></i>
59 )}
60 </div>
61 );
62 },
63 render: (h, scope) => {
64 return (
65 <div>
66 {this.$route.query.viewtype == 1 ? (
67 <span>{scope.$index + 1}</span>
68 ) : (
69 <i
70 class="el-icon-minus pointer"
71 onClick={() => {
72 this.deleClick(scope.$index, scope.row);
73 }}
74 ></i>
75 )}
76 </div>
77 );
78 },
79 },
80 {
81 label: "土地用途",
82 align: "center",
83 render: (h, scope) => {
84 return (
85 <el-select
86 value={scope.row.yt}
87 onChange={(val) => {
88 scope.row.yt = val;
89 }}
90 clearable
91 onblur={() => {
92 this.addrow(scope);
93 }}
94 >
95 {this.dictData["tdyt"].map((option) => {
96 return (
97 <el-option
98 label={option.dname}
99 value={option.dcode}
100 ></el-option>
101 );
102 })}
103 </el-select>
104 );
105 },
106 },
107 {
108 label: "土地使用起始时间",
109 render: (h, scope) => {
110 return (
111 <el-date-picker
112 v-model={scope.row.qssj}
113 type="date"
114 placeholder="选择日期"
115 value-format="yyyy/MM/dd HH:mm:ss"
116 format="yyyy/MM/dd HH:mm:ss"
117 onblur={() => {
118 this.addrow(scope.row);
119 }}
120 ></el-date-picker>
121 );
122 },
123 },
124 {
125 label: "土地使用结束时间",
126 render: (h, scope) => {
127 return (
128 <el-date-picker
129 v-model={scope.row.jssj}
130 type="date"
131 placeholder="选择日期"
132 value-format="yyyy/MM/dd HH:mm:ss"
133 format="yyyy/MM/dd HH:mm:ss"
134 onblur={() => {
135 this.addrow(scope.row);
136 }}
137 ></el-date-picker>
138 );
139 },
140 },
141 {
142 label: "土地使用期限",
143 render: (h, scope) => {
144 return (
145 <el-input
146 v-model={scope.row.syqx}
147 onblur={() => {
148 this.addrow(scope.row);
149 }}
150 ></el-input>
151 );
152 },
153 },
154 ],
155 }; 117 };
156 }, 118 },
157 watch: { 119 watch: {
...@@ -168,8 +130,18 @@ export default { ...@@ -168,8 +130,18 @@ export default {
168 syqx: "", 130 syqx: "",
169 }, 131 },
170 ]); 132 ]);
133 if( that.tableDataList.length>0){
134 this.tdyt=that.tableDataList[0].yt?that.tableDataList[0].yt:null
135 }else{
136 this.tdyt=null
137 }
171 } else { 138 } else {
172 that.tableDataList = _.cloneDeep(val); 139 that.tableDataList = _.cloneDeep(val);
140 if( that.tableDataList.length>0){
141 this.tdyt=that.tableDataList[0].yt?that.tableDataList[0].yt:null
142 }else{
143 this.tdyt=null
144 }
173 } 145 }
174 }); 146 });
175 }, 147 },
...@@ -178,21 +150,42 @@ export default { ...@@ -178,21 +150,42 @@ export default {
178 }, 150 },
179 }, 151 },
180 methods: { 152 methods: {
153 renderHeader() {
154 return (
155 <div>
156 {" "}
157 {this.$route.query.viewtype == 1 ? (
158 "序号"
159 ) : (
160 <i
161 class="el-icon-plus pointer"
162 onClick={() => {
163 this.addClick();
164 }}
165 ></i>
166 )}
167 </div>
168 );
169 },
181 // 修改事件 170 // 修改事件
182 addrow() { 171 addrow() {
183 console.log("this.$parent.bsmqlxx",this.$parent.$parent.bsmqlxx); 172 this.tableDataList = this.tableDataList.map((item) => {
184 173 return{
174 ...item,
175 yt:this.tdyt
176 }
177 })
185 this.$emit("upDateTdytxxList", this.tableDataList); 178 this.$emit("upDateTdytxxList", this.tableDataList);
186 }, 179 },
187 // 新增 180 // 新增
188 addClick() { 181 addClick() {
189 this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata); 182 this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
183
190 this.$emit("upDateTdytxxList", this.tableDataList); 184 this.$emit("upDateTdytxxList", this.tableDataList);
191 }, 185 },
192 186
193 // 删除 187 // 删除
194 deleClick(index, row) { 188 deleClick(index, row) {
195 console.log("删除");
196 this.$confirm("确定要删除吗, 是否继续?", "提示", { 189 this.$confirm("确定要删除吗, 是否继续?", "提示", {
197 confirmButtonText: "确定", 190 confirmButtonText: "确定",
198 cancelButtonText: "取消", 191 cancelButtonText: "取消",
...@@ -210,4 +203,8 @@ export default { ...@@ -210,4 +203,8 @@ export default {
210 .el-input { 203 .el-input {
211 border: none !important; 204 border: none !important;
212 } 205 }
206 /deep/.el-table__row{
207 border: none !important;
208
209 }
213 </style> 210 </style>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 </div> 15 </div>
16 <el-row :gutter="10"> 16 <el-row :gutter="10">
17 <el-col :span="8"> 17 <el-col :span="8">
18 <el-form-item label="业务号:"> 18 <el-form-item label="业务号111:">
19 <el-input disabled v-model="ruleForm.flow.ywh"></el-input> 19 <el-input disabled v-model="ruleForm.flow.ywh"></el-input>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
...@@ -131,14 +131,14 @@ ...@@ -131,14 +131,14 @@
131 </el-form-item> 131 </el-form-item>
132 </el-col> 132 </el-col>
133 133
134 <el-col :span="8"> 134 <!-- <el-col :span="8">
135 <el-form-item label="下拉表格测试:"> 135 <el-form-item label="下拉表格测试:">
136 <select-table v-model="value2" :table-width="600" :props="props" @change="change"> 136 <select-table v-model="value2" :table-width="600" :props="props" @change="change">
137 <el-table-column prop="id" label="ID" width="180"></el-table-column> 137 <el-table-column prop="id" label="ID" width="180"></el-table-column>
138 <el-table-column prop="user" label="姓名"></el-table-column> 138 <el-table-column prop="user" label="姓名"></el-table-column>
139 </select-table> 139 </select-table>
140 </el-form-item> 140 </el-form-item>
141 </el-col> 141 </el-col> -->
142 142
143 </el-row> 143 </el-row>
144 <div class="slxx_title title-block"> 144 <div class="slxx_title title-block">
......
...@@ -47,12 +47,13 @@ ...@@ -47,12 +47,13 @@
47 </template> 47 </template>
48 <script> 48 <script>
49 //首次登记 49 //首次登记
50 import jump from "./mixin/jump";
50 import store from '@/store/index.js' 51 import store from '@/store/index.js'
51 import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table"; 52 import table from "@/utils/mixin/table";
54 import jump from "./mixin/jump"; 53 import { popupDialog, popupCacel } from "@/utils/popup.js";
55 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js"; 54 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
55 import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
56 import { defaultParameters } from "../javascript/publicDefaultPar.js";
56 export default { 57 export default {
57 mixins: [table, jump], 58 mixins: [table, jump],
58 props: { 59 props: {
...@@ -115,9 +116,8 @@ ...@@ -115,9 +116,8 @@
115 } 116 }
116 this.$popupCacel() 117 this.$popupCacel()
117 } else { 118 } else {
118 this.$message.error(res.message) 119 popupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
119 } 120 }
120
121 }) 121 })
122 }, 122 },
123 handleSelectionChange (val) { 123 handleSelectionChange (val) {
......