Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
44477458 by renchao@pashanhoo.com
Options

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

2 parents 9631f17e 5efa271b
Inline Side-by-side
Showing 6 changed files with 165 additions and 128 deletions
...@@ -277,7 +277,9 @@ ...@@ -277,7 +277,9 @@
277 </el-col> 277 </el-col>
278 278
279 <el-col :span="8"> 279 <el-col :span="8">
280 <el-form-item label="异议事项："> 280 <el-form-item label="异议事项："
281 prop="yydj.yysx"
282 :rules="rules.yysxrules">
281 <el-input v-model="ruleForm.yydj.yysx"></el-input> 283 <el-input v-model="ruleForm.yydj.yysx"></el-input>
282 </el-form-item> 284 </el-form-item>
283 </el-col> 285 </el-col>
...@@ -507,6 +509,7 @@ export default { ...@@ -507,6 +509,7 @@ export default {
507 bdcdjzmhrules: [ 509 bdcdjzmhrules: [
508 { required: true, message: "不动产登记证明号： ", trigger: "blur" }, 510 { required: true, message: "不动产登记证明号： ", trigger: "blur" },
509 ], 511 ],
512 yysxrules: [{ required: true, message: "异议事项", trigger: "blur" }],
510 }, 513 },
511 ableOperation: false, 514 ableOperation: false,
512 }; 515 };
......
...@@ -113,14 +113,6 @@ export default { ...@@ -113,14 +113,6 @@ export default {
113 }, 113 },
114 }, 114 },
115 mounted() { 115 mounted() {
116 console.log(
117 "bestepid: this.$route.query.bestepid,",
118 this.$route.query.bestepid
119 );
120 console.log(
121 "bestepid: this.$route.query.sqywbm,",
122 this.$route.query.sqywbm
123 );
124 this.ableOperation = this.$parent.ableOperation; 116 this.ableOperation = this.$parent.ableOperation;
125 }, 117 },
126 methods: { 118 methods: {
...@@ -162,7 +154,6 @@ export default { ...@@ -162,7 +154,6 @@ export default {
162 return new Promise((resolve) => { 154 return new Promise((resolve) => {
163 this.unitData = this.$parent.unitData; 155 this.unitData = this.$parent.unitData;
164 var formdata = new FormData(); 156 var formdata = new FormData();
165
166 formdata.append("bsmSlsq", this.$parent.bsmSlsq); 157 formdata.append("bsmSlsq", this.$parent.bsmSlsq);
167 if (this.$route.query.sqywbm == "DJBBL") { 158 if (this.$route.query.sqywbm == "DJBBL") {
168 formdata.append("bsmSldy", this.$parent.bsmRepair); 159 formdata.append("bsmSldy", this.$parent.bsmRepair);
...@@ -259,6 +250,9 @@ export default { ...@@ -259,6 +250,9 @@ export default {
259 sjlx: data.cllx, 250 sjlx: data.cllx,
260 sfxjcl: "1", // 是否必选 251 sfxjcl: "1", // 是否必选
261 }; 252 };
253 if (this.$route.query.sqywbm == "DJBBL") {
254 obj.bsmSldy=this.$parent.bsmRepair
255 }
262 saveClml(obj).then(async (res) => { 256 saveClml(obj).then(async (res) => {
263 if (res.code == 200) { 257 if (res.code == 200) {
264 let res = await this.clmlInitList(2); 258 let res = await this.clmlInitList(2);
...@@ -324,6 +318,7 @@ export default { ...@@ -324,6 +318,7 @@ export default {
324 data: this.tableData, 318 data: this.tableData,
325 unitData: this.$parent.unitData, 319 unitData: this.$parent.unitData,
326 ableOperation: this.$parent.ableOperation, 320 ableOperation: this.$parent.ableOperation,
321 bsmRepair:this.$parent.bsmRepair
327 }, 322 },
328 "60%", 323 "60%",
329 true 324 true
......
...@@ -209,9 +209,14 @@ ...@@ -209,9 +209,14 @@
209 return new Promise(resolve => { 209 return new Promise(resolve => {
210 this.unitData = this.$parent.unitData; 210 this.unitData = this.$parent.unitData;
211 var formdata = new FormData(); 211 var formdata = new FormData();
212 formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy); 212 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
213 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq); 213 if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
214 formdata.append("bsmSldy", this.formData.bsmRepair);
215 formdata.append("clfl", 3);
216 } else {
217 formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
214 formdata.append("clfl", 2); 218 formdata.append("clfl", 2);
219 }
215 InitClml(formdata).then((res) => { 220 InitClml(formdata).then((res) => {
216 if (res.code == 200) { 221 if (res.code == 200) {
217 resolve(res.code) 222 resolve(res.code)
......
...@@ -485,8 +485,19 @@ ...@@ -485,8 +485,19 @@
485 // this.taskList =this.formData.allCommentList; 485 // this.taskList =this.formData.allCommentList;
486 // 处理数据之后赋值 486 // 处理数据之后赋值
487 this.taskCommentList = this.taskList; 487 this.taskCommentList = this.taskList;
488 this.taskCommentList=this.taskCommentList.sort(this.sortDownDate)
488 }, 489 },
490 /**
491 * 时间排序函数
492 * @description: formatDate
493 * @param {*} row
494 * @param {*} column
495 * @author: renchao
496 */
489 497
498 sortDownDate(a, b) {
499 return Date.parse(a.createTime) - Date.parse(b.createTime);
500 },
490 // 设置流程图元素状态 501 // 设置流程图元素状态
491 /** 502 /**
492 * @description: 设置流程图元素状态 503 * @description: 设置流程图元素状态
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 </el-col> 60 </el-col>
61 <el-col :span="8"> 61 <el-col :span="8">
62 <el-form-item label="不动产单元号："> 62 <el-form-item label="不动产单元号：">
63 <el-input v-model="ruleForm.zdjbxx.bdcdyh"></el-input> 63 <el-input v-model="ruleForm.sldy.bdcdyh"></el-input>
64 </el-form-item> 64 </el-form-item>
65 </el-col> 65 </el-col>
66 <el-col :span="8"> 66 <el-col :span="8">
......
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
11 :model="queryForm" 11 :model="queryForm"
12 ref="queryForm" 12 ref="queryForm"
13 @submit.native.prevent 13 @submit.native.prevent
14 label-width="80px"> 14 label-width="80px"
15 >
15 <el-row> 16 <el-row>
16 <el-col :span="5"> 17 <el-col :span="5">
17 <el-form-item label="业务来源" label-width="70px"> 18 <el-form-item label="业务来源" label-width="70px">
...@@ -22,12 +23,14 @@ ...@@ -22,12 +23,14 @@
22 class="width100" 23 class="width100"
23 filterable 24 filterable
24 clearable 25 clearable
25 placeholder="请选择业务来源"> 26 placeholder="请选择业务来源"
27 >
26 <el-option 28 <el-option
27 v-for="item in dictData['ywly']" 29 v-for="item in dictData['ywly']"
28 :key="item.dcode" 30 :key="item.dcode"
29 :label="item.dname" 31 :label="item.dname"
30 :value="item.dcode"> 32 :value="item.dcode"
33 >
31 </el-option> 34 </el-option>
32 </el-select> 35 </el-select>
33 </el-form-item> 36 </el-form-item>
...@@ -41,12 +44,14 @@ ...@@ -41,12 +44,14 @@
41 class="width100" 44 class="width100"
42 filterable 45 filterable
43 clearable 46 clearable
44 placeholder="请选择权利类型"> 47 placeholder="请选择权利类型"
48 >
45 <el-option 49 <el-option
46 v-for="item in dictData['A8']" 50 v-for="item in dictData['A8']"
47 :key="item.dcode" 51 :key="item.dcode"
48 :label="item.dname" 52 :label="item.dname"
49 :value="item.dcode"> 53 :value="item.dcode"
54 >
50 </el-option> 55 </el-option>
51 </el-select> 56 </el-select>
52 </el-form-item> 57 </el-form-item>
...@@ -60,12 +65,14 @@ ...@@ -60,12 +65,14 @@
60 class="width100" 65 class="width100"
61 filterable 66 filterable
62 clearable 67 clearable
63 placeholder="请选择登记类型"> 68 placeholder="请选择登记类型"
69 >
64 <el-option 70 <el-option
65 v-for="item in dictData['A21']" 71 v-for="item in dictData['A21']"
66 :key="item.dcode" 72 :key="item.dcode"
67 :label="item.dname" 73 :label="item.dname"
68 :value="item.dcode"> 74 :value="item.dcode"
75 >
69 </el-option> 76 </el-option>
70 </el-select> 77 </el-select>
71 </el-form-item> 78 </el-form-item>
...@@ -76,14 +83,20 @@ ...@@ -76,14 +83,20 @@
76 placeholder="请输入业务号" 83 placeholder="请输入业务号"
77 v-model="queryForm.ywh" 84 v-model="queryForm.ywh"
78 clearable 85 clearable
79 class="width200px"> 86 class="width200px"
87 >
80 </el-input> 88 </el-input>
81 </el-form-item> 89 </el-form-item>
82 </el-col> 90 </el-col>
83 91
84 <el-col :span="4" class="btnColRight"> 92 <el-col :span="4" class="btnColRight">
85 <el-form-item> 93 <el-form-item>
86 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button> 94 <el-button
95 type="primary"
96 native-type="submit"
97 @click="handleSearch"
98 >查询</el-button
99 >
87 <el-button @click="moreQueryClick">高级查询</el-button> 100 <el-button @click="moreQueryClick">高级查询</el-button>
88 </el-form-item> 101 </el-form-item>
89 </el-col> 102 </el-col>
...@@ -95,14 +108,16 @@ ...@@ -95,14 +108,16 @@
95 {{ item.name }}:{{ item.value }} 108 {{ item.name }}:{{ item.value }}
96 <i 109 <i
97 class="el-icon-circle-close" 110 class="el-icon-circle-close"
98 @click="handelItem(item, index)"></i> 111 @click="handelItem(item, index)"
112 ></i>
99 </li> 113 </li>
100 </ul> 114 </ul>
101 <el-button 115 <el-button
102 class="clean-btn" 116 class="clean-btn"
103 type="text" 117 type="text"
104 v-if="searchList.length > 0" 118 v-if="searchList.length > 0"
105 @click.native="hanldeCleanAll">清除全部 119 @click.native="hanldeCleanAll"
120 >清除全部
106 </el-button> 121 </el-button>
107 </el-row> 122 </el-row>
108 </el-form> 123 </el-form>
...@@ -119,123 +134,131 @@ ...@@ -119,123 +134,131 @@
119 @size-change="handleSizeChange" 134 @size-change="handleSizeChange"
120 @p-current-change="handleCurrentChange" 135 @p-current-change="handleCurrentChange"
121 :column="tableData.columns" 136 :column="tableData.columns"
122 :data="tableData.data"> 137 :data="tableData.data"
138 >
123 </lb-table> 139 </lb-table>
124 </div> 140 </div>
125 <searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" /> 141 <searchBox
142 v-model="isSearch"
143 @getSearch="getSearch"
144 :advancedForm="otherForm"
145 />
126 </div> 146 </div>
127 </template> 147 </template>
128 <script> 148 <script>
129 import { mapGetters } from "vuex"; 149 import { mapGetters } from "vuex";
130 import searchMin from "../components/mixin/index"; 150 import searchMin from "../components/mixin/index";
131 import table from "@/utils/mixin/table"; 151 import table from "@/utils/mixin/table";
132 import { datas, sendThis } from "./ybxdata"; 152 import { datas, sendThis } from "./ybxdata";
133 import { searchTaskDone } from "@/api/workflow/search.js"; 153 import { searchTaskDone } from "@/api/workflow/search.js";
134 import searchBox from "../components/search.vue"; 154 import searchBox from "../components/search.vue";
135 export default { 155 export default {
136 name: "ybx", 156 name: "ybx",
137 components: { searchBox }, 157 components: { searchBox },
138 mixins: [table, searchMin], 158 mixins: [table, searchMin],
139 mounted () { 159 mounted() {
140 sendThis(this); 160 sendThis(this);
141 }, 161 },
142 computed: { 162 computed: {
143 ...mapGetters(["dictData"]), 163 ...mapGetters(["dictData"]),
144 }, 164 },
145 data () { 165 data() {
146 return { 166 return {
147 queryForm: { 167 queryForm: {
148 ywly: "", 168 ywly: "",
149 qllx: "", 169 qllx: "",
150 djlx: "", 170 djlx: "",
151 ywh: "", 171 ywh: "",
152 }, 172 },
153 searchForm: { 173 searchForm: {
154 ywlymc: "", 174 ywlymc: "",
155 qllxmc: "", 175 qllxmc: "",
156 djlxmc: "", 176 djlxmc: "",
157 ywh: "", 177 ywh: "",
158 },
159 tableData: {
160 total: 0,
161 columns: datas.columns(),
162 data: [],
163 },
164 };
165 },
166 activated () {
167 this.queryClick()
168 window["getBpageList"] = () => {
169 this.queryClick()
170 }
171 },
172 methods: {
173 // 列表渲染接口
174 /**
175 * @description: 列表渲染接口
176 * @author: renchao
177 */
178 queryClick () {
179 this.$startLoading();
180 this.searchForm.ywh = this.queryForm.ywh;
181 this.iterationData();
182 searchTaskDone({
183 ...this.queryForm,
184 ...this.otherForm,
185 ...this.pageData,
186 }).then((res) => {
187 this.$endLoading();
188 if (res.code === 200) {
189 let { total, records } = res.result;
190 records.forEach((item) => {
191 item.qlrmc = item.qlrmc.join(",");
192 item.ywh = item.ywh.join(",");
193 item.zl = item.zl.join(",");
194 item.outstepdate = item.outstepdate[0];
195 });
196 this.tableData.total = total ? total : 0;
197 this.tableData.data = records ? records : [];
198 }
199 });
200 }, 178 },
201 /** 179 tableData: {
202 * @description: handleSort 180 total: 0,
203 * @param {*} val 181 columns: datas.columns(),
204 * @author: renchao 182 data: [],
205 */
206 handleSort (val) {
207 this.queryForm.sortField = val.prop;
208 this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
209 this.queryClick();
210 }, 183 },
211 /** 184 };
212 * @description: ywhClick 185 },
213 * @param {*} item 186 activated() {
214 * @author: renchao 187 this.queryClick();
215 */ 188 window["getBpageList"] = () => {
216 ywhClick (item) { 189 this.queryClick();
217 //有任务权限 190 };
218 if (item.sjlx == "3") { 191 },
219 const { href } = this.$router.resolve( 192 methods: {
220 "/djbworkFrameview?bsmSlsq=" + 193 // 列表渲染接口
194 /**
195 * @description: 列表渲染接口
196 * @author: renchao
197 */
198 queryClick() {
199 this.$startLoading();
200 this.searchForm.ywh = this.queryForm.ywh;
201 this.iterationData();
202 searchTaskDone({
203 ...this.queryForm,
204 ...this.otherForm,
205 ...this.pageData,
206 }).then((res) => {
207 this.$endLoading();
208 if (res.code === 200) {
209 let { total, records } = res.result;
210 records.forEach((item) => {
211 item.qlrmc = item.qlrmc.join(",");
212 item.ywh = item.ywh.join(",");
213 item.zl = item.zl.join(",");
214 item.outstepdate = item.outstepdate[0];
215 });
216 this.tableData.total = total ? total : 0;
217 this.tableData.data = records ? records : [];
218 }
219 });
220 },
221 /**
222 * @description: handleSort
223 * @param {*} val
224 * @author: renchao
225 */
226 handleSort(val) {
227 this.queryForm.sortField = val.prop;
228 this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
229 this.queryClick();
230 },
231 /**
232 * @description: ywhClick
233 * @param {*} item
234 * @author: renchao
235 */
236 ywhClick(item) {
237 //有任务权限
238 if (item.sjlx == "3") {
239 item.djywbm = "DJBBL";
240 const { href } = this.$router.resolve(
241 "/djbworkFrameview?bsmSlsq=" +
221 item.bsmSlsq + 242 item.bsmSlsq +
222 "&bestepid=" + 243 "&bestepid=" +
223 item.bestepid 244 item.bestepid +
224 ); 245 "&sqywbm=" +
225 window.open(href, `djbworkFrameview${item.bsmSlsq}`); 246 item.djywbm
226 } else { 247 );
227 const { href } = this.$router.resolve( 248 window.open(href, `djbworkFrameview${item.bsmSlsq}`);
228 "/workFrameView?bsmSlsq=" + 249 } else {
250 const { href } = this.$router.resolve(
251 "/workFrameView?bsmSlsq=" +
229 item.bsmSlsq + 252 item.bsmSlsq +
230 "&bestepid=" + 253 "&bestepid=" +
231 item.bestepid 254 item.bestepid
232 ); 255 );
233 window.open(href, `workFrameView${item.bsmSlsq}`); 256 window.open(href, `workFrameView${item.bsmSlsq}`);
234 }
235 } 257 }
236 } 258 },
237 } 259 },
260 };
238 </script> 261 </script>
239 <style scoped lang="scss"> 262 <style scoped lang="scss">
240 @import "~@/styles/public.scss"; 263 @import "~@/styles/public.scss";
241 </style> 264 </style>
......