修改添加误差面积

guoyuji

2024-11-26 5ceb74ebb5ed2875a75d78a83817c7ce583b3534

修改添加误差面积

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

@@ -35,13 +35,13 @@
  request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      produceList.value = deepClone(res.data.data)
      console.log(produceList.value)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)
      produceList.value.forEach(item => {
        sumMoney+=item.DeliveryDetail.money
      })
      console.log(otherMoney.value)
      otherMoney1=[]
      otherMoney=deepClone(res.data.otherMoney)
      for(let i=0;i<otherMoney.length;i++){

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

@@ -38,6 +38,8 @@
    if(res.code==200){
      productIdData.value=deepClone(res.data.data)
      produceList.value = deepClone(res.data.data)

      console.log(produceList.value)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      produceList.value.forEach(item => {
@@ -208,7 +210,9 @@
        <th style="width: 10%;">面积</th>
        <th style="width: 10%;">单价</th>
        <th style="width: 12%;">金额</th>
        <th style="width: 20%;" colspan="2">加工要求</th>
        <th v-if="company.showDeliveryCreator" style="width: 20%;" colspan="2">加工要求</th>
        <th v-if="!company.showDeliveryCreator" style="width: 10%;" colspan="1">加工要求</th>
        <th v-if="!company.showDeliveryCreator" style="width: 10%;" colspan="1">备注</th>
      </tr>
      <template v-for="(item, index) in produceList" :key="index" >
        <tr>
@@ -226,7 +230,9 @@
          <td>{{items.compute_gross_area}}</td>
          <td>{{items.price}}</td>
          <td>{{items.gross_amount}}</td>
          <td colspan="2">{{items.processingNote}}</td>
          <td v-if="company.showDeliveryCreator" colspan="2">{{items.processingNote}}</td>
          <td v-if="!company.showDeliveryCreator" >{{items.processingNote}}</td>
          <td v-if="!company.showDeliveryCreator" >{{items.remarks}}</td>
        </tr>
        <tr class="day-in" >
          <td style="font-size: 15px;font-weight: bold;" colspan="3">小计:</td>

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

@@ -7,6 +7,7 @@
        address:'天津宝坻区节能环保工业区天兴路西侧宝中道南侧',
        telephone:'022-59280088',
        fax:'022-59280066',
        errorArea:0.4,
        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/stores/sd/companySet/³£ÖݼªÀû.js

@@ -7,6 +7,7 @@
        address:'常州市天宁区郑陆镇大明南路8号',
        telephone:'022-59280088',
        fax:'022-59280066',
        errorArea:0.4,
        widHeiLength:{//订单宽高长度
            regexp:/^(\d{1,4})$/,//正则四位整数
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99

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

@@ -8,6 +8,7 @@
        address:'新疆五家渠工业园兵团新型建材工业园区工一路11号附1号',
        telephone:'13419168999',
        fax:'',
        errorArea:0.4,
        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/stores/sd/companySet/½ð»ªÌì³É.js

@@ -7,6 +7,7 @@
        address:'浙江省金华市金东区曹宅镇工业功能区鹤岩街28号2号',
        telephone:'189 3119 1362 èµ–厂长',
        fax:'',
        errorArea:0.3,
        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/sd/order/CreateOrder.vue

@@ -25,9 +25,9 @@
let sizeCheckVisible = ref(false)
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()
let errorArea = ref(company.errorArea)
const router = useRouter()
const route = useRoute()
const xGrid = ref()

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

@@ -1011,7 +1011,8 @@
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               dd.price,
               od.other_columns
               od.other_columns,
               od.remarks
        from delivery_detail dd
                 left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
                 left join product p on od.product_id = p.id
@@ -1050,7 +1051,8 @@
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               od.price,
               od.other_columns
               od.other_columns,
               od.remarks
        from  order_detail od
        where  od.order_id = #{orderId}
          and od.product_id = #{productId}