liuhj 8 months ago
parent
commit
ee9f41d1ec

+ 1 - 1
src/components/Enroll.vue

@@ -51,7 +51,7 @@
             <el-input v-model="ruleForm.IDnumber" placeholder="输入身份证号"></el-input>
           </el-form-item>
           <el-form-item label="入职时间" prop="datebirth">
-            <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.datebirth" style="width: 100%;"></el-date-picker>
+            <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="ruleForm.datebirth" style="width: 100%;"></el-date-picker>
             <!-- <el-input v-model="ruleForm.datebirth"></el-input> -->
           </el-form-item>
         </div>

+ 1 - 0
src/components/Finance/CardReconciliation.vue

@@ -18,6 +18,7 @@
                 <el-date-picker
                 style="width: 300px;"
                 size="small"
+                value-format="yyyy-MM-dd"
                 v-model="value"
                 type="daterange"
                 align="right"

+ 1 - 1
src/components/Finance/GroupUnreviewed.vue

@@ -3,7 +3,7 @@
         <div class="groupunreviewed-title">团组未审核数据</div>
         <div class="groupunreviewed-haed">
             <div>
-                <el-date-picker @change="datechange" style="width:350px" v-model="value" type="daterange" align="left"
+                <el-date-picker value-format="yyyy-MM-dd" @change="datechange" style="width:350px" v-model="value" type="daterange" align="left"
                     unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
                     :picker-options="pickerOptions">
                 </el-date-picker>

+ 1 - 0
src/components/Finance/LncomingBills.vue

@@ -80,6 +80,7 @@
                     width="210">
                         <template slot-scope="scope">
                             <el-date-picker
+                            value-format="yyyy-MM-dd"
                             style="width: 100%;"
                             v-model="scope.row.createTime"
                             type="datetime"

+ 1 - 0
src/components/Finance/Overspendedit.vue

@@ -40,6 +40,7 @@
                     </el-form-item>
                     <el-form-item prop="priceDt" label="产生日期">
                         <el-date-picker
+                        value-format="yyyy-MM-dd"
                         style="width:100%"
                         v-model="form.priceDt"
                         type="date"

+ 1 - 0
src/components/Finance/PayReceived.vue

@@ -91,6 +91,7 @@
                         width="165">
                         <template slot-scope="scope">
                             <el-date-picker
+                            value-format="yyyy-MM-dd"
                             style="width: 100%;"
                             v-model="scope.row.sectionTime"
                             type="date"

+ 1 - 1
src/components/Finance/PaymentFiled.vue

@@ -3,7 +3,7 @@
         <div class="paymentfiled-all">
             <div class="paymentfiled-haed-box">
                 <div class="paymentfiled-haed">
-                    <el-date-picker style="width:400px" v-model="value2" type="daterange" align="left" unlink-panels range-separator="至"
+                    <el-date-picker value-format="yyyy-MM-dd" style="width:400px" v-model="value2" type="daterange" align="left" unlink-panels range-separator="至"
                         start-placeholder="开始日期" end-placeholder="结束日期" @change="datechange"
                         :picker-options="pickerOptions">
                     </el-date-picker>

+ 2 - 2
src/components/MCR/MarketCustomerResourcesOperation.vue

@@ -135,7 +135,7 @@
                         </el-col>
                         <el-col :span="8">
                             <div class="grid-content bg-purple"><el-form-item label="护照有效期:">
-                                    <el-date-picker v-model="requestData.passportDate" type="date" placeholder="选择日期">
+                                    <el-date-picker value-format="yyyy-MM-dd" v-model="requestData.passportDate" type="date" placeholder="选择日期">
                                     </el-date-picker>
                                 </el-form-item></div>
                         </el-col>
@@ -146,7 +146,7 @@
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
                                 <el-form-item label="生日信息:">
-                                    <el-date-picker v-model="requestData.birthday" type="date" placeholder="选择日期">
+                                    <el-date-picker value-format="yyyy-MM-dd" v-model="requestData.birthday" type="date" placeholder="选择日期">
                                     </el-date-picker>
                                 </el-form-item>
                             </div>

+ 1 - 0
src/components/MCR/Marketingamount.vue

@@ -21,6 +21,7 @@
                 <div v-for="(item,index) in callonarr" :key="index" class="callondialog-li">
                     <div style="display: flex;justify-content: space-between;">
                         <el-date-picker
