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

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

@@ -167,9 +167,10 @@
                 >
               
         </el-row>
-        <div class="footer" style="float: right;
-            margin-bottom:2px;">
-            <el-button @click="cancel">取 消</el-button>
+         <div style="margin-top: 100px; margin-left:45%">
+            <el-button type="info" @click="cancel">取消</el-button>
+            <!-- <el-button type="success" @click="submitForm"
+                >提交</el-button> -->
         </div>
         <!--预览-->
         <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>

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

@@ -163,7 +163,7 @@
             margin-bottom:2px;">
             <el-button type="success" @click="getContractFile">预览文件</el-button>
             <el-button type="info" @click="refuse">拒签</el-button>
-            <el-button type="primary" @click="selectType">盖章</el-button>
+            <el-button type="primary" @click="selectType">合同签署</el-button>
             <el-button @click="cancel">取消</el-button>
         </div>
         <el-dialog

front-vue/src/views/system/fundSide/fundSide.vue

@@ -48,7 +48,7 @@
           />
         </el-form-item>
         <el-form-item label="资金方类型" align="center" prop="smiType">
-          <el-select v-model="queryParams.smiType">
+          <el-select v-model="queryParams.smiType" clearable>
             <el-option
               v-for="(item, index) in formulaOptions"
               :key="index"
@@ -194,13 +194,14 @@
         <el-form-item label="资金方名称" prop="scyName">
           <el-input
             v-model="form.scyName"
+            clearable
             style="width: 215px"
             placeholder="请输入资金方名称"
             maxlength="15"
           />
         </el-form-item>
         <el-form-item prop="smiType" label="资金方类型">
-          <el-select v-model="form.smiType">
+          <el-select v-model="form.smiType" clearable>
             <el-option
               v-for="(item, index) in formulaOptions"
               :key="index"
@@ -215,7 +216,7 @@
           align="center"
           prop="smiAgreementType"
         >
-          <el-select v-model="form.smiAgreementType">
+          <el-select v-model="form.smiAgreementType" clearable>
             <el-option
               v-for="(item, index) in formulaOptionsSend"
               :key="index"
@@ -227,6 +228,7 @@
         <el-form-item label="资金方网点" prop="smiAddress">
           <el-input
             v-model="form.smiAddress"
+            clearable
             style="width: 215px"
             placeholder="请输入资金方网点"
             maxlength="15"
@@ -235,6 +237,7 @@
         <el-form-item label="社会统一信用代码" prop="scySocialCode">
           <el-input
             v-model="form.scySocialCode"
+            clearable
             style="width: 215px"
             placeholder="请输入社会统一信用代码"
             maxlength="18"
@@ -243,6 +246,7 @@
         <el-form-item label="客户经理" prop="smiManager">
           <el-input
             v-model="form.smiManager"
+            clearable
             style="width: 215px"
             placeholder="请输入客户经理"
             maxlength="15"
@@ -251,6 +255,7 @@
         <el-form-item label="联系人姓名" prop="smiContract">
           <el-input
             v-model="form.smiContract"
+            clearable
             style="width: 215px"
             placeholder="请输入联系人姓名"
             maxlength="15"
@@ -260,6 +265,7 @@
         <el-form-item label="联系人电话" prop="smiContractPhone">
           <el-input
             v-model="form.smiContractPhone"
+            clearable
             style="width: 215px"
             placeholder="请输入联系人电话"
             maxlength="11"