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

@@ -162,3 +162,19 @@ export function selectOtherH (data) {
         data
         data
     })
     })
 }
 }
+
+// 认领任务
+export function claimTask (bsmSlsq,bestepid) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/business/workFlow/claimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
+        method: 'get',
+    })
+}
+
+// 取消认领任务
+export function unClaimTask (bsmSlsq,bestepid) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/business/workFlow/unClaimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
+        method: 'get',
+    })
+}
\ No newline at end of file

@@ -39,7 +39,7 @@
         }
         }
 
 
         .xxTable {
         .xxTable {
-            border-spacing: 1px;
+            //border-spacing: 1px;
             width: 100%;
             width: 100%;
 
 
             tr>th {
             tr>th {

@@ -81,7 +81,7 @@ import {
   getStepFormInfo,
   getStepFormInfo,
 } from "@/api/fqsq.js";
 } from "@/api/fqsq.js";
 import { mapGetters } from "vuex"
 import { mapGetters } from "vuex"
-import { deleteFlow } from "@/api/ywbl.js";
+import { deleteFlow,unClaimTask} from "@/api/ywbl.js";
 import ProcessViewer from './components/processViewer.vue'
 import ProcessViewer from './components/processViewer.vue'
 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js";
 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js";
 import { getForm } from "./flowform.js";
 import { getForm } from "./flowform.js";
@@ -132,16 +132,36 @@ export default {
       clxxIndex: "",
       clxxIndex: "",
       //材料信息选项卡对象
       //材料信息选项卡对象
       clxxTab: {},
       clxxTab: {},
+      //页面监听时间
+      _beforeUnload_time: "",
     };
     };
   },
   },
   mounted () {
   mounted () {
     this.loadBdcdylist();
     this.loadBdcdylist();
     this.flowInitParam();
     this.flowInitParam();
+    //添加页面监听事件
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
   },
   },
   computed: {
   computed: {
     ...mapGetters(["oldDetail", "newDetail"])
     ...mapGetters(["oldDetail", "newDetail"])
   },
   },
   methods: {
   methods: {
+    beforeunloadHandler() {
+    	this._beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+        this._gap_time = new Date().getTime() - this._beforeUnload_time
+        //判断是窗口关闭还是刷新
+        if (this._gap_time <= 5) {
+            //取消认领
+            unClaimTask(this.bsmSlsq,this.bestepid)
+        }
+    },  
     changeLoadIndex () {
     changeLoadIndex () {
       this.loadIndex++
       this.loadIndex++
     },
     },
@@ -367,6 +387,8 @@ export default {
           break;
           break;
         case "signout":
         case "signout":
           window.close();
           window.close();
+          //取消认领
+          unClaimTask(this.bsmSlsq,this.bestepid)
           break;
           break;
         case "B9":
         case "B9":
           var formdata = new FormData();
           var formdata = new FormData();

@@ -70,7 +70,7 @@ import searchBox from '../components/search.vue'
 import table from "@/utils/mixin/table"
 import table from "@/utils/mixin/table"
 import searchMin from "../components/mixin/index"
 import searchMin from "../components/mixin/index"
 import { datas, sendThis } from "./dbxdata"
 import { datas, sendThis } from "./dbxdata"
-import { searchTaskToDo, deleteFlow } from "@/api/ywbl.js"
+import { searchTaskToDo, deleteFlow ,claimTask} from "@/api/ywbl.js"
 export default {
 export default {
   name: "dbx",
   name: "dbx",
   components: { searchBox },
   components: { searchBox },
@@ -174,6 +174,9 @@ export default {
     ywhClick (item) {
     ywhClick (item) {
       const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
       const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
       window.open(href, '_blank');
       window.open(href, '_blank');
+
+      //从待办箱进入的调取任务领取接口
+      claimTask(item.bsmSlsq,item.bestepid)
     }
     }
   }
   }
 }
 }

@@ -140,6 +140,15 @@
               </el-radio-group>
               </el-radio-group>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
+          <el-col :span="5">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="发证方式：">
+              <el-radio-group v-model="ruleForm.slywxx.fzfs">
+                <el-radio label="1">小证</el-radio>
+                <el-radio label="2">大证</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
           <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
               <el-radio-group v-model="ruleForm.slywxx.sffbcz">
               <el-radio-group v-model="ruleForm.slywxx.sffbcz">
@@ -195,9 +204,7 @@ export default {
       if (res.code === 200 && res.result) {
       if (res.code === 200 && res.result) {
         this.ruleForm = {
         this.ruleForm = {
           ...res.result,
           ...res.result,
-          ...res.result.zdjbxxdatas,
           ...res.result.qlxxdatas,
           ...res.result.qlxxdatas,
-          ...res.result.jsydsyqdatas,
         }
         }
       }
       }
     });
     });
