--no commit message

@@ -13,7 +13,8 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      label-width="145px">
+      label-width="145px"
+    >
       <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           补录信息
@@ -66,7 +67,12 @@
           <el-col :span="8">
             <el-form-item label="登记类型：">
               <el-select v-model="ruleForm.qlxx.djlx">
-                <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                <el-option
+                  v-for="item in djlxlist"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -125,7 +131,12 @@
             </el-form-item> -->
             <el-form-item label="抵押不动产类型：">
               <el-select v-model="ruleForm.qlxx.djlx">
-                <el-option v-for="item in dictData['A27']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                <el-option
+                  v-for="item in dictData['A27']"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -158,7 +169,12 @@
           <el-col :span="8">
             <el-form-item label="是否预告登记：">
               <el-select v-model="ruleForm.qlxx.djlx">
-                <el-option v-for="item in dictData['A6']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                <el-option
+                  v-for="item in dictData['A6']"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -175,40 +191,64 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="抵押面积：">
-              <div style="display:flex">
-                <el-input v-model="ruleForm.diyaq.dymj" style="width:500%"
-                  oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
+              <div style="display: flex">
+                <el-input
+                  v-model="ruleForm.diyaq.dymj"
+                  style="width: 500%"
+                  oninput="value=value.replace(/[^\d.]/g,'')"
+                ></el-input>
                 <el-select v-model="ruleForm.diyaq.mjdw">
-                  <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  <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>
           <el-col :span="8">
             <el-form-item label="最高债权额">
-              <div style="display:flex">
-                <el-input v-model="ruleForm.diyaq.zgzqse" style="width:500%"
-                  oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
+              <div style="display: flex">
+                <el-input
+                  v-model="ruleForm.diyaq.zgzqse"
+                  style="width: 500%"
+                  oninput="value=value.replace(/[^\d.]/g,'')"
+                ></el-input>
                 <el-select v-model="ruleForm.diyaq.jedw">
-                  <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  <el-option
+                    v-for="item in dictData['A57']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode"
+                  >
                   </el-option>
                 </el-select>
               </div>
             </el-form-item>
-           </el-col >
+          </el-col>
           <el-col :span="8">
             <el-form-item label="被担保主债权数额">
-              <div style="display:flex">
-                <el-input v-model="ruleForm.diyaq.bdbzzqse" style="width:500%"
-                  oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
+              <div style="display: flex">
+                <el-input
+                  v-model="ruleForm.diyaq.bdbzzqse"
+                  style="width: 500%"
+                  oninput="value=value.replace(/[^\d.]/g,'')"
+                ></el-input>
                 <el-select v-model="ruleForm.diyaq.jedw">
-                  <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  <el-option
+                    v-for="item in dictData['A57']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode"
+                  >
                   </el-option>
                 </el-select>
               </div>
             </el-form-item>
-           </el-col >
+          </el-col>
           <el-col :span="8">
             <el-form-item label="币种">
               <el-input v-model="ruleForm.qlxx.djsj"></el-input>
@@ -312,8 +352,7 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="共有方式：">
-              <el-radio-group
-                v-model="ruleForm.qlxx.gyqk">
+              <el-radio-group v-model="ruleForm.qlxx.gyqk">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -326,7 +365,8 @@
           :tableData="ruleForm.qlrData"
           @upDateQlrxxList="upDateQlrxxList"
           :key="key"
-          :gyfs="ruleForm.qlxx.gyfs" />
+          :gyfs="ruleForm.qlxx.gyfs"
+        />
 
         <div>
           <div class="slxx_title title-block">
@@ -337,7 +377,8 @@
             v-if="ruleForm.ywrData"
             :tableData="ruleForm.ywrData"
             :key="key"
-            @upDateQlrxxList="upDateYwrxxList" />
+            @upDateQlrxxList="upDateYwrxxList"
+          />
         </div>
       </div>
       <el-row class="btn">
