|
|
4e05734865
|
fix: split cost fields into multiple rows in product.vue
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-03-02 12:03:06 +08:00 |
|
|
|
b08196c479
|
refactor: replace manual_cost with unit_total_cost and total_price
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-03-02 11:39:49 +08:00 |
|
|
|
68ea351c99
|
refactor: replace manual_cost with unit_total_cost and total_price
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-03-02 11:35:55 +08:00 |
|
|
|
f001be9eef
|
feat: replace manual cost with unit total cost in inbound forms
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-03-02 10:28:43 +08:00 |
|
|
|
545cd86632
|
refactor: simplify cost calculation to 3 fields, drop manual_cost
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-03-02 10:24:51 +08:00 |
|
|
|
646804bb98
|
修改半成品的分为单价和总价格
|
2026-03-02 09:22:41 +08:00 |
|
|
|
3daf7e4500
|
成品下拉框修改完成
|
2026-02-28 17:37:34 +08:00 |
|
|
|
e61c179d77
|
修改半成品和成品新增时候搜索下拉框显示问题,新增负责人和生产人历史记录功能
|
2026-02-28 17:27:57 +08:00 |
|
|
|
f7cfb5a346
|
修改半成品和成品新增时候搜索下拉框显示问题,新增负责人和生产人历史记录功能
|
2026-02-28 17:08:35 +08:00 |
|
|
|
00ebffb9fd
|
修改盘库时候数量增加减少的按钮大小
|
2026-02-28 12:05:21 +08:00 |
|
|
|
4b29912f6f
|
feat: add borrowed quantity column and update stocktake export formulas
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-28 11:55:19 +08:00 |
|
|
|
b85f28fc72
|
修改采购件页面金额显示,修改权限管理页面非字段级内容可见与可编辑联动
|
2026-02-28 09:23:07 +08:00 |
|
|
|
8f6d0cd40b
|
修改采购件页面金额显示,修改权限管理页面非字段级内容可见与可编辑联动
|
2026-02-28 09:10:51 +08:00 |
|
|
|
dda54e829b
|
feat: add category and type filters to product search
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 17:18:25 +08:00 |
|
|
|
ad8bb5a75d
|
feat: adapt semi and product inbound views for tablet and hide barcode input
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 16:53:28 +08:00 |
|
|
|
fbff519ac9
|
fix: remove duplicate updatePrices function
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 16:06:18 +08:00 |
|
|
|
657c916703
|
feat: add post-tax unit price, company filter, and frontend price linkage
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 15:58:55 +08:00 |
|
|
|
3c1c822f88
|
feat: add pre/post-tax price linkage, hide barcode, and tablet adapt
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 15:44:10 +08:00 |
|
|
|
afcf90a859
|
feat: enforce field-level permissions for buy and service modules
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 15:03:44 +08:00 |
|
|
|
5bc3dab31c
|
feat: add field-level permission control for inbound modules
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 14:52:12 +08:00 |
|
|
|
f79fb53b17
|
inventory-web/src/views/stock/stocktake/index.vue
```vue
<<<<<<< SEARCH
<el-button type="primary" size="large" class="action-btn-full" @click="startNewSession" :loading="btnLoading">
开始新盘点
</el-button>
=======
<el-button v-if="userStore.hasPermission('inventory_stocktake:operation')" type="primary" size="large" class="action-btn-full" @click="startNewSession" :loading="btnLoading">
开始新盘点
</el-button>
>>>>>>> REPLACE
```
inventory-web/src/views/stock/stocktake/index.vue
```vue
<<<<<<< SEARCH
<el-button
v-if="serverDraftCount > 0"
type="warning"
plain
size="large"
class="action-btn-full"
@click="resumeSession"
:loading="btnLoading"
>
继续上次盘点 <span class="sub-text">({{ serverDraftCount }}项)</span>
</el-button>
=======
<el-button
v-if="serverDraftCount > 0 && userStore.hasPermission('inventory_stocktake:operation')"
type="warning"
plain
size="large"
class="action-btn-full"
@click="resumeSession"
:loading="btnLoading"
>
继续上次盘点 <span class="sub-text">({{ serverDraftCount }}项)</span>
</el-button>
>>>>>>> REPLACE
```
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 13:40:55 +08:00 |
|
|
|
38f0bbe41d
|
feat: add RBAC for inventory stocktake module
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 13:36:10 +08:00 |
|
|
|
1ad477eda8
|
feat: add permission management to inbound service module
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 13:12:45 +08:00 |
|
|
|
1d2e8feced
|
feat: apply RBAC permission control to product module
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 13:03:27 +08:00 |
|
|
|
6e914f1e96
|
feat: add RBAC permission control for semi inbound module
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 12:08:57 +08:00 |
|
|
|
b5b1efdc4e
|
fix: remove duplicate allColumns declaration
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 11:56:15 +08:00 |
|
|
|
56bb6a1c84
|
chore: add user store import to buy inbound view
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 11:51:28 +08:00 |
|
|
|
379bc5786f
|
feat: implement RBAC for inbound buy module with field-level permissions
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-27 11:48:33 +08:00 |
|
|
|
31ddb1aafd
|
将半成品成品同样进行新增所属公司以及内容修改
|
2026-02-24 16:16:17 +08:00 |
|
|
|
42171ed612
|
对于采购件的税率添加以及所属公司添加
|
2026-02-24 15:43:14 +08:00 |
|
|
|
d1ab5f1100
|
新增打印多张标签纸的功能
|
2026-02-24 14:33:43 +08:00 |
|
|
|
853374de5d
|
将半成品和成品跟bom表进行相关联
|
2026-02-12 17:16:24 +08:00 |
|
|
|
e900326571
|
修改semi,product,service的搜索逻辑
|
2026-02-11 15:12:20 +08:00 |
|
|
|
83f040728f
|
fix: add missing import and correct SQL query for service list
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-11 14:51:26 +08:00 |
|
|
|
d3d35e03cd
|
feat: increase default page size and options for inbound semi list
|
2026-02-11 14:51:14 +08:00 |
|
|
|
9f0134b2e4
|
feat: add material search filters to semi, product, service modules
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-11 14:42:16 +08:00 |
|
|
|
5f3ceef3fd
|
修改采购件对于两个搜索框的bug修复
|
2026-02-11 13:39:02 +08:00 |
|
|
|
5532c87684
|
基础信息展示以及搜索逻辑进行修复
|
2026-02-11 13:12:05 +08:00 |
|
|
|
ec16ef8d20
|
对于采购件的内容进行修改,使其填写更加便利加上库位自动加载上一次的逻辑
|
2026-02-11 08:38:12 +08:00 |
|
|
|
d594ed7ef1
|
采购人根据历史上传记录来
|
2026-02-10 17:41:53 +08:00 |
|
|
|
8ee2a9a45b
|
采购人走用户的表
|
2026-02-10 17:20:06 +08:00 |
|
|
|
b5b0677b01
|
feat: align service inbound material search with buy/semi
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-10 15:16:03 +08:00 |
|
|
|
8d00e6783c
|
feat: add provider autocomplete to service form
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-10 15:10:55 +08:00 |
|
|
|
695c78090a
|
refactor: remove localStorage usage for column visibility and history
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-10 15:03:52 +08:00 |
|
|
|
af1a95017b
|
选择基础信息内容修改
|
2026-02-10 15:00:57 +08:00 |
|
|
|
8cae6ee7f6
|
refactor: remove local history caching and add API suggestions
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-10 14:38:15 +08:00 |
|
|
|
2d0593078b
|
修改拍照的大小以及增加放大缩小编辑等功能
|
2026-02-10 09:59:32 +08:00 |
|
|
|
a0ed92319c
|
修改拍照上传逻辑,避免平板不可以调用照相机
|
2026-02-10 09:27:52 +08:00 |
|
|
|
d4b23790a1
|
fix: only close camera dialog on successful upload
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-09 17:15:50 +08:00 |
|
|
|
aee0fc4380
|
inventory-web/src/views/stock/inbound/buy.vue
```python
<<<<<<< SEARCH
const cameraInputRef = ref<HTMLInputElement | null>(null)
const currentCameraField = ref<'arrival_photo' | 'inspection_report'>('arrival_photo')
=======
const cameraDialogVisible = ref(false)
const cameraRef = ref<InstanceType<typeof WebRtcCamera> | null>(null)
const currentCameraField = ref<'arrival_photo' | 'inspection_report'>('arrival_photo')
>>>>>>> REPLACE
```
inventory-web/src/views/stock/inbound/buy.vue
```python
<<<<<<< SEARCH
const triggerCamera = (field: 'arrival_photo' | 'inspection_report') => { currentCameraField.value = field; if (cameraInputRef.value) cameraInputRef.value.click() }
=======
const triggerCamera = (field: 'arrival_photo' | 'inspection_report') => {
currentCameraField.value = field;
cameraDialogVisible.value = true;
}
>>>>>>> REPLACE
```
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
|
2026-02-09 17:02:02 +08:00 |
|