Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-02-22 e2cab7f54b3aa3678637c19285f7d944150b7b57

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue

@@ -151,7 +151,7 @@
  return regex.test(value); // 返回true/false
}

//子组件接收参数
//右侧子组件接收参数
const xGrid = ref()
const gridOptions = reactive({
  border:  "full",//表格加边框
@@ -226,6 +226,80 @@
})


//左侧子组件接收参数
const xGridLeft = ref()
const gridLeftOptions = reactive({
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true },//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },//表头参数
  columns:[
    {type: 'checkbox', fixed: "left", title: '选择'},
    {field: 'orderDetail.orderNumber', title: '流程卡号',filters:[{ data: '' }],slots: { filter: 'num1_filter' },width:130 },
    {field: 'orderDetail.shape',  title: '订序', showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.width', title: '落架顺序', filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.height', title: '形状',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.quantity', title: '长边', showOverflow:"ellipsis"},
    {field: 'orderDetail.computeGrossArea', title: '短边'},
    {field: 'product.totalThickness', title: '总数量'},
    {field: 'product.totalThickness', title: '总厚度'},
  ],//表头按钮

  toolbarConfig: {
    // buttons: [{
    //
    // }],
    import: false,
    export: true,
    print: true,
    zoom: true,
    custom: true
  },
  data:  [

  ],//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['总数量','总面积','分箱数']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return '合计:'
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
        }
        return ''
      })
    ]
  }

})



</script>

@@ -250,17 +324,41 @@
    <div class="common-layout">
      <el-container height="100%">
        <el-aside width="44%" style="">
          <el-table :data="tableData" border style="width: 100%" height="100%">
            <el-table-column sortable prop="processCard" label="流程卡号" width="120" />
            <el-table-column prop="orderSequence" label="订序" width="60" />
            <el-table-column prop="landingSequence" label="落架顺序" width="85" />
            <el-table-column prop="floorNumber" label="楼层编号" :show-overflow-tooltip='true' width="120" />
            <el-table-column prop="shape" label="形状" width="65" />
            <el-table-column prop="longSide" label="长边" width="65" />
            <el-table-column prop="shortSide" label="短边" width="65" />
            <el-table-column prop="total" label="总数量" width="75" />
            <el-table-column prop="totalThickness" label="总厚度" width="75" />
          </el-table><!-- <h1>{{msg}}</h1> -->
          <vxe-grid
              max-height="100%"
              @filter-change="filterChanged"
              class="mytable-scrollbar"
              ref="xGridLeft"
              v-bind="gridLeftOptions"
          >
            <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
            <!--      下拉显示所有信息插槽-->
            <template #content="{ row }">
              <ul class="expand-wrapper">
                <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
                  <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
                  <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
                  <span v-else>{{ row[item.field] }}</span>
                </li>
              </ul>
            </template>
            <!--左边固定显示的插槽-->
            <template #button_slot="{ row }">
              <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">打印</el-button>
              <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">排版</el-button>
              <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">删除</el-button>
            </template>
            <template #num1_filter="{ column, $panel }">
              <div>
                <div v-for="(option, index) in column.filters" :key="index">
                  <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
                </div>
              </div>
            </template>


          </vxe-grid>

        </el-aside>

        <el-main width="12%" style="">
@@ -293,7 +391,6 @@
                  <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
                  <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
                  <span v-else>{{ row[item.field] }}</span>

                </li>
              </ul>
            </template>
@@ -312,8 +409,6 @@
                </div>
              </div>
            </template>


          </vxe-grid>
        </el-aside>
      </el-container>