Merge branch 'master' of http://git.minpay.cc/SupplyChain/front

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

@@ -35,4 +35,13 @@ export function getContractFile(data) {
     method: 'put',
     data: data
   })
-}
+}
+
+//拒签
+export function creditRefuse(data){
+    return request({
+      url: '/sc-service/ownCreditHandle/creditRefuse',
+      method: 'put',
+      data: data
+    })
+  }

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

@@ -192,6 +192,7 @@
             v-hasPermi="['credit:credit:approve']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus == '00' && (scope.row.zfiCoreStatus == '' || scope.row.zfiCoreStatus == null || scope.row.zfiCoreStatus =='null')"
           >确权</el-button>
+          <!--原补充资料-->
           <el-button
             size="mini"
             type="text"
@@ -199,7 +200,7 @@
             @click="handleAddInformation(scope.row)"
             v-hasPermi="['credit:credit:addInfor']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null')"
-          >补充资料</el-button>
+          >签收</el-button>
           <el-button
             size="mini"
             type="text"
@@ -212,6 +213,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            @click="handleRefuse(scope.row)"
+            v-hasPermi="['credit:credit:refuse']"
+            v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null') "
+          >拒签</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleGoFinance(scope.row)"
             v-hasPermi="['finance:record:add']"
             v-if="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'"
@@ -257,14 +266,14 @@
             v-hasPermi="['credit:credit:approval']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiSupplierStatus =='03'"
           >融资申请审批</el-button>
-          <el-button
+     <!--      <el-button
             size="mini"
             type="text"
             icon="el-icon-s-check"
             @click="handleApprovals(scope.row)"
             v-hasPermi="['credit:information:approval']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiSupplierStatus=='03'"
-          >补充资料审批</el-button>
+          >补充资料审批</el-button> -->
           <el-button
             type="text"
             size="mini"
@@ -476,6 +485,7 @@
             v-hasPermi="['credit:credit:approve']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus == '00' && (scope.row.zfiCoreStatus == '' || scope.row.zfiCoreStatus == null || scope.row.zfiCoreStatus =='null')"
           >确权</el-button>
+           <!--原补充资料-->
           <el-button
             size="mini"
             type="text"
@@ -483,7 +493,7 @@
             @click="handleAddInformation(scope.row)"
             v-hasPermi="['credit:credit:addInfor']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null')"
-          >补充资料</el-button>
+          >签收</el-button>
           <el-button
             size="mini"
             type="text"
@@ -496,6 +506,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            @click="handleRefuse(scope.row)"
+            v-hasPermi="['credit:credit:refuse']"
+            v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null') "
+          >拒签</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleGoFinance(scope.row)"
             v-hasPermi="['credit:credit:goFinance']"
             v-if="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'"
@@ -541,14 +559,14 @@
             v-hasPermi="['credit:credit:approval']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiSupplierStatus =='03'"
           >融资申请审批</el-button>
-          <el-button
+      <!--     <el-button
             size="mini"
             type="text"
             icon="el-icon-s-check"
             @click="handleApprovals(scope.row)"
             v-hasPermi="['credit:information:approval']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiSupplierStatus=='03'"
-          >补充资料审批</el-button>
+          >补充资料审批</el-button> -->
           <el-button
             type="text"
             size="mini"
@@ -760,6 +778,7 @@
             v-hasPermi="['credit:credit:approve']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus == '00' && (scope.row.zfiCoreStatus == '' || scope.row.zfiCoreStatus == null || scope.row.zfiCoreStatus =='null')"
           >确权</el-button>
+          <!--原补充资料-->
           <el-button
             size="mini"
             type="text"
@@ -767,7 +786,7 @@
             @click="handleAddInformation(scope.row)"
             v-hasPermi="['credit:credit:addInfor']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null')"
-          >补充资料</el-button>
+          >签收</el-button>
           <el-button
             size="mini"
             type="text"
@@ -780,6 +799,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            @click="handleRefuse(scope.row)"
+            v-hasPermi="['credit:credit:refuse']"
+            v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null') "
+          >拒签</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleGoFinance(scope.row)"
             v-hasPermi="['credit:credit:goFinance']"
             v-if="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'"
@@ -825,14 +852,14 @@
             v-hasPermi="['credit:credit:approval']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiSupplierStatus =='03'"
           >融资申请审批</el-button>
