Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-08-07 f7341938e2a9f843784eec6b777f6d73a930c9ad

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -296,6 +296,7 @@
        totalArea:'TotalArea',
        childWidth:'Child Width',
        childHeight:'Child Height',
        arc:'arc',
        area:'Area',
        process:'Process',
        orderDetail:'Order Detail',

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -292,6 +292,7 @@
        totalArea:'Общий размер',
        childWidth:'Ширина монолитного стекла',
        childHeight:'Высота монолитного стекла',
        arc:'Длина дуги',
        area:'Размер монолитного стекла',
        process:'Технологический процесс',
        orderDetail:'Подробности заказа',

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -297,6 +297,7 @@
        totalArea:'总尺寸',
        childWidth:'单片宽',
        childHeight:'单片高',
        arc:'弧长',
        area:'单片尺寸',
        process:'工艺流程',
        orderDetail:'订单详情',

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -118,34 +118,38 @@
  },

})
const initOrder = async ()=> {
//页面第一次加载
request.get(`/basicData/BasicDataByType/delivery`).then((res) => {
  await request.get(`/basicData/BasicDataByType/delivery`).then((res) => {

  if(res.code==200){
    titleSelectJson.value=deepClone(res.data)
    //其他金额
    otherMoney.value = titleSelectJson.value.deliveryOtherMoney[0]
    //let columns = []
    otherMoney.value.forEach(item => {
      let column = {field: `otherColumns.${item.column}`,width:50,  title: item.alias,editRender: { name: 'input'}}
      //columns.push(column)
      gridOptions.columns.push(column)
    })
    const today = new Date
    today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
    titleUploadData.value.deliveryDate = today.getFullYear() +
        '-' + ("0" + (today.getMonth() + 1)).slice(-2)
        + '-' + ("0" + today.getDate()).slice(-2)
  }else{
    ElMessage.warning(res.msg)
  }
})
    if (res.code == 200) {
      titleSelectJson.value = deepClone(res.data)
      console.log(titleSelectJson.value)
      //其他金额
      otherMoney.value = titleSelectJson.value.deliveryOtherMoney[0]
      //let columns = []
      otherMoney.value.forEach(item => {
        let column = {field: `otherColumns.${item.column}`, width: 50, title: item.alias, editRender: {name: 'input'}}
        //columns.push(column)
        gridOptions.columns.push(column)
      })
      const today = new Date
      today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
      titleUploadData.value.deliveryDate = today.getFullYear() +
          '-' + ("0" + (today.getMonth() + 1)).slice(-2)
          + '-' + ("0" + today.getDate()).slice(-2)
    } else {
      ElMessage.warning(res.msg)
    }
  })

}

const  xGrid = ref();
const  number = ref();

onMounted(()=>{
onMounted( async()=>{
  await initOrder()
  //启用表格拖动选中
  addListener(xGrid.value,gridOptions,cellArea.value)
  //发货新增
@@ -161,6 +165,8 @@


        titleUploadData.value=deepClone(res.data.title)
        console.log(111)
        console.log(titleSelectJson.value)
        titleUploadData.value.paymentTerms = titleSelectJson.value.paymentTerms[0].basicName
        titleUploadData.value.payMethod = titleSelectJson.value.payMethod[0].basicName
        const today = new Date

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -896,7 +896,7 @@
      titleUploadData.value.icon = titleSelectJson.value.icon[0].basicName
      titleUploadData.value.packType = titleSelectJson.value.packType[0].basicName
      titleUploadData.value.alType = titleSelectJson.value.alType[0].basicName
      titleUploadData.value.calculateType = 1
      titleUploadData.value.calculateType = company.calculateType
      const today = new Date
      today.setTime(today.getTime() + (7 * 24 * 60 * 60 * 1000))
      titleUploadData.value.deliveryDate = today.getFullYear() +

 north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue

@@ -58,6 +58,7 @@
    {field: 'totalArea',width:120,  title: t('craft.totalArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'childWidth',width:120,  title: t('craft.childWidth'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'childHeight',width:120,  title: t('craft.childHeight'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'arc',width:120,  title: t('craft.arc'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'area',width:120,  title: t('craft.area'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'orderDetail.quantity',width:120,  title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'process',width:120,  title: t('craft.process'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -371,6 +372,7 @@
  request.post(`/order/getOrderCraftById/${str}`).then((res) => {
    if(res.code==200){
      titleUploadData.value = res.data.order
      console.log(res.data.orderGlassDetails)

      //取消审核按钮禁用
      if(res.data.order.processReview === 2 ){

 north-glass-erp/northglass-erp/vite.config.js

@@ -15,7 +15,7 @@
    alias: {
      '@': fileURLToPath(new URL('./src', import.meta.url))
    }
  }, 
  },
  server: {
    port: 5173,//端口号
    host: true,//ip地址 或 '0.0.0.0' 或 "loaclhost"

 north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml

@@ -92,6 +92,7 @@
        <result column="glass_child" property="glassChild"/>
        <result column="child_width" property="childWidth"/>
        <result column="child_height" property="childHeight"/>
        <result column="arc" property="arc"/>
        <result column="icon" property="icon"/>
        <result column="process" property="process"/>
        <result column="area" property="area"/>
@@ -130,7 +131,7 @@
           a.total_area,
           b.edging_type,
           a.child_width,
           a.child_height,
           a.child_height,a.arc,
           a.icon,
           a.area,
           b.quantity,
@@ -154,7 +155,8 @@
                a.area = #{item.area},
                a.total_area = #{item.area}*b.quantity,
                a.icon = #{item.icon},
                a.process = #{item.process}
                a.process = #{item.process},
                a.arc = #{item.arc}
            where
                a.order_id = b.order_id
                and a.order_id = #{item.orderId}