From cf7a852a52eb37b7ede44f98ffea16b35d966aab Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 30 Jun 2025 23:20:29 +0800
Subject: [PATCH] md

---
 .../EmisTmsCostFeeRelList.vue                 | 422 ------------------
 .../emisTmsCostFeeRelForm.vue                 | 199 ---------
 src/views/emis/emisTmsCostFeeSplit/index.vue  | 199 ++++-----
 .../EmisTmsCostProfitList.vue                 |  14 +-
 .../emisTmsCostProfit/TmsCostProfitDetail.vue |  54 ++-
 .../panel/BigBatchEditForm.vue                |  10 +-
 6 files changed, 126 insertions(+), 772 deletions(-)
 delete mode 100644 src/views/emis/emisTmsCostFeeRel/EmisTmsCostFeeRelList.vue
 delete mode 100644 src/views/emis/emisTmsCostFeeRel/emisTmsCostFeeRelForm.vue

diff --git a/src/views/emis/emisTmsCostFeeRel/EmisTmsCostFeeRelList.vue b/src/views/emis/emisTmsCostFeeRel/EmisTmsCostFeeRelList.vue
deleted file mode 100644
index 9c82c3ff..00000000
--- a/src/views/emis/emisTmsCostFeeRel/EmisTmsCostFeeRelList.vue
+++ /dev/null
@@ -1,422 +0,0 @@
-<template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-   
-      <el-form-item label="" prop="costNo">
-        <el-input
-          v-model="queryParams.costNo"
-          :placeholder="$t('支付序号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billCode">
-        <el-input
-          v-model="queryParams.billCode"
-          :placeholder="$t('运单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="feeType">
-        <el-input
-          v-model="queryParams.feeType"
-          :placeholder="$t('成本费用类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="splitType">
-        <el-input
-          v-model="queryParams.splitType"
-          :placeholder="$t('成本分摊类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="costFee">
-        <el-input
-          v-model="queryParams.costFee"
-          :placeholder="$t('分摊成本')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="calcRemark">
-        <el-input
-          v-model="queryParams.calcRemark"
-          :placeholder="$t('计算备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    </SearchForm>
-
-   
-    <XdTable v-loading="loading" 
-           border stripe
-           size="small"
-           :data="emisTmsCostFeeRelList"
-           :showSearch.sync="showSearch"
-           :queryParams="queryParams"
-           :total="total"
-           @queryTable="getList"
-           @selection-change="handleSelectionChange"
-           @sort-change="handleSortChange"
-           >
-      
-      <div slot="toolbar">
-        <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  plain
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="handleAdd"
-                  v-hasPermi="['emis:emisTmsCostFeeRel:add']"
-                >新增</el-button>
-              </el-col>
-              <!-- 
-              <el-col :span="1.5">
-                <el-button
-                  type="success"
-                  plain
-                  icon="el-icon-edit"
-                  size="mini"
-                  :disabled="single"
-                  @click="handleUpdate"
-                  v-hasPermi="['emis:emisTmsCostFeeRel:edit']"
-                >修改</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:emisTmsCostFeeRel:remove']"
-                >删除</el-button>
-              </el-col>
-              <!-- <el-col :span="1.5">
-                <el-button
-                  type="warning"
-                  plain
-                  icon="el-icon-download"
-                  size="mini"
-                  @click="handleExport"
-                  v-hasPermi="['emis:emisTmsCostFeeRel:export']"
-                >导出</el-button>
-              </el-col> -->
-          </el-row>
-      </div>
-      
-      <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-       
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
-
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
-      -->
-
-      <el-table-column :label="$t('支付序号')" align="center" prop="costNo" min-width="100" />
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
-      <el-table-column :label="$t('成本费用类型')" align="center" prop="feeType" min-width="100" />
-      <el-table-column :label="$t('成本分摊类型')" align="center" prop="splitType" min-width="100" />
-      <el-table-column :label="$t('分摊成本')" align="center" prop="costFee" min-width="100" />
-      <el-table-column :label="$t('计算备注')" align="center" prop="calcRemark" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisTmsCostFeeRel:edit']"
-          >修改</el-button>
-          <!-- 
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisTmsCostFeeRel:remove']"
-          >删除</el-button> -->
-        </template>
-      </el-table-column>
-    </XdTable>
-
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <emisTmsCostFeeRelForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsCostFeeRelForm>
-    </el-dialog>
-    
-
-    <!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
-        <emisTmsCostFeeRelView :id="id" ></EmisTmsCostFeeRelView>
-    </el-dialog>
-    -->
-
-  </div>
-</template>
-
-<script>
-import { listEmisTmsCostFeeRel, getEmisTmsCostFeeRel, delEmisTmsCostFeeRel, addEmisTmsCostFeeRel, updateEmisTmsCostFeeRel } from "@/api/emis/emisTmsCostFeeRel";
-import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-// import emisTmsCostFeeRelView from '@/views/emis/emisTmsCostFeeRel/emisTmsCostFeeRelView';
-import emisTmsCostFeeRelForm from '@/views/emis/emisTmsCostFeeRel/emisTmsCostFeeRelForm';
-
-export default {
-  name: "emisTmsCostFeeRel",
-  components: { elDateSimplePicker,emisTmsCostFeeRelForm },
-  dicts: [
-  ],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 创建时间搜索
-      dateTimeRange:[],
-      // 总条数
-      total: 0,
-      // 成本费用运单关联表格数据
-      emisTmsCostFeeRelList: [],
-    
-      currentId:null,
-      openForm: false,
-      titleForm: "",
-
-      // 弹出展示层
-      id:null,
-      titleView:"",
-      openView: false,
-      // 更新网点时间范围
-      daterangeCreateTime: [],
-      // 更新网点时间范围
-      daterangeUpdateTime: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        costNo: null,
-        billCode: null,
-        feeType: null,
-        splitType: null,
-        costFee: null,
-        calcRemark: null,
-        remark: null,
-        delFlag: null,
-      },
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询成本费用运单关联列表 */
-    getList() {
-      this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisTmsCostFeeRel(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
-        this.emisTmsCostFeeRelList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    // 排序 查询字段是表格中字段名字 动态取值排序顺序
-    handleSortChange(column) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "新增";
-    },
-    handleShowMoreInput(){
-      this.moreInputVisible = !this.moreInputVisible;
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-       this.currentId= row.id;
-       this.openForm = true;
-       this.titleForm = "修改";
-    },
-    handleView(row) {
-       this.id=row.id;
-       this.titleView="查看";
-       this.openView=true;
-    //   this.router.push({ path: '/emis/emisTmsCostFeeRel/viewDetail', query: { id: row.id }})
-    },
-    handleFormChanged(){
-        this.openForm = false;
-        this.getList();
-    },
-    cancelForm(){
-      this.openForm = false;
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除').then(function() {
-        return delEmisTmsCostFeeRel(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-    //   this.download('emis/emisTmsCostFeeRel/export', {
-    //     ...this.queryParams
-    //   }, `emisTmsCostFeeRel_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
-            text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
-
-       listEmisTmsCostFeeRel(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
-        this.downloadLoading = false
-        if (response.code === 200) {
-                const curList = response.rows
-                import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','支付序号','运单号','成本费用类型','成本分摊类型','分摊成本','计算备注','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
-                  const filterVal = ['id','costNo','billCode','feeType','splitType','costFee','calcRemark','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                  const data = this.formatJson(filterVal, curList, response.rows)
-                  excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: '成本费用运单关联',
-                    autoWidth: true
-                  })
-                  loadingInstance.close()
-                })
-        }
-      });
-    },
-    formatJson(filterVal, jsonData, resData) {
-      let index = 0
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'index') {
-          return ++index
-        }
-        if (j === 'status') {
-          var statusStr='xxx'
-          if(v[j] == 10){
-              statusStr='xxx'
-          }
-          return statusStr;
-        }
-        return v[j]
-      }))
-    },
-    /** 列索引函数  */
-    getIndex($index) {
-          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-    },
-    /** 时间搜索响应函数 */
-    dateTimeChange(value){
-        this.dateTimeRange=value;
-    },
-  }
-};
-</script>
-
-<style scoped>
-  .el-divider{
-    margin-top: 0px;
-    background: 0 0;
-    border-top: 1px solid #E6EBF5;
-  }
-  .el-divider__text {
-    color: #0955ee;
-    cursor: pointer;
-  }
-</style>
diff --git a/src/views/emis/emisTmsCostFeeRel/emisTmsCostFeeRelForm.vue b/src/views/emis/emisTmsCostFeeRel/emisTmsCostFeeRelForm.vue
deleted file mode 100644
index d502f92e..00000000
--- a/src/views/emis/emisTmsCostFeeRel/emisTmsCostFeeRelForm.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-<template>
-  <div >
-       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-         <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-          <el-col :span="24">
-            <el-form-item label="支付序号" prop="costNo">
-              <el-input v-model="form.costNo" placeholder="请输入支付序号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="运单号" prop="billCode">
-              <el-input v-model="form.billCode" placeholder="请输入运单号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="成本费用类型" prop="feeType">
-              <el-input v-model="form.feeType" placeholder="请输入成本费用类型" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="成本分摊类型" prop="splitType">
-              <el-input v-model="form.splitType" placeholder="请输入成本分摊类型" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="分摊成本" prop="costFee">
-              <el-input v-model="form.costFee" placeholder="请输入分摊成本" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="计算备注" prop="calcRemark">
-              <el-input v-model="form.calcRemark" placeholder="请输入计算备注" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="删除标志（0代表存在" prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
-            </el-form-item>
-          </el-col>
-
-        <!--
-         <el-form-item label="上级字典">
-              <treeselect
-                ref="tree"
-                v-model="form.parentId"
-                :options="emisTmsCostFeeRelOptions"
-                :normalizer="normalizer"
-                :default-expand-level="1"
-                :show-count="true"
-                placeholder="选择上级"
-              />
-        </el-form-item>
-        -->
-        </el-row>
-      </el-form>
-      <div style="text-align: center;margin-bottom: 10px;">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    
-  </div>
-</template>
-
-<script>
-import { listEmisTmsCostFeeRel, getEmisTmsCostFeeRel, delEmisTmsCostFeeRel, addEmisTmsCostFeeRel, updateEmisTmsCostFeeRel } from "@/api/emis/emisTmsCostFeeRel";
-
-export default {
-  name: "emisTmsCostFeeRelForm",
-  props:{
-    id:{
-        type:Number
-    }
-  },
-  components: {  },
-  dicts: [
-  ],
-  data() {
-    return {
-      emisTmsCostFeeRelOptions: [],
-      // 遮罩层
-      loading: true,
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
-        ],
-        delFlag: [
-          { required: true, message: "删除标志（0代表存在不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-   watch: {
-      "id": {
-        handler (newValue, oldValue) {
-          this.id = newValue;
-          this.initData();
-        },
-        deep: true
-      }
-  },
-  created() {
-    this.initData();
-  },
-
-  methods: {
-    initData() {
-       
-        if(this.id !=null) {
-          this.loading = true;
-          getEmisTmsCostFeeRel(this.id).then(response => {
-            this.form = response.data;
-            this.loading = false;
-          });
-        }else{
-            this.reset();
-        }
-        // this.getTreeselect();
-    },
-    // 取消按钮
-    cancel() {
-      this.reset();
-      this.$emit("on-cancel");
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        costNo: null,
-        billCode: null,
-        feeType: null,
-        splitType: null,
-        costFee: null,
-        calcRemark: null,
-        remark: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        createSite: null,
-        updateSite: null
-      };
-      this.resetForm("form");
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateEmisTmsCostFeeRel(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.$emit("on-changed");
-            });
-          } else {
-            addEmisTmsCostFeeRel(this.form).then(response => {
-               this.$modal.msgSuccess("新增成功");
-               this.$emit("on-changed");
-            });
-          }
-        }
-      });
-    },
-    //   /** 转换菜单数据结构 */
-    //  normalizer(node) {
-    //   if (node.children && !node.children.length) {
-    //     delete node.children;
-    //   }
-    //   return {
-    //     id: node.id,
-    //     label: node.idName,
-    //     children: node.children
-    //   };
-    // },
-    //  /** 查询菜单下拉树结构 */
-    // getTreeselect() {
-    //   const queryParams = {}
-    //   listEmisTmsCostFeeRel(queryParams).then(response => {
-    //     this.emisTmsCostFeeRelOptions = [];
-    //     const rootItem = { idId: 0, emisTmsCostFeeRelName: '-', children: [] };
-    //     rootItem.children = this.handleTree(response.data, "id");
-    //     this.emisTmsCostFeeRelOptions.push(rootItem);
-
-    //     if(this.parentId != undefined) {
-    //       this.form.parentId = this.parentId;
-    //     }
-
-    //   });
-    // },
-  }
-};
-</script>
diff --git a/src/views/emis/emisTmsCostFeeSplit/index.vue b/src/views/emis/emisTmsCostFeeSplit/index.vue
index c5ce4665..e279f213 100644
--- a/src/views/emis/emisTmsCostFeeSplit/index.vue
+++ b/src/views/emis/emisTmsCostFeeSplit/index.vue
@@ -1,101 +1,62 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <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="costNo">
+      <el-form-item label="成本编号" prop="costNo">
         <el-input
           v-model="queryParams.costNo"
