md

src/views/emis/customerService/traceRecordList.vue

@@ -19,7 +19,7 @@
 
       <el-table-column :label="$t('扫描时间')" align="center" prop="scanDate"  :sortable="true" :sort-method="sortByScanDate" min-width="170" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.scanDate) }}</span>
+          <span>{{ (scope.row.scanDate) }}</span>
         </template>
       </el-table-column>
 

src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue

@@ -127,7 +127,7 @@
             <dict-tag :options="dict.type.emis_cost_split_type" :value="scope.row.splitType"/>
           </template>
        </el-table-column>
-       <el-table-column :label="$t('成本时间')" align="center" prop="tradeDate" min-width="100" />
+       <el-table-column :label="$t('成本时间')" align="center" prop="tradeDate" min-width="170" />
       <el-table-column :label="$t('总费用')" align="center" prop="costFee" min-width="100" />
       <el-table-column :label="$t('运单总票数')" align="center" prop="sendPieceSum" min-width="100" />
       <!-- <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" /> -->

src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue

@@ -68,25 +68,25 @@
               <el-input v-model="form.destPlace" placeholder="请输入目的地" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="交易日期" prop="tradeDate" >
               <el-date-picker
               style="width:100%"
               clearable
                 v-model="form.tradeDate"
-                type="date"
+                type="datetime"
-                value-format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="交易日期">
               </el-date-picker>
             </el-form-item>
         </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
           </el-col>
           <el-col :span="6">
             <el-form-item label="运输方式" prop="transType">
               <el-select clearable v-model="form.transType" placeholder="请选择" style="width:100%">
                 <el-option
-                  v-for="dict in dict.type.emis_trans_carrier"
+                  v-for="dict in dict.type.emis_biz_shipping_method"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -109,7 +109,6 @@
 
 
 
-
           <el-col :span="24">
             <el-form-item label="关联单号" prop="billCode" >
               <span slot="label">
@@ -247,7 +246,7 @@ export default {
     }
   },
   components: { EmisTmsSiteBatchPicker },
-  dicts: ['emis_cost_fee_type','emis_cost_split_type','emis_trans_carrier','emis_payment_type'],
+  dicts: ['emis_cost_fee_type','emis_cost_split_type','emis_biz_shipping_method','emis_payment_type'],
   data() {
     return {
       emisTmsCostFeeOptions: [],
@@ -322,7 +321,9 @@ export default {
         this.form.transSignNo=item.carNo;
         this.form.sendPlace=item.startSiteName;
         this.form.destPlace=item.nextSiteName;
-        this.form.tradeDate=item.etd;
+        this.form.tradeDate= this.parseTime(item.etd);
+
+
 
         this.form.billRelList=[];
         // 运单列表信息