Merge remote-tracking branch 'origin/master'

夏齐
Showing 12 changed files with 43 additions and 54 deletions
src/api/workflow/diyaqFlow.js
src/styles/slxx/slxx.scss
src/views/jkfw/ptjk/ptjk.vue
src/views/workflow/components/qlrCommonTable.vue
src/views/ywbl/diyaq/slxx.vue
src/views/ywbl/diyaq/slxx200.vue
src/views/ywbl/fdcq2/slxx.vue
src/views/ywbl/fdcq2/slxx300.vue
src/views/ywbl/fwsyq/slxx.vue
src/views/ywbl/jsydsyq/slxx.vue
src/views/ywbl/ygdj/slxx.vue
src/views/ywbl/ygdj/slxx300.vue
--- a/src/api/workflow/diyaqFlow.js
View file @873061a
+++ b/src/api/workflow/diyaqFlow.js
View file @873061a
@@ -34,9 +34,13 @@ export function Init (data) {
    })
 }
 // 受理信息保存
-export function saveData  (data) {
+export function saveData  (data,djlx) {
+    let apiUrl = "/rest/ywbl/dyaq/saveData";
+    if(djlx=="400"){
+        apiUrl = "/rest/ywbl/dyaq/saveLogoutData";
+    }
    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/dyaq/saveData',
+        url: SERVER.SERVERAPI + apiUrl,
        method: 'post',
        data
    })
--- a/src/styles/slxx/slxx.scss
View file @873061a
+++ b/src/styles/slxx/slxx.scss
View file @873061a
@@ -2,7 +2,6 @@
  display: flex;
  flex-direction: column;
  height: calc(100vh - 130px);