-          :placeholder="$t('支付序号')"
+          :placeholder="$t('成本编号')"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="feeItemId">
-        <el-input
-          v-model="queryParams.feeItemId"
-          :placeholder="$t('费用项ID')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billCode">
+      <el-form-item label="运单号" prop="billCode">
         <el-input
           v-model="queryParams.billCode"
           :placeholder="$t('运单号')"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="mainBillCode">
+      <!-- <el-form-item label="" prop="mainBillCode">
         <el-input
           v-model="queryParams.mainBillCode"
           :placeholder="$t('主单号')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="" prop="feeType">
+      </el-form-item> -->
+      <!-- <el-form-item label="" prop="feeType">
         <el-input
           v-model="queryParams.feeType"
           :placeholder="$t('成本费用类型')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="" prop="splitType">
+      </el-form-item> -->
+      <!-- <el-form-item label="" prop="splitType">
         <el-input
           v-model="queryParams.splitType"
           :placeholder="$t('成本分摊类型')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="" prop="costFee">
-        <el-input
-          v-model="queryParams.costFee"
-          :placeholder="$t('分摊成本')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="totalVolume">
-        <el-input
-          v-model="queryParams.totalVolume"
-          :placeholder="$t('总体积')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billWeight">
-        <el-input
-          v-model="queryParams.billWeight"
-          :placeholder="$t('实际重量')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="calcRemark">
-        <el-input
-          v-model="queryParams.calcRemark"
-          :placeholder="$t('计算备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      </el-form-item> -->
+      
     </SearchForm>
