Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/indexAir.vue

@@ -36,8 +36,8 @@
       </el-form-item>
 
       <el-form-item label="">
-        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
+        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
       </el-form-item>
 
       <el-form-item>
@@ -84,7 +84,7 @@
 
       <el-table-column label="日期" align="center" prop="createTime" width="180">
       <template slot-scope="scope">
-        <span>{{ new Date(scope.row.createTime).format('yyyy-MM-dd') }}</span>
+        <span>{{ new Date(scope.row.createTime).format('yyyy-MM-dd hh:mm:ss') }}</span>
       </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/ecw/box/indexSea.vue

@@ -40,7 +40,7 @@
       </el-form-item>
 
       <el-form-item label="">
-        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
 
       <el-form-item label="状态" prop="boxStatus">
@@ -105,7 +105,7 @@
 
       <el-table-column label="日期" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ new Date(scope.row.createTime).format('yyyy-MM-dd') }}</span>
+          <span>{{ new Date(scope.row.createTime).format('yyyy-MM-dd hh:mm:ss') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">

src/views/ecw/box/indexSeaAir.vue

@@ -34,8 +34,8 @@
       </el-form-item>
 
       <el-form-item label="">
-        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
+        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
       </el-form-item>
 
 
@@ -101,7 +101,7 @@
 
       <el-table-column label="日期" align="center" prop="createTime" width="180">
       <template slot-scope="scope">
-        <span>{{ new Date(scope.row.createTime).format('yyyy-MM-dd') }}</span>
+        <span>{{ new Date(scope.row.createTime).format('yyyy-MM-dd hh:mm:ss') }}</span>
       </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/ecw/box/regError.vue

@@ -15,8 +15,8 @@
         <el-input v-model="errorObj.abnDetail" type="textarea" rows="2" placeholder="请输入异常情况"></el-input>
       </el-form-item>
       <el-form-item label="异常时间" prop="arrivalTime" class="two-element">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="errorObj.abnStartTime" value-format="yyyy-MM-dd"></el-date-picker>
-        <el-date-picker type="date" placeholder="请选择日期" v-model="errorObj.abnEndTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="errorObj.abnStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="errorObj.abnEndTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
 
       <el-form-item label="是否更新订单状态">

src/views/ecw/box/shippingSea/nodePage/arrival.vue

@@ -11,7 +11,7 @@
         <p class="message-area" v-show="showMsg">请确认是否有异常，如有异常请进行异常登记</p>
       </el-form-item>
       <el-form-item label="卸港时间">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="arrivalObj.apUnloadPortTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="arrivalObj.apUnloadPortTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
     </el-form>
 
@@ -80,7 +80,7 @@ export default {
     getExpectedTime() {
       const { shippingInfo } = this.$attrs.shipmentObj;
       if (shippingInfo) {
-        return dayjs(shippingInfo.dtEstArrivalTime).format("YYYY-MM-DD");
+        return dayjs(shippingInfo.dtEstArrivalTime).format("YYYY-MM-DD HH:mm:ss");
       }
       return null;
     },

src/views/ecw/box/shippingSea/nodePage/barge.vue

@@ -11,7 +11,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="驳船预计开船时间" label-width="130px">
-              <el-date-picker type="date" placeholder="请选择日期" v-model="bargeObj.bgEstShipTime" value-format="yyyy-MM-dd"></el-date-picker>
+              <el-date-picker type="datetime" placeholder="请选择日期" v-model="bargeObj.bgEstShipTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -21,7 +21,7 @@
           </el-col>
         </el-row>
         <el-form-item label="驳船实际开船时间" label-width="130px">
-          <el-date-picker type="date" placeholder="请选择日期" v-model="bargeObj.bgRealShipTime" value-format="yyyy-MM-dd"></el-date-picker>
+          <el-date-picker type="datetime" placeholder="请选择日期" v-model="bargeObj.bgRealShipTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
       </div>
     </el-form>

src/views/ecw/box/shippingSea/nodePage/booking.vue

@@ -20,13 +20,13 @@
         <supplierSelect v-model="bookingObj.spaceCompanyId" :companyType="'1'" placeholder="请选择订舱公司" :allSupplier="this.$attrs.allSupplier" />
       </el-form-item>
       <el-form-item label="预计驳船时间">
-        <el-date-picker type="date" placeholder="请选择日期" value-format="yyyy-MM-dd" v-model="bookingObj.bargeTime"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.bargeTime"></el-date-picker>
       </el-form-item>
 
       <el-row>
         <el-col :span="12">
           <el-form-item label="预计开船时间" prop="sailTime">
-            <el-date-picker type="date" placeholder="请选择日期" value-format="yyyy-MM-dd" v-model="bookingObj.sailTime"></el-date-picker>
+            <el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.sailTime"></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -39,7 +39,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="预计提单补料时间">
-            <el-date-picker type="date" placeholder="请选择日期" value-format="yyyy-MM-dd" v-model="bookingObj.ladingBillTime"></el-date-picker>
+            <el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.ladingBillTime"></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -52,7 +52,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="预计报关时间">
-            <el-date-picker type="date" placeholder="请选择日期" value-format="yyyy-MM-dd" v-model="bookingObj.customsTime"></el-date-picker>
+            <el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.customsTime"></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -65,7 +65,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="预计截关时间">
-            <el-date-picker type="date" placeholder="请选择日期" value-format="yyyy-MM-dd" v-model="bookingObj.cutOffTime"></el-date-picker>
+            <el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.cutOffTime"></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="12">

src/views/ecw/box/shippingSea/nodePage/cabinet/index.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form ref="cabinetForm" :rules="rules" :model="cabinetObj" label-width="80px">
       <el-form-item label="到仓时间">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="cabinetObj.ldInWarehouseTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="cabinetObj.ldInWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item label="仓库">
         <el-select v-model="cabinetObj.ldWarehouseType" placeholder="请选择仓库" filterable>
@@ -10,10 +10,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="装柜时间" prop="ldBoxTime">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item label="出仓时间">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item label="装柜图片">
         <ImageUpload :limit="1" :isShowTip=false v-model="cabinetObj.ldPictures" />

src/views/ecw/box/shippingSea/nodePage/clrDocument.vue

@@ -9,7 +9,7 @@
 
       <template v-if="cDocObj.cdOutBillType === '1'">
         <el-form-item label="电放时间">
-          <el-date-picker type="date" placeholder="请选择日期" v-model="cDocObj.cdElectricTime" value-format="yyyy-MM-dd"></el-date-picker>
+          <el-date-picker type="datetime" placeholder="请选择日期" v-model="cDocObj.cdElectricTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
         <el-form-item label="电放凭证附件">
           <FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdElectricVoucher" :fileType="fileType" />
@@ -18,7 +18,7 @@
 
       <template v-if="cDocObj.cdOutBillType === '2'">
         <el-form-item label="寄送时间">
-          <el-date-picker type="date" placeholder="请选择日期" v-model="cDocObj.cdSendTime" value-format="yyyy-MM-dd"></el-date-picker>
+          <el-date-picker type="datetime" placeholder="请选择日期" v-model="cDocObj.cdSendTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
         <el-form-item label="快递单号">
           <el-input v-model="cDocObj.cdBillNo" placeholder="请输入快递单号"></el-input>
@@ -31,7 +31,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item>
-        <el-date-picker type="date" placeholder="请选择日期" v-model="cDocObj.cdAgentlistTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="cDocObj.cdAgentlistTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdAgentlistFile" :fileType="fileType" />
@@ -43,7 +43,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item>
-        <el-date-picker type="date" placeholder="请选择日期" v-model="cDocObj.cdSoncapTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="cDocObj.cdSoncapTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdSoncapFile" :fileType="fileType" />

src/views/ecw/box/shippingSea/nodePage/cusClearance.vue

@@ -3,7 +3,7 @@
     <el-form ref="cusClearanceForm" :rules="rules" :model="cusClearanceObj" label-width="120px">
       <el-form-item label="清关代理">{{getClAgent('label')}}</el-form-item>
       <el-form-item label="预计清关时间" prop="clEstTime">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="cusClearanceObj.clEstTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="cusClearanceObj.clEstTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item label="清关时间" prop="clClearTime">
         <el-date-picker type="datetime" placeholder="请选择日期" v-model="cusClearanceObj.clClearTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>

src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue

@@ -27,7 +27,7 @@
         <supplierSelect v-model="cusDeclarationObj.dcCompanyId" :companyType="'2'" placeholder="请选择报关公司名称" :allSupplier="this.$attrs.allSupplier" />
       </el-form-item>
       <el-form-item label="截关时间">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclarationObj.dcCutOffTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="cusDeclarationObj.dcCutOffTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item label="状态" prop="dcCustomsStatus">
         <el-radio-group v-model="cusDeclarationObj.dcCustomsStatus">
@@ -47,7 +47,7 @@
       <!-- 退场 -->
       <div v-show="cusDeclarationObj.dcCheckStatus === '1' || cusDeclarationObj.dcCheckStatus === '2'">
         <el-form-item label="查验时间">
-          <el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclarationObj.dcCheckTime" value-format="yyyy-MM-dd"></el-date-picker>
+          <el-date-picker type="datetime" placeholder="请选择日期" v-model="cusDeclarationObj.dcCheckTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
         <el-form-item label="查验前图片">
           <ImageUpload :limit="1" :isShowTip=false v-model="cusDeclarationObj.dcCheckPreImg" />
@@ -59,7 +59,7 @@
 
       <!-- 放行 -->
       <el-form-item label="放行时间" v-show="cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCheckStatus === '2'">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclarationObj.dcPassTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="cusDeclarationObj.dcPassTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
 
       <el-form-item label="装箱单">

src/views/ecw/box/shippingSea/nodePage/departure.vue

@@ -11,7 +11,7 @@
       </el-form-item>
 
       <el-form-item label="预期到港时间" prop="dtEstArrivalTime">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="departureObj.dtEstArrivalTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="departureObj.dtEstArrivalTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
     </el-form>
 
@@ -110,7 +110,7 @@ export default {
     // 预计开船时间
     getSailingTime() {
       return dayjs(this.$attrs.shipmentObj.bookSeaInfo.sailTime).format(
-        "YYYY-MM-DD"
+        "YYYY-MM-DD HH:mm:ss"
       );
     },
   },

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -3,7 +3,7 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="入仓时间" prop="rucangtime">
-        <el-date-picker v-model="queryParams.rucangtime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+        <el-date-picker v-model="queryParams.rucangtime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
       <el-form-item label="始发地" prop="startWarehouseId">
         <el-select v-model="queryParams.startWarehouseId" placeholder="请选择始发地" clearable size="small">

src/views/ecw/box/shippingSea/nodePage/settlement.vue

@@ -2,10 +2,10 @@
   <div>
     <el-form ref="settlementForm" :model="settlementObj" label-width="80px">
       <el-form-item label="可结算">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="settlementObj.slSettlementTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="settlementObj.slSettlementTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item label="已结算">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="settlementObj.slSettledTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="settlementObj.slSettledTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
     </el-form>
 

src/views/ecw/box/shippingSea/nodePage/ship.vue

@@ -7,7 +7,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="配船时间" v-show="shipObj.saExmtStatus === '2'">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="shipObj.configTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="shipObj.configTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
     </el-form>
 

src/views/ecw/box/shippingSea/nodePage/trailer.vue

@@ -10,7 +10,7 @@
         <supplierSelect v-model="trailerObj.tlCompanyId" :companyType="'4'" placeholder="请选择拖车公司" :allSupplier="this.$attrs.allSupplier" />
       </el-form-item>
       <el-form-item label="拖车时间" prop="tlTime">
-        <el-date-picker type="date" placeholder="请选择日期" value-format="yyyy-MM-dd" v-model="trailerObj.tlTime"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="trailerObj.tlTime"></el-date-picker>
       </el-form-item>
       <el-form-item label="车牌">
         <el-input v-model="trailerObj.tlLicensePlate	" placeholder="请输入车牌"></el-input>

src/views/ecw/box/shippingSea/nodePage/unloading/index.vue

@@ -5,10 +5,10 @@
         <dockSelect v-model="unloadingObj.ulOutletsId" placeholder="请选择网点" :allDocks="this.$attrs.allDocks" />
       </el-form-item>
       <el-form-item label="到仓时间">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="unloadingObj.ulWarehouseTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="unloadingObj.ulWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item label="卸柜时间">
-        <el-date-picker type="date" placeholder="请选择日期" v-model="unloadingObj.ulBoxTime" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="unloadingObj.ulBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
     </el-form>
 

src/views/ecw/box/shippingSea/seaStepDetail.vue

@@ -38,8 +38,6 @@ export default {
       if (val) {
         switch (type) {
           case "date":
-            val = dayjs(val).format("YYYY-MM-DD");
-            break;
           case "datetime":
             val = dayjs(val).format("YYYY-MM-DD HH:mm:ss");
             break;

src/views/ecw/box/shippingSea/utils.js

@@ -886,10 +886,10 @@ function formatNumberString(obj, keys) {
  *
  * @param {*} obj
  * @param {*} keys
- * @param {string} [format="YYYY-MM-DD"]
+ * @param {string} [format="YYYY-MM-DD HH:mm:ss"]
  * @return {*}
  */
-function formatDateStr(obj, keys, format = "YYYY-MM-DD") {
+function formatDateStr(obj, keys, format = "YYYY-MM-DD HH:mm:ss") {
   for (const [key, value] of Object.entries(obj)) {
     if (keys.includes(key) && dayjs(value).isValid()) {
       obj[key] = dayjs(value).format(format);
@@ -902,10 +902,10 @@ function formatDateStr(obj, keys, format = "YYYY-MM-DD") {
  * 格式化日期
  *
  * @param {*} date
- * @param {string} [format="YYYY-MM-DD"]
+ * @param {string} [format="YYYY-MM-DD HH:mm:ss"]
  * @return {*}
  */
-function formatDate(date, format = "YYYY-MM-DD") {
+function formatDate(date, format = "YYYY-MM-DD HH:mm:ss") {
   if (!date) return date;
   return dayjs(date).format(format);
 }