Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
b09ca2e0 by xiaomiao
Options

bug

2 parents db5e9829 d3e88617
Inline Side-by-side
Showing 14 changed files with 167 additions and 55 deletions
1 {
2 "typeAcquisition": {
3 "include": [
4 "wechat-miniprogram"
5 ]
6 }
7 }
...\ No newline at end of file ...\ No newline at end of file
1 { 1 {
2 "SERVERAPI": "service-bdcdj-th" 2 "SERVERAPI": "/bdcdj"
3 } 3 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-04-26 09:39:18
5 -->
1 <!DOCTYPE html> 6 <!DOCTYPE html>
2 <html> 7 <html>
3 <head> 8
4 <meta charset="utf-8"> 9 <head>
5 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> 10 <meta charset="utf-8">
6 <meta name="renderer" content="webkit"> 11 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
7 <meta name="referrer" content="no-referrer" /> 12 <meta name="renderer" content="webkit">
8 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> 13 <meta name="referrer" content="no-referrer" />
9 <link rel="icon" href="<%= BASE_URL %>favicon.ico"> 14 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
10 <title><%= webpackConfig.name %></title> 15 <link rel="shortcut icon" type="image/x-icon" href="./bdcdj/favicon.ico" />
11 </head> 16 <title>
12 <body> 17 <%= webpackConfig.name %>
13 <div id="app"></div> 18 </title>
14 <!-- built files will be auto injected --> 19 </head>
15 </body> 20
21 <body>
22 <div id="app"></div>
23 <!-- built files will be auto injected -->
24 </body>
25
16 </html> 26 </html>
17 <script> 27 <script>
18 window.baseUrl = location.origin || location.protocol +'//'+location.host 28 window.baseUrl = location.origin || location.protocol + '//' + location.host
19 // window.authorization = 'bearer AT-14-h4UlUGjPvgmrIgnDO-3QgMP0m4YJGQTR'; 29 // window.authorization = 'bearer AT-14-h4UlUGjPvgmrIgnDO-3QgMP0m4YJGQTR';
20 // window.authorization = 'bearer AT-223-c-Q86EHx75m7ig3EDf-SwMWl4U0AKn0b'; 30 // window.authorization = 'bearer AT-223-c-Q86EHx75m7ig3EDf-SwMWl4U0AKn0b';
21 window.timeout=5000 31 window.timeout = 5000
22 window.authorization="bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6" 32 window.authorization = "bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6"
23 </script> 33 </script>
...\ No newline at end of file ...\ No newline at end of file
......
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1682411381886" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2656" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M106.666667 213.333333h810.666666v42.666667H106.666667z" fill="#ffffff" p-id="2657"></path><path d="M640 128v42.666667h42.666667V128c0-23.573333-19.093333-42.666667-42.538667-42.666667H383.872A42.496 42.496 0 0 0 341.333333 128v42.666667h42.666667V128h256z" fill="#ffffff" p-id="2658"></path><path d="M213.333333 896V256H170.666667v639.957333C170.666667 919.552 189.653333 938.666667 213.376 938.666667h597.248C834.218667 938.666667 853.333333 919.68 853.333333 895.957333V256h-42.666666v640H213.333333z" fill="#ffffff" p-id="2659"></path><path d="M320 341.333333h42.666667v384h-42.666667zM490.666667 341.333333h42.666666v384h-42.666666zM661.333333 341.333333h42.666667v384h-42.666667z" fill="#ffffff" p-id="2660"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
21 </el-dropdown> 21 </el-dropdown>
22 22
23 23
24 <svg-icon class="shutdown" icon-class='shutdown' /> 24 <svg-icon class="shutdown" @click.native="logout" icon-class='shutdown' />
25 </div> 25 </div>
26 </div> 26 </div>
27 <NoticeBar class="NoticeBar" :noticeList="noticeList" /> 27 <NoticeBar class="NoticeBar" :noticeList="noticeList" v-if="noticeList.length > 0" />
28 </div> 28 </div>
29 </template> 29 </template>
30 <script> 30 <script>
...@@ -38,7 +38,10 @@ export default { ...@@ -38,7 +38,10 @@ export default {
38 NoticeBar 38 NoticeBar
39 }, 39 },
40 computed: { 40 computed: {
41 ...mapGetters(['sidebar', 'avatar', 'name']) 41 ...mapGetters(['sidebar', 'avatar', 'name']),
42 baseUrl () {
43 return window.baseUrl;
44 },
42 }, 45 },
43 data () { 46 data () {
44 return { 47 return {
...@@ -61,6 +64,7 @@ export default { ...@@ -61,6 +64,7 @@ export default {
61 window.removeEventListener('message') 64 window.removeEventListener('message')
62 }, 65 },
63 methods: { 66 methods: {
67
64 queryNoticeList () { 68 queryNoticeList () {
65 getHomeNoticeList().then(res => { 69 getHomeNoticeList().then(res => {
66 if (res.result) { 70 if (res.result) {
...@@ -68,6 +72,12 @@ export default { ...@@ -68,6 +72,12 @@ export default {
68 } 72 }
69 }) 73 })
70 }, 74 },
75 logout () {
76 const url = baseUrl + "/sso-logout?redirect_uri=" + baseUrl + "/admin";
77 window.open(url, "_self");
78 sessionStorage.removeItem("navList");
79 },
80
71 themeChange (val) { 81 themeChange (val) {
72 this.$store.dispatch('app/updateTheme', val) 82 this.$store.dispatch('app/updateTheme', val)
73 }, 83 },
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-04-20 09:37:34 4 * @LastEditTime: 2023-04-26 09:36:10
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import App from './App' 7 import App from './App'
...@@ -60,7 +60,7 @@ Object.keys(filters).forEach(key => { ...@@ -60,7 +60,7 @@ Object.keys(filters).forEach(key => {
60 }) 60 })
61 Vue.config.productionTip = false 61 Vue.config.productionTip = false
62 62
63 axios.get("./config.json") 63 axios.get("./bdcdj/config.json")
64 .then((res) => { 64 .then((res) => {
65 Vue.prototype.BASE_API = res.data 65 Vue.prototype.BASE_API = res.data
66 localStorage.setItem('ApiUrl', JSON.stringify(res.data)); 66 localStorage.setItem('ApiUrl', JSON.stringify(res.data));
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-04-19 14:27:26 4 * @LastEditTime: 2023-04-25 17:05:49
5 */ 5 */
6 import store from '@/store' 6 import store from '@/store'
7 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器 7 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器
8 export default class filter { 8 export default class filter {
9 selected (row) { 9 selected (row) {
10 if (row.djblzt == 1) { // 正在办理不能申请 10 // if (row.sfbl == 0) { // 正在办理不能申请
11 return false //不可选择 11 // return false
12 } else { 12 // } else {
13 return true //可选择 13 // return true //可选择
14 } 14 // }
15 return true
15 } 16 }
16 // 业务来源 17 // 业务来源
17 busSource (val) { 18 busSource (val) {
......
...@@ -15,6 +15,13 @@ ...@@ -15,6 +15,13 @@
15 </el-col> 15 </el-col>
16 </el-row> 16 </el-row>
17 <el-row> 17 <el-row>
18 <el-col :span="24">
19 <el-form-item label="有效时长:">
20 <el-input v-model="ruleForm.validDays" class="width100"></el-input>
21 </el-form-item>
22 </el-col>
23 </el-row>
24 <el-row>
18 <el-form-item label="通知内容:" prop="noticeContent"> 25 <el-form-item label="通知内容:" prop="noticeContent">
19 <quill-editor v-model="ruleForm.noticeContent" class="editor ql-editor" ref="myQuillEditor" 26 <quill-editor v-model="ruleForm.noticeContent" class="editor ql-editor" ref="myQuillEditor"
20 :options="editorOption" @blur="onEditorBlur($event)" @focus="onEditorFocus($event)" 27 :options="editorOption" @blur="onEditorBlur($event)" @focus="onEditorFocus($event)"
...@@ -65,6 +72,7 @@ export default { ...@@ -65,6 +72,7 @@ export default {
65 noticeContent: "", 72 noticeContent: "",
66 noticeFileUrl: "", 73 noticeFileUrl: "",
67 noticeSource: "", 74 noticeSource: "",
75 validDays: 14,
68 noticeType: "1" 76 noticeType: "1"
69 }, 77 },
70 rules: { 78 rules: {
...@@ -140,7 +148,10 @@ export default { ...@@ -140,7 +148,10 @@ export default {
140 false 148 false
141 ) 149 )
142 }) 150 })
143 if (this.formData) { 151 if (!this.formData.isButtonFlag) {
152 this.getDetailInfo(this.formData)
153 }
154 if (this.formData.edit) {
144 this.getDetailInfo(this.formData) 155 this.getDetailInfo(this.formData)
145 } 156 }
146 }, 157 },
...@@ -166,6 +177,8 @@ export default { ...@@ -166,6 +177,8 @@ export default {
166 }, 177 },
167 //新增通知 178 //新增通知
168 addNotice () { 179 addNotice () {
180 // 解决报错
181 // this.ruleForm.noticeType = "1"
169 addSysNotice(this.ruleForm).then(res => { 182 addSysNotice(this.ruleForm).then(res => {
170 if (res.code == 200) { 183 if (res.code == 200) {
171 this.$message.success("保存成功"); 184 this.$message.success("保存成功");
...@@ -197,6 +210,7 @@ export default { ...@@ -197,6 +210,7 @@ export default {
197 noticeContent: "", 210 noticeContent: "",
198 noticeFileUrl: "", 211 noticeFileUrl: "",
199 noticeSource: "", 212 noticeSource: "",
213 validDays: 14,
200 noticeType: "1" 214 noticeType: "1"
201 } 215 }
202 }, 216 },
......
...@@ -164,7 +164,7 @@ export default { ...@@ -164,7 +164,7 @@ export default {
164 }, 164 },
165 //编辑通知 165 //编辑通知
166 editNotice (item) { 166 editNotice (item) {
167 this.$popupDialog("系统通知详情", "system/xttz/components/addDialog", { ...item, "isButtonFlag": true }, "50%") 167 this.$popupDialog("系统通知详情", "system/xttz/components/addDialog", { ...item, "isButtonFlag": true, "edit": true }, "50%")
168 }, 168 },
169 downloadFile (item) { 169 downloadFile (item) {
170 const href = item.noticeFileUrl 170 const href = item.noticeFileUrl
......
...@@ -57,6 +57,11 @@ class data extends filter { ...@@ -57,6 +57,11 @@ class data extends filter {
57 width: '140' 57 width: '140'
58 }, 58 },
59 { 59 {
60 prop: "failureTime",
61 label: "失效时间",
62 width: '140'
63 },
64 {
60 prop: "creater", 65 prop: "creater",
61 width: '120', 66 width: '120',
62 label: "创建人", 67 label: "创建人",
......
...@@ -2,6 +2,7 @@ import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"; ...@@ -2,6 +2,7 @@ import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
2 import { getPrintTemplateByCode } from "@/api/system"; 2 import { getPrintTemplateByCode } from "@/api/system";
3 import { getPrintApplicationInfo } from "@/api/fqsq"; 3 import { getPrintApplicationInfo } from "@/api/fqsq";
4 import { uploadUndo } from "@/api/clxx"; 4 import { uploadUndo } from "@/api/clxx";
5 import { deleteFlow } from "@/api/ywbl";
5 import { getLodop } from "@/utils/LodopFuncs" 6 import { getLodop } from "@/utils/LodopFuncs"
6 import { 7 import {
7 leftMenu, 8 leftMenu,
...@@ -63,7 +64,7 @@ export default { ...@@ -63,7 +64,7 @@ export default {
63 switch (qllx) { 64 switch (qllx) {
64 case 'B39': 65 case 'B39':
65 this.showBatch = true; 66 this.showBatch = true;
66 this.batchButtonName = '批量查封'; 67 this.batchButtonName = '批量查封清单信息';
67 break; 68 break;
68 case 'A37': 69 case 'A37':
69 this.showBatch = true; 70 this.showBatch = true;
...@@ -107,7 +108,7 @@ export default { ...@@ -107,7 +108,7 @@ export default {
107 finishedSequenceFlowSet: result.finishedSequenceFlowSet 108 finishedSequenceFlowSet: result.finishedSequenceFlowSet
108 }, 109 },
109 allCommentList: result.historyTaskList 110 allCommentList: result.historyTaskList
110 }, '70%', true) 111 }, '80%', true)
111 }) 112 })
112 break; 113 break;
113 case "B2": //材料分屏按钮 114 case "B2": //材料分屏按钮
...@@ -229,8 +230,40 @@ export default { ...@@ -229,8 +230,40 @@ export default {
229 }); 230 });
230 }); 231 });
231 break; 232 break;
233 case "rm":
234 this.del()
235 break;
232 } 236 }
233 }, 237 },
238 del () {
239 let formdata = new FormData();
240 formdata.append("bsmSlsq", this.bsmSlsq);
241 this.$confirm("确定要删除吗, 是否继续?", "提示", {
242 confirmButtonText: "确定",
243 cancelButtonText: "取消",
244 type: "warning",
245 })
246 .then(() => {
247 deleteFlow(formdata).then((res) => {
248 if (res.code === 200) {
249 this.$message({
250 type: "success",
251 message: "删除成功!",
252 });
253 window.close();
254 window.opener.getBpageList();
255 } else {
256 this.$message.error(res.message);
257 }
258 });
259 })
260 .catch(() => {
261 this.$message({
262 type: "info",
263 message: "已取消删除",
264 });
265 });
266 },
234 //发送下一个环节 267 //发送下一个环节
235 sendToNext (obj) { 268 sendToNext (obj) {
236 const h = this.$createElement; 269 const h = this.$createElement;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <ul> 13 <ul>
14 <li @click="operation(item)" v-for="(item, index) in rightButtonList" :key="index"> 14 <li @click="operation(item)" v-for="(item, index) in rightButtonList" :key="index">
15 <svg-icon class="icon" :icon-class="item.icon" /> 15 <svg-icon class="icon" :icon-class="item.icon" />
16 <span class="iconName">{{ item.name }}</span> 16 <span class="iconName">{{ item.name }} {{item.value }}</span>
17 </li> 17 </li>
18 </ul> 18 </ul>
19 <NoticeBar class="NoticeBar" :noticeList="noticeList" /> 19 <NoticeBar class="NoticeBar" :noticeList="noticeList" />
...@@ -175,8 +175,40 @@ export default { ...@@ -175,8 +175,40 @@ export default {
175 case "signout": 175 case "signout":
176 window.close(); 176 window.close();
177 break; 177 break;
178 case "rm":
179 this.del()
180 window.close();
178 } 181 }
179 }, 182 },
183 del () {
184 let formdata = new FormData();
185 formdata.append("bsmSlsq", this.bsmSlsq);
186 this.$confirm("确定要删除吗, 是否继续?", "提示", {
187 confirmButtonText: "确定",
188 cancelButtonText: "取消",
189 type: "warning",
190 })
191 .then(() => {
192 deleteFlow(formdata).then((res) => {
193 if (res.code === 200) {
194 this.handleDel();
195 this.$message({
196 type: "success",
197 message: "删除成功!",
198 });
199 this.queryClick();
200 } else {
201 this.$message.error(res.message);
202 }
203 });
204 })
205 .catch(() => {
206 this.$message({
207 type: "info",
208 message: "已取消删除",
209 });
210 });
211 },
180 //读取申请单元信息 212 //读取申请单元信息
181 loadBdcdylist () { 213 loadBdcdylist () {
182 var formdata = new FormData(); 214 var formdata = new FormData();
......
1 <template> 1 <template>
2 <div class="from-clues"> 2 <div class="from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="80px"> 4 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="100px">
5 <el-row> 5 <el-row>
6 <el-col :span="5"> 6 <el-col :span="5">
7 <el-form-item label="业务来源" label-width="70px"> 7 <el-form-item label="业务来源">
8 <el-select v-model="queryForm.ywly" class="width100" filterable 8 <el-select v-model="queryForm.ywly" class="width100" filterable
9 @change="handleSelect('ywly', 'ywlymc', 'ywly')" @clear="handleEmpty('ywlymc')" clearable 9 @change="handleSelect('ywly', 'ywlymc', 'ywly')" @clear="handleEmpty('ywlymc')" clearable
10 placeholder="请选择业务来源"> 10 placeholder="请选择业务来源">
...@@ -31,14 +31,14 @@ ...@@ -31,14 +31,14 @@
31 </el-select> 31 </el-select>
32 </el-form-item> 32 </el-form-item>
33 </el-col> 33 </el-col>
34 <el-col :span="5"> 34 <el-col :span="6">
35 <el-form-item label="业务号"> 35 <el-form-item label="业务号">
36 <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100"> 36 <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100">
37 </el-input> 37 </el-input>
38 </el-form-item> 38 </el-form-item>
39 </el-col> 39 </el-col>
40 40
41 <el-col :span="4" class="btnColRight"> 41 <el-col :span="3" class="btnColRight">
42 <el-form-item> 42 <el-form-item>
43 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button> 43 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
44 <el-button @click="moreQueryClick">高级查询</el-button> 44 <el-button @click="moreQueryClick">高级查询</el-button>
...@@ -46,25 +46,25 @@ ...@@ -46,25 +46,25 @@
46 </el-col> 46 </el-col>
47 </el-row> 47 </el-row>
48 <el-row> 48 <el-row>
49 <el-col :span="5"> 49 <el-col :span="5">
50 <el-form-item label="不动产单元号"> 50 <el-form-item label="不动产单元号">
51 <el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width100"> 51 <el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width100">
52 </el-input> 52 </el-input>
53 </el-form-item> 53 </el-form-item>
54 </el-col> 54 </el-col>
55 <el-col :span="5"> 55 <el-col :span="5">
56 <el-form-item label="申请人"> 56 <el-form-item label="申请人">
57 <el-input placeholder="如需要模糊查询，前后输入%" v-model="queryForm.sqrmc" clearable class="width100"> 57 <el-input placeholder="如需要模糊查询，前后输入%" v-model="queryForm.sqrmc" clearable class="width100">
58 </el-input> 58 </el-input>
59 </el-form-item> 59 </el-form-item>
60 </el-col> 60 </el-col>
61 <el-col :span="5"> 61 <el-col :span="5">
62 <el-form-item label="申请人证件号"> 62 <el-form-item label="申请人证件号">
63 <el-input placeholder="如需要模糊查询，前后输入%" v-model="queryForm.sqrzjhm" clearable class="width100"> 63 <el-input placeholder="如需要模糊查询，前后输入%" v-model="queryForm.sqrzjhm" clearable class="width100">
64 </el-input> 64 </el-input>
65 </el-form-item> 65 </el-form-item>
66 </el-col> 66 </el-col>
67 <el-col :span="5"> 67 <el-col :span="6">
68 <el-form-item label="坐落"> 68 <el-form-item label="坐落">
69 <el-input placeholder="如需要模糊查询，前后输入%" v-model="queryForm.zl" clearable class="width100"> 69 <el-input placeholder="如需要模糊查询，前后输入%" v-model="queryForm.zl" clearable class="width100">
70 </el-input> 70 </el-input>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 </div> 86 </div>
87 <div class="from-clues-content"> 87 <div class="from-clues-content">
88 <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort" 88 <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
89 :current-page.sync="pageData.currentPage" :heightNum="295" :total="tableData.total" 89 :current-page.sync="pageData.currentPage" :heightNum="335" :total="tableData.total"
90 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 90 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
91 :data="tableData.data"> 91 :data="tableData.data">
92 </lb-table> 92 </lb-table>
...@@ -135,9 +135,8 @@ export default { ...@@ -135,9 +135,8 @@ export default {
135 sendThis(this); 135 sendThis(this);
136 window["getBpageList"] = () => { 136 window["getBpageList"] = () => {
137 this.queryClick(); 137 this.queryClick();
138 }; 138 }
139 }, 139 },
140
141 watch: { 140 watch: {
142 queryForm: { 141 queryForm: {
143 handler (newName, oldName) { }, 142 handler (newName, oldName) { },
......
...@@ -69,17 +69,17 @@ class data extends filter { ...@@ -69,17 +69,17 @@ class data extends filter {
69 { 69 {
70 prop: "bdcdyh", 70 prop: "bdcdyh",
71 label: "不动产单元号", 71 label: "不动产单元号",
72 width: '170', 72 width: '170',
73 }, 73 },
74 { 74 {
75 prop: "qlrmc", 75 prop: "qlrmc",
76 label: "权利人", 76 label: "权利人",
77 width: '120', 77 width: '120',
78 }, 78 },
79 { 79 {
80 prop: "ywrmc", 80 prop: "ywrmc",
81 label: "义务人", 81 label: "义务人",
82 width: '120', 82 width: '120',
83 }, 83 },
84 { 84 {
85 prop: "zl", 85 prop: "zl",
...@@ -104,13 +104,13 @@ class data extends filter { ...@@ -104,13 +104,13 @@ class data extends filter {
104 prop: 'fromstepdate', 104 prop: 'fromstepdate',
105 width: '140' 105 width: '140'
106 }, 106 },
107 { 107 // {
108 label: '操作', 108 // label: '操作',
109 width: '80', 109 // width: '80',
110 render: (h, scope) => { 110 // render: (h, scope) => {
111 return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.del(scope.row) }}>删除</el-button> 111 // return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.del(scope.row) }}>删除</el-button>
112 } 112 // }
113 } 113 // }
114 ] 114 ]
115 } 115 }
116 } 116 }
......