-          <el-button
+       <!--    <el-button
             size="mini"
             type="text"
             icon="el-icon-s-check"
             @click="handleApprovals(scope.row)"
             v-hasPermi="['credit:information:approval']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiSupplierStatus=='03'"
-          >补充资料审批</el-button>
+          >补充资料审批</el-button> -->
           <el-button
             type="text"
             size="mini"
@@ -1044,6 +1071,7 @@
             v-hasPermi="['credit:credit:approve']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus == '00' && (scope.row.zfiCoreStatus == '' || scope.row.zfiCoreStatus == null || scope.row.zfiCoreStatus =='null')"
           >确权</el-button>
+          <!--原补充资料-->
           <el-button
             size="mini"
             type="text"
@@ -1051,7 +1079,7 @@
             @click="handleAddInformation(scope.row)"
             v-hasPermi="['credit:credit:addInfor']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null')"
-          >补充资料</el-button>
+          >签收</el-button>
           <el-button
             size="mini"
             type="text"
@@ -1064,6 +1092,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            @click="handleRefuse(scope.row)"
+            v-hasPermi="['credit:credit:refuse']"
+            v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null') "
+          >拒签</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleGoFinance(scope.row)"
             v-hasPermi="['credit:credit:goFinance']"
             v-if="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'"
@@ -1109,14 +1145,14 @@
             v-hasPermi="['credit:credit:approval']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiSupplierStatus =='03'"
           >融资申请审批</el-button>
-          <el-button
+       <!--    <el-button
             size="mini"
             type="text"
             icon="el-icon-s-check"
             @click="handleApprovals(scope.row)"
             v-hasPermi="['credit:information:approval']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiSupplierStatus=='03'"
-          >补充资料审批</el-button>
+          >补充资料审批</el-button> -->
           <el-button
             type="text"
             size="mini"
@@ -1328,6 +1364,7 @@
             v-hasPermi="['credit:credit:approve']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus == '00' && (scope.row.zfiCoreStatus == '' || scope.row.zfiCoreStatus == null || scope.row.zfiCoreStatus =='null')"
           >确权</el-button>
+          <!--原补充资料-->
           <el-button
             size="mini"
             type="text"
@@ -1335,7 +1372,7 @@
             @click="handleAddInformation(scope.row)"
             v-hasPermi="['credit:credit:addInfor']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null')"
-          >补充资料</el-button>
+          >签收</el-button>
           <el-button
             size="mini"
             type="text"
@@ -1348,6 +1385,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            @click="handleRefuse(scope.row)"
+            v-hasPermi="['credit:credit:refuse']"
+            v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null') "
+          >拒签</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleGoFinance(scope.row)"
             v-hasPermi="['credit:credit:goFinance']"
             v-if="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'"
@@ -1393,14 +1438,14 @@
             v-hasPermi="['credit:credit:approval']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiSupplierStatus =='03'"
           >融资申请审批</el-button>
-          <el-button
+       <!--    <el-button
             size="mini"
             type="text"
             icon="el-icon-s-check"
             @click="handleApprovals(scope.row)"
             v-hasPermi="['credit:information:approval']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiSupplierStatus=='03'"
-          >补充资料审批</el-button>
+          >补充资料审批</el-button> -->
           <el-button
             type="text"
             size="mini"
@@ -1612,6 +1657,7 @@
             v-hasPermi="['credit:credit:approve']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus == '00' && (scope.row.zfiCoreStatus == '' || scope.row.zfiCoreStatus == null || scope.row.zfiCoreStatus =='null')"
           >确权</el-button>
+          <!--原补充资料-->
           <el-button
             size="mini"
             type="text"
@@ -1619,7 +1665,7 @@
             @click="handleAddInformation(scope.row)"
             v-hasPermi="['credit:credit:addInfor']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null')"
-          >补充资料</el-button>
+          >签收</el-button>
           <el-button
             size="mini"
             type="text"
@@ -1632,6 +1678,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            @click="handleRefuse(scope.row)"
+            v-hasPermi="['credit:credit:refuse']"
+            v-if="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null') "
+          >拒签</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleGoFinance(scope.row)"
             v-hasPermi="['credit:credit:goFinance']"
             v-if="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'"
