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

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-11 09:51:07
+ * @LastEditTime: 2023-07-12 13:26:37
  */
 import request from "@/utils/request";
 let SERVER = window.config
@@ -71,3 +71,16 @@ export function getLpbTj(zrzbsm) {
     method: "get",
   });
 }
+
+/**
+ * @description:楼盘查询- 根据bsmSlsq查询自然幢标识码
+ * @param {*} data
+ * @author: renchao
+ */
+ export function getZrzbsm(bsm) {
+  return request({
+    url: SERVER.SERVERAPI + "/rest/zhcx/search/getZrzbsmList?bsmSlsq=" + bsm,
+    method: "post",
+    data: bsm,
+  });
+}
\ No newline at end of file

@@ -283,8 +283,8 @@
               v-model="ruleForm.diyaq.zwlxqssj"
               type="date"
             placeholder="选择日期"
-              value-format="yyyy/MM/dd HH:mm:ss"
-              format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -295,8 +295,8 @@
               v-model="ruleForm.diyaq.zwlxjssj"
               type="date"
              placeholder="选择日期"
-              value-format="yyyy/MM/dd HH:mm:ss"
-              format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>

@@ -63,8 +63,8 @@
                       v-model="item.shkssj"
                       type="date"
                      placeholder="选择日期"
-                      value-format="yyyy/MM/dd HH:mm:ss"
-                      format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
                     >
                     </el-date-picker>
                   </el-form-item>

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-12 14:20:58
+-->
+<template>
+  <div>
+    图形定位
+  </div>
+</template>
+<script>
+  export default {
+    props: {
+      formData: {
+        type: Object,
+        default: {}
+      }
+    },
+    data () {
+      return {
+      }
+    },
+    methods: {
+    }
+  }
+</script>
+<style scoped lang='scss'>
+</style>
\ No newline at end of file

@@ -45,8 +45,8 @@
             type="date"
             :disabled="disabled"
            placeholder="选择日期"
-            value-format="yyyy/MM/dd HH:mm:ss"
-            format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             @blur="addrow(scope.row)">
           </el-date-picker>
         </template>
@@ -58,8 +58,8 @@
             type="date"
             :disabled="disabled"
              placeholder="选择日期"
-            value-format="yyyy/MM/dd HH:mm:ss"
-            format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             @blur="addrow(scope.row)">
           </el-date-picker>
         </template>

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-06-26 17:03:07
+ * @LastEditTime: 2023-07-12 14:23:25
  */
 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
 import { getPrintTemplateByCode } from "@/api/system";
@@ -17,6 +17,7 @@ import {
 } from "@/api/fqsq.js";
 import { mapGetters } from 'vuex'
 import { log } from "bpmn-js-token-simulation";
+import { getZrzbsm } from "@/api/lpb";
 export default {
   data () {
     return {
@@ -76,7 +77,7 @@ export default {
                 rejectedTaskSet: {},
                 finishedSequenceFlowSet: result.finishedSequenceFlowIds
               },
-              handlinglist:result.runningTasks,
+              handlinglist: result.runningTasks,
               allCommentList: result.finishedTasks
             }, '80%', true)
           })
@@ -139,9 +140,22 @@ export default {
           )
           break;
         case "B8":
+          getZrzbsm(this.bsmSlsq).then((res) => {
+            if (res.code === 200) {
               this.$popupDialog('楼盘表', 'lpb/index', {
-            bsm: ''
+                bsm: res.result[0]
               }, '90%', true)
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+            .catch((err) => {
+              this.$message.error(err)
+            });
+          break;
+        // 图形定位
+        case "B-TXDW":
+          this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', {}, '60%', true)
           break;
         case "back": //退回按钮
           this.$popupDialog("退回", "workflow/components/th", {