@@ -231,8 +238,18 @@ export default {
     },
     },
     onSubmit () {
     onSubmit () {
       saveBatchData(this.ruleForm).then((res) => {
       saveBatchData(this.ruleForm).then((res) => {
-        if (res.code === 200 && res.result) {
-          console.log(res);
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
         }
         }
       });
       });
     },
     },

@@ -249,10 +249,18 @@ export default {
     },
     },
     onSubmit () {
     onSubmit () {
       saveData(this.ruleForm).then((res) => {
       saveData(this.ruleForm).then((res) => {
-        console.log(this.ruleForm);
-        if (res.code === 200 && res.result) {
-          console.log(res);
-          //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
         }
         }
       });
       });
     },
     },

@@ -253,24 +253,12 @@ export default {
   },
   },
   methods: {
   methods: {
     onClick(){
     onClick(){
-      this.$popup({
-        titleStyle: "left",
-        title: "登记簿详情", // 弹窗标题
-        editItem: "ywbl/fdcq2/slxxCompareDetai", // 弹窗内容
+      this.$popup("房屋信息比对","ywbl/fdcq2/slxxCompareDetai",
+         {
          formData: {
          formData: {
            bsmSldy: this.propsParam.bsmSldy,
            bsmSldy: this.propsParam.bsmSldy,
            qllx: this.propsParam.qllx
            qllx: this.propsParam.qllx
-        },
-        width: "1220px",
-        height: "790px",
-        // cancelText: '取消摆烂', // 右边按钮文本
-        // confirmText: '确定点击', //左边按钮文本
-        cancel: () => {
-          console.log("取消回调");
-        },
-        confirm: () => {
-          console.log("确认回调");
-        },
+         }
       });
       });
     },
     },
     // 更新权利人信息
     // 更新权利人信息
@@ -284,9 +272,18 @@ export default {
 
 
     onSubmit () {
     onSubmit () {
       saveGZBatchData(this.ruleForm).then((res) => {
       saveGZBatchData(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 }
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
         }
         }
       });
       });
     },
     },

@@ -266,9 +266,18 @@ export default {
     },
     },
     onSubmit () {
     onSubmit () {
       saveLogoutData(this.ruleForm).then((res) => {
       saveLogoutData(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 }
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
         }
         }
       });
       });
     },
     },

@@ -228,26 +228,20 @@ export default {
     upDateYwrxxList (val) {
     upDateYwrxxList (val) {
       this.ruleForm.ywrList = _.cloneDeep(val);
       this.ruleForm.ywrList = _.cloneDeep(val);
     },
     },
-    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 () {
     onSubmit () {
       saveBHZData(this.ruleForm).then((res) => {
       saveBHZData(this.ruleForm).then((res) => {
-        console.log(this.ruleForm);
-        if (res.code === 200 && res.result) {
-          console.log(res);
-          //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
         }
         }
       });
       });
     },
     },

@@ -44,6 +44,7 @@
 <script>
 <script>
 import {getFdcqLSInfo} from "@/api/registerBook.js";
 import {getFdcqLSInfo} from "@/api/registerBook.js";
 import { datas } from "@/views/registerBook/qlxxFormData.js";
 import { datas } from "@/views/registerBook/qlxxFormData.js";
