BianLzhaoMin
|
0cce767acd
|
优化
|
2024-04-29 17:06:02 +08:00 |
 binbin_pan
|
c64e32b423
|
fix: 1421 输入框出现unknown
|
2024-04-29 15:58:21 +08:00 |
|
BianLzhaoMin
|
38ebf1ded7
|
库存日志页面接口调试 字段回显确认
|
2024-04-29 13:27:26 +08:00 |
|
binbin_pan
|
860b95d5dd
|
1399 基础管理新增页面存在错乱字符
|
2024-04-29 13:21:34 +08:00 |
 zzyuan
|
f775acb88f
|
前端useNum修改
|
2024-04-29 10:38:57 +08:00 |
liang.chao
|
b6ac7ef9f2
|
代码提交
|
2024-04-29 10:35:34 +08:00 |
 15856
|
bad5c11bdc
|
Merge remote-tracking branch 'origin/dev' into dev-cq-bug
|
2024-04-28 16:41:10 +08:00 |
|
BianLzhaoMin
|
f697659bd7
|
优化测试问题
|
2024-04-28 10:28:22 +08:00 |
|
zzyuan
|
5751307d15
|
退料接收优化zzy
|
2024-04-26 18:11:19 +08:00 |
|
BianLzhaoMin
|
1131c36f7e
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-26 17:51:54 +08:00 |
|
BianLzhaoMin
|
51abc81b1e
|
优化测试问题
|
2024-04-26 17:51:49 +08:00 |
|
binbin_pan
|
c1a578302e
|
fix: 1360 若选择物品种类与设备类型，重置按钮无法重置设备类型内容
|
2024-04-26 17:48:25 +08:00 |
|
zzyuan
|
e95c7585c0
|
前端问题修改（退料申请机具类型选择筛选）
|
2024-04-26 17:22:16 +08:00 |
|
binbin_pan
|
5ea7738ef6
|
fix: 1338 状态显示完成，流程步骤显示确认为灰色
|
2024-04-26 09:45:00 +08:00 |
|
BianLzhaoMin
|
3edb63e8b8
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-25 18:23:44 +08:00 |
|
BianLzhaoMin
|
760a1085b1
|
优化
|
2024-04-25 18:23:40 +08:00 |
|
zzyuan
|
5f80f7e09e
|
前端环境
|
2024-04-25 18:00:54 +08:00 |
|
BianLzhaoMin
|
102c6b52a4
|
增加南网打包配置
|
2024-04-25 17:29:01 +08:00 |
|
zzyuan
|
da35634589
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-25 17:04:12 +08:00 |
|
zzyuan
|
dd0845a4d7
|
领料保存报错提示重复
|
2024-04-25 17:03:40 +08:00 |
|
15856
|
090fc6c17d
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-25 16:42:58 +08:00 |
|
BianLzhaoMin
|
b005744181
|
冲突合并
|
2024-04-25 16:29:21 +08:00 |
|
BianLzhaoMin
|
3797f88699
|
测试问题修改
|
2024-04-25 16:28:47 +08:00 |
|
binbin_pan
|
36c171adc0
|
fix: 手机号校验
|
2024-04-25 16:26:40 +08:00 |
|
zzyuan
|
4357ae3307
|
手机号输入只能为数字11位
|
2024-04-25 16:21:40 +08:00 |
|
BianLzhaoMin
|
14bfda5e94
|
冲突合并
|
2024-04-25 16:03:49 +08:00 |
|
BianLzhaoMin
|
b162811f47
|
测试问题修改
|
2024-04-25 16:00:19 +08:00 |
|
binbin_pan
|
6fdb0b7fb1
|
fix: 1323 退料审核不通过原因无法输入
|
2024-04-25 15:41:28 +08:00 |
|
binbin_pan
|
9aab9d752f
|
fix: 1319 退料接收详情页面连点两次，页面卡死
|
2024-04-25 14:58:34 +08:00 |
|
zzyuan
|
41601ff933
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-25 14:52:07 +08:00 |
|
zzyuan
|
83d7b2801e
|
序号改为顺序1
|
2024-04-25 14:51:15 +08:00 |
|
binbin_pan
|
f99aa9aa31
|
fix: 1315 若进入子页面，使用列表进入主页，再次点击其他数据的按钮，打开仍然时第一次的子页面
|
2024-04-25 14:36:57 +08:00 |
|
binbin_pan
|
c11d023886
|
fix: 1313 提示为往来单位，字段为领料单位
|
2024-04-25 14:14:30 +08:00 |
|
binbin_pan
|
6deca039fa
|
fix: 1309 已绑定的标签可以再次进行绑定操作（APP端二维码扫描出多个设备）
|
2024-04-25 14:05:28 +08:00 |
 jackal
