Merge branch 'dev' into 'master'

Dev

See merge request !3

@@ -65,10 +65,18 @@
             }
             }
           })
           })
         } else {
         } else {
-          getPrintTemplateByCode({ tmpno: Vue.prototype.BASE_API.adapter + '-2' }).then(res => {
+          // getPrintTemplateByCode({ tmpno: Vue.prototype.BASE_API.adapter + '-2' }).then(res => {
+          getPrintTemplateByCode({ tmpno: 'dysqs-bz-2' }).then(res => {
             if (res.code === 200) {
             if (res.code === 200) {
               getPrintApplicationForm(this.formData.bsmSldy).then(infoRes => {
               getPrintApplicationForm(this.formData.bsmSldy).then(infoRes => {
                 if (infoRes.code === 200) {
                 if (infoRes.code === 200) {
+                  if (infoRes.result.fileList && infoRes.result.fileList.length > 0) {
+                    infoRes.result.fileList.forEach((it, index) => {
+                      let key = index + 1
+                      this.$set(infoRes.result, "file" + key, it.sjmc)
+                    })
+                  }
+                  console.log(infoRes.result)
                   let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
                   let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
 
 
                   // 装载第一个模板并设置数据
                   // 装载第一个模板并设置数据

@@ -99,7 +99,7 @@
     }
     }
   };
   };
   import store from '@/store/index.js'
   import store from '@/store/index.js'
-  import { addQy, update } from "@/api/xxba.js"
+  import { addQy, update, addYh } from "@/api/xxba.js"
   import clxx from './clxx/index.vue'
   import clxx from './clxx/index.vue'
   export default {
   export default {
     props: {
     props: {
@@ -215,6 +215,7 @@
           that.$refs['ruleForm'].validate((valid) => {
           that.$refs['ruleForm'].validate((valid) => {
             if (valid) {
             if (valid) {
               store.dispatch("user/refreshPage", false);
               store.dispatch("user/refreshPage", false);
+              if (this.formData.QyYh == 1) {
                 addQy(this.ruleForm).then(res => {
                 addQy(this.ruleForm).then(res => {
                   if (res.code == 200) {
                   if (res.code == 200) {
                     that.$message.success('保存成功')
                     that.$message.success('保存成功')
@@ -229,6 +230,22 @@
                   }
                   }
                 })
                 })
               } else {
               } else {
+                addYh(this.ruleForm).then(res => {
+                  if (res.code == 200) {
+                    that.$message.success('保存成功')
+                    that.$emit("input", false);
+                    that.$refs['ruleForm'].resetFields();
+                    that.resetTableFields();
+                    that.closeDialog();
+                    //刷新列表
+                    store.dispatch("user/refreshPage", true);
+                  } else {
+                    that.$message.error(res.message);
+                  }
+                })
+              }
+
+            } else {
               this.$message.error('请完善表单');
               this.$message.error('请完善表单');
               return false;
               return false;
             }
             }

@@ -106,7 +106,7 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleAdd () {
       handleAdd () {
-        this.$popupDialog("添加企业", "xxba/components/addDialog", { isAdd: 1 }, "75%")
+        this.$popupDialog("添加企业", "xxba/components/addDialog", { isAdd: 1, QyYh: 1 }, "75%")
       },
       },
       /**
       /**
        * @description: handleDelete
        * @description: handleDelete

@@ -105,7 +105,7 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleAdd () {
       handleAdd () {
-        this.$popupDialog("添加银行", "xxba/components/addDialog", { isAdd: 1 }, "75%")
+        this.$popupDialog("添加银行", "xxba/components/addDialog", { isAdd: 1, QyYh: 2 }, "75%")
       },
       },
       /**
       /**
        * @description: handleDelete
        * @description: handleDelete