Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
1d62e270 by 赵千
Options

Merge remote-tracking branch 'origin/dev' into dev

2 parents 02a5f106 1ec9cab4
Inline Side-by-side
Showing 6 changed files with 76 additions and 21 deletions
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-11 09:51:07 4 * @LastEditTime: 2023-07-12 13:26:37
5 */ 5 */
6 import request from "@/utils/request"; 6 import request from "@/utils/request";
7 let SERVER = window.config 7 let SERVER = window.config
...@@ -71,3 +71,16 @@ export function getLpbTj(zrzbsm) { ...@@ -71,3 +71,16 @@ export function getLpbTj(zrzbsm) {
71 method: "get", 71 method: "get",
72 }); 72 });
73 } 73 }
74
75 /**
76 * @description:楼盘查询- 根据bsmSlsq查询自然幢标识码
77 * @param {*} data
78 * @author: renchao
79 */
80 export function getZrzbsm(bsm) {
81 return request({
82 url: SERVER.SERVERAPI + "/rest/zhcx/search/getZrzbsmList?bsmSlsq=" + bsm,
83 method: "post",
84 data: bsm,
85 });
86 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -282,9 +282,9 @@ ...@@ -282,9 +282,9 @@
282 <el-date-picker 282 <el-date-picker
283 v-model="ruleForm.diyaq.zwlxqssj" 283 v-model="ruleForm.diyaq.zwlxqssj"
284 type="date" 284 type="date"
285 placeholder="选择日期" 285 placeholder="选择日期"
286 value-format="yyyy/MM/dd HH:mm:ss" 286 value-format="yyyy-MM-dd HH:mm:ss"
287 format="yyyy/MM/dd" 287 format="yyyy-MM-dd"
288 > 288 >
289 </el-date-picker> 289 </el-date-picker>
290 </el-form-item> 290 </el-form-item>
...@@ -294,9 +294,9 @@ ...@@ -294,9 +294,9 @@
294 <el-date-picker 294 <el-date-picker
295 v-model="ruleForm.diyaq.zwlxjssj" 295 v-model="ruleForm.diyaq.zwlxjssj"
296 type="date" 296 type="date"
297 placeholder="选择日期" 297 placeholder="选择日期"
298 value-format="yyyy/MM/dd HH:mm:ss" 298 value-format="yyyy-MM-dd HH:mm:ss"
299 format="yyyy/MM/dd" 299 format="yyyy-MM-dd"
300 > 300 >
301 </el-date-picker> 301 </el-date-picker>
302 </el-form-item> 302 </el-form-item>
......
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
62 <el-date-picker 62 <el-date-picker
63 v-model="item.shkssj" 63 v-model="item.shkssj"
64 type="date" 64 type="date"
65 placeholder="选择日期" 65 placeholder="选择日期"
66 value-format="yyyy/MM/dd HH:mm:ss" 66 value-format="yyyy-MM-dd HH:mm:ss"
67 format="yyyy/MM/dd" 67 format="yyyy-MM-dd"
68 > 68 >
69 </el-date-picker> 69 </el-date-picker>
70 </el-form-item> 70 </el-form-item>
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-12 14:20:58
5 -->
6 <template>
7 <div>
8 图形定位
9 </div>
10 </template>
11 <script>
12 export default {
13 props: {
14 formData: {
15 type: Object,
16 default: {}
17 }
18 },
19 data () {
20 return {
21 }
22 },
23 methods: {
24 }
25 }
26 </script>
27 <style scoped lang='scss'>
28 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
44 v-model='scope.row.qssj' 44 v-model='scope.row.qssj'
45 type="date" 45 type="date"
46 :disabled="disabled" 46 :disabled="disabled"
47 placeholder="选择日期" 47 placeholder="选择日期"
48 value-format="yyyy/MM/dd HH:mm:ss" 48 value-format="yyyy-MM-dd HH:mm:ss"
49 format="yyyy/MM/dd" 49 format="yyyy-MM-dd"
50 @blur="addrow(scope.row)"> 50 @blur="addrow(scope.row)">
51 </el-date-picker> 51 </el-date-picker>
52 </template> 52 </template>
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
57 v-model='scope.row.jssj' 57 v-model='scope.row.jssj'
58 type="date" 58 type="date"
59 :disabled="disabled" 59 :disabled="disabled"
60 placeholder="选择日期" 60 placeholder="选择日期"
61 value-format="yyyy/MM/dd HH:mm:ss" 61 value-format="yyyy-MM-dd HH:mm:ss"
62 format="yyyy/MM/dd" 62 format="yyyy-MM-dd"
63 @blur="addrow(scope.row)"> 63 @blur="addrow(scope.row)">
64 </el-date-picker> 64 </el-date-picker>
65 </template> 65 </template>
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-26 17:03:07 4 * @LastEditTime: 2023-07-12 14:23:25
5 */ 5 */
6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"; 6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
7 import { getPrintTemplateByCode } from "@/api/system"; 7 import { getPrintTemplateByCode } from "@/api/system";
...@@ -17,6 +17,7 @@ import { ...@@ -17,6 +17,7 @@ import {
17 } from "@/api/fqsq.js"; 17 } from "@/api/fqsq.js";
18 import { mapGetters } from 'vuex' 18 import { mapGetters } from 'vuex'
19 import { log } from "bpmn-js-token-simulation"; 19 import { log } from "bpmn-js-token-simulation";
20 import { getZrzbsm } from "@/api/lpb";
20 export default { 21 export default {
21 data () { 22 data () {
22 return { 23 return {
...@@ -76,7 +77,7 @@ export default { ...@@ -76,7 +77,7 @@ export default {
76 rejectedTaskSet: {}, 77 rejectedTaskSet: {},
77 finishedSequenceFlowSet: result.finishedSequenceFlowIds 78 finishedSequenceFlowSet: result.finishedSequenceFlowIds
78 }, 79 },
79 handlinglist:result.runningTasks, 80 handlinglist: result.runningTasks,
80 allCommentList: result.finishedTasks 81 allCommentList: result.finishedTasks
81 }, '80%', true) 82 }, '80%', true)
82 }) 83 })
...@@ -139,9 +140,22 @@ export default { ...@@ -139,9 +140,22 @@ export default {
139 ) 140 )
140 break; 141 break;
141 case "B8": 142 case "B8":
142 this.$popupDialog('楼盘表', 'lpb/index', { 143 getZrzbsm(this.bsmSlsq).then((res) => {
143 bsm: '' 144 if (res.code === 200) {
144 }, '90%', true) 145 this.$popupDialog('楼盘表', 'lpb/index', {
146 bsm: res.result[0]
147 }, '90%', true)
148 } else {
149 this.$message.error(res.message)
150 }
151 })
152 .catch((err) => {
153 this.$message.error(err)
154 });
155 break;
156 // 图形定位
157 case "B-TXDW":
158 this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', {}, '60%', true)
145 break; 159 break;
146 case "back": //退回按钮 160 case "back": //退回按钮
147 this.$popupDialog("退回", "workflow/components/th", { 161 this.$popupDialog("退回", "workflow/components/th", {
......