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

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 初始化内容
 export function Init(data) {
     let apiUrl = "";
-    switch (data.get("sqywbm")) {
-        case "B39300":
+    switch (data.get("djlx")) {
+        case "300":
             apiUrl = "/ywbl/cfdj/xfInit";
             break;
-        case "B39400":
+        case "400":
             apiUrl = "/ywbl/cfdj/jfInit";
             break;
-        case "B39800":
+        case "800":
             apiUrl = "/ywbl/cfdj/cfInit";
             break;
     }
@@ -20,11 +20,22 @@ export function Init(data) {
         data
     })
 }
-
-//批量查封
-export function cfBatchInit (data) {
+//批量初始化
+export function BatchInit(data) {
+    let apiUrl = "";
+    switch (data.get("djlx")) {
+        case "300":
+            apiUrl = "/ywbl/cfdj/xfBatchInit";
+            break;
+        case "400":
+            apiUrl = "/ywbl/cfdj/jfBatchInit";
+            break;
+        case "800":
+            apiUrl = "/ywbl/cfdj/cfBatchInit";
+            break;
+    }
     return request({
-        url: '/ywbl/cfdj/cfBatchInit',
+        url: apiUrl,
         method: 'post',
         data
     })

@@ -132,7 +132,7 @@
 </template>
 <script>
 import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
-import { cfBatchInit, batchSaveData } from "@/api/cfdjFlow.js";
+import { BatchInit, batchSaveData } from "@/api/cfdjFlow.js";
 import { mapGetters } from "vuex";
 export default {
   data () {
@@ -148,7 +148,15 @@ export default {
     };
   },
   created () {
-    this.list();
+    this.propsParam = this.$attrs;
+    var formdata = new FormData();
+    formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
+    formdata.append("djlx", this.propsParam.djlx);
+    BatchInit(formdata).then((res) => {
+      if (res.code === 200 && res.result) {
+        this.ruleForm = res.result
+      }
+    });
   },
   watch: {
 
@@ -169,15 +177,6 @@ export default {
   },
 
   methods: {
-    list () {
-      var formdata = new FormData();
-      formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
-      cfBatchInit(formdata).then((res) => {
-        if (res.code === 200 && res.result) {
-          this.ruleForm = res.result
-        }
-      });
-    },
     onSubmit () {
       this.ruleForm.bsmSlsq = this.$route.query.bsmSlsq;
       batchSaveData(this.ruleForm).then((res) => {

@@ -83,17 +83,17 @@
         <el-row :gutter="10">
            <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="权利人：" prop="qlxx.qlrmc">
-              <el-input disabled v-model="ruleForm.qlxx.ywrmc"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.qlrmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号：">
-              <el-input disabled v-model="ruleForm.qlxx.ywrzjhm"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.qlrzjhm"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类：">
-              <el-input disabled v-model="ruleForm.qlxx.ywrzjzl"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.qlrzjzl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -189,10 +189,17 @@ export default {
       ableEdit: false
     };
   },
-  created () {
+  async created () {
     this.propsParam = this.$attrs;
     this.ableEdit = this.$parent.showBatch;
-    this.list(this.propsParam.bsmSldy);
+    var formdata = new FormData();
+    formdata.append("bsmSldy", this.propsParam.bsmSldy);
+    formdata.append("djlx", this.propsParam.djlx);
+    Init(formdata).then((res) => {
+      if (res.code === 200 && res.result) {
+        this.ruleForm = res.result
+      }
+    });
   },
   watch: {
 
@@ -213,16 +220,6 @@ export default {
   },
 
   methods: {
-    list (bsmSldy) {
-      var formdata = new FormData();
-      formdata.append("bsmSldy", bsmSldy);
-      formdata.append("sqywbm", this.$route.query.sqywbm);
-      Init(formdata).then((res) => {
-        if (res.code === 200 && res.result) {
-          this.ruleForm = res.result
-        }
-      });
-    },
     onSubmit () {
       saveData(this.ruleForm).then((res) => {
         if (res.code === 200) {

@@ -58,7 +58,7 @@ import { datas, sendThis } from "../javascript/cfdj.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
-import { selectCfdj, startBusinessFlow } from "@/api/ywbl.js";
+import { selectCfdj, startBusinessFlow ,choiceBdcdy} from "@/api/ywbl.js";
 export default {
   props: {
     isJump: { type: Boolean, default: false },
@@ -102,6 +102,7 @@ export default {
         return;
       }
       this.saveloding = true;
+      if (!this.isJump) {
         startBusinessFlow({
           bsmSqyw: Cookies.get("bsmSqyw"),
           bdcdysz: this.bdcdysz,
@@ -115,15 +116,29 @@ export default {
               message: '发起申请成功',
               type: 'success'
             })
-          if (!this.isJump) {
             this.jump(res.result, this.djywbm)
           } else {
-            this.$emit('updateDialog', true)
+            this.$message.error(res.message);
           }
+        })
+      } else {
+        choiceBdcdy({
+          bsmSlsq: this.$route.query.bsmSlsq,
+          bdcdysz: this.bdcdysz
+        }).then(res => {
+          this.saveloding = false;
+          if (res.code == 200) {
+            this.$message({
+              showClose: true,
+              message: '发起申请成功',
+              type: 'success'
+            })
+            this.$emit('updateDialog', true)
           } else {
             this.$message.error(res.message);
           }
-      });
+        })
+      }
     },
     handleSelectionChange (val) {
       val.forEach((item, index) => {