--no commit message

xiaomiao
Showing 2 changed files with 85 additions and 46 deletions
src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
src/views/djbworkflow/mixin/index.js
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @c905cbc
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @c905cbc
@@ -13,7 +13,8 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      label-width="127px">
+      label-width="127px"
+    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
          补录信息
@@ -66,7 +67,12 @@
          <el-col :span="8">
            <el-form-item label="登记类型：">
              <el-select v-model="ruleForm.qlxx.djlx">
-                <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                <el-option
+                  v-for="item in dictData['A21']"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
                </el-option>
              </el-select>
            </el-form-item>
@@ -74,7 +80,12 @@
          <el-col :span="8">
            <el-form-item label="权属状态：">
              <el-select v-model="ruleForm.qlxx.qszt">
-                <el-option v-for="item in qsztlist" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                <el-option
+                  v-for="item in qsztlist"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
                </el-option>
              </el-select>
            </el-form-item>
@@ -91,19 +102,24 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="取得价格：">
-              <div style="display:flex">
+              <div style="display: flex">
-                <el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%"></el-input>
+                <el-input
+                  v-model="ruleForm.jsydsyq.qdjg"
+                  style="width: 500%"
+                ></el-input>
                <el-select v-model="ruleForm.jsydsyq.jedw">
-                  <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  <el-option
+                    v-for="item in dictData['A57']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode"
+                  >
                  </el-option>
                </el-select>
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="不动产权证号：">
              <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
@@ -137,7 +153,14 @@
            </el-form-item>
          </el-col>
        </el-row>
+        <div class="slxx_title title-block">
+          土地用途
+          <div class="triangle"></div>
+        </div>
+        <tdytTable
+          :tableData="ruleForm.tdytqxList"
+          @upDateTdytxxList="upDateTdytxxList"
+        />
        <div class="slxx_title title-block">
          权利人信息
          <div class="triangle"></div>
@@ -147,7 +170,8 @@
            <el-form-item label="共有方式：">
              <el-radio-group
                :disabled="$route.query.viewtype == 0"
-                v-model="ruleForm.qlxx.gyqk">
+                v-model="ruleForm.qlxx.gyqk"
+              >
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>
@@ -158,15 +182,23 @@
          <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
            <el-form-item label="是否分别持证：">
              <el-radio-group v-model="ruleForm.qlxx.sqfbcz">
-                <el-radio :label=1>是</el-radio>
+                <el-radio :label="1">是</el-radio>
-                <el-radio :label=0>否</el-radio>
+                <el-radio :label="0">否</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
-          <el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
+          <el-col
+            :span="6"
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'"
+          >
            <el-form-item label="持证人：">
              <el-select v-model="ruleForm.czr" placeholder="持证人">
-                <el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
+                <el-option
+                  v-for="item in czrOptions"
+                  :key="item.zjh"
+                  :label="item.sqrmc"
+                  :value="item.zjh"
+                >
                </el-option>
              </el-select>
            </el-form-item>
@@ -177,7 +209,8 @@
          @upDateQlrxxList="upDateQlrxxList"
          :key="key"
          :viewtype="$route.query.viewtype"
-          :gyfs="ruleForm.qlxx.gyfs" />
+          :gyfs="ruleForm.qlxx.gyfs"
+        />
        <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0">
          <div class="slxx_title title-block">
@@ -189,7 +222,8 @@
            :tableData="ruleForm.ywrList"
            :key="key"
            @upDateQlrxxList="upDateYwrxxList"
-            :viewtype="$route.query.viewtype" />
+            :viewtype="$route.query.viewtype"
+          />
        </div>
      </div>
      <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
@@ -201,27 +235,28 @@
  </div>
 </template>
 <script>
-import store from '@/store/index.js'
+import store from "@/store/index.js";
 import { mapGetters } from "vuex";
