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

@@ -5,4 +5,4 @@ NODE_ENV=development
 VUE_APP_BASE_API = '/bdcdj'
 
 # 开发环境
-VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018'
+VUE_APP_API_BASE_URL = 'http://192.168.2.95:8018'

@@ -12,6 +12,8 @@ export function addJtfcCxjgXx (data) {
   return request({
     url: '/sqcx/addJtfcCxjgXx',
     method: 'post',
-    data
+    data,
+    showLoading: true,
+    loadingTarget: '正在查询中...'
   })
 }
\ No newline at end of file

@@ -106,3 +106,21 @@ export function selectCfdj (data) {
         data
     })
 }
+/* 
+业务办理-业务申请-添加收藏业务
+*/
+export function addCollectBiz (bsmSqyw) {
+    return request({
+        url: '/ywbl/BusinessApply/addCollectBiz?bsmSqyw=' + bsmSqyw,
+        method: 'post'
+    })
+}
+/* 
+业务办理-业务申请-添加收藏业务
+*/
+export function deleteCollectBiz (bsmSqyw) {
+    return request({
+        url: '/ywbl/BusinessApply/deleteCollectBiz?bsmSqyw=' + bsmSqyw,
+        method: 'post'
+    })
+}
\ No newline at end of file

@@ -59,7 +59,7 @@ export default {
     },
     heightNum: {
       type: Number,
-      default: 285,
+      default: 260,
     },
     maxHeight: {
       type: Number,

@@ -2,9 +2,12 @@
   <transition name="fade" mode="out-in" v-if="isShow">
     <div class="ls-mask" v-loading="loading">
       <div class="ls-mask-window" :style="{'width':width,'height':height}">
-        <div :style="{'text-align':titleStyle}"><b>{{title}}</b></div>
-        <i class="el-icon-close" @click="onCancel"></i>
-        <div class="ls-mask-content">
+        <div class="ls-head">
+          <div class="ls-title" :style="{'text-align':titleStyle}"><b>{{title}}</b></div>
+          <i class="el-icon-close" @click="onCancel"></i>
+        </div>
+       
+        <div class="ls-mask-content" ref='contentRef' :style="{'height': contentHeight + 'px'}">
           <component :is="editItem" ref='childRef' @loading='loadingFn' :formData='formData' />
         </div>
         <div class="ls-mask-footer">
@@ -30,10 +33,12 @@ export default {
       editItem: "",
       titleStyle: 'center',
       width: "75%",
-      height: "500px",
+      height: "auto",
       formData: "",//父组件传递的参数 负责传给子组件
+      contentHeight:"",
     }
   },
+  
   props: {
     loading: { type: Boolean, default: false },
   },
@@ -42,6 +47,12 @@ export default {
       this.editItem = this.loadViewFn(this.editItem)
     },
   },
+  mounted(){
+  //  计算滚动条高度
+   setTimeout(() => {
+    this.contentHeight = this.$refs.contentRef.offsetHeight
+   }, 1000);
+  },
   methods: {
     onCancel () {
       this.isShow = false
@@ -82,36 +93,47 @@ export default {
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.3);
+
 }
 
 .ls-mask-window {
-  padding-top: 20px;
   background: white;
-  position: absolute;
+  position: relative;
   left: 50%;
   top: 50%;
+  min-height: 200px;
   transform: translate(-50%, -50%);
+  border-radius: 10px;
+}
+.ls-head{
+  position: relative;
 }
-
 .ls-mask-window b {
   padding-left: 12px;
 }
-
+.ls-title{
+  padding: 20px;
+  background: #1E9FFF;
+  color: #ffffff;
+}
 .ls-mask-content {
   padding: 20px;
   text-align: center;
+  position: absolute;
+  width: 100%;
+  overflow: scroll;
 }
 
 .ls-mask-footer {
-  height: 45px;
+  height: 65px;
   border-top: 1px solid #f0f0f0;
   display: flex;
-  justify-content: flex-end;
-  padding: 2px;
+  justify-content: center;
   position: absolute;
-  width: 98%;
-  bottom: 10px;
-  right: 12px;
+  width: 100%;
+  bottom: 0px;
+  right: 0px;
+  background: #f3f3f3;
 }
 
 /deep/.el-icon-close {
@@ -120,10 +142,14 @@ export default {
   right: 12px;
   font-size: 20px;
   cursor: pointer;
+  color: #ffffff;
 }
 
 /deep/.el-loading-mask {
   background: none;
 }
+/deep/.el-button{
+  margin: 15px 10px;
+}
 </style>
   
\ No newline at end of file

@@ -12,6 +12,10 @@ const service = axios.create({
     headers: {
         'Content-Type': 'application/json; charset=utf-8',
         'Authorization': 'bearer AT-16-oqkOHiUSsDdFA-eAZ49k2rJQDTzQpClO'
+        //token列表
+        //admin:bearer AT-16-oqkOHiUSsDdFA-eAZ49k2rJQDTzQpClO
+        //renc:bearer AT-30-KHB4LXc8-CZXwBEyaFJa9lRmMTc5sHVI
+        //tianh:bearer AT-33-3zFTGkhQ4eUv4nXvzAmbgN5RPZppzEY6
     },
     timeout: 15000
 })

@@ -17,7 +17,7 @@
     <div class="thumb-wrap">
       <div class="thumb-wrap-button">
         <el-button type="primary" @click="clickImage">（放大） 显示（缩小）</el-button>
-        <el-upload class="fileUpdate" action="" :show-file-list="false" multiple :limit="5" :auto-upload="false"
+        <el-upload class="fileUpdate" action="" :show-file-list="false" multiple :auto-upload="false"
           :on-change="handleChange" accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload">
           <el-button icon="el-icon-upload" type="primary">上传</el-button>
         </el-upload>

@@ -16,7 +16,8 @@ export default {
         sqrxm: '',
         sqrzjlxbm: '',
         sqrzjhm: '',
-        lxdh: ''
+        lxdh: '',
+        inputErr: false
       }]
     }
   },
