 shijing
|
b307103ba8
|
fix:禅道338待改善
|
2026-04-14 16:59:31 +08:00 |
|
shijing
|
f3ff8c5942
|
fix:禅道357 洁净车间（洗）页面调整
|
2026-04-13 15:37:16 +08:00 |
|
shijing
|
d423cee74c
|
fix:禅道339
|
2026-04-13 09:10:40 +08:00 |
|
shijing
|
ae943f6b15
|
fix:热压统计（扭转）调整
|
2026-04-10 16:02:40 +08:00 |
|
shijing
|
c6288d19aa
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-04-10 13:41:34 +08:00 |
|
shijing
|
ad79102320
|
fix:禅道更新
|
2026-04-10 13:41:32 +08:00 |
 TianyangZhang
|
79fc4201fd
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-03-31 11:08:45 +08:00 |
|
TianyangZhang
|
a3fe47384b
|
feat:修改光芯人员导入功能
|
2026-03-31 11:08:44 +08:00 |
 caoqianming
|
9e3ebb5a46
|
fix: 修复手动来料物料选择和 mgroup 传递问题
- 修正 xtSelect @change 回调签名，正确赋值 material_name
- createForm 初始化时默认填入当前 mgroup，提交时从 createForm 读取
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
2026-03-27 16:41:24 +08:00 |
|
caoqianming
|
5e77d575b8
|
feat: 来料未完成界面添加手动来料和删除功能
- wpm_gx/inm.vue、wpm_bx/inmIn.vue 添加来料按钮（v-auth wmaterial.create）
- 操作列添加删除按钮，仅 is_manual 记录显示（v-auth wmaterial.delete）
- 新增手动来料 dialog，支持选择物料、填写批次号和数量
- wpm.js wmaterial 添加 create/delete 接口
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
2026-03-27 10:28:01 +08:00 |
|
shijing
|
33eb661295
|
feat:光子性能检验添加两个字段（中温粘度规格、结论），修改两个文案
|
2026-03-27 09:44:26 +08:00 |
|
shijing
|
0f46fb6b53
|
fix:6车间新增报工时，无法多次修改领用数量问题修改
|
2026-03-26 17:06:01 +08:00 |
|
shijing
|
be10887892
|
fix:统计分析-管综合统计中，六车间中检会出现有合格率，但是没有检验数，字段引用错了，已纠正
|
2026-03-26 16:37:19 +08:00 |
|
shijing
|
17b4a16def
|
fix:有时出现加工-发货合格率有数，但发货数为0的情况问题修改为当有发货数的时候再计算两个合格率
|
2026-03-26 16:26:14 +08:00 |
|
shijing
|
a035cf979b
|
fix:7车间生产大屏：本月生产统计横坐标改成1-10炉号
|
2026-03-26 15:49:21 +08:00 |
|
shijing
|
0b4ae3d042
|
feat:10车间看板：人员到岗模块删除，不需要了
|
2026-03-26 15:34:00 +08:00 |
|
shijing
|
0f680491a3
|
feat:扭转统计
|
2026-03-26 10:02:49 +08:00 |
|
shijing
|
7dd188ce94
|
fix:文件名修改
|
2026-03-25 13:25:21 +08:00 |
|
shijing
|
b3c42b5876
|
fix:日志中针对扭转的检验表（用material_in）做特殊处理
|
2026-03-25 13:24:14 +08:00 |
|
shijing
|
9023d3b34a
|
fix:禅道359
|
2026-03-25 11:15:34 +08:00 |
|
shijing
|
4565b7ccca
|
fix:禅道361
|
2026-03-24 14:55:09 +08:00 |
|
shijing
|
f47bcebbbb
|
fix:禅道353
|
2026-03-24 14:07:50 +08:00 |
|
shijing
|
3643a2a95c
|
fix:禅道362
|
2026-03-23 15:40:28 +08:00 |
|
shijing
|
d1f7209469
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-03-23 14:49:24 +08:00 |
|
shijing
|
afb86b1cec
|
fix:热压统计（毛）检测数据修正
|
2026-03-23 14:47:49 +08:00 |
|
TianyangZhang
|
a994cbc10d
|
feat: 修改光芯OA审批的BUG与新增导出功能
|
2026-03-23 09:50:09 +08:00 |
|
TianyangZhang
|
12b0f280d9
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-03-23 09:48:11 +08:00 |
|
shijing
|
29263a4f1b
|
fix:禅道356点击数据没有显示列表
|
2026-03-20 14:47:11 +08:00 |
|
shijing
|
a5b124576e
|
fix:禅道360工艺编辑的时候输入输出物料没有显示
|
2026-03-20 13:40:51 +08:00 |
|
shijing
|
493a9289fe
|
fix:输出检验表固定前几列和操作列
|
2026-03-20 11:11:08 +08:00 |
|
TianyangZhang
|
b0e4dc830a
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-03-20 09:21:07 +08:00 |
|
TianyangZhang
|
ab030d2487
|
feat:mpr-物资管理前端（申购单、入库单、物料库存、领用记录）
- 新增 mpr API 接口定义（申购单、入库单、物料库存、领用单 CRUD）
- 新增申购单列表页与表单页，支持明细内联编辑和一次性提交审批
- 新增入库单列表页与表单页，支持仓库下拉选择和入库明细管理
- 新增物料库存列表页，支持状态筛选（闲置/领用中/已领用/已领完）
- 新增领用记录列表页与表单页，支持从库存选择物品和非清单物品两类领用
- 注册物资管理路由菜单（申购单管理、入库单管理、物料库存、领用记录）
Made-with: Cursor
|
2026-03-12 16:57:12 +08:00 |
|
shijing
|
d2befea659
|
fix:玻纤输出检验表格表头文案靠左对齐
|
2026-03-12 09:08:16 +08:00 |
|
shijing
|
122e73fee2
|
fix：玻纤排板统计2添加物料名
|
2026-03-12 09:07:26 +08:00 |
|
shijing
|
0a9b1bdf1f
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-03-12 09:05:58 +08:00 |
|
shijing
|
31df2e12a8
|
fix:光芯返工检测表修正
|
2026-03-12 09:05:54 +08:00 |
|
TianyangZhang
|
35d105baf8
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-03-11 13:31:31 +08:00 |
|
TianyangZhang
|
48be57422a
|
feat: hrm-empcontract 劳动合同
|
2026-03-11 13:31:30 +08:00 |
|
shijing
|
809c14c123
|
fix:光芯日志选择物料组件更换成el-select
|
2026-03-06 16:27:44 +08:00 |
|
shijing
|
2aec38201a
|
fix:禅道312开台人拆头人显示问题
|
2026-03-06 14:35:03 +08:00 |
|
shijing
|
bc15b06fa4
|
fix:禅道298
|
2026-03-06 14:32:34 +08:00 |
|
shijing
|
061af195ec
|
fix:光芯改版时不合批，不传new_batch
|
2026-03-06 10:58:57 +08:00 |
|
shijing
|
ed4feb2f0c
|
fix:交接类别完善
|
2026-03-06 09:09:23 +08:00 |
|
shijing
|
281ff811c8
|
fix:禅道341
|
2026-03-05 14:11:13 +08:00 |
|
shijing
|
fdacb84301
|
fix:光芯已完成退火检验恢复
|
2026-03-05 09:03:32 +08:00 |
|
shijing
|
04ae10aa40
|
fix:质检统计查询问题修复
|
2026-03-04 16:52:35 +08:00 |
|
shijing
|
625df22d50
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-03-04 16:40:08 +08:00 |
|
shijing
|
1e0c88639f
|
fix:光芯本工段检验表和加工前检验表getQct获取时传入type:'in'/'out'
|
2026-03-04 16:40:06 +08:00 |
|
TianyangZhang
|
42bc028585
|
feat:gx-hrm 人员转正等修改
|
2026-03-04 16:36:57 +08:00 |
|
shijing
|
17bc6c8428
|
fix:排扳统计查询条件文案提示
|
2026-03-04 10:50:55 +08:00 |
|
shijing
|
6df332211c
|
fix:禅道350
|
2026-03-04 10:50:17 +08:00 |
|
shijing
|
f22632090b
|
fix:禅道344
|
2026-03-03 13:54:50 +08:00 |
|
shijing
|
5a09b121fb
|
fix:禅道348
|
2026-03-03 13:54:08 +08:00 |
|
shijing
|
747b095995
|
fix:工时统计中热压相关表整合到一个页面
|
2026-03-02 16:50:11 +08:00 |
|
shijing
|
33a45de918
|
fix:原料入库检验时导入报错提示展示返回信息
|
2026-03-02 15:16:12 +08:00 |
|
shijing
|
3e9fc7f2c8
|
fix:禅道349
|
2026-02-27 11:14:51 +08:00 |
|
shijing
|
33c97c1bd9
|
fix:光芯configData中columnWidth调整
|
2026-02-27 10:26:10 +08:00 |
|
shijing
|
fb3a821673
|
fix:禅道343
|
2026-02-27 09:05:22 +08:00 |
|
shijing
|
7cb32833f1
|
fix:禅道347
|
2026-02-27 08:53:42 +08:00 |
|
shijing
|
f3021a2357
|
fix:禅道346
|
2026-02-27 08:52:36 +08:00 |
|
shijing
|
fe96ccde0f
|
fix:禅道343
|
2026-02-10 14:23:29 +08:00 |
|
shijing
|
2f2928fcb0
|
fix:日志物料根据route的material_in筛选
|
2026-02-10 13:51:44 +08:00 |
|
shijing
|
41db9a55f1
|
fix:排板统计和热压统计合并
|
2026-02-10 09:49:01 +08:00 |
|
shijing
|
ba988d0fd1
|
fix:产品库存查询按工序统计
|
2026-02-09 13:14:20 +08:00 |
|
shijing
|
fb196d1d9e
|
fix:模具号统计有横压的将横压数据展示在模具号后面
|
2026-02-06 14:09:14 +08:00 |
|
shijing
|
c679907c31
|
fix:毛坯检测板段统计只展示有检测日期的
|
2026-02-06 14:07:55 +08:00 |
|
shijing
|
95450d39ad
|
feat:禅道331
|
2026-02-05 16:38:13 +08:00 |
|
shijing
|
922492f590
|
fix:板段查询默认显示一条数据
|
2026-02-05 15:23:52 +08:00 |
|
shijing
|
5a4c50e8e7
|
fix:热压检测数据
|
2026-02-05 14:05:38 +08:00 |
|
shijing
|
0e0e25492c
|
fix:检测统计报表板段统计日期倒置
|
2026-02-05 10:59:47 +08:00 |
|
shijing
|
f2ad7ca5e0
|
fix:热压生产数据板号展示
|
2026-02-05 10:24:36 +08:00 |
|
shijing
|
f8ef6300b3
|
fix:this指向问题修正
|
2026-02-05 10:23:38 +08:00 |
|
shijing
|
0b60a04b76
|
fix:表头颜色调整
|
2026-02-05 10:23:03 +08:00 |
|
shijing
|
f144bfd627
|
feat:凹面检测统计
|
2026-02-05 10:18:22 +08:00 |
|
shijing
|
0617dce254
|
feat:板段查询页面添加最新日志和最近交接
|
2026-02-05 10:13:45 +08:00 |
|
shijing
|
0faf237e43
|
fix:扭转日期变动时添加是否为空的判断
|
2026-02-04 10:38:06 +08:00 |
|
shijing
|
d21cc6bdf2
|
fix:工时统计->热压生产数据：列宽度调整
|
2026-02-04 09:54:03 +08:00 |
|
shijing
|
29adfe2d7d
|
fix:工时统计->热压生产数据：列宽度调整
|
2026-02-04 09:46:58 +08:00 |
|
shijing
|
9c28cfff84
|
fix:工时统计->热压生产数据：对应字段调正
|
2026-02-04 09:41:17 +08:00 |
|
TianyangZhang
|
ca696a0685
|
fix: hrm-人员调岗 修改人员申请
|
2026-01-29 10:45:17 +08:00 |
|
TianyangZhang
|
74daa6094b
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-01-28 10:30:12 +08:00 |
|
TianyangZhang
|
b0cffc1777
|
feat: hrm-人员调岗申请 表单
|
2026-01-28 10:30:09 +08:00 |
|
shijing
|
e483f2c06c
|
fix:
|
2026-01-26 15:02:20 +08:00 |
|
shijing
|
c03e46b3a1
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-01-26 15:01:13 +08:00 |
|
shijing
|
0b5542c95c
|
feat: 禅道330
|
2026-01-26 15:01:10 +08:00 |
|
TianyangZhang
|
993e46e21e
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-01-26 14:13:26 +08:00 |
|
TianyangZhang
|
46d6820575
|
feat: 新增hrm 人员调岗
|
2026-01-26 14:13:24 +08:00 |
|
shijing
|
843113b7eb
|
feat: 禅道312
|
2026-01-23 16:12:01 +08:00 |
|
shijing
|
82f4b5aaa4
|
fix: 禅道329
|
2026-01-23 16:11:01 +08:00 |
|
shijing
|
9147e6cd86
|
feat：上盘平磨合批时批次号默认：HP+模板+年月日
|
2026-01-23 10:55:00 +08:00 |
|
shijing
|
2225d79500
|
fix: 排一次棒日志详情中oinfo_json中imageUrl不显示
|
2026-01-23 10:52:33 +08:00 |
|
shijing
|
fe05b22972
|
feat： 禅道320
|
2026-01-22 16:27:50 +08:00 |
|
shijing
|
c19540d9f5
|
fix: 查询修正
|
2026-01-22 16:25:54 +08:00 |
|
shijing
|
931c45da11
|
feat: 禅道296
|
2026-01-22 15:53:12 +08:00 |
|
shijing
|
ca6b14c2fd
|
feat: 禅道279
|
2026-01-21 16:50:34 +08:00 |
|
shijing
|
2f192f4107
|
feat: 禅道321
|
2026-01-21 15:51:49 +08:00 |
|
shijing
|
0f0620e8db
|
feat: 禅道323
|
2026-01-21 15:27:48 +08:00 |
|
shijing
|
f93f7d3095
|
fix: 扭转输出中时间列调宽
|
2026-01-21 14:48:17 +08:00 |
|
shijing
|
c9b6e7bb31
|
feat: 禅道324
|
2026-01-21 14:32:19 +08:00 |
|
shijing
|
dfedb67cb8
|
feat: 禅道310
|
2026-01-21 11:22:27 +08:00 |
|
shijing
|
adbd936382
|
fix: 工艺路线排一次棒上传图片问题
|
2026-01-20 11:20:26 +08:00 |
|
shijing
|
4d23c5467a
|
fix: 数据集form名称、编号独占一行
|
2026-01-20 10:32:48 +08:00 |
|
shijing
|
ffdb8e10b1
|
feat: 禅道314
|
2026-01-19 14:28:15 +08:00 |
|
shijing
|
f98d719c24
|
feat: 禅道301热压生产数据表查询
|
2026-01-19 10:07:52 +08:00 |
|
shijing
|
1017bf7568
|
fix:查询条件错误修改
|
2026-01-19 09:01:36 +08:00 |
|
shijing
|
5957261989
|
feat: 禅道260
|
2026-01-16 14:33:00 +08:00 |
|
shijing
|
cc8b6f3bd6
|
fix:光芯采购入库检验人员展示IQC
|
2026-01-16 14:31:30 +08:00 |
|
shijing
|
dcccc2c636
|
fix:禅道317、318
|
2026-01-16 11:29:24 +08:00 |
|
shijing
|
7ce45a6263
|
fix:禅道315
|
2026-01-16 10:02:15 +08:00 |
|
shijing
|
085cf44a66
|
fix:禅道257
|
2026-01-15 13:53:50 +08:00 |
|
shijing
|
2dfd9efdae
|
fix:禅道262
|
2026-01-15 13:53:26 +08:00 |
|
shijing
|
e3890bd687
|
fix:光芯六车间日志表单去掉多余代码（禅道230中的一部分）
|
2026-01-15 10:06:30 +08:00 |
|
shijing
|
0977713d66
|
fix:日志输出检验表问题
|
2026-01-15 08:49:08 +08:00 |
|
shijing
|
af6403d9f0
|
fix:光芯入厂检验时不合格添加其他=不合格-四个不合格项的和
|
2026-01-14 16:34:48 +08:00 |
|
shijing
|
35b7186f5c
|
feat:工时统计新增页面（禅道301初步页面，待完善）
|
2026-01-14 16:04:34 +08:00 |
|
shijing
|
1c927d1ba8
|
fix:禅道307
|
2026-01-14 15:43:46 +08:00 |
|
shijing
|
2072004c00
|
fix:禅道308
|
2026-01-14 15:01:03 +08:00 |
|
shijing
|
5e8469dd1c
|
fix: 检测统计/批次统计添加检测日期和日期查询
|
2026-01-13 16:58:34 +08:00 |
|
shijing
|
f798a0fa02
|
fix: 检测统计表板段统计添加检测日期和时间查询
|
2026-01-13 15:09:32 +08:00 |
|
shijing
|
fb31274bdb
|
fix:更新后0与false严格区别
|
2026-01-13 14:09:17 +08:00 |
|
shijing
|
93e197e09b
|
fix:排版板段统计
|
2026-01-13 13:41:27 +08:00 |
|
shijing
|
702ef1e296
|
fix:玻纤交接记录撤消按钮文案改为撤回
|
2026-01-13 13:35:25 +08:00 |
|
shijing
|
392f979ff5
|
feat：禅道282
|
2026-01-13 10:26:16 +08:00 |
|
shijing
|
5fe457cd5f
|
fix:row-key问题
|
2026-01-13 09:09:31 +08:00 |
|
shijing
|
0bebb55e19
|
feat:半成品库采购入库编号改动
|
2026-01-13 09:04:08 +08:00 |
|
shijing
|
09a9e85bb3
|
fix:工艺步骤添加图片调整
|
2026-01-13 09:02:26 +08:00 |
|
shijing
|
7394afbdf7
|
fix：route_form问题修正
|
2026-01-12 14:26:57 +08:00 |
|
shijing
|
057fa9af75
|
fix:交接记录中传参mgroupx
|
2026-01-12 11:12:32 +08:00 |
|
shijing
|
d686d54eb8
|
feat：禅道280日志中保存工艺图片
|
2026-01-12 11:07:23 +08:00 |
|
shijing
|
f7fc184630
|
fix:排一次棒编辑时判断是否有工艺图片
|
2026-01-12 10:56:16 +08:00 |
|
shijing
|
3c96c48d2e
|
fix:图片编辑时丢失上次保存问题修正
|
2026-01-12 08:50:56 +08:00 |
|
shijing
|
d3e788ffe0
|
fix:placehoder文案修正
|
2026-01-12 08:49:59 +08:00 |
|
shijing
|
d83944f00d
|
fix:禅道294
|
2026-01-09 15:55:55 +08:00 |
|
shijing
|
0ebd53c341
|
feat:禅道281
|
2026-01-09 15:27:46 +08:00 |
|
shijing
|
c847083081
|
fix:去除多余的consolelog
|
2026-01-09 14:13:42 +08:00 |
|
shijing
|
299d13e072
|
feat:禅道255
|
2026-01-09 14:13:01 +08:00 |
|
shijing
|
c84ad40c00
|
fix:排版统计展示板段列表
|
2026-01-09 10:18:20 +08:00 |
|
shijing
|
e744274f08
|
fix:检测统计批次统计产品名称查询无响应修复
|
2026-01-08 11:03:28 +08:00 |
|
shijing
|
0a76b08134
|
fix:排一次棒数据调整
|
2026-01-08 10:29:46 +08:00 |
|
shijing
|
9a10bc78e8
|
feat:禅道282
|
2026-01-08 10:29:11 +08:00 |
|
TianyangZhang
|
f475974d49
|
feat: gx-人员请假申请
|
2026-01-07 16:01:51 +08:00 |
|
shijing
|
cbc940b8df
|
fix:工艺步骤排一次棒时添加工艺图纸，并在‘排一次棒‘日志中展示第一张图片
|
2026-01-07 15:46:01 +08:00 |
|
shijing
|
99f320d80b
|
fix:玻纤子工序中不需要选择班次
|
2026-01-07 13:44:21 +08:00 |
|
shijing
|
a75e43bc69
|
fix:
|
2026-01-07 13:29:44 +08:00 |
|
shijing
|
00b3af30c1
|
fix:光芯合批时新批次号改动
|
2026-01-07 11:16:35 +08:00 |
|
shijing
|
5e24ad9c66
|
fix:光芯入库检验不合格数量放开可编辑
|
2026-01-07 11:12:58 +08:00 |
|
shijing
|
f1bd6ac527
|
fix:禅道286
|
2026-01-07 09:25:35 +08:00 |
|
shijing
|
2a5c8f5de9
|
fix:禅道285
|
2026-01-07 08:51:30 +08:00 |
|
shijing
|
2f6f881ead
|
feat:禅道235
|
2026-01-06 16:55:05 +08:00 |
|
shijing
|
f178953d86
|
fix:禅道180
|
2026-01-06 16:35:01 +08:00 |