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

@@ -42,3 +42,30 @@ export function Init (data) {
         data
     })
 }
+
+// 材料目录明细初始化
+export function clmlInit (data) {
+    return request({
+        url: '/zhcx/clml/Init',
+        method: 'post',
+        data
+    })
+}
+
+// 材料目录明细移动
+export function move (data) {
+    return request({
+        url: '/zhcx/clml/move',
+        method: 'post',
+        data
+    })
+}
+
+// 材料目录明细保存
+export function save (data) {
+    return request({
+        url: '/zhcx/clml/save',
+        method: 'post',
+        data
+    })
+}

@@ -64,3 +64,23 @@ export function startBusinessFlow (data) {
         data
     })
 }
+/* 
+已办箱列表查询接口
+*/
+export function searchTaskDone (data) {
+    return request({
+        url: '/workBox/search/searchTaskDone',
+        method: 'post',
+        data
+    })
+}
+/* 
+业务办理-选择权利信息-根据条件进行列表查询
+*/
+export function selectQlxx (data) {
+    return request({
+        url: '/ywbl/ywsq/selectQlxx',
+        method: 'post',
+        data
+    })
+}

@@ -53,12 +53,12 @@ class data extends filter {
         width:'220'
       },
       {
-        prop: "qlr",
+        prop: "qlrmc",
         label: "权利人",
         width:'70'
       },
       {
-        prop: "ywr",
+        prop: "ywrmc",
         label: "义务人",
         width:'70'
       },

@@ -77,16 +77,23 @@
         </div>
       </div>
     </div>
-    <clxxAddDialog v-model="isDialog"/>
+    <clxxAddDialog v-model="isDialog" />
   </div>
 </template>
 <script>
-import clxxAddDialog from "./clxxAddDialog.vue"
+import clxxAddDialog from "./clxxAddDialog.vue";
+import { upward, down } from "@/utils/operation";
+import { clmlInit, move, save } from "@/api/fqsq.js";
+
 export default {
-  components: {clxxAddDialog},
+  components: { clxxAddDialog },
+  props: {
+    id: "",
+    unitData: Array,
+  },
   data() {
     return {
-      isDialog:false,
+      isDialog: false,
       menuList: [
         {
           id: "1",
@@ -184,7 +191,9 @@ export default {
           },
         },
       ],
-      tableData: [
+      key: 0,
+      tableData: [],
+      tableData1: [
         {
           sfbx: "必选",
           clmc: "不动产登记申请书",
@@ -284,13 +293,58 @@ export default {
       iclass: "itemIcon el-icon-caret-bottom",
     };
   },
+  watch: {
+    unitData: {
+      handler(newName, oldName) {
+        if (newName && newName.length > 0) {
+          this.clmlmxInit();
+        }
+      },
+      immediate: true,
+    },
+  },
   methods: {
     // 左侧菜单点击
     menuClick(item) {
       this.checkedId = item.id;
     },
     // 添加材料目录
-    handleAdd() {},
+    handleAdd() {
+      this.isDialog = true;
+    },
+    // 上移
+    moveUpward(index, row) {
+      upward(index, this.tableData);
+    },
+    // 下移
+    moveDown(index, row) {
+      down(index, this.tableData);
+    },
+    // 材料目录明细初始化
+    clmlmxInit() {
+      var formdata = new FormData();
+      formdata.append("bsmSldy", this.unitData[0].bsmSldy);
+      formdata.append("bsmSlsq", this.id);
+      clmlInit(formdata).then((res) => {
+        if (res.result.result) {
+          this.tableData = res.result.result;
+        }
+      });
+    },
+    // 新增弹窗保存
+    addSave(data){
+      let obj = [...this.tableData];
+      obj.push({
+        bsmSlsq:this.id,
+        xh: this.tableData.length + 1,
+        isrequired:'0',
+        sjmc:data.clmc,
+        sjlx:data.cllx
+      })
+      save(obj).then(res => {
+        console.log('22222',res);
+      })
+    },
     // 材料目录关闭收起
     iconClick() {
       this.menuOpen = !this.menuOpen;

 <template>
-  <dialogBox title="新建材料信息" width="60%">
-
+  <dialogBox
+    title="新建材料信息"
+    width="40%"
+    v-model="myValue"
+    :isButton="false"
+  >
+    <el-form :model="ruleForm" ref="ruleForm" label-width="120px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="材料类型">
+            <el-input v-model="ruleForm.cllx"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="材料名称">
+            <el-input v-model="ruleForm.clmc"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div class="submit-button" style="padding-bottom: 20px">
+      <el-button type="primary" @click="onSave">保存</el-button>
+      <el-button @click="closeDialog">取消</el-button>
+    </div>
   </dialogBox>
 </template>
 
 <script>
+
 export default {
   props: {
-
+    value: { type: Boolean, default: false },
   },
-
-  data () {
-    return {}
+  data() {
+    return {
+      myValue: this.value,
+      ruleForm: {
+        cllx: "",
+        clmc: "",
       },
-  methods: {}
-}
+    };
+  },
+  watch: {
+    value(val) {
+      this.myValue = val;
+    },
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("input", false);
+    },
+    onSave() {
+      this.$parent.addSave(this.ruleForm);
+      this.$emit("input", false);
+    },
+  },
+};
 </script>
 <style scoped lang="scss">
+.submit-button {
+  text-align: center;
+  height: 52px;
+  padding-top: 10px;
+  background-color: #fff;
+}
 </style>

@@ -43,7 +43,7 @@
             <div class="splitScreen-con" v-if='index == 0'>
               <component ref='slxx' :is="editItem" :flag="flag" :key="key" />
             </div>
-            <component :is="editItem" v-else :key="key" />
+            <component :is="editItem" v-else :key="key" :unitData="unitData" :id="id" />
           </el-tab-pane>
         </el-tabs>
       </div>

@@ -57,6 +57,7 @@
 import { mapGetters } from 'vuex'
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./ybxdata";
+import { searchTaskDone} from "@/api/ywbl.js"
 export default {
   name: "ybx",
   components: {},
@@ -81,28 +82,29 @@ export default {
         total: 2,
       },
       tableData: {
+        total: 0,
         columns: datas.columns(),
-        data: [
-          {
-            ywly: "办事大厅",
-            lczt: "进行中",
-            ywh: "20200409146",
-            sqywmc: "预告买卖登记||首次登记",
-            qlr: "张三",
-            ywr: "绿地开发商",
-            zl: "C区沙尾金地名轩塔楼1栋101",
-            slsj: "2022-5-12",
-            slry: "窗口人员1",
-            zcsj: "2016-10-01 10:00:00",
-          },
-
-        ],
+        data: [],
       },
     };
   },
   methods: {
-    // 初始化数据
-    fetchData () { },
+    init (e) {
+      this.fetchData()
+    },
+    // 列表渲染接口
+    fetchData () {
+      searchTaskDone({ ...this.queryForm, ...this.pageData }).then(res => {
+        if (res.code === 200) {
+          let { total, records } = res.result
+          this.pageData.total = total;
+          this.tableData.data = records
+        }
+      })
+     },
+    queryClick () {
+      this.fetchData()
+    },
     handleSort (name, sort) {
       console.log(name, sort);
     },

@@ -16,12 +16,21 @@ class data extends filter {
         width: '50'
       },
       {
-        prop: "ywly",
+        prop: "ywlymc",
         label: "业务来源",
       },
       {
-        prop: "lczt",
         label: "流程状态",
+        render: (h, scope) => {
+          switch (scope.row.lczt) {
+            case '1':
+              return <span>进行中</span>
+            case '2':
+              return <span>已结束</span>
+            case '3':
+              return <span>进行中</span>
+          }
+        }
       },
       {
         prop: "ywh",
@@ -32,11 +41,11 @@ class data extends filter {
         label: "申请业务名称",
       },
       {
-        prop: "qlr",
+        prop: "qlrmc",
         label: "权利人",
       },
       {
-        prop: "ywr",
+        prop: "ywrmc",
         label: "义务人",
       },
       {

@@ -43,7 +43,7 @@ class data extends filter {
         label: "不动产权证号",
       },
       {
-        prop: "qlr",
+        prop: "qlrmc",
         label: "权利人",
       },
       {
@@ -55,7 +55,7 @@ class data extends filter {
         label: "面积",
       },
       {
-        prop: "yt",
+        prop: "ytmc",
         label: "用途",
       },
       {

@@ -52,10 +52,10 @@
   </div>
 </template>
 <script>
-//查封等级
+//查封登记
 import { datas, sendThis } from "./cfdj.js";
 import table from "@/utils/mixin/table";
-import { selectScBdcdy, startBusinessFlow } from "@/api/ywbl.js";
+import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
 export default {
   props: {
     bsmSqyw: { type: String, default: '' },
@@ -68,7 +68,7 @@ export default {
         bdcdyh: "",
         ywh: "",
         bdcqzh: "",
-        sqywbm: "A03100",
+        sqywbm: "B39800",
       },
       qllxs: [],
       tableData: {
@@ -94,7 +94,7 @@ export default {
     },
     fetchData () {
       if (this.bsmSqyw) {
-        selectScBdcdy({ ...this.queryForm, ...this.pageData })
+        selectQlxx({ ...this.queryForm, ...this.pageData })
           .then((res) => {
             if (res.code === 200) {
               let { total, records } = res.result;
@@ -104,21 +104,30 @@ export default {
           })
       }
     },
-    submitForm () {
+    submitForm() {
       if (this.bdcdysz.length == 0) {
-        this.$message.error('请至少选择一条数据');
-        return
+        this.$message.error("请至少选择一条数据");
+        return;
       }
-      this.saveloding = true
+      this.saveloding = true;
       startBusinessFlow({
         bsmSqyw: this.bsmSqyw,
-        bdcdysz: this.bdcdysz
-      }).then(res => {
-        this.saveloding = false
-        this.$emit("closeDialog")
-        const { href } = this.$router.resolve('/fqsq?bsmSqyw=' + this.bsmSqyw + '&bsmSlsq=' + res.message)
-        window.open(href, '_blank');
-      })
+        bdcdysz: this.bdcdysz,
+      }).then((res) => {
+        this.saveloding = false;
+        if (res.code == 200) {
+          this.$emit("closeDialog");
+          const { href } = this.$router.resolve(
+            "/fqsq?bsmSlsq=" +
+              res.result.bsmSlsq +
+              "&bestepid=" +
+              res.result.bestepid
+          );
+          window.open(href, "_blank");
+        } else {
+          this.$message.error(res.message);
+        }
+      });
     },
     handleSelectionChange (val) {
       this.bdcdysz = val

@@ -22,7 +22,7 @@ export default {
       this.myValue = val
     },
     djywbm (val) {
-      let itemObj = { 'A03100': 'scdj', default: 'scdj' }
+      let itemObj = { 'A03100': 'scdj','A37100': 'scdy','B39800':'cfdj', default: 'scdj' }
       this.editItem = this.loadView(itemObj[val])
     },
   },

+import filter from '@/utils/filter.js'
+let vm = null
+
+const sendThis = (_this) => {
+  vm = _this
+}
+class data extends filter {
+  constructor() {
+    super()
+  }
+  columns () {
+    return [
+      {
+        type: 'selection',
+        label: '全选'
+      },
+      {
+        label: '序号',
+        type: 'index',
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
+      },
+      {
+        prop: "status",
+        label: "状态",
+      },
+      {
+        prop: "qllxmc",
+        label: "权利类型",
+      },
+      {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+      },
+      {
+        prop: "bdcqzh",
+        label: "不动产权证号",
+      },
+      {
+        prop: "qlrmc",
+        label: "权利人",
+      },
+      {
+        prop: "zjh",
+        label: "证件号",
+      },
+      {
+        prop: "mj",
+        label: "面积",
+      },
+      {
+        prop: "ytmc",
+        label: "用途",
+      },
+      {
+        prop: "zl",
+        label: "坐落",
+      },
+    ]
+  }
+
+
+}
+let datas = new data()
+export {
+  datas,
+  sendThis
+}

+<template>
+  <div class="from-clues">
+    <!-- 表单部分 -->
+    <div class="from-clues-header">
+      <el-form :model="queryForm" ref="queryForm" label-width="120px">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="权利类型">
+              <el-select
+                v-model="queryForm.qllx"
+                filterable
+                clearable
+                placeholder="请选择权利类型"
+                class="width300px"
+              >
+                <el-option
+                  v-for="item in qllxs"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="不动产单元号">
+              <el-input
+                placeholder="请输入不动产单元号"
+                v-model="queryForm.bdcdyh"
+                clearable
+                class="width300px"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="业务号">
+              <el-input
+                placeholder="请输入业务号"
+                v-model="queryForm.ywh"
+                clearable
+                class="width300px"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="不动产权证号">
+              <el-input
+                placeholder="请输入不动产权证号"
+                v-model="queryForm.bdcqzh"
+                clearable
+                class="width300px"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2" class="btnCol">
+            <el-form-item>
+              <el-button type="primary" @click="queryClick()">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="from-clues-content">
+      <lb-table
+        :page-size="pageData.pageSize"
+        :heightNum="400"
+        :current-page.sync="pageData.currentPage"
+        :total="tableData.total"
+        @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange"
+        @selection-change="handleSelectionChange"
+        :column="tableData.columns"
+        :data="tableData.data"
+      >
+      </lb-table>
+    </div>
+    <div class="submit_button">
+      <el-button @click="closeDialog">取消</el-button>
+      <el-button type="primary" plain @click="submitForm" :loading="saveloding"
+        >发起申请</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+//抵押权首次登记
+import { datas, sendThis } from "./scdy.js";
+import table from "@/utils/mixin/table";
+import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
+export default {
+  props: {
+    bsmSqyw: { type: String, default: "" },
+    djqxObj: { type: Object, default: "" },
+  },
+  mixins: [table],
+  data() {
+    return {
+      queryForm: {
+        qllx: "",
+        bdcdyh: "",
+        ywh: "",
+        bdcqzh: "",
+        sqywbm: "A37100",
+      },
+      qllxs: [],
+      tableData: {
+        total: 0,
+        columns: datas.columns(),
+        data: [],
+      },
+      bdcdysz: [],
+      saveloding: false,
+    };
+  },
+  watch: {
+    bsmSqyw(val) {
+      this.fetchData();
+    },
+  },
+  mounted() {
+    sendThis(this);
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("closeDialog");
+    },
+    fetchData() {
+      if (this.bsmSqyw) {
+        selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
+          if (res.code === 200) {
+            let { total, records } = res.result;
+            this.tableData.total = total;
+            this.tableData.data = records;
+          }
+        });
+      }
+    },
+    submitForm() {
+      if (this.bdcdysz.length == 0) {
+        this.$message.error("请至少选择一条数据");
+        return;
+      }
+      this.saveloding = true;
+      startBusinessFlow({
+        bsmSqyw: this.bsmSqyw,
+        bdcdysz: this.bdcdysz,
+        djqxbm: this.djqxObj.djqxbm,
+        djqxmc: this.djqxObj.djqxmc,
+      }).then((res) => {
+        this.saveloding = false;
+        if (res.code == 200) {
+          this.$emit("closeDialog");
+          const { href } = this.$router.resolve(
+            "/fqsq?bsmSlsq=" +
+              res.result.bsmSlsq +
+              "&bestepid=" +
+              res.result.bestepid
+          );
+          window.open(href, "_blank");
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+    handleSelectionChange(val) {
+      this.bdcdysz = val;
+    },
+    queryClick() {
+      this.fetchData();
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "~@/styles/mixin.scss";
+@import "~@/styles/public.scss";
+</style>

@@ -179,7 +179,7 @@ export default {
       this.$set(item, 'select', true)
       if (item.sffqlc == '1') {
         this.btnDisabled = false
-        this.bsmSqyw = item.parentid
+        this.bsmSqyw = item.bsmSqyw
         this.djywbm = item.djywbm
       } else {
         this.getNextNode(item.bsmSqyw)