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

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

@@ -11,7 +11,7 @@
                 <el-col :span="8">
                     <el-form-item label="授信额度" prop="zfiCoreQuotaId">
                         <el-select style="width: 200px" v-model="form.zfiCoreQuotaId" filterable clearable remote @change="change">
-                            <el-option v-for="item in creditLineList" :key="item.value" :label="item.label" :value="item.value">
+                            <el-option v-for="item in creditLineList" :key="item.value" :label="item.label+item.remaining" :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -45,6 +45,7 @@
             </el-row>
             <el-divider content-position="left">应付账款</el-divider>
             <el-form-item style="margin-left: 100px">
+                <!-- <el-button size="mini" type="success" @click="addPay">新增应付账款</el-button> -->
                 <el-button size="mini" type="primary" @click="openTicket">选择</el-button>
                 <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
                 <el-form-item label="合计金额:">
@@ -372,7 +373,8 @@ export default {
                         zfpSplit: item.zfpSplit,
                         zfpId: item.zfpId,
                         zfpcrRate:item.zfpcrRate,
-                        zfpAuthType:item.zfpAuthType
+                        zfpAuthType:item.zfpAuthType,
+                        remaining:item.remaining
                     };
                 });
             });
@@ -932,6 +934,10 @@ export default {
             }
             this.openFile = true;
         },
+        //新增应付
+        addPay(){
+
+        }
     },
 };
 </script>

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

@@ -54,7 +54,36 @@
                             <el-input v-model="form.openName" style="width: 200px" disabled />
                         </el-form-item>
                 </el-col> 
+                 <el-col :span="8">
+                <el-form-item label="接收方" prop="receiveName">
+                    <el-input v-model="form.receiveName" style="width: 200px" disabled />
+                </el-form-item>
+                </el-col>
                 <el-col :span="8">
+                    <el-form-item label="签发有效期" prop="zfiEffectiveDate"> 
+                        <el-date-picker clearable size="small" style="width: 200px" :disabled="isUpdate"
+                            v-model="form.zfiEffectiveDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择签发有效期"
+                            :picker-options="pickerOptions">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="8">
+                    <el-form-item label="承诺还款日" prop="zfiExpireDate"> 
+                        <el-date-picker clearable size="small" style="width: 200px" :disabled="isUpdate"
+                            v-model="form.zfiExpireDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择承诺还款日"
+                            :picker-options="pickerOptions">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8" v-if="this.zfiCreateType == 0">
                     <el-form-item label="授信额度" prop="zfiSupplierQuotaId" >
                         <el-select
                             style="width: 200px"
@@ -62,53 +91,28 @@
                             filterable
                             clearable
                             remote
-                            :disabled="isUpdate"
                             >
                             <el-option
                             v-for="item in creditLineList"
                             :key="item.value"
-                            :label="item.label"
+                            :label="item.label+item.remaining"
                             :value="item.value">
                             </el-option>
                             </el-select>
                     </el-form-item>
+                </el-col>
+                <el-col :span="8" v-if="this.zfiCreateType != 0">
+                    <el-form-item label="授信额度" prop="zfpName" >
+                       <el-input v-model="form.zfpName" style="width: 200px" disabled/>
+                    </el-form-item>
                
                 </el-col>
-                <el-col :span="8">
+                <el-col :span="8" v-if="this.zfiCreateType == 0">
                     <span>可用额度:</span>
                     <span>{{availableAmt}}</span>
                     <br>   
                     <span>有效期:</span>
                     <span>{{validityDate}}</span>  
-                </el-col>    
-            </el-row>
-            <el-row>
-                <el-col :span="8">
-                    <el-form-item label="接收方" prop="receiveName">
-                        <el-input v-model="form.receiveName" style="width: 200px" disabled />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="签发有效期" prop="zfiEffectiveDate"> 
-                       <el-date-picker clearable size="small" style="width: 200px" :disabled="isUpdate"
-                            v-model="form.zfiEffectiveDate"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择签发有效期"
-                            :picker-options="pickerOptions">
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="承诺还款日" prop="zfiExpireDate"> 
-                        <el-date-picker clearable size="small" style="width: 200px" :disabled="isUpdate"
-                            v-model="form.zfiExpireDate"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择承诺还款日"
-                            :picker-options="pickerOptions">
-                        </el-date-picker>
-                    </el-form-item>
                 </el-col> 
             </el-row>  
             <el-row>
@@ -402,7 +406,8 @@ export default {
                         zfpcrLoanType: item.zfpcrLoanType,
                         zfpSplit: item.zfpSplit,
                         zfpId: item.zfpId,
-                        zfpcrRate:item.zfpcrRate};
+                        zfpcrRate:item.zfpcrRate,
+                        remaining:item.remaining};
                 }); 
                 this.form = data.financeInf;
                 //融信类型
@@ -416,6 +421,8 @@ export default {
                 }
                 //接收方
                 this.form.receiveName = data.receiveName;
+                //产品
+                this.form.zfpName = data.zfpName;
                 //开立方
                 this.form.openName = data.openName;
                 //创建人

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

@@ -78,7 +78,7 @@
                             <el-option
                             v-for="item in creditLineList"
                             :key="item.value"
-                            :label="item.label"
+                            :label="item.label+item.remaining"
                             :value="item.value">
                             </el-option>
                             </el-select>
@@ -471,7 +471,7 @@ export default {
               this.creditParams.zfpcrId = data.financeInf.zfiCoreQuotaId;
               listCreditLine(this.creditParams).then((response) => {
                 this.creditLineList = response.data.map(item => {
-                    return { value: item.zfpcrId, label: item.zfpName,zfpcrDateType:item.zfpcrDateType,zfpcrEndDate:item.zfpcrEndDate,zfpcrLoanType:item.zfpcrLoanType,zfpSplit:item.zfpSplit,zfpId:item.zfpId,zfpcrRate:item.zfpcrRate};
+                    return { value: item.zfpcrId, label: item.zfpName,zfpcrDateType:item.zfpcrDateType,zfpcrEndDate:item.zfpcrEndDate,zfpcrLoanType:item.zfpcrLoanType,zfpSplit:item.zfpSplit,zfpId:item.zfpId,zfpcrRate:item.zfpcrRate,remaining:item.remaining};
                 }); 
                 this.form = data.financeInf;
                 //开立方

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

@@ -49,7 +49,7 @@
                             <el-option
                             v-for="item in creditLineList"
                             :key="item.value"
-                            :label="item.label"
+                            :label="item.label+item.remaining"
                             :value="item.value">
                             </el-option>
                             </el-select>
@@ -398,7 +398,8 @@ export default {
                         zfpcrLoanType: item.zfpcrLoanType,
                         zfpSplit: item.zfpSplit,
                         zfpId: item.zfpId,
-                        zfpcrRate:item.zfpcrRate};
+                        zfpcrRate:item.zfpcrRate,
+                        remaining:item.remaining};
             }); 
         });
         //签发金额

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

@@ -66,7 +66,7 @@
                             <el-option
                             v-for="item in creditLineList"
                             :key="item.value"
-                            :label="item.label"
+                            :label="item.label+item.remaining"
                             :value="item.value">
                             </el-option>
                             </el-select>
@@ -454,7 +454,8 @@ export default {
                         zfpcrLoanType: item.zfpcrLoanType,
                         zfpSplit: item.zfpSplit,
                         zfpId: item.zfpId,
-                        zfpcrRate:item.zfpcrRate};
+                        zfpcrRate:item.zfpcrRate,
+                        remaining:item.remaining};
                 }); 
                 this.form = data.financeInf;
                 //接收方