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

廖井涛

2024-06-25 05b730c07f34b4392caa7ad877bf2b1964888253

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

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

@@ -166,7 +166,7 @@
        technology:'工艺',
        amountReset:'金额重置',
        OrderNum:'订单序号',
        productId:'产品Id',
        productId:'产品ID',
        product:'产品',
        price:'单价',
        quantity:'数量',

 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue

@@ -222,7 +222,7 @@

      for (let i=0;i<BasicData.value.length;i++){
        let aa={field: "json."+BasicData.value[i].OperateType, width: '150',title: BasicData.value[i].OperateTypeName, sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
        console.log(aa)

        gridOptions.columns.push(aa)

      }

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

@@ -1361,6 +1361,7 @@
    -moz-user-select: none;
    -ms-user-select: none;
    user-select: none;
    transform: translateZ(0);
  }
  :deep(#product .el-dialog__body){
    height: 90%;

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

@@ -2,7 +2,7 @@
import {computed, onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import request from "@/utils/request"
import {ElMessage} from "element-plus"
import {ElMessage, ElMessageBox} from "element-plus"
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
import {useI18n} from "vue-i18n"
@@ -16,6 +16,7 @@
const xGrid = ref()
const trademarkLocation=ref([t('craft.upperLeft'),t('craft.upperRight'),t('craft.lowLeft'),t('craft.lowRight')])
const gridOptions = reactive({
  loading:true,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
@@ -25,7 +26,7 @@
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true },//开启虚拟滚动
  scrollY:{ enabled: true,gt:13 },//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
@@ -44,10 +45,10 @@
  },//表头参数
  columns:[
    {title: t('basicData.operate'), width: 220, slots: { default: 'button_slot' },fixed:"left",},
    {field: 'orderNumber',width:120,  title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    //{field: 'orderDetail.buildingNumber',width:120,  title: '楼号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.productName',width:120,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'glassAddress',width:120,  title: t('craft.glassAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'orderNumber',fixed:"left",width:120,  title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'orderDetail.productId',fixed:"left",width:120,  title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.productName',fixed:"left",width:120,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'technologyNumber',width:120,  title: t('craft.glassAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'glassChild',width:120,  title: t('craft.glassChild'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'orderDetail.width',width:120,  title: t('craft.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'orderDetail.height',width:120,  title: t('craft.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -79,6 +80,7 @@
            { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
            { code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
            { code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
            { code: 'computedSize', name: '科学计数', prefixIcon: 'vxe-icon-chart-line', visible: true, disabled: false },
          ]
      ]
    }
@@ -138,6 +140,30 @@
              }
            })
          }
          break
        }
        case 'computedSize' :{
          let result = toolbarButtonClickEvent()
          if(!result || result.cell!=='childWidth'){
            break
          }
          ElMessageBox.prompt('', '', {
            confirmButtonText: t('basicData.confirmButtonText'),
            cancelButtonText: t('basicData.cancelButtonText'),
            inputPattern:/^(-?\d{1,4}(\.\d{1,2})?|-?0(\.\d{1,2})?)$/,
            inputErrorMessage: '-9999.99~9999.99',
          })
          .then(({ value }) => {
            const value1 = value*1
            $grid.getTableData().visibleData.forEach((item,index) =>{
              if(index>=result.start && index<=result.end){

                item[result.cell] = item[result.cell]*1+value1
              }

            })
          })

          break
        }
        case 'copyAll' :{
@@ -301,6 +327,7 @@
  }
  request.post(`/order/getOrderCraftById/${str}`).then((res) => {
    if(res.code==200){
      console.log(res.data)
      titleUploadData.value = res.data.order

      //取消审核按钮禁用
@@ -317,6 +344,7 @@

      }
      xGrid.value.reloadData(res.data.orderGlassDetails)
      gridOptions.loading = false
    }else{
      ElMessage.error(res.msg)
    }
@@ -388,7 +416,7 @@
    <div class="order-detail">

      <vxe-grid
          max-height="97%"
          height="100%"
          class="mytable-scrollbar"
          ref="xGrid"
          v-bind="gridOptions"

 north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue

@@ -73,7 +73,7 @@
})

let productGlassTypeStore = useProductGlassTypeStore()
productGlassTypeStore.GlassType=['','']
productGlassTypeStore.GlassType=[null,null]

//页面加载请求
request.get(`/basicData/BasicDataByType/product`).then((res) => {
@@ -107,14 +107,14 @@
})

const saveProduct = () => {
  console.log(productDetailList.value)
  console.log(productGlassTypeStore.GlassType);
  if(productDetailList.value.length===0){
    ElMessage.warning(t('product.msg.productLength'))
    return
  }else if(productDetailList.value[productDetailList.value.length-1].detailType!=='glass'){
    ElMessage.warning(t('product.msg.lastGlass'))
    return
  }else if(productGlassTypeStore.GlassType[1]==='' || productGlassTypeStore.GlassType[1]===null){
  }else if(productGlassTypeStore.GlassType===null || productGlassTypeStore.GlassType[1]==='' || productGlassTypeStore.GlassType[1]===null){
    ElMessage.warning(t('product.msg.glassType'))
    return
  }
@@ -133,7 +133,6 @@
      }
      case 'hollow' :{
        productName+='*'+item.detail+"*"
        console.log(item.detail.slice(0,-2))
        break
      }
    }

 north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue

@@ -139,7 +139,6 @@
//第一次加载数据
request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,filterData.value).then((res) => {
  if(res.code==200){
    console.log(res.data.data)
    pageTotal.value=res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    xGrid.value.reloadData(produceList)

 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java

@@ -45,7 +45,12 @@
        }

        BasicOtherMoney basicOtherMoney = basicOtherMoneyList.get(0);
        String getColumn = basicOtherMoney.getColumn()==null?"0":basicOtherMoney.getColumn().replace("M","");
        String getColumn = basicOtherMoney.getColumn()==null?
                "0":
                String.valueOf(basicOtherMoney.getId());
//                basicOtherMoney.getColumn().
//                        replace("M","").
//                        replace("S","");
        int  columnNum = Integer.parseInt(getColumn)+1;
        BasicOtherMoney newBasicOtherMoney = new  BasicOtherMoney();
        newBasicOtherMoney.setColumn("M"+String.format("%02d", columnNum));

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

@@ -82,6 +82,7 @@
        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">

            <result column="building_number" property="buildingNumber"/>
            <result column="product_id" property="productId"/>
            <result column="product_name" property="productName"/>
            <result column="width" property="width"/>
            <result column="height" property="height"/>
@@ -100,6 +101,7 @@
            a.order_id,
            a.order_number,
            b.building_number,
            b.product_id,
            b.product_name,
            a.glass_address,
           a.technology_number,