diff --git a/src/api/biz/produceTagApi.js b/src/api/biz/produceTagApi.js
new file mode 100644
index 0000000..a16b4d0
--- /dev/null
+++ b/src/api/biz/produceTagApi.js
@@ -0,0 +1,32 @@
+import { baseRequest } from '@/utils/request'
+
+const request = (url, ...arg) => baseRequest(`/produce/tag/` + url, ...arg)
+
+/**
+ * 生产标签Api接口管理器
+ *
+ * @author Luck
+ * @date 2024/08/07 22:07
+ **/
+export default {
+ // 获取生产标签分页
+ produceTagPage(data) {
+ return request('page', data, 'get')
+ },
+ // 获取生产标签 列表
+ produceTagList(data) {
+ return request('list', data, 'get')
+ },
+ // 提交生产标签表单 edit为true时为编辑,默认为新增
+ produceTagSubmitForm(data, edit = false) {
+ return request(edit ? 'edit' : 'add', data)
+ },
+ // 删除生产标签
+ produceTagDelete(data) {
+ return request('delete', data)
+ },
+ // 获取生产标签详情
+ produceTagDetail(data) {
+ return request('detail', data, 'get')
+ }
+}
diff --git a/src/views/productionBusiness/basicData/materiel/detail/index.vue b/src/views/productionBusiness/basicData/materiel/detail/index.vue
index 400275d..26bb287 100644
--- a/src/views/productionBusiness/basicData/materiel/detail/index.vue
+++ b/src/views/productionBusiness/basicData/materiel/detail/index.vue
@@ -86,8 +86,8 @@
-
-
+
+
@@ -138,7 +138,7 @@
-
+
包装比例转换
@@ -196,7 +196,6 @@
unitOptions = unitList
dataSource.value = packageData
- console.log(dataSource.value, 'dataSource.value')
}
})
@@ -234,7 +233,7 @@
materialCategoryList &&
baseFormItems.forEach((item) => {
if (item.name === 'categoryId') {
- item.attrs.options = materialCategoryList
+ item.attrs.treeData = materialCategoryList
}
})
@@ -275,13 +274,20 @@
})
unitOptions = res
+ formData.packageProportion = null
const resFilter = res.filter((item) => item.isBase === 'YES')
if (resFilter.length > 0) formData.baseUnitId = resFilter[0].id
+ dataSource.value.forEach((item) => {
+ item.unitId = null
+ item.productQty = null
+ item.unitRate = null
+ })
+
// 修改包装关系的默认单位
dataSource.value[0].unitId = resFilter[0].id
dataSource.value[0].productQty = null
- dataSource.value[0].rate = resFilter[0].rate
+ dataSource.value[0].unitRate = resFilter[0].rate
})
}
@@ -430,12 +436,12 @@
{
label: '物料类型:',
name: 'categoryId',
- type: 'a-select',
+ type: 'a-tree-select',
span: 6,
rules: [required('请选择物料类型')],
attrs: {
placeholder: '请选择物料类型',
- options: tool.dictList('OFFICIAL_ACCOUNT_TYPE'),
+ treeData: [],
fieldNames: {
label: 'name',
value: 'id'
@@ -447,7 +453,6 @@
name: 'brandId',
type: 'a-select',
span: 6,
- rules: [required('请选择品牌')],
attrs: {
placeholder: '请选择品牌',
options: [],
@@ -731,7 +736,7 @@
},
{
title: '换算率',
- dataIndex: 'rate',
+ dataIndex: 'unitRate',
editable: true,
align: 'center',
width: 200
@@ -745,9 +750,8 @@
}
]
- const [api, contextHolder] = notification.useNotification()
const onChangeUnit = (value, options, record) => {
- record.rate = options.rate
+ record.unitRate = options.rate
}
const handleCompute = () => {
@@ -770,7 +774,7 @@
// 验证换算率 是否按照 从大到小排序
for (let i = 0; i < enabledStateFilter.length - 1; i++) {
// 减一以避免越界
- if (enabledStateFilter[i].rate > enabledStateFilter[i + 1].rate) {
+ if (enabledStateFilter[i].unitRate > enabledStateFilter[i + 1].unitRate) {
// 如果当前元素小于下一个元素
return notification.error({
message: `包装比例转换提示`,
@@ -783,7 +787,7 @@
let packageProportionCount = []
enabledStateFilter.forEach((item) => {
- packageProportionCount.push(item.productQty * item.rate)
+ packageProportionCount.push(item.productQty * item.unitRate)
})
formData.packageProportion = calculateRatios(packageProportionCount).join(':')
diff --git a/src/views/productionBusiness/employee/personnelReport/detail/addPersonnelItem.vue b/src/views/productionBusiness/employee/personnelReport/detail/addPersonnelItem.vue
new file mode 100644
index 0000000..3add409
--- /dev/null
+++ b/src/views/productionBusiness/employee/personnelReport/detail/addPersonnelItem.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+ 保存
+
+
+
+
+
diff --git a/src/views/productionBusiness/employee/personnelReport/detail/index.vue b/src/views/productionBusiness/employee/personnelReport/detail/index.vue
index 0c87457..caf1820 100644
--- a/src/views/productionBusiness/employee/personnelReport/detail/index.vue
+++ b/src/views/productionBusiness/employee/personnelReport/detail/index.vue
@@ -43,38 +43,44 @@
+ {{ $TOOL.dictTypeData('FIT_STATE', record.isFit) }}
+ {{ $TOOL.dictTypeData('MANUAL_TASK_PAY_MODE', record.payMode) }}
+ {{ record.amount.toFixed(2) }}
-
+
+ {{ record.money.toFixed(2) }}
删除
@@ -104,15 +110,19 @@
:user-page-api="selectorApiFunction.userPageApi"
:checkedUserListApi="selectorApiFunction.userListByIdListApi"
@onBack="userSelectorOnBack"
+ :radioModel="route.query.type === 'EDIT'"
>
+
+
diff --git a/src/views/productionBusiness/employee/personnelReport/index.vue b/src/views/productionBusiness/employee/personnelReport/index.vue
index e1ef54f..2c0ef5e 100644
--- a/src/views/productionBusiness/employee/personnelReport/index.vue
+++ b/src/views/productionBusiness/employee/personnelReport/index.vue
@@ -2,6 +2,11 @@
+
+
+
+
+
@@ -100,13 +105,19 @@
v-if="hasPerm('customerEdit')"
>
-
+
-
+
@@ -195,7 +206,8 @@
deleteBatchRecords,
options,
searchFormRef,
- navigateTo
+ navigateTo,
+ deleteRecord
} = useTableManagement(
{
page: manualTaskApi.manualTaskPage,