+                        value-format="yyyy-MM-dd"
                         style="width: 380px;"
                         v-model="item.beginDt"
                         type="datetimerange"

+ 2 - 2
src/components/OP/Groupedit.vue

@@ -50,7 +50,7 @@
                         <el-input @blur="splicingname" el-input v-model="ruleForm.countriesvisited" placeholder="按照“国家1、国家2、国家3”录入"></el-input>
                     </el-form-item>
                     <el-form-item label-width="120px" label="出访时间:" prop="visitingtime">
-                        <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.visitingtime"
+                        <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="ruleForm.visitingtime"
                             style="width: 100%;"></el-date-picker>
                     </el-form-item>
                     <el-form-item label-width="120px" label="出访天数:" prop="numdays">
@@ -63,7 +63,7 @@
                         <el-input el-input v-model="ruleForm.groupname"></el-input>
                     </el-form-item>
                     <el-form-item label-width="120px" label="合同时间:" :prop="bidbr?'contracttime':''">
-                        <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.contracttime"
+                        <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="ruleForm.contracttime"
                             style="width: 100%;"></el-date-picker>
                     </el-form-item>
                     

+ 6 - 6
src/components/OP/HotelReservations.vue

@@ -220,11 +220,11 @@
                         </el-form-item>
                         <div class="remcss" style="display: flex;flex-wrap: wrap;">
                             <el-form-item prop="OnTime" style="width:395px ;" label="入住时间" required>
-                                <el-date-picker @change="CalculateAmount" size="medium" type="date" placeholder="选择日期"
+                                <el-date-picker value-format="yyyy-MM-dd" @change="CalculateAmount" size="medium" type="date" placeholder="选择日期"
                                     v-model="RequiredParameters.OnTime" style="width: 100%;"></el-date-picker>
                             </el-form-item>
                             <el-form-item style="width:395px ;" label="离店时间" prop="OutTime">
-                                <el-date-picker  @change="CalculateAmount" size="medium" type="date" placeholder="选择时间"
+                                <el-date-picker value-format="yyyy-MM-dd" @change="CalculateAmount" size="medium" type="date" placeholder="选择时间"
                                     v-model="RequiredParameters.OutTime" style="width: 100%;"></el-date-picker>
                             </el-form-item>
                             <el-form-item style="width:395px ;" label="入住类型" prop="TypeStay">
@@ -338,7 +338,7 @@
                             </div>
                             <div style="width: 395px;">
                                 <el-form-item label="消费日期:" label-width="110px">
-                                    <el-date-picker v-model="roomtaxobj.consumptionDate" consumptionDate="消费日期"
+                                    <el-date-picker value-format="yyyy-MM-dd" v-model="roomtaxobj.consumptionDate" consumptionDate="消费日期"
                                         type="date" style="width: 100%;">
                                     </el-date-picker>
                                 </el-form-item>
@@ -463,7 +463,7 @@
                             </div>
                             <div style="width: 395px;">
                                 <el-form-item label="消费日期:" label-width="110px">
-                                    <el-date-picker v-model="Citytaxobj.consumptionDate" placeholder="消费日期"
+                                    <el-date-picker value-format="yyyy-MM-dd" v-model="Citytaxobj.consumptionDate" placeholder="消费日期"
                                         type="date" style="width: 100%;">
                                     </el-date-picker>
                                 </el-form-item>
@@ -588,7 +588,7 @@
                             </div>
                             <div style="width: 395px;">
                                 <el-form-item label="消费日期:" label-width="110px">
-                                    <el-date-picker v-model="landtaxobj.consumptionDate" placeholder="消费日期"
+                                    <el-date-picker value-format="yyyy-MM-dd" v-model="landtaxobj.consumptionDate" placeholder="消费日期"
                                         type="date" style="width: 100%;">
                                     </el-date-picker>
                                 </el-form-item>
@@ -713,7 +713,7 @@
                             </div>
                             <div style="width: 395px;">
                                 <el-form-item label="消费日期:" label-width="110px">
-                                    <el-date-picker v-model="Hotelbreakfastobj.consumptionDate" placeholder="消费日期"
+                                    <el-date-picker value-format="yyyy-MM-dd" v-model="Hotelbreakfastobj.consumptionDate" placeholder="消费日期"
                                         type="date" style="width: 100%;">
                                     </el-date-picker>
                                 </el-form-item>

+ 3 - 3
src/components/OP/Hotelenquiry.vue