-import { init,save } from "@/api/djbbl.js";
+import { init, save } from "@/api/djbbl.js";
 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
 import tdytTable from "@/views/workflow/components/tdytTable";
 export default {
-  components: { qlrCommonTable,tdytTable },
+  components: { qlrCommonTable, tdytTable },
  computed: {
    ...mapGetters(["dictData", "flag"]),
  },
  data() {
    return {
      // 键名转换，方法默认是label和children进行树状渲染
-        normalizer (node) { //方法
+      normalizer(node) {
-          if (node.children == null || node.children == 'null') {
+        //方法
+        if (node.children == null || node.children == "null") {
          delete node.children;
        }
        return {
          id: node.dcode,
-            label: node.dname
+          label: node.dname,
-          }
+        };
      },
      //表单是否可操作
      propsParam: this.$attrs,
@@ -238,6 +273,7 @@ export default {
          dname: "历史",
        },
      ],
+      tdxz:null,
      isShow: false,
      disabled: true,
      czrOptions: [],
@@ -252,31 +288,34 @@ export default {
  mounted() {},
  methods: {
    // 字典
-      getDictData (val) {
+    getDictData(val) {
-        return store.getters.dictData[val]
+      return store.getters.dictData[val];
    },
    loadData() {
-        console.log("建设用地使用权",this.propsParam);
-        console.log("this.getDictData('A30')",this.getDictData('A22'));
      init(this.propsParam.bsmRepair).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
-          console.log("this.ruleForm",this.ruleForm);
+            if( this.ruleForm.tdytqxList.length>0){
+            this.tdxz=this.ruleForm.tdytqxList[0].qlxzbm
+          }else{
+            this.tdxz=null
+          }
+          console.log("this.ruleForm", this.ruleForm);
          this.isShow = true;
        }
      });
    },
    // 更新土地用途信息
    upDateTdytxxList(val) {
-      console.log("VAL",val);
+      console.log("VAL", val);
      this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
      this.key++;
    },
    // 更新权利人信息
    upDateQlrxxList(val) {
-      console.log("val",val);
+      console.log("val", val);
      this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-      console.log("this.ruleForm.qlrData",this.ruleForm.qlrData);
+      console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
      this.czrOptions = this.ruleForm.qlrData;
      this.key++;
    },
@@ -286,7 +325,7 @@ export default {
      this.key++;
    },
    onSubmit() {
-      console.log("this.ruleForm大信息",this.ruleForm);
+      console.log("this.ruleForm大信息", this.ruleForm);
      if (this.ruleForm.qlrData.length == 0) {
        this.$message({
          showClose: true,
--- a/src/views/djbworkflow/mixin/index.js
View file @c905cbc
+++ b/src/views/djbworkflow/mixin/index.js
View file @c905cbc
@@ -7,7 +7,7 @@ import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
 import { getPrintTemplateByCode } from "@/api/system";
 import { getPrintApplicationInfo } from "@/api/fqsq";
 import { uploadUndo } from "@/api/clxx";
-import { deleteFlow } from "@/api/ywbl";
+import { deleteFlow } from "@/api/djbbl";
 import { getLodop } from "@/utils/LodopFuncs"
 import {
  stepExpandInfo,
@@ -243,18 +243,18 @@ export default {
      })
        .then(() => {
          console.log('删除流程');
-          // deleteFlow(formdata).then((res) => {
+          deleteFlow(formdata).then((res) => {
-          //   if (res.code === 200) {
+            if (res.code === 200) {
-          //     this.$message({
+              this.$message({
-          //       type: "success",
+                type: "success",
-          //       message: "删除成功!",
+                message: "删除成功!",
-          //     });
+              });
-          //     window.close();
+              window.close();
-          //     window.opener.getBpageList();
+              window.opener.getBpageList();
-          //   } else {
+            } else {
-          //     this.$message.error(res.message);
+              this.$message.error(res.message);
-          //   }
+            }
-          // });
+          });
        })
        .catch(() => {
          this.$message({