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>
+        <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 class="ls-mask-content">
+        </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

@@ -16,7 +16,8 @@ export default {
         sqrxm: '',
         sqrzjlxbm: '',
         sqrzjhm: '',
-        lxdh: ''
+        lxdh: '',
+        inputErr: false
       }]
     }
   },
@@ -91,8 +92,16 @@ export default {
             label: '联系电话',
             render: (h, scope) => {
               return (
+                <div class='typePhone'>
                   <el-input placeholder="联系电话" value={scope.row[scope.column.property]}
-                  onInput={(val) => { scope.row[scope.column.property] = val }} type='tel' maxlength='11'></el-input>
+                    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-col :span="14" class="btnCol">
             <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
-            </el-form-item>
+            <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'

+<!--
+  功能：流程图
+  作者：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

@@ -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,
       // 默认选中
@@ -156,7 +152,11 @@ export default {
         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 "B5":

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