@@ -111,15 +111,15 @@
                                 <el-input size="medium" type="text" v-model="enquiryinfo.name"></el-input>
                             </el-form-item>
                             <el-form-item prop="selectDt" style="width:395px ;" label="查询时间" required>
-                                <el-date-picker size="medium" type="datetime" placeholder="选择日期"
+                                <el-date-picker value-format="yyyy-MM-dd" size="medium" type="datetime" placeholder="选择日期"
                                     v-model="enquiryinfo.selectDt" style="width: 100%;"></el-date-picker>
                             </el-form-item>
                             <el-form-item prop="checkInDate" style="width:395px ;" label="入住时间" required>
-                                <el-date-picker size="medium" type="date" placeholder="选择日期"
+                                <el-date-picker value-format="yyyy-MM-dd" size="medium" type="date" placeholder="选择日期"
                                     v-model="enquiryinfo.checkInDate" style="width: 100%;"></el-date-picker>
                             </el-form-item>
                             <el-form-item style="width:395px ;" label="离店时间" prop="checkOutDate">
-                                <el-date-picker  size="medium" type="date" placeholder="选择时间"
+                                <el-date-picker value-format="yyyy-MM-dd"  size="medium" type="date" placeholder="选择时间"
                                     v-model="enquiryinfo.checkOutDate" style="width: 100%;"></el-date-picker>
                             </el-form-item>
                         </div>

+ 2 - 3
src/components/OP/OpAirTicketRes.vue

@@ -278,7 +278,7 @@
                     </div>
                     <div style="width: 25%;">
                         <el-form-item label="航班日期:" prop="flightsDate" label-width="160px">
-                            <el-date-picker v-model="airTicketResOpData.flightsDate" type="date" placeholder="航班日期">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="airTicketResOpData.flightsDate" type="date" placeholder="航班日期">
                             </el-date-picker>
                         </el-form-item>
                     </div>
@@ -393,9 +393,8 @@
                     </div> -->
                     <div style="width: 25%;">
                         <el-form-item label="消费日期:" prop="visitCountry">
-                            <el-date-picker v-model="cardPaymentOpData.consumptionDate" placeholder="消费日期" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="cardPaymentOpData.consumptionDate" placeholder="消费日期" type="date">
                             </el-date-picker>
-
                         </el-form-item>
                     </div>
                     <div style="width: 25%;">

+ 1 - 1
src/components/OP/OpCustomers.vue

@@ -175,7 +175,7 @@
                     </div>
                     <div style="width: 390px;">
                         <el-form-item label="消费日期:" prop="consumptionDate" label-width="160px">
-                            <el-date-picker v-model="OpCustomersData.consumptionDate" placeholder="消费日期" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="OpCustomersData.consumptionDate" placeholder="消费日期" type="date">
                             </el-date-picker>
 
                         </el-form-item>

+ 1 - 1
src/components/OP/OpVisaPriec.vue

@@ -195,7 +195,7 @@
                     </div> -->
                     <div style="width: 385px;">
                         <el-form-item label="消费日期:" prop="consumptionDate" label-width="160px">
-                            <el-date-picker style="width:100%" v-model="OpVisaPriceData.consumptionDate"
+                            <el-date-picker value-format="yyyy-MM-dd" style="width:100%" v-model="OpVisaPriceData.consumptionDate"
                                 placeholder="消费日期" type="date">
                             </el-date-picker>
 

+ 2 - 2
src/components/OP/PickupList.vue

@@ -127,7 +127,7 @@
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item style="width:395px ;" label="出生日期">
-                        <el-date-picker size="medium" type="date" placeholder="选择出生日期" v-model.trim="pickupinif.birth"
+                        <el-date-picker value-format="yyyy-MM-dd" size="medium" type="date" placeholder="选择出生日期" v-model.trim="pickupinif.birth"
                             style="width: 100%;">
                         </el-date-picker>
                     </el-form-item>
@@ -230,7 +230,7 @@
                         </el-table-column>
                         <el-table-column label="出生日期" width="100">
                             <template slot-scope="scope">
-                                <el-date-picker :clearable="false" size="mini" type="date" placeholder="出生日期"
+                                <el-date-picker value-format="yyyy-MM-dd" :clearable="false" size="mini" type="date" placeholder="出生日期"
                                     v-model.trim="scope.row.birthDay" style="width: 100%;padding-left: 0px;padding-right: 0px;">
                                 </el-date-picker>
                             </template>

