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

guoyujie

2025-08-01 cd084621774f86c415e42baf22804e45d3481949

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

@@ -293,7 +293,10 @@
            </el-col>
            <el-col :span="5" style="font-size:19px;font-weight: bold"> {{ deliveryId }}</el-col>
            <el-col :span="6"></el-col>
            <el-col :span="2" style="white-space: nowrap;font-size:19px;font-weight: bold">{{ deliveryDate }}</el-col>
            <el-col :span="2" style="white-space: nowrap;font-size:19px;font-weight: bold">
              <input v-model="deliveryDate"
                     style="white-space: nowrap;font-size:19px;font-weight: bold;border: 0;"/>
            </el-col>
          </el-row>
        </td>
      </tr>
@@ -305,7 +308,10 @@
        <td colspan="6">
          <el-row :gutter="20">
            <el-col :span="2"></el-col>
            <el-col :span="17" style="font-size: 16px;">{{ delivery.customerName }}</el-col>
            <el-col :span="17" style="font-size: 16px;">
              <input v-model="delivery.customerName"
                     style="font-size: 16px;border: 0;width: 100%"/>
            </el-col>

            <el-col :span="5" style="font-size: 16px;white-space: nowrap;"> {{ delivery.project }}</el-col>
          </el-row>