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

chenlu

2024-12-05 c981fbfa98b5c88d4a15ff19b1e5710e027b30d2

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

 north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue

@@ -290,6 +290,18 @@
    }
  },
  {
    tid: 'size', title: '尺寸数量', data: '', type: 'text',
    options: {
      field: 'size',
      testData: '',
      width:270,
      height: 16,
      fontSize: 11.25,
      textAlign: "left",
      textContentVerticalAlign: "middle"
    }
  },
  {
    tid: 'orderNumber', title: '订单序号', data: '', type: 'text',
    options: {
      field: 'orderNumber',
@@ -744,7 +756,7 @@
  }
}

const save = () => {
const save = (type) => {
  ElMessageBox.prompt( t('components.addNewSignature')+':', {
    confirmButtonText: t('basicData.save'),
    cancelButtonText: t('basicData.cancelButtonText'),
@@ -755,22 +767,28 @@
    tag.value.name = value
    let json = $ref(hiprintTemplate.value.getJson())
    const tableFlag = json.panels[0].printElements.filter(item => item.options.field==='table')

    if(tableFlag.length===1 && json.panels[0].printElements.length===1){
    json.panels[0].printElements.forEach((item,index) => {
      if (item.options.field === 'table') {
      let funct = "function(value,row,index,options){return `"
      json.panels[0].printElements[0].options.columns[0].forEach(item => {
        json.panels[0].printElements[index].options.columns[0].forEach(item => {
          if(item.field){
            if (company.printShowTitle){
            funct += item.title+':${row.'+item.field+' || "" }  <br>'
            }else{
              funct += '${row.'+item.field+' || "" }  <br>'
            }
          }
      })
      funct+='`}'
      json.panels[0].printElements[0].options.columns[0][0].renderFormatter = funct
    }else if(json.panels[0].printElements.length>1 && tableFlag.length>0){
      ElMessage.warning('保存失败,请检查是否只有一个表格')
      return
        json.panels[0].printElements[index].options.columns[0][0].renderFormatter = funct
    }
    })





    if(type === 'save'){
    tag.value.value = JSON.stringify(json)
    request.post('tagStyle/saveTag',tag.value).then(res => {
      if(res.code === '200' && res.data===true){
@@ -778,45 +796,18 @@
        getTags()
      }
    })
  })
}

const add = () => {
  ElMessageBox.prompt( t('components.addNewSignature')+':', {
    confirmButtonText: t('basicData.save'),
    cancelButtonText: t('basicData.cancelButtonText'),
    inputPattern:/^.{1,20}$/,
    inputErrorMessage: t('components.message'),
    inputValue:tag.value.name
  }).then(({ value }) => {
    tag.value.name = value
    let json = $ref(hiprintTemplate.value.getJson())
    const tableFlag = json.panels[0].printElements.filter(item => item.options.field==='table')

    if(tableFlag.length===1 && json.panels[0].printElements.length===1){
      let funct = "function(value,row,index,options){return `"
      json.panels[0].printElements[0].options.columns[0].forEach(item => {
        if(item.field){
          funct += item.title+':${row.'+item.field+' || "" }  <br>'
        }
      })
      funct+='`}'
      json.panels[0].printElements[0].options.columns[0][0].renderFormatter = funct
    }else if(json.panels[0].printElements.length>1 && tableFlag.length>0){
      ElMessage.warning('保存失败,请检查是否只有一个表格')
      return
    }


    tag.value.value = JSON.stringify(json)
    }else{
    request.post('tagStyle/addTag',tag.value).then(res => {
      if(res.code === '200' && res.data===true){
        ElMessage.success(t('basicData.msg.saveSuccess'))
        getTags()
      }
    })
    }

  })
}


const getTags = () => {
  request.get('tagStyle/getTagList').then(res => {
@@ -981,8 +972,8 @@
          </el-select>
        </el-col>
        <el-col :span="6">
          <el-button type="primary" @click="save">保存</el-button>
          <el-button type="primary" @click="add">复制</el-button>
          <el-button type="primary" @click="save('save')">保存</el-button>
          <el-button type="primary" @click="save('copy')">复制</el-button>
          <el-button type="warning" @click="clear">清空</el-button>
          <el-button :disabled="!tag.id" type="danger" @click="deleteTag">删除</el-button>
          <el-button type="primary" @click="htmlPrint">预览</el-button>

 north-glass-erp/northglass-erp/src/stores/sd/companySet/Ìì½ò±±²£.js

@@ -25,6 +25,7 @@
        qualityInsStatus:1,//跨工序质检审核，1不需要，2需要
        remarkSwitch:1,//流程卡上是否显示其它备注，1显示，2不显示
        icon:"",//商标参数
        printShowTitle:true,//流程卡自定义打印是否显示标签
        longSide:null,//订单创建最长边提示颜色 null不提示颜色
        showDeliveryCreator:true,//发货单创建人先显示或者后显示 false后显示
        deliveryRemark: ['备注:本批玻璃为优等合格品，请在卸货时,当面消点验收、如有质量问题在一周内与本公司联系,否则概不负责！'],

 north-glass-erp/northglass-erp/src/stores/sd/companySet/³£ÖݼªÀû.js

@@ -25,6 +25,7 @@
        qualityInsStatus:2,//跨工序质检审核，1不需要，2需要
        remarkSwitch:2,//流程卡上是否显示其它备注，1显示，2不显示
        icon:"奥飞久通",//商标参数
        printShowTitle:true,//流程卡自定义打印是否显示标签
        longSide:6500,//订单创建最长边提示颜色
        showDeliveryCreator:true,//发货单创建人先显示或者后显示 false后显示
        deliveryRemark: ['备注:本批玻璃为优等合格品，请在卸货时,当面消点验收、如有质量问题在一周内与本公司联系,否则概不负责！'],

 north-glass-erp/northglass-erp/src/stores/sd/companySet/н®ºãöÎ.js

@@ -26,6 +26,7 @@
        qualityInsStatus:1,//跨工序质检审核，1.不需要，2.需要
        remarkSwitch:2,//流程卡上是否显示其它备注，1显示，2不显示
        icon:"奥飞久通",//商标参数
        printShowTitle:true,//流程卡自定义打印是否显示标签
        longSide:null,//订单创建最长边提示颜色
        showDeliveryCreator:true,//发货单创建人先显示或者后显示 false后显示
        deliveryRemark: ['备注:本批玻璃为优等合格品，请在卸货时,当面消点验收、如有质量问题在一周内与本公司联系,否则概不负责！'],

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

@@ -25,6 +25,7 @@
        qualityInsStatus:2,//跨工序质检审核，1不需要，2需要
        remarkSwitch:2,//流程卡上是否显示其它备注，1显示，2不显示
        icon:"",//商标参数
        printShowTitle:false,//流程卡自定义打印是否显示标签
        longSide:null,//订单创建最长边提示颜色 null不提示颜色
        showDeliveryCreator:false,//发货单创建人先显示或者后显示 false后显示
        deliveryRemark: ['温馨提示：货到工地或工厂后，请于五天内安装完毕，如未能及时安装完毕，请放置于阴凉干燥处，并做好防晒防淋的措施，防止玻璃发霉；所有单片镀膜玻璃请勿用带酸性或碱性的液体清洗膜面。',

 north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue

@@ -159,7 +159,6 @@
  <div style="width: 100%;height: 100%">
    <div class="main-table">
      <vxe-grid
          style="width: 40vw;"
          class="mytable-scrollbar"
          height="100%"
          ref="xGrid"

 north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue

@@ -166,12 +166,12 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="650px"
        max-height="100%"
          height="100%"
        v-bind="gridOptions"
        v-on="teamGridEvents"

@@ -202,15 +202,19 @@
        <span>{{ row.basicCategory }}</span>
      </template>
    </vxe-grid>

    </div>
  </div>
</template>

<style scoped>
.main-div-customer {
  width: 80%;
  margin:  0 auto;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 0px);
}
.vxe-grid {
  /* ç¦ç”¨æµè§ˆå™¨é»˜è®¤é€‰ä¸­ */

 north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue

@@ -224,12 +224,12 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="650px"
        max-height="100%"
          height="100%"
        v-bind="gridOptions"
        v-on="teamGridEvents"
    >
@@ -275,14 +275,19 @@
      </template>

    </vxe-grid>

    </div>
  </div>
</template>

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 0px);
}

.vxe-grid {

 north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue

@@ -253,9 +253,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            type="daterange"
@@ -272,13 +271,13 @@
            id="select"
            type="primary" :icon="Search">{{$t('basicData.search')}}
        </el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
          height="100%"
        v-bind="gridOptions"

    >
@@ -318,7 +317,7 @@


    </vxe-grid>

    </div>
    <el-dialog v-model="dialogTableVisible" :title="$t('machine.maintenanceAndRepairEdit')">

      <el-form :model="form">
@@ -433,12 +432,13 @@
</template>

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}
#selectForm {
  width: 40%;
  text-align: center;

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue

@@ -132,9 +132,10 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="main-table">
    <vxe-grid
        max-height="100%"
          height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
@@ -164,6 +165,7 @@


    </vxe-grid>
    </div>

    <el-dialog v-model="dialogFormVisible" :title="$t('machine.deviceEditing')">
      <el-form :model="form">
@@ -213,8 +215,13 @@
</template>

<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 0px);
}
</style>

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

@@ -655,7 +655,8 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="head">
    <el-input v-show="isVisible" v-model="printMerge" :placeholder="$t('processCard.mergePrinting')" clearable
              style="width: 90px"></el-input>
    &nbsp;
@@ -688,6 +689,9 @@
          :value="item.value"
      />
    </el-select>
    </div>

    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        :checkbox-config="{labelField: 'name', highlight: true, range: true}"
@@ -736,6 +740,7 @@


    </vxe-grid>
    </div>
    <!--  æµç¨‹å¡æ‰“印  -->
    <el-dialog
        id="sizePrintCalrd"
@@ -847,9 +852,15 @@
</template>

<style scoped>
.main-div-customer {
  width: 99%;
  height: 92%;

.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}



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

@@ -727,7 +727,8 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="head">
    <el-input v-show="isVisible" v-model="printMerge" :placeholder="$t('processCard.mergePrinting')" clearable
              style="width: 90px"></el-input>
    &nbsp;
@@ -760,6 +761,9 @@
          :value="item.value"
      />
    </el-select>
    </div>

    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        :checkbox-config="{labelField: 'name', highlight: true, range: true}"
@@ -811,6 +815,7 @@


    </vxe-grid>
    </div>
    <!--  æµç¨‹å¡æ‰“印  -->
    <el-dialog
        id="sizePrintCalrd"
@@ -939,6 +944,16 @@
  height: 92%;
}

.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}


:deep(#sizeCheck .el-dialog__body) {
  height: 90%;

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

@@ -197,7 +197,9 @@
        <div class="row2" v-else>
          <span style="font-size: 8pt">{{ item.customer_name }}</span>&nbsp;
        </div>
        <div class="row2" style="font-size: 8pt" >{{item.order_id}}</div>
        <div class="row2" style="font-size: 8pt" >{{item.order_id}}
          <span style="font-size: 8pt">{{ remarks }}</span>&nbsp;
        </div>
        <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
        <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>


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

@@ -651,9 +651,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="orderInfo.workOrderDate"
            :default-time="defaultTime"
@@ -690,13 +689,13 @@
            :icon="Search"
            type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
        </el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="95%"
          height="100%"
        v-bind="gridOptions"
        v-on="gridEvents"
        @filter-change="filterChanged"
@@ -740,19 +739,19 @@

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

</template>

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 70%;
  height: 6%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}

.vxe-grid {

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

@@ -258,9 +258,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="orderInfo.workOrderDate"
            :default-time="defaultTime"
@@ -277,11 +276,12 @@
            id="select"
            type="primary" :icon="Search">{{$t('basicData.search')}}
        </el-button>
      </el-row>

    </div>

    <div class="main-table">
    <vxe-grid
        height="95%"
        height="100%"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
@@ -326,6 +326,7 @@

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

<style scoped>
@@ -337,4 +338,13 @@
  width: 50%;
  text-align: center;
}
.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

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

@@ -335,9 +335,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="orderInfo.workOrderDate"
            :start-placeholder="$t('basicData.startDate')"
@@ -358,12 +357,14 @@
            type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
        </el-button>
        <vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value"  :content="$t('processCard.merge')" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
      </el-row>

    </div>

    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="95%"
        height="100%"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
@@ -397,6 +398,7 @@


    </vxe-grid>
  </div>
    <el-dialog
        id="titleStyle"
        :title="$t('processCard.labelStyle')"
@@ -420,12 +422,14 @@
</template>

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}
#selectForm {
  width: 60%;

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
:deep(#titleStyle .el-dialog__body){
  height: 90%;

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

@@ -298,9 +298,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            :start-placeholder="$t('basicData.startDate')"
@@ -317,8 +316,8 @@
            :icon="Search"
            type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
        </el-button>
      </el-row>
    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
@@ -366,6 +365,7 @@


    </vxe-grid>
    </div>
    <el-dialog
        id="titleStyle"
        :title="$t('processCard.labelStyle')"
@@ -398,12 +398,14 @@


<style scoped>
.main-div-customer {
  width: 99%;
  height: 93%;
.head{
  width: 100%;
  height: 35px;
}
#selectForm {
  width: 60%;

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
:deep(#titleStyle .el-dialog__body){
  height: 90%;

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

@@ -430,9 +430,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="orderInfo.workOrderDate"
            :default-time="defaultTime"
@@ -447,12 +446,13 @@
        <el-button
            id="select"
            :icon="Search"
            style="margin-top: -5px"
            type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}

        </el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        :checkbox-config="checkBoxConfig"
@@ -536,16 +536,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 95%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 40%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue

@@ -141,12 +141,12 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
        height="650px"
          height="100%"
        v-bind="gridOptions"
        v-on="teamGridEvents"
        @filter-change="filterChanged"
@@ -176,7 +176,7 @@


    </vxe-grid>

    </div>
  </div>
</template>

@@ -186,6 +186,16 @@
  margin:  0 auto;
  height: 100%;
}

.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 0px);
}
.vxe-grid {
  /* ç¦ç”¨æµè§ˆå™¨é»˜è®¤é€‰ä¸­ */
  -webkit-user-select: none;

 north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue

@@ -142,12 +142,12 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
        height="650px"
          height="100%"
        v-bind="gridOptions"
        v-on="teamGridEvents"
        @filter-change="filterChanged"
@@ -176,7 +176,7 @@


    </vxe-grid>

    </div>
  </div>
</template>

@@ -186,6 +186,15 @@
  margin:  0 auto;
  height: 100%;
}
.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 0px);
}
.vxe-grid {
  /* ç¦ç”¨æµè§ˆå™¨é»˜è®¤é€‰ä¸­ */
  -webkit-user-select: none;

 north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue

@@ -163,12 +163,12 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
        height="650px"
          height="100%"
        v-bind="gridOptions"
        v-on="teamGridEvents"
        @filter-change="filterChanged"
@@ -200,7 +200,7 @@
      </template>

    </vxe-grid>

    </div>
  </div>
</template>

@@ -209,6 +209,15 @@
  width: 99%;
  height: 100%;
}
.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 0px);
}
.vxe-grid {
  /* ç¦ç”¨æµè§ˆå™¨é»˜è®¤é€‰ä¸­ */
  -webkit-user-select: none;

 north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue

@@ -184,9 +184,10 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="main-table">
    <vxe-grid
        max-height="100%"
          height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
@@ -234,6 +235,7 @@


    </vxe-grid>
    </div>

    <el-dialog v-model="dialogTableVisible" :title="$t('productionBasicData.basicDataEdit')">
      <el-row>
@@ -291,11 +293,13 @@
</template>

<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}
.el-row{
  margin: 10px;

.main-table{
  width: 100%;
  height: calc(100% - 0px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/replenish/Replenish.vue

@@ -60,6 +60,5 @@
#main-body{
  width: 99%;
  height: 92%;
  margin-top: 1%;
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue

@@ -281,27 +281,25 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
            style="width: 100px"
            type="daterange"
            value-format="YYYY-MM-DD"
        />
        &nbsp;&nbsp;
        <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
        height="100%"
        v-bind="gridOptions"
        @filter-change="filterChanged"

@@ -350,12 +348,18 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}

#selectForm {

 north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue

@@ -291,27 +291,25 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
            style="width: 100px"
            type="daterange"
            value-format="YYYY-MM-DD"
        />
        &nbsp;&nbsp;
        <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
          height="100%"
        v-bind="gridOptions"

    >
@@ -346,16 +344,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 60%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue

@@ -201,9 +201,8 @@
</script>

<template>
  <div class="main-div-customer" >
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-input
            v-model="form.orderId"
            clearable
@@ -218,9 +217,9 @@
            type="primary" :icon="Search">{{$t('basicData.search')}}

        </el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
       height="100%"
        class="mytable-scrollbar"
@@ -260,15 +259,17 @@

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

<style scoped>
.main-div-customer{
  width: 99%;
  height: 90%;
.head{
  width: 100%;
  height: 35px;
}
#selectForm {
  width: 60%;
  text-align: center;

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue

@@ -360,9 +360,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->

@@ -371,7 +370,6 @@
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
            style="width: 100px"
            type="daterange"
            value-format="YYYY-MM-DD"
        />
@@ -389,13 +387,13 @@
          />
        </el-select>
        <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
          height="100%"
        v-bind="gridOptions"

    >
@@ -438,16 +436,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 93%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 60%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue

@@ -182,15 +182,14 @@
</script>

<template>
  <div class="main-div-customer" >
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-input
            v-model="form.orderId"
            clearable
            :disabled="props.orderId"
            :placeholder="$t('order.orderId')"
            style="width: 130px"></el-input>
            style="width: 140px"
            :placeholder="$t('order.orderId')"></el-input>
        &nbsp;&nbsp;
        <el-button
            :disabled="props.orderId"
@@ -199,9 +198,9 @@
            type="primary" :icon="Search">{{$t('basicData.search')}}

        </el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        height="100%"
        @filter-change="filterChanged"
@@ -241,15 +240,17 @@

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

<style scoped>
.main-div-customer{
  width: 99%;
  height: 95%;
.head{
  width: 100%;
  height: 35px;
}
#selectForm {
  width: 60%;
  text-align: center;

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue

@@ -288,27 +288,25 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
            style="width: 100px"
            type="daterange"
            value-format="YYYY-MM-DD"
        />
        &nbsp;&nbsp;
        <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
          height="100%"
        v-bind="gridOptions"

    >
@@ -344,16 +342,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 60%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue

@@ -269,27 +269,25 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
            style="width: 100px"
            type="daterange"
            value-format="YYYY-MM-DD"
        />
        &nbsp;&nbsp;
        <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
          height="100%"
        v-bind="gridOptions"

    >
@@ -325,16 +323,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 60%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue

@@ -284,15 +284,13 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            :end-placeholder="$t('basicData.endDate')"
            :start-placeholder="$t('basicData.startDate')"
            format="YYYY/MM/DD"
            style="width: 100px"
            type="daterange"
            value-format="YYYY-MM-DD"
        />
@@ -307,13 +305,13 @@
        </el-select>
        &nbsp;&nbsp;
        <el-button type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}</el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
          height="100%"
        v-bind="gridOptions"
        @filter-change="filterChanged"

@@ -363,16 +361,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 60%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue

@@ -253,21 +253,20 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">

        <el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 130px"></el-input>
        <el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 140px"></el-input>
        &nbsp;&nbsp;

        <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
          height="100%"
        v-bind="gridOptions"

    >
@@ -297,16 +296,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 60%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue

@@ -213,25 +213,25 @@
</script>

<template>
  <div class="main-div-customer" >
    <div id="selectForm">
      <el-row :gutter="0">
        <el-input
            v-model="form.orderId"
            clearable
            :disabled="props.orderId"
            :placeholder="$t('order.orderId')"
            style="width: 130px"></el-input>
  <div  style="width: 100%;height: 100%">
    <div class="head">

        <el-date-picker
            v-model="time.date1"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
            style="width: 100px"
            type="daterange"
            value-format="YYYY-MM-DD"
        />

        &nbsp;&nbsp;
      <el-input
          v-model="form.orderId"
          clearable
          :disabled="props.orderId"
          :placeholder="$t('order.orderId')"
          style="width: 130px"></el-input>&nbsp;
        <el-button
            :disabled="props.orderId"
            @click="getWorkOrder"
@@ -239,11 +239,11 @@
            type="primary" :icon="Search">{{$t('basicData.search')}}

        </el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        height="400px"
          height="100%"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
@@ -286,15 +286,17 @@

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

<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}
#selectForm {
  width: 60%;
  text-align: center;

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue

@@ -334,9 +334,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->

@@ -359,9 +358,10 @@
          />
        </el-select>
        <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
      </el-row>


    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
@@ -413,16 +413,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 90%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 60%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue

@@ -422,9 +422,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">

        <el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 130px"></el-input>
        &nbsp;&nbsp;
@@ -448,10 +447,8 @@
          />
        </el-select>
        <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
      </el-row>

    </div>
    <div style="height: 100%">
    <div class="main-table">
      <vxe-grid
          ref="xGrid"
          class="mytable-scrollbar"
@@ -515,13 +512,13 @@
</template>

<style scoped>
.main-div-customer {
  width: 99%;
  height: 90%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 60%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue

@@ -327,15 +327,13 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
            style="width: 100px"
            type="daterange"
            value-format="YYYY-MM-DD"
        />
@@ -349,13 +347,13 @@
          />
        </el-select>
        <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        max-height="100%"
          height="100%"
        v-bind="gridOptions"

    >
@@ -391,16 +389,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 95%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 60%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -1317,8 +1317,8 @@
</script>

<template>
  <div style="height: 100%;width: 100%">
    <div id="head" style="height: 5%;width: 100%;margin-bottom: 5px">
  <div  style="width: 100%;height: 100%">
    <div class="head">
      <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" :placeholder="$t('reportingWorks.reportingWorkId')" style="width: 200px" />
      <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" :placeholder="$t('processCard.processId')" style="width: 200px" @keyup.enter.native="getWork();getQuantity()"/>
      &nbsp;
@@ -1342,7 +1342,7 @@
      &nbsp;
      <label>{{technologicalProcess}}</label>
    </div>
    <div style="background-color: white;margin-bottom: 5px;height: 17%;width: 100%">
    <div class="head1">
      <el-row>
        <el-col :span="2">
          <el-text>{{$t('order.orderId')}}：</el-text>
@@ -1478,12 +1478,11 @@

      </el-row>
    </div>
    <div class="main-div-customer" style="width: 100%;height: 70%">
    <div class="main-table">
      <vxe-grid
          ref="xGrid"
          class="mytable-scrollbar"
          :row-class-name="changeRowClass"
          max-height="100%"
          height="100%"
          size="small"
          v-bind="gridOptions"
@@ -1507,6 +1506,7 @@


      </vxe-grid>
    </div>
      <el-dialog
          @opened="openedBrokenTable"
          :before-close="checkClose"
@@ -1611,11 +1611,23 @@
        </vxe-grid>
      </el-dialog>
    </div>
  </div>
</template>

<style scoped>
.head{
  width: 100%;
  height: 35px;
}
.head1{
  width: 100%;
  height: 105px;
  background-color: white;
}

.main-table{
  width: 100%;
  height: calc(100% - 135px);
}

.processCard {
  width: 140px;

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue

@@ -341,9 +341,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            type="daterange"
@@ -373,9 +372,10 @@
            type="primary" :icon="Search">{{$t('basicData.search')}}

        </el-button>
      </el-row>

    </div>

    <div class="main-table">
    <vxe-grid
        height="100%"
        @filter-change="filterChanged"
@@ -436,15 +436,17 @@

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

<style scoped>
.main-div-customer{
  width: 99%;
  height: 95%;
.head{
  width: 100%;
  height: 35px;
}
#selectForm {
  width: 60%;
  text-align: center;

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue

@@ -375,9 +375,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            type="daterange"
@@ -397,9 +396,8 @@
            type="primary" :icon="Search">{{$t('basicData.search')}}

        </el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        height="100%"
        @filter-change="filterChanged"
@@ -474,6 +472,7 @@
      </template>

    </vxe-grid>
    </div>
<!--    <el-dialog v-model="updateWork"  style="width: 80%;height:75% ">-->
<!--      <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />-->
<!--    </el-dialog>-->
@@ -481,12 +480,13 @@
</template>

<style scoped>
.main-div-customer{
  width: 99%;
  height: 96%;
.head{
  width: 100%;
  height: 35px;
}
#selectForm {
  width: 45%;
  text-align: center;

.main-table{
  width: 100%;
  height: calc(100% - 25px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue

@@ -249,9 +249,10 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="main-table">
    <vxe-grid
        max-height="100%"
          height="100%"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
@@ -291,11 +292,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 0px);
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue

@@ -328,9 +328,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="orderInfo.workOrderDate"
            type="daterange"
@@ -363,11 +362,11 @@
            id="select"
            type="primary" :icon="Search">{{$t('basicData.search')}}
        </el-button>
      </el-row>

    </div>
    <div class="main-table">
    <vxe-grid
        max-height="100%"
          height="100%"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
@@ -421,16 +420,17 @@

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

<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

#selectForm {
  width: 50%;
  text-align: center;
.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue

@@ -162,9 +162,10 @@

  //表头按钮
  toolbarConfig: {
    buttons: [
      {'code': 'add', 'name': t('basicData.insert'),status: 'primary'},
    ],
    slots:{
      buttons: "toolbar_buttons",
      tools:'add'
    },

    // import: false,
    // export: true,
@@ -187,6 +188,11 @@
      }
    }
  }
}

const add = () => {
  rowIndex.value = null
  dialogTableVisible.value = true
}

request.get('/basicData/getBasicData').then(res => {
@@ -254,22 +260,9 @@

<template>
  <div  style="width: 100%;height: 100%">
    <div class="head">
    <el-row>
      <el-col :span="8">
        <el-cascader
            v-model="basic.basicType"
            @change="handleChange"
            :options="options"
            clearable
            :placeholder="$t('processCard.pleaseSelect')"
        />
      </el-col>
    </el-row>
  </div>

  <div class="main-table">
    <vxe-grid
        style="width: 40vw;"
        class="mytable-scrollbar"
        height="100%"
        ref="xGrid"
@@ -297,6 +290,22 @@
        </div>
      </template>

        <template #toolbar_buttons>
          <el-col :span="8">
            <el-cascader
                v-model="basic.basicType"
                @change="handleChange"
                :options="options"
                clearable
                :placeholder="$t('processCard.pleaseSelect')"
            />
          </el-col>
        </template>
        <template #add>
          <el-button @click="add" type="primary" style="margin-right: 3px">新增</el-button>

        </template>


    </vxe-grid>
  </div>
@@ -317,6 +326,6 @@

.main-table{
  width: 100%;
  height: calc(100% - 35px);
  height: calc(100% - 0px);
}
</style>

 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue

@@ -156,7 +156,6 @@
  <div  style="width: 100%;height: 100%">
    <div class="main-table">
    <vxe-grid
        style="width: 40vw;"
        class="mytable-scrollbar"
        height="100%"
        ref="xGrid"

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -1588,6 +1588,7 @@
               round(ogd.child_width)                                as width,
               round(ogd.child_height)                               as height,
               fc.quantity,
               CONCAT(round(ogd.child_width)  , ' X ', round(ogd.child_height)   ,' = ',fc.quantity )           as size,
               od.order_number                                       as orderNumber,
               fc.technology_number                                  as technologyNumber,
               od.building_number                                    as buildingNumber,
@@ -2100,6 +2101,11 @@
               width,
               height,
               #{printQuantity}                                      as quantity,
               CONCAT(
                   TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
                   ' X ',
                   TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
                   ' = ',#{printQuantity} )      as size,
               od.order_number                                       as orderNumber,
               fc.technology_number                                  as technologyNumber,
               od.building_number                                    as buildingNumber,