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

chenlu

2024-11-08 8e75607b15c6e49e715213b8974a9173f9099240

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

 north-glass-erp/northglass-erp/src/stores/sd/companySet/½ð»ªÌì³É.js

File was renamed from north-glass-erp/northglass-erp/src/stores/sd/companySet/½ð»ªÀÖ¶¯.js
@@ -3,7 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        companyName: '金华市乐动智能科技有限公司',
        companyName: '金华福喜天成玻璃有限公司',
        address:'浙江省金华市金东区曹宅镇工业功能区鹤岩街28号2号',
        telephone:'189 3119 1362 èµ–厂长',
        fax:'',

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/GlassComputed.vue

@@ -1,11 +1,47 @@
<script setup>
import ComputeCard from "@/views/pp/glassOptimize/page/ComputeCard.vue";
import ComputeDetail from "@/views/pp/glassOptimize/page/ComputeDetail.vue";
import Compute from "@/views/pp/glassOptimize/page/Compute.vue";

</script>

<template>
123
  <div style="width: 100%; height: 100%;">

    <div id="compute">
      <compute/>
    </div>

    <div id="computeCard">
      <compute-card/>
    </div>

    <div id="computeDetail">
      <compute-detail/>
    </div>

  </div>
</template>

<style scoped>

#compute{
  float: left;
  margin-top: -30px;
  margin-bottom: 2%;
  width: 100%;
  height: 40%;
}
#computeCard{
  margin-top: 90px;
  width: 64%;
  height: 40%;
  float: left;
}
#computeDetail{
  margin-top: 90px;
  margin-left: 1%;
  float: left;
  width: 35%;
  height: 40%;
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue

@@ -3,6 +3,7 @@
import ProjectDetail from "@/views/pp/glassOptimize/page/ProjectDetail.vue"
import ProjectCreate from "@/views/pp/glassOptimize/ProjectCreate.vue"
import GlassComputed from "@/views/pp/glassOptimize/GlassComputed.vue";
import ProjectMange from "@/views/pp/glassOptimize/ProjectMange.vue";

import {ref} from "vue";
let dialogVisible = ref(false)
@@ -25,12 +26,13 @@

   <el-dialog
       v-model="dialogVisible"
       title="工程创建"
       :title="detailPage ===1? '创建工程' : detailPage ===2? '工程管理' : detailPage ===3? '模拟计算':''"
       destroy-on-close
       style="width: 90%;height:90%;margin-top: 3vh"
   >
     <project-create v-if="detailPage===1" />
     <glass-computed v-if="detailPage===2"/>
     <project-mange  v-if="detailPage===2" />
     <glass-computed v-if="detailPage===3" />
   </el-dialog>

 </div>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectCreate.vue

@@ -25,8 +25,6 @@
      <project-list/>
    </div>



  </div>
</template>


 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue

New file
@@ -0,0 +1,232 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
import {Search} from "@element-plus/icons-vue";
import {ElDatePicker} from "element-plus";
import useOrderInfoStore from "@/stores/sd/order/orderInfo";

const { t } = useI18n()

const xGrid = ref()
const gridOptions = reactive({
  height:'100%',
  loading: false,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ProjectMange',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {field: 'id', width: 100,title: '工程号',},
    {field: '',width: 50,title: '名称',},
    {field: 'id', width: 50,title: '膜系',},
    {field: 'id', width: 50,title: '厚度',},
    {field: 'id', width: 50,title: '类型',},
    {field: 'id', width: 50,title: '状态',},
    {field: 'id', width: 50,title: '数量',},
    {field: 'id', width: 50,title: '面积',},
    {field: 'id', width: 100,title: '流程卡数量',},
    {field: 'id', width: 100,title: '原片使用数',},
    {field: 'id', width: 70,title: '流程卡',},
    {field: 'id', width: 100,title: '钢化装载率',},
    {field: '',width: 100,title: '钢化炉数',},
    {field: '',width: 100,title: '平均切裁率',},
    {field: '',width: 100,title: '有效切裁率',},
    {field: '',width: 100,title: '尾片切裁率',},
    {field: '',width: 100,title: '原料使用数',},
    {field: '',width: 100,title: '平均切裁率',},
    {field: '',width: 50,title: '备注',},
    {field: '',width: 100,title: '创建人',},
    {field: '',width: 100,title: '创建时间',},
    {field: '',width: 100,title: '修改时间',},
  ],//表头参数
  data:null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
    },
  },

})
const oderInfo = useOrderInfoStore()

