Merge branch 'dev'

renchao@pashanhoo.com
Showing 6 changed files with 160 additions and 56 deletions
src/utils/request.js
src/views/registerBook/qlxxFormData.js
src/views/registerBook/tdsyq.vue
src/views/workflow/components/clxx/clxxUnify.vue
src/views/workflow/components/dialog/clxxDetailDialog.vue
src/views/ywbl/ywsq/guidePage.vue
--- a/src/utils/request.js
View file @fe55fa7
+++ b/src/utils/request.js
View file @fe55fa7
@@ -54,7 +54,9 @@ service.interceptors.response.use(
         */
        if (response.status == 200) {
            return response.data;
-        } else {
+        }else if (response.status == 2002){
+            Message.error(response.message);
+        }else {
            handleErrorData(response.data);
        }
        return response;
--- a/src/views/registerBook/qlxxFormData.js
View file @fe55fa7
+++ b/src/views/registerBook/qlxxFormData.js
View file @fe55fa7
@@ -24,6 +24,116 @@ class data extends filter {
          label: "历史",
        },
      ],
+      TDSYQ: [
+        {
+          prop: "qszt",
+          label: "权属状态",
+        },
+        {
+          prop: "sjlx",
+          label: "数据类型",
+        },
+        {
+          prop: "qllxmc",
+          label: "权利类型",
+        },
+        {
+          prop: "djlxmc",
+          label: "登记类型",
+        },
+        {
+          prop: "ssywh",
+          label: "上手业务号",
+        },
+        {
+          prop: "dah",
+          label: "档案号",
+        },
+        {
+          prop: "ywh",
+          label: "业务号",
+        },
+        {
+          prop: "bdcdyh",
+          label: "不动产单元号",
+        },
+        {
+          prop: "zl",
+          label: "坐落",
+        },
+        {
+          prop: "gyqk",
+          label: "共有情况",
+        },
+        {
+          prop: "qlrlx",
+          label: "权利人类型",
+        },
+        {
+          prop: "qlrmc",
+          label: "权利人",
+        },
+        {
+          prop: "qlrzjzl",
+          label: "证件种类",
+        },
+        {
+          prop: "qlrzjhm",
+          label: "证件号",
+        },       
+        {
+          prop: "ytmc",
+          label: "土地用途",
+        },
+        {
+          prop: "mjdw",
+          label: "面积单位",
+        },
+        {
+          prop: "gdmj",
+          label: "耕地面积",
+        },
+        {
+          prop: "ldmj",
+          label: "林地面积",
+        },
+        {
+          prop: "cdmj",
+          label: "草地面积",
+        },
+        {
+          prop: "qtnydmj",
+          label: "其他农用地面积",
+        },
+        {
+          prop: "jsydmj",
+          label: "建设用地面积",
+        },
+        {
+          prop: "wlydmj",
+          label: "未利用地面积",
+        },
+        {
+          prop: "djyy",
+          label: "登记原因",
+        },
+        {
+          prop: "bdcqzh",
+          label: "不动产权证号",
+        },
+        {
+          prop: "djsj",
+          label: "登记时间",
+        },
+        {
+          prop: "dbr",
+          label: "登簿人",
+        },
+        {
+          prop: "fj",
+          label: "附记",
+        },
+      ],
      JSYDSYQ: [
        {
          prop: "qszt",
--- a/src/views/registerBook/tdsyq.vue
View file @fe55fa7
+++ b/src/views/registerBook/tdsyq.vue
View file @fe55fa7
@@ -78,7 +78,7 @@
        //空列值个数
        emptycolNum: datas.columns().emptycolNum,
        //列名称对象
-        columns: datas.columns().JSYDSYQ,
+        columns: datas.columns().TDSYQ,
      };
    },
    created () {
--- a/src/views/workflow/components/clxx/clxxUnify.vue
View file @fe55fa7
+++ b/src/views/workflow/components/clxx/clxxUnify.vue
View file @fe55fa7
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-01 15:19:13
+ * @LastEditTime: 2023-08-15 09:43:21
 -->
 <template>
  <div class="clxx">
@@ -13,9 +13,7 @@
            type="primary"
            native-type="submit"
            @click="viewDetail"
-            style="width: 100%; margin-top: 10px"
+            style="width: 100%; margin-top: 10px">申请材料目录</el-button>
-            >查看明细</el-button
-          >
          <div class="item">
            材料目录({{ tableData.length }})
            <div style="margin-top: 10px">
@@ -26,21 +24,17 @@
                  color: black;
                  font-size: 14px;
                "
-                v-if="tableData.length == 0"
+                v-if="tableData.length == 0">
-              >
                暂无数据
              </div>
              <div
                v-for="(item, index) in tableData"
                :key="item.bsmSj"
                :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']"
-                @click="treeClick(item, index)"
+                @click="treeClick(item, index)">
-              >
                <span v-if="item.isrequired == 1" class="required">必选</span>
                {{ item.sjmc }}
-                <span class="cl_number"
+                <span class="cl_number">({{ item.children ? item.children.length : 0 }})</span>
-                  >({{ item.children ? item.children.length : 0 }})</span
-                >
              </div>
            </div>
          </div>
@@ -49,9 +43,7 @@
            native-type="submit"
            style="width: 100%"
            @click="handleAdd()"
-            v-if="ableOperation"
+            v-if="ableOperation">新增</el-button>
-            >新增</el-button
-          >
        </div>
        <image-preview
          ref="imageRef"
@@ -60,22 +52,21 @@
          :ableOperation="ableOperation"
          @updateList="updateList"
          @nextPriview="nextPriview"
-          @prevPriview="prevPriview"
+          @prevPriview="prevPriview" />
-        />
      </div>
    </div>
    <clxxAddDialog v-model="isDialog" />
  </div>
 </template>
 <script>
-import { mapGetters } from "vuex";
+  import { mapGetters } from "vuex";
-import clxxAddDialog from "../dialog/clxxAddDialog.vue";
+  import clxxAddDialog from "../dialog/clxxAddDialog.vue";
-import clxxDetailDialog from "../dialog/clxxDetailDialog.vue";
+  import clxxDetailDialog from "../dialog/clxxDetailDialog.vue";
-import imagePreview from "@/views/components/imagePreview.vue";
+  import imagePreview from "@/views/components/imagePreview.vue";
-import { InitClml, saveClml } from "@/api/clxx.js";
+  import { InitClml, saveClml } from "@/api/clxx.js";
-export default {
+  export default {
    components: { clxxAddDialog, imagePreview, clxxDetailDialog },
-  data() {
+    data () {
      return {
        //表单是否可操作
        ableOperation: true,
@@ -99,7 +90,7 @@ export default {
    computed: {
      ...mapGetters(["dictData"]),
    },
-  created() {
+    created () {
      this.clmlInitList(1);
    },
    computed: {
@@ -107,12 +98,12 @@ export default {
    },
    watch: {
      workFresh: {
-      handler(newVal, oldVal) {
+        handler (newVal, oldVal) {
          if (newVal) this.clmlInitList(1);
        },
      },
    },
-  mounted() {
+    mounted () {
      this.ableOperation = this.$parent.ableOperation;
    },
    methods: {
@@ -121,7 +112,7 @@ export default {
       * @description: 自动预览
       * @author: renchao
       */
-    nextPriview() {
+      nextPriview () {
        if (this.treeCheckIndex < this.tableData.length) {
          this.treeCheckIndex++;
          this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
@@ -134,7 +125,7 @@ export default {
       * @description: prevPriview
       * @author: renchao
       */
-    prevPriview() {
+      prevPriview () {
        if (this.treeCheckIndex >= 1) {
          this.treeCheckIndex--;
          this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
@@ -149,7 +140,7 @@ export default {
       * @param {*} type
       * @author: renchao
       */
-    clmlInitList(type) {
+      clmlInitList (type) {
        //type  1：列表初始化  2：新增材料
        return new Promise((resolve) => {
          this.unitData = this.$parent.unitData;
@@ -189,7 +180,7 @@ export default {
       * @param {*} item
       * @author: renchao
       */
-    setChecked(item) {
+      setChecked (item) {
        this.treeCheckId = item.bsmSj;
        this.title = item.sjmc;
        this.titleYs = 1;
@@ -202,7 +193,7 @@ export default {
       * @param {*} val
       * @author: renchao
       */
-    updateList(val) {
+      updateList (val) {
        let that = this;
        if (val.children.length != 0) {
          //删除最后一张图片时 val=null
@@ -230,7 +221,7 @@ export default {
       * @description: 添加材料目录
       * @author: renchao
       */
-    handleAdd() {
+      handleAdd () {
        this.isDialog = true;
      },
      // 新增弹窗保存
@@ -239,7 +230,7 @@ export default {
       * @param {*} data
       * @author: renchao
       */
-    addSave(data) {
+      addSave (data) {
        let obj = {
          bsmSlsq: this.$parent.bsmSlsq,
          isrequired: "1",
@@ -251,7 +242,7 @@ export default {
          sfxjcl: "1", // 是否必选
        };
        if (this.$route.query.sqywbm == "DJBBL") {
-          obj.bsmSldy=this.$parent.bsmRepair
+          obj.bsmSldy = this.$parent.bsmRepair
        }
        saveClml(obj).then(async (res) => {
          if (res.code == 200) {
@@ -271,7 +262,7 @@ export default {
       * @param {*} index
       * @author: renchao
       */
-    treeClick(item, index) {
+      treeClick (item, index) {
        this.previewImg.index = 0;
        this.treeCheckId = item?.bsmSj;
        this.treeCheckIndex = index;
@@ -285,7 +276,7 @@ export default {
       * @param {*} index
       * @author: renchao
       */
-    imgClick(item, index) {
+      imgClick (item, index) {
        this.showImg = item;
        this.titleYs = index + 1;
      },
@@ -296,7 +287,7 @@ export default {
       * @param {*} code
       * @author: renchao
       */
-    dicStatus(val, code) {
+      dicStatus (val, code) {
        let data = this.$store.getters.dictData[code],
          name = "暂无";
        if (data) {
@@ -309,49 +300,49 @@ export default {
        }
      },
      //查看明细
-    viewDetail() {
+      viewDetail () {
        this.$store.dispatch("user/reWorkFresh", false);
        this.$popupDialog(
-        "查看明细",
+          "申请材料目录",
          "workflow/components/dialog/clxxDetailDialog",
          {
            data: this.tableData,
            unitData: this.$parent.unitData,
            ableOperation: this.$parent.ableOperation,
-          bsmRepair:this.$parent.bsmRepair
+            bsmRepair: this.$parent.bsmRepair
          },
          "60%",
          true
        );
      },
      //设置tableData
-    setTableData(tableData) {
+      setTableData (tableData) {
        this.$nextTick((res) => {
          this.tableData = tableData;
        });
      },
    },
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
+  @import "~@/styles/mixin.scss";
-.active {
+  .active {
    background: $light-blue !important;
    color: #fff;
-}
+  }
-.required {
+  .required {
    font-size: 12px;
    color: $pink;
    float: left;
-}
+  }
-.cl_number {
+  .cl_number {
    float: right;
-}
+  }
-.clxx {
+  .clxx {
    width: 100%;
    display: flex;
    padding-left: 5px;
@@ -457,5 +448,5 @@ export default {
        }
      }
    }
-}
+  }
 </style>
--- a/src/views/workflow/components/dialog/clxxDetailDialog.vue
View file @fe55fa7
+++ b/src/views/workflow/components/dialog/clxxDetailDialog.vue
View file @fe55fa7
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:53:05
+ * @LastEditTime: 2023-08-15 09:43:46
 -->
 <template>
  <div class="clmlmx-box">
-    <div class="title">申请材料目录</div>
    <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData">
    </lb-table>
    <div class="text-center">
@@ -61,7 +60,7 @@
            label: "材料名称",
            render: (h, scope) => {
              return (
-                this.formData.ableOperation ?
+                (this.formData.ableOperation && scope.row.isrequired != '1') ?
                  <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
              )
            }
--- a/src/views/ywbl/ywsq/guidePage.vue
View file @fe55fa7
+++ b/src/views/ywbl/ywsq/guidePage.vue
View file @fe55fa7
@@ -211,6 +211,7 @@
       */
      getNextNode (bsmSqyw) {
        getNextNode(bsmSqyw).then(res => {
+          if (res.result) {
            if (res.result.djqx) {
              this.djqxList = res.result.djqx;
              this.djqxList.forEach(item => {
@@ -223,6 +224,7 @@
                this.$set(item, 'selected', false);
              });
            }
+          }
        })
      },