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

chenlu

2025-07-22 93f94b0d6d93f3b9ae7455c05277a31d54359eb7

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

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

@@ -884,7 +884,8 @@
        const result = Object.fromEntries(
            fields.map(item => [item.field, true]) // è½¬æ¢æˆ [key, value] æ•°ç»„
        )
        let funct = "function(value,row,index,options){return `<div style='width: 6.5cm;height:4.95cm;background-color: #5cadfe'> <br>"
        //<div style='width: 6.5cm;height:4.95cm;background-color: #5cadfe'>
        let funct = "function(value,row,index,options){return ` <br>"
        json.panels[0].printElements[index].options.columns[0].forEach(item => {
          if(item.field && !result[item.field ]){
            if (company.printShowTitle){
@@ -896,7 +897,8 @@
            funct += item.title+'<br>'
          }
        })
        funct+='<br></div>`}'
        funct+='<br>`}'
        //</div>
        json.panels[0].printElements[index].options.columns[0][0].renderFormatter = funct
      }
    })

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue

@@ -212,8 +212,8 @@
<template>
  <div >
    <el-row id="footsum" :gutter="20" >
      <el-col :span="20"></el-col>
      <el-col :span="4" style="font-weight: bolder;font-size: 19px" >{{delivery.creator}}</el-col>
      <el-col :span="19"></el-col>
      <el-col :span="5" style="font-weight: bolder;font-size: 19px" >{{delivery.creator}}</el-col>
    </el-row>
    <el-row id="footsum1" :gutter="20" >
      <el-col :span="2" ></el-col>
@@ -231,12 +231,12 @@
          <td colspan="6" >
            <el-row :gutter="20">
              <el-col :span="2"></el-col>
              <el-col :span="9">
              <el-col :span="8">
                <input v-model="companyName"
                       style="border: 0;width: 100%;
                       height: 100%;font-size:19px;font-weight: bolder "/>
              </el-col>
              <el-col :span="5" style="font-size:19px;font-weight: bolder"> {{deliveryId}} </el-col>
              <el-col :span="6" style="font-size:19px;font-weight: bolder"> {{deliveryId}} </el-col>
              <el-col :span="3"></el-col>
              <el-col :span="5" style="white-space: nowrap;font-size:19px;font-weight: bolder">{{deliveryDate}}</el-col>
            </el-row>
@@ -291,7 +291,7 @@
          </td>

          <td
              style="width: 100px"
              style="width: 80px"
              v-if="props.type===1"
          >
            {{item.DeliveryDetail.price}}
@@ -363,7 +363,7 @@
@media print {
  #footsum{
    position: fixed;
    bottom: 3.5cm;
    bottom: 3.4cm;
    width: 100%; /* æˆ–者设置成具体的宽度 */
    font-size: 17px;
  }

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÂåÑô±±²£.js

@@ -11,7 +11,7 @@
        address:'洛阳国家高新技术开发区',
        telephone:'0379-64312861',
        fax:'0379-64332066',
        errorArea:0.4,
        errorArea:0.5,
        widHeiLength:{//订单宽高长度
            regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//正则0.00-99999.99
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99

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

@@ -328,6 +328,7 @@
    if ($grid) {
      switch (code) {
        case 'out': {
          $grid.clearFilter()
          const selectRecords = $grid.getCheckboxRecords()


@@ -395,7 +396,7 @@
        }

        case 'delete': {

          $grid.clearFilter()
          const selectRecords = $grid.getCheckboxRecords()
          if (selectRecords.length === 0) {
            ElMessage.warning(t('productStock.unselectedData'))

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

@@ -1538,6 +1538,22 @@
    return true;
  });
};


const changeGroup = (value)=> {
  //判断历史班组是否有此班组信息
  const exists = titleSelectJson.value.historyTeams.some(item => item.basic_name === value)
  if(! exists){
    titleSelectJson.value.historyTeams.push({
      basic_name: value,
      process: titleUploadData.value.thisProcess,
      basic_type: 'teamsgroups',
      id: 555
    })
  }


}
</script>

<template>
@@ -1667,6 +1683,7 @@
        <el-col :span="3">
          <el-select :disabled="groupChangeProcess"
                     v-model="titleUploadData.teamsGroupsName"
                     @change="changeGroup"
                     clearable
                     :placeholder="$t('reportingWorks.selectTeam')">
            <el-option

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

@@ -563,6 +563,7 @@
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          xGrid.value.updateFooter()
          break
        }
        case 'copyAll' :{
@@ -601,6 +602,7 @@
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          xGrid.value.updateFooter()
          break
        }
        case 'clearChecked' :{
@@ -615,6 +617,7 @@
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false

          break
        }
        case 'computedMoney' :{
@@ -703,6 +706,7 @@
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          xGrid.value.updateFooter()
          break
        }
        case 'incrementalChecked' : {
@@ -767,6 +771,7 @@
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled = false
          xGrid.value.updateFooter()
          break
        }
        case "reportingTransfer":{
@@ -1433,6 +1438,7 @@
   //   }
   // }
  titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
  xGrid.value.updateFooter()

}


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

@@ -434,6 +434,6 @@
    </select>

    <update id="updateOrderFile">
        update sd.order_file set file_name=#{fileName},file_data=#{dxfData},create_time=now() where orderId=#{orderId} and orderNumber=#{orderNumber}
        update sd.order_file set file_name=#{fileName},file_data=#{dxfData},create_time=now() where order_id=#{orderId} and order_number=#{orderNumber}
    </update>
</mapper>