//定义工程状态
const optionVal = ref('0')
const options = [
  {
    value: '0',
    label: '全部',
  },
  {
    value: '1',
    label: '1',
  },
  {
    value: '2',
    label: '2',
  },
  {
    value: '3',
    label: '10',
  },
  {
    value: '4',
    label: '20',
  },
  {
    value: '5',
    label: '100',
  },
  {
    value: '6',
    label: '200',
  },
]


</script>

<template>
    <div id="mange">
      <div id="select">
        <span>优化日期</span>
        <el-date-picker
            style="margin-left:10px; margin-top: -5px; "
            v-model="oderInfo.mangeDate"
            type="daterange"
            format="YYYY/MM/DD"
            value-format="YYYY-MM-DD"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            :default-time="defaultTime"

        />
        <el-select
            style="margin-left:10px; margin-top: -5px; "
            :default-first-option="true"
            ref="getSelect"
            v-model="optionVal"
            class="m-2"
            @change="getWorkOrder"
              >

          <el-option
              v-for="item in options"
              :key="item.value"
              :label="item.label"
              :value="item.value"
          />
        </el-select>

        <el-button
            style="margin-left:10px;margin-top: -5px"
            @click="searchByDateRange"
            type="primary" :icon="Search">
          æŸ¥è¯¢
        </el-button>
      </div>

      <vxe-grid
          @filter-change="filterChanged"
          height="100%"
          class="mytable-scrollbar"
          ref="xGrid"
          v-bind="gridOptions"
          v-on="gridEvents"
      >
        <template #num2_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
                <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
                <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
              </vxe-select>
            </div>
          </div>
        </template>

        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input
                  type="type"
                  v-model="option.data"
                  @keyup.enter.native="$panel.confirmFilter()"
                  @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </template>
      </vxe-grid>
      <div id="last">
        <span>
          å°ç‰‡æ•°<vxe-input size="small" class="input"></vxe-input>
          å°ç‰‡é¢<vxe-input size="small" class="input"></vxe-input>
          åŽŸç‰‡æ•°<vxe-input size="small" class="input"></vxe-input>
          åŽŸç‰‡é¢<vxe-input size="small" class="input"></vxe-input>
        </span>
        <span style="float: right">
          <el-button type="primary" class="input">钢化版图</el-button>
          <el-button type="primary" class="input">模拟计算</el-button>
          <el-button type="primary" class="input">优化版图</el-button>
          <el-button type="primary" class="input">优化排版</el-button>
          <el-button type="primary" class="input">数据导出</el-button>
        </span>
      </div>
    </div>
</template>