+ 4 - 3
src/components/OP/SuppliesInventory.vue

@@ -251,6 +251,7 @@
                     </el-form-item>
                     <el-form-item label="入库时间" prop="storageTime">
                         <el-date-picker
+                        value-format="yyyy-MM-dd"
                         size="small"
                         style="width:100%"
                         v-model="warehousingsruleForm.storageTime"
@@ -1310,9 +1311,9 @@ export default {
                 this.groupID+=this.groupID[g]+','
             }
             // this.groupID=this.groupID.substring(0, this.groupID.length - 1);
-            // for (let p = 0; p < this.personnelID.length; p++) {
-            //     this.personnelID += this.personnelID[p]+',';
-            // }
+            for (let p = 0; p < this.personnelID.length; p++) {
+                this.personnelID += this.personnelID[p]+',';
+            }
             // this.personnelID=this.personnelID.substring(0, this.personnelID.length - 1);
             console.log(this.groupID);
             console.log(this.personnelID);

+ 8 - 8
src/components/OP/backwardtabke.vue

@@ -26,7 +26,7 @@
             <div class="backward-table">
                 <div class="backward-table-li">
                     <div class="backward-li-span">
-                        <el-date-picker v-model="datainfo.approvalDataDt" type="date" placeholder="选择日期">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="datainfo.approvalDataDt" type="date" placeholder="选择日期">
                         </el-date-picker>
                     </div>
                     <div class="backward-li-span">报批资料准备</div>
@@ -38,7 +38,7 @@
                 </div>
                 <div class="backward-table-li">
                     <div class="backward-li-span">
-                        <el-date-picker v-model="datainfo.approvalDt" type="date" placeholder="选择日期">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="datainfo.approvalDt" type="date" placeholder="选择日期">
                         </el-date-picker>
                     </div>
                     <div class="backward-li-span">
@@ -58,7 +58,7 @@
                 </div>
                 <div class="backward-table-li">
                     <div class="backward-li-span">
-                        <el-date-picker v-model="datainfo.issueApprovalDt" type="date" placeholder="选择日期">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="datainfo.issueApprovalDt" type="date" placeholder="选择日期">
                         </el-date-picker>
                     </div>
                     <div class="backward-li-span"><p style="line-height: 10px;padding: 0;">出批件</p><p  style="line-height: 10px;padding: 0;">护照办理</p></div>
@@ -82,7 +82,7 @@
                 </div> -->
                 <div class="backward-table-li">
                     <div class="backward-li-span">
-                        <el-date-picker v-model="datainfo.visaInformationDt" type="date" placeholder="选择日期">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="datainfo.visaInformationDt" type="date" placeholder="选择日期">
                         </el-date-picker>
                     </div>
                     <div class="backward-li-span">签证资料准备</div>
@@ -94,7 +94,7 @@
                 </div>
                 <div class="backward-table-li">
                     <div class="backward-li-span">
-                        <el-date-picker v-model="datainfo.sendVisaDt" type="date" placeholder="选择日期">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="datainfo.sendVisaDt" type="date" placeholder="选择日期">
                         </el-date-picker>
                     </div>
                     <div class="backward-li-span">送签签证</div>
@@ -147,7 +147,7 @@
                 </div>
                 <div class="backward-table-li">
                     <div class="backward-li-span">
-                        <el-date-picker v-model="datainfo.issueVisaDt" type="date" placeholder="选择日期">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="datainfo.issueVisaDt" type="date" placeholder="选择日期">
                         </el-date-picker>
                     </div>
                     <div class="backward-li-span">出签</div>
@@ -159,7 +159,7 @@
                 </div>
                 <div class="backward-table-li">
                     <div class="backward-li-span">
-                        <el-date-picker v-model="datainfo.preTripMeetingDt" type="date" placeholder="选择日期">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="datainfo.preTripMeetingDt" type="date" placeholder="选择日期">
                         </el-date-picker>
                     </div>
                     <div class="backward-li-span">开行前会</div>
@@ -171,7 +171,7 @@
                 </div>
                 <div class="backward-table-li">
                     <div class="backward-li-span">
-                        <el-date-picker v-model="datainfo.airportdDropOffDt" type="date" placeholder="选择日期">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="datainfo.airportdDropOffDt" type="date" placeholder="选择日期">
                         </el-date-picker>
                     </div>
                     <div class="backward-li-span">送机</div>

