zhangwencui
2026-04-22 0c2901e13dcc61ebae45aa7433d71b43bbf56d25
分支
用户 zhangwencui <1064582902@qq.com>
星期三, 四月 22, 2026 15:42 +0800
提交者 zhangwencui <1064582902@qq.com>
星期三, 四月 22, 2026 15:42 +0800
提交0c2901e13dcc61ebae45aa7433d71b43bbf56d25
目录 15006c4d170751dc75c5f18b490fe2e8e070effb 目录 | zip | gz
上一版本 14882552e4878db176ff793bc3506da3afaf44ae 查看 | 对比
a980fa7f103db90b629041473be27845a8a7ffc9 查看 | 对比
Merge branch 'dev_New' into dev_NEW_pro

# Conflicts:
# src/views/productionManagement/processRoute/index.vue
# src/views/productionManagement/processRoute/processRouteItem/index.vue
# src/views/productionManagement/productStructure/Detail/index.vue
# src/views/productionManagement/productionProcess/Edit.vue
# src/views/productionManagement/productionProcess/New.vue
# src/views/productionManagement/productionProcess/index.vue
已添加6个文件
已修改21个文件
3893 ■■■■ 文件已修改
src/api/basicData/customerFile.js 104 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/api/basicData/productModel.js 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/api/productionManagement/productionOrder.js 47 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/api/productionManagement/workOrder.js 45 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/store/modules/permission.js 1 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/basicData/customerFile/index.vue 102 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/basicData/customerFileOpenSea/index.vue 1794 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/basicData/product/ProductSelectDialog.vue 27 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/basicData/product/index.vue 17 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/customerService/feedbackRegistration/components/formDia.vue 6 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/customerService/feedbackRegistration/index.vue 3 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/index.vue 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementReport/index.vue 1 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/purchaseReturnOrder/New.vue 1 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productStructure/Detail/index.vue 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue 181 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue 298 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionOrder/index.vue 71 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionProcess/Edit.vue 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionProcess/New.vue 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/workOrderEdit/index.vue 459 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/workOrderManagement/components/MaterialDialog.vue 278 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/workOrderManagement/index.vue 34 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/finalInspection/index.vue 260 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/returnOrder/components/formDia.vue 19 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 97 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesQuotation/index.vue 32 ●●●● 对比 | 查看 | 原始文档 | blame | 历史