ソースを参照

流程bug修改

ch 4 年 前
コミット
4d11ee3e07

+ 1 - 0
front-vue/src/views/service/contract/addContract.vue

@@ -21,6 +21,7 @@
             <el-input
               v-model="form.zfcName"
               placeholder="请输入合同模板名称"
+              maxlength="20"
             /> </el-form-item
         ></el-col>
         <el-col :span="8"

+ 1 - 2
front-vue/src/views/service/contract/contract.vue

@@ -109,6 +109,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDel(scope.row)"
+            v-if="scope.row.zfcStatus == '01'"
             v-hasPermi="['service:contract:delete']"
           >删除</el-button>
         </template>
@@ -341,8 +342,6 @@ export default {
           zfcNodeList +=",";
         }
       }
-
-
       return zfcNodeList;
     },
      //签署节点字典反显

+ 4 - 4
front-vue/src/views/service/contract/detailContract.vue

@@ -159,7 +159,7 @@
           :auto-upload="false"
           style="width:800px"
         >
-          <el-button slot="trigger" size="small" type="primary"
+          <!-- <el-button slot="trigger" size="small" type="primary"
             >点击选择</el-button
           >
           <el-button
@@ -168,16 +168,16 @@
             type="success"
             @click="submitUpload"
             >上传到服务器</el-button
-          >
+          > -->
         </el-upload>
       </el-form-item>
 
     </el-form>
     <!-- 保存 -->
-    <div class="footer" style="margin-top: 260px; float: right">
+    <!-- <div class="footer" style="margin-top: 260px; float: right">
       <el-button type="info" @click="cancel">取消</el-button>
       <el-button type="success" @click="submitForm">提交</el-button>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 1 - 0
front-vue/src/views/service/contract/editContract.vue

@@ -21,6 +21,7 @@
             <el-input
               v-model="form.zfcName"
               placeholder="请输入合同模板名称"
+              maxlength="20"
             /> </el-form-item
         ></el-col>
         <el-col :span="8"

+ 19 - 11
front-vue/src/views/service/financeProduct/addFinanceProduct.vue

@@ -6,7 +6,7 @@
           <el-input v-model="form.zfpNumber" placeholder="请输入融资产品编号" />
         </el-form-item> -->
         <el-form-item label="融资产品名称:" prop="zfpName" style="margin-left: 5%">
-          <el-input v-model="form.zfpName" placeholder="请输入融资产品名称" />
+          <el-input v-model="form.zfpName" placeholder="请输入融资产品名称" maxlength="20"/>
         </el-form-item>
         <el-form-item label="资金方:" prop="zfpManagementId" style="margin-left: 5%">
            <el-select
@@ -35,10 +35,10 @@
          <el-divider content-position="left">平台参数</el-divider>
 
         <el-form-item label="最小融资金额(元):" prop="zfpMinimumAmount" style="margin-left: 5%">
-          <el-input v-model="form.zfpMinimumAmount" placeholder="请输入最小融资金额" />
+          <el-input v-model="form.zfpMinimumAmount" placeholder="请输入最小融资金额" maxlength="10"/>
         </el-form-item>
          <el-form-item label="最短融资账期:" prop="zfpShortestPeriod" style="margin-left: 5%">
-          <el-input v-model="form.zfpShortestPeriod" placeholder="最短14天" @change="change"/>
+          <el-input v-model="form.zfpShortestPeriod" placeholder="最短14天" maxlength="2"/>
         </el-form-item>
         <el-form-item label="服务费是否可退:" style="margin-left: 6%">
           <el-radio v-model="form.zfpCharge" label="0">否</el-radio>
@@ -89,8 +89,8 @@
           <el-radio v-model="form.zfpPart" label="0">否</el-radio>
           <el-radio v-model="form.zfpPart" label="1">是</el-radio>
         </el-form-item>
-        <el-form-item label="资方融资费率:" prop="zfpRate" style="margin-left: 5%">
-          <el-input v-model="form.zfpRate" placeholder="请输入资方融资费率" />
+        <el-form-item label="资方融资费率(%):" prop="zfpRate" style="margin-left: 5%">
+          <el-input v-model="form.zfpRate" placeholder="请输入资方融资费率" maxlength="5"/>
         </el-form-item>
         <el-form-item label="融资到期方式:" prop="zfpExpire" style="margin-left: 5%">
           <el-select
@@ -123,8 +123,8 @@
               :value="dict.dictValue"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="资方返佣费率" prop="zfpProfitRate" style="margin-left: 5%" v-if="form.zfpProfit== '1'">