+ 21 - 21
src/components/OP/visaEdit.vue

@@ -30,7 +30,7 @@
                             <el-input v-model="deleClient.phone" placeholder="请输入11位手机号"></el-input>
                         </el-form-item>
                         <el-form-item label="出生日期:" prop="birthDay">
-                            <el-date-picker v-model="deleClient.birthDay" type="date" placeholder="选择日期">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.birthDay" type="date" placeholder="选择日期">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="婚姻状况:" prop="marriage">
@@ -110,12 +110,12 @@
                     </el-form-item>
                     <el-form-item label="证件有效期:" prop="issueDt">
                         <div>
-                            <el-date-picker v-model="item.issueDt" type="date" placeholder="身份证有效期">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="item.issueDt" type="date" placeholder="身份证有效期">
                             </el-date-picker>
                         </div>
                     </el-form-item>
                     <el-form-item label="至:" prop="expiryDt">
-                        <el-date-picker v-model="item.expiryDt" type="date" placeholder="身份证有效期">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="item.expiryDt" type="date" placeholder="身份证有效期">
                         </el-date-picker>
                     </el-form-item>
                     <div style="margin-top: 40px;margin-left: 40px;">
@@ -167,7 +167,7 @@
                             <el-input v-model="deleClient.job"></el-input>
                         </el-form-item>
                         <el-form-item label="入职时间" prop="workDate">
-                            <el-date-picker v-model="deleClient.workDate" type="date" placeholder="(注明年月日)">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.workDate" type="date" placeholder="(注明年月日)">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="月薪" prop="wage">
@@ -205,18 +205,18 @@
                     @submit.native.prevent>
                     <div class="foundation-box">
                         <el-form-item label="结婚时间:" prop="weddingDate">
-                            <el-date-picker v-model="deleClient.weddingDate" type="date" placeholder="请注明结婚时间">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.weddingDate" type="date" placeholder="请注明结婚时间">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="离婚时间:" prop="divorceDate">
-                            <el-date-picker v-model="deleClient.divorceDate" type="date" placeholder="如离婚,请注明离婚时间">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.divorceDate" type="date" placeholder="如离婚,请注明离婚时间">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="配偶姓名:" prop="mateName">
                             <el-input v-model="deleClient.mateName" placeholder="客户配偶姓名(若离异或分居或去世也应填写此项)"></el-input>
                         </el-form-item>
                         <el-form-item label="出生日期:" prop="mateBirthDay">
-                            <el-date-picker v-model="deleClient.mateBirthDay" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.mateBirthDay" type="date">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="出生城市" prop="mateBirthCity">
@@ -258,7 +258,7 @@
                         <el-input v-model="item.name" clearable></el-input>
                     </el-form-item>
                     <el-form-item label="出生日期:" prop="FamilybirthDay">
-                        <el-date-picker v-model="item.birthDay" type="date">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="item.birthDay" type="date">
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item label="出生地:" prop="birthPlace">
@@ -348,7 +348,7 @@
                             <span>(请列出最近1次出访信息,不记得具体日期,请提供尽量靠近的日期)</span>
                         </el-form-item>
                         <el-form-item label="美国:" prop="usaDate">
-                            <el-date-picker v-model="deleClient.usaDate" placeholder="抵达日期" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.usaDate" placeholder="抵达日期" type="date">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="天数:" prop="usaDays">
@@ -356,7 +356,7 @@
                         </el-form-item>
                         <el-form-item label="加拿大:" prop="canDate">
 
-                            <el-date-picker v-model="deleClient.canDate" placeholder="抵达日期" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.canDate" placeholder="抵达日期" type="date">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="天数:" prop="canDays">
@@ -375,16 +375,16 @@
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="申根有效期起:" prop="startTime">
-                            <el-date-picker v-model="deleClient.startTime" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.startTime" type="date">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="申根有效期止:" prop="endTime">
-                            <el-date-picker v-model="deleClient.endTime" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.endTime" type="date">
                             </el-date-picker>
                         </el-form-item>
 
                         <el-form-item label="申根指纹录入:" prop="fingerDate">
-                            <el-date-picker v-model="deleClient.fingerDate" type="date" placeholder="选择日期">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.fingerDate" type="date" placeholder="选择日期">
                             </el-date-picker>
                         </el-form-item>
 
