From ed2a0b2ffa5d54aa293f348e6675bc9666dca2e8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 7 Jan 2025 14:37:45 +0800
Subject: [PATCH] md

---
 .../emisTmsCostFee/EmisTmsCostFeeList.vue     | 48 +++++++++++++++----
 .../emisTmsCostFee/emisTmsCostFeeForm.vue     |  8 ++--
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue b/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
index 69906a68..5530b013 100644
--- a/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
+++ b/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
@@ -1,17 +1,45 @@
 <template>
   <XdPageContainer class="app-container">
     <SearchForm   slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-
-      <!-- <el-form-item label="" prop="costName">
+      <!-- 运输单号、供应商名称、账期、发件地、目的地、运输方式、成本时间 -->
+      <el-form-item label="运输号" prop="transSignNo">
         <el-input
-          v-model="queryParams.costName"
-          :placeholder="$t('成本名称')"
+          v-model="queryParams.transSignNo"
+          :placeholder="$t('运输号')"
           clearable
-          @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>
+      <el-form-item :label="$t('供应商名称')" prop="feeType">
+          <el-select clearable filterable v-model="queryParams.supplierName" placeholder="请选择" style="width:100%">
+            <el-option
+              v-for="dict in dict.type.emis_supplier_name"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="账期" prop="billMonth">
+          <el-date-picker style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="运输方式" prop="transType">
+              <el-select clearable v-model="queryParams.transType" placeholder="请选择" style="width:100%">
+                <el-option
+                  v-for="dict in dict.type.emis_biz_shipping_method"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+      </el-form-item>
+      <el-form-item label="发件地" prop="sendPlace">
+              <el-input v-model="queryParams.sendPlace" placeholder="" />
+      </el-form-item>
+      <el-form-item label="目的地" prop="destPlace">
+              <el-input v-model="queryParams.destPlace" placeholder="" />
+      </el-form-item>
       <el-form-item :label="$t('费用类型')" prop="feeType">
-          <el-select clearable v-model="queryParams.feeType" placeholder="请选择" style="width:100%">
+          <el-select clearable filterable v-model="queryParams.feeType" placeholder="请选择" style="width:100%">
             <el-option
               v-for="dict in dict.type.emis_cost_fee_type"
               :key="dict.value"
@@ -30,9 +58,11 @@
             ></el-option>
           </el-select>
       </el-form-item>
+      <el-form-item label="成本时间" prop="dateTimeRange">
+        <elDateAdvPicker  placeholder="成本时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
+      </el-form-item>
     </SearchForm>
 
-
     <XdTable
 
           slot="pageContent"
@@ -191,7 +221,7 @@ import EmisTmsCostFeeForm from '@/views/emis/emisTmsCostFee/emisTmsCostFeeForm';
 export default {
   name: "emisTmsCostFee",
   components: { elDateSimplePicker,EmisTmsCostFeeForm },
-  dicts: ['emis_cost_fee_type','emis_cost_split_type','emis_biz_shipping_method','emis_payment_type'],
+  dicts: ['emis_cost_fee_type','emis_supplier_name','emis_cost_split_type','emis_biz_shipping_method','emis_payment_type'],
   data() {
     return {
       // 遮罩层
diff --git a/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue b/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
index f001e6f6..e1383e0d 100644
--- a/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
+++ b/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
@@ -57,20 +57,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="交易日期" prop="tradeDate" >
+            <el-form-item label="成本时间" prop="tradeDate" >
               <el-date-picker
               style="width:100%"
               clearable
                 v-model="form.tradeDate"
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="交易日期">
+                placeholder="成本时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item label="账单月份" prop="billMonth">
-              <el-date-picker  style="width:100%" v-model="form.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
+            <el-form-item label="账期" prop="billMonth">
+              <el-date-picker  style="width:100%" v-model="form.billMonth" type="month" placeholder="账期" value-format="yyyy-MM"></el-date-picker>
             </el-form-item>
           </el-col>