Merge branch 'dev'

renchao@pashanhoo.com
Showing 5 changed files with 40 additions and 30 deletions
src/views/lpb/lpbContent/index.vue
src/views/workflow/main/fzxx/zslq.vue
src/views/workflow/main/slsqxx/fdcq2/slxx.vue
src/views/workflow/mixin/index.js
src/views/zhcx/djbcx/djbcx.vue
--- a/src/views/lpb/lpbContent/index.vue
View file @a08b7c5
+++ b/src/views/lpb/lpbContent/index.vue
View file @a08b7c5
--- a/src/views/workflow/main/fzxx/zslq.vue
View file @a08b7c5
+++ b/src/views/workflow/main/fzxx/zslq.vue
View file @a08b7c5
@@ -30,30 +30,30 @@
    <el-row>
      <el-col :span="3">
        <el-form-item label="身份证读卡器">
-          <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button>
+          <el-button type="text" icon="el-icon-tickets" :disabled="show" @click="readClick">读取</el-button>
        </el-form-item>
      </el-col>
      <el-col :span="5">
        <el-form-item label="领证人" prop="lzrxm" label-width="70px">
-          <el-input v-model="ruleForm.lzrxm"></el-input>
+          <el-input :disabled="show" v-model="ruleForm.lzrxm"></el-input>
        </el-form-item>
      </el-col>
      <el-col :span="5">
        <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
-          <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
+          <el-select :disabled="show" v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
-            <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
+            <el-option  v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
            </el-option>
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="5">
        <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
-          <el-input v-model="ruleForm.lzrzjh"></el-input>
+          <el-input :disabled="show" v-model="ruleForm.lzrzjh"></el-input>
        </el-form-item>
      </el-col>
      <el-col :span="5">
        <el-form-item label="领证人电话" prop="lzrdh">
-          <el-input v-model="ruleForm.lzrdh"></el-input>
+          <el-input :disabled="show" v-model="ruleForm.lzrdh"></el-input>
        </el-form-item>
      </el-col>
    </el-row>
@@ -133,7 +133,8 @@
          total: 0,
          columns: datas.columns().lzgrid,
          data: []
-        }
+        },
+        show:true
      }
    },
    mounted () {
@@ -202,6 +203,7 @@
        getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
          if (res.code === 200) {
            this.tableData.data = res.result.list;
+            this.show=!res.result.list.length>0;
            this.$nextTick(() => {
              this.tableData.data.forEach(item => {
                that.$refs.table.toggleRowSelection(item)
--- a/src/views/workflow/main/slsqxx/fdcq2/slxx.vue
View file @a08b7c5
+++ b/src/views/workflow/main/slsqxx/fdcq2/slxx.vue
View file @a08b7c5
@@ -380,9 +380,9 @@
          </el-col>
        </el-row>
        <qlrCommonTable
+        :tableData="ruleForm.qlrList"
          @upDateQlrxxList="upDateQlrxxList"
-          :disabled="!viewEdit"
+          :disabled="viewEdit"
-          :tableData="ruleForm.qlrList"
          :gyfs="ruleForm.sldy.gyfs" />
        <div class="slxx_title title-block">
          登记原因
--- a/src/views/workflow/mixin/index.js
View file @a08b7c5
+++ b/src/views/workflow/mixin/index.js
View file @a08b7c5
 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2024-02-23 16:27:17
+ * @LastEditTime: 2024-03-07 09:13:26
 */
 import Vue from 'vue'
-import { getPrintTemplateByCode, getPrintAcceptance,getPrintReceiveSupplementalMaterials,getPrintRejectForms,getPrintSendBackMaterials,getPrintRiviseForms} from "@/api/print";
+import { getPrintTemplateByCode, getPrintAcceptance, getPrintReceiveSupplementalMaterials, getPrintRejectForms, getPrintSendBackMaterials, getPrintRiviseForms } from "@/api/print";
 import { uploadUndo } from "@/api/clxx";
 import { getLodop } from "@/utils/LodopFuncs";
 import { getNewDate } from '@/utils/util'
@@ -151,7 +151,8 @@ export default {
                unitData: window.unitData,
                bsmSlsq: this.bsmSlsq,
                showSave: true,
-                djlx: window.djlx
+                djlx: window.djlx,
+                isworkFrame: true
              }, '85%', true, false)
            } else {
              this.$message.error(res.message)
@@ -259,8 +260,8 @@ export default {
                    })
                  }
                  infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
-                  infoRes.result.nowyue = this.newDate.slice(5,7)
+                  infoRes.result.nowyue = this.newDate.slice(5, 7)
-                  infoRes.result.nowri = this.newDate.slice(8,10)
+                  infoRes.result.nowri = this.newDate.slice(8, 10)
                  let date = infoRes.result.sqrq
                  infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
                  infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
@@ -285,13 +286,13 @@ export default {
            }
          })
          break;
-            // 补充材料通知书
+        // 补充材料通知书
        case "bccltzs":
          this.$popupDialog("补充材料通知书", "workflow/top/bccltzs/index",
-            { bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy,type:"bccltzs" },
+            { bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy, type: "bccltzs" },
            '70%', true)
          break;
-                // 补充材料接收凭证
+        // 补充材料接收凭证
        case "bccljspz":
          getPrintTemplateByCode({ tmpno: 'bdcdjbccljspz' }).then(res => {
            if (res.code === 200) {
@@ -302,12 +303,12 @@ export default {
                      let key = index + 1
                      this.$set(infoRes.result, "file" + key, it.sjmc)
                      this.$set(infoRes.result, "file" + key + 'ys', it.ys)
-                      this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件")
+                      this.$set(infoRes.result, "file" + key + 'lx', it.sjlx == 1 ? "原件" : "复印件")
                    })
                  }
                  infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
-                  infoRes.result.nowyue = this.newDate.slice(5,7)
+                  infoRes.result.nowyue = this.newDate.slice(5, 7)
-                  infoRes.result.nowri = this.newDate.slice(8,10)
+                  infoRes.result.nowri = this.newDate.slice(8, 10)
                  let date = infoRes.result.sqrq
                  infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
                  infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
@@ -333,7 +334,7 @@ export default {
          })
          break;
-                // 不予登记告知书
+        // 不予登记告知书
        case "bydjgzs":
          getPrintTemplateByCode({ tmpno: 'bydjgzs' }).then(res => {
            if (res.code === 200) {
@@ -347,8 +348,8 @@ export default {
                    })
                  }
                  infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
-                  infoRes.result.nowyue = this.newDate.slice(5,7)
+                  infoRes.result.nowyue = this.newDate.slice(5, 7)
-                  infoRes.result.nowri = this.newDate.slice(8,10)
+                  infoRes.result.nowri = this.newDate.slice(8, 10)
                  let date = infoRes.result.sqrq
                  infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
                  infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
@@ -373,7 +374,7 @@ export default {
            }
          })
          break;
