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

@@ -97,7 +97,7 @@ loadingDirective.install = Vue => {
       const mask = new Mask({
         el: document.createElement('div'),
         data: {
-          text: vm && vm[textExr] || textExr,
+          text: vm && vm[textExr] || textExr || '正在加载中...',
           spinner: vm && vm[spinnerExr] || spinnerExr,
           background: vm && vm[backgroundExr] || backgroundExr,
           customClass: vm && vm[customClassExr] || customClassExr,

@@ -3,10 +3,6 @@
     <div v-show="visible" class="el-loading-mask" :style="{ backgroundColor: background || '' }"
       :class="[customClass, { 'is-fullscreen': fullscreen }]">
       <div class="el-loading-spinner">
-        <!-- <svg v-if="!spinner" class="circular" viewBox="25 25 50 50">
-          <circle class="path" cx="50" cy="50" r="20" fill="none" />
-        </svg>
-        <i v-else :class="spinner"></i> -->
         <img class="img" src="../../../image/progress.gif" alt="">
         <p v-if="text" class="el-loading-text">{{ text }}</p>
       </div>

@@ -3,10 +3,6 @@
     <div v-show="visible" class="el-loading-mask" :style="{ backgroundColor: background || '' }"
       :class="[customClass, { 'is-fullscreen': fullscreen }]">
       <div class="el-loading-spinner">
-        <!-- <svg v-if="!spinner" class="circular" viewBox="25 25 50 50">
-          <circle class="path" cx="50" cy="50" r="20" fill="none" />
-        </svg>
-        <i v-else :class="spinner"></i> -->
         <img class="img" src="../../../image/progress.gif" alt="">
         <p v-if="text" class="el-loading-text">{{ text }}</p>
       </div>

@@ -93,7 +93,7 @@
           <i class="el-icon-s-unfold pointer"></i>
         </div>
         <ul>
-          <li v-for="(item, index) in doneList.slice(0, 10)" :key="index" class="flexst dynamicInfo">
+          <li v-for="(item, index) in doneList.slice(0, 13)" :key="index" class="flexst dynamicInfo">
             <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
             <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
           </li>

 <template>
-    <dialogBox title="常用意见" width="60%" isMain v-model="value" @closeDialog="closeDialog" :isButton="false">
   <div>
+    <dialogBox title="常用意见" :fullscreen="false" width="60%" isMain v-model="value" @closeDialog="closeDialog"
+      :isButton="false">
       <el-button type="primary" native-type="submit" @click="openDialog()">新增常用</el-button>
-        <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total"
-            @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="columns"
-            :data="tableData.data">
+      <lb-table :page-size="pageData.size" heightNumSetting :current-page.sync="pageData.current"
+        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+        :column="columns" :data="tableData.data">
       </lb-table>
-        <el-dialog title="新增意见" :visible.sync="addDialog" width="50%" :modal="false" top="30vh">
+      <div style="height:15px"></div>
+    </dialogBox>
+    <el-dialog title="新增意见" custom-class="dialogBox" :visible.sync="addDialog" width="50%" :append-to-body="true"
+      :modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item prop="commonOpinion">
           <div class="invalid-reson">常用意见：</div>
@@ -14,24 +18,17 @@
         </el-form-item>
         <el-form-item>
           <div class="dialog-footer">
-                    <el-button @click="closeaddDiglog()">取 消</el-button>
-                    <el-button type="primary" @click="addOpinion()">确 定</el-button>
+            <el-button @click="closeaddDiglog">取 消</el-button>
+            <el-button type="primary" @click="addOpinion">确 定</el-button>
           </div>
         </el-form-item>
       </el-form>
-            <!-- <div class="invalid-reson">常用意见：</div>
-            <el-input v-model="commonOpinion" placeholder="请输入常用意见" type="textarea" :rows="4"></el-input>
-            <div class="dialog-footer">
-                <el-button @click="closeaddDiglog()">取 消</el-button>
-                <el-button type="primary" @click="addOpinion()">确 定</el-button>
-            </div> -->
     </el-dialog>
   </div>
-    </dialogBox>
 </template>
 <script>
 import table from "@/utils/mixin/table";
-import { getUserCommonOpinion,addUserCommonOpinion,delUserCommonOpinion } from "@/api/fqsq.js"
+import { getUserCommonOpinion, addUserCommonOpinion, delUserCommonOpinion } from "@/api/fqsq.js"
 export default {
   components: {},
   mixins: [table],
@@ -78,11 +75,11 @@ export default {
       addDialog: false,
     }
   },
-  mounted() {
-      this.queryClick ()
+  mounted () {
+    this.queryClick()
   },
   methods: {
-    queryClick (){
+    queryClick () {
       getUserCommonOpinion(this.pageData).then(res => {
         let { total, records } = res.result
         this.tableData.total = total;
@@ -90,14 +87,14 @@ export default {
       })
     },
     //新增常用意见
-    addOpinion(){
+    addOpinion () {
       this.$refs.form.validate(valid => {
         if (valid) {
-          addUserCommonOpinion({commonOpinion: this.form.commonOpinion}).then(res => {
-            if(res.code == 200){
+          addUserCommonOpinion({ commonOpinion: this.form.commonOpinion }).then(res => {
+            if (res.code == 200) {
               this.closeaddDiglog();
               this.queryList()
-            }else{
+            } else {
               this.$message.error(res.message)
             }
           })
@@ -108,31 +105,31 @@ export default {
       });
     },
     //打开新增弹窗
-    openDialog() {
+    openDialog () {
       this.addDialog = true
     },
     //关闭新增弹窗
-    closeaddDiglog() {
+    closeaddDiglog () {
       this.addDialog = false;
-      this.form.commonOpinion = "";
+      this.$refs['form'].resetFields();
     },
     //使用常用意见
-    useCommonOpinion(item){
+    useCommonOpinion (item) {
       this.$parent.useOpinion(item.opinion);
       this.$emit("input", false);
     },
     //删除常用意见
-    deleteOpinion(item){
+    deleteOpinion (item) {
       this.$confirm("确定要删除吗, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-          delUserCommonOpinion({bsmOpinion: item.bsmOpinion}).then(res => {
-            if(res.code == 200){
+        delUserCommonOpinion({ bsmOpinion: item.bsmOpinion }).then(res => {
+          if (res.code == 200) {
             this.$message.success("删除成功")
             this.queryClick()
-            }else{
+          } else {
             this.$message.error(res.message)
           }
         })
@@ -153,12 +150,16 @@ export default {
 }
 </script>
 <style scoped lang='scss'>
-  .invalid-reson {
+@import "~@/styles/mixin.scss";
+@import "~@/styles/dialogBox.scss";
+
+.invalid-reson {
   margin-bottom: 10px;
-  }
-  .dialog-footer {
+}
+
+.dialog-footer {
   margin-top: 10px;
   display: flex;
   justify-content: flex-end;
-  }
+}
 </style>
\ No newline at end of file

 <template>
-  <div class="from-clues loadingtext" v-Loading="loading" style="height:720px">
+  <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px">
     <!-- 表单部分 -->
     <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length > 1">
       <el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bsmBdcqz"

 <template>
   <!-- 受理信息 -->
   <div class="slxx">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
-      label-width="140px">
+    <el-form :model="ruleForm" :rules="rules" class="loadingtext" ref="ruleForm" :label-position="flag ? 'top' : ''"
+      :inline="flag" label-width="140px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           受理信息
@@ -107,7 +107,6 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="抵押方式：">
-              <!-- <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input> -->
               <el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
                 <el-radio label="1">一般抵押</el-radio>
                 <el-radio label="2">最高额抵押</el-radio>
@@ -150,8 +149,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-
         <el-row>
           <el-col :span="24">
             <el-form-item label="担保范围：">
@@ -249,15 +246,17 @@ import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
 import { Init, saveData } from "@/api/workflow/diyaqFlow.js";
 import { mapGetters } from "vuex";
 export default {
-  async created () {
+  mounted () {
     this.propsParam = this.$attrs;
     var formdata = new FormData();
+    this.$startLoading();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
     formdata.append("djlx", this.propsParam.djlx);
     Init(formdata).then((res) => {
       if (res.code === 200 && res.result) {
         this.ruleForm = res.result;
+        this.$endLoading();
         this.ruleForm.diyaq.sfczjzhxz = "0";
       }
     })

 <template>
   <!-- 受理信息 -->
   <div class="slxx">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
-      label-width="140px">
+    <el-form :model="ruleForm" :rules="rules" class="loadingtext" ref="ruleForm" :label-position="flag ? 'top' : ''"
+      :inline="flag" label-width="140px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           受理信息
@@ -243,15 +243,17 @@ import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
 import { Init, saveData } from "@/api/workflow/diyaqFlow.js";
 import { mapGetters } from "vuex";
 export default {
-  async created () {
+  mounted () {
     this.propsParam = this.$attrs;
     var formdata = new FormData();
+    this.$startLoading();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
     formdata.append("djlx", this.propsParam.djlx);
     Init(formdata).then((res) => {
       if (res.code === 200 && res.result) {
         this.ruleForm = res.result;
+        this.$endLoading();
         this.ruleForm.diyaq.sfczjzhxz = "0";
       }
     });

 <template>
   <!-- 受理信息 -->
   <div class="slxx">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
-      label-width="120px">
+    <el-form :model="ruleForm" :rules="rules" class="loadingtext" ref="ruleForm" :label-position="flag ? 'top' : ''"
+      :inline="flag" label-width="120px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           受理信息
@@ -186,14 +186,16 @@ import { mapGetters } from "vuex";
 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
 export default {
-  async created () {
+  mounted () {
     this.propsParam = this.$attrs;
     var formdata = new FormData();
+    this.$startLoading();
     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;
+        this.$endLoading();
       }
     });
   },

 <template>
   <!-- 受理信息 -->
   <div class="slxx">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
-      label-width="120px">
+    <el-form :model="ruleForm" :rules="rules" class="loadingtext" ref="ruleForm" :label-position="flag ? 'top' : ''"
+      :inline="flag" label-width="120px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           受理信息
@@ -237,14 +237,16 @@ import { Init, saveData } from "@/api/workflow/nydsyqFlow.js"
 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
 import JtcyTable from "@/views/workflow/components/JtcyTable"
 export default {
-  created () {
+  mounted () {
     this.ableOperation = this.$parent.currentSelectTab.ableOperation
     this.propsParam = this.$attrs;
+    this.$startLoading();
     var formdata = new FormData();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("djlx", this.propsParam.djlx);
     Init(formdata).then((res) => {
       this.ruleForm = res.result;
+      this.$endLoading();
       if (res.code === 200) {
       }
       else {

 <template>
   <!-- 受理信息 -->
   <div class="slxx">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
-      label-width="120px">
+    <el-form :model="ruleForm" :rules="rules" class="loadingtext" ref="ruleForm" :label-position="flag ? 'top' : ''"
+      :inline="flag" label-width="120px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           受理信息
@@ -243,13 +243,15 @@ import { Init, saveData } from "@/api/workflow/nydsyqFlow.js"
 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
 import JtcyTable from "@/views/workflow/components/JtcyTable"
 export default {
-  created () {
+  mounted () {
     this.propsParam = this.$attrs;
     var formdata = new FormData();
+    this.$startLoading();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("djlx", this.propsParam.djlx);
     Init(formdata).then((res) => {
       this.ruleForm = res.result;
+      this.$endLoading();
       if (res.code === 200) {
       }
       else {

 <template>
   <!-- 受理信息 -->
   <div class="slxx">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
-      label-width="120px">
+    <el-form :model="ruleForm" :rules="rules" class="loadingtext" ref="ruleForm" :label-position="flag ? 'top' : ''"
+      :inline="flag" label-width="120px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           受理信息
@@ -177,14 +177,15 @@ import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
 import { Init, saveData } from "@/api/workflow/ygdjFlow.js";
 import { mapGetters } from "vuex";
 export default {
-  async created () {
-    //this.propsParam = this.$attrs;
+  mounted () {
+    this.$startLoading();
     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.$endLoading();
         this.ruleForm = res.result;
       }
     })

 <template>
   <!-- 受理信息 -->
   <div class="slxx">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
-      label-width="120px">
+    <el-form :model="ruleForm" :rules="rules" class="loadingtext" ref="ruleForm" :label-position="flag ? 'top' : ''"
+      :inline="flag" label-width="120px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           受理信息
@@ -180,13 +180,15 @@ import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
 import { Init, saveData } from "@/api/workflow/ygdjFlow.js";
 import { mapGetters } from "vuex";
 export default {
-  async created () {
+  mounted () {
     this.propsParam = this.$attrs;
     var formdata = new FormData();
+    this.$startLoading();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("djlx", this.propsParam.djlx);
     Init(formdata).then((res) => {
       if (res.code === 200 && res.result) {
+        this.$endLoading();
         this.ruleForm = res.result;
       }
     });

 <template>
   <!-- 受理信息 -->
   <div class="slxx">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
-      label-width="120px">
+    <el-form :model="ruleForm" :rules="rules" v-Loading="loading" ref="ruleForm" :label-position="flag ? 'top' : ''"
+      :inline="flag" label-width="120px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           受理信息
@@ -184,15 +184,20 @@ import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
 import { Init, saveData } from "@/api/workflow/ygdyFlow.js";
 import { mapGetters } from "vuex";
 export default {
-  async created () {
+  created () {
     this.propsParam = this.$attrs;
     var formdata = new FormData();
+    let that = this
+    this.loading = true
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
     formdata.append("djlx", this.propsParam.djlx);
     Init(formdata).then((res) => {
       if (res.code === 200 && res.result) {
-        this.ruleForm = res.result;
+        that.ruleForm = res.result;
+        setTimeout(() => {
+          that.loading = false
+        }, 300)
       }
     });
   },
@@ -202,6 +207,7 @@ export default {
   },
   data () {
     return {
+      loading: false,
       disabled: true,
       tdytOption: [],
       czrOptions: [],
@@ -220,7 +226,6 @@ export default {
     upDateYwrxxList (val) {
       this.ruleForm.ywrList = _.cloneDeep(val);
     },
-
     onSubmit () {
       saveData(this.ruleForm).then((res) => {
         if (res.code === 200) {
@@ -243,76 +248,5 @@ export default {
 </script>
 <style scoped lang='scss'>
 @import "~@/styles/public.scss";
-
-/deep/.el-form {
-  display: flex;
-  flex-direction: column;
-  height: calc(100vh - 130px);
-}
-
-/deep/.el-form-item__label {
-  padding: 0;
-}
-
-/deep/.el-radio {
-  margin-right: 10px;
-}
-
-/deep/.el-select {
-  width: 100%;
-}
-
-/deep/.el-form-item {
-  margin-bottom: 8px;
-}
-
-.marginBot0 {
-  margin-bottom: 0 !important;
-}
-
-.slxx {
-  box-sizing: border-box;
-}
-
-.slxx_con {
-  flex: 1;
-  height: 100%;
-  background-color: #ffffff;
-  overflow-y: auto;
-  padding-right: 3px;
-  overflow-x: hidden;
-}
-
-.submit_btn {
-  height: 50px;
-}
-
-.slxx_title {
-  border-bottom: 1px solid $borderColor;
-  padding-left: 10px;
-  padding-bottom: 5px;
-  margin-bottom: 10px;
-  margin-top: 5px;
-  font-size: 16px;
-  font-weight: 500;
-  color: #4a4a4a;
-}
-
-.btn {
-  text-align: center;
-  padding-top: 10px;
-  height: 36px;
-  background-color: #ffffff;
-  padding: 5px 0;
-}
-
-.textArea {
-  /deep/.el-textarea__inner {
-    min-height: 90px !important;
-  }
-}
-
-/deep/.el-form-item__label {
-  padding-bottom: 0px;
-}
+@import "~@/styles/slxx/slxx.scss";
 </style>

 <template>
   <!-- 受理信息 -->
   <div class="slxx">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
-      label-width="140px">
+    <el-form :model="ruleForm" :rules="rules" class="loadingtext" ref="ruleForm" :label-position="flag ? 'top' : ''"
+      :inline="flag" label-width="140px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           受理信息
@@ -249,15 +249,17 @@ import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
 import { Init, saveData } from "@/api/workflow/zjgcdyFlow.js";
 import { mapGetters } from "vuex";
 export default {
-  async created () {
+  mounted () {
     this.propsParam = this.$attrs;
     var formdata = new FormData();
+    this.$startLoading();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
     formdata.append("djlx", this.propsParam.djlx);
     Init(formdata).then((res) => {
       if (res.code === 200 && res.result) {
         this.ruleForm = res.result;
+        this.$endLoading();
         this.ruleForm.diyaq.sfczjzhxz = "0";
       }
     })