@@ -91,8 +92,16 @@ export default {
             label: '联系电话',
             render: (h, scope) => {
               return (
-                <el-input placeholder="联系电话" value={scope.row[scope.column.property]}
-                  onInput={(val) => { scope.row[scope.column.property] = val }} type='tel' maxlength='11'></el-input>
+                <div class='typePhone'>
+                  <el-input placeholder="联系电话" value={scope.row[scope.column.property]}
+                    onInput={(val) => { scope.row[scope.column.property] = val }}
+                    onBlur={(val) => { this.teltest(scope.row) }}
+                    type='tel' maxlength='11'
+                  ></el-input>
+                  <span v-show={scope.row.inputErr} style={{
+                    fontSize: '12px', color: 'red', position: 'absolute', bottom: '-2px', left: '0'
+                  }}>请输入正确手机号</span>
+                </div>
               )
             }
           }
@@ -114,6 +123,7 @@ export default {
     dataList: {
       handler (newValue, oldName) {
         this.tableData.data = _.cloneDeep(newValue)
+        console.log(this.tableData.data, 'this.tableData.datathis.tableData.data');
       },
       deep: true,
       immediate: true
@@ -125,14 +135,29 @@ export default {
         sqrxm: '',
         sqrzjlxbm: '',
         sqrzjhm: '',
-        lxdh: ''
+        lxdh: '',
+        inputErr: false
       })
     },
     handleMinus (index, row) {
       this.tableData.data.splice(index, 1)
     },
-  },
+    teltest (row) {
+      const reg = /^1([38]\d|5[0-35-9]|7[3678])\d{8}$/;
+      if (row.lxdh == '' || row.lxdh.length <= 10 || !reg.test(row.lxdh)) {
+        row.inputErr = true
+        return false
+
+      } else {
+        row.inputErr = false
+        return true
+      }
+    }
+  }
 }
 </script>
 <style scoped lang='scss'>
+/deep/.el-table__cell {
+  padding: 12px 0;
+}
 </style>
\ No newline at end of file

@@ -4,19 +4,19 @@
       <div class="jtfccx-edit-con">
         <b class="title">申请信息</b>
         <personInfoTable @getInfoList="handleGetSqList" :dataList="sqdataList" />
-        <el-form :model="ruleForm" label-width="100px">
+        <el-form :model="ruleForm" label-width="120px">
           <el-row>
-            <el-col :span="12">
-              <el-form-item label="活动名称" prop="name">
-                <el-input v-model="ruleForm.name"></el-input>
+            <el-col :span="8">
+              <el-form-item label="查询用途" label-width="90px">
+                <el-input v-model="ruleForm.cxyt"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="活动名称" prop="name">
-                <el-radio-group v-model="ruleForm.radio">
+            <el-col :span="16">
+              <el-form-item label="与产权人的关系">
+                <el-radio-group v-model="ruleForm.ycyrgx">
                   <el-radio :label="1">房屋权利人</el-radio>
-                  <el-radio :label="2">委托人</el-radio>
-                  <el-radio :label="3">产权利害关系人</el-radio>
+                  <el-radio :label="2">产权利害关系人</el-radio>
+                  <el-radio :label="3">委托人</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -36,7 +36,8 @@
       </div>
 
       <div class="submit-button" style="padding-bottom:20px">
