Merge branch 'dev'

 /*
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @LastEditTime: 2023-07-28 15:49:38
  */
@@ -12,6 +12,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  userInfo: state => state.user.userInfo,
   userData: state => state.user.userData,
   permission_routes: state => state.permission.routes,
   addRoutes: state => state.permission.addRoutes,

 /*
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @LastEditTime: 2023-07-28 16:33:19
  */
 import { getUserInfo } from '@/api/user'
+import { log } from 'bpmn-js-token-simulation'
 const state = {
     name: '',
+    userInfo:{},
     avatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
     isRefresh: false,
     // 业务流程刷新
@@ -14,8 +16,10 @@ const state = {
 const mutations = {
     SET_NAME: (state, data) => {
         state.name = data.loginName
+        state.userInfo = data
     },
     REFRESH: (state, data) => {
+
         state.isRefresh = data
     },
     SETWORKFRESH: (state, data) => {

@@ -29,6 +29,7 @@
             <div>
               <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
               <p v-else>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
+              <div class="ywh">（业务号：{{ item.blywh}}）</div>
             </div>
             <i class="el-icon-delete" @click.stop="handleDel(item)" v-if="delel"></i>
           </el-menu-item>
@@ -75,6 +76,7 @@
         qllx: this.$route.query.qllx,
         // 默认选中
         activeIndex: "0",
+        clickindex:"",
         // 折叠
         isShowdrawer: true,
         delel: true,
@@ -138,7 +140,6 @@
        * @author: renchao
        */
       getleftMenubl (row) {
-
         leftMenubl(this.bsmSlsq).then((res) => {
           this.supplementarylist = res.result;
           if (row) {
@@ -149,6 +150,10 @@
                 this.unitClick(index)
               }
             })
+            if(row=="change"){
+              this.unitClick(this.clickindex)
+
+            }
           }else{
              if (this.supplementarylist.length) {
             this.unitClick(0)
@@ -183,6 +188,7 @@
        * @author: renchao
        */
       unitClick (index) {
+         this.clickindex=index
         this.currentSelectProps = this.supplementarylist[index];
         this.$emit("getCurrentSelectProps", this.currentSelectProps);
       },
@@ -317,7 +323,11 @@
       color: red;
       line-height: 22px;
     }
+    .ywh{
+    font-size: 12px;
+    }
     .el-icon-delete {
+      margin-top: 10px;
       margin-right: 3px;
       // background-color: saddlebrown;
       height: 27px;

@@ -2,7 +2,7 @@
  * @Description:
  * @Autor: renchao
  :show-message="false"
- * @LastEditTime: 2023-06-25 15:52:42
+ * @LastEditTime: 2023-08-01 09:45:22
 -->
 <template>
   <!-- 受理信息 -->
@@ -46,7 +46,10 @@
         </div>
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item label="查封不动产权信息：" prop="ztQlxx.bdcqzh" :rules="rules.ztQlxxrules">
+            <el-form-item
+              label="查封不动产权信息："
+              prop="ztQlxx.bdcqzh"
+              :rules="rules.ztQlxxrules">
               <select-table
                 v-model="ruleForm.ztQlxx"
                 :table-width="550"
@@ -157,7 +160,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="业务号：">
+            <el-form-item
+              label="业务号："
+              prop="qlxx.ywh"
+              :rules="rules.ywhrules">
               <el-input v-model="ruleForm.qlxx.ywh"></el-input>
             </el-form-item>
           </el-col>
@@ -447,7 +453,6 @@
         ],
         ableOperation: false,
         //传递参数\
-
         ssQlxxList: [],
         ztQlxxList: [],
         rules: {

@@ -792,6 +792,7 @@ export default {
                 message: "保存成功！",
                 type: "success",
               });
+              this.$parent.changeywh()
               this.$store.dispatch("user/refreshPage", true);
             } else {
               this.$message({

@@ -676,6 +676,7 @@ export default {
                 message: "保存成功！",
                 type: "success",
               });
+              this.$parent.changeywh()
               this.$store.dispatch("user/refreshPage", true);
             } else {
               this.$message({

@@ -560,7 +560,6 @@
           this.ssqlxxshow = true;
         }
       },
-
       /**
        * @description: loadData
        * @author: renchao
@@ -699,6 +698,7 @@
                   message: "保存成功！",
                   type: "success",
                 });
+                 this.$parent.changeywh()
                 this.$store.dispatch("user/refreshPage", true);
               } else {
                 this.$message({

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 10:03:05
+ * @LastEditTime: 2023-08-01 09:46:29
 -->
 <template>
   <!-- 受理信息 -->

@@ -719,6 +719,7 @@ export default {
             message: "保存成功！",
             type: "success",
           });
+          this.$parent.changeywh()
           this.$store.dispatch("user/refreshPage", true);
         } else {
           this.$message({

@@ -618,6 +618,7 @@ export default {
             message: "保存成功！",
             type: "success",
           });
+          this.$parent.changeywh()
           this.$store.dispatch("user/refreshPage", true);
         } else {
           this.$message({

@@ -616,6 +616,7 @@ export default {
                 message: "保存成功！",
                 type: "success",
               });
+                this.$parent.changeywh()
               this.$store.dispatch("user/refreshPage", true);
             } else {
               this.$message({

@@ -275,7 +275,7 @@ export default {
       height: 100%;
       line-height: 80px;
       border: 1px solid $borderColor;
-      text-align: center;
+      margin: auto;
       font-size: 22px;
       font-weight: 400;
     }

 <!--
  * @Description  :宗地基本信息
  * @Autor        : miaofang
- * @LastEditTime : 2023-05-24 15:08:51
+ * @LastEditTime : 2023-07-31 17:21:56
 -->
 <template>
   <div class="tableDivCss">
@@ -11,7 +11,7 @@
       </tr>
       <tr>
         <td>单位</td>
-        <td colspan="4">{{ zdjbxx.mjdw | dictionary('A7') }}</td>
+        <td colspan="4">{{ zdjbxx.mjdw | dictionary("A7") }}</td>
       </tr>
       <tr>
         <td>不动产类型</td>
@@ -25,10 +25,10 @@
         <td rowspan="8">土地状况</td>
       </tr>
       <tr>
-        <td style="width:15%">宗地面积</td>
-        <td style="width:30%">{{ zdjbxx.zdmj }}m²</td>
-        <td style="width:15%">用途</td>
-        <td style="width:30%">{{ zdjbxx.ghytmc }}</td>
+        <td style="width: 15%">宗地面积</td>
+        <td style="width: 30%">{{ zdjbxx.zdmj }}m²</td>
+        <td style="width: 15%">用途</td>
+        <td style="width: 30%">{{ zdjbxx.yt | dicyt("tdyt") }}</td>
       </tr>
       <tr>
         <td>等级</td>
@@ -44,7 +44,7 @@
       </tr>
       <tr>
         <td>权利设定方式</td>
-        <td>{{zdjbxx.qlsdfs | dictionary('A10')}}</td>
+        <td>{{ zdjbxx.qlsdfs | dictionary("A10") }}</td>
         <td>容积率</td>
         <td>{{ zdjbxx.rjl }}</td>
       </tr>
@@ -111,7 +111,6 @@
               <td class="bhqkTh">{{ item.label }}</td>
             </tr>
           </table> -->
-
       </tr>
 
       <tr v-if="showGroup">
@@ -126,90 +125,116 @@
         <td>{{ zdbhqks[0].djsj }}</td>
         <td>{{ zdbhqks[0].dbr }}</td>
       </tr> -->
-
     </table>
   </div>
 </template>
 
 <script>
-  import store from '@/store/index.js'
-  import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js";
+import store from "@/store/index.js";
+import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js";
 
-  export default {
-    data () {
-      return {
-        bhqkColumns: [
-          {
-            prop: "ssywh",
-            label: "上手业务号",
-          },
-          {
-            prop: "zddm",
-            label: "宗地代码",
-          },
-          {
-            prop: "bhqzddm",
-            label: "变化前宗地代码",
-          },
-          {
-            prop: "bhnr",
-            label: "变化内容",
-          },
-          {
-            prop: "bhyy",
-            label: "变化原因",
-          },
-          {
-            prop: "djsj",
-            label: "登记时间",
-          },
-          {
-            prop: "dbr",
-            label: "登簿人",
-          },
-          {
-            prop: "fj",
-            label: "附记",
-          },
-        ],
-        bhqkTableWidth: 745,
-        zdjbxx: {},
-        zdbhqks: [],
-        propsParam: this.$attrs,
-        showGroup: false,
-        bdclxList: ["", "宗地", "宗海", "自然幢", "多幢", "构筑物", "林权", "户"]
+export default {
+  data() {
+    return {
+      bhqkColumns: [
+        {
+          prop: "ssywh",
+          label: "上手业务号",
+        },
+        {
+          prop: "zddm",
+          label: "宗地代码",
+        },
+        {
+          prop: "bhqzddm",
+          label: "变化前宗地代码",
+        },
+        {
+          prop: "bhnr",
+          label: "变化内容",
+        },
+        {
+          prop: "bhyy",
+          label: "变化原因",
+        },
+        {
+          prop: "djsj",
+          label: "登记时间",
+        },
+        {
+          prop: "dbr",
+          label: "登簿人",
+        },
+        {
+          prop: "fj",
+          label: "附记",
+        },
+      ],
+      bhqkTableWidth: 745,
+      zdjbxx: {},
+      zdbhqks: [],
+      propsParam: this.$attrs,
+      showGroup: false,
+      bdclxList: ["", "宗地", "宗海", "自然幢", "多幢", "构筑物", "林权", "户"],
+      foundItemaa: {},
+      foundItemaaa: {},
+    };
+  },
+  filters: {
+    dictionary: function (value, param) {
+      const foundItem = store.getters.dictData[param].find(
+        (item) => item.dcode === String(value)
+      );
+      if (foundItem) {
+        return foundItem.dname;
       }
     },
-    filters: {
-      dictionary: function (value, param) {
-        const foundItem = store.getters.dictData[param].find(item => item.dcode === String(value))
-        if (foundItem) {
-          return foundItem.dname
+    dicyt: function (value, param) {
+      const res = store.getters.dictData[param].filter((item) => {
+        if (item.dcode === String(value)) {
+          return item;
+        } else {
+          if (item.children.length) {
+            const res2 = item.children.filter((items) => {
+              if (items.dcode === String(value)) {
+                return items;
+              }
+            });
+            if (res2.length) {
+              return res2;
+
+            }
+
+          }
         }
+      });
+      if (res[0]) {
+        return res[0].dname
       }
     },
-    created () {
-      this.loadData()
-    },
-    methods: {
-      /**
-       * @description: loadData
-       * @author: renchao
-       */
-      loadData () {
-        getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
-          if (res.code === 200) {
-            this.zdjbxx = res.result.zdjbxx;
-            this.zdbhqks = res.result.zdbhqkList;
-            if (this.zdbhqks != null && this.zdbhqks.length > 0) {
-              this.showGroup = true;
-            }
+  },
+  created() {
+    this.loadData();
+  },
+  methods: {
+    /**
+     * @description: loadData
+     * @author: renchao
+     */
+    loadData() {
+      getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
+        if (res.code === 200) {
+          this.zdjbxx = res.result.zdjbxx;
+          this.zdbhqks = res.result.zdbhqkList;
+          if (this.zdbhqks != null && this.zdbhqks.length > 0) {
+            this.showGroup = true;
           }
-        })
-      }
-    }
-  }
+        }
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/tablecss.scss";
+@import "~@/styles/tablecss.scss";
 </style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 13:59:45
+ * @LastEditTime: 2023-08-01 09:41:01
 -->
 <template>
   <div class="clxx">
@@ -68,6 +68,16 @@
     created () {
       this.clmlInitList(1)
     },
+    computed: {
+      ...mapGetters(['workFresh'])
+    },
+    watch: {
+      workFresh: {
+        handler (newVal, oldVal) {
+          if (newVal) this.clmlInitList(1)
+        }
+      }
+    },
     mounted () {
       this.ableOperation = this.$parent.ableOperation
     },
@@ -254,7 +264,8 @@
       viewDetail () {
         this.$popupDialog("查看明细", "workflow/components/dialog/clxxDetailDialog", {
           data: this.tableData,
-          unitData: this.$parent.unitData
+          unitData: this.$parent.unitData,
+          ableOperation: this.$parent.ableOperation
         }, "60%")
       },
       //设置tableData

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 14:27:07
+ * @LastEditTime: 2023-08-01 09:43:19
 -->
 <template>
   <div class="clmlmx-box">
@@ -10,6 +10,7 @@
     </lb-table>
     <div class="text-center">
       <el-button @click="$popupCacel">取消</el-button>
+      <el-button type="primary" @click="handleSubmit" v-if="formData.ableOperation">确定</el-button>
     </div>
   </div>
 </template>
@@ -58,16 +59,28 @@
           {
             prop: "sjmc",
             label: "材料名称",
+            render: (h, scope) => {
+              return (
+                <el-input value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
+              )
+            }
           },
           {
             prop: "sjlx",
             label: "材料类型",
-            width: "80",
+            width: "110",
             render: (h, scope) => {
               return (
-                <div>
-                  <span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
-                </div>
+                <el-select value={scope.row[scope.column.property]}
+                  onChange={(val) => { scope.row[scope.column.property] = val }}>
+                  {
+                    store.getters.dictData['A40'].map(option => {
+                      return (
+                        <el-option label={option.dname} value={option.dcode}></el-option>
+                      )
+                    })
+                  }
+                </el-select>
               )
             }
           },
@@ -127,7 +140,7 @@
           },
           {
             label: "操作",
-            width: "80",
+            width: "100",
             render: (h, scope) => {
               return (
                 <div>
@@ -149,10 +162,13 @@
                   >
                     下移
                   </el-button>
-                </div>
-              );
-            },
-          },
+                  <i v-show={scope.row.isrequired != '1' && formData.ableOperation} onClick={() => {
+                    this.handleDelete(scope.$index, scope.row);
+                  }} class="el-icon-delete pointer" style="color:#409EFF;margin-left:5px;position: relative;top: 1px;"></i>
+                </div >
+              )
+            }
+          }
         ],
         key: 0,
         tableData: []
