廖井涛
2025-09-25 441a55bc6e551d4759bdcf5dcdda2a10fc128a97
Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
2个文件已修改
10 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue
@@ -339,8 +339,8 @@
        <template #toolbar_buttons="{ $grid }">
          &nbsp;&nbsp;
          <vxe-select @change="changeOrderType" v-model="values" >
            <vxe-option value="1" :label= "t('finishedGlassShelf.summary')"></vxe-option>
            <vxe-option value="2" :label= "t('finishedGlassShelf.detail')"></vxe-option>
            <vxe-option value="1" :label="$t('finishedGlassShelf.summary')"></vxe-option>
            <vxe-option value="2" :label="$t('finishedGlassShelf.detail')"></vxe-option>
          </vxe-select>
          &nbsp;&nbsp;
north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue
@@ -510,6 +510,8 @@
                      details: assignedDetails
                    }
                  })
                  // 计算总价
                  product.totalPrice = details.reduce((sum, d) => sum + (d.materialPric || 0), 0)
                })
                dialogTableVisible.value = true
              }
@@ -750,7 +752,7 @@
            &nbsp;&nbsp;&nbsp;
            <span>数量:{{ item.quantity }}</span>
            &nbsp;&nbsp;&nbsp;
            <span>周长:{{ item.perimeter }}</span>
            <span>周长:{{ Number(item.perimeter).toFixed(2) }}</span>
          </div>
        </template>
@@ -759,7 +761,7 @@
          <el-col :span="8">{{ part.name }}:</el-col>
          <el-col :span="16">
            <div v-for="(d, j) in part.details" :key="j">
              {{ d.material }} ¥{{ d.materialPric}}
              {{ d.material }}  &nbsp; ¥{{ d.materialPric}}
            </div>
            <hr>
          </el-col>