-          <el-input v-model="form.zfpProfitRate" placeholder="请输入资方返佣费率" />
+        <el-form-item label="资方返佣费率(%):" prop="zfpProfitRate" style="margin-left: 5%" v-if="form.zfpProfit== '1'">
+          <el-input v-model="form.zfpProfitRate" placeholder="请输入资方返佣费率"  maxlength="5"/>
         </el-form-item>
         <el-form-item label="是否需平台审批:" style="margin-left: 5%">
           <el-radio v-model="form.zfpPlatform" label="0">否</el-radio>
@@ -135,7 +135,6 @@
           style="width: 95%;"
             v-model="form.zfpAuthType"
             placeholder="请选择签署意愿类型"
-            clearable
             size="small">
             <el-option
               v-for="dict in authTypeOptions"
@@ -157,7 +156,7 @@
         </el-table-column>
           <el-table-column label="合同模板编号"  align="center"  prop="zfcId" v-if="false" />
           <el-table-column label="合同模板名称"  align="center"  prop="zfcName"   />
-          <el-table-column label="签署方"  align="center"  prop="zfcSubject"  :formatter="subjectFormat"  />
+          <el-table-column label="签署节点"  align="center"  prop="zfcNode"  :formatter="nodeFormat"  />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
             <template slot-scope="scope">
               <el-button
@@ -213,7 +212,7 @@
       <el-table-column label="合同模板名称" align="center" prop="zfcName" :show-overflow-tooltip="true" />
       <el-table-column label="合同模板状态" align="center" prop="zfcStatus" :formatter="statusFormat" :show-overflow-tooltip="true"/>
       <el-table-column label="签署节点" align="center" prop="zfcNode"  :formatter="nodeFormat" :show-overflow-tooltip="true" />
-      <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true"/> -->
       <el-table-column label="创建人" align="center" prop="nickName" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
       </el-table>
@@ -315,6 +314,7 @@ export default {
           {
             required: true,
             message: "最短融资账期不能为空",
+            pattern: /^\d+$/,
             trigger: ["blur", "change"],
           },
         ],
