修改

廖井涛

2024-08-04 8e63485b0bf52813626c851542823ff677f5d0be

修改

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

@@ -200,7 +200,7 @@
              <td>{{delivery.quantity}}</td>
              <td>{{delivery.area}}</td>
              <td></td>
              <td>{{sumMoney}}</td>
              <td>{{parseFloat(sumMoney.toFixed(2))}}</td>
              <td colspan="2"></td>
            </tr>
            <tr class="day-in">

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

@@ -43,6 +43,7 @@
    {field: 'height',width:140,  title: t('order.height'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'quantity',width:140,  title: t('order.quantity'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'processingNote',width:200,  title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'price',width:140,  title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'area',width:150,  title: t('order.trueArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'grossArea',width:160,  title: t('order.trueGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'computeArea',width:180,  title: t('order.computeArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},

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

@@ -187,7 +187,7 @@
        <td>{{delivery.quantity}}</td>
        <td>{{delivery.area}}</td>
        <td></td>
        <td>{{sumMoney}}</td>
        <td>{{parseFloat(sumMoney.toFixed(2))}}</td>
        <td colspan="2"></td>
      </tr>
      <tr class="day-in">

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

@@ -384,6 +384,7 @@
                    item.computeArea = item.area
                    item.computeGrossArea = item.grossArea
                  })
                  errorAreaComputed()
                  selectOrder(order)
                }

@@ -1225,6 +1226,7 @@




//关闭其他金额界面
const refOtherMoney = ref()
const closeOtherMoneyDialog = async (done) => {

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

@@ -826,8 +826,8 @@
                           on d.type_id = c.type_id
                 left join sd.basic_glass_type as e
                           on e.type_id = d.belong
        where date(a.create_time) >= #{dates[0]}
          and date(a.create_time) &lt;= #{dates[1]}
        where date(b.create_time) >= #{dates[0]}
          and date(b.create_time) &lt;= #{dates[1]}
        group by b.order_id, a.product_id
        order by b.order_id desc
    </select>