liuhj 7 months ago
parent
commit
a43297f467

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

@@ -3,7 +3,7 @@
         <div class="groupunreviewed-title">团组未审核数据</div>
         <div class="groupunreviewed-haed">
             <div>
-                <el-date-picker value-format="yyyy-MM-dd" @change="datechange" style="width:350px" v-model="value" type="daterange" align="left"
+                <el-date-picker @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>

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

@@ -40,7 +40,6 @@
                     </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"

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

@@ -91,7 +91,6 @@
                         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/OP/OpVisaPriec.vue

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

+ 14 - 5
src/components/OP/SuppliesInventory.vue

@@ -280,7 +280,6 @@
                     </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"
@@ -871,7 +870,7 @@ export default {
             return val.toFixed(2);
         },
         //处理日期
-        datetime(val){
+        datetimes(val){
             var date=new Date(val);
             var y=date.getFullYear();
             var m=date.getMonth()+1>=10?date.getMonth()+1:'0'+(date.getMonth()+1).toString();
@@ -881,6 +880,17 @@ export default {
             var mm=date.getSeconds()>=10?date.getSeconds():'0'+(date.getSeconds()).toString();
             return y+'-'+m+'-'+d
         },
+        //处理日期
+        datetime(val){
+            var date=new Date(val);
+            var y=date.getFullYear();
+            var m=date.getMonth()+1>=10?date.getMonth()+1:'0'+(date.getMonth()+1).toString();
+            var d=date.getDate()>=10?date.getDate():'0'+(date.getDate()).toString();
+            var s=date.getHours()>=10?date.getHours():'0'+(date.getHours()).toString();
+            var f=date.getMinutes()>=10?date.getMinutes():'0'+(date.getMinutes()).toString();
+            var mm=date.getSeconds()>=10?date.getSeconds():'0'+(date.getSeconds()).toString();
+            return y+'-'+m+'-'+d+" "+s+':'+f+':'+mm
+        },
         //获取
         GoodsInitDataSource() {
             var url = "/api/PersonnelModule/GoodsInitDataSource"
@@ -1288,7 +1298,6 @@ export default {
             if (valid) {
                 this.GoodsStorageOP();
             } else {
-                console.log(this.datetime(this.warehousingsruleForm.storageTime));
                 return false;
             }
             });
@@ -1391,8 +1400,8 @@ export default {
                     goodsId:0,
                     userLabel:personnelID,
                     goodsName:that.RSAuditname,
-                    beginDt:that.RSAudittime?that.datetime(that.RSAudittime[0]):'',
-                    endDt:that.RSAudittime?that.datetime(that.RSAudittime[1]):'',
+                    beginDt:that.RSAudittime?that.datetimes(that.RSAudittime[0]):'',
+                    endDt:that.RSAudittime?that.datetimes(that.RSAudittime[1]):'',
                     groupLabel:groupID,
                     typeLabel:RSAuditTypes,
                     auditLabel:that.RSAuditStatus+"",