@@ -395,7 +395,7 @@
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="获得日期:" prop="getUSAVisaDate">
-                            <el-date-picker v-model="deleClient.getUSAVisaDate" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.getUSAVisaDate" type="date">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="地点:" prop="getUPPlace">
@@ -428,7 +428,7 @@
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="何时:" prop="rejectedDate">
-                            <el-date-picker v-model="deleClient.rejectedDate" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.rejectedDate" type="date">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="何地:" prop="rejectedPlace">
@@ -457,7 +457,7 @@
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="何时:" prop="loseDate">
-                            <el-date-picker v-model="deleClient.loseDate" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.loseDate" type="date">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="护照编码:" prop="loseCode">
@@ -576,11 +576,11 @@
                                 <el-input v-model="item.leaderName" clearable style="width: 150px;"></el-input>
                             </el-form-item>
                             <el-form-item label="起始日期:" prop="workStart">
-                                <el-date-picker v-model="item.workStart" type="date">
+                                <el-date-picker value-format="yyyy-MM-dd" v-model="item.workStart" type="date">
                                 </el-date-picker>
                             </el-form-item>
                             <el-form-item label="结束日期:" prop="workEnd">
-                                <el-date-picker v-model="item.workEnd" type="date">
+                                <el-date-picker value-format="yyyy-MM-dd" v-model="item.workEnd" type="date">
                                 </el-date-picker>
                             </el-form-item>
                         </div>
@@ -633,11 +633,11 @@
                             <el-input v-model="item.subject" clearable></el-input>
                         </el-form-item>
                         <el-form-item label="起始日期:" prop="studyStart">
-                            <el-date-picker v-model="item.studyStart" type="date" style="width: 150px;">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="item.studyStart" type="date" style="width: 150px;">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="结束日期:" prop="studyEnd">
-                            <el-date-picker v-model="item.studyEnd" type="date" style="width: 150px;">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="item.studyEnd" type="date" style="width: 150px;">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item style="margin-top: 3%;margin-left: 5px;">
@@ -670,7 +670,7 @@
                         <el-input v-model="deleClient.tableOpTel" placeholder="填表经办人联系电话"></el-input>
                     </el-form-item>
                     <el-form-item label="填表日期:" prop="tableDate">
-                        <el-date-picker v-model="deleClient.tableDate" type="date" placeholder="选择日期">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="deleClient.tableDate" type="date" placeholder="选择日期">
                         </el-date-picker>
                     </el-form-item>
                 </div>

+ 1 - 0
src/components/Resource/OpOfficialActivities.vue

@@ -101,6 +101,7 @@
                     <div style="width: 385px;">
                         <el-form-item label="公务日期:" prop="date" label-width="160px">
                             <el-date-picker
+                            value-format="yyyy-MM-dd"
                             type="date"
                             v-model="OpOfficialActivitiesDto.date"
                             placeholder="选择日期">

+ 2 - 2
src/components/child/Controltree.vue

@@ -74,12 +74,12 @@
                     </el-form-item>
                     <el-form-item label="开始时间" label-width="80px" required>
                         <el-form-item prop="ExpectBeginDt">
-                            <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.ExpectBeginDt" style="width: 100%;"></el-date-picker>
+                            <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="ruleForm.ExpectBeginDt" style="width: 100%;"></el-date-picker>
                         </el-form-item>
                     </el-form-item>
                     <el-form-item label="结束时间" label-width="80px" required>
                         <el-form-item prop="ExpectEndDt">
-                            <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.ExpectEndDt" style="width: 100%;"></el-date-picker>
+                            <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="ruleForm.ExpectEndDt" style="width: 100%;"></el-date-picker>
                         </el-form-item>
                     </el-form-item>
                 </div>

+ 1 - 0
src/components/statistics/Statistically.vue

@@ -3,6 +3,7 @@
         <div class="statistically-all">
             <div class="yeardate">
                 <el-date-picker
+                    value-format="yyyy-MM-dd"
                     @change="yearchange"
                     style="width:200px;"
                     v-model="year"

+ 2 - 0
src/components/system/MyTasksinif.vue

@@ -27,6 +27,7 @@
                     <div class="mytasksinif-form-first">
                         <el-form-item label="实际开始" prop="name">
                             <el-date-picker
+                            value-format="yyyy-MM-dd hh:mm:ss"
                             :disabled="true"
                             style="width:100%;"
                             v-model="finish.actuallyStarted"