<style scoped>
#mange{
  width: 100%;
  height: 85%;
}
#last {
  margin-top: 10px;
}
.input{
  width: 80px;
  margin-left: 15px;
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue

New file
@@ -0,0 +1,216 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
import {Minus, Plus, Search} from "@element-plus/icons-vue";

const {t} = useI18n()

const xGrid = ref()

const gridOptions = reactive({
  height: '100%',
  loading: false,
  border: "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'Compute',
  scrollX: {enabled: true},
  scrollY: {enabled: true, gt: 0},//开启虚拟滚动
  showOverflow: true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns: [
    {field: 'id', width: 70, title: '序号', filters: [{data: ''}], slots: {default: 'state', filter: 'num2_filter'}},
    {field: '', width: 100, title: '版图数'},
    {field: '', width: 100, title: '装载率'},
    {field: '', width: 100, title: '流程卡数'},
    {field: '', width: 100, title: '模拟片数'},
    {
      field: 'processId',
      width: 150,
      title: t('processCard.processId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
  ],//表头参数
  data: null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots: {
      buttons: "toolbar_buttons"
    },
  },

})
let emit = defineEmits([
  'changeDialog'
])
let ProjectName = ref('')
const changeOrderType = async () => {
  await emit('changeDialog', ProjectName.value)
  ProjectName.value = null
}
// è¿›åº¦æ¡é¢œè‰²å’ŒæŒ‰é’®åŠ å‡
const percentage1 = ref(80)
const percentage2 = ref(50)
const customColors = [
  {color: '#f56c6c', percentage: 20},
  {color: '#e6a23c', percentage: 40},
  {color: '#5cb87a', percentage: 60},
  {color: '#1989fa', percentage: 80},
  {color: '#162ce5', percentage: 100},
]
const handleButtonClick = (progressIndex, isIncrease) => {
  let percentageRef;
  if (progressIndex === 1) {
    percentageRef = percentage1;
  } else if (progressIndex === 2) {
    percentageRef = percentage2;
  }
  if (isIncrease && percentageRef.value < 100) {
    percentageRef.value += 10;
  } else if (!isIncrease && percentageRef.value > 0) {
    percentageRef.value -= 10;
  }
};

</script>

<template>
  <div style="width: 100%;height: 100%">
    <!--模拟计算表头-->
    <div id="title" style="margin-top: -10px">
      <span>
        å·¥ç¨‹ç¼–号
      <vxe-select size="small" style="margin-left: 20px"></vxe-select>
      <el-button type="primary" :icon="Search" style="margin-left: 20px">查询</el-button>
      </span>
      <span style="float: right ; margin-right: 120px">
        å·¥ç¨‹æ··æŽ’等级
      <vxe-select size="small" style="margin-left: 20px">
        <vxe-option value="null" >不混排</vxe-option>
        <vxe-option value="null" >轻度混排</vxe-option>
        <vxe-option value="null" >中度混排</vxe-option>
        <vxe-option value="null" >高度混排</vxe-option>
      </vxe-select>
      <el-button type="primary" style="margin-left: 20px">模拟计算</el-button>
      <el-button type="primary" style="margin-left: 50px">保存</el-button>
      </span><br>
      <div class="demo-progress" style="margin-top: 5px">
        <div style="display: flex; align-items: center">
          <span>钢化最大装载</span>
          <!--进度条设置-->
          <el-progress style="max-width: 300px; flex: 1; margin-left: 10px" :percentage="percentage1"
                       :color="customColors"/>
          <el-button-group style="margin-left: 10px;">
            <el-button :icon="Minus" @click="handleButtonClick(1,false)"/>
            <el-button :icon="Plus" @click="handleButtonClick(1,true)"/>
          </el-button-group>
          <span style="float: right ; margin-left: 250px;">
                å·¥ç¨‹çŽ»ç’ƒç‰‡<vxe-input size="small" class="input" ></vxe-input>
                å®½è½´é—´éš”<vxe-input size="small" class="input"></vxe-input>
                ç‚‰å®½(mm)<vxe-input size="small" class="input"></vxe-input>
              </span>
        </div>
      </div>
      <br>
      <div class="demo-progress" style="margin-top: -10px">
        <div style="display: flex; align-items: center">
          <span>理片笼空闲度</span>
          <!--进度条设置-->
          <el-progress style="max-width: 300px; flex: 1; margin-left: 10px" :percentage="percentage2"
                       :color="customColors"/>
          <el-button-group style="margin-left: 10px;">
            <el-button :icon="Minus" @click="handleButtonClick(2,false)"/>
            <el-button :icon="Plus" @click="handleButtonClick(2,true)"/>
          </el-button-group>
          <span style="float: right ; margin-left: 242px;">
                  åŠ çƒ­æ—¶é—´(秒)<vxe-input size="small" class="input"></vxe-input>
                  é•¿è½´é—´éš”<vxe-input size="small" class="input"></vxe-input>
                  ç‚‰é•¿(mm)<vxe-input size="small" class="input"></vxe-input>
          </span>
        </div>
      </div>
    </div>

    <vxe-grid
        size="small"
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"
                        @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
          </div>
        </div>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input
                type="type"
                v-model="option.data"
                @keyup.enter.native="$panel.confirmFilter()"
                @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>
    </vxe-grid>
  </div>
</template>

<style scoped>

.input{
  width: 80px;
  margin-left: 10px;
}

</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeCard.vue

New file
@@ -0,0 +1,134 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
const { t } = useI18n()

const xGrid = ref()

const gridOptions = reactive({

  height:'100%',
  loading: false,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ComputeCard',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {field: 'checkbox', title: '允许横排', width: 100},
    {field: 'checkbox', title: '钢化', width: 70},
    {field: 'processId',width: 150, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 70,  title: '层',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'id',width: 150, title: '总层数',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 100, title: '规格',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'quantity',width: 150, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.productName',width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.computeGrossArea',width: 150, title: t('order.area'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '',width: 70, title: 'merge'}

  ],//表头参数
  data:null,//表格数据

  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
    },
  },

})
let emit = defineEmits([
  'changeDialog'
])
let Membrane = ref('选择膜系')

const changeOrderType = async ()=>{
  await emit('changeDialog',Membrane.value)
  Membrane.value = null
}

</script>

<template>
  <div style="width: 100%;height: 100%">
    <span>流程卡</span>
    <vxe-grid
        size="small"
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
          </div>
        </div>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input

                type="type"
                v-model="option.data"
                @keyup.enter.native="$panel.confirmFilter()"
                @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>
    </vxe-grid>
  </div>
</template>

<style scoped>

</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeDetail.vue

New file
@@ -0,0 +1,126 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
const { t } = useI18n()

const xGrid = ref()

