zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,447 Commits 4 Branches 6 Tags 364 MiB
Commit Graph

3801 Commits

Author SHA1 Message Date
shijing ff2e9a49e0 feat:禅道446折线图：X轴展示产品编号，Y轴展示分检的像位移值 2026-07-24 11:29:49 +08:00
shijing f3a92cb296 fix：光芯生产执行中的检验记录可以撤回并删除 2026-07-24 08:59:53 +08:00
shijing 9c302b215b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-07-23 16:40:07 +08:00
shijing f8e3523568 fix:禅道456 2026-07-23 16:40:05 +08:00
caoqianming a378a39917 fix:工艺画布拉线表单带入残留信息根因修复:禁用VueFlow connectOnClick(单击手柄会挂起待连接状态,之后再点手柄以旧节点为起点触发connect,导致间歇性带入错误输入/输出);预填改为prop挂载时确定;误吸附回起点按拉空白处理;单纯点击手柄不再弹新增表单;节点增减后重新适配视野 2026-07-23 16:06:02 +08:00
caoqianming 494999eb11 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-07-23 15:52:16 +08:00
caoqianming 205768fbc3 fix:工艺路线表单残留问题根治:xtSelect外部清空值时同步清空显示文字(残留主因);画布/右侧新增弹框加key每次打开强制重建实例;route_form编辑时sort不再被count+1覆盖;无routeId不再全量拉辅料 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-23 15:50:32 +08:00
shijing ca5d96bd86 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-07-23 15:04:33 +08:00
shijing 1770b10d07 fix:交接扫码时光标丢失问题 2026-07-23 15:04:31 +08:00
caoqianming d6d382e281 fix:弹框表单残留上次内容问题一批:route_form open时主动resetForm不再依赖父级v-if销毁(关闭动画期间重开复用实例致残留);riskpoint新增未重置saveForm且RiskForm常驻挂载补destroy-on-close;algo页弹框v-model改v-if与algo2对齐;mroom/plat_record新增未重置表单 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-23 14:25:25 +08:00
caoqianming 37b5e3f468 fix:工作流配置四页(字段/工作流/流转/状态)新增弹框未重置表单,先编辑再新增会残留上一条内容;默认值提为defaultForm常量供data与新增共用 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-23 14:25:25 +08:00
shijing 23313d5ced fix:禅道458 2026-07-23 13:55:20 +08:00
shijing 070b41fd51 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-07-23 13:24:58 +08:00
shijing d3502b4456 fix:陶瓷日志中设备为可选 2026-07-23 13:24:56 +08:00
caoqianming dea337b632 feat:工艺画布scFlow更名xtFlow;工艺包产品常驻画布为终点节点可直接连线;节点按物料真实类型着色;fix:拖线新增setData覆盖params_json致排一次棒表单报错;perf:vue-flow分包prefetch预取+查看器合并重复布局;style:route_show查看页卡片化紧凑布局 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-23 09:18:59 +08:00
caoqianming f7fee89290 feat:物料表单新增入库检验方式,入库明细未检免检物料显示免检标识;fix:其他配置页提交未实现导致保存无效 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-22 16:27:41 +08:00
caoqianming 3ee5403ad9 fix:抽屉内打开的el-dialog统一加append-to-body(24文件28处),避免被pages.scss抽屉工作流表单样式误伤成卡片/灰底/底部留白 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-22 15:03:55 +08:00
caoqianming 63dfe7e948 refactor:工艺路线查看统一到Vue Flow只读视图scFlowViewer,与编辑器共用MaterialNode节点/dagre布局;route_show与route页弃用dagre-d3版scDegra 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-22 15:03:54 +08:00
caoqianming 46ed8b0c54 fix:抽屉内el-main/el-aside恢复nopadding约定优先级; route_form弹窗加append-to-body避免被抽屉工作流表单样式误伤成卡片 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-22 15:03:54 +08:00
caoqianming e50e09bcaf feat:工艺路线新增可视化流程编辑器scFlowEditor(Vue Flow+dagre异步分包); 编辑工艺抽屉压缩布局留白 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-22 15:03:54 +08:00
shijing 7fccfc9869 fix:分检加人员筛选不生效修改 2026-07-21 14:59:24 +08:00
caoqianming e671393bff fix:table下的tr补上tbody包裹,消除vue3.5模板编译的HTML嵌套规范警告 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-21 10:29:26 +08:00
caoqianming 87ef0772a4 chore:升级依赖 vue3.2->3.5, element-plus2.8->2.14, sass等; maopi/zhongjian1Total的script声明lang=jsx以兼容新版编译器 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-21 10:14:54 +08:00
shijing fe730915f2 fix:禅道452综合查询界面棒数据未显示发货数 2026-07-20 16:26:25 +08:00
shijing 6be1b10736 fix:禅道452综合查询界面棒数据未显示发货数 2026-07-20 13:19:15 +08:00
shijing bec1e9a8a6 feat:禅道444扭转工序，快速报工，扫码框后面加数字识别功能 2026-07-20 11:27:37 +08:00
shijing 6564742644 fix:禅道452综合查询界面棒数据未显示发货数 2026-07-20 11:26:41 +08:00
shijing 564fa2e1c3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-07-20 09:50:16 +08:00
shijing 04e3a2e18d feat:禅道446深加工统计里加工装tab页面 2026-07-20 09:50:14 +08:00
caoqianming 3e77fb77fb feat:销售发货批次选择隐藏可发数量为0的批次 
批次查询改用后端 count_canmio__gt=0 过滤(存量-在途出入库),
只展示可实际发货的批次

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-16 12:06:41 +08:00
caoqianming c8f38e54b6 feat:合格B类字段文案改为记为合格更准确表达 
工序/日志提交处 clear_defect 开关文案由不拆批/合批清除缺陷统一改为合格B类记为合格,与后端同步。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-16 10:21:10 +08:00
caoqianming 27060f7c54 fix:出入库记录及明细表单新增时清空,避免上次保存数据残留导致"物料找不到" 
mio_form/mioitem_form的open()原只设type、不重置form,saveDialog虽用
v-if="dialog.save"+@closed重建,但关闭动画未结束就再点新增时dialog.save
仍为true、组件被复用,导致上次的material/mb/batch/selectObj等残留。
新增resetForm(),add模式打开时强制清空,不依赖v-if重建时序。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-16 09:54:36 +08:00
caoqianming 61c04fe150 perf:生产领料/其他出库(bxerp+gz)改按仓库批次选择,生产入库批次下拉显示工段 
抽isBatchPick统一bxerp/gz出库(do_out/other_out)为选仓库批次:下拉带
物料名/批次号/仓库/可发量、只读批次摘要、隐藏冗余框,选中自动回填并按
物料类型限定可领范围;销售发货仍仅bxerp,gx出库靠扫码保持原样不变。
生产入库批次下拉每项加显示工段(mgroup_name)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-15 21:16:28 +08:00
caoqianming 4c2caee8f6 perf:销售发货明细表单改为按仓库批次选择并精简冗余字段 
bxerp销售发货:第一个下拉"物料"改名"仓库批次",下拉表格增加物料名/批次号/
仓库/可发数量列,新增只读批次信息摘要,隐藏重复的批次号编辑框、仓库已有批次、
自动锁定的仓库框。仅影响sale_out&&bxerp分支,不影响gz/gx及其他出入库类型。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-15 16:31:23 +08:00
caoqianming 2e22f851a0 feat:仓库数量汇总报表支持点击状态设定安全库存上下限并日期自动查询 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-15 08:18:31 +08:00
caoqianming b301a09cac style:仓库数量汇总报表页优化显示(KPI概览/对比图/网格/合计/安全库存预警) 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-14 16:03:25 +08:00
caoqianming ee40da3461 refactor:仓库数量汇总报表页移至 statistics 目录 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-14 15:44:02 +08:00
caoqianming cc69fa8cca feat:物料档案增加安全库存上限, 新增仓库数量汇总报表页 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-14 15:21:32 +08:00
caoqianming 94859d431d fix:上盘平磨合批弹窗总计不刷新,交接数量@change的countChanges方法未声明变量报错;总计改为computed计算属性,随handoverb自动汇总,并移除分散的手动累加与500ms定时重算 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-14 14:23:34 +08:00
caoqianming 0a3f7d7292 fix:zt_batch_gx展开行count_*字段后缀翻译为中文 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 12:39:08 +08:00
caoqianming 33366baef7 feat:新增大批直通良率统计页zt_batch_gx 
按大批展示直通_白料数/总合格数/良率/口径/子批次, 行展开平铺整份
统计data; 支持大批号/子批号反查/口径/日期过滤, 合计行与导出;
动态路由不注册router

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 12:24:15 +08:00
caoqianming 0c73337a9a fix:出入库明细页单价/金额/合计改用后端返回的unit_price、price、total_price,修复前端浮点计算误差;库存导出总金额保留两位 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 10:24:08 +08:00
caoqianming 02f3d3e3dd Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-07-14 09:10:46 +08:00
caoqianming f0fe273eb5 fix:客户页面删除接口调用错误，误用采购订单删除接口，并补充删除后刷新列表 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 09:10:04 +08:00
shijing b4b992a4e4 fix:报废时物料显示 2026-07-10 16:56:53 +08:00
shijing 44cc291540 feat:禅道443 2026-07-06 14:45:57 +08:00
shijing 5f47ef62c6 fix:20260702光子科技开发测新修改 2026-07-03 14:58:48 +08:00
shijing 4eb54c63f6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-07-01 15:57:24 +08:00
shijing 8856308e8f fix:交接物料时，可以选择合格物料，也可以选择返修完成物料 2026-07-01 15:55:22 +08:00
shijing 701b085cb5 fix:返工日志输出物料列表不展示问题 2026-07-01 15:53:23 +08:00