-                // 申请材料退回通知书
+        // 申请材料退回通知书
        case "sqclthtzs":
          getPrintTemplateByCode({ tmpno: 'bdcdjsqclthtzs' }).then(res => {
            if (res.code === 200) {
@@ -387,8 +388,8 @@ export default {
                    })
                  }
                  infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
-                  infoRes.result.nowyue = this.newDate.slice(5,7)
+                  infoRes.result.nowyue = this.newDate.slice(5, 7)
-                  infoRes.result.nowri = this.newDate.slice(8,10)
+                  infoRes.result.nowri = this.newDate.slice(8, 10)
                  let date = infoRes.result.sqrq
                  infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
                  infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
@@ -413,7 +414,7 @@ export default {
            }
          })
          break;
-                // 不动产更正登记通知书
+        // 不动产更正登记通知书
        case "gzdjtzs":
          getPrintTemplateByCode({ tmpno: 'bdcgzdjtzs' }).then(res => {
            if (res.code === 200) {
@@ -428,8 +429,8 @@ export default {
                    })
                  }
                  infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
-                  infoRes.result.nowyue = this.newDate.slice(5,7)
+                  infoRes.result.nowyue = this.newDate.slice(5, 7)
-                  infoRes.result.nowri = this.newDate.slice(8,10)
+                  infoRes.result.nowri = this.newDate.slice(8, 10)
                  let date = infoRes.result.sqrq
                  infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
                  infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
--- a/src/views/zhcx/djbcx/djbcx.vue
View file @a08b7c5
+++ b/src/views/zhcx/djbcx/djbcx.vue
View file @a08b7c5
@@ -98,6 +98,7 @@
  import table from "@/utils/mixin/table";
  import { datas, sendThis } from "./djbcxdata";
  import { getDjbBysearch } from "@/api/search.js";
+    import { getZrzListByBsmSlsq } from "@/api/workflow/zjgcdyFlow.js";
  export default {
    name: "djbcx",
@@ -137,7 +138,8 @@
        },
        qllxs: [],
        isDialog: false,
-        djbxxData: {}
+        djbxxData: {},
+        zrzbsm:""
      }
    },
    computed: {
@@ -188,6 +190,11 @@
       * @author: renchao
       */
      handleLpbClick (item) {
+     let params = {zdbsm:item.bsmZd};
+ getZrzListByBsmSlsq(params).then((res) => {
+        if (res.code === 200) {
+        }
+      });
        console.log("zrzbsm",item,item.zrzbsm);
         this.$popupDialog('楼盘表', 'lpb/index', {
              bsm: item.zrzbsm,