@@ -350,13 +391,13 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import { init,save } from "@/api/djbbl.js";
+import { init, save } from "@/api/djbbl.js";
 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
 
 import tdytTable from "@/views/workflow/components/tdytTable";
 export default {
-  components: { qlrCommonTable,ywrCommonTable,tdytTable },
+  components: { qlrCommonTable, ywrCommonTable, tdytTable },
   computed: {
     ...mapGetters(["dictData", "flag"]),
   },
@@ -371,6 +412,7 @@ export default {
       ruleForm: {},
       //传递参数\
       rules: {},
+      // 权属状态
       qsztlist: [
         {
           dcode: "1",
@@ -381,6 +423,35 @@ export default {
           dname: "历史",
         },
       ],
+
+      // 登记类型
+      djlxlist: [
+        {
+          dcode: "100",
+          dname: "首次登记",
+        },
+        {
+          dcode: "200",
+          dname: "转移登记",
+        },
+        {
+          dcode: "300",
+          dname: "变更登记",
+        },
+        {
+          dcode: "500",
+          dname: "更正登记",
+        },
+
+        {
+          dcode: "901",
+          dname: "补证",
+        },
+        {
+          dcode: "902",
+          dname: "换证",
+        },
+      ],
     };
   },
   created() {
@@ -389,26 +460,26 @@ export default {
   mounted() {},
   methods: {
     loadData() {
-        console.log("预告登记",this.propsParam);
+      console.log("预告登记", this.propsParam);
       init(this.propsParam.bsmRepair).then((res) => {
         if (res.code == 200) {
           this.ruleForm = res.result;
-          console.log("this.ruleForm",this.ruleForm);
+          console.log("this.ruleForm", this.ruleForm);
           this.isShow = true;
         }
       });
     },
     // 更新土地用途信息
     upDateTdytxxList(val) {
-      console.log("VAL",val);
+      console.log("VAL", val);
       this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
       this.key++;
     },
     // 更新权利人信息
     upDateQlrxxList(val) {
-      console.log("val",val);
+      console.log("val", val);
       this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-      console.log("this.ruleForm.qlrData",this.ruleForm.qlrData);
+      console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
       this.czrOptions = this.ruleForm.qlrData;
       this.key++;
     },
@@ -418,7 +489,7 @@ export default {
       this.key++;
     },
     onSubmit() {
-      console.log("this.ruleForm大信息",this.ruleForm);
+      console.log("this.ruleForm大信息", this.ruleForm);
       if (this.ruleForm.qlrData.length == 0) {
         this.$message({
           showClose: true,

@@ -59,16 +59,16 @@
         <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
         <el-table-column label="流程状态" header-align="center" align="center">
           <template slot-scope="scope">
-            <div v-if="scope.row.finishTime == null">正在办理</div>
-            <div v-else>已完结</div>
+            <div v-if="scope.row.endTime">已完结</div>
+            <div v-else>正在办理</div>
           </template>
         </el-table-column>
         <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
         <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
-        <el-table-column label="处理时间" prop="createTime" width="160" align="center" />
-        <el-table-column label="办结时间" prop="finishTime" width="160" align="center" />
-        <el-table-column label="操作方式" align="center">
-        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="160" align="center" />
+        <el-table-column label="办结时间" prop="endTime" width="160" align="center" />
+        <el-table-column label="操作方式" prop="businessName" align="center"/>
+        <el-table-column label="意见" prop="idea" align="center"/>
       </el-table>
     </div>
   </div>
@@ -237,13 +237,31 @@
        // 获取流程记录
       getCommentList() {
         this.formData.allCommentList.forEach(async (item,index) => {
+          item.comments.forEach(element => {
+            if(element.type=="COMPLETE"){
+              this.formData.allCommentList[index].idea=element.message
+            }
+          });
             this.formData.allCommentList[index].agent=item.assignee.name
         })
-        setTimeout(() => {
-           this.taskList =this.formData.allCommentList;
+        this.formData.handlinglist.forEach(async (item,index) => {
+          if(item.assignee.name){
+            this.formData.handlinglist[index].agent=item.assignee.name
+          }else{
+            let str=""
+            item.countersign.forEach((item) => {
+               str+=item.name+","
+            })
+            str=str.slice(0, -1);
+            this.formData.allCommentList[index].agent=str
+          }
+
+        })
+           this.taskList =[...this.formData.allCommentList,...this.formData.handlinglist];
+          //  this.taskList =this.formData.allCommentList;
           //  处理数据之后赋值
             this.taskCommentList=this.taskList
-        }, 100)
+
       },
 
       // 设置流程图元素状态

@@ -76,6 +76,7 @@ export default {
                 rejectedTaskSet: {},
                 finishedSequenceFlowSet: result.finishedSequenceFlowIds
               },
+              handlinglist:result.runningTasks,
               allCommentList: result.finishedTasks
             }, '80%', true)
           })