禅道bug 融资盖章

front-vue/src/api/service/credit/message.js

@@ -45,4 +45,13 @@ export function contractSigning(query) {
     method: 'post',
     data: query
   })
+}
+
+//查询企业当前融信已盖章合同
+export function listStamped(query) {
+  return request({
+    url: '/sc-service/ownMessage/listStamped',
+    method: 'get',
+    params: query
+  })
 }

front-vue/src/api/service/financeRecord/record.js

@@ -116,4 +116,13 @@ export function cancelContract(data) {
     method: 'put',
     data: data
   })
+}
+
+//查询企业当前融信已盖章合同
+export function listStamped(query) {
+  return request({
+    url: '/sc-service/recordSeal/listStamped',
+    method: 'get',
+    params: query
+  })
 }

front-vue/src/views/service/credit/credit.vue

@@ -2835,7 +2835,7 @@ export default {
         }
       })
       listStatisticalAmount(this.queryParamsSign).then(response => {
-        this.ysxAmount = response.data.klzAmount;
+        this.ysxAmount = response.data.ysxAmount;
         })
       //this.listStatisticalAmount(this.queryParamsSign);
     })
@@ -2850,7 +2850,7 @@ export default {
         }
       })
       listStatisticalAmount(this.queryParamsFinancing).then(response => {
-        this.rzzAmount = response.data.klzAmount;
+        this.rzzAmount = response.data.rzzAmount;
         })
       //this.listStatisticalAmount(this.queryParamsFinancing);
     })

front-vue/src/views/service/financeRecord/addFinanceRecord.vue

@@ -423,17 +423,16 @@
     </el-dialog>
 
     <!-- 合同预览 -->
-    <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body>
+    <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body :show-close="pdfIsShow">
       <pdf-show
         :pdfFileList="pdfFileList"
         :zfiId="this.form.zfiId"
         :parent="parent"
       ></pdf-show>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="selectType">签署</el-button>
-        <el-button type="primary" plain="" @click="pdfShowDialog = false"
-          >取消</el-button
-        >
+        <el-button type="primary" @click="selectType" v-if="pdfIsShow">签署</el-button>
+        <el-button type="primary" plain="" @click="pdfShowDialog = false" v-if="pdfIsShow">取消</el-button>
+        <el-button type="primary" @click="closePDF" v-if="!pdfIsShow">确定</el-button>
       </span>
     </el-dialog>
 
@@ -597,6 +596,7 @@ export default {
   components: { DetailBill, pdfShow },
   data() {
     return {
+      pdfIsShow: true,
       //往来账款id
       zbiId: "",
       //融资账户是够编辑
@@ -1538,12 +1538,36 @@ export default {
             //关闭人脸二维码
             self.faceIsShow = false;
           }
-          self.cancel();
+          // self.cancel();
+          //关闭预览合同
+          //self.closePdfShow();
+          let queryStamped = {};
+          queryStamped.zfrId = this.zfrId
+          const load = self.$loading({
+            lock: true,
+            text: "Loading",
+            background: "rgba(0, 0, 0,0)",
+          });
+          listStamped(queryStamped).then((response) =>{
+            if(response.data){
+              this.pdfFileList = response.data.list;
+            }
+            this.pdfShowDialog = true;
+            this.pdfIsShow = false;
+            load.close()
+          }).catch((response) => {
+             load.close();
+          });
         })
         .catch((response) => {
           loading.close();
         });
     },
+    closePDF(){
+      this.cancel();
+          //关闭预览合同
+          this.closePdfShow();
+    }
   },
 };
 </script>

front-vue/src/views/service/financeRecord/financeRecord.vue

@@ -15,11 +15,11 @@
             <el-form-item prop="zfrValue" v-if="this.queryParams.zfrQuery" size="large">
                 <el-input v-model="queryParams.zfrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
+            <!-- <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
                 <el-select v-model="queryParams.zfrQueryStatus" clearable>
                     <el-option v-for="dict in queryStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="还款日期" prop="zfrRepaymentDate" label-width="96px" size="large">
                 <el-date-picker v-model="queryParams.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -40,11 +40,11 @@
             <el-form-item prop="zfrValue" v-if="this.queryParamsIng.zfrQuery" size="large">
                 <el-input v-model="queryParamsIng.zfrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
+            <!-- <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
                 <el-select v-model="queryParamsIng.zfrQueryStatus" clearable>
                     <el-option v-for="dict in queryStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
                 <el-date-picker v-model="queryParamsIng.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -65,11 +65,11 @@
             <el-form-item prop="zfrValue" v-if="this.queryParamsEnd.zfrQuery" size="large">
                 <el-input v-model="queryParamsEnd.zfrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
