Merge branch 'dev'

 /*
  * @Description: 企业银行接口
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 14:49:22
+ * @LastEditTime: 2023-10-31 10:45:35
  */
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -64,6 +64,22 @@ export function uploadBatch (data) {
   })
 }
 
+/**
+ * @description: 上传单个文件
+ * @param {*} data
+ * @author: renchao
+ */
+export function uploadSjClmx (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sys/company/uploadSjClmx',
+    method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    data
+  })
+}
+
 
 
 /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-13 15:02:59
+ * @LastEditTime: 2023-10-31 10:21:32
 -->
 <template>
   <div class="rlPopup">
@@ -53,7 +53,7 @@
 <script>
   import PhotoZoom from '@/components/PhotoZoom'
   import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
-  import { uploadBatch, deleteClmx, move } from "@/api/clxx.js";
+  import { uploadBatch, deleteClmx, move, uploadSjClmx } from "@/api/clxx.js";
   import publicPicture from '@/components/publicPicture/index.vue'
   export default {
     name: 'PreviewImage',
@@ -194,9 +194,12 @@
           formData.append('file', file)
           formData.append("bsmSj", this.previewImg.bsmSj);
           formData.append("bsmSlsq", this.previewImg.bsmSlsq);
+          if (this.previewImg.imgList.length > 0) {
+            formData.append("ssBsmClmx", this.previewImg.imgList[this.previewImg.index].bsmClmx);
+          }
           uploadSjClmx(formData).then((res) => {
             if (res.code == 200) {
-              this.$emit('updateList', res.result)
+              this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
               this.$message({
                 message: '上传成功!',
                 type: 'success'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-12 10:00:08
+ * @LastEditTime: 2023-10-31 10:48:04
 -->
 <template>
   <div class="rlPopup">
@@ -53,7 +53,7 @@
 <script>
   import PhotoZoom from '@/components/PhotoZoom'
   import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
-  import { uploadBatch, deleteClmx, move } from "@/api/clxx.js";
+  import { uploadBatch, deleteClmx, move, uploadSjClmx } from "@/api/clxx.js";
   import publicPicture from '@/components/publicPicture/index.vue'
   export default {
     name: 'PreviewImage',
@@ -194,6 +194,9 @@
           formData.append('file', file)
           formData.append("bsmSj", this.previewImg.bsmSj);
           formData.append("bsmSlsq", this.previewImg.bsmSlsq);
+          if (this.previewImg.imgList.length > 0) {
+            formData.append("ssBsmClmx", this.previewImg.imgList[this.previewImg.index].bsmClmx);
+          }
           uploadSjClmx(formData).then((res) => {
             if (res.code == 200) {
               this.$emit('updateList', res.result)

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-10-18 14:06:31
+ * @LastEditTime: 2023-10-31 10:42:21
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">

@@ -14,7 +14,7 @@
   /deep/.el-menu-item {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    // justify-content: space-between;
   }
 }
 

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-12 09:55:54
+ * @LastEditTime: 2023-10-31 10:46:54
 -->
 <template>
   <div class="rlPopup">
@@ -53,7 +53,7 @@
 <script>
   import PhotoZoom from '@/components/PhotoZoom'
   import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
-  import { uploadBatch, deleteFile, move } from "@/api/company.js"
+  import { uploadBatch, deleteFile, move, uploadSjClmx } from "@/api/company.js"
   import publicPicture from '@/components/publicPicture/index.vue'
   export default {
     name: 'PreviewImage',
@@ -198,6 +198,9 @@
           formData.append('file', file)
           formData.append("bsmMaterial ", this.previewImg.bsmMaterial);
           formData.append("bsmSlsq", this.previewImg.bsmSlsq);
+          if (this.previewImg.imgList.length > 0) {
+            formData.append("ssbsmMaterial", this.previewImg.imgList[this.previewImg.index].bsmMaterial);
+          }
           uploadSjClmx(formData).then((res) => {
             if (res.code == 200) {
               this.$emit('updateList', res.result)

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-26 15:12:41
+ * @LastEditTime: 2023-10-31 10:49:31
 -->
 <template>
   <div class="from-clues">
@@ -282,6 +282,7 @@
       handleRowClick (row) {
         this.queryForm.bhqkbsm = row.bhqkbsm
         this.radioVal = row.bdcdyh
+        row.bglx = '1'
         selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {

@@ -65,9 +65,8 @@ class data extends filter {
       },
       {
         label: '操作',
-        width: '90',
+        width: '80',
         align: 'center',
-        fixed: 'right',
         render: (h, scope) => {
           return <el-button type="text" icon="el-icon-film" onClick={() => { vm.openlpbClick(scope) }}>楼盘表</el-button>
         }