-        <el-button type="primary">打印（1）</el-button>
+        <el-button type="primary">无房证明打印（1）</el-button>
+        <el-button type="primary">房产结果打印（1）</el-button>
         <el-button @click="closeDialog">关闭</el-button>
       </div>
     </div>
@@ -56,11 +57,16 @@ export default {
   data () {
     return {
       myValue: this.value,
+      ruleForm: {
+        cxyt: '',
+        ycyrgx: 1
+      },
       dataList: [{
         sqrxm: '',
         sqrzjlxbm: '',
         sqrzjhm: '',
-        lxdh: ''
+        lxdh: '',
+        inputErr: false
       }],
       sqdataList: [],
       qldataList: [],
@@ -135,11 +141,8 @@ export default {
         ],
         data: []
       },
-      ruleForm: {
-        name: '',
-        radio: 1
-      },
       addJtfc: {
+        djSqcxDO: {},
         sqxx: [],
         qlrxx: [],
       }
@@ -153,7 +156,7 @@ export default {
       this.addJtfc.sqxx = _.cloneDeep(this.dataList)
       this.addJtfc.qlrxx = _.cloneDeep(this.dataList)
     },
-    'ruleForm.radio' (val) {
+    'ruleForm.ycyrgx' (val) {
       if (val != 1) {
         this.qldataList = _.cloneDeep(this.dataList)
         this.addJtfc.qlrxx = _.cloneDeep(this.dataList)
@@ -168,20 +171,21 @@ export default {
       this.$emit('input', false)
     },
     handleGetSqList (val) {
-      if (!_.isEqual(val, this.dataList) && this.ruleForm.radio == 1) {
+      if (!_.isEqual(val, this.dataList) && this.ruleForm.ycyrgx == 1) {
         this.qldataList = val
         this.addJtfc.qlrxx = val
       } else
         this.addJtfc.sqxx = val
     },
     handleGetQlList (val) {
-      if (this.ruleForm.radio != 1) {
+      if (this.ruleForm.ycyrgx != 1) {
         this.addJtfc.qlrxx = val
       }
     },
     handleSearch () {
+      this.addJtfc.djSqcxDO = { ...this.ruleForm }
       addJtfcCxjgXx(this.addJtfc).then(res => {
-        // console.log(res);
+        console.log(res);
       })
     },
     handleReset () {

@@ -16,25 +16,9 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
-            <el-form-item label="查询用途">
-              <el-select v-model="queryForm.cxyt" class="width100" filterable clearable placeholder="请选择用途">
-                <el-option v-for="item in cxytOption" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item label="业务号">
-              <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width200px">
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="btnCol">
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
-            </el-form-item>
+          <el-col :span="14" class="btnCol">
+            <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button>
+            <el-button type="primary" @click="handleAdd" icon="el-icon-plus">新增</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -46,28 +30,29 @@
         :data="tableData.data">
       </lb-table>
     </div>
+    <editDialog v-model="isDialog" />
   </div>
 </template>
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./jtfcdata";
 import { getJtfcPage } from "@/api/sqcx";
+import editDialog from "../components/editDialog.vue"
 export default {
   name: "jtfc",
-  components: {},
+  components: { editDialog },
   mixins: [table],
   mounted () {
     sendThis(this);
   },
   data () {
     return {
+      isDialog: false,
       sqrOption: [],
       cxytOption: [],
       queryForm: {
         cxbh: "",
-        sqr: "",
-        cxyt: "",
-        ywh: "",
+        sqr: ""
       },
       tableData: {
         total: 0,
@@ -92,15 +77,18 @@ export default {
     fetchData () {
       getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         let { records, total } = res.result;
-        // this.tableData.data = records
+        this.tableData.data = records
         this.tableData.total = total;
       });
     },
     handleSort (name, sort) {
       console.log(name, sort);
     },
-  },
-};
+    handleAdd () {
+      this.isDialog = true
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";

@@ -13,7 +13,14 @@ class data extends filter {
       {
         label: '序号',
         type: 'index',
-        width: '50'
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
       },
       {
         prop: "cxlx",

@@ -51,7 +51,7 @@
   </div>
 </template>
 <script>
-import editDialog from "./components/editDialog.vue"
+import editDialog from "../components/editDialog.vue"
 import table from "@/utils/mixin/table"
 import { datas, sendThis } from "./sqcxjldata"
 import { getJtfcPage } from '@/api/sqcx'

@@ -29,7 +29,7 @@
             </el-collapse-transition>
           </div>
         </div>
-        <image-preview :previewImg="previewImg" @updateList="updateList" />
+        <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" />
       </div>
     </div>
     <clxxAddDialog v-model="isDialog" />
@@ -233,7 +233,8 @@ export default {
       })
     },
     updateList (val) {
-      this.tableData.forEach(item => {
+      if(val!=null){ //删除最后一张图片时 val=null
+        this.tableData.forEach(item => {
         if (item.bsmSj === val.bsmSj) {
           item.children = val.children
         }
@@ -242,6 +243,15 @@ export default {
       if (this.previewImg.index == this.previewImg.imgList.length) {
         this.previewImg.index = this.previewImg.index - 1
       }
+      }else{
+        this.previewImg.imgList = []
+        this.tableData.forEach(item => {
+          if(this.treeCheckId == item.bsmSj){
+             item.children = []
+          }
+      })
+      }
+     
     },
     // 左侧菜单点击
     menuClick (item) {

+<!--
+  功能：流程图
+  作者：calliope
+-->
+<template>
+  <div class='flowChart'>
+    <img :src="formData" alt="">
+  </div>
+</template>
+<script>
+
+export default {
+  props: {
+    formData: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+@import "~@/styles/mixin.scss";
+
+.flowChart {
+  margin: 20px 0;
+}
+</style>
\ No newline at end of file

 <template>
   <div class="from-clues">
-    <!-- 表单部分 -->
+    <!-- 发证信息 -->
     <div class="from-clues-header">
       <el-form :model="ruleForm">
         <el-row :gutter="20">
@@ -36,14 +36,12 @@
 <script>
 import table from "@/utils/mixin/table";
 import { getCertificateList } from "@/api/fqsq.js";
-import { datas } from "./fzxxdata";
+import { datas } from "../javascript/fzxxdata";
 export default {
   mixins: [table],
   components: {},
   props: {
-
   },
-
   data () {
     return {
       ruleForm: {
@@ -56,8 +54,8 @@ export default {
         total: 0,
         columns: datas.columns(),
         data: [],
-      },
-    };
+      }
+    }
   },
   methods: {
     // 列表渲染接口
@@ -68,9 +66,9 @@ export default {
           this.tableData.data = res.result
         }
       })
-    },
+    }
   }
-};
+}
 </script>
 <style scoped lang='scss'>
 @import "~@/styles/public.scss";

@@ -101,15 +101,12 @@ export default {
           this.$message.error(res.message)
         }
       })
-
-    },
-
-  },
+    }
+  }
 }
 </script>
 <style scoped lang='scss'>
 @import '~@/styles/mixin.scss';
-
 .spyj {
   margin-left: 5px;
 

 <template>
-  <dialogBox title="退回" @submitForm="submitForm"  saveButton="确认退回" width="80%" 
-     @closeDialog="closeDialog" v-model="value">
+  <dialogBox title="退回" @submitForm="submitForm" saveButton="确认退回" width="80%" @closeDialog="closeDialog"
+    v-model="value">
     <div class="from-clues">
       <!-- 表单部分 -->
       <div class="from-clues-header">
         <el-form ref="queryForm" label-width="120px">
-        <div>
-          <!-- <el-form-item label="不动产单元号:">
-            <p>{{item.bdcdyh}}</p>
-          </el-form-item> -->
-          <lb-table :column="columns" border  :heightNum="390"  :pagination="false" heightNumSetting
-          :data="tableData">
-        </lb-table>
-        <el-form-item label="退回意见:">
-          <el-input class="textArea" type="textarea" v-model="outstepopinion"></el-input>
-        </el-form-item>
-        </div>
+          <div>
+            <lb-table :column="columns" border :heightNum="390" :pagination="false" heightNumSetting :data="tableData">
+            </lb-table>
+            <el-form-item label="退回意见:">
+              <el-input class="textArea" type="textarea" v-model="outstepopinion"></el-input>
+            </el-form-item>
+          </div>
         </el-form>
       </div>
     </div>
@@ -23,33 +19,27 @@
 </template>
 
 <script>
-   import { getTaskBackNode,sendBackTask } from "@/api/fqsq.js"
+import { getTaskBackNode, sendBackTask } from "@/api/fqsq.js"
 export default {
   components: {
   },
   props: {
     value: { type: Boolean, default: false },
-    queryForm:{type:Object},
-    taskId:{type:String},
-    bsmBusiness:{type:String}
+    queryForm: { type: Object },
+    taskId: { type: String },
+    bsmBusiness: { type: String }
   },
   data () {
-    const columns=[
-      // {
-      //   label: '',
-      //   align: 'center',
-      //   render: (h, scope) => {
-      //     return   <el-radio label={scope.row.taskid} v-model={this.radioVal} >{''}</el-radio>
-      //   }
-      // },
+    const columns = [
       {
         label: "",
         width: "36px",
         render: (h, scope) => {
           return (
             <div class="orgColumn">
-              <el-radio v-model={this.radioVal} label={scope.row.taskid}  onChange={() => {this.radioClick(scope.row);
-                    }}>
+              <el-radio v-model={this.radioVal} label={scope.row.taskid} onChange={() => {
+                this.radioClick(scope.row);
+              }}>
                 {" "}
                 &ensp;
               </el-radio>
@@ -65,62 +55,61 @@ export default {
         prop: "assignee",
         label: "办理人",
       },
-     
     ];
     return {
-    columns,
-    radioVal:"",
-    outstepopinion:"",
-    tableData:[],
-    list:{
-      bsmSlsq:"",
-      backNodeList:[],
-    },
-    sumbitList:{},
-    activityId:"",
+      columns,
+      radioVal: "",
+      outstepopinion: "",
+      tableData: [],
+      list: {
+        bsmSlsq: "",
+        backNodeList: [],
+      },
+      sumbitList: {},
+      activityId: "",
     }
   },
-  mounted(){
-    if(this.$route.query.bsmSlsq){
-        this.list.bsmSlsq = this.$route.query.bsmSlsq
+  mounted () {
+    if (this.$route.query.bsmSlsq) {
+      this.list.bsmSlsq = this.$route.query.bsmSlsq
     }
   },
   methods: {
-    tablelistFn(){
-      getTaskBackNode({bsmBusiness:this.bsmBusiness}).then(res => {
+    tablelistFn () {
+      getTaskBackNode({ bsmBusiness: this.bsmBusiness }).then(res => {
         if (res.code === 200) {
-            this.tableData = res.result 
+          this.tableData = res.result
         }
       })
     },
-    radioClick(scope){
+    radioClick (scope) {
       this.activityId = scope.activityId
       this.sumbitList = scope
-    
+
     },
     submitForm () {
-      if(this.activityId==undefined){
+      if (this.activityId == undefined) {
         this.$message.error('请至少选择一条数据');
         return
       }
       this.list.backNodeList.push({
-          id:this.taskId,
-          taskid:this.activityId,
-          processInstanceId:this.sumbitList.processInstanceId,
-          bsmBusiness:this.bsmBusiness,
-          outstepopinion:this.outstepopinion
-        })
+        id: this.taskId,
+        taskid: this.activityId,
+        processInstanceId: this.sumbitList.processInstanceId,
+        bsmBusiness: this.bsmBusiness,
+        outstepopinion: this.outstepopinion
+      })
       sendBackTask(this.list).then(res => {
         if (res.code === 200) {
           this.$message.success('退回成功')
           setTimeout(() => {
             window.opener = null;
-          window.open("about:blank", "_self");
-          window.close();
-           this.$emit('input', false)
+            window.open("about:blank", "_self");
+            window.close();
+            this.$emit('input', false)
           }, 1000);
-         
-        }else{
+
+        } else {
           this.$message.error(res.message)
         }
       })
@@ -128,12 +117,13 @@ export default {
     closeDialog () {
       this.$emit("input", false);
     },
-  
+
   }
 }
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
+
 .textArea {
   /deep/.el-textarea__inner {
     min-height: 90px !important;

@@ -28,7 +28,7 @@
 <script>
 import table from "@/utils/mixin/table";
 import { getCertificateList, issueCertificate } from "@/api/fqsq.js";
-import { datas } from "./fzxxdata";
+import { datas } from "../javascript/fzxxdata";
 import { mapGetters } from 'vuex'
 export default {
   mixins: [table],

@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import { datas } from "./zsyl.js";
+import { datas } from "../javascript/zsyl.js";
 import { readYsxlh,certificate } from "@/api/fqsq.js"
 export default {
   components: {

@@ -3,10 +3,10 @@ export function getForm (tabName) {
     let form;
     switch (tabName) {
         case "slxx":
-            form = require("@/views/workflow/components/slxx.vue");
+            form = require("@/views/ywbl/jsydsyq/slxx.vue");
             break;
         case "slxxCfdj":
-            form = require("@/views/workflow/components/slxxCfdj.vue");
+            form = require("@/views/ywbl/cfdj/slxx.vue");
             break;
         case "clxx":
             form = require("@/views/workflow/components/clxx.vue");

 import filter from '@/utils/filter.js'
-
 class data extends filter {
   constructor() {
     super()

@@ -56,9 +56,6 @@
         </div>
       </div>
     </div>
-    <dialogBox title="流程图" width="70%" isMain v-model="myValue" :isFullscreen="false" :isButton="false">
-      <img :src="imgSrc" style="margin: 20px 0" />
-    </dialogBox>
   </div>
 </template>
 
@@ -82,7 +79,6 @@ export default {
     return {
       // 流程图
       imgSrc: '',
-      myValue: false,
       // 折叠
       isShowdrawer: true,
       // 默认选中
@@ -149,18 +145,24 @@ export default {
     },
     //流程环节操作按钮
     operation (index, item) {
+      //按钮 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书
+      //操作按钮 登簿：record  转件：transfer  退回：back  退出：signout
       let that = this;
       switch (item.value) {
         case "B1":
           getWorkFlowImage(this.bsmSlsq).then(res => {
             this.imgSrc = URL.createObjectURL(res)
-            this.myValue = true
+            this.$popup({
+              title: '流程图',
+              editItem: 'workflow/components/flowChart',
+              formData: this.imgSrc
+            })
           })
           break;
-        case "zsyl":
+        case "B5":
           this.zsylFlag = true;
           break;
-        case "clfp": //材料分屏按钮
+        case "B2": //材料分屏按钮
           this.splitScreen = this.splitScreen ? false : true;
           this.$store.dispatch('app/settScreen', this.splitScreen)
           if (this.splitScreen) {
@@ -174,9 +176,9 @@ export default {
             this.tabList.splice(this.clxxIndex, 1, this.clxxTab);
           }
           break;
-        case "th": //退回按钮
+        case "back": //退回按钮
           break;
-        case "zc": //转件按钮
+        case "transfer": //转件按钮       
           getNextLinkInfo({
             bsmSlsq: this.bsmSlsq,
             bestepid: this.bestepid,
@@ -186,10 +188,10 @@ export default {
             }
           });
           break;
-        case "tc":
+        case "signout":
           window.close();
           break;
-        case "db":
+        case "record":
           var formdata = new FormData();
           formdata.append("bsmSlsq", this.bsmSlsq);
           formdata.append("bestepid", this.bestepid);
@@ -256,6 +258,7 @@ export default {
             completeTask({
               bsmSlsq: this.bsmSlsq,
               shyj: "this.bestepid",
+              stepform: JSON.stringify(this.tabList)
             }).then((res) => {
               if (res.code === 200) {
                 instance.confirmButtonLoading = false;

@@ -129,7 +129,7 @@
   </div>
 </template>
 <script>
-import InformationTable from "./InformationTable";
+import InformationTable from "@/views/workflow/components/InformationTable";
 import { Init, fristReg } from "@/api/cfdjFlow.js";
 import { mapGetters } from "vuex";
 export default {

+<template>
+  <!-- 受理信息 -->
+  <div class="slxx">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
+      label-width="120px">
+      <div class="slxx_con">
+        <div class="slxx_title">受理信息</div>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：" prop="ywh">
+              <el-input disabled v-model="ruleForm.ywh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="受理人员：" prop="slry">
+              <el-input disabled v-model="ruleForm.slry"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="受理时间：" prop="slsj">
+              <el-input disabled v-model="ruleForm.slsj"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：" prop="qllx">
+              <el-select disabled v-model="ruleForm.qllx" filterable clearable placeholder="请选择权利类型">
+                <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型：" prop="djlx">
+              <el-select disabled v-model="ruleForm.djlx" filterable clearable placeholder="请选择登记类型">
+                <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：" prop="djqx">
+              <el-input disabled v-model="ruleForm.djqxmc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="slxx_title">不动产单元情况</div>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地代码：" prop="zddm">
+              <el-input disabled v-model="ruleForm.zddm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：" prop="bdcdyh">
+              <el-input disabled v-model="ruleForm.bdcdyh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质：" prop="qlxzmc">
+              <el-input disabled v-model="ruleForm.qlxzmc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="自然幢号：" prop="zrzh">
+              <el-input disabled v-model="ruleForm.zdmj"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="户不动产单元号：" prop="hbdcdyh">
+              <el-input disabled v-model="ruleForm.ghytmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="登记状态：" prop="djzt">
+              <el-select disabled v-model="ruleForm.djzt" filterable clearable>
+                <el-option v-for="item in djztList" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="图幅丘幢号：" prop="tfqzh">
+              <el-input disabled v-model="ruleForm.tfqzh"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="16">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落：" prop="zl">
+              <el-input disabled v-model="ruleForm.zl"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="房屋用途：">
+              <el-input disabled v-model="ruleForm.fwyt"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="房屋性质：">
+              <el-input disabled v-model="ruleForm.fwxz"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="房屋结构：">
+              <el-input disabled v-model="ruleForm.fwjg"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="slxx_title">权利人信息</div>
+        <el-row :gutter="10">
+          <el-col :span="14">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
+              <el-radio-group v-model="ruleForm.gyfs">
+                <el-radio label="1">单独所有</el-radio>
+                <el-radio label="2">共同共有</el-radio>
+                <el-radio label="3">按份所有</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5" v-show="ruleForm.gyfs == '2'">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
+              <el-radio-group v-model="ruleForm.sffbcz">
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5" v-show="ruleForm.gyfs == '2'">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="持证人：">
+              <el-select v-model="ruleForm.czr" placeholder="持证人">
+                <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <InformationTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" />
+        <div class="slxx_title">登记原因{{flag}}</div>
+        <el-row :gutter="10">
+          <el-col>
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
+              <el-input class="textArea" type="textarea" v-model="ruleForm.djyy"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <el-row class="btn">
+        <el-form-item :class="flag ? 'marginBot0' : ''">
+          <el-button type="primary" @click="onSubmit">保存</el-button>
+        </el-form-item>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+<script>
+import InformationTable from "@/views/workflow/components/InformationTable";
+import { Init, fristReg } from "@/api/jsydsyqFlow.js";
+import { mapGetters } from "vuex";
+export default {
+  async created () {
+    this.propsParam = this.$attrs;
+    var formdata = new FormData();
+    formdata.append("bsmSldy", this.propsParam.bsmSldy);
+    Init(formdata).then((res) => {
+      if (res.code === 200 && res.result) {
+        this.ruleForm = {
+          ...res.result,
+          ...res.result.zdjbxxdatas,
+          ...res.result.qlxxdatas,
+          ...res.result.jsydsyqdatas,
+        };
+      }
+    });
+  },
+  components: { InformationTable },
+  computed: {
+    ...mapGetters(["dictData", "flag"]),
+  },
+  data () {
+    return {
+      disabled: true,
+      tdytOption: [],
+      czrOptions: [],
+      ruleForm: {
+        ywh: "",
+        slry: "",
+        slsj: "",
+        qllx: "",
+        djlx: "",
+        djqx: "",
+        // 宗地代码
+        zddm: "",
+        bdcdyh: "",
+        qlxzmc: "",
+        qlrxx: [],
+        // 自然幢号
+        zrzh: "",
+        // 户不动产单元号
+        hbdcdyh: '',
+        djzt: '',
+        // 图幅丘幢号
+        tfqzh: '',
+        zl: '',
+        // 房屋用途
+        fwyt: '',
+        fwxz: '',
+        fwjg: '',
+        // 权利人信息
+        gyfs: "1",
+        // 是否分别持证
+        sffbcz: "",
+        // 持证人
+        czr: "",
+        djyy: ''
+      },
+      //传递参数
+      propsParam: {},
+      rules: {},
+    };
+  },
+  methods: {
+    list (bsmSldy) {
+      var formdata = new FormData();
+      formdata.append("bsmSldy", bsmSldy);
+      Init(formdata).then((res) => {
+        if (res.code === 200 && res.result) {
+          this.ruleForm = {
+            ...res.result,
+            ...res.result.zdjbxxdatas,
+            ...res.result.qlxxdatas,
+            ...res.result.jsydsyqdatas,
+          };
+        }
+      });
+    },
+    onSubmit () {
+      fristReg(this.ruleForm).then((res) => {
+        if (res.code === 200 && res.result) {
+          console.log(res);
+          //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped lang='scss'>
+@import "~@/styles/public.scss";
+
+/deep/.el-form {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 130px);
+  background-color: aqua;
+}
+
+/deep/.el-form-item__label {
+  padding: 0;
+}
+
+/deep/.el-radio {
+  margin-right: 10px;
+}
+
+/deep/.el-select {
+  width: 100%;
+}
+
+/deep/.el-form-item {
+  margin-bottom: 8px;
+}
+
+.marginBot0 {
+  margin-bottom: 0 !important;
+}
+
+.slxx {
+  box-sizing: border-box;
+}
+
+.slxx_con {
+  flex: 1;
+  height: 100%;
+  background-color: #ffffff;
+  overflow-y: auto;
+  padding-right: 3px;
+  overflow-x: hidden;
+}
+
+.submit_btn {
+  height: 50px;
+}
+
+.slxx_title {
+  border-bottom: 1px solid $borderColor;
+  padding-left: 10px;
+  padding-bottom: 5px;
+  margin-bottom: 10px;
+  margin-top: 5px;
+  font-size: 16px;
+  font-weight: 500;
+  color: #4a4a4a;
+}
+
+.btn {
+  text-align: center;
+  padding-top: 10px;
+  height: 36px;
+  background-color: #ffffff;
+  padding: 5px 0;
+}
+
+.textArea {
+  /deep/.el-textarea__inner {
+    min-height: 90px !important;
+  }
+}
+
+/deep/.el-form-item__label {
+  padding-bottom: 0px;
+}
+</style>
\ No newline at end of file

 <template>
+  <!-- 受理信息 -->
   <div class="slxx">
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
       label-width="120px">
@@ -162,12 +163,11 @@
   </div>
 </template>
 <script>
-import InformationTable from "./InformationTable";
+import InformationTable from "@/views/workflow/components/InformationTable";
 import { Init, fristReg } from "@/api/jsydsyqFlow.js";
 import { mapGetters } from "vuex";
 export default {
   async created () {
-    //var bsmSldy = this.$parent._data.unitData[0].bsmSldy;
     this.propsParam = this.$attrs;
     var formdata = new FormData();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);

@@ -106,7 +106,7 @@ export default {
     fetchData () {
       if (this.bsmSqyw) {
         this.queryForm.sqywbm = this.djywbm;
-
+        console.log(this.queryForm, this.bsmSqyw);
         selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => {
           if (res.code === 200) {
             let { total, records } = res.result;

@@ -9,6 +9,8 @@ export function queueDjywmc (djywbm) {
         case "A03200":
         case "A03300":
         case "A03400":
+            vm = "jsydsyq200";
+            break;
         case "A04100":
             vm = "houseOwnership";
             break;

@@ -23,8 +23,9 @@
             <p>
               {{ item.nodename }}
             </p>
-            <p v-if="item.sffqlc == 1" :class="item.select ? 'active' : ''" @click.stop="handleCollection(item)">
-              <i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i>
+            <p v-if="item.sffqlc == 1" :class="item.userCollect==1 ? 'active' : ''"
+              @click.stop="handleCollection(item)">
+              <i class="el-icon-star-off" :class="item.userCollect==1 ? 'active' : ''"></i>
             </p>
           </li>
         </ul>
@@ -38,8 +39,9 @@
               <p>
                 {{ item.nodename }}
               </p>
-              <p v-if="item.sffqlc == 1" :class="item.select ? 'active' : ''" @click="handleCollection(item)">
-                <i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i>
+              <p v-if="item.sffqlc == 1" :class="item.userCollect==1 ? 'active' : ''"
+                @click.stop="handleCollection(item)">
+                <i class="el-icon-star-off" :class="item.userCollect==1 ? 'active' : ''"></i>
               </p>
             </li>
           </ul>
@@ -52,8 +54,8 @@
               <p>
                 {{ item.nodename }}
               </p>
-              <p :class="item.select ? 'active' : ''" @click.stop="handleCollection(item)">
-                <i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i>
+              <p :class="item.userCollect==1 ? 'active' : ''" @click.stop="handleCollection(item)">
+                <i class="el-icon-star-off" :class="item.userCollect==1 ? 'active' : ''"></i>
               </p>
             </li>
           </ul>
@@ -67,7 +69,7 @@
   </div>
 </template>
 <script>
-import { getCollectBiz, getleftMenu, getNextNode } from "@/api/ywbl"
+import { getCollectBiz, getleftMenu, getNextNode, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
 import fqsqDialog from "./slectBdc.vue"
 export default {
   data () {
@@ -88,8 +90,7 @@ export default {
       djqxObj: {
         djqxbm: "",
         djqxmc: "",
-      },
-
+      }
     }
   },
   components: {
@@ -161,7 +162,28 @@ export default {
       })
     },
     handleCollection (item) {
-      item.select = !item.select
+      let that = this
+      if (item.userCollect == '2') {
+        addCollectBiz(item.bsmSqyw).then(res => {
+          if (res.code == 200) {
+            item.userCollect = '1'
+            that.$message({
+              message: '收藏成功！',
+              type: 'success'
+            })
+          }
+        })
+      } else {
+        deleteCollectBiz(item.bsmSqyw).then(res => {
+          if (res.code == 200) {
+            item.userCollect = '2'
+            that.$message({
+              message: '取消收藏成功！',
+              type: 'success'
+            })
+          }
+        })
+      }
     },
     handleSelect (item) {
       this.busList.forEach(item => {