|
7ddb70360e
|
fix:长期领料已完成确认，但是页面图标未变成“√”修改
|
2024-04-25 13:40:11 +08:00 |
|
binbin_pan
|
646456b1c6
|
fix: 1310 填写协议的租赁期限的数字过大时，页面会报错
|
2024-04-25 13:19:04 +08:00 |
|
zzyuan
|
9df0dae379
|
删除提示框文案修改现在不携带编号类数据
|
2024-04-25 11:28:22 +08:00 |
|
zzyuan
|
10e57c23ae
|
Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug
|
2024-04-25 11:10:39 +08:00 |
|
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 |
|
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 |
|
jackal
|
a34c11e3bf
|
feat:抱杆明细弹窗组件开发
|
2024-04-24 11:27:59 +08:00 |
|
jackal
|
ae0b637828
|
fix：新购工机具入库审核状态修改
|
2024-04-23 16:16:08 +08:00 |
|
zzyuan
|
2ef3d4dbe4
|
前端退料接收编码退料
|
2024-04-23 14:53:54 +08:00 |
|
zzyuan
|
d2d9f5b6c4
|
退料接收按钮判断
|
2024-04-23 14:35:31 +08:00 |
|
zzyuan
|
6e6420c65c
|
前端修改问题修改
|
2024-04-23 13:44:50 +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
|
62f2330ffb
|
成套机具代码提交
|
2024-04-23 09:19:37 +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 |
|
zzyuan
|
6e1c80d8b0
|
前端修改zzy
|
2024-04-22 11:24:04 +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 |
|
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 |
|
binbin_pan
|
45d551f864
|
fix: 岗位管理
|
2024-04-20 16:42:41 +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 |
|
BianLzhaoMin
|
b9d2ebd10a
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 14:54:34 +08:00 |
|
BianLzhaoMin
|
97e554d6ac
|
测试问题修改
|
2024-04-20 14:54:26 +08:00 |
|
jackal
|
f080f72c32
|
fix:去除不通过原因字段
|
2024-04-20 14:53:47 +08:00 |
|
binbin_pan
|
09f732bae0
|
fix: 退料接收管理-退料状态下拉项
|
2024-04-20 14:46:12 +08:00 |
|
zzyuan
|
4520e6d1bf
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 14:31:49 +08:00 |
|
zzyuan
|
e95c1acf6b
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-20 14:31:46 +08:00 |
|
jackal
|
1a30d552ad
|
fix：协议管理导出修改
|
2024-04-20 14:30:43 +08:00 |
|
zzyuan
|
8dc56bcde9
|
前端领退料模块问题修改
|
2024-04-20 14:29:59 +08:00 |
|
jackal
|
0da44483df
|
fix:退料申请bug修改
|
2024-04-20 14:10:33 +08:00 |
|
binbin_pan
|
0d457afa9d
|
fix: 仓库管理-仓库货架管理-编辑下拉框报错
|
2024-04-20 14:01:11 +08:00 |
|
jackal
|
5a88bafd89
|
fix:配件新购入库bug修改
|
2024-04-20 13:41:35 +08:00 |
|
binbin_pan
|
66f8df4fba
|
fix: 标签绑定管理-标签绑定管理-设置禁用项
|
2024-04-20 13:40:04 +08:00 |
|
jackal
|
3efa283b3c
|
fix:修改pickerOptions方法，日期可选今天及以后
|
2024-04-20 13:10:30 +08:00 |
|
jackal
|
b8ff950a16
|
fix:新购工机具入库bug修改
|
2024-04-20 13:00:37 +08:00 |
|
jackal
|
c39b231e09
|
fix:新购机具管理bug修改
|
2024-04-20 12:23:39 +08:00 |
|
binbin_pan
|
4d774e44c9
|
fix: 退料接收管理-退料申请-重置时间
|
2024-04-20 11:12:37 +08:00 |
|
jackal
|
9ae1c69f71
|
fix:协议管理bug修改
|
2024-04-20 10:48:36 +08:00 |
|
zzyuan
|
7b312fbffc
|
前端问题修改
|
2024-04-20 10:39:36 +08:00 |
|
zzyuan
|
ae327449a3
|
领退料问题修改
|
2024-04-20 10:23:04 +08:00 |
|
jackal
|
e4239f4955
|
fix:退料接受详情修改
|
2024-04-19 17:31:55 +08:00 |
|
binbin_pan
|
c2dc2a5d40
|
抱杆配套管理
|
2024-04-19 11:08:25 +08:00 |
|
binbin_pan
|
bcf6710e01
|
领料申请-重置查询条件修复
|
2024-04-19 10:45:11 +08:00 |
|
binbin_pan
|
03ae671f7b
|
抱杆配套管理
|
2024-04-18 17:43:56 +08:00 |
|
jackal
|
4fdcf91a45
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-04-18 16:32:16 +08:00 |