diff --git a/src/api/biz/pdaChangelogApi.js b/src/api/biz/pdaChangelogApi.js
new file mode 100644
index 0000000..a49b702
--- /dev/null
+++ b/src/api/biz/pdaChangelogApi.js
@@ -0,0 +1,28 @@
+import { baseRequest } from '@/utils/request'
+
+const request = (url, ...arg) => baseRequest(`/pda/changelog/` + url, ...arg)
+
+/**
+ * PDA更新日志Api接口管理器
+ *
+ * @author luojun
+ * @date 2024/11/15 21:55
+ **/
+export default {
+ // 获取PDA更新日志分页
+ pdaChangelogPage(data) {
+ return request('page', data, 'get')
+ },
+ // 提交PDA更新日志表单 edit为true时为编辑,默认为新增
+ pdaChangelogSubmitForm(data, edit = false) {
+ return request(edit ? 'edit' : 'add', data)
+ },
+ // 删除PDA更新日志
+ pdaChangelogDelete(data) {
+ return request('delete', data)
+ },
+ // 获取PDA更新日志详情
+ pdaChangelogDetail(data) {
+ return request('detail', data, 'get')
+ }
+}
diff --git a/src/views/biz/app/apk/detail/form.vue b/src/views/biz/app/apk/detail/form.vue
new file mode 100644
index 0000000..c030e16
--- /dev/null
+++ b/src/views/biz/app/apk/detail/form.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+ 保存
+
+
+
+
+
diff --git a/src/views/biz/app/apk/index.vue b/src/views/biz/app/apk/index.vue
new file mode 100644
index 0000000..ab5a175
--- /dev/null
+++ b/src/views/biz/app/apk/index.vue
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/productionBusiness/inventory/invoice/detail/index.vue b/src/views/productionBusiness/inventory/invoice/detail/index.vue
index 5e17367..a265157 100644
--- a/src/views/productionBusiness/inventory/invoice/detail/index.vue
+++ b/src/views/productionBusiness/inventory/invoice/detail/index.vue
@@ -72,9 +72,10 @@
- import inventoryInvoiceApi from '@/api/inventory/inventoryInvoiceApi'
- import sysStoreApi from '@/api/base/store/sysStoreApi'
- import materialApi from '@/api/base/material/materialApi'
- import useFormHandler from '@/hook/useFormHandler'
- import {
- basicInfoFormRules,
- basicInfoFormItems,
- productDetailFormItems
- } from '@/views/productionBusiness/inventory/invoice/formFields/detailFields'
- import { useRoute } from 'vue-router'
- import MaterielSelectorPlus from '@/components/Selector/materielSelectorPlus.vue'
- import ClientSelectorPlus from '@/components/Selector/clientSelectorPlus.vue'
- const route = useRoute()
+import inventoryInvoiceApi from '@/api/inventory/inventoryInvoiceApi'
+import sysStoreApi from '@/api/base/store/sysStoreApi'
+import materialApi from '@/api/base/material/materialApi'
+import useFormHandler from '@/hook/useFormHandler'
+import {
+ basicInfoFormItems,
+ basicInfoFormRules,
+ productDetailFormItems
+} from '@/views/productionBusiness/inventory/invoice/formFields/detailFields'
+import {useRoute} from 'vue-router'
+import MaterielSelectorPlus from '@/components/Selector/materielSelectorPlus.vue'
+import ClientSelectorPlus from '@/components/Selector/clientSelectorPlus.vue'
+
+const route = useRoute()
const formRef1 = ref(null)
let extendData = ref([])
@@ -134,6 +136,7 @@
fetchData(route.query.type).then((res) => {
if (res) {
formData.customerId = res.customerId // 客户id
+ formData.customerName = res.customerName // 客户id
formData.customerNumber = res.customerNumber // 客户编码
formData.storeId = res.storeId // 仓库id
formData.storeName = res.storeName // 仓库名称
@@ -141,12 +144,12 @@
}
})
- // 获取明细列表
- const detailList = await inventoryInvoiceApi.inventoryInvoiceDetailList({
- invoiceId: formRefs.value.id
- })
-
- productDetailData.value = detailList
+ if(route.query.type === 'EDIT') {
+ // 获取明细列表
+ productDetailData.value = await inventoryInvoiceApi.inventoryInvoiceDetailList({
+ invoiceId: formRefs.value.id
+ })
+ }
// 处理表单 元素数据填充
const sysStoreTreeList = await sysStoreApi.sysStoreTree()
@@ -167,6 +170,14 @@
})
}
+ const handleSelectUnit = (value, record) => {
+ record.unitName = record.unitArr.filter(item => item.id === value)[0].name
+ }
+
+ /*
+ * 根据单位计算发货数量,基本计划数量,基本发货数量
+ * */
+
/* 物料选择器 */
const materielSelectorPlusRef = ref(null)
let materialPackageData = {}
@@ -180,12 +191,19 @@
// 物料选择器返回操作
const materielBackOk = async (event) => {
+ productDetailData.value[materielIndex].batchNumber = event.materielSelectedRows[0].batchNumber
+
+ // 产品
+ productDetailData.value[materielIndex].productId = event.materielSelectedRows[0].id
productDetailData.value[materielIndex].productName = event.materielSelectedRows[0].name
productDetailData.value[materielIndex].productNumber = event.materielSelectedRows[0].number
productDetailData.value[materielIndex].specification = event.materielSelectedRows[0].specification
+ productDetailData.value[materielIndex].packageProportion = event.materielSelectedRows[0].packageProportion
productDetailData.value[materielIndex].baseUnitName = event.materielSelectedRows[0].baseUnitName
- productDetailData.value[materielIndex].batchNumber = event.materielSelectedRows[0].batchNumber
- productDetailData.value[materielIndex].planAmount = event.materielSelectedRows[0].planAmount
+ productDetailData.value[materielIndex].baseUnitId = event.materielSelectedRows[0].baseUnitId
+ productDetailData.value[materielIndex].batchNumber = event.materielSelectedRows[0].batchNumber // 批次号
+
+ // productDetailData.value[materielIndex].planAmount = event.materielSelectedRows[0].planAmount
// 获取单位列表
productDetailData.value[materielIndex].unitArr = await handleMaterialPackageData(event.materielSelectedRows[0].id)
@@ -217,6 +235,7 @@
const clientBackOk = (event) => {
formData.customerName = event.clientSelectedRows[0].name
formData.customerId = event.clientSelectedRows[0].id
+ formData.customerNumber = event.clientSelectedRows[0].number
}
/* =================================== 商品明细 ============================*/
diff --git a/src/views/productionBusiness/inventory/invoice/index.vue b/src/views/productionBusiness/inventory/invoice/index.vue
index 28afd36..9d70b48 100644
--- a/src/views/productionBusiness/inventory/invoice/index.vue
+++ b/src/views/productionBusiness/inventory/invoice/index.vue
@@ -67,9 +67,9 @@
{{ record.billNumber }}
-
- {{
- $TOOL.dictTypeData('PRODUCE_TASK_STATE', record.state || '')
+
+ {{
+ $TOOL.dictTypeData('INVOICE_AUDIT_STATE', record.auditState || '')
}}
@@ -94,9 +94,9 @@
-
+
更多
@@ -177,7 +177,7 @@
},
{
title: '状态',
- dataIndex: 'state',
+ dataIndex: 'auditState',
align: 'center',
resizable: true,
width: 300,