@@ -383,7 +383,15 @@ export default {
     },
     //签署节点字典反显
     nodeFormat(row, column) {
-      return this.selectDictLabel(this.nodeOptions, row.zfcNode);
+      var zfcNodes = row.zfcNode.split(",");
+      var zfcNodeList='';
+      for(var i=0;i<zfcNodes.length;i++){
+        zfcNodeList += this.selectDictLabel(this.nodeOptions, zfcNodes[i]);
+        if(i < zfcNodes.length-1){
+          zfcNodeList +=",";
+        }
+      }
+      return zfcNodeList;
     },
      //签署方字典反显
     subjectFormat(row, column) {

+ 16 - 9
front-vue/src/views/service/financeProduct/detailFinanceProduct.vue

@@ -47,7 +47,7 @@
           <el-input v-model="form.zfpMinimumAmount" placeholder="请输入最小融资金额" :disabled="disabled" />
         </el-form-item>
          <el-form-item label="最短融资账期:" prop="zfpShortestPeriod" style="margin-left: 5%">
-          <el-input v-model="form.zfpShortestPeriod" placeholder="最短14天" @change="change" :disabled="disabled"/>
+          <el-input v-model="form.zfpShortestPeriod" placeholder="最短14天" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="服务费是否可退:" style="margin-left: 6%">
           <el-radio v-model="form.zfpCharge" label="0" :disabled="disabled">否</el-radio>
@@ -143,7 +143,6 @@
           <el-select
             v-model="form.zfpAuthType"
             placeholder="请选择签署意愿类型"
-            clearable
             size="small">
             <el-option
               v-for="dict in authTypeOptions"
@@ -154,8 +153,8 @@
         </el-form-item>
         <el-divider content-position="left">关联合同</el-divider>
         <el-form-item prop="zfcId" style="margin-left: 100px" >
-        <el-button size="mini" type="primary" @click="openTicket">选择合同</el-button>
-        <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
+        <!-- <el-button size="mini" type="primary" @click="openTicket">选择合同</el-button>
+        <el-button size="mini" @click="deleteTicekt">清空全部</el-button> -->
         <el-table :data="contractList1" style="width: 1100px">
           <el-table-column label="序号" type="index" width="50" align="center">
           <template slot-scope="scope">
@@ -164,8 +163,8 @@
         </el-table-column>
           <el-table-column label="合同模板编号"  align="center"  prop="zfcId" v-if="false" />
           <el-table-column label="合同模板名称"  align="center"  prop="zfcName"   />
-          <el-table-column label="签署方"  align="center"  prop="zfcSubject"  :formatter="subjectFormat"  />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
+          <el-table-column label="签署节点" align="center" prop="zfcNode"  :formatter="nodeFormat" />
+          <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -174,7 +173,7 @@
                 @click="handleDelete(scope.$index, contractList1)"
               >删除</el-button>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
       </el-form-item>
       </el-form>
@@ -220,7 +219,7 @@
       <el-table-column label="合同模板名称" align="center" prop="zfcName" :show-overflow-tooltip="true" />
       <el-table-column label="合同模板状态" align="center" prop="zfcStatus" :formatter="statusFormat" :show-overflow-tooltip="true"/>
       <el-table-column label="签署节点" align="center" prop="zfcNode"  :formatter="nodeFormat" :show-overflow-tooltip="true" />
-      <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true"/> -->
       <el-table-column label="创建人" align="center" prop="nickName" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
       </el-table>
@@ -401,7 +400,15 @@ export default {
     },
     //签署节点字典反显
     nodeFormat(row, column) {
-      return this.selectDictLabel(this.nodeOptions, row.zfcNode);
+      var zfcNodes = row.zfcNode.split(",");
+      var zfcNodeList='';
+      for(var i=0;i<zfcNodes.length;i++){
+        zfcNodeList += this.selectDictLabel(this.nodeOptions, zfcNodes[i]);
+        if(i < zfcNodes.length-1){
+          zfcNodeList +=",";
+        }
+      }
+      return zfcNodeList;
     },
      //签署方字典反显
     subjectFormat(row, column) {

+ 23 - 14
front-vue/src/views/service/financeProduct/editFinanceProduct.vue

@@ -2,20 +2,20 @@
   <div class="app-container">
     <el-form :inline="true" ref="form" :model="form" :rules="rules" label-width="auto" style="margin-top: 20px;"  >
       <el-form-item label="融资产品编号:" prop="zfpNumber" style="margin-left: 5%">
-          <el-input v-model="form.zfpNumber" placeholder="请输入融资产品名称" :disabled="disabled" />
+          <el-input v-model="form.zfpNumber"  disabled />
         </el-form-item>
         <el-form-item label="创建人:" prop="userName" style="margin-left: 5%">
-          <el-input v-model="userName" placeholder="请输入融资产品名称" :disabled="disabled" />
+          <el-input v-model="userName"  disabled />
         </el-form-item>
         <el-form-item label="创建时间:" prop="createTime" style="margin-left: 5.7%">
-          <el-input v-model="form.createTime" placeholder="请输入融资产品名称" :disabled="disabled" />
+          <el-input v-model="form.createTime"  disabled />
         </el-form-item>
       <el-divider content-position="left">基本信息</el-divider>
         <!-- <el-form-item label="融资产品编号" prop="zfpNumber">
           <el-input v-model="form.zfpNumber" placeholder="请输入融资产品编号" />
         </el-form-item> -->
         <el-form-item label="融资产品名称:" prop="zfpName" style="margin-left: 5%">
-          <el-input v-model="form.zfpName" placeholder="请输入融资产品名称" :disabled="disabled" />
+          <el-input v-model="form.zfpName" placeholder="请输入融资产品名称" maxlength="20" :disabled="disabled" />
         </el-form-item>
         <el-form-item label="资金方:" prop="zfpManagementId" style="margin-left: 5%">
            <el-select
@@ -44,10 +44,10 @@
          <el-divider content-position="left">平台参数</el-divider>
 
         <el-form-item label="最小融资金额(元):" prop="zfpMinimumAmount" style="margin-left: 5%">
-          <el-input v-model="form.zfpMinimumAmount" placeholder="请输入最小融资金额" :disabled="disabled" />
+          <el-input v-model="form.zfpMinimumAmount" placeholder="请输入最小融资金额" maxlength="10" :disabled="disabled" />
         </el-form-item>
          <el-form-item label="最短融资账期:" prop="zfpShortestPeriod" style="margin-left: 5%">
-          <el-input v-model="form.zfpShortestPeriod" placeholder="最短14天" @change="change" :disabled="disabled"/>
+          <el-input v-model="form.zfpShortestPeriod" placeholder="最短14天" maxlength="2" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="服务费是否可退:" style="margin-left: 6%">
           <el-radio v-model="form.zfpCharge" label="0" :disabled="disabled">否</el-radio>
@@ -99,8 +99,8 @@
           <el-radio v-model="form.zfpPart" label="0">否</el-radio>
           <el-radio v-model="form.zfpPart" label="1">是</el-radio>
         </el-form-item>
-        <el-form-item label="资方融资费率:" prop="zfpRate" style="margin-left: 11%">
-          <el-input v-model="form.zfpRate" placeholder="请输入资方融资费率" />
+        <el-form-item label="资方融资费率(%):" prop="zfpRate" style="margin-left: 11%">
+          <el-input v-model="form.zfpRate" placeholder="请输入资方融资费率" maxlength="5"/>
         </el-form-item>
         <el-form-item label="融资到期方式:" prop="zfpExpire" style="margin-left: 6%">
           <el-select
@@ -132,8 +132,8 @@
               :value="dict.dictValue"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="资方返佣费率" prop="zfpProfitRate" style="margin-left: 5%" v-if="form.zfpProfit== '1' ">
-          <el-input v-model="form.zfpProfitRate" placeholder="请输入资方返佣费率" />
+        <el-form-item label="资方返佣费率(%):" prop="zfpProfitRate" style="margin-left: 5%" v-if="form.zfpProfit== '1' ">
+          <el-input v-model="form.zfpProfitRate" placeholder="请输入资方返佣费率" maxlength="5" />
         </el-form-item>
         <el-form-item label="是否需平台审批:" style="margin-left: 5%">
           <el-radio v-model="form.zfpPlatform" label="0">否</el-radio>
@@ -164,7 +164,7 @@
         </el-table-column>
           <el-table-column label="合同模板编号"  align="center"  prop="zfcId" v-if="false" />
           <el-table-column label="合同模板名称"  align="center"  prop="zfcName"   />
-          <el-table-column label="签署方"  align="center"  prop="zfcSubject"  :formatter="subjectFormat"  />
+          <el-table-column label="签署节点" align="center" prop="zfcNode"  :formatter="nodeFormat" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
             <template slot-scope="scope">
               <el-button
@@ -220,7 +220,7 @@
       <el-table-column label="合同模板名称" align="center" prop="zfcName" :show-overflow-tooltip="true" />
       <el-table-column label="合同模板状态" align="center" prop="zfcStatus" :formatter="statusFormat" :show-overflow-tooltip="true"/>
       <el-table-column label="签署节点" align="center" prop="zfcNode"  :formatter="nodeFormat" :show-overflow-tooltip="true" />
-      <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true"/> -->
       <el-table-column label="创建人" align="center" prop="nickName" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
       </el-table>
@@ -326,7 +326,8 @@ export default {
         zfpShortestPeriod: [
           {
             required: true,
-            message: "最短融资账期不能为空",
+            pattern: /^\d+$/,
+            message: "请输入正确的最短融资账期",
             trigger: ["blur", "change"],
           },
         ],
@@ -401,7 +402,15 @@ export default {
     },
     //签署节点字典反显
     nodeFormat(row, column) {
-      return this.selectDictLabel(this.nodeOptions, row.zfcNode);
+      var zfcNodes = row.zfcNode.split(",");
+      var zfcNodeList='';
+      for(var i=0;i<zfcNodes.length;i++){
+        zfcNodeList += this.selectDictLabel(this.nodeOptions, zfcNodes[i]);
+        if(i < zfcNodes.length-1){
+          zfcNodeList +=",";
+        }
+      }
+      return zfcNodeList;
     },
      //签署方字典反显
     subjectFormat(row, column) {

+ 2 - 0
front-vue/src/views/service/financeProduct/financeProduct.vue

@@ -32,6 +32,7 @@
       </el-form-item>
       <el-form-item  label="最短账期">
           <el-input
+          type = "number"
           v-model="queryParams.begin"
           placeholder="请输入最短账期"
           clearable
@@ -44,6 +45,7 @@
       </el-form-item>
       <el-form-item>
           <el-input
+          type = "number"
           v-model="queryParams.end"
           placeholder="请输入最短账期"
           clearable

+ 17 - 3
front-vue/src/views/service/repayment/repayment.vue

@@ -459,6 +459,7 @@ export default {
         // 表单重置
         reset() {
             this.form = {};
+            this.fileList = [];
             this.resetForm("form");
         },
         /** 搜索按钮操作 */ 
@@ -515,7 +516,7 @@ export default {
             spinner: 'el-icon-loading',
             background: 'rgba(0, 0, 0, 0.7)'
           });
-          this.download('sc-service-ch/repayment/export/'+zfrId, {
+          this.download('sc-service/repayment/export/'+zfrId, {
 
         }, `还款明细.docx`);
         setTimeout(() => {
@@ -528,7 +529,10 @@ export default {
         //上传附件
         handleUp(row){
             this.reset();
-            this.form.zfrId = row.zfrId || this.ids
+            this.form.zfrId = row.zfrId || this.ids;
+            this.showBtnImg = true;
+            this.noneBtnImg = this.fileList.length >= this.limitCountImg;
+            debugger
             this.open = true;
             this.title = "还款登记";
         },
@@ -637,7 +641,7 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
         });
-        this.download('sc-service-ch/repayment/export', {
+        this.download('sc-service/repayment/export', {
         ...this.queryParams
             }, `待还款列表.xls`);
             setTimeout(() => {
@@ -650,3 +654,13 @@ export default {
     },
 };
 </script>
+<style>
+.showUoload .el-upload--picture-card {
+  width: 110px;
+  height: 110px;
+  line-height: 110px;
+}
+.uoloadSty .el-upload--picture-card {
+  display: none;
+}
+</style>