const gridOptions = reactive({
  height:'100%',
  loading: false,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ComputeDetail',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns:[
    {field: 'id',width: 70,  title: '序号',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field:'state',width: 150,title: t('order.width'),filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {type: 'seq',width: 150,title: t('order.height')},
    {field: 'id',width: 150, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.buildingNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.shape'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.grossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('craft.TrademarkAttribute'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

  ],//表头参数
  data:null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
    },
  },

})
let emit = defineEmits([
  'changeDialog'
])
let ProjectName = ref('')
const changeOrderType = async ()=>{
  await emit('changeDialog',ProjectName.value)
  ProjectName.value = null
}
</script>

<template>
  <div style="width: 100%;height: 100%">
    <span>流程卡详情</span>
    <vxe-grid
        size="small"
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
          </div>
        </div>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input
                type="type"
                v-model="option.data"
                @keyup.enter.native="$panel.confirmFilter()"
                @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>
    </vxe-grid>
  </div>
</template>

<style scoped>

</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue

@@ -1,6 +1,7 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
import {Search} from "@element-plus/icons-vue";
const { t } = useI18n()

const xGrid = ref()
@@ -134,6 +135,10 @@
            <vxe-option value="-2" :label="$t('searchOrder.cancelledOrders')"></vxe-option>
            <vxe-option value="0" :label="$t('searchOrder.allOrders')"></vxe-option>
          </vxe-select>
          <el-button type="primary" :icon="Search" style="margin-left: 20px">查询</el-button>
          <vxe-select style="margin-left: 40px"></vxe-select>
          <vxe-select style="margin-left: 20px"></vxe-select>
          <el-button type="primary" style="margin-left: 10px">筛选</el-button>
        </template>
    </vxe-grid>
  </div>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCardDetail.vue

@@ -13,7 +13,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ProcessCard-Detail',
  id: 'ProcessCardDetail',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
@@ -120,11 +120,8 @@
      </template>

      <template #toolbar_buttons>
        <vxe-select @change="changeOrderType" v-model="ProjectName">
          <vxe-option value="2" :label="$t('searchOrder.regularOrders')"></vxe-option>
          <vxe-option value="-2" :label="$t('searchOrder.cancelledOrders')"></vxe-option>
          <vxe-option value="0" :label="$t('searchOrder.allOrders')"></vxe-option>
        </vxe-select>
        <vxe-input @change="changeOrderType" v-model="ProjectName"></vxe-input>
        <el-button type="primary" style="margin-left: 20px">创建</el-button>
      </template>

    </vxe-grid>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue

@@ -1,22 +1,34 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
import {Folder} from "@element-plus/icons-vue";
const { t } = useI18n()
import {
  Folder,
  Plus,
  Setting,
  Operation,
  Tickets,
  DocumentCopy,
  Grid,
  Edit,
  Printer,
  DocumentAdd, Minus, Menu,  Checked, Upload, Suitcase, Refresh, CircleCloseFilled, Sort, Link ,
} from "@element-plus/icons-vue";

const {t} = useI18n()