@@ -168,6 +184,12 @@
       }
     },
     methods: {
+      handleSubmit () {
+        // saveClml(this.tableData).then(res => {
+        //   console.log(res, '11111111111111');
+        // })
+        //  store.dispatch('user/reWorkFresh', true)
+      },
       /**
        * @description: 材料目录明细初始化
        * @author: renchao
@@ -187,7 +209,6 @@
               } else {
                 this.tableData = []
               }
-              console.log(this.tableData, 'this.tableData');
             } else {
               this.$message.error(res.message)
             }
@@ -248,7 +269,6 @@
           }
         })
       },
-      // 材料目录删除
       /**
        * @description: 材料目录删除
        * @param {*} index
@@ -268,7 +288,7 @@
               if (res == 200) {
                 that.$message({
                   message: "删除成功",
-                  type: "success",
+                  type: "success"
                 })
               }
             }

@@ -73,9 +73,10 @@
        * @author: renchao
        */
       onSubmit () {
-        console.log(this.formData.bsmSlsq);
-        console.log(this.selectItem);
-        sendBackTask({
+        if(!this.outstepopinion){
+        this.$message.error("请填写退回意见");
+        }else{
+         sendBackTask({
           bsmSlsq: this.formData.bsmSlsq,
           backNodeList: [this.selectItem],
           message:this.outstepopinion
@@ -92,6 +93,7 @@
             this.$emit("input", false);
           }, 1000);
         });
+        }
       },
       /**
        * @description: changeSelectItem

@@ -35,7 +35,8 @@ export default {
       //批量按钮名称
       batchButtonName: '',
       // 受理申请信息
-      slsq: {}
+      slsq: {},
+      dqhj:""
     }
   },
   mounted () {
@@ -57,6 +58,9 @@ export default {
       stepExpandInfo(formdata).then((res) => {
         if (res.code === 200) {
           this.leftButtonList = res.result.button;
+          if (res.result.properties&&res.result.properties.length) {
+            this.dqhj = res.result.properties[0].value
+          }
           this.rightButtonList = res.result.operation;
           this.slsq = res.result.slsq
         }