Date: Fri, 19 Apr 2024 09:42:20 +0800
Subject: [PATCH 151/303] =?UTF-8?q?2024-04-19=20=E4=BF=AE=E6=94=B9detial?=
=?UTF-8?q?=20=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/abilityInfo/index.vue | 5 ++--
src/views/mes/components/Detail.vue | 40 +++++++++++++------------
src/views/mes/dismantlingMain/index.vue | 3 +-
src/views/mes/opersteps/index.vue | 4 +--
src/views/mes/operstepsType/index.vue | 4 +--
src/views/mes/pattern/index.vue | 4 +--
src/views/mes/patternType/index.vue | 4 +--
src/views/mes/productBackline/index.vue | 3 +-
src/views/mes/productOffline/index.vue | 5 ++--
src/views/mes/reworkBatch/index.vue | 5 ++--
src/views/mes/reworkSingle/index.vue | 5 ++--
11 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/src/views/mes/abilityInfo/index.vue b/src/views/mes/abilityInfo/index.vue
index f73f10e03..945375f6f 100644
--- a/src/views/mes/abilityInfo/index.vue
+++ b/src/views/mes/abilityInfo/index.vue
@@ -51,7 +51,8 @@
/>
-
+
@@ -64,7 +65,7 @@ import * as AbilityInfoApi from '@/api/mes/abilityInfo'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
defineOptions({ name: 'AbilityInfo' })
diff --git a/src/views/mes/components/Detail.vue b/src/views/mes/components/Detail.vue
index 48a3ec50b..a5072d7e9 100644
--- a/src/views/mes/components/Detail.vue
+++ b/src/views/mes/components/Detail.vue
@@ -35,6 +35,7 @@
:schema="allSchemas.detailSchema"
:columns="2"
width="200px"
+
/>
@@ -381,24 +382,24 @@ const isShowDrawer = ref(false)
const detailLoading = ref(false)
const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
-if (props.isBasic == true) {
- if (tabsList.value && tabsList.value.length > 0) {
- tabsList.value.unshift({
- label: '详情',
- prop: 'Detail'
- })
- }
-} else {
- if (tabsList.value && tabsList.value.length > 0) {
- } else {
- tabsList.value = [
- {
- label: '明细',
- prop: 'Detail'
- }
- ]
- }
-}
+// if (props.isBasic == true || props.isBasicMes == true) {
+// if (tabsList.value && tabsList.value.length > 0) {
+// tabsList.value.unshift({
+// label: '详情',
+// prop: 'Detail'
+// })
+// }
+// } else {
+// if (tabsList.value && tabsList.value.length > 0) {
+// } else {
+// tabsList.value = [
+// {
+// label: '明细',
+// prop: 'Detail'
+// }
+// ]
+// }
+// }
const otherList = [...props.annexTable,{
label:props.annexAliasLabel,
@@ -413,10 +414,11 @@ const otherList = [...props.annexTable,{
tabsList.value = [...tabsList?.value,...otherList]
if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) {
+ if (props.isBasic == false && props.isBasicMes == false) {
tabsList.value.unshift({
label: '明细',
prop: 'Detail'
- })
+ })}
}
tabsList.value.unshift({
label: '主数据',
diff --git a/src/views/mes/dismantlingMain/index.vue b/src/views/mes/dismantlingMain/index.vue
index b41931c64..c4c87bdf8 100644
--- a/src/views/mes/dismantlingMain/index.vue
+++ b/src/views/mes/dismantlingMain/index.vue
@@ -53,6 +53,7 @@
-
+
@@ -64,7 +64,7 @@ import * as OperstepsApi from '@/api/mes/opersteps'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
defineOptions({ name: 'Opersteps' })
diff --git a/src/views/mes/operstepsType/index.vue b/src/views/mes/operstepsType/index.vue
index 7079cc3f5..20c4d9940 100644
--- a/src/views/mes/operstepsType/index.vue
+++ b/src/views/mes/operstepsType/index.vue
@@ -51,7 +51,7 @@
/>
-
+
@@ -64,7 +64,7 @@ import * as OperstepsTypeApi from '@/api/mes/operstepsType'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
defineOptions({ name: 'OperstepsType' })
diff --git a/src/views/mes/pattern/index.vue b/src/views/mes/pattern/index.vue
index 7d201886a..e7a6f128d 100644
--- a/src/views/mes/pattern/index.vue
+++ b/src/views/mes/pattern/index.vue
@@ -51,7 +51,7 @@
/>
-
+
@@ -64,7 +64,7 @@ import * as PatternApi from '@/api/mes/pattern'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
defineOptions({ name: 'Pattern' })
diff --git a/src/views/mes/patternType/index.vue b/src/views/mes/patternType/index.vue
index acedd71fe..6a1ad681a 100644
--- a/src/views/mes/patternType/index.vue
+++ b/src/views/mes/patternType/index.vue
@@ -51,7 +51,7 @@
/>
-
+
@@ -64,7 +64,7 @@ import * as PatternTypeApi from '@/api/mes/patternType'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
defineOptions({ name: 'PatternType' })
diff --git a/src/views/mes/productBackline/index.vue b/src/views/mes/productBackline/index.vue
index 1dc6d58fb..f3b9da7b4 100644
--- a/src/views/mes/productBackline/index.vue
+++ b/src/views/mes/productBackline/index.vue
@@ -51,7 +51,8 @@
/>
-
+
diff --git a/src/views/mes/productOffline/index.vue b/src/views/mes/productOffline/index.vue
index 6f96689ef..3d07a2172 100644
--- a/src/views/mes/productOffline/index.vue
+++ b/src/views/mes/productOffline/index.vue
@@ -51,7 +51,8 @@
/>
-
+
@@ -64,7 +65,7 @@ import * as ProductOfflineApi from '@/api/mes/productOffline'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
defineOptions({ name: 'MesProductOffline' })
diff --git a/src/views/mes/reworkBatch/index.vue b/src/views/mes/reworkBatch/index.vue
index f2b515fd3..d081b8355 100644
--- a/src/views/mes/reworkBatch/index.vue
+++ b/src/views/mes/reworkBatch/index.vue
@@ -51,7 +51,8 @@
/>
-
+
@@ -64,7 +65,7 @@ import * as ReworkBatchApi from '@/api/mes/reworkBatch'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
defineOptions({ name: 'MesReworkBatch' })
diff --git a/src/views/mes/reworkSingle/index.vue b/src/views/mes/reworkSingle/index.vue
index 3fe6a7eb8..a5254d728 100644
--- a/src/views/mes/reworkSingle/index.vue
+++ b/src/views/mes/reworkSingle/index.vue
@@ -51,7 +51,8 @@
/>
-
+
@@ -64,7 +65,7 @@ import * as ReworkSingleApi from '@/api/mes/reworkSingle'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
defineOptions({ name: 'MesReworkSingle' })
From 8c6435bc13055b9785cf74824c6fd7369d353825 Mon Sep 17 00:00:00 2001
From: zhousq
Date: Fri, 19 Apr 2024 09:47:39 +0800
Subject: [PATCH 152/303] =?UTF-8?q?2024-04-19=20=E7=A6=BB=E7=BA=BF?=
=?UTF-8?q?=E7=99=BB=E8=AE=B0=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/productBackline/index.vue | 2 +-
src/views/mes/productOffline/index.vue | 2 +-
src/views/mes/productOffline/productOffline.data.ts | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/mes/productBackline/index.vue b/src/views/mes/productBackline/index.vue
index f3b9da7b4..9872e5958 100644
--- a/src/views/mes/productBackline/index.vue
+++ b/src/views/mes/productBackline/index.vue
@@ -65,7 +65,7 @@ import * as ProductBacklineApi from '@/api/mes/productBackline'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
defineOptions({ name: 'MesProductBackline' })
diff --git a/src/views/mes/productOffline/index.vue b/src/views/mes/productOffline/index.vue
index 3d07a2172..fa7244d44 100644
--- a/src/views/mes/productOffline/index.vue
+++ b/src/views/mes/productOffline/index.vue
@@ -51,7 +51,7 @@
/>
-
diff --git a/src/views/mes/productOffline/productOffline.data.ts b/src/views/mes/productOffline/productOffline.data.ts
index 07249e267..95a1784df 100644
--- a/src/views/mes/productOffline/productOffline.data.ts
+++ b/src/views/mes/productOffline/productOffline.data.ts
@@ -27,6 +27,7 @@ export const ProductOffline = useCrudSchemas(reactive([
field: 'offlineCode',
sort: 'custom',
isForm: false,
+ fixed: 'left'
},
{
label: '产品编码',
From 2c897800de0f1d51e0f808cd41946f331bb3ffd4 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 19 Apr 2024 09:50:43 +0800
Subject: [PATCH 153/303] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierinvoiceRecordMain.data.ts | 54 +++++++++++++
.../supplierinvoiceRequestMain.data.ts | 76 +++++++++----------
2 files changed, 92 insertions(+), 38 deletions(-)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 2affd0a1c..d686f530c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -621,6 +621,60 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive
component: 'InputNumber',
}
},
+ {
+ label: '差额',
+ field: 'differencePrice',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ },
+ tableForm:{
+ type: 'slot',
+ disabled: true
+ }
+ },
+ {
+ label: '未税差额',
+ field: 'untaxedDifference',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ min: 0,
+ precision: 6,
+ }
+ },
+ tableForm: {
+ type: 'InputNumber',
+ min: 0,
+ precision: 6,
+ }
+ },
+ {
+ label: '含税差额',
+ field: 'taxInclusiveDifference',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ min: 0,
+ precision: 6,
+ }
+ },
+ tableForm: {
+ type: 'InputNumber',
+ min: 0,
+ precision: 6,
+ }
+ },
{
label: '收货日期',
field: 'deliveryDate',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 7ca283623..b627663e9 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -302,44 +302,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
precision: 6,
}
},
- {
- label: '未税差额',
- field: 'untaxedDifference',
- table: {
- width: 150
- },
- form: {
- component: 'InputNumber',
- componentProps: {
- min: 0,
- precision: 6,
- }
- },
- tableForm: {
- type: 'InputNumber',
- min: 0,
- precision: 6,
- }
- },
- {
- label: '含税差额',
- field: 'taxInclusiveDifference',
- table: {
- width: 150
- },
- form: {
- component: 'InputNumber',
- componentProps: {
- min: 0,
- precision: 6,
- }
- },
- tableForm: {
- type: 'InputNumber',
- min: 0,
- precision: 6,
- }
- },
{
label: '金税票号',
field: 'goldenTaxInvoiceNumber',
@@ -908,6 +870,44 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive
Date: Fri, 19 Apr 2024 10:08:03 +0800
Subject: [PATCH 154/303] =?UTF-8?q?=E9=87=91=E9=A2=9D=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierinvoice/supplierinvoiceRequestMain/index.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 8202a3062..db4946f43 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -586,6 +586,9 @@ const handleImport = () => {
// 主子数据 提交
const submitForm = async (formType, data) => {
+ data.differencePrice = tableData.value.reduce((prev,item)=>{
+ return (0)+Number((Number(item?.singlePrice)-Number(item?.purchasePrice)).toFixed(6))
+ },0)
data.subList = tableData.value // 拼接子表数据参数
try {
if (formType === 'create') {
From ac8ba2b2f4aa0ec1dca1ed265e001bb23ed7ac74 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 19 Apr 2024 10:20:32 +0800
Subject: [PATCH 155/303] =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=B7=AE=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierinvoice/supplierinvoiceRequestMain/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index db4946f43..5acc8e857 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -586,9 +586,9 @@ const handleImport = () => {
// 主子数据 提交
const submitForm = async (formType, data) => {
- data.differencePrice = tableData.value.reduce((prev,item)=>{
- return (0)+Number((Number(item?.singlePrice)-Number(item?.purchasePrice)).toFixed(6))
- },0)
+ tableData.value.forEach((item) => {
+ item.differencePrice = Number((Number(item?.singlePrice)-Number(item?.purchasePrice)).toFixed(6))
+ })
data.subList = tableData.value // 拼接子表数据参数
try {
if (formType === 'create') {
From f3ba9aa2a8837b5ec81576cb97019ef28e768421 Mon Sep 17 00:00:00 2001
From: zhaoyiran
Date: Fri, 19 Apr 2024 10:32:05 +0800
Subject: [PATCH 156/303] =?UTF-8?q?aql=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/qms/aql/index.ts | 8 +++++
src/config/axios/index.ts | 8 +++++
src/utils/disposition/defaultButtons.ts | 23 ++++++++++++-
src/views/qms/aql/aql.data.ts | 18 +++++++++++
src/views/qms/aql/index.vue | 43 ++++++++++++++++++++-----
5 files changed, 91 insertions(+), 9 deletions(-)
diff --git a/src/api/qms/aql/index.ts b/src/api/qms/aql/index.ts
index dda72b699..2a3317051 100644
--- a/src/api/qms/aql/index.ts
+++ b/src/api/qms/aql/index.ts
@@ -105,3 +105,11 @@ export const importTemplate = () => {
export const getSamplingScheme = async () => {
return await request.get({ url: `/qms/sampling-scheme/get-available-list`})
}
+// 启用
+export const enableAql = async (id: number) => {
+ return await request.enable({ url: `/qms/aql/enable?id=` + id })
+}
+// 禁用
+export const disableAql = async (id: number) => {
+ return await request.disable({ url: `/qms/aql/disable?id=` + id })
+}
diff --git a/src/config/axios/index.ts b/src/config/axios/index.ts
index 69c5e72ac..ad0fd2f8c 100644
--- a/src/config/axios/index.ts
+++ b/src/config/axios/index.ts
@@ -39,6 +39,14 @@ export default {
const res = await request({ method: 'DELETE', ...option })
return res.data as unknown as T
},
+ enable: async (option: any) => {
+ const res = await request({ method: 'POST', ...option })
+ return res.data as unknown as T
+ },
+ disable: async (option: any) => {
+ const res = await request({ method: 'POST', ...option })
+ return res.data as unknown as T
+ },
put: async (option: any) => {
const res = await request({ method: 'PUT', ...option })
return res.data as unknown as T
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index e8d89e7d8..0893325bb 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -250,7 +250,28 @@ export function mainListDeleteBtn(option:any) {
hasPermi: ''
})
}
-
+export function mainListEnableBtn(option:any) {
+ return __defaultBtnOption(option,{
+ label: '启用',
+ name: 'enable',
+ hide: false,
+ type: 'danger',
+ color: '',
+ link: true, // 文本展现按钮
+ hasPermi: ''
+ })
+}
+export function mainListDisableBtn(option:any) {
+ return __defaultBtnOption(option,{
+ label: '禁用',
+ name: 'disable',
+ hide: false,
+ type: 'danger',
+ color: '',
+ link: true, // 文本展现按钮
+ hasPermi: ''
+ })
+}
// 主列表-中止按钮1
export function mainListSuspend1Btn(option:any) {
return __defaultBtnOption(option,{
diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts
index d16783a9f..1351f93d1 100644
--- a/src/views/qms/aql/aql.data.ts
+++ b/src/views/qms/aql/aql.data.ts
@@ -550,6 +550,24 @@ export const Aql = useCrudSchemas(reactive([
}
},
},
+ {
+ label: '是否可用',
+ field: 'available',
+ sort: 'custom',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ table: {
+ width: 110
+ }
+ },
{
label: '操作',
field: 'action',
diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue
index 378d5b12c..3ac3045a6 100644
--- a/src/views/qms/aql/index.vue
+++ b/src/views/qms/aql/index.vue
@@ -33,7 +33,7 @@
-
+