-
    
-    <XdTable v-loading="loading" 
+    <XdTable 
+           v-loading="loading" 
+    
+           slot="pageContent"
+           slot-scope="slotProps"
+           :height="(slotProps.contentHeight)+'px'"
+
+    
            border stripe
            size="small"
+
+           ref="refTable"
+           storageName="emisTmsCostFeeSplitList_main1"
+           
            :data="emisTmsCostFeeSplitList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
@@ -153,74 +114,70 @@
           </el-row>
       </div>
       
-      <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-       
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
+          <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
+          <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="120" />
+          <el-table-column :label="$t('成本时间')" align="center" prop="tradeDate" min-width="100" />
+          <el-table-column :label="$t('费用类型')" align="center" prop="feeType" min-width="100" >
             <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
+              <span style="font-weight:600;color:black"><dict-tag :options="dict.type.emis_cost_fee_type" :value="scope.row.feeType"/></span>
             </template>
           </el-table-column>
-      -->
-
-      <el-table-column :label="$t('支付序号')" align="center" prop="costNo" min-width="100" />
-      <el-table-column :label="$t('费用项ID')" align="center" prop="feeItemId" min-width="100" />
+          <el-table-column :label="$t('费用')" align="center" prop="costFee" min-width="70" />
+          <el-table-column :label="$t('分摊类型')" align="center" prop="splitType" min-width="100" >
+            <template slot-scope="scope">
+                <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="splitValue" min-width="100" />
+          <el-table-column :label="$t('供应商')" align="left" prop="supplierName" min-width="150" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('发件地')" align="center" prop="sendPlace" min-width="100" />
+          <el-table-column :label="$t('目的地')" align="center" prop="destPlace" min-width="100" />
+          <el-table-column :label="$t('运输号')" align="center" prop="transSignNo" min-width="100" />
+          <!-- <el-table-column :label="$t('承运重量')" align="center" prop="costFeeDetail.realTotalWeight" min-width="100" /> -->
+          <!-- <el-table-column :label="$t('单价')" align="center" prop="feeItem.price" min-width="100" /> -->
+          <!-- <el-table-column :label="$t('单项费')" align="center" prop="feeItem.fee" min-width="100" /> -->
+          <!-- <el-table-column :label="$t('币种')" align="center" prop="feeItem.currency" min-width="80">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.sys_currency_type" :value="scope.row.feeItem.currency"/>
+              </template>
+          </el-table-column> -->
+          <el-table-column :label="$t('批次号')" align="center" prop="batchNo" min-width="100" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('运输总重量')" align="center" prop="transWeight" min-width="120" />
+          <el-table-column :label="$t('分摊总费用')" align="center" prop="transCostFee" min-width="120" />
+          <el-table-column :label="$t('计算公式')" align="center" prop="calcExpr" min-width="150" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('计算备注')" align="center" prop="calcRemark" min-width="150" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="200" :show-overflow-tooltip="true"/> 
+      <!-- 
+          
       <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
