1

src/assets/common/lang/zh.js

@@ -462,6 +462,7 @@ export const admin={  //行政
    hotel_StartDate:'开始日期',
    hotel_EndDate:'结束日期',
    hotel_Currency:'币种',
+   Operate:'操作',
    hotel_CurrentRate:'汇率',
    hotel_UseAmount:'报入人数',
    hotel_commission:'返佣',

src/assets/common/lang/zhCN/fill.js

@@ -4244,7 +4244,7 @@ export const obj = {
       beizhu3: '凡是填写必须进店的，未进，公社购物金额不足150万及格线，均要填坑补店 10万日元/店',
       xinzengfy: '新增费用',
       xiugaify: '修改费用',
-      xinzengqtzc: '新增其它支出',
+      xinzengqtzc: '新增/编辑其它支出',
       fieyongmc: '费用名称',
       feiyongjg: '费用价格',
       qitazhic: '其它支出',

src/components/LeaderManagement/AlipayManagement.vue

@@ -161,7 +161,7 @@
           <tr>
             <td>
               <el-form-item label="制度有效期" prop="Sort">
-                <el-date-picker  v-model="addMsg.effectiveDateList" type="daterange"  range-separator="至" start-placeholder="开始日期"  end-placeholder="结束日期"> </el-date-picker>
+                <el-date-picker  value-format="yyyy-MM-dd"  v-model="addMsg.effectiveDateList" type="daterange"  range-separator="至" start-placeholder="开始日期"  end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
             </td>
           </tr>

src/components/LeaderManagement/AlipayManagementDetail.vue

@@ -129,14 +129,6 @@
                     <td> 
                       <template v-if="item.Id&&item.Id>0">  {{item.EffectiveStartDate}}-{{item.EffectiveEndDate}}</template>
                     </td>
-                    <!-- <td>
-                     <template v-if="item.QuotaTotal&&item.QuotaTotal>0">
-                      <div>可用金额:{{item.QuotaAvailable}}</div>
-                      <div>锁定金额:{{item.QuotaLocked}}</div>
-                      <div>已用金额:{{item.QuotaUsed}}</div>
-                    </template>
-                    <span>刷新</span>
-                    </td> -->
                     <td v-if="IsEdit==1"> 
                       <template v-if="item.Id&&item.Id>0"> 
                         <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
@@ -170,9 +162,9 @@
           <tr>
             <td>
               <el-form-item label="类型" prop="action">
-                <el-radio v-model="AddMsgQuota.action" label="1">增加额度</el-radio>
-                     <el-radio v-model="AddMsgQuota.action" label="2">减少额度</el-radio>
-                     <el-radio v-model="AddMsgQuota.action" label="3">删除额度</el-radio>
+                <el-radio v-model="AddMsgQuota.Action" label="1">增加额度</el-radio>
+                     <el-radio v-model="AddMsgQuota.Action" label="2">减少额度</el-radio>
+                     <el-radio v-model="AddMsgQuota.Action" label="3">删除额度</el-radio>
               </el-form-item>
             </td> 
           </tr>
@@ -231,7 +223,7 @@
           <tr>
             <td>
               <el-form-item label="额度有效期" prop="EffectiveDateList">
-              <el-date-picker  v-model="NewMsgQuota.EffectiveDateList" type="daterange"  range-separator="至" start-placeholder="开始日期"  end-placeholder="结束日期"> </el-date-picker>
+              <el-date-picker value-format="yyyy-MM-dd"  v-model="NewMsgQuota.EffectiveDateList" type="daterange"  range-separator="至" start-placeholder="开始日期"  end-placeholder="结束日期"> </el-date-picker>
             </el-form-item>
             </td>
           </tr>
@@ -267,7 +259,7 @@
           <tr>
             <td>
               <el-form-item label="制度生效时间" prop="Sort">
-                <el-date-picker  v-model="addMsg.effectiveDateList" type="daterange"  range-separator="至" start-placeholder="开始日期"  end-placeholder="结束日期"> </el-date-picker>
+                <el-date-picker value-format="yyyy-MM-dd"  v-model="addMsg.effectiveDateList" type="daterange"  range-separator="至" start-placeholder="开始日期"  end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
             </td>
           </tr>
@@ -385,7 +377,7 @@
           InstitutionDesc:"",//费控描述
           EffectiveEndDate:"",
           EffectiveStartDate:"",
-          effectiveDateList:[],
+          effectiveDateList:'',
         },
         rulesMsg: {
             InstitutionName: [{
@@ -547,7 +539,7 @@
         })
       },
       AlipayEbppInvoiceExpensecontrolQuotaQuery() { //获取用户使用额度情况
-        this.apipost('alipay_post_AlipayEbppInvoiceExpensecontrolQuotaQuery', {InstitutionId:this.msg.Id}, res => {
+        this.apipost('alipay_post_AlipayEbppInvoiceExpensecontrolQuotaQuery', {InstitutionId:this.DataList.Id}, res => {
           if (res.data.resultCode == 1) {
             let RoyaltyList = []
               RoyaltyList = res.data.data

src/components/commonPage/companyalipay.vue

@@ -41,6 +41,13 @@ table.companyalipay {
           </el-col>
         </el-row>
         <el-row :gutter="20">
+          <el-col >
+            <el-form-item label="制度有效期" prop="EffectiveDateList">
+        <el-date-picker value-format="yyyy-MM-dd"  v-model="msg.EffectiveDateList" type="daterange"  range-separator="至" start-placeholder="开始日期"  end-placeholder="结束日期"> </el-date-picker>
+      </el-form-item>
+          </el-col>
+      </el-row>
+       <el-row :gutter="20">
             <el-col >
             <el-form-item label="员工" prop="EmployeeIdList">
                 <el-select
@@ -78,7 +85,7 @@ table.companyalipay {
                      <el-radio v-model="item.ShareMode" label="1">是</el-radio>
                     </td>
                     <td> 
-                        <el-date-picker  v-model="item.effectiveDateList" type="daterange"  range-separator="至" start-placeholder="开始日期"  end-placeholder="结束日期"> </el-date-picker>
+                        <el-date-picker value-format="yyyy-MM-dd"  v-model="item.effectiveDateList" type="daterange"  range-separator="至" start-placeholder="开始日期"  end-placeholder="结束日期"> </el-date-picker>
                     </td>
                 </tr>
             </table>
@@ -107,6 +114,9 @@ export default {
                 QuotaCreateList: [],
                 InstitutionName: "",//支付名称  20
                 InstitutionDesc: "", //制度描述  200
+                EffectiveDateList:[],
+                EffectiveEndDate:"",
+                EffectiveStartDate:"",
                 //StandardName: "", //规则名称 string(20)
             // RuleName: "", //费控条件名称 string(32)
         },
@@ -122,6 +132,12 @@ export default {
             trigger: 'change',
             type: 'array',
           }],
+          EffectiveDateList: [{
+            required: true,
+            message: "请选择制度有效期",
+            trigger: 'blur',
+            type: 'array',
+          }],
         },
         }
     },
@@ -140,7 +156,10 @@ export default {
       this.msg.EmployeeIdList=[];
       this.msg.QuotaCreateList=[];
       this.msg.InstitutionName="";
+      this.msg.EffectiveDateList=[];
       this.msg.InstitutionDesc="";
+      this.msg.EffectiveEndDate="";
+      this.msg.EffectiveStartDate="";
     },
     AddQuotaCreate() {
         if(this.msg.EmployeeIdList&&this.msg.EmployeeIdList.length>0){
@@ -204,6 +223,7 @@ export default {
         this.employeeMsg.GroupId = userInfo.RB_Group_id; 
         this.msg.EmployeeIdList=[];
         this.EmployeeList=[];
+        this.msg.EffectiveDateList=this.TeamStartDateList;
        this.getEmployee();
     }
 }