-  background-color: aqua;
 }
 /deep/.el-form-item__label {
--- a/src/views/jkfw/ptjk/ptjk.vue
View file @873061a
+++ b/src/views/jkfw/ptjk/ptjk.vue
View file @873061a
@@ -27,25 +27,25 @@
    </div>
    <!-- 表格 -->
    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total"
+      <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
        :data="tableData.data">
      </lb-table>
    </div>
-    <addDialog ref="addDialog" v-model="addDialog" :editFlag="editFlag"/>
+    <addDialog ref="addDialog" v-model="addDialog" :editFlag="editFlag" />
-    <retrieveDialog ref="retrieveDialog" v-model="retrieveDialog"/>
+    <retrieveDialog ref="retrieveDialog" v-model="retrieveDialog" />
  </div>
 </template>
 <script>
 import { mapGetters } from 'vuex'
 import table from "@/utils/mixin/table"
 import { datas, sendThis } from "./ptjkdata"
-import { getSysInterfaceList} from '@/api/jkfw'
+import { getSysInterfaceList } from '@/api/jkfw'
 import addDialog from "./components/addDialog.vue"
 import retrieveDialog from "./components/retrieveDialog.vue"
 export default {
  name: "ptjk",
-  components: { addDialog,retrieveDialog },
+  components: { addDialog, retrieveDialog },
  mixins: [table],
  mounted () {
    sendThis(this);
@@ -73,11 +73,11 @@ export default {
    };
  },
  methods: {
-      queryClick(){
+    queryClick () {
      this.$startLoading()
      getSysInterfaceList({ ...this.ruleForm, ...this.pageData }, { 'target': '#ptjkLoading' }).then(res => {
        this.$endLoading()
-            if(res.code == 200){
+        if (res.code == 200) {
          let { total, records } = res.result
          this.tableData.total = total;
          this.tableData.data = records ? records : []
@@ -85,18 +85,18 @@ export default {
      })
    },
    //打开新增
-      openDialog(){
+    openDialog () {
      this.editFlag = false;
      this.addDialog = true;
    },
    //打开编辑
-      editInterface(item){
+    editInterface (item) {
      this.editFlag = true;
      this.addDialog = true;
      this.$refs.addDialog.getDetailInfo(item);
    },
    //打开调试窗口
-      tuneInterface(item){
+    tuneInterface (item) {
      this.retrieveDialog = true;
      this.$refs.retrieveDialog.getDetailInfo(item);
    }
--- a/src/views/workflow/components/qlrCommonTable.vue
View file @873061a
+++ b/src/views/workflow/components/qlrCommonTable.vue
View file @873061a
@@ -124,6 +124,7 @@ export default {
          this.column = this.InformationTable
        })
      },
+      immediate: true,
      deep: true
    },
    gyfs: {
--- a/src/views/ywbl/diyaq/slxx.vue
View file @873061a
+++ b/src/views/ywbl/diyaq/slxx.vue
View file @873061a
@@ -284,7 +284,7 @@ export default {
  },
  methods: {
    onSubmitClick () {
-      saveData(this.ruleForm).then((res) => {
+      saveData(this.ruleForm,this.propsParam.djlx).then((res) => {
        if (res.code === 200) {
          this.$message({
            showClose: true,
--- a/src/views/ywbl/diyaq/slxx200.vue
View file @873061a
+++ b/src/views/ywbl/diyaq/slxx200.vue
View file @873061a
@@ -216,7 +216,13 @@
        </div>
        <el-row :gutter="10">
          <el-col>
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
+            <el-form-item v-if="ruleForm.slywxx.djlx == '400'" :class="flag ? 'marginBot0' : ''" label="注销抵押原因："
+              prop="djyy">
+              <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
+                v-model="ruleForm.diyaq.zxdyyy">
+              </el-input>
+            </el-form-item>
+            <el-form-item v-else :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
              <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
                v-model="ruleForm.diyaq.djyy">
              </el-input>
@@ -272,7 +278,7 @@ export default {
  },
  methods: {
    onSubmitClick () {
-      saveData(this.ruleForm).then((res) => {
+      saveData(this.ruleForm,this.propsParam.djlx).then((res) => {
        if (res.code === 200) {
          this.$message({
            showClose: true,
--- a/src/views/ywbl/fdcq2/slxx.vue
View file @873061a
+++ b/src/views/ywbl/fdcq2/slxx.vue
View file @873061a
@@ -133,7 +133,8 @@
        <el-row :gutter="10">
          <el-col :span="14" v-if="ruleForm.qlxx">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
-              <el-radio-group :disabled="$route.query.viewtype == 1" @change="showCZInfo" v-model="ruleForm.slywxx.gyfs">
+              <el-radio-group :disabled="$route.query.viewtype == 1" @change="showCZInfo"
+                v-model="ruleForm.slywxx.gyfs">
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>
@@ -273,7 +274,6 @@ export default {
  display: flex;
  flex-direction: column;
  height: calc(100vh - 130px);
-  background-color: aqua;
 }
 /deep/.el-form-item__label {
--- a/src/views/ywbl/fdcq2/slxx300.vue
View file @873061a
+++ b/src/views/ywbl/fdcq2/slxx300.vue
View file @873061a
@@ -299,7 +299,6 @@ export default {
  display: flex;
  flex-direction: column;
  height: calc(100vh - 130px);
-  background-color: aqua;
 }
 /deep/.el-form-item__label {
--- a/src/views/ywbl/fwsyq/slxx.vue
View file @873061a
+++ b/src/views/ywbl/fwsyq/slxx.vue
View file @873061a
@@ -271,7 +271,6 @@ export default {
  display: flex;
  flex-direction: column;
  height: calc(100vh - 130px);
-  background-color: aqua;
 }
 /deep/.el-form-item__label {
--- a/src/views/ywbl/jsydsyq/slxx.vue
View file @873061a
+++ b/src/views/ywbl/jsydsyq/slxx.vue
View file @873061a
 <template>
  <!-- 受理信息 -->
  <div class="slxx">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
+    <el-form :model="ruleForm" :rules="rules" class="loadingtext" ref="ruleForm" :label-position="flag ? 'top' : ''"
-      label-width="120px">
+      :inline="flag" label-width="120px">
-      <div class="slxx_con">
+      <div class="slxx_con" v-if="isShow">
        <div class="slxx_title title-block">
          受理信息
          <div class="triangle"></div>
@@ -147,12 +147,12 @@
        </el-row>
        <qlrCommonTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList"
          :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
-        <div v-if="ruleForm.ywrList.length > 0">
+        <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0">
          <div class="slxx_title title-block">
            义务人信息
            <div class="triangle"></div>
          </div>
-          <qlrCommonTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList"
+          <qlrCommonTable v-if="ruleForm.ywrList" :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList"
            :viewtype="$route.query.viewtype" />
        </div>
@@ -183,45 +183,28 @@ import { mapGetters } from "vuex"
 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"
 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
 export default {
-  created () {
+  mounted () {
    this.propsParam = this.$attrs;
    var formdata = new FormData();
+    let that = this
+    this.$startLoading();
    formdata.append("bsmSldy", this.propsParam.bsmSldy);
    formdata.append("djlx", this.propsParam.djlx);
    Init(formdata).then((res) => {
-      this.ruleForm = res.result;
+      this.$nextTick(() => {
-      if (res.code === 200) {
+        that.ruleForm = res.result;
-        this.$store.dispatch('slxx/setQlrxxOld', {
+        that.$endLoading();
-          qlrxx: this.ruleForm.qlrxx,
+        that.isShow = true
-          fj: this.ruleForm.fj,
-          gyfs: this.ruleForm.gyfs,
-          djyy: this.ruleForm.djyy
      })
-      }
-      else {
-        this.$alert(res.message, '提示');
-      }
    })
  },
  components: { qlrCommonTable },
  computed: {
    ...mapGetters(["dictData", "flag"])
  },
-  watch: {
-    ruleForm: {
-      handler: function (newValue) {
-        this.$store.dispatch('slxx/setQlrxxNew', {
-          qlrxx: this.ruleForm.qlrxx,
-          fj: this.ruleForm.fj,
-          gyfs: this.ruleForm.gyfs,
-          djyy: this.ruleForm.djyy
-        })
-      },
-      deep: true
-    }
-  },
  data () {
    return {
+      isShow: false,
      disabled: true,
      czrOptions: [],
      ruleForm: {},
@@ -233,11 +216,11 @@ export default {
  methods: {
    // 更新权利人信息
    upDateQlrxxList (val) {
-      this.ruleForm.qlrList = _.cloneDeep(val);
+      this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val))
    },
    // 更新义务人信息
    upDateYwrxxList (val) {
-      this.ruleForm.ywrList = _.cloneDeep(val);
+      this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val))
    },
    onSubmit () {
      saveData(this.ruleForm).then((res) => {
--- a/src/views/ywbl/ygdj/slxx.vue
View file @873061a
+++ b/src/views/ywbl/ygdj/slxx.vue
View file @873061a
@@ -240,7 +240,6 @@ export default {
  display: flex;
  flex-direction: column;
  height: calc(100vh - 130px);
-  background-color: aqua;
 }
 /deep/.el-form-item__label {
--- a/src/views/ywbl/ygdj/slxx300.vue
View file @873061a
+++ b/src/views/ywbl/ygdj/slxx300.vue
View file @873061a
@@ -252,7 +252,6 @@ export default {
  display: flex;
  flex-direction: column;
  height: calc(100vh - 130px);
-  background-color: aqua;
 }
 /deep/.el-form-item__label {