融信列表样式优化

front-vue/src/components/Table/ButtonsGroup.vue

@@ -10,9 +10,7 @@
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '0' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02') && scope.row.zfiStatus != '01')||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))
                         ">修改</el-button>
-    <!--融信状态待确权且为核心企业
-              -->
-    <el-button class="zap-button-confirmation" size="mini" type="text" @click="handleApprove(scope.row)" v-show="scope.row.zfiStatus == '00' && scope.row.companyType == '01'" v-hasPermi="['credit:credit:approve']">确权</el-button>
+
     <!--原补充资料-->
     <!--核心开立+融信状态为待签收+融资企业   判断内部，平台，审批中不可进入
               -->
@@ -45,7 +43,10 @@
     <el-button class="zap-button-primary" size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['credit:credit:del']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '0' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02') && scope.row.zfiStatus != '01')||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))">删除</el-button>
-    <el-button class="zap-button-primary" size="mini" type="text" @click="handleFlowable(scope.row)">查看流程</el-button>
+    <el-button class="zap-button-primary" size="mini" type="text" @click="handleFlowable(scope.row)">进度</el-button>
+     <!--融信状态待确权且为核心企业
+              -->
+    <el-button class="zap-button-confirmation" size="mini" type="text" @click="handleApprove(scope.row)" v-show="scope.row.zfiStatus == '00' && scope.row.companyType == '01'" v-hasPermi="['credit:credit:approve']">确权</el-button>
 </div>
 </template>
 

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

@@ -1,29 +1,31 @@
 <template>
 <div class="app-container zap-main">
     <search-bar v-if="activeIndex === '0'" :hiddenSetting="true" @query="handleQuery" @reset="resetQuery">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-if="showSearch" label-width="68px">
-            <el-row>
-                <el-form-item prop="zfiTypes" size="large">
-                    <el-select v-model="queryParams.zfiTypes" clearable>
+        <el-form :model="queryParams" ref="queryForm" v-if="showSearch" label-width="80px">
+            <el-row type="flex" style="flex-wrap:wrap;">
+                <el-form-item class="zap-flex-1" prop="zfiTypes" label="融信来源">
+                    <el-select v-model="queryParams.zfiTypes" style="width: 200px;" clearable>
                         <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
                 </el-form-item>
-                <el-form-item prop="finaceStatus" size="large">
-                    <el-select v-model="queryParams.finaceStatus" clearable>
-                        <el-option v-for="dict in stateOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-                    </el-select>
-                </el-form-item>
-
-                <el-form-item prop="zfiQuery" size="large">
-                    <el-select v-model="queryParams.zfiQuery" clearable>
+                <el-form-item class="zap-flex-1" prop="zfiQuery" label="类型">
+                    <el-select v-model="queryParams.zfiQuery" style="width: 248px;" clearable>
                         <el-option v-for="dict in queryOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
                 </el-form-item>
-                <el-form-item prop="zfiValue" v-if="this.queryParams.zfiQuery" size="large">
-                    <el-input v-model="queryParams.zfiValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
+                <el-form-item class="zap-flex-1" prop="zfiValue" v-if="this.queryParams.zfiQuery" label-width="24px">
+                    <el-input v-model="queryParams.zfiValue" style="width: 272px;" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
+                </el-form-item>
+            </el-row>
+            <el-row type="flex" style="flex-wrap:wrap;">
+                <el-form-item class="zap-flex-1" prop="finaceStatus" label="融信状态">
+                    <el-select v-model="queryParams.finaceStatus" style="width: 200px;" clearable>
+                        <el-option v-for="dict in stateOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+                    </el-select>
                 </el-form-item>
-                <el-form-item label="承诺付款日期" prop="zfiExpireDate" label-width="96px" size="large">
+                <el-form-item class="zap-flex-1" label="到期日期" prop="zfiExpireDate">
                     <el-date-picker
+                        style="width: 248px;"
                         v-model="queryParams.zfiExpireDate"
                         unlink-panels
                         value-format="yyyy-MM-dd"
