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

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-07 16:28:14
+ * @LastEditTime: 2023-09-11 11:31:17
 -->
 <template>
   <transition name="msgbox-fade">
@@ -166,7 +166,7 @@
     width: 100%;
     min-height: 30%;
     max-height: 90vh;
-    overflow-y: scroll;
+    // overflow-y: scroll;
     box-sizing: border-box;
   }
 

@@ -49,6 +49,10 @@ export default {
     this.dealCheckedItem();
   },
   methods: {
+    /**
+     * @description: submitForm
+     * @author: renchao
+     */
     submitForm () {
       var checkedNodes = this.$refs.tree.getCheckedNodes();
       if (checkedNodes.length > 6) {
@@ -65,6 +69,10 @@ export default {
         }
       })
     },
+    /**
+     * @description: queryClick
+     * @author: renchao
+     */
     queryClick () {
       let that = this
       getMenuInfo().then(res => {
@@ -79,13 +87,28 @@ export default {
       }
       this.defaultCheckeds = lookForAllId()
     },
+    /**
+     * @description: dealCheckedItem
+     * @author: renchao
+     */
     dealCheckedItem () {
     },
     //关闭窗口
+    /**
+     * @description: 关闭窗口
+     * @author: renchao
+     */
     closeDialog () {
       this.$emit("input", false);
     },
     //节点选择状态发生改变时
+    /**
+     * @description: 节点选择状态发生改变时
+     * @param {*} data
+     * @param {*} checked
+     * @param {*} node
+     * @author: renchao
+     */
     handleClick (data, checked, node) {
       var checkedNodes = this.$refs.tree.getCheckedNodes();
       if (checkedNodes.length > 6) {

@@ -75,6 +75,10 @@
     },
     methods: {
       // 初始化数据
+      /**
+       * @description: 初始化数据
+       * @author: renchao
+       */
       queryClick () {
         this.$startLoading();
         getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {

@@ -195,6 +195,10 @@
       }
     },
     methods: {
+      /**
+       * @description: handleSubmit
+       * @author: renchao
+       */
       handleSubmit () {
         this.loading = true
         updateClml(this.tableData).then(res => {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-06 16:15:09
+ * @LastEditTime: 2023-09-11 11:29:36
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -12,7 +12,7 @@
       </el-tab-pane>
     </el-tabs>
     <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty>
-    <div style="width:1180px;">
+    <div :style="{'width':'1180px','height': `calc(100% - ${hdiffHeight}px)`,'overflow-y': 'auto'}">
       <canvas ref="zs" width="1000" v-show="this.bdcqz.bdcqzlx==1" height="700"></canvas>
       <canvas ref="zm" width="1180" v-show="this.bdcqz.bdcqzlx==2" height="780"></canvas>
     </div>
@@ -517,6 +517,11 @@
 
         image.src = this.bdczmSrc;
       }
+    },
+    computed:{
+      hdiffHeight(){
+        return  this.headTabBdcqz.length > 1 ? 54 :0 
+      }
     }
   }
 </script>

@@ -463,7 +463,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

@@ -330,6 +330,10 @@
       };
     },
     methods: {
+      /**
+       * @description: updateFdcwxmList
+       * @author: renchao
+       */
       updateFdcwxmList (val) {
         this.ruleForm.fdcqxm && (this.ruleForm.fdcqxm = _.cloneDeep(val));
         this.key++;
@@ -429,7 +433,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

@@ -585,7 +585,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

@@ -496,7 +496,7 @@ export default {
             return false;
           }
           this.ruleForm.qlrList.forEach((item, index) => {
-            if (item.zjh == this.czr) {
+            if (item.zjh == that.czr) {
               item.sfczr = "1";
             } else {
               item.sfczr = "0";

@@ -421,7 +421,7 @@ export default {
             return false;
           }
           this.ruleForm.qlrList.forEach((item, index) => {
-            if (item.zjh == this.czr) {
+            if (item.zjh == that.czr) {
               item.sfczr = "1";
             } else {
               item.sfczr = "0";

@@ -427,7 +427,7 @@ export default {
             return false;
           }
           this.ruleForm.qlrList.forEach((item, index) => {
-            if (item.zjh == this.czr) {
+            if (item.zjh == that.czr) {
               item.sfczr = "1";
             } else {
               item.sfczr = "0";

@@ -398,7 +398,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

@@ -372,7 +372,7 @@ export default {
             return false;
           }
           this.ruleForm.qlrList.forEach((item, index) => {
-            if (item.zjh == this.czr) {
+            if (item.zjh == that.czr) {
               item.sfczr = "1";
             } else {
               item.sfczr = "0";

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-09-07 17:04:32
+ * @LastEditTime: 2023-09-11 11:14:35
 -->
 <template>
   <div class="slxx">
@@ -143,7 +143,6 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="造林年度：">
-              <!-- <el-input v-model="ruleForm.lq.zlnd"></el-input> -->
               <el-date-picker
                 class="width100"
                 value-format="yyyy"
@@ -349,6 +348,7 @@
             ? (this.ruleForm.slsq.fzfs = "1")
             : this.ruleForm.slsq.fzfs;
           this.czrOptions = this.ruleForm.qlrList;
+          this.ruleForm.lq.zlnd ? this.$set(this.ruleForm.lq,'zlnd',this.ruleForm.lq.zlnd.toString()) : this.$set(this.ruleForm.lq,'zlnd',"")
           setTimeout(() => {
             this.loading = false
           }, 200)
@@ -368,7 +368,6 @@
         czr: "",
         ruleForm: {
           lq:{
-
           },
           flow: {
             ywh: "",
@@ -392,7 +391,7 @@
         propsParam: this.$attrs,
         //表单是否可操作
         viewEdit: true,
-        rules: {},
+        rules: {}
       };
     },
     methods: {
@@ -482,7 +481,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

@@ -435,7 +435,7 @@ export default {
             return false;
           }
           this.ruleForm.qlrList.forEach((item, index) => {
-            if (item.zjh == this.czr) {
+            if (item.zjh == that.czr) {
               item.sfczr = "1";
             } else {
               item.sfczr = "0";

@@ -422,7 +422,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-09-01 13:37:53
+ * @LastEditTime: 2023-09-11 09:51:59
 -->
 <template>
   <div class="slxx">
@@ -359,6 +359,11 @@
         czrOptions: [],
         czr: "",
         ruleForm: {
+          lq:{
+            zlnd:"",
+            ldsyqssj:"",
+            ldsyjssj:""
+          },
           flow: {
             ywh: "",
           },
@@ -471,7 +476,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

@@ -510,7 +510,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

@@ -421,7 +421,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

@@ -339,7 +339,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

@@ -427,7 +427,7 @@
               return false;
             }
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.czr) {
+              if (item.zjh == that.czr) {
                 item.sfczr = "1";
               } else {
                 item.sfczr = "0";

@@ -423,7 +423,7 @@ export default {
             return false;
           }
           this.ruleForm.qlrList.forEach((item, index) => {
-            if (item.zjh == this.czr) {
+            if (item.zjh == that.czr) {
               item.sfczr = "1";
             } else {
               item.sfczr = "0";

@@ -451,7 +451,7 @@ export default {
             return false;
           }
           this.ruleForm.qlrList.forEach((item, index) => {
-            if (item.zjh == this.czr) {
+            if (item.zjh == that.czr) {
               item.sfczr = "1";
             } else {
               item.sfczr = "0";

@@ -174,7 +174,7 @@
   import { datas, sendThis } from "../javascript/selectFwbjDybgSplitMerge.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { selectFwsyq, selectDiyaq } from "@/api/ywsq.js";
-  import { startBusinessFlow } from "@/api/workFlow.js";
+  import { startTogetherFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {
@@ -200,6 +200,11 @@
       sendThis(this)
     },
     methods: {
+      /**
+       * @description: yWstatus
+       * @param {*} row
+       * @author: renchao
+       */
       yWstatus (row) {
         let text = "";
         let keys = 0;
@@ -241,12 +246,13 @@
       },
       /**
        * @description: 单选事件
+       * @param {*} row
        * @author: renchao
        */
       getCurrentRow (row) {
         this.radioVal = row.bdcdyh;
         this.bdcdysz = [row]
-        selectDiyaq({ bdcdyh: this.radioVal, currentPage: 1, pageSize: 10 }).then((res) => {
+        selectDiyaq({ bdcdyh: this.radioVal,sqywbm:'A37300', currentPage: 1, pageSize: 10 }).then((res) => {
           if (res.code === 200) {
             this.tableData.dataList = res.result.records
             this.bdcdysz = [this.bdcdysz[0], ...this.tableData.dataList]
@@ -284,7 +290,7 @@
        */
       submitForm () {
         this.loading = true
-        startBusinessFlow({
+        startTogetherFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
         }).then((res) => {

@@ -214,6 +214,11 @@
       sendThis(this)
     },
     methods: {
+      /**
+       * @description: yWstatus
+       * @param {*} row
+       * @author: renchao
+       */
       yWstatus (row) {
         let text = "";
         let keys = 0;
@@ -255,6 +260,7 @@
       },
       /**
        * @description: 单选事件
+       * @param {*} row
        * @author: renchao
        */
       getCurrentRow (row) {