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

@@ -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,

@@ -4,8 +4,10 @@
  * @LastEditTime: 2023-07-28 15:45:21
  */
 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;

@@ -47,7 +47,11 @@
         </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"
@@ -165,7 +169,11 @@
             </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>
@@ -182,9 +190,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-             <el-form-item label="是否被续封："
+            <el-form-item
+              label="是否被续封："
               prop="cfdj.sfbxf"
-              :rules="rules.sfbxfrules">
+              :rules="rules.sfbxfrules"
+            >
               <el-select v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
                 <el-option
                   v-for="item in sfbxflist"
@@ -478,7 +488,10 @@ export default {
         djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
-         sfbxfrules: [{ required: true, message: "是否被续封", trigger: "change" }],
+        ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
+        sfbxfrules: [
+          { required: true, message: "是否被续封", trigger: "change" },
+        ],
       },
     };
   },
@@ -620,6 +633,7 @@ export default {
                 message: "保存成功！",
                 type: "success",
               });
+              this.$parent.changeywh()
               this.$store.dispatch("user/refreshPage", true);
             } else {
               this.$message({

@@ -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({

@@ -561,7 +561,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({

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

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

@@ -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;
     }

@@ -262,13 +262,9 @@ export default {
     getFromRouter(tabname) {
       this.componentTag = getForm(tabname);
     },
-    // closefp () {
-    //   this.splitScreen = this.splitScreen ? false : true;
-    //   this.$store.dispatch("app/set1tScreen", this.splitScreen);
-    //   this.getFromRouter(this.tabList[0].value);
-    //   this.clxxForm = getForm(this.tabList[1].value);
-    //   this.tabName = this.tabList[0].value
-    // },
+    changeywh () {
+      this.$refs.Menu.getleftMenubl("change");
+    },
     // 增加补录记录
     /**
      * @description: 增加补录记录

 <!--
  * @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,17 +125,16 @@
         <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 () {
+export default {
+  data() {
     return {
       bhqkColumns: [
         {
@@ -177,26 +175,53 @@
       zdbhqks: [],
       propsParam: this.$attrs,
       showGroup: false,
-        bdclxList: ["", "宗地", "宗海", "自然幢", "多幢", "构筑物", "林权", "户"]
-      }
+      bdclxList: ["", "宗地", "宗海", "自然幢", "多幢", "构筑物", "林权", "户"],
+      foundItemaa: {},
+      foundItemaaa: {},
+    };
   },
   filters: {
     dictionary: function (value, param) {
-        const foundItem = store.getters.dictData[param].find(item => item.dcode === String(value))
+      const foundItem = store.getters.dictData[param].find(
+        (item) => item.dcode === String(value)
+      );
       if (foundItem) {
-          return foundItem.dname
+        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()
+  },
+  created() {
+    this.loadData();
   },
   methods: {
     /**
      * @description: loadData
      * @author: renchao
      */
-      loadData () {
+    loadData() {
       getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
         if (res.code === 200) {
           this.zdjbxx = res.result.zdjbxx;
@@ -205,11 +230,11 @@
             this.showGroup = true;
           }
         }
-        })
-      }
-    }
-  }
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/tablecss.scss";
+@import "~@/styles/tablecss.scss";
 </style>

 <!--
- * @Description: 功能：审批意见
+ * @Description: 审批意见
  * @Autor: renchao
- * @LastEditTime: 2023-07-20 09:52:48
+ * @LastEditTime: 2023-05-17 10:41:24
 -->
 <template>
-  <div class='spyj loadingtext'>
+  <div class="spyj loadingtext">
     <div class="box">
-      <b class="spyj_title">审批表</b>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
-        <div class="spyj_form" v-for="(item, index) in tableData" :key="index">
+      <div class="spyj_title">
+        <div class="righttitle">审批表</div>
+      </div>
+
+      <div v-for="(item, index) in tableData" :key="index">
+        <el-form
+          :model="tableData[index]"
+          label-width="120px"
+          ref="ruleFormRef'"
+        >
+          <div class="spyj_form">
             <div class="item_left">
-            {{ item.jdmc }}意见
+              <div class="right">{{ jdmc }}意见</div>
             </div>
             <div class="item_right">
               <el-row>
                 <el-col :span="24">
-                <el-form-item label-width="0" class="opinion_item" prop="shyj">
-                  <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入审批意见"
-                    v-if="item.stepShjy == '1' && ableOperation" v-model="ruleForm.shyj"></el-input>
-                  <el-input type="textarea" :rows="4" class="opinion" v-model="item.shyj" v-else :disabled="true">
-                  </el-input>
-                  <el-button class="opinion_btn" @click="commonOpinion"
-                    v-if="item.stepShjy == '1' && ableOperation">常用意见</el-button>
+                  <el-form-item label-width="0" class="opinion_item">
+                    <el-input
+                      :disabled="!ableOperation"
+                      type="textarea"
+                      :rows="4"
+                      class="opinion"
+                      placeholder="请输入审批意见"
+                      v-model="item.shyj"
+                    ></el-input>
+                    <el-button
+                      class="opinion_btn"
+                      @click="commonOpinion(index)"
+                      v-if="ableOperation"
+                      >常用意见</el-button
+                    >
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="16">
-                <el-form-item label="审查人" prop="shryxm">
-                  {{ item.shryxm }}
+                  <el-form-item label="审查人">
+                    <el-input
+                      :disabled="!ableOperation"
+                      v-model="item.shryxm"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                <el-form-item label="审核时间" prop="shjssj" :key="refresh">
-                  {{ item.shjssj }}
+                  <el-form-item class="sjxzq" label="审核时间">
+                    <el-date-picker
+                      :disabled="!ableOperation"
+                      v-model="item.shjssj"
+                      type="date"
+                      placeholder="选择日期"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      format="yyyy-MM-dd"
+                    >
+                    </el-date-picker>
                   </el-form-item>
                 </el-col>
               </el-row>
             </div>
           </div>
+        </el-form>
+      </div>
       <div class="submit_button" v-if="ableOperation">
-          <el-button type="primary" @click="onSubmit">保存</el-button>
+        <el-button type="primary" @click="onSubmit()">保存</el-button>
       </div>
-      </el-form>
     </div>
-    <el-empty v-if="isNoData" description="暂无数据"></el-empty>
+    <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
   </div>
 </template>
 <script>
-  import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/opinion.js";
-  import { mapGetters } from 'vuex'
-  export default {
+import { saveSpyjBySlsq, getSpyjList } from "@/api/opinion.js";
+import { mapGetters } from "vuex";
+export default {
   computed: {
-      ...mapGetters(['userData', 'yjsqOptions'])
+    ...mapGetters(["userData", "yjsqOptions", "userInfo"]),
   },
-    data () {
+  data() {
     return {
       isNoData: false,
-        bsmSlsq: '',
-        //刷新值
-        refresh: 10,
-        ableOperation: true,
+      currentindex: 0,
+      bsmSlsq: "",
+      ableOperation: false,
       bsmSlsq: this.$route.query.bsmSlsq,
       bestepid: this.$route.query.bestepid,
-        ruleForm: {},
-        rules: {
-          shyj: [
-            { required: true, message: '请输入审批意见', trigger: 'blur' }
-          ],
-        },
+      propsParam: {},
       tableData: [],
-        propsParam: {}
-      }
+      falg: false,
+      falg1: false,
+      jdmc: "",
+      indexdqlc: 0,
+    };
   },
+
   watch: {
     yjsqOptions: {
-        handler (val) {
-          this.ruleForm.shyj = val
+      handler(val) {
+        console.log("val", val);
+        this.add(val);
       },
       deep: true,
-        immediate: true
+      immediate: true,
     },
   },
-    mounted () {
-      this.ableOperation = this.$parent.currentSelectTab.ableOperation
-      this.list();
+  created() {},
+  mounted() {
+    this.propsParam = this.$attrs;
+    console.log("this.$parent.dqhj", this.$parent.dqhj);
+    this.ableOperation = this.$parent.currentSelectTab.ableOperation;
+    // this.ableOperation = this.$parent.ableOperation;
+    this.getShList();
+
+    switch (this.$parent.dqhj) {
+      case "cs":
+        this.indexdqlc = 0;
+        this.jdmc = "初审";
+        break;
+      case "fs":
+        this.indexdqlc = 1;
+        this.jdmc = "复审";
+        break;
+      case "hd":
+        this.indexdqlc = 2;
+        this.jdmc = "核定";
+        break;
+    }
   },
   methods: {
-      //审批意见数据初始化
     /**
-       * @description: 审批意见数据初始化
+     * @description: getShList
+     * @param {*} obj
      * @author: renchao
      */
-      list () {
-        let that = this
-        this.$startLoading()
+    getShList() {
+      let that = this;
+      this.$startLoading();
+      console.log(this.userInfo);
       var formdata = new FormData();
-        formdata.append("bsmBusiness", this.propsParam.bsmBusiness);
+     formdata.append("bsmBusiness",this.$parent.bsmSlsq);
       formdata.append("bestepid", this.$route.query.bestepid);
+
       getSpyjList(formdata).then((res) => {
-          this.$endLoading()
+        this.$endLoading();
         if (res.code === 200 && res.result) {
-            this.tableData = res.result ? res.result : []
-            if (res.result.length == 0) {
-              that.isNoData = true
+          this.tableData = res.result;
+          if (this.tableData.length == 0) {
+            this.tableData.push({ jdmc: "初审" });
           }
-            this.ruleForm = res.result[res.result.length - 1]
+          console.log("this.tableData", this.tableData);
         }
-        })
+      });
     },
     /**
+     * @description: judgment
+     * @param {*} obj
+     * @author: renchao
+     */
+    judgment(obj) {},
+    /**
      * @description: onSubmit
      * @author: renchao
      */
-      onSubmit () {
-        this.ruleForm.bsmSlsq = this.bsmSlsq
-        this.ruleForm.bestepid = this.bestepid
-        saveSpyjBySlsq(this.ruleForm).then(res => {
+    onSubmit() {
+      this.tableData.forEach((item, index) => {
+        item["bsmSlsq"] = this.$parent.bsmSlsq;
+        item["bestepid"] = this.$parent.bestepid;
+        item["shryxm"] = this.userInfo.name;
+        item["userid"] = this.userInfo.id;
+        item["jddm"] = this.$parent.dqhj;
+        item["jdmc"] = this.jdmc;
+        item["shjssj"] = item.shkssj;
+        item["czjg"] = "1";
+        item["stepid"] = "1";
+
+      });
+      console.log("this.tableData", this.tableData);
+      saveSpyjBySlsq(this.tableData).then((res) => {
         if (res.code === 200) {
-            this.$message.success("保存成功")
-            this.refresh += 1
+          this.$message.success("保存成功");
+          this.refresh += 1;
         } else {
-            this.$message.error(res.message)
+          this.$message.error(res.message);
         }
-        })
+      });
+      // } else {
+      //   return false;
+      // }
     },
     //打开常用意见列表弹窗
     /**
      * @description: 打开常用意见列表弹窗
+     * @param {*} index
      * @author: renchao
      */
-      commonOpinion () {
-        this.$popupDialog("常用意见", "workflow/components/dialog/commonOpinion", {}, "70%", true)
+    commonOpinion(index) {
+      this.currentindex = index;
+      this.$popupDialog(
+        "常用意见",
+        "workflow/components/dialog/commonOpinion",
+        {},
+        "70%",
+        true
+      );
     },
-      //使用常用意见
     /**
-       * @description: 使用常用意见
+     * @description: add
+     * @param {*} val
      * @author: renchao
      */
-      useOpinion (opinion) {
-        this.ruleForm.shyj = opinion
-      }
-    }
+    add(val) {
+      if (val != "") {
+        this.$set(this.tableData[this.currentindex], "shyj", val);
       }
+    },
+  },
+};
 </script>
-<style scoped lang='scss'>
-  @import "~@/styles/mixin.scss";
+<style scoped lang="scss">
+@import "~@/styles/mixin.scss";
 
-  .spyj {
+.spyj {
   width: 100%;
   height: 100%;
   background-color: #f5f5f5;
@@ -162,16 +240,31 @@
     overflow-y: scroll;
     padding-top: 20px;
     padding: 20px 40px;
-    }
     .spyj_title {
-      line-height: 68px;
+      width: 100%;
+      height: 80px;
       border: 1px solid $borderColor;
-      text-align: center;
+      background-color: #eceef2;
+      display: flex;
+    }
+    .leftadd {
+      width: 3%;
+      height: 100%;
+      display: flex;
+      font-size: 14px;
+      text-indent: 20px;
+      align-items: center;
+      border: 1px solid $borderColor;
+    }
+    .righttitle {
+      width: 80%;
+      height: 100%;
+      line-height: 80px;
+      border: 1px solid $borderColor;
+      margin: auto;
       font-size: 22px;
       font-weight: 400;
-      background-color: #eceef2;
-      display: block;
-      border-bottom: none;
+    }
   }
 
   /deep/.el-form-item {
@@ -192,7 +285,7 @@
       color: #606266;
       display: flex;
       font-size: 14px;
-        text-indent: 80px;
+      text-indent: 50px;
       align-items: center;
       border-right: 1px solid $borderColor;
     }
@@ -207,14 +300,12 @@
       /deep/.el-form-item__content {
         display: block;
         text-align: left;
-          text-indent: 10px;
       }
       .opinion_item {
         /deep/.el-form-item__error {
           margin-top: -16px !important;
           left: 3px;
         }
-
         border-bottom: 1px solid $borderColor;
       }
 
@@ -239,5 +330,9 @@
     text-align: center;
     margin: 15px 0;
   }
+
+  .el-date-editor.el-input {
+    width: 100%;
   }
+}
 </style>

@@ -73,8 +73,9 @@
        * @author: renchao
        */
       onSubmit () {
-        console.log(this.formData.bsmSlsq);
-        console.log(this.selectItem);
+        if(!this.outstepopinion){
+        this.$message.error("请填写退回意见");
+        }else{
          sendBackTask({
           bsmSlsq: this.formData.bsmSlsq,
           backNodeList: [this.selectItem],
@@ -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
         }