@@ -37,21 +39,21 @@
         </el-form>
     </search-bar>
     <search-bar v-else-if="activeIndex === '1'" :hiddenSetting="true" @query="handleQueryOpening" @reset="resetQueryOpening">
-        <el-form :model="queryParamsOpening" ref="queryFormOpening" :inline="true" v-if="showSearch" label-width="68px">
-            <el-form-item prop="zfiTypes" size="large">
+        <el-form :model="queryParamsOpening" ref="queryFormOpening" :inline="true" v-if="showSearch" label-width="80px">
+            <el-form-item prop="zfiTypes" label="融信来源">
                 <el-select v-model="queryParamsOpening.zfiTypes" clearable>
                     <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiQuery" size="large">
+            <el-form-item prop="zfiQuery" label="类型">
                 <el-select v-model="queryParamsOpening.zfiQuery" clearable>
                     <el-option v-for="dict in queryOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiValue" v-if="this.queryParamsOpening.zfiQuery" size="large">
+            <el-form-item prop="zfiValue" v-if="this.queryParamsOpening.zfiQuery" label-width="24px">
                 <el-input v-model="queryParamsOpening.zfiValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="承诺付款日期" prop="zfiExpireDate" label-width="96px" size="large">
+            <el-form-item label="到期日期" prop="zfiExpireDate">
                 <el-date-picker
                     v-model="queryParamsOpening.zfiExpireDate"
                     unlink-panels
@@ -65,21 +67,21 @@
         </el-form>
     </search-bar>
     <search-bar v-else-if="activeIndex === '2'" :hiddenSetting="true" @query="handleQuerySign" @reset="resetQuerySign">
-        <el-form :model="queryParamsSign" ref="queryFormSign" :inline="true" v-if="showSearch" label-width="68px">
-            <el-form-item prop="zfiTypes" size="large">
+        <el-form :model="queryParamsSign" ref="queryFormSign" :inline="true" v-if="showSearch" label-width="80px">
+            <el-form-item prop="zfiTypes" label="融信来源">
                 <el-select v-model="queryParamsSign.zfiTypes" clearable>
                     <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiQuery" size="large">
+            <el-form-item prop="zfiQuery" label="类型">
                 <el-select v-model="queryParamsSign.zfiQuery" clearable>
                     <el-option v-for="dict in queryOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiValue" v-if="this.queryParamsSign.zfiQuery" size="large">
+            <el-form-item prop="zfiValue" v-if="this.queryParamsSign.zfiQuery" label-width="24px">
                 <el-input v-model="queryParamsSign.zfiValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="承诺付款日期" prop="zfiExpireDate" label-width="96px" size="large">
+            <el-form-item label="到期日期" prop="zfiExpireDate">
                 <el-date-picker
                     v-model="queryParamsSign.zfiExpireDate"
                     unlink-panels
@@ -93,21 +95,21 @@
         </el-form>
     </search-bar>
     <search-bar v-else-if="activeIndex === '3'" :hiddenSetting="true" @query="handleQueryFinancing" @reset="resetQueryFinancing">
-        <el-form :model="queryParamsFinancing" ref="queryFormFinancing" :inline="true" v-if="showSearch" label-width="68px">
-            <el-form-item prop="zfiTypes" size="large">
+        <el-form :model="queryParamsFinancing" ref="queryFormFinancing" :inline="true" v-if="showSearch" label-width="80px">
+            <el-form-item prop="zfiTypes" label="融信来源">
                 <el-select v-model="queryParamsFinancing.zfiTypes" clearable>
                     <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiQuery" size="large">
+            <el-form-item prop="zfiQuery" label="类型">
                 <el-select v-model="queryParamsFinancing.zfiQuery" clearable>
                     <el-option v-for="dict in queryOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiValue" v-if="this.queryParamsFinancing.zfiQuery" size="large">
+            <el-form-item prop="zfiValue" v-if="this.queryParamsFinancing.zfiQuery" label-width="24px">
                 <el-input v-model="queryParamsFinancing.zfiValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="承诺付款日期" prop="zfiExpireDate" label-width="96px" size="large">
