 zzyuan
|
2c0b35d7bc
|
treeselect查询英文结果改为中文
|
2024-04-25 11:10:36 +08:00 |
 binbin_pan
|
e5076c061b
|
fix: 1285 删除一条数据，再新增数据时，用户编号不会连续
|
2024-04-25 10:59:17 +08:00 |
|
zzyuan
|
fa0a4148fc
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-25 10:58:32 +08:00 |
|
zzyuan
|
0655ee501b
|
system模块前端问题修改
|
2024-04-25 10:58:28 +08:00 |
|
binbin_pan
|
f8a6621f06
|
fix: 1276 查询框不能查询
|
2024-04-25 10:56:44 +08:00 |
 jackal
|
20a6b3318b
|
fix:用户管理页面导入失败提示修改
|
2024-04-25 10:46:47 +08:00 |
|
jackal
|
d8990a97e9
|
fix:treeselect组件修改
|
2024-04-25 10:36:07 +08:00 |
|
zzyuan
|
4cab68bba6
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-25 10:32:50 +08:00 |
|
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 |
|
binbin_pan
|
6866107192
|
config
|
2024-04-25 09:27:12 +08:00 |
|
binbin_pan
|
f7da293b87
|
领料分析-弹框
|
2024-04-25 09:26:22 +08:00 |
BianLzhaoMin
|
7a81252dc1
|
宁夏报废模块优化
|
2024-04-25 09:24:31 +08:00 |
liang.chao
|
3ac38557af
|
成套机具代码提交
|
2024-04-24 17:59:17 +08:00 |
|
BianLzhaoMin
|
237699319a
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-04-24 17:57:50 +08:00 |
|
BianLzhaoMin
|
aaedeaa557
|
优化
|
2024-04-24 17:57:47 +08:00 |
|
binbin_pan
|
1d5116a05e
|
新购验收入库分析-弹框
|
2024-04-24 17:24:56 +08:00 |
|
binbin_pan
|
392b6d769b
|
总保有量-弹框
|
2024-04-24 15:58:10 +08:00 |
|
binbin_pan
|
7247b3679d
|
退料分析-折线图弹框
|
2024-04-24 15:00:07 +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 |
|
binbin_pan
|
0861d579b5
|
退料数据-弹框
|
2024-04-24 11:21:16 +08:00 |
|
binbin_pan
|
bc22b4397e
|
领料数据-弹框
|
2024-04-24 10:14:36 +08:00 |
|
BianLzhaoMin
|
82ce5836ee
|
优化
|
2024-04-24 09:22:58 +08:00 |
|
BianLzhaoMin
|
afc93e38bd
|
优化
|
2024-04-24 08:46:24 +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 |
|
BianLzhaoMin
|
60562a1fbb
|
优化
|
2024-04-23 10:21:21 +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 |
|
BianLzhaoMin
|
8b8d2b9f54
|
优化
|
2024-04-22 18:15:42 +08:00 |
|
zzyuan
|
10994deeb4
|
退料接收3
|
2024-04-22 16:07:48 +08:00 |