@@ -1677,14 +1731,14 @@
             v-hasPermi="['credit:credit:approval']"
             v-if="scope.row.zfiCreateType == '0' && scope.row.zfiSupplierStatus =='03'"
           >融资申请审批</el-button>
-          <el-button
+       <!--    <el-button
             size="mini"
             type="text"
             icon="el-icon-s-check"
             @click="handleApprovals(scope.row)"
             v-hasPermi="['credit:information:approval']"
             v-if="scope.row.zfiCreateType == '1' && scope.row.zfiSupplierStatus=='03'"
-          >补充资料审批</el-button>
+          >补充资料审批</el-button> -->
           <el-button
             type="text"
             size="mini"
@@ -1709,6 +1763,7 @@
 
 <script>
 import { listCredit, coreApproval, confirmationApproval, informationApproval,approval,openApproval, getUser } from "@/api/service/credit/credit";
+import {creditRefuse} from "@/api/service/credit/creditHandle";
 import Editor from '@/components/Editor';
 import Cookies from 'js-cookie'
 export default {
@@ -2280,6 +2335,33 @@ export default {
         Cookies.set("/credit/creditApply/", this.$route.fullPath);
         this.$router.push({ path: "/credit/creditApply/" });
     },
+    //拒签
+    handleRefuse(row){
+      const zfiNumber = row.zfiNumber ;
+      this.$confirm('是否拒签审批融信编号为"' + zfiNumber + '"的数据项?', "警告",{
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          //拒签
+          return creditRefuse(row); 
+        }).then(() => {
+          this.getList();
+          this.getListSign();
+          this.getListFinancing();
+          this.getListOpening();
+          this.getListFinanced();
+          this.getListInvalid();
+          this.msgSuccess("拒签成功");
+        })
+        .catch(() => {
+          this.$message({
+            type: "warning",
+            message: "已取消",
+           
+          });
+        });
+    },
     //列表格式化金额
     moneyFormat(row, column, cellValue) {
         if(cellValue == null || cellValue== undefined || cellValue == ''){
@@ -2306,7 +2388,8 @@ export default {
             return cellValue.replace(/(\d)(?=(\d{3})+\.)/g, function ($0, $1) {
               return $1 + ',';
             }).replace(/\.$/, '');
-    }
+    },
+    
     
 
   }

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

@@ -183,8 +183,8 @@
                         <el-input v-model="messageForm.validCode" style="width: 200px" maxlength="6"/>
                     </el-form-item>
                     <el-form-item> 
-                        <el-button  v-show="show"  type="success" @click="send">点击获取验证码</el-button>
-                        <el-button v-show="!show" type="success" disabled><span>{{timer}}</span>秒后重新获取</el-button>
+                        <el-button  v-show="messShow"  type="success" @click="send">点击获取验证码</el-button>
+                        <el-button v-show="!messShow" type="success" disabled><span>{{timer}}</span>秒后重新获取</el-button>
                     </el-form-item>
                     
             </el-form>
@@ -273,7 +273,7 @@ export default {
             //人脸识别结果传参
             authForm:{},
             //控制短信验证码倒计时是否展示
-            show:true,
+            messShow:true,
             timer:60,
             openFile:false,
             wordUrl: "",
@@ -510,7 +510,6 @@ export default {
                     this.checking();
                 }
         }
-
     },
     //文件下载
     handleDownload(row){
@@ -602,13 +601,13 @@ export default {
                     var newIphone = response.data.newIphone;
                     //结果
                     var result = response.data.result;
-                    this.show = false;
+                    this.messShow = false;
                     let auth_timer = window.setInterval(() => {
-                        this.show = false;
+                        this.messShow = false;
                         setTimeout(() => {
                                 this.timer--;
                                 if(this.timer <= 0 ){
-                                    this.show = true;
+                                    this.messShow = true;
                                     clearInterval(auth_timer);
                                 }
                             }, 0)

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

@@ -112,7 +112,7 @@
         </el-table>
         <div class="footer" style="float: right;
             margin-bottom:2px;">
-            <el-button type="info" @click="submitForm('01')">拒签</el-button>
+           <!--  <el-button type="info" @click="submitForm('01')">拒签</el-button> -->
             <el-button type="primary" @click="submitForm('00')">签收</el-button>
             <el-button @click="cancel">取 消</el-button>
         </div>