+            <!-- <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
                 <el-select v-model="queryParamsEnd.zfrQueryStatus" clearable>
                     <el-option v-for="dict in queryStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
                 <el-date-picker v-model="queryParamsEnd.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -90,11 +90,11 @@
             <el-form-item prop="zfrValue" v-if="this.queryParamsLose.zfrQuery && this.queryParamsLose.zfrQuery != '03' " size="large">
                 <el-input v-model="queryParamsLose.zfrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
+            <!-- <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
                 <el-select v-model="queryParamsLose.zfrQueryStatus" clearable>
                     <el-option v-for="dict in queryStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
                 <el-date-picker v-model="queryParamsLose.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -130,7 +130,7 @@
                         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
                             <template slot-scope="scope">
                                 <el-button class="zap-button-plain" size="mini" @click="handleDetail(scope.row)" v-hasPermi="['finance:record:query']">详情</el-button>
-                                <el-button class="zap-button-parimary" size="mini" type="primary" @click="handleLoan(scope.row)" v-hasPermi="['finance:record:edit']" v-if="scope.row.zfrStatus == '00' && scope.row.companyType ==('00' || '01')">放款登记</el-button>
+                                <el-button class="zap-button-parimary" size="mini" type="primary" @click="handleLoan(scope.row)" v-hasPermi="['finance:record:edit']" v-if="scope.row.zfrStatus == '00' && scope.row.companyType ==('00' || '03')">放款登记</el-button>
                                 <el-button class="zap-button-waring" size="mini" type="warning" @click="handleExport(scope.row)" v-hasPermi="['finance:record:export']">导出</el-button>
                                 <el-button class="zap-button-parimary" size="mini" type="primary" @click="seal(scope.row)" v-hasPermi="['finance:record:seal']" v-if="scope.row.zfrApproveStt == '01' && scope.row.zfrStatus == '04'">融资</el-button>
                                 <el-button class="zap-button-info" size="mini" @click="cancelFtp(scope.row)" v-if="scope.row.zfrApproveStt == '01' && scope.row.zfrStatus == '04'">作废</el-button>
@@ -166,7 +166,7 @@
                         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
                             <template slot-scope="scope">
                                 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)" v-hasPermi="['finance:record:query']">详情</el-button>
-                                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleLoan(scope.row)" v-hasPermi="['finance:record:edit']" v-if="scope.row.zfrStatus == '00' && scope.row.companyType ==('00' || '01')">放款登记</el-button>
+                                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleLoan(scope.row)" v-hasPermi="['finance:record:edit']" v-if="scope.row.zfrStatus == '00' && scope.row.companyType ==('00' || '03')">放款登记</el-button>
                                 <el-button size="mini" type="text" icon="el-icon-delete" @click="handleExport(scope.row)" v-hasPermi="['finance:record:export']">导出</el-button>
                                 <el-button size="mini" type="text" icon="el-icon-info" @click="handleFlowable(scope.row)" v-if="scope.row.zfrApproveStt == '00' || scope.row.zfrApproveStt == '02'">查看流程</el-button>
                             </template>