@@ -37,6 +38,7 @@
                         </el-form-item>
                         <el-form-item label="实际结束" prop="name">
                             <el-date-picker
+                            value-format="yyyy-MM-dd hh:mm:ss"
                             style="width:100%;"
                             :disabled="true"
                             v-model="finish.actuallyOver"

+ 8 - 7
src/components/system/Payroll.vue

@@ -5,6 +5,7 @@
                 <div style="display: flex;" class="payroll-head-li">
                     <el-date-picker
                     style="width: 120px;"
+                    value-format="yyyy-MM"
                     v-model="value2"
                     :clearable="false"
                     type="month"
@@ -184,7 +185,7 @@
                 <div>
                     <el-form :model="TaxesData" ref="TaxesData" :rules="Taxesrules">
                         <el-form-item label="年月" prop="yearMonth" label-width="50">
-                            <el-date-picker style="width:86%" v-model="TaxesData.yearMonth" size="medium" type="month" placeholder="选择月"></el-date-picker>
+                            <el-date-picker value-format="yyyy-MM" style="width:86%" v-model="TaxesData.yearMonth" size="medium" type="month" placeholder="选择月"></el-date-picker>
                         </el-form-item>
                     </el-form>
                     <el-upload drag
@@ -212,13 +213,13 @@
             <el-dialog :close-on-click-modal="false" width="380px" title="选择计算当月工资日期" :visible.sync="gridTableVisible">
                 <el-form :model="gridData" ref="gridData" :rules="gridrules">
                     <el-form-item label="年月" prop="yearMonth" :label-width="formLabelWidth">
-                        <el-date-picker v-model="gridData.yearMonth" size="medium" type="month" placeholder="选择月"></el-date-picker>
+                        <el-date-picker value-format="yyyy-MM" v-model="gridData.yearMonth" size="medium" type="month" placeholder="选择月"></el-date-picker>
                     </el-form-item>
                     <el-form-item label="工资日期起" prop="startDate" :label-width="formLabelWidth">
-                        <el-date-picker v-model="gridData.startDate" size="medium" type="date" placeholder="选择日期"></el-date-picker>
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="gridData.startDate" size="medium" type="date" placeholder="选择日期"></el-date-picker>
                     </el-form-item>
                     <el-form-item label="工资日期止" prop="endDate" :label-width="formLabelWidth">
-                        <el-date-picker v-model="gridData.endDate" size="medium" type="date" placeholder="选择日期"></el-date-picker>
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="gridData.endDate" size="medium" type="date" placeholder="选择日期"></el-date-picker>
                     </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
@@ -245,13 +246,13 @@
                             </el-switch>
                         </el-form-item> -->
                         <el-form-item label="年月" prop="yearMonth" :label-width="formLabelWidth">
-                            <el-date-picker @change="Rangetime()" v-model="salaryinif.yearMonth" size="medium" type="month" placeholder="选择月"></el-date-picker>
+                            <el-date-picker value-format="yyyy-MM" @change="Rangetime()" v-model="salaryinif.yearMonth" size="medium" type="month" placeholder="选择月"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="工资日期起" prop="startDate" :label-width="formLabelWidth">
-                            <el-date-picker v-model="salaryinif.startDate" size="medium" type="date" placeholder="选择日期"></el-date-picker>
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="salaryinif.startDate" size="medium" type="date" placeholder="选择日期"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="工资日期止" prop="endDate" :label-width="formLabelWidth">
-                            <el-date-picker v-model="salaryinif.endDate" size="medium" type="date" placeholder="选择日期"></el-date-picker>
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="salaryinif.endDate" size="medium" type="date" placeholder="选择日期"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="基本工资" prop="basic" :label-width="formLabelWidth">
                             <el-input-number :precision="2" size="medium" :controls="false" v-model="salaryinif.basic"></el-input-number>

+ 1 - 1
src/components/system/User.vue

@@ -105,7 +105,7 @@
                             <el-input v-model="ruleForm.IDnumber" placeholder="输入身份证号"></el-input>
                         </el-form-item>
                         <el-form-item label="入职时间" prop="datebirth">
-                            <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.datebirth" style="width: 100%;"></el-date-picker>
+                            <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="ruleForm.datebirth" style="width: 100%;"></el-date-picker>
                             <!-- <el-input v-model="ruleForm.datebirth"></el-input> -->
                         </el-form-item>
                         <el-form-item label="学历" prop="educated">