+
+      <el-table-column :label="$t('成本编号')" align="center" prop="costNo" min-width="100" />
+      <el-table-column :label="$t('批次号')" align="center" prop="batchNo" min-width="100" />
+      
       <el-table-column :label="$t('主单号')" align="center" prop="mainBillCode" min-width="100" />
+      <el-table-column :label="$t('发件地')" align="center" prop="sendPlace" min-width="100" />
+      <el-table-column :label="$t('目的地')" align="center" prop="destPlace" min-width="100" />
+      <el-table-column :label="$t('账单月份')" align="center" prop="billMonth" min-width="100" />
+      <el-table-column :label="$t('交易时间')" align="center" prop="tradeDate" min-width="100" />
+      <el-table-column :label="$t('运输工具号')" align="center" prop="transSignNo" min-width="100" />
+      <el-table-column :label="$t('供应商代码')" align="center" prop="supplierCode" min-width="100" />
       <el-table-column :label="$t('成本费用类型')" align="center" prop="feeType" min-width="100" />
       <el-table-column :label="$t('成本分摊类型')" align="center" prop="splitType" min-width="100" />
+      <el-table-column :label="$t('成本分摊值')" align="center" prop="splitValue" min-width="100" />
       <el-table-column :label="$t('分摊成本')" align="center" prop="costFee" min-width="100" />
       <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
       <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
