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

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-11 10:01:32
+ * @LastEditTime: 2023-09-14 16:21:51
 -->
 <template>
-  <el-image-viewer :on-close="closeViewer" :url-list="urlList">
+  <el-image-viewer :on-close="closeViewer" :url-list="urlList" :initial-index="initialIndex">
   </el-image-viewer>
 </template>
 <script>
@@ -19,6 +19,10 @@
         default: function () {
           return []
         }
+      },
+      initialIndex: {
+        type: Number,
+        default: 0
       }
     },
     data () {

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-11 10:18:11
+ * @LastEditTime: 2023-09-14 17:11:15
 -->
 <template>
   <transition name="msgbox-fade">
@@ -160,7 +160,7 @@
   .mask-content {
     padding: 5px 20px 30px 20px;
     width: 100%;
-    min-height: 20%;
+    min-height: 253px;
     max-height: 90vh;
     overflow-y: scroll;
   }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 15:36:42
+ * @LastEditTime: 2023-09-14 16:16:57
 -->
 <template>
   <div class="rlPopup">
@@ -148,6 +148,7 @@
             } else {
               this.previewImg.index = this.previewImg.index + 1
             }
+            this.initialIndex = this.previewImg.index
             this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
             this.$message({
               message: '移动成功!',
@@ -234,6 +235,7 @@
        */
       showCurrent (index) {
         this.previewImg.index = index
+        this.initialIndex = index
       },
       /**
        * @description: closeViewer

@@ -2,7 +2,7 @@
  * @Author: yangwei
  * @Date: 2023-02-28 15:47:12
  * @LastEditors: yangwei
- * @LastEditTime: 2023-07-21 14:39:12
+ * @LastEditTime: 2023-09-14 15:04:20
  * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
  * @Description:
  *
@@ -108,13 +108,15 @@ export default {
       // 边框颜色
       borderColor:'rgb(230, 230, 230)',
       // 申请单元列表数据
-      unitIdList:[]
+      unitIdList:[],
+      // 组件标识
+      compFlag:Math.random()
     };
   },
   mounted() {
     // 根据申请单元列表数据处理选中户
     console.log("window.unitData",window.unitData);
-    if(window.unitData.length){
+    if(window.unitData && window.unitData.length){
       window.unitData.forEach(e => {
         this.unitIdList.push(e.bdcdyid)
       })
@@ -266,14 +268,17 @@ export default {
                 {
                   bdcdyh:h.bdcdyh,
                   bsm:h.bsm,
-                dyhbsm:h.dyhbsm
+                  dyhbsm:h.dyhbsm,
+                  bdcdyid:h.dyhbsm,
+                  bdcdylx:'7',
+                  flag:this.compFlag
                 }
               )
             }
           });
         });
       })
-      this.getBsmList(list)
+      this.getBsmList(list,this.compFlag)
     },
     changeChoosedObj: {
       handler(val) {

@@ -37,7 +37,11 @@ import chCpn from "./ch.vue";
 import zdyCpn from "./zdys.vue";
 import ljzsCpn from "./ljzs.vue";
 import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
+import jump from "../../ywbl/ywsq/components/mixin/jump";
+import store from '@/store/index.js'
+import { ywPopupCacel } from "@/utils/popup.js";
 export default {
+  mixins: [jump],
   provide() {
     return {
       openMenu: this.openMenu,
@@ -74,6 +78,7 @@ export default {
       type: Object,
        default: () => { } 
     },
+    isJump: { type: Boolean, default: false },
   },
   data() {
     return {
@@ -111,8 +116,12 @@ export default {
      * @param {Array} bsmList
      * @author: renchao
      */
-    getBsmList(bsmList){
-      this.bsmList = bsmList;
+    getBsmList(bsmList,compFlag){
+      // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
+      this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
+      // 合并本次数据
+      this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
+      // })
     },
     /**
      * @description: 保存当前楼盘表
@@ -229,11 +238,7 @@ export default {
           this.$message.error("请至少选择一条数据");
           return;
         }
-      this.loading = true
-      this.bsmList.forEach(item=>{
-        item['bdcdyid'] = item.dyhbsm;
-        item['bdcdylx'] = '7';
-      })
+      this.loading = true;
       startBusinessFlow({
         bsmSqyw: this.sqywInfo.bsmSqyw,
         bdcdysz: this.bsmList,
@@ -250,7 +255,7 @@ export default {
           } else {
             store.dispatch('user/refreshPage', true);
           }
-          this.$popupCacel()
+          this.close()
         } else {
           if (res.result && res.result.length > 0) {
             this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
@@ -262,6 +267,14 @@ export default {
         this.loading = false
       })
     },
+    /**
+     * @description: close
+     * @param {*} val
+     * @author: renchao
+     */
+    close(){
+      ywPopupCacel()
+    },
   },
   computed:{
     lpbContentHeight(){

@@ -2,7 +2,7 @@
  * @Author: yangwei
  * @Date: 2023-02-28 17:25:45
  * @LastEditors: yangwei
- * @LastEditTime: 2023-07-21 14:59:46
+ * @LastEditTime: 2023-09-14 14:35:19
  * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue
  * @Description: 
  * 
@@ -21,12 +21,14 @@
           >
             <!-- 逻辑幢名称 -->
             <p class="lpb-xmmc ljz-xmmc">
-              <span>{{ljz.ljzmc}}</span>
+              <el-checkbox @change="zdySelectAll($event,ljz.bsm)">{{
+                ljz.ljzmc
+              }}</el-checkbox>
             </p>
             <!-- 独立层户 -->
-            <ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" />
+            <ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" />
             <!-- 幢单元 -->
-            <zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
+            <zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
           </div>
         </div>
       </div>
@@ -38,11 +40,15 @@
         v-else
       >
         <!-- 逻辑幢名称 -->
-        <p class="lpb-xmmc ljz-xmmc">{{ ljzarr[0].ljzmc }}</p>
+        <p class="lpb-xmmc ljz-xmmc">
+          <el-checkbox @change="zdySelectAll($event,ljzarr[0].bsm)">{{
+            ljzarr[0].ljzmc
+          }}</el-checkbox>
+        </p>
         <!-- 独立层户 -->
-        <ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" />
+        <ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" />
         <!-- 幢单元 -->
-        <zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
+        <zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
       </div>
     </div>
   </div>
@@ -90,7 +96,20 @@ export default {
       return tempArr.filter(Boolean)
     },
   },
-  methods: {},
+  methods: {
+    /**
+     * @description: 逻辑幢全选
+     * @param {*} val
+     * @param {*} r
+     * @return {*}
+     */
+    zdySelectAll(val,r) {
+      // 逻辑幢下的独立层户全选
+      this.$refs[r] && this.$refs[r][0].zdySelectAll(val)
+      // 逻辑幢下的幢单元全选
+      this.$refs['zdy' + r] && this.$refs['zdy' + r][0].selectAll(val)
+    }
+  },
 };
 </script>
 

@@ -2,7 +2,7 @@
  * @Author: yangwei
  * @Date: 2023-02-28 16:29:04
  * @LastEditors: yangwei
- * @LastEditTime: 2023-07-21 14:55:30
+ * @LastEditTime: 2023-09-14 14:36:51
  * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
  * @Description:
  *
@@ -13,10 +13,9 @@
     <div v-for="zdy in realZdys" :key="zdy.bsm">
       <!-- 幢单元名称 -->
       <p class="lpb-xmmc">
-        <el-checkbox @change="zdySelectAll($event,zdy.bsm)" v-if="!onlyShow">{{
+        <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
           zdy.zdymc
         }}</el-checkbox>
-        <span v-else>aaa{{zdy.zdymc}}</span>
       </p>
       <!-- 每个幢单元下的层户 -->
       <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
@@ -58,6 +57,16 @@ export default {
     zdySelectAll(val,r) {
       this.$refs[r][0].zdySelectAll(val)
     },
+    /**
+     * @description: 逻辑幢全选点击后逻辑幢下的幢单元全选
+     * @param {*} val
+     * @return {*}
+     */
+    selectAll(val){
+      this.realZdys.forEach(i=>{
+        this.zdySelectAll(val,i.bsm)
+      })
+    }
   },
   computed: {
     realZdys() {

@@ -6,7 +6,7 @@
 <template>
   <div class="djxxTable">
     <div v-show="false">
-       <printTemplate id="boxcfdj" :propsParam="propsParam" :tableData="tableData" :render="render"/>
+       <printTemplate id="boxcfdj" :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -12,6 +12,7 @@
       style="page-break-after: always"
     >
       <div class="title">{{ title }}</div>
+      <div class="num">共{{ datass.length }}页，第{{ indexx + 1 }}页</div>
       <table class="xxTable">
         <tr v-for="item in columns" :key="item.name">
           <td>
@@ -50,18 +51,14 @@ export default {
     };
   },
   props: {
-    propsParam: {
-      type: Object,
-      default: () => {},
-    },
     tableData: {
       type: Array,
       default: () => [],
     },
-    render:{
+    render: {
       type: Boolean,
       default: false,
-    }
+    },
   },
   created() {},
   watch: {
@@ -72,7 +69,7 @@ export default {
     },
     render: {
       handler(newValue, oldValue) {
-            if(newValue){
+        if (newValue) {
           this.loadData();
         }
       },
@@ -87,13 +84,13 @@ export default {
      */
     loadData() {
       getFieldListByQlxx({
-        qllx: this.propsParam.qllx,
+        qllx: this.tableData[0].qllx,
       }).then((res) => {
         if (res.code === 200) {
           this.columns = res.result;
         }
       });
-      if (this.tableData.length&&this.datass.length==0) {
+      if (this.tableData.length && this.datass.length == 0) {
         for (let i = 0; i < this.tableData.length; i += 4) {
           this.datass.push(this.tableData.slice(i, i + 4));
         }
@@ -113,8 +110,13 @@ export default {
 <style lang="scss" scoped>
 .tbalede {
   width: 100%;
-  // height: 1123px;
   margin: auto;
+  position: relative;
+  .num {
+   position: absolute;
+   right: 10px;
+   top: 0px;
+  }
   .title {
     width: 100%;
     font-weight: 700;
@@ -140,16 +142,15 @@ export default {
       padding: 5px;
     }
     td {
-   width: 20px!important;
+      width: 20px !important;
       word-break: break-all;
       //       /* 方法一：使用 word-break */
-// word-break: break-all;
-// // /* 方法二：使用 white-space */
-// // white-space: pre-wrap;
-// // /* 方法三：使用 overflow-wrap */
-// // overflow-wrap: break-word;
+      // word-break: break-all;
+      // // /* 方法二：使用 white-space */
+      // // white-space: pre-wrap;
+      // // /* 方法三：使用 overflow-wrap */
+      // // overflow-wrap: break-word;
     }
-
   }
 }
 </style>

@@ -6,7 +6,7 @@
 <template>
   <div class="djxxTable">
     <div v-show="false">
-       <printTemplate id="boxdiyaq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
+       <printTemplate id="boxdiyaq" :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -6,7 +6,7 @@
 <template>
   <div class="djxxTable">
     <div v-show="false">
-       <printTemplate id="boxdiyiq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
+       <printTemplate id="boxdiyiq" :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -8,7 +8,7 @@
     <div v-show="false">
       <printTemplate
         id="boxfdcq"
-       :propsParam="propsParam" :tableData="tableData" :render="render"/>
+       :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -5,10 +5,9 @@
 -->
 <template>
   <div class="djxxTable">
-    <div>
+    <div v-show="false">
       <printTemplate
         id="boxfdcq"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -8,7 +8,6 @@
     <div v-show="false">
       <printTemplate
         id="boxjsydsyq"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -8,7 +8,6 @@
     <div v-show="false">
       <printTemplate
         id="boxldsyq"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -8,7 +8,6 @@
     <div v-show="false">
       <printTemplate
         id="boxnydsyq"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -18,7 +18,6 @@
     <div v-show="false">
       <printTemplate
         id="boxsllmsyq"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -6,7 +6,7 @@
 <template>
   <div class="djxxTable">
     <div v-show="false">
-       <printTemplate  id="boxtdsyq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
+       <printTemplate  id="boxtdsyq" :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -6,7 +6,7 @@
 <template>
   <div class="djxxTable">
     <div v-show="false">
-        <printTemplate  id="boxygdj" :propsParam="propsParam" :tableData="tableData" :render="render"/>
+        <printTemplate  id="boxygdj" :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -8,7 +8,6 @@
     <div v-show="false">
       <printTemplate
         id="boxyydj"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -8,51 +8,64 @@
     <div class="fieldcheck">
       <div class="left">
         <div class="header">
+          <div class="headerconcent">
             <el-checkbox
               class="check"
               :indeterminate="isIndeterminate"
               v-model="checkAll"
-            @change="handleCheckAllChange">待选合集</el-checkbox>
-          <div class="num">/</div>
+              @change="handleCheckAllChange"
+              >待选合集</el-checkbox
+            >
+            <div class="num">
+              总数{{ cities.length }} 已选{{ datalist.length }}
+            </div>
+          </div>
         </div>
         <el-checkbox-group
           class="concent"
           v-model="checkedCities"
-          @change="handleCheckedCitiesChange">
+          @change="handleCheckedCitiesChange"
+        >
           <el-checkbox
             v-for="city in cities"
             :label="city.name"
-            :key="city.name">{{ city.despriction }}({{ city.name }})</el-checkbox>
+            :key="city.name"
+            >{{ city.despriction }}({{ city.name }})</el-checkbox
+          >
         </el-checkbox-group>
       </div>
       <div class="right">
         <el-table
           class="tablelist"
           :data="datalist"
+          border
           ref="listTable"
           :key="key"
           row-key="name"
           :pagination="false"
-          :header-cell-style="{ 'text-align': 'center' }"
           :heightNumSetting="true"
           :minHeight="150"
-          height="590"
-          style="width: 100%">
+          height="650"
+          style="width: 100%"
+        >
           <el-table-column label="字段" prop="name" min-width="100">
           </el-table-column>
 
           <el-table-column
             label="字段名称"
             prop="desprictionor"
-            min-width="100">
+            min-width="100"
+          >
           </el-table-column>
           <el-table-column label="字段别名" min-width="100">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.despriction"
                 placeholder="请输入内容"
-                @input="sumTime(scope.$index, scope.row.tdsyqx)">
-                ></el-input>
+                @input="sumTime(scope.$index, scope.row.tdsyqx)"
+              >
+                ></el-input
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -66,16 +79,16 @@
 </template>
 
 <script>
-  import Sortable from 'sortablejs'
-  import { getFieldList, getFieldListByQlxx, save } from "@/api/SysDjbFieldDO";
-  export default {
+import Sortable from "sortablejs";
+import { getFieldList, getFieldListByQlxx, save } from "@/api/SysDjbFieldDO";
+export default {
   props: {
     formData: {
       type: Object,
-        default: () => { },
+      default: () => {},
     },
   },
-    data () {
+  data() {
     return {
       checkAll: false,
       sortable: null,
@@ -87,48 +100,51 @@
       isIndeterminate: true,
     };
   },
-    mounted () {
-      this.generateData()
+  mounted() {
+    this.generateData();
   },
-    beforeDestroy () {
+  beforeDestroy() {
     if (this.sortable) {
       this.sortable.destroy();
     }
   },
   watch: {
     key: {
-        handler (newName, oldName) {
-          this.initSort()
-        }
-      }
+      handler(newName, oldName) {
+        this.initSort();
+      },
+    },
   },
   methods: {
-      changeIndex (array, index1, index2) {
+    changeIndex(array, index1, index2) {
       array[index1] = array.splice(index2, 1, array[index1])[0];
     },
-      initSort () {
-           const el =  this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
+    initSort() {
+      const el = this.$refs.listTable.$el.querySelectorAll(
+        ".el-table__body-wrapper > table > tbody"
+      )[0];
       // const sortable = new Sortable(el, options);
       // 根据具体需求配置options配置项
       const sortable = new Sortable(el, {
-	        onEnd: (evt) => { // 监听拖动结束事件
-	          console.log(this) // this是当前vue上下文
-	          console.log(evt.oldIndex) // 当前行的被拖拽前的顺序
-	          console.log(evt.newIndex) // 当前行的被拖拽后的顺序
+        onEnd: (evt) => {
+          // 监听拖动结束事件
+          console.log(this); // this是当前vue上下文
+          console.log(evt.oldIndex); // 当前行的被拖拽前的顺序
+          console.log(evt.newIndex); // 当前行的被拖拽后的顺序
           // 这里就可以写我们需要传给后台的逻辑代码
           // 我们有了 evt.oldIndex 和 evt.newIndex 这两个参数做索引，我们可以根据绑定在表格上面的 data 这个 Array 找到两个相应的记录。就可以针对数据进行操作啦。
           // 下面将拖拽后的顺序进行修改
-	          const currRow = this.datalist.splice(evt.oldIndex, 1)[0]
-	          this.datalist.splice(evt.newIndex, 0, currRow)
-          }
-        })
+          const currRow = this.datalist.splice(evt.oldIndex, 1)[0];
+          this.datalist.splice(evt.newIndex, 0, currRow);
+        },
+      });
     },
     /**
      * @description: 初始数据集
      * @author: renchao
      */
-      generateData () {
-        let that = this
+    generateData() {
+      let that = this;
       getFieldList({ qllx: this.formData.qllx }).then((res) => {
         if (res.code === 200) {
           let listss = res.result;
@@ -150,38 +166,37 @@
                   desprictionor: item.despriction,
                 });
                 that.$nextTick(() => {
-                    that.datalist = this.tablelist
+                  that.datalist = this.tablelist;
                   that.checkedCities.push(item.name);
-                  })
-                })
-                that.initSort()
+                });
+              });
+              that.initSort();
             }
           });
         }
       });
     },
-      handleCheckAllChange (val) {
-        let checkedlist = []
-        let orlist = []
+    handleCheckAllChange(val) {
+      let checkedlist = [];
+      let orlist = [];
       checkedlist = val ? this.cities : [];
       this.isIndeterminate = false;
       console.log("this.checkedCities", this.checkedCities);
       let lists = [];
       this.cities.forEach((item, index) => {
-
         checkedlist.forEach((el) => {
-            orlist.push(el.name)
+          orlist.push(el.name);
           if (item.name == el.name) {
             lists.push(this.cities[index]);
           }
         });
       });
-        this.checkedCities = orlist
+      this.checkedCities = orlist;
       this.datalist = lists;
       // 其他排序逻辑
-        this.initSort()
+      this.initSort();
     },
-      handleCheckedCitiesChange (value) {
+    handleCheckedCitiesChange(value) {
       console.log("value", value, this.checkedCities);
       let checkedCount = value.length;
       this.checkAll = checkedCount === this.cities.length;
@@ -191,16 +206,15 @@
       this.cities.forEach((item, index) => {
         this.checkedCities.forEach((el) => {
           if (item.name == el) {
-              console.log("1");
             lists.push(this.cities[index]);
           }
         });
       });
       this.datalist = lists;
       // 其他排序逻辑
-        this.initSort()
+      this.initSort();
     },
-      submitForm () {
+    submitForm() {
       save(this.formData.bsmMb, this.datalist).then((res) => {
         if (res.code == 200) {
           this.$popupCacel();
@@ -217,19 +231,19 @@
       });
     },
   },
-  };
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
-  @import "~@/styles/dialogBoxheader.scss";
-  .fieldcheck {
+@import "~@/styles/mixin.scss";
+@import "~@/styles/dialogBoxheader.scss";
+.fieldcheck {
   width: 100%;
   height: 650px;
   display: flex;
   justify-content: space-between;
   .left,
   .right {
-      width: 47%;
+    width: 49%;
     height: 650px;
     border: 1px solid rgb(230, 230, 230);
   }
@@ -237,16 +251,15 @@
     .header {
       width: 100%;
       height: 50px;
-        line-height: 50px;
       background-color: rgba(243, 242, 242, 0.897);
-        display: flex;
-        justify-content: space-around;
-        align-items:center .check {
-          height: 20px;
+      .headerconcent {
+        width: 90%;
+        height: 50px;
         margin: auto;
-        }
-        .num {
-          height: 20px;
+        line-height: 50px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
       }
     }
     .concent {
@@ -273,15 +286,12 @@
       line-height: 50px;
       background-color: rgba(243, 242, 242, 0.897);
     }
-      .tablelist {
-        margin-top: 10px;
-        height: 680px;
-      }
-    }
+
   }
-  .btn {
+}
+.btn {
   margin-top: 10px;
   width: 100%;
   text-align: center;
-  }
+}
 </style>

           <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 17:08:19
+ * @LastEditTime: 2023-09-14 16:37:15
 -->
 <template>
   <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
@@ -28,25 +28,30 @@
       :calcHeight="300">
     </lb-table>
     <el-row>
-      <el-col :span="6">
-        <el-form-item label="领证人" prop="lzrxm">
+      <el-col :span="3">
+        <el-form-item label="身份证读卡器">
+          <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button>
+        </el-form-item>
+      </el-col>
+      <el-col :span="5">
+        <el-form-item label="领证人" prop="lzrxm" label-width="70px">
           <el-input v-model="ruleForm.lzrxm"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
-        <el-form-item label="证件类型" prop="lzrzjlb">
+      <el-col :span="5">
+        <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
           <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
             <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
-        <el-form-item label="证件号" prop="lzrzjh">
+      <el-col :span="5">
+        <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
           <el-input v-model="ruleForm.lzrzjh"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="5">
         <el-form-item label="领证人电话" prop="lzrdh">
           <el-input v-model="ruleForm.lzrdh"></el-input>
         </el-form-item>
@@ -62,7 +67,8 @@
   import Vue from 'vue'
   import store from '@/store/index.js'
   import table from "@/utils/mixin/table";
-  import { getUnclaimedBdcqz, issueCertificate,getBdcqzQlr } from "@/api/bdcqz.js";
+  import { getIdCardInfo } from '@/utils/operation.js'
+  import { getUnclaimedBdcqz, issueCertificate, getBdcqzQlr } from "@/api/bdcqz.js";
   import { datas } from "../../javascript/fzxxdata";
   export default {
     props: {
@@ -115,6 +121,29 @@
     },
     methods: {
       /**
+       * @description: 身份证打卡器
+       * @author: renchao
+       */
+      readClick () {
+        getIdCardInfo().then(res => {
+          if (res.data.code == 0) {
+            let data = res.data.IDCardInfo
+            this.ruleForm.lzrxm = data.name
+            this.ruleForm.lzrzjlb = '1'
+            this.ruleForm.lzrzjh = data.cardID
+            this.$message({
+              message: '读取成功！',
+              type: 'success'
+            })
+          } else {
+            this.$message({
+              message: res.data.message,
+              type: 'warning'
+            })
+          }
+        })
+      },
+      /**
        * @description: 列表初始化
        * @author: renchao
        */

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-06 15:20:16
+ * @LastEditTime: 2023-09-14 17:19:26
 -->
 <template>
   <div class="slxx sdqxx">
@@ -119,10 +119,6 @@
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
       formdata.append("isEdit", this.viewEdit);
-      // Init(formdata).then((res) => {
-      //   if (res.code === 200 && res.result) {
-      //   }
-      // });
     },
     data () {
       return {

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 16:16:08
+ * @LastEditTime: 2023-09-14 16:06:51
 -->
 <template>
-  <div>
-    <canvas id="mxcad" style="width:100%;height:100%">
+  <div style="width:90%;height:100%;">
+    <canvas id="mxcad" style="width:90%;height:80%; position: relative;top:0">
     </canvas>
   </div>
 </template>
@@ -20,20 +20,17 @@
         Mx.MxFun.createMxObject({
           canvasId: "mxcad", // canvas元素的id
           cadFile: "buf/hhhh.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸
-          // cadFile: "test2.dwg", //  socket通信方式请直接提供图纸名称 如：text.dwg
           callback: (mxDraw, {
             canvas,
             canvasParent
           }) => {
             // 可以拿到canvas元素和它的父级元素
-            console.log(canvas, canvasParent)
-            console.log(mxDraw)
             // 拿到图层数据
             mxDraw.addEvent('uiSetLayerData', (listLayer) => {
               console.log(listLayer)
             })
           },
-          isNewFile: false // 是否新建文件
+          isNewFile: true // 是否新建文件
         })
       })
     }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 13:57:48
+ * @LastEditTime: 2023-09-14 17:19:13
 -->
 <template>
   <div class="container">
@@ -194,7 +194,8 @@
             setTimeout(() => {
               this.prinsss()
             }, 100)
-
+          } else {
+            this.$message.error(res.message);
           }
         })
       },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-14 10:12:23
+ * @LastEditTime: 2023-09-14 11:14:54
 -->
 <template>
   <div class="clmlmx-box">
@@ -34,27 +34,6 @@
         sortable: null,
         column: [
           {
-            prop: "isrequired",
-            label: "是否必选",
-            width: "80",
-            render: (h, scope) => {
-              if (scope.row.isrequired === "1") {
-                return (
-                  <div>
-                    <span>必选</span>
-                  </div>
-                );
-              }
-              else {
-                return (
-                  <div>
-                    <span>可选</span>
-                  </div>
-                )
-              }
-            }
-          },
-          {
             label: "材料名称",
             render: (h, scope) => {
               return (
@@ -101,21 +80,6 @@
             },
           },
           {
-            label: "是否新建材料",
-            width: "80",
-            render: (h, scope) => {
-              if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
-                return (
-                  <span>是</span>
-                );
-              } else {
-                return (
-                  <span>否</span>
-                );
-              }
-            },
-          },
-          {
             label: "操作",
             width: "100",
             render: (h, scope) => {
@@ -123,7 +87,7 @@
                 <el-button
                   type="text"
                   icon="el-icon-delete"
-                  disabled={!(scope.row.count == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
+                  disabled={scope.row.count != 0}
                   onClick={() => {
                     this.handleDelete(scope.$index, scope.row);
                   }}
@@ -170,8 +134,8 @@
               message: '保存成功',
               type: 'success'
             })
-            ywPopupCacel()
             store.dispatch('user/reWorkFresh', true)
+            ywPopupCacel()
           }
         }).catch(() => {
           this.loading = false

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-12 13:46:29
+ * @LastEditTime: 2023-09-14 16:24:07
 -->
 <template>
   <div class="rlPopup">
@@ -86,7 +86,7 @@
         // 缩略图
         thumbnailImages: [],
         showViewer: false,
-        initialIndex: undefined,
+        initialIndex: 0,
         allLi: [],
       }
     },
@@ -152,6 +152,7 @@
             } else {
               this.previewImg.index = this.previewImg.index + 1
             }
+            this.initialIndex = this.previewImg.index
             this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial })
             this.$message({
               message: '移动成功!',
@@ -238,6 +239,7 @@
        */
       showCurrent (index) {
         this.previewImg.index = index
+        this.initialIndex = index
       },
       /**
        * @description: closeViewer

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 17:05:49
+ * @LastEditTime: 2023-09-14 14:23:19
 -->
 <template>
   <div class="clxx">
@@ -58,10 +58,10 @@
 </template>
 <script>
   import store from '@/store/index.js'
-  import { ywPopupDialog, ywPopupCacel } from "@/utils/popup.js";
+  import { ywPopupDialog } from "@/utils/popup.js";
+  import imagePreview from "./dialog/imagePreview.vue";
   import clxxAddDialog from "./dialog/clxxAddDialog.vue";
   import clxxDetailDialog from "./dialog/clxxDetailDialog.vue";
-  import imagePreview from "./dialog/imagePreview.vue";
   import { getCompanyMaterialList, addCompanyMaterial, getFileListByBsmMaterial } from "@/api/company.js";
   export default {
     components: { clxxAddDialog, imagePreview, clxxDetailDialog },
@@ -90,6 +90,20 @@
         }
       }
     },
+    computed: {
+      workFresh () {
+        return store.state.user.workFresh
+      }
+    },
+    watch: {
+      workFresh: {
+        handler (newValue, oldValue) {
+          this.clmlInitList()
+        },
+        deep: true,
+        immediate: true
+      }
+    },
     created () {
       this.clmlInitList()
     },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-11 11:23:49
+ * @LastEditTime: 2023-09-14 11:11:10
 -->
 <template>
   <div class="from-clues">
@@ -39,7 +39,6 @@
   </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex'
   import table from "@/utils/mixin/table"
   import { datas, sendThis } from "./data"
   import { queryQyByPage, addQy, remove } from "@/api/xxba.js";
@@ -53,17 +52,6 @@
     activated () {
       this.queryClick()
     },
-    computed: {
-      ...mapGetters(['workFresh'])
-    },
-    watch: {
-      workFresh: {
-        handler (newVal, oldVal) {
-          console.log(newVal, 'newVal');
-          if (newVal) this.queryClick()
-        }
-      }
-    },
     data () {
       return {
         queryForm: {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 09:50:02
+ * @LastEditTime: 2023-09-14 17:19:40
 -->
 <template>
   <div class="slxx">
@@ -310,6 +310,8 @@
       Init(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           this.ruleForm = res.result;
+        } else {
+          this.$message.error(res.message);
         }
       });
     },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-12 09:59:18
+ * @LastEditTime: 2023-09-14 17:19:58
 -->
 <template>
   <!-- 受理信息 -->
@@ -365,6 +365,7 @@
   import { mapGetters } from "vuex";
   export default {
     mounted () {
+      let that = this
       this.loading = true
       this.viewEdit = this.$parent.currentSelectTab.ableOperation;
       this.propsParam = this.$attrs;
@@ -381,14 +382,16 @@
           this.loading = false
         }, 200)
         if (res.code === 200 && res.result) {
-          this.ruleForm = res.result;
-          this.czrOptions = this.ruleForm.qlrList;
-        }
-        this.ruleForm.qlrList.forEach((item) => {
+          that.ruleForm = res.result;
+          that.czrOptions = this.ruleForm.qlrList;
+          that.ruleForm.qlrList.forEach((item) => {
             if (item.sfczr == 1) {
-            this.czr = item.zjh
+              that.czr = item.zjh
+            }
+          })
+        } else {
+          that.$message.error(res.message);
         }
-        });
       }).catch(() => {
         this.loading = false
       })

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-09-13 14:41:34
+ * @LastEditTime: 2023-09-14 17:20:40
 -->
 <template>
   <div class="slxx">
@@ -105,16 +105,44 @@
         <el-row :gutter="10" v-if="ruleForm.fdcq1">
           <el-col :span="8">
             <el-form-item label="独用土地面积：">
-              <el-input :disabled="!viewEdit" maxlength="12" v-model="ruleForm.fdcq1.dytdmj"></el-input>
+              <div class="flex">
+                <el-input
+                  maxlength="12"
+                  v-model="ruleForm.fdcq1.dytdmj"
+                  :disabled="!viewEdit"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
+                <el-select disabled v-model="mjdw" style="width: 68px">
+                  <el-option
+                    v-for="item in dictData['A7']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="分摊土地面积：">
-              <el-input :disabled="!viewEdit" maxlength="12" v-model="ruleForm.fdcq1.fttdmj"></el-input>
+              <div class="flex">
+                <el-input
+                  maxlength="12"
+                  v-model="ruleForm.fdcq1.fttdmj"
+                  :disabled="!viewEdit"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
+                <el-select disabled v-model="mjdw" style="width: 68px">
+                  <el-option
+                    v-for="item in dictData['A7']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
+
             <el-form-item label="房地产交易价格：">
               <div class="flex">
                 <el-input
@@ -285,6 +313,8 @@
             }
           });
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
       })
     },
@@ -298,6 +328,7 @@
         disabled: true,
         tdytOption: [],
         czrOptions: [],
+        mjdw: "1",
         czr: "",
         ruleForm: {
           flow: {

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-09-12 10:04:14
+ * @LastEditTime: 2023-09-14 17:17:56
 -->
 <template>
   <div class="slxx">
@@ -440,6 +440,8 @@
             }
           });
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
       }).catch(() => {
         this.loading = false

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 14:16:46
+ * @LastEditTime: 2023-09-14 17:20:53
 -->
 <template>
   <div class="slxx">
@@ -299,6 +299,8 @@
             }
           });
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
       }).catch(() => {
         this.loading = false

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 14:17:15
+ * @LastEditTime: 2023-09-14 17:20:59
 -->
 <template>
   <div class="slxx">
@@ -296,6 +296,8 @@
           this.czrOptions = this.ruleForm.qlrList;
           this.gyfs = this.ruleForm.sldyList[0].gyfs;
           this.splicingFdcq2Info();
+        } else {
+          this.$message.error(res.message);
         }
         this.ruleForm.qlrList.forEach((item) => {
           if (item.sfczr == 1) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 14:05:26
+ * @LastEditTime: 2023-09-14 17:21:04
 -->
 <template>
   <!-- 受理信息 -->
@@ -264,6 +264,8 @@
             }
           });
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
       }).catch(() => {
         this.loading = false
@@ -356,6 +358,8 @@
               ...res.result.qlxxdatas,
               ...res.result.jsydsyqdatas,
             };
+          } else {
+            this.$message.error(res.message);
           }
         });
       },

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 14:17:49
+ * @LastEditTime: 2023-09-14 17:21:19
 -->
 <template>
   <!-- 受理信息 -->
@@ -239,6 +239,8 @@
         if (res.code === 200 && res.result) {
           this.ruleForm = res.result;
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
         this.ruleForm.qlrList.forEach((item) => {
           if (item.sfczr == 1) {

@@ -352,6 +352,8 @@
           setTimeout(() => {
             this.loading = false
           }, 200)
+        } else {
+          this.$message.error(res.message);
         }
       })
     },

@@ -345,6 +345,8 @@
             ? (this.ruleForm.slsq.fzfs = "1")
             : this.ruleForm.slsq.fzfs;
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
       });
     },

@@ -227,9 +227,11 @@
             if (item.sfczr == 1) {
               this.czr = item.zjh
             }
-          });
+          })
+        } else {
+          this.$message.error(res.message);
         }
-      });
+      })
     },
     components: { qlrCommonTable, ywrCommonTable },
     computed: {

@@ -327,6 +327,8 @@
           setTimeout(() => {
             that.loading = false
           }, 200)
+        } else {
+          this.$message.error(res.message);
         }
       })
     },

@@ -345,6 +345,8 @@
               this.czr = item.zjh
             }
           })
+        } else {
+          this.$message.error(res.message);
         }
       }).catch(() => {
         this.loading = false