Commit Graph

1202 Commits

Author SHA1 Message Date
zzyuan ee0aba24e6 往来单位在领退管理中改为对应字段 2024-04-25 10:32:47 +08:00
jackal 7737e18910 fix:新增供应商必填校验添加 2024-04-25 10:26:47 +08:00
zzyuan 82f8e5bb6c 宁夏退料在用量修改 2024-04-25 10:04:44 +08:00
zzyuan 2313d7baca 单位工程下拉查询bug'修改 2024-04-25 09:33:17 +08:00
liang.chao 3ac38557af 成套机具代码提交 2024-04-24 17:59:17 +08:00
zzyuan 4af501532f Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-24 14:10:21 +08:00
zzyuan 580e3a851a 退料接收1 2024-04-24 14:10:08 +08:00
liang.chao 37d0365868 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	sgzb-ui/vue.config.js
2024-04-24 14:09:26 +08:00
liang.chao 6ffe2fb057 Merge remote-tracking branch 'origin/dev-cq-bug' into dev
# Conflicts:
#	sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
#	sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
#	sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
2024-04-24 14:08:35 +08:00
liang.chao 82e8a6db4a 退料审核代码提交 2024-04-24 14:05:18 +08:00
jackal a34c11e3bf feat:抱杆明细弹窗组件开发 2024-04-24 11:27:59 +08:00
liang.chao 5490fd2e8f 成套抱杆机具验收 2024-04-23 17:36:00 +08:00
liang.chao 74d7fc2e87 Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug 2024-04-23 16:16:41 +08:00
jackal ae0b637828 fix:新购工机具入库审核状态修改 2024-04-23 16:16:08 +08:00
liang.chao 182442491a Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug 2024-04-23 14:54:40 +08:00
zzyuan 2ef3d4dbe4 前端退料接收编码退料 2024-04-23 14:53:54 +08:00
liang.chao af4498afd0 Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug 2024-04-23 14:37:18 +08:00
zzyuan d2d9f5b6c4 退料接收按钮判断 2024-04-23 14:35:31 +08:00
zzyuan 6e6420c65c 前端修改问题修改 2024-04-23 13:44:50 +08:00
liang.chao 79ee11ff05 tomcat版本替换 2024-04-23 13:22:19 +08:00
liang.chao 05d4e08f4a tomcat版本替换 2024-04-23 13:13:48 +08:00
zzyuan 2a164bfcca Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-23 10:41:52 +08:00
zzyuan a21e52816b 领料申请2 2024-04-23 10:41:45 +08:00
BianLzhaoMin 4408191900 无效json文件删除 2024-04-23 10:29:56 +08:00
liang.chao 3fedcde616 sql提交 2024-04-23 09:35:44 +08:00
liang.chao 62f2330ffb 成套机具代码提交 2024-04-23 09:19:37 +08:00
csyue f94470a742 测试app问题项修改 2024-04-22 18:58:46 +08:00
zzyuan 10994deeb4 退料接收3 2024-04-22 16:07:48 +08:00
zzyuan 06655c5eff 退料接收修改2 2024-04-22 15:47:54 +08:00
zzyuan 9d072eea63 退料接收判断 2024-04-22 14:28:40 +08:00
binbin_pan 3e1db1b125 限制输入字数 2024-04-22 12:04:29 +08:00
mashuai f175c44ba1 整套抱杆 2024-04-22 11:28:36 +08:00
zzyuan 6e1c80d8b0 前端修改zzy 2024-04-22 11:24:04 +08:00
liang.chao b4c3540fb5 退料审核代码提交 2024-04-22 11:19:06 +08:00
mashuai a10c3dd8a7 bug 2024-04-22 10:20:29 +08:00
binbin_pan 546eb704fb 退料接收管理-退料审核-批量审核 2024-04-22 10:07:03 +08:00
binbin_pan 62c669aa9f fix: bug修复 2024-04-20 17:55:12 +08:00
liang.chao b1fee78651 bug修改 2024-04-20 17:29:05 +08:00
zzyuan 8c7453aa23 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-20 17:03:39 +08:00
zzyuan 562bb16f2f 工地直转 2024-04-20 17:03:35 +08:00
mashuai e9deecdee5 Merge remote-tracking branch 'origin/dev' into dev 2024-04-20 16:58:45 +08:00
mashuai f1a3e8839b bug 2024-04-20 16:58:38 +08:00
hayu c180ad60e7 测试问题修改 2024-04-20 16:58:15 +08:00
binbin_pan 45d551f864 fix: 岗位管理 2024-04-20 16:42:41 +08:00
mashuai 07c77c5ad3 bug 2024-04-20 16:01:30 +08:00
binbin_pan f2fe043738 fix: 往来单位管理-下拉框校验修复 2024-04-20 15:57:47 +08:00
binbin_pan 06ad1af47d fix: 用户管理-增加导入失败的原因 2024-04-20 15:34:19 +08:00
binbin_pan 34aafe3095 fix: 退料接收管理-退料审核-工机具类型下拉框 2024-04-20 15:20:39 +08:00
hayu 57291ad37e Merge remote-tracking branch 'origin/dev' into dev 2024-04-20 14:55:54 +08:00
hayu a7d8ad5ef8 修饰入库不通过问题修改 2024-04-20 14:55:38 +08:00