const xGrid = ref()
const gridOptions = reactive({
  height:'100%',
  height: '100%',
  loading: false,
  border:  "full",//表格加边框
  border: "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ProjectDetail',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
  scrollX: {enabled: true},
  scrollY: {enabled: true, gt: 0},//开启虚拟滚动
  showOverflow: true,
  columnConfig: {
    resizable: true,
    useKey: true
@@ -53,31 +65,101 @@
      }
    ]
  },*/
  columns:[
  columns: [
    {title: '订序', width: 70},
    {field:'state',width: 150,title: t('order.width'),filters:[{ data: '' }], slots: { filter: 'num2_filter' }},
    {type: 'seq',width: 150,title: t('order.height')},
    {field: 'id',width: 150, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '长磨1',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '长磨2',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '短磨1',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '短磨1',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.shape'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '流程卡号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.buildingNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('basicData.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.grossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'state', width: 150, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num2_filter'}},
    {type: 'seq', width: 150, title: t('order.height')},
    {
      field: 'id',
      width: 150,
      title: t('order.quantity'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {field: 'id', width: 150, title: '长磨1', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
    {field: 'id', width: 150, title: '长磨2', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
    {field: 'id', width: 150, title: '短磨1', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
    {field: 'id', width: 150, title: '短磨1', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
    {
      field: 'id',
      width: 150,
      title: t('order.shape'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {field: 'id', width: 150, title: '流程卡号', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
    {
      field: 'id',
      width: 150,
      title: t('order.product'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('order.buildingNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('basicData.remarks'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('order.perimeter'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('order.grossArea'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },

    {field: 'id',width: 150, title: t('craft.glassChild'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('craft.glassAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('craft.TrademarkAttribute'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {
      field: 'id',
      width: 150,
      title: t('craft.glassChild'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('craft.glassAddress'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('craft.TrademarkAttribute'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
  ],//表头参数
  data:null,//表格数据
  data: null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots:{
    slots: {
      buttons: "toolbar"
    },
  },
@@ -86,10 +168,9 @@
let emit = defineEmits([
  'changeDialog'
])
const handleCommand = async (command)=>{
  await emit('changeDialog',command)
const handleCommand = async (command) => {
  await emit('changeDialog', command)
}


</script>

@@ -107,7 +188,8 @@
      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"
                        @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
@@ -128,27 +210,97 @@
      </template>

      <template #toolbar>
        <el-dropdown @command="handleCommand" >
          <el-button type="primary" :icon="Folder">
            å·¥ç¨‹èœå•<el-icon class="el-icon--right"></el-icon>
        <div id="title">
          <el-button id="checkinventory" type="primary">查询库存</el-button>
          <el-button id="checkremnant" type="primary">查询余料</el-button>
          <el-button id="selectml" type="primary">设置磨量</el-button>
          <el-button id="selectxb" type="primary">设置修边</el-button>
          <el-button id="safe" type="primary">保存</el-button>
          <el-button id="optimize" type="primary">优化</el-button>
        </div>
        <!--工程文件菜单-->
        <el-dropdown @command="handleCommand">
          <el-button  type="primary" :icon="Folder">
            å·¥ç¨‹æ–‡ä»¶
          </el-button>
          <template #dropdown>
            <el-dropdown-menu>
              <el-dropdown-item :command="1">创建工程</el-dropdown-item>
              <el-dropdown-item :command="2">工程管理</el-dropdown-item>
              <el-dropdown-item :command="3">模拟计算</el-dropdown-item>
<!--              <el-dropdown-item command="4">文件导出</el-dropdown-item>
              <el-dropdown-item command="5">文件导入</el-dropdown-item>-->
              <el-dropdown-item :command="1" :icon="Plus">创建工程</el-dropdown-item>
              <el-dropdown-item :command="2" :icon="Setting">工程管理</el-dropdown-item>
              <el-dropdown-item :command="3" :icon="Operation">模拟计算</el-dropdown-item>
              <!--              <el-dropdown-item command="4">文件导出</el-dropdown-item>
                            <el-dropdown-item command="5">文件导入</el-dropdown-item>-->
            </el-dropdown-menu>
          </template>
        </el-dropdown>
        <!--打印菜单-->
        <el-dropdown @command="handleCommand">
          <el-button class="buttons" type="primary" :icon="Printer">
            æ‰“印
          </el-button>
          <template #dropdown>
            <el-dropdown-menu>
              <el-dropdown-item :command="null" :icon="Printer">打印优化版图</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Tickets">打印优化报告</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="DocumentCopy">合并打印</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Grid">缩略图</el-dropdown-item>
            </el-dropdown-menu>
          </template>
        </el-dropdown>
        <!--调整-->
        <el-dropdown @command="handleCommand">
          <el-button class="buttons" type="primary" :icon="Operation">
            è°ƒæ•´
          </el-button>
          <template #dropdown>
            <el-dropdown-menu>
              <el-dropdown-item :command="null" :icon="Edit">全部重排</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="DocumentAdd">新增版面</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Plus">增加加工次数</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Minus">删除版面</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Menu">镜像当前版面</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Grid">镜像所以版面</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Checked">保存修改</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Upload">导出剩余小片</el-dropdown-item>
            </el-dropdown-menu>
          </template>
        </el-dropdown>
        <!--数控-->
        <el-dropdown @command="handleCommand">
          <el-button class="buttons" type="primary" :icon="Suitcase">
            æ•°æŽ§
          </el-button>
          <template #dropdown>
            <el-dropdown-menu>
              <el-dropdown-item :command="null" :icon="Refresh">刷新刀路</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Link">截断连续线</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="CircleCloseFilled">删除刀路</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Sort">当前刀路反向</el-dropdown-item>
            </el-dropdown-menu>
          </template>
        </el-dropdown>
        <!--设置-->
        <el-button class="buttons" type="primary" :icon="Setting">
          è®¾ç½®
        </el-button>
        <!--报告-->
        <el-button class="buttons" type="primary" :icon="Tickets">
          æŠ¥å‘Š
        </el-button>
      </template>

    </vxe-grid>
  </div>
</template>

<style scoped>

#title {
  position: absolute;
  right: 10px;
}

.buttons {
  margin-left: 10px;
}

</style>