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

guoyuji

2025-02-14 51ede336f7e3be525b4183cd62b3a9900bfc62d1

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

 north-glass-erp/northglass-erp/src/components/BasicTable.vue

@@ -115,7 +115,7 @@
  }
})
const basicProp = ref({
  pageSize : 100,//页面显示数量
  pageSize : 10000,//页面显示数量
  pageNum:1,//当前页
  selectDate:['',''],//查询的日期
  pageTotal : 0,//总页数

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue

@@ -189,7 +189,7 @@
                <td>{{items.orderNumber}}</td>
                <td>{{items.buildingNumber}}</td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else-if="items.differentSize=1">
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else-if="items.differentSize==1">
                  <template v-for="(orderGlassDetail, index1) in items.orderGlassDetails" >
                  ({{orderGlassDetail.childWidth}}x{{orderGlassDetail.childHeight}})
                  </template>

 north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue

@@ -59,7 +59,7 @@
let total = reactive({
  pageTotal : 0,
  dataTotal : 0,
  pageSize : 100
  pageSize : 10000
})