+
 export default {
 export default {
   data() {
   data() {
     return {
     return {
@@ -73,7 +74,6 @@ export default {
   },
   },
   methods: {
   methods: {
     loadData() {
     loadData() {
-      console.log(this.propsParam.formData);
       var formdata = new FormData();
       var formdata = new FormData();
       formdata.append("bsmSldy", this.propsParam.formData.bsmSldy);
       formdata.append("bsmSldy", this.propsParam.formData.bsmSldy);
       formdata.append("qllx", this.propsParam.formData.qllx);
       formdata.append("qllx", this.propsParam.formData.qllx);

@@ -83,7 +83,7 @@
         <el-row :gutter="10">
         <el-row :gutter="10">
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="取得价格：">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="取得价格：">
-              <el-input disabled v-model="ruleForm.jsydsyq.qdjg"></el-input>
+              <!-- <el-input disabled v-model="ruleForm.jsydsyq.qdjg"></el-input> -->
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
 
 
@@ -187,6 +187,9 @@ export default {
           djyy: this.ruleForm.djyy
           djyy: this.ruleForm.djyy
         })
         })
       }
       }
+      else{
+        this.$message(res.message);
+      }
     })
     })
   },
   },
   components: { InformationTable },
   components: { InformationTable },

@@ -7,19 +7,46 @@
       </el-tabs>
       </el-tabs>
       <el-form :model="queryForm" ref="queryForm" label-width="110px">
       <el-form :model="queryForm" ref="queryForm" label-width="110px">
         <el-row>
         <el-row>
-          <el-col :span="6">
-            <el-form-item label="不动产单元号">
-              <el-input placeholder="不动产单元号" v-model="queryForm.bdcdyh" clearable>
+          <el-col :span="7">
+            <el-form-item label="宗地代码">
+              <el-input placeholder="宗地代码" v-model="queryForm.zddm" clearable>
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="坐落">
-              <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable>
+           <el-col :span="7">
+            <el-form-item label="土地证号">
+              <el-input placeholder="土地证号" v-model="queryForm.bdcqzh" clearable>
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="12" class="btnColRight">
+           <el-col :span="7">
+            <el-form-item label="土地坐落">
+              <el-input placeholder="土地坐落" v-model="queryForm.zl" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="自然幢号">
+              <el-input placeholder="自然幢号" v-model="queryForm.zrzh" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+           <el-col :span="7">
+            <el-form-item label="项目名称">
+              <el-input v-model="queryForm.xmmc"></el-input>
+            </el-form-item>
+          </el-col>         
+           <el-col :span="7">
+            <el-form-item label="建筑物名称">
+              <el-input placeholder="建筑物名称" v-model="queryForm.jzwmc" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+         
+          <el-col :span="3" class="btnColRight">
             <el-form-item>
             <el-form-item>
               <el-button type="primary" @click="fetchData()">查询</el-button>
               <el-button type="primary" @click="fetchData()">查询</el-button>
             </el-form-item>
             </el-form-item>

@@ -49,7 +49,7 @@ class data extends filter {
         }
         }
       },
       },
       {
       {
-        prop: "bdcqzsh",
+        prop: "tdzh",
         label: "土地证号",
         label: "土地证号",
       },
       },
       {
       {
@@ -73,7 +73,7 @@ class data extends filter {
         render: (h, scope) => {
         render: (h, scope) => {
           return (
           return (
             <div>
             <div>
-              {(scope.row.tdxzmc) + (' / ') + (scope.row.tdxzmc)}
+              {(scope.row.showQlxz) + (' / ') + (scope.row.fwxzbsm)}
             </div>
             </div>
           )
           )
         }
         }
@@ -89,8 +89,14 @@ class data extends filter {
         }
         }
       },
       },
       {        
       {        
-        prop: "jzwjbyt",
         label: "用途",
         label: "用途",
+        render: (h, scope) => {
+          return (
+            <div>
+              {(scope.row.showTdyt) + (' / ') + (scope.row.showFwyt)}
+            </div>
+          )
+        }
       },
       },
       {
       {
         prop: "zcs",
         prop: "zcs",

@@ -66,7 +66,7 @@
         <el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button>
         <el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button>
       </div>
       </div>
     </div>
     </div>
-    <fqsqDialog v-model="isDialog"  :djywbm="djywbm" />
+    <fqsqDialog v-model="isDialog" :djywbm="djywbm"/>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>