md

src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue

@@ -1,9 +1,33 @@
 <template>
   <XdPageContainer class="app-container">
     <SearchForm   slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="30"  label-width="80px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-      <el-form-item label="运输批次" prop="batchNo">
+      <el-form-item label="运单号" prop="billCode">
-        <EmisTmsSiteBatchPicker v-model="queryParams.batchNo" ></EmisTmsSiteBatchPicker>
+        <div slot="label">
+                  <el-radio-group class="query-label" v-model="queryOrderType">
+                    <el-radio :key="1" label="1">运单号</el-radio>
+                    <el-radio :key="2" label="2">运输号</el-radio>
+                    <el-radio :key="3" label="3">批次号</el-radio>
+                  </el-radio-group>
+              </div>
+              <XdTextareaInput
+                v-model="queryParams.queryCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                :rows="3"
+              />
       </el-form-item>
+      <!-- <el-form-item label="运输号" prop="transSignNo">
+        <XdTextareaInput
+                v-model="queryParams.transSignNo"
+                :placeholder="$t('运输号')"
+                clearable
+                :rows="1"
+              />
+      </el-form-item> -->
+      <!-- <el-form-item label="运输批次" prop="batchNo">
+        <EmisTmsSiteBatchPicker v-model="queryParams.batchNo" ></EmisTmsSiteBatchPicker>
+      </el-form-item> -->
+
       <el-form-item :label="$t('供应商')" prop="feeType">
           <EmisSupplierPicker :placeholder="$t('请选择')"  v-model="queryParams.supplierCode"  ></EmisSupplierPicker>
       </el-form-item>
@@ -23,20 +47,14 @@
                 ></el-option>
               </el-select>
       </el-form-item>
-      <el-form-item label="运输号" prop="transSignNo">
+      
-        <el-input
-          v-model="queryParams.transSignNo"
-          :placeholder="$t('运输号')"
-          clearable
-        />
-      </el-form-item>
       <el-form-item label="发件地" prop="sendPlace">
               <el-input v-model="queryParams.sendPlace" clearable placeholder="" />
       </el-form-item>
       <el-form-item label="目的地" prop="destPlace">
               <el-input v-model="queryParams.destPlace" clearable placeholder="" />
       </el-form-item>
-      <el-form-item :label="$t('费用类型')" prop="feeType">
+      <!-- <el-form-item :label="$t('费用类型')" prop="feeType">
           <el-select clearable filterable v-model="queryParams.feeType" placeholder="请选择" >
             <el-option
               v-for="dict in dict.type.emis_cost_fee_type"
@@ -45,7 +63,7 @@
               :value="dict.value"
             ></el-option>
           </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="$t('分摊类型')" prop="splitType">
           <el-select clearable v-model="queryParams.splitType" placeholder="请选择" >
             <el-option
@@ -60,13 +78,10 @@
     </SearchForm>
 
     <XdTable
-
           ref="refTable"
-
           slot="pageContent"
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
-
           storageName="emisTmsCostFeeList_main5"
 
           v-loading="loading"
@@ -259,6 +274,8 @@ export default {
       emisTmsCostFeeList: [],
       selectList:[],
 
+      queryOrderType:null,
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -267,31 +284,62 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-      // 更新站点时间范围
+
-      daterangeConfirmCenterDate: [],
-      // 更新站点时间范围
-      daterangeConfirmSiteDate: [],
-      // 更新站点时间范围
-      daterangeCreateTime: [],
-      // 更新站点时间范围
-      daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+
+        queryCode:null,
+
+        batchNo:null,
+        transSignNo:null,
+        billMonth:null,
+
+        transType:null,
+        sendPlace:null,
+        destPlace:null,
+        splitType:null,
+
         costName: null,
         feeType: null,
         splitType: null,
+        params:{
+          billCode:null,
+        }
       },
     };
   },
   created() {
+    this.queryOrderType="1"
     this.getList();
   },
   methods: {
+    initQueryParams(){
+      // 按运单查询时的处理
+      if(this.queryOrderType=='1'){
+        this.queryParams.billCode=this.queryParams.queryCode;
+        this.queryParams.batchNo=null;
+        this.queryParams.transSignNo=null;
+      }
+      else if(this.queryOrderType=='2'){
+        this.queryParams.transSignNo=this.queryParams.queryCode;
+        this.queryParams.billCode=null;
+        this.queryParams.batchNo=null;
+      }
+      else if(this.queryOrderType=='3'){
+        this.queryParams.batchNo=this.queryParams.queryCode;
+        this.queryParams.billCode=null;
+        this.queryParams.transSignNo=null;
+      }
+
+    },
     /** 查询TMS运输成本账单列表 */
     getList() {
       this.loading = true;
+
+      this.initQueryParams();
+
       listEmisTmsCostFee( this.addDateRange(this.queryParams, this.dateTimeRange,'tradeDate')).then(response => {
         this.emisTmsCostFeeList = response.rows;
         this.total = response.total;

src/views/emis/emisTmsCostProfit/EmisTmsCostProfitList.vue

@@ -113,6 +113,17 @@
                   @click="handleReCalcProfitByBillCode"
                 >利润重算</el-button>
               </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                  v-hasPermi="['emis:emisTmsCostFee:remove']"
+                >删除</el-button>
+              </el-col>
               <el-col :span="1.5">
                 <el-button
                   type="warning"

src/views/emis/emisTransPlanRule/index.vue

@@ -332,15 +332,12 @@ export default {
         this.exportData(this.selectList,loadingInstance);
       }
       else{
-
-          this.initQueryParams();
-
           let qExportParam={...this.queryParams};
           qExportParam=this.addDateRange(qExportParam, this.dateTimeRange,'createTime')
           qExportParam.pageNum=1;
           qExportParam.pageSize=20000;
 
-          listEmisSettleBill(qExportParam).then(response => {
+          listEmisTransPlanRule(qExportParam).then(response => {
             if (response.code === 200) {
               this.exportData(response.rows,loadingInstance);
             }