md

src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue

@@ -857,7 +857,6 @@ export default {
       start.setHours(0,0,0,0)
 
       let end = new Date()
-      end.setHours(23,59,59,0)
       var currentMonth = end.getMonth()
       var nextMonth = ++currentMonth
       var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1)

src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue

@@ -261,7 +261,7 @@ import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
 import EmisTmsSiteBatchPicker from '@/views/emis/EmisBaseTools/EmisTmsSiteBatchPicker';
 
 export default {
-  name: "emisTmsCostFee",
+  name: "EmisTmsCostFee",
   components: { EmisTmsCostFeeForm ,elDateAdvPicker,EmisSupplierPicker,EmisTmsSiteBatchPicker},
   dicts: ['emis_cost_fee_type','emis_supplier_name','emis_cost_split_type','emis_biz_shipping_method','emis_payment_type'],
   data() {

src/views/emis/emisTmsCostFeeSplit/index.vue

@@ -269,7 +269,7 @@ import emisTmsCostFeeSplitForm from '@/views/emis/emisTmsCostFeeSplit/emisTmsCos
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 
 export default {
-  name: "emisTmsCostFeeSplit",
+  name: "EmisTmsCostFeeSplit",
   components: { elDateAdvPicker,emisTmsCostFeeSplitForm },
   dicts: ['emis_cost_fee_type','emis_cost_split_type','emis_commission_fee_type','emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

src/views/emis/emisTmsCostProfit/TmsCostProfitDetail.vue

@@ -32,7 +32,7 @@
           <el-table-column :label="$t('计算规则')"  align="center">
               <el-table-column :label="$t('总成本')" align="center" prop="cnyFee" min-width="100" >
                 <template slot-scope="scope">
-                  <span >{{ scope.row.cnyFee }}({{ scope.row.currency }})</span>
+                  <span >{{ scope.row.cnyFee }}(CNY)</span>
                   </template>
               </el-table-column>
               <el-table-column :label="$t('分摊类型')" align="center" prop="splitType" min-width="100" >
@@ -58,15 +58,19 @@
           </el-table-column>
           <el-table-column :label="$t('原成本')" align="center" prop="transCostFee" min-width="100" >
                 <template slot-scope="scope">
-                  <span >{{ scope.row.transCostFee }}</span>
-                  </template>
-              </el-table-column>
-          <el-table-column :label="$t('原币种')" align="center" prop="feeItem.currency" min-width="80">
+                  <span >
+                    {{ scope.row.transCostFee }}
+                    <span v-if="scope.row.currency">({{ scope.row.currency }})</span>
+                    <span v-else>(CNY)</span>
+                  </span> 
+               </template>
+          </el-table-column>
+          <!-- <el-table-column :label="$t('原币种')" align="center" prop="feeItem.currency" min-width="80">
           <template slot-scope="scope">
                 <dict-tag v-if="scope.row.currency" :options="dict.type.sys_currency_type" :value="scope.row.currency"/>
                 <span v-else>人民币(CNY)</span>
               </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column :label="$t('批次号')" align="center" prop="batchNo" min-width="100" :show-overflow-tooltip="true">
             <template slot-scope="scope">
                 <span v-if="scope.row.batchNo!='-1'">{{ scope.row.batchNo }}</span>

src/views/emis/emisTmsCostQuotePrice/index.vue

@@ -186,7 +186,7 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
 
 
 export default {
-  name: "emisTmsCostQuotePrice",
+  name: "EmisTmsCostQuotePrice",
   components: { elDateSimplePicker,emisTmsCostQuotePriceForm,EmisSupplierPicker,EmisSiteSimplePicker1,EmisSiteSimplePicker2 },
   dicts: ['emis_cost_fee_type','emis_price_type'],
   data() {