@@ -416,7 +416,7 @@ export default {
                 zfrTypes: "00",
                 zfrQuery: null,
                 zfrValue: null,
-                zfrQueryStatus: '05'
+                // zfrQueryStatus: '05'
             },
             queryParamsIng: {
                 pageNum: 1,
@@ -436,7 +436,7 @@ export default {
                 zfrTypes: "00",
                 zfrQuery: null,
                 zfrValue: null,
-                zfrQueryStatus: '05'
+                // zfrQueryStatus: '05'
             },
             queryParamsEnd: {
                 pageNum: 1,
@@ -456,7 +456,7 @@ export default {
                 zfrTypes: "00",
                 zfrQuery: null,
                 zfrValue: null,
-                zfrQueryStatus: '05'
+                // zfrQueryStatus: '05'
             },
             queryParamsLose: {
                 pageNum: 1,
@@ -476,7 +476,7 @@ export default {
                 zfrTypes: "00",
                 zfrQuery: null,
                 zfrValue: null,
-                zfrQueryStatus: '05'
+                // zfrQueryStatus: '05'
             },
             // 表单参数
             form: {},

front-vue/src/views/service/financeRecord/pdfShow.vue

@@ -85,7 +85,7 @@
                 </div>
             </el-dialog>
             <!--授权编号的短信框-->
-            <el-dialog  :title="授权短信验证"  :visible.sync="projectIsShow" width="800px"  append-to-body :before-close = "cancelProject" center>
+            <el-dialog  title="授权短信验证"  :visible.sync="projectIsShow" width="800px"  append-to-body :before-close = "cancelProject" center>
                 <el-form ref="projectForm"  :disabled="false" :model="projectForm"  v-if="projectIsShow" label-width="150px"  class="demo-form-inline" :inline="true">
                         <el-form-item label="验证码" prop="code">
                             <el-input v-model="projectForm.code" style="width: 200px" maxlength="6"  oninput="value=value.replace(/[^\d]/g,'')"/>

front-vue/src/views/service/financeRecord/recordSeal.vue

@@ -424,17 +424,17 @@
     </el-dialog>
 
     <!-- 合同预览 -->
-    <el-dialog title="合同预览" :visible.sync="pdfShowDialog" width="60%" append-to-body>
+    <el-dialog title="合同预览" :visible.sync="pdfShowDialog" width="60%" append-to-body :show-close="pdfIsShow">
       <pdf-show
         :pdfFileList="pdfFileList"
         :zfiId="this.form.zfiId"
         :parent="parent"
       ></pdf-show>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="selectType">签署</el-button>
-        <el-button type="primary" plain="" @click="pdfShowDialog = false"
-          >取消</el-button
-        >
+        <el-button type="primary" @click="selectType" v-if="pdfIsShow">签署</el-button>
+        <el-button type="primary" plain="" @click="pdfShowDialog = false" v-if="pdfIsShow"
+          >取消</el-button>
+          <el-button type="primary" @click="closePDF" v-if="!pdfIsShow">确定</el-button>
       </span>
     </el-dialog>
 
@@ -573,6 +573,7 @@ import {
   updateChargeStatus,
   listChargeStatus,
   cancelContract,
+  listStamped
 } from "@/api/service/financeRecord/record";
 import { listFinanceInf } from "@/api/common/financeInf";
 import { getFile } from "@/api/service/credit/credit";
@@ -601,6 +602,7 @@ export default {
   components: { DetailBill, pdfShow },
   data() {
     return {
+      pdfIsShow: true,
       //往来账款id
       zbiId: "",
       //融资账户是够编辑
@@ -1190,6 +1192,7 @@ export default {
           }
           //文件存在
           if (this.pdfFileList.length > 0) {
+            this.pdfIsShow = true
             this.pdfShowDialog = true;
           } else {
             this.$message({
@@ -1570,14 +1573,36 @@ export default {
             //关闭人脸二维码
             self.faceIsShow = false;
           }
-          self.cancel();
+          // self.cancel();
           //关闭预览合同
-          self.closePdfShow();
+          //self.closePdfShow();
+          let queryStamped = {};
+          queryStamped.zfrId = this.zfrId
+          const load = self.$loading({
+            lock: true,
+            text: "Loading",
+            background: "rgba(0, 0, 0,0)",
+          });
+          listStamped(queryStamped).then((response) =>{
+            if(response.data){
+              this.pdfFileList = response.data.list;
+            }
+            this.pdfShowDialog = true;
+            this.pdfIsShow = false;
+            load.close()
+          }).catch((response) => {
+             load.close();
+          });
         })
         .catch((response) => {
           loading.close();
         });
     },
+    closePDF(){
+      this.cancel();
+          //关闭预览合同
+          this.closePdfShow();
+    }
   },
 };
 </script>

front-vue/src/views/system/user/index.vue

@@ -348,6 +348,7 @@
             <el-col :span="12">
               <el-form-item label="手机号" prop="userName">
                 <el-input
+                clearable
                   v-model="form.userName"
                   placeholder="请输入手机号"
                   maxlength="11"
@@ -1484,19 +1485,37 @@ export default {
     },
     //上传前校验
     beforeAvatarUpload(file) {
-      const isJPG =
-        file.type === "image/jpeg" ||
-        file.type === "image/png" ||
-        file.type === "image/bmp";
-      const isLt2M = file.size / 1024 / 1024 < 3;
+      var testmsg = files.name.substring(files.name.lastIndexOf(".") + 1);
+            const extension = testmsg === "jpg";
+            const extension2 = testmsg === "jpeg";
+            const extension3 = testmsg === "png";
+            const extension4 = testmsg === "JPG";
+            const extension5 = testmsg === "JPEG";
+            const extension6 = testmsg === "PNG";
+            if (
+                !extension &&
+                !extension2 &&
+                !extension3 &&
+                !extension4 &&
+                !extension5 &&
+                !extension6
+            ) {
+                this.$message.warning(`请选择图片格式文件`);
+            }
+            return extension || extension2 || extension3;
+      // const isJPG =
+      //   file.type === "image/jpeg" ||
+      //   file.type === "image/png" ||
+      //   file.type === "image/bmp";
+      // const isLt2M = file.size / 1024 / 1024 < 3;
 
-      if (!isJPG) {
-        this.$message.error("上传图片只能是 JPG/PNG/BMP 格式");
-      }
-      if (!isLt2M) {
-        this.$message.error("上传图片大小不能超过 3MB");
-      }
-      return isJPG && isLt2M;
+      // if (!isJPG) {
+      //   this.$message.error("上传图片只能是 JPG/PNG/BMP 格式");
+      // }
+      // if (!isLt2M) {
+      //   this.$message.error("上传图片大小不能超过 3MB");
+      // }
+      // return isJPG && isLt2M;
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {