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

田浩浩
Showing 9 changed files with 245 additions and 69 deletions
src/api/zsgl.js
src/views/ywbl/fqsq/components/fzxx.vue
src/views/zsgl/zsff/components/addDialog.vue
src/views/zsgl/zsff/zsff.vue
src/views/zsgl/zsff/zsffdata.js
src/views/zsgl/zsrk/components/addDialog.vue
src/views/zsgl/zsrk/zsrk.vue
src/views/zsgl/zssyjl/zssyjl.vue
src/views/zsgl/zssyjl/zssyjldata.js
--- a/src/api/zsgl.js
View file @ac8cde6
+++ b/src/api/zsgl.js
View file @ac8cde6
@@ -78,3 +78,33 @@ export function getZsEndNo (params) {
        params
    })
 }
+/* 
+证书管理-新增证书分发
+*/
+export function zsff (data) {
+    return request({
+        url: '/sys/zsgl/zsff',
+        method: 'post',
+        data
+    })
+}
+/* 
+证书管理-确定分发
+*/
+export function confirmZsff (params) {
+    return request({
+        url: '/sys/zsgl/confirmZsff',
+        method: 'get',
+        params: params
+    })
+}
+/* 
+证书管理-证书使用情况
+*/
+export function getZssyqkList (data) {
+    return request({
+        url: '/sys/zsgl/getZssyqkList',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file
--- a/src/views/ywbl/fqsq/components/fzxx.vue
View file @ac8cde6
+++ b/src/views/ywbl/fqsq/components/fzxx.vue
View file @ac8cde6
@@ -6,17 +6,17 @@
        <el-row :gutter="20">
          <el-col :span="6">
            <el-form-item label="印刷序列号">
-              <el-input v-model="ruleForm.ysxlh" placeholder="请输入印刷序列号"></el-input>
+              <el-input v-model="ruleForm.ysxlh" clearable  placeholder="请输入印刷序列号"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="证书号">
-              <el-input v-model="ruleForm.zsh" placeholder="请输入证书号"></el-input>
+              <el-input v-model="ruleForm.zsh" clearable  placeholder="请输入证书号"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="权利人">
-              <el-input v-model="ruleForm.qlr" placeholder="请输入权利人"></el-input>
+              <el-input v-model="ruleForm.qlr" clearable  placeholder="请输入权利人"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6" class="btnCol">
--- a/src/views/zsgl/zsff/components/addDialog.vue
View file @ac8cde6
+++ b/src/views/zsgl/zsff/components/addDialog.vue
View file @ac8cde6
@@ -21,8 +21,8 @@
                </el-form-item>
            </el-col>
            <el-col :span="12">
-                <el-form-item label="领取人:" prop="lqr">
+                <el-form-item label="领取人:" prop="receiver">
-                    <el-select v-model="ruleForm.lqr" placeholder="请选择">
+                    <el-select v-model="ruleForm.receiver" placeholder="请选择">
                        <el-option v-for="item in usernames" :key="item" :label="item" :value="item"></el-option>
                    </el-select>
                </el-form-item>
@@ -34,7 +34,7 @@
                  <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200"></el-table-column>
                  <el-table-column prop="bs" label="本数">
                    <template slot-scope="scope">
-                       <el-input v-model="scope.row.bs" @blur="ysxlhDeal(scope.row)"></el-input>
+                      <el-input v-model="scope.row.bs" @blur="ysxlhDeal(scope.row)" oninput="value=value.replace(/[^\d.]/g,'')" ></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200">
@@ -54,7 +54,7 @@
 </template>
 <script>
-import { getZsStartNo,getSysSerialSingle, getZsEndNo} from "@/api/zsgl.js"
+import { getZsStartNo,getSysSerialSingle, getZsEndNo,zsff} from "@/api/zsgl.js"
 export default {
  components: {
  },
@@ -65,10 +65,10 @@ export default {
  },
  data () {
    return {
-      tableData: {},
+      //表单提交数据
      ruleForm: {
          batchno: '',
-          lqr: '',
+          receiver: '',
          rkry: '超级管理员',
          rksj: '',
          bz: '',
@@ -79,6 +79,7 @@ export default {
          zmendno: '',
          zmnum: ''
        },
+      //表格数据
      tableForm: [
        {
          name: '不动产权证书',
@@ -95,12 +96,14 @@ export default {
          zslx: 'zm'
        }
      ],  
+      //证书分发业务号固定参数
      ywhQueryForm: {
        serialtype: 'zsffbh',
        serialname: '证书分发编号',
        serialcode: 'zsff',
        digit: '5'
      },
+      //用户列表
      usernames: ['张三','李四'],
      rules: {
          batchNo: [
@@ -121,15 +124,25 @@ export default {
  methods: {
    //表单提交
    submitForm () {
+      zsff(this.ruleForm).then(res => {
+        if(res.code == 200){
+          this.$message.success('保存成功')
+          this.$emit("input", false);
+          this.ruleForm = {};
+          this.resetTableFields();
+          this.$parent.fetchData();
+        }else{
+          this.$message.error(res.message)
+        }
+      })
    },
    //序列号获取
    ywhSerial(){
-    //   getSysSerialSingle(this.ywhQueryForm).then(res => {
+      getSysSerialSingle(this.ywhQueryForm).then(res => {
-    //     if(res.code == 200){
+        if(res.code == 200){
-    //         this.ruleForm.batchno = res.message;
+            this.ruleForm.batchno = res.message;
-    //     }
+        }
-    //   })
+      })
    },
    initStartNo(){
        getZsStartNo().then(res => {
@@ -141,14 +154,35 @@ export default {
    },
    //印刷序列号处理
    ysxlhDeal(item){
+      if(item.bs){
+        //存在本数
        getZsEndNo({"bookNumber": item.bs,"zslx": item.zslx}).then(res => {
          if(res.code == 200){
            item.jsysxlh = res.result.endno
            item.bs = res.result.bookNumber
+            this.updateRuleForm(res.result.endno,res.result.bookNumber,item);
          }else{
            this.$message.error(res.message)
          }          
        })
+      }else{
+        //不存在本数
+        item.bs = 0;
+        item.jsysxlh = '';
+        this.updateRuleForm('',0,item);
+      }     
+    },
+    //更新表单数据
+    updateRuleForm(endno,bookNumber,item){
+      if(item.zslx == 'zs'){
+        this.ruleForm.zsstarno = item.ksysxlh;
+        this.ruleForm.zsendno = endno;
+        this.ruleForm.zsnum = bookNumber;
+      }else if(item.zslx == 'zm'){
+        this.ruleForm.zmstarno = item.ksysxlh;
+        this.ruleForm.zmendno = endno;
+        this.ruleForm.zmnum = bookNumber;
+      }
    },
    resetTableFields() {
      this.tableForm = [
@@ -157,14 +191,14 @@ export default {
          ksysxlh: '',
          jsysxlh: '',
          bs: 0,
-          zslx:1
+          zslx: 'zs'
        },
        {
          name: '不动产权登记证明',
          ksysxlh: '',
          jsysxlh: '',
          bs: 0,
-          zslx:2
+          zslx: 'zm'
        }
      ]
    },
@@ -176,5 +210,4 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
 </style>
--- a/src/views/zsgl/zsff/zsff.vue
View file @ac8cde6
+++ b/src/views/zsgl/zsff/zsff.vue
View file @ac8cde6
@@ -5,14 +5,14 @@
      <el-form :model="ruleForm" label-width="70px">
        <el-row>
          <el-col :span="5">
-            <el-form-item label="入库编号">
+            <el-form-item label="分发编号">
-              <el-input v-model="ruleForm.rkbh" placeholder="入库编号"></el-input>
+              <el-input v-model="approveForm.batchno" clearable  placeholder="分发编号"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="人库时间">
+            <el-form-item label="领取时间">
-              <el-date-picker v-model="value" type="daterange" range-separator="至" start-placeholder="开始日期"
+              <el-date-picker v-model="ruleForm.ffsj" type="daterange" range-separator="至" start-placeholder="开始日期"
-                end-placeholder="结束日期">
+                end-placeholder="结束日期"  @change="timeChange()" value-format="yyyy-MM-dd HH:mm:ss" clearable >
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -38,7 +38,7 @@
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./zsffdata";
-import { getZsglffList} from "@/api/zsgl.js"
+import { getZsglffList,removeZsgl,confirmZsff} from "@/api/zsgl.js"
 import addDialog from "./components/addDialog.vue"
 export default {
  name: "zsff",
@@ -52,8 +52,13 @@ export default {
      isDialog: false,
      value: '',
      ruleForm: {
-        rkbh: "",
+        batchno: "",
-        rksj: ""
+        ffsj: ""
+      },
+      approveForm: {
+        batchno: '',
+        ffkssj: '',
+        ffjssj: ''
      },
      tableData: {
        total: 0,
@@ -68,7 +73,7 @@ export default {
    },
    // 列表渲染接口
    fetchData () {
-      getZsglffList({ ...this.ruleForm, ...this.pageData }).then(res => {
+      getZsglffList({ ...this.approveForm, ...this.pageData }).then(res => {
        if (res.code === 200) {
          let { total, records } = res.result
          this.tableData.total = total;
@@ -83,6 +88,63 @@ export default {
        this.$refs.addDialog.initStartNo();
      })
    },
+    queryClick () {
+      this.fetchData()
+    },
+    //修改筛选时间
+    timeChange() {
+      if (this.ruleForm.ffsj != null) {
+        this.approveForm.ffkssj = this.ruleForm.ffsj[0];
+        this.approveForm.ffjssj = this.ruleForm.ffsj[1];
+      } else {
+        this.approveForm.ffkssj = ''
+        this.approveForm.ffjssj = ''
+      }
+    },
+    //确定证书分发
+    confrimVerify(item){
+      this.$confirm('是否确定分发', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        confirmZsff({"bsmBatch":item.bsmBatch}).then(res => {
+          if(res.code == 200){
+            this.$message.success("分发成功")
+            this.fetchData();
+          }else{
+            this.$message.error(res.message)
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消审核'
+        });
+      });
+    },
+     //删除证书分发数据
+    delZsff(item){
+      this.$confirm('确定要删除吗, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        removeZsgl({"bsmBatch":item.bsmBatch}).then(res => {
+          if(res.code == 200){
+            this.$message.success("删除成功")
+            this.fetchData();
+          }else{
+            this.$message.error(res.message)
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
  },
 };
 </script>
--- a/src/views/zsgl/zsff/zsffdata.js
View file @ac8cde6
+++ b/src/views/zsgl/zsff/zsffdata.js
View file @ac8cde6
@@ -60,7 +60,7 @@ class data extends filter {
            case '0':
              return <div>
              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.confrimVerify(scope.row) }}>确认分发</el-button>
-              <el-button type="text" icon="el-icon-delete" onClick={() => { vm.delZsrk(scope.row) }}>删除</el-button>
+              <el-button type="text" icon="el-icon-delete" onClick={() => { vm.delZsff(scope.row) }}>删除</el-button>
            </div>
            case '1':
              return <el-button type="text" onClick={() => { }}>查看</el-button>
--- a/src/views/zsgl/zsrk/components/addDialog.vue
View file @ac8cde6
+++ b/src/views/zsgl/zsrk/components/addDialog.vue
View file @ac8cde6
@@ -33,12 +33,14 @@
                  <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column>
                  <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200">
                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.ksysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"></el-input>
+                      <el-input v-model="scope.row.ksysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
+                       oninput="value=value.replace(/[^\d.]/g,'')" ></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200">
                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.jsysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"></el-input>
+                      <el-input v-model="scope.row.jsysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
+                       oninput="value=value.replace(/[^\d.]/g,'')" ></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="bs" label="本数">
@@ -72,7 +74,7 @@ export default {
  },
  data () {
    return {
-      tableData: {},
+      //表单提交数据
      ruleForm: {
          batchno: '',
          djjg: '',
@@ -86,6 +88,7 @@ export default {
          zmendno: '',
          zmnum: ''
        },
+      //表格数据
      tableForm: [
        {
          name: '不动产权证书',
@@ -102,6 +105,7 @@ export default {
          zslx:2
        }
      ],  
+      //证书入库业务号参数
      ywhQueryForm: {
        serialtype: 'zsrkbh',
        serialname: '证书入库编号',
--- a/src/views/zsgl/zsrk/zsrk.vue
View file @ac8cde6
+++ b/src/views/zsgl/zsrk/zsrk.vue
View file @ac8cde6
@@ -6,13 +6,13 @@
        <el-row>
          <el-col :span="5">
            <el-form-item label="入库编号">
-              <el-input v-model="ruleForm.rkbh" placeholder="入库编号"></el-input>
+              <el-input v-model="approveForm.batchno" clearable  placeholder="入库编号"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="人库时间">
              <el-date-picker v-model="ruleForm.rksj" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-                end-placeholder="结束日期">
+                end-placeholder="结束日期" @change="timeChange()" value-format="yyyy-MM-dd HH:mm:ss" clearable >
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -51,8 +51,12 @@ export default {
    return {
      isDialog: false,
      ruleForm: {
-        rkbh: "",
+        rksj: ''
-        rksj: ""
+      },
+      approveForm: {
+        batchno: '',
+        rkkssj: '',
+        rkjssj: ''
      },
      tableData: {
        total: 0,
@@ -67,7 +71,7 @@ export default {
    },
    // 列表渲染接口
    fetchData () {
-      getZsglrkList({ ...this.ruleForm, ...this.pageData }).then(res => {
+      getZsglrkList({ ...this.approveForm, ...this.pageData }).then(res => {
        if (res.code === 200) {
          let { total, records } = res.result
          this.tableData.total = total;
@@ -84,6 +88,16 @@ export default {
    queryClick () {
      this.fetchData()
    },
+    //修改筛选时间
+    timeChange() {
+      if (this.ruleForm.rksj != null) {
+        this.approveForm.rkkssj = this.ruleForm.rksj[0];
+        this.approveForm.rkjssj = this.ruleForm.rksj[1];
+      } else {
+        this.approveForm.rkkssj = ''
+        this.approveForm.rkjssj = ''
+      }
+    },
    //删除证书入库数据
    delZsrk(item){
      this.$confirm('确定要删除吗, 是否继续?', '提示', {
--- a/src/views/zsgl/zssyjl/zssyjl.vue
View file @ac8cde6
+++ b/src/views/zsgl/zssyjl/zssyjl.vue
View file @ac8cde6
@@ -6,17 +6,24 @@
        <el-row>
          <el-col :span="5">
            <el-form-item label="印刷序列号" prop="ysxlh">
-              <el-input v-model="ruleForm.ysxlh" placeholder="请输入印刷序列号"></el-input>
+              <el-input v-model="ruleForm.ysxlh" clearable  placeholder="请输入印刷序列号"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="证书类型" prop="zslx">
-              <el-input v-model="ruleForm.zslx" placeholder="请输入证书类型"></el-input>
+              <el-select v-model="ruleForm.zslx" placeholder="请选择证书类型" clearable >
+                <el-option
+                  v-for="item in zslxArr"
+                  :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="业务号" prop="ywh">
-              <el-input v-model="ruleForm.ywh" placeholder="请输入业务号"></el-input>
+              <el-input v-model="ruleForm.ywh" clearable  placeholder="请输入业务号"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
@@ -47,6 +54,7 @@
 <script>
 import viewDialog from "./components/viewDialog.vue"
 import table from "@/utils/mixin/table";
+import { getZssyqkList} from "@/api/zsgl.js"
 import { datas, sendThis } from "./zssyjldata";
 export default {
  name: "zssyjl",
@@ -67,20 +75,28 @@ export default {
      tableData: {
        total: 0,
        columns: datas.columns(),
-        data: [
+        data: [],
-          {
-            slsj: "2022-5-12",
-          },
-          {
-            slsj: "2022-5-13",
-          },
-        ],
      },
+      zslxArr: [
+        {label: '不动产权证书',value: 'zs'},
+        {label: '不动产登记证明', value: 'zm'}
+      ]
    };
  },
  methods: {
-    // 初始化数据
+    init (e) {
-    fetchData () { },
+      this.fetchData()
+    },
+    // 列表渲染接口
+    fetchData () {
+      getZssyqkList({ ...this.ruleForm, ...this.pageData }).then(res => {
+        if (res.code === 200) {
+          let { total, records } = res.result
+          this.tableData.total = total;
+          this.tableData.data = records ? records : []
+        }
+      })
+    },
    openDialog () {
      this.isDialog = true
    },
--- a/src/views/zsgl/zssyjl/zssyjldata.js
View file @ac8cde6
+++ b/src/views/zsgl/zssyjl/zssyjldata.js
View file @ac8cde6
@@ -16,41 +16,58 @@ class data extends filter {
        width: '50'
      },
      {
-        prop: "ywly",
+        label: "状态",
-        label: "业务来源",
+        render: (h, scope) => {
+          switch (scope.row.state) {
+            case '1':
+              return <span>已入库未分发</span>
+            case '2':
+              return <span>已领取未使用</span>
+            case '3':
+              return <span>已制证</span>
+            case '4':
+              return <span>已作废</span>
+          }
+        }
      },
      {
-        prop: "lczt",
+        prop: "djjg",
-        label: "流程状态",
+        label: "登记机构",
      },
      {
-        prop: "zbhj",
+        prop: "operationtime",
-        label: "在办环节",
+        label: "入库时间",
      },
      {
-        prop: "ywh",
+        prop: "operator",
-        label: "业务号",
+        label: "入库人员",
      },
      {
-        prop: "sqywmc",
+        prop: "usedate",
-        label: "申请业务名称",
+        label: "领取时间",
      },
      {
-        prop: "ywr",
+        prop: "receiver",
-        label: "义务人",
+        label: "领取人员",
      },
      {
-        prop: "zl",
+        label: "证书类型",
-        label: "坐落",
+        render: (h, scope) => {
+          switch (scope.row.zslx) {
+            case 'zs':
+              return <span>不动产权证书</span>
+            case 'zm':
+              return <span>不动产登记证明</span>
+          }
+        }
      },
      {
-        prop: "slsj",
+        prop: "ysxlh",
-        label: "受理时间"
+        label: "序列号"
      },
      {
-        prop: "zrsj",
+        prop: "bdcqzh",
-        label: "转入时间",
+        label: "不动产权证号"
-        sortable: 'custom'
      },
      {
        label: '操作',
@@ -58,7 +75,7 @@ class data extends filter {
        align: 'center',
        fixed: 'right',
        render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-view" onClick={() => { vm.openDialog(scope) }}>查看</el-button>
+          return <el-button type="text" icon="el-icon-view" onClick={() => { }}>查看</el-button>
        }
      }
    ]