+      <el-table-column :label="$t('总运输重量')" align="center" prop="transWeight" min-width="100" />
+      <el-table-column :label="$t('总运输体积')" align="center" prop="transVolume" min-width="100" />
+      <el-table-column :label="$t('批次运输费')" align="center" prop="transCostFee" min-width="100" />
+      <el-table-column :label="$t('计算公式')" align="center" prop="calcExpr" min-width="100" />
       <el-table-column :label="$t('计算备注')" align="center" prop="calcRemark" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisTmsCostFeeSplit:edit']"
-          >修改</el-button>
-          <!-- 
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisTmsCostFeeSplit:remove']"
-          >删除</el-button> -->
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('是否手工计算')" align="center" prop="blManual" min-width="100" />
+      <el-table-column :label="$t('是否虚拟单')" align="center" prop="blVirtual" min-width="100" />
+      <el-table-column :label="$t('是否子单')" align="center" prop="blSub" min-width="100" />
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
+
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
@@ -234,7 +191,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -246,7 +203,7 @@ import emisTmsCostFeeSplitForm from '@/views/emis/emisTmsCostFeeSplit/emisTmsCos
 export default {
   name: "emisTmsCostFeeSplit",
   components: { elDateSimplePicker,emisTmsCostFeeSplitForm },
-  dicts: [
+  dicts: ['emis_cost_fee_type','emis_cost_split_type'
   ],
   data() {
     return {
diff --git a/src/views/emis/emisTmsCostProfit/EmisTmsCostProfitList.vue b/src/views/emis/emisTmsCostProfit/EmisTmsCostProfitList.vue
index ba84b920..728cc7f0 100644
--- a/src/views/emis/emisTmsCostProfit/EmisTmsCostProfitList.vue
+++ b/src/views/emis/emisTmsCostProfit/EmisTmsCostProfitList.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="30"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="30"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-form-item label="运单号" prop="billCode">
               <XdTextareaInput
                 v-model="queryParams.billCode"
@@ -81,7 +81,13 @@
               />
             </el-form-item>
     </SearchForm>
-    <XdTable v-loading="loading"
+    <XdTable 
+    
+           slot="pageContent"
+           slot-scope="slotProps"
+           :height="(slotProps.contentHeight)+'px'"
+
+           v-loading="loading"
            border stripe
 
            ref="refTable"
@@ -224,7 +230,7 @@
      <TmsCostProfitDetail  :key="currentId" :id="currentId" ></TmsCostProfitDetail>
    </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisTmsCostProfit/TmsCostProfitDetail.vue b/src/views/emis/emisTmsCostProfit/TmsCostProfitDetail.vue
index 716c1576..60774565 100644
--- a/src/views/emis/emisTmsCostProfit/TmsCostProfitDetail.vue
+++ b/src/views/emis/emisTmsCostProfit/TmsCostProfitDetail.vue
@@ -15,42 +15,50 @@
           v-loading="loading"
            border stripe
            :data="emisTmsCostFeeSplitList"
-           :showSearch.sync="showSearch"
-           :queryParams="queryParams"
-           :total="total"
            >
-          <el-table-column :label="$t('成本时间')" align="center" prop="costFeeDetail.tradeDate" min-width="100" />
+          <el-table-column :label="$t('成本时间')" align="center" prop="tradeDate" min-width="100" />
           <el-table-column :label="$t('费用类型')" align="center" prop="feeType" min-width="100" >
             <template slot-scope="scope">
               <span style="font-weight:600;color:black"><dict-tag :options="dict.type.emis_cost_fee_type" :value="scope.row.feeType"/></span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('费用')" align="center" prop="costFee" min-width="70" />
-          <el-table-column :label="$t('分摊类型')" align="center" prop="splitType" min-width="100" >
-            <template slot-scope="scope">
-                <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="billWeight" min-width="100" />
-          <el-table-column :label="$t('供应商')" align="center" prop="costFeeDetail.supplierName" min-width="150" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('始发地')" align="center" prop="costFeeDetail.sendPlace" min-width="100" />
-          <el-table-column :label="$t('目的地')" align="center" prop="costFeeDetail.destPlace" min-width="100" />
+          <el-table-column :label="$t('分摊成本(CNY)')" align="center" prop="costFee" min-width="100" >
+                <template slot-scope="scope">
+                    <span style="color:red">￥{{ scope.row.costFee }}</span>
+                  </template>
+              </el-table-column>
+          <el-table-column :label="$t('计算规则')"  align="center">
+              <el-table-column :label="$t('总成本(CNY)')" align="center" prop="transCostFee" min-width="100" />
+              <el-table-column :label="$t('分摊类型')" align="center" prop="splitType" min-width="100" >
+                <template slot-scope="scope">
+                    <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="transWeight" min-width="100" />
+              <el-table-column :label="$t('分摊重量')" align="center" prop="billWeight" min-width="100" />
+              <el-table-column :label="$t('计算公式')" align="center" prop="calcExpr" min-width="100" :show-overflow-tooltip="true"/>
+              <el-table-column :label="$t('计算备注')" align="center" prop="calcRemark" min-width="150" :show-overflow-tooltip="true"/>
+              <el-table-column :label="$t('单价')" align="center" prop="feeItem.price" min-width="60" />
+              <el-table-column :label="$t('始发地')" align="center" prop="sendPlace" min-width="100" />
+              <el-table-column :label="$t('目的地')" align="center" prop="destPlace" min-width="100" />
+              <el-table-column :label="$t('运输号')" align="center" prop="transSignNo" min-width="100" />
+
+          <el-table-column :label="$t('供应商')" align="center" prop="supplierName" min-width="150" :show-overflow-tooltip="true"/>
           <el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="100" >
             <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.costFeeDetail.transType"/>
-              </template>
+                <dict-tag v-if="scope.row.waybillDetail" :options="dict.type.emis_biz_shipping_method" :value="scope.row.waybillDetail.transType"/>
+                <span v-else>-</span>
+             </template>
           </el-table-column>
-          <el-table-column :label="$t('运输号')" align="center" prop="costFeeDetail.transSignNo" min-width="100" />
-          <el-table-column :label="$t('承运重量')" align="center" prop="costFeeDetail.realTotalWeight" min-width="100" />
-          <el-table-column :label="$t('单价')" align="center" prop="feeItem.price" min-width="100" />
-          <el-table-column :label="$t('单项费')" align="center" prop="feeItem.fee" min-width="100" />
+          
           <el-table-column :label="$t('币种')" align="center" prop="feeItem.currency" min-width="80">
           <template slot-scope="scope">
-                <dict-tag :options="dict.type.sys_currency_type" :value="scope.row.feeItem.currency"/>
+                <dict-tag v-if="scope.row.feeItem" :options="dict.type.sys_currency_type" :value="scope.row.feeItem.currency"/>
+                <span v-else>人民币(CNY)</span>
               </template>
           </el-table-column>
           <el-table-column :label="$t('批次号')" align="center" prop="costFeeDetail.batchNo" min-width="100" :show-overflow-tooltip="true"/>
-
+        </el-table-column>
           <!-- <el-table-column :label="$t('成本序号')" align="center" prop="costNo" min-width="150" :show-overflow-tooltip="true"/> -->
           <!-- <el-table-column :label="$t('分摊类型')" align="center" prop="splitType" min-width="100" /> -->
           <!-- <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" /> -->
@@ -58,7 +66,7 @@
         </el-table>
       </el-col>
       <el-col :span="24" style="border-top: 1px solid #f3f3f3;margin-top:20px">
-        <WaybillDetailReadOnly :key="resetRefreshId+'_2'"  :billCode="showBillCode"></WaybillDetailReadOnly>
+        <WaybillDetailReadOnly v-if="showBillCode" :key="resetRefreshId+'_2'"  :billCode="showBillCode"></WaybillDetailReadOnly>
       </el-col>
     </el-row>
 
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index 4bc9c184..4778bd3e 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -765,9 +765,13 @@ export default {
       this.tempExistCoPackWayBillList = resList.rows;
       //临时存储，用于运单号校验
       this.tempCoPackInfo = this.form;
-      for(let p = 0; p < resList.rows.length;p++){
-        this.emisCoPackDetail.push(resList.rows[p].waybillDetail);
-      }
+      let cvtBillList=this.tempExistCoPackWayBillList.map(item=>item.waybillDetail);
+
+      // for(let p = 0; p < resList.rows.length;p++){
+      //   this.emisCoPackDetail.push(resList.rows[p].waybillDetail);
+      // }
+      this.emisCoPackDetail=cvtBillList;
+      
       this.form.packStatus = this.tempCoPackInfo.packStatus;
       this.form.scanDate = this.tempCoPackInfo.scanDate;