+            <el-form-item label="到期日期" prop="zfiExpireDate">
                 <el-date-picker
                     v-model="queryParamsFinancing.zfiExpireDate"
                     unlink-panels
@@ -121,21 +123,21 @@
         </el-form>
     </search-bar>
     <search-bar v-else-if="activeIndex === '4'" :hiddenSetting="true" @query="handleQueryFinanced" @reset="resetQueryFinanced">
-        <el-form :model="queryParamsFinanced" ref="queryFormFinanced" :inline="true" v-if="showSearch" label-width="68px">
-            <el-form-item prop="zfiTypes" size="large">
+        <el-form :model="queryParamsFinanced" ref="queryFormFinanced" :inline="true" v-if="showSearch" label-width="80px">
+            <el-form-item prop="zfiTypes" label="融信来源">
                 <el-select v-model="queryParamsFinanced.zfiTypes" clearable>
                     <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiQuery" size="large">
+            <el-form-item prop="zfiQuery" label="类型">
                 <el-select v-model="queryParamsFinanced.zfiQuery" clearable>
                     <el-option v-for="dict in queryOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiValue" v-if="this.queryParamsFinanced.zfiQuery" size="large">
+            <el-form-item prop="zfiValue" v-if="this.queryParamsFinanced.zfiQuery" label-width="24px">
                 <el-input v-model="queryParamsFinanced.zfiValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="承诺付款日期" prop="zfiExpireDate" label-width="96px" size="large">
+            <el-form-item label="到期日期" prop="zfiExpireDate">
                 <el-date-picker
                     v-model="queryParamsFinanced.zfiExpireDate"
                     unlink-panels
@@ -150,21 +152,21 @@
     </search-bar>
     <!-- 已拒绝 -->
     <search-bar v-else-if="activeIndex === '5'" :hiddenSetting="true" @query="handleQueryInvalid" @reset="resetQueryInvalid">
-        <el-form :model="queryParamsInvalid" ref="queryFormInvalid" :inline="true" v-if="showSearch" label-width="68px">
-            <el-form-item prop="zfiTypes" size="large">
+        <el-form :model="queryParamsInvalid" ref="queryFormInvalid" :inline="true" v-if="showSearch" label-width="80px">
+            <el-form-item prop="zfiTypes"  label="融信来源">
                 <el-select v-model="queryParamsInvalid.zfiTypes" clearable>
                     <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiQuery" size="large">
+            <el-form-item prop="zfiQuery" label="类型">
                 <el-select v-model="queryParamsInvalid.zfiQuery" clearable>
                     <el-option v-for="dict in queryOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiValue" v-if="this.queryParamsInvalid.zfiQuery" size="large">
+            <el-form-item prop="zfiValue" v-if="this.queryParamsInvalid.zfiQuery" label-width="24px">
                 <el-input v-model="queryParamsInvalid.zfiValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="承诺付款日期" prop="zfiExpireDate" label-width="96px" size="large">
+            <el-form-item label="到期日期" prop="zfiExpireDate">
                 <el-date-picker
                     v-model="queryParamsInvalid.zfiExpireDate"
                     unlink-panels
@@ -179,21 +181,21 @@
     </search-bar>
     <!-- 已结算 -->
     <search-bar v-else-if="activeIndex === '6'" :hiddenSetting="true" @query="handleQuerySettlement" @reset="resetQuerySettlement">
-        <el-form :model="queryParamsSettlement" ref="queryFormSettlement" :inline="true" v-if="showSearch" label-width="68px">
-            <el-form-item prop="zfiTypes" size="large">
+        <el-form :model="queryParamsSettlement" ref="queryFormSettlement" :inline="true" v-if="showSearch" label-width="80px">
+            <el-form-item prop="zfiTypes" label="融信来源">
                 <el-select v-model="queryParamsSettlement.zfiTypes" clearable>
                     <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiQuery" size="large">
+            <el-form-item prop="zfiQuery" label="类型">
                 <el-select v-model="queryParamsSettlement.zfiQuery" clearable>
                     <el-option v-for="dict in queryOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiValue" v-if="this.queryParamsSettlement.zfiQuery" size="large">
+            <el-form-item prop="zfiValue" v-if="this.queryParamsSettlement.zfiQuery" label-width="24px">
                 <el-input v-model="queryParamsSettlement.zfiValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="承诺付款日期" prop="zfiExpireDate" label-width="96px" size="large">
+            <el-form-item label="到期日期" prop="zfiExpireDate">
                 <el-date-picker
                     v-model="queryParamsSettlement.zfiExpireDate"
                     unlink-panels
@@ -208,21 +210,21 @@
     </search-bar>
     <!-- 已过期 -->
     <search-bar v-else-if="activeIndex === '7'" :hiddenSetting="true" @query="handleQueryOverdue" @reset="resetQueryOverdue">
-        <el-form :model="queryParamsOverdue" ref="queryFormOverdue" :inline="true" v-if="showSearch" label-width="68px">
-            <el-form-item prop="zfiTypes" size="large">
+        <el-form :model="queryParamsOverdue" ref="queryFormOverdue" :inline="true" v-if="showSearch" label-width="80px">
+            <el-form-item prop="zfiTypes" label="融信来源">
                 <el-select v-model="queryParamsOverdue.zfiTypes" clearable>
                     <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiQuery" size="large">
+            <el-form-item prop="zfiQuery" label="类型">
                 <el-select v-model="queryParamsOverdue.zfiQuery" clearable>
                     <el-option v-for="dict in queryOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="zfiValue" v-if="this.queryParamsOverdue.zfiQuery" size="large">
+            <el-form-item prop="zfiValue" v-if="this.queryParamsOverdue.zfiQuery" label-width="24px">
                 <el-input v-model="queryParamsOverdue.zfiValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="承诺付款日期" prop="zfiExpireDate" label-width="96px" size="large">
+            <el-form-item label="到期日期" prop="zfiExpireDate">
                 <el-date-picker
                     v-model="queryParamsOverdue.zfiExpireDate"
                     unlink-panels
@@ -931,9 +933,15 @@
                     <!-- 查看流程 -->
                     <el-dialog title="查看流程" :visible.sync="openFlowDetail" width="837px" append-to-body>
                         <div class="zap-form">
-                          <flow-detail :financeId="financeId" :financeType="financeType" :financeActive="financeActive" v-if="openFlowDetail"></flow-detail>
+                            <flow-detail :financeId="financeId" :financeType="financeType" :financeActive="financeActive" v-if="openFlowDetail"></flow-detail>
                         </div>
-                        <el-row slot="footer" class="dialog-footer" type="flex" justify="center" align="middle" style="height: 102px;">
+                        <el-row
+                            slot="footer"
+                            class="dialog-footer"
+                            type="flex"
+                            justify="center"
+                            align="middle"
+                            style="height: 102px;">
                             <el-button type="primary" @click="closeFliwDetail">关闭</el-button>
                         </el-row>
                     </el-dialog>
@@ -1975,21 +1983,21 @@ export default {
                 return false;
             }
             //查询有无平台审批
-          /*   var platParam = {};
-            platParam.menuId = "1000000004";
-            isOpenApproval(platParam).then((response) => {
-                var platResult = response.data.isOpen;
-                //开启平台审批
-                if (platResult == true) {
+            /*   var platParam = {};
+              platParam.menuId = "1000000004";
+              isOpenApproval(platParam).then((response) => {
+                  var platResult = response.data.isOpen;
+                  //开启平台审批
+                  if (platResult == true) {
 
-                }
-            }) */
+                  }
+              }) */
             if (row.zfiPlatformStatus == '00') {
-                        this.$message({
-                            message: "平台正在审核资料，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请平台审批通过后，再次签署",
-                            type: 'warning'
-                        });
-                        return false;
+                this.$message({
+                    message: "平台正在审核资料，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请平台审批通过后，再次签署",
+                    type: 'warning'
+                });
+                return false;
             }
             //查询当前用户是否为经办人
             listCompanyHandler().then((response) => {