diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index 6f00f10c2..f81f8f35a 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -5,6 +5,7 @@ import { useDesign } from '@/hooks/web/useDesign'
import { propTypes } from '@/utils/propTypes'
import { useAppStore } from '@/store/modules/app'
import { DescriptionsSchema } from '@/types/descriptions'
+const { t } = useI18n() // 国际化
defineOptions({ name: 'Descriptions' })
@@ -99,7 +100,7 @@ const showAll = () =>{
>
- {{ title }}
+ {{ t(`ts.${title}`).replace('ts.', '') }}
@@ -119,7 +120,7 @@ const showAll = () =>{
-
{
:row="{
label: item.label
}"
- >{{ item.label }}
+ >{{ t(`ts.${item.label}`).replace('ts.', '') }}
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 3ebe261c5..af528c603 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -2,14 +2,14 @@
- {{ titleValueRef }} {{ titleNameRef }}
+ {{ titleValueRef }} {{ t(`ts.${titleNameRef}`).replace('ts.','') }}
diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue
index b72b2b9ec..35920d91e 100644
--- a/src/components/DictTag/src/DictTag.vue
+++ b/src/components/DictTag/src/DictTag.vue
@@ -3,6 +3,7 @@ import { defineComponent, PropType, ref } from 'vue'
import { isHexColor } from '@/utils/color'
import { ElTag } from 'element-plus'
import { DictDataType, getDictOptions } from '@/utils/dict'
+const { t } = useI18n() // 国际化
export default defineComponent({
name: 'DictTag',
@@ -55,7 +56,7 @@ export default defineComponent({
}
disableTransitions={true}
>
- {dictData.value?.label}
+ {t(`ts.${dictData.value?.label}`).replace('ts.', '')}
)
} else {
@@ -71,7 +72,7 @@ export default defineComponent({
}
disableTransitions={true}
>
- {item?.label}
+ {t(`ts.${item?.label}`).replace('ts.', '')}
})
)
diff --git a/src/components/Remarks/src/Remarks.vue b/src/components/Remarks/src/Remarks.vue
index 35423c454..857d91027 100644
--- a/src/components/Remarks/src/Remarks.vue
+++ b/src/components/Remarks/src/Remarks.vue
@@ -20,9 +20,9 @@
@@ -32,6 +32,7 @@
const message = useMessage() // 消息弹窗
import * as RemarkApi from '@/api/wms/remark'
import { formatDate } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
defineComponent({
name: 'Annex'
diff --git a/src/components/Tabs/src/Tabs.vue b/src/components/Tabs/src/Tabs.vue
index 8c66168a9..8c22163f6 100644
--- a/src/components/Tabs/src/Tabs.vue
+++ b/src/components/Tabs/src/Tabs.vue
@@ -1,7 +1,7 @@
-
{{ item.label }}
+
{{ t(`ts.${item.label}`).replace('ts.','') }}
@@ -9,6 +9,7 @@
// const message = useMessage() // 消息弹窗
import { emit } from "process";
+const { t } = useI18n() // 国际化
// const { t } = useI18n() // 国际化
defineComponent({
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 05ce5f239..bf3cc4895 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -42,6 +42,7 @@ import { PropType } from 'vue'
import { propTypes } from '@/utils/propTypes'
import { getAccessToken, getTenantId } from '@/utils/auth'
import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
+const { t } = useI18n() // 国际化
defineOptions({ name: 'UploadFile' })
@@ -78,7 +79,7 @@ const uploadHeaders = ref({
// 文件上传之前判断
const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
if (fileList.value.length >= props.limit) {
- message.error(`上传文件数量不能超过${props.limit}个!`)
+ message.error(`${t('ts.上传文件数量不能超过')}${props.limit}!`)
return false
}
let fileExtension = ''
@@ -91,14 +92,14 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
})
const isLimit = file.size < props.fileSize * 1024 * 1024
if (!isImg) {
- message.error(`文件格式不正确, 请上传${props.fileType.join('/')}格式!`)
+ message.error(`${t(`ts.${'文件格式不正确, 请上传'}`)}${props.fileType.join('/')}${t('ts.格式')}!`)
return false
}
if (!isLimit) {
- message.error(`上传文件大小不能超过${props.fileSize}MB!`)
+ message.error(`${t('ts.上传文件大小不能超过')}${props.fileSize}MB!`)
return false
}
- message.success('正在上传文件，请稍候...')
+ message.success(t(`ts.${'正在上传文件，请稍候'}`))
uploadNumber.value++
}
// 处理上传的文件发生变化
@@ -107,7 +108,7 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
// }
// 文件上传成功
const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any): void => {
- message.success('上传成功')
+ message.success(t('ts.上传成功'))
const fileListNew = fileList.value
fileListNew.pop()
fileList.value = fileListNew
@@ -121,11 +122,11 @@ const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any):
}
// 文件数超出提示
const handleExceed: UploadProps['onExceed'] = (): void => {
- message.error(`上传文件数量不能超过${props.limit}个!`)
+ message.error(`${t('ts.上传文件数量不能过')}${props.limit}!`)
}
// 上传错误提示
const excelUploadError: UploadProps['onError'] = (): void => {
- message.error('导入数据失败，请您重新上传！')
+ message.error(t(`ts.导入数据失败，请您重新上传`))
}
// 删除上传文件
const handleRemove = (file) => {
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index d426530a5..c8a4ee393 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1063,6 +1063,30 @@ export default {
采购价格审批人:'Purchasing price approver',
供应商发货单号:'Supplier\'s invoice number',
加载中:'loading',
+ 请输入备注:'Please enter remarks',
+ '正在上传文件，请稍候':'Please wait while uploading files',
+ 上传成功:'upload successful',
+ 上传文件数量不能超过:'The number of uploaded files cannot exceed',
+ '导入数据失败，请您重新上传':'Failed to import data, please upload again!',
+ 上传文件大小不能超过:'The size of the uploaded file cannot exceed',
+ '文件格式不正确, 请上传':'The file format is incorrect. Please upload it in',
+ 格式:'format',
+ 收货人:'consignee',
+ 联系电话:'phone',
+ 送达日期:'delivery date',
+ 月台代码:'Platform code',
+ 截止日期:'Deadline',
+ 仓库代码:'Warehouse code',
+ 'ERP单据号(无用)':'ERP document number (useless)',
+ 供应商审批人:'Supplier approver',
+ 供应商审批时间:'Supplier approval time',
+ 快递单号:'courier number',
+ 开票日历管理:'Invoicing calendar management',
+ 描述:'description'
+
+
+
+
},
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 73699f76a..65f4ded05 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1063,6 +1063,30 @@ export default {
采购价格审批人:'采购价格审批人',
供应商发货单号:'供应商发货单号',
加载中:'加载中',
+ 请输入备注:'请输入备注',
+ '正在上传文件，请稍候':'正在上传文件，请稍候...',
+ 上传成功:'上传成功',
+ 上传文件数量不能超过:'上传文件数量不能超过',
+ '导入数据失败，请您重新上传':'导入数据失败，请您重新上传！',
+ 上传文件大小不能超过:'上传文件大小不能超过',
+ '文件格式不正确, 请上传':'文件格式不正确, 请上传',
+ 格式:'格式',
+ 收货人:'收货人',
+ 联系电话:'联系电话',
+ 送达日期:'送达日期',
+ 月台代码:'月台代码',
+ 截止日期:'截止日期',
+ 仓库代码:'仓库代码',
+ 'ERP单据号(无用)':'ERP单据号(无用)',
+ 供应商审批人:'供应商审批人',
+ 供应商审批时间:'供应商审批时间',
+ 快递单号:'快递单号',
+ 开票日历管理:'开票日历管理',
+ 描述:'描述'
+
+
+
+
},
diff --git a/src/views/home/components/supplierIndex.vue b/src/views/home/components/supplierIndex.vue
index 5e8a679c1..af6faa6f0 100644
--- a/src/views/home/components/supplierIndex.vue
+++ b/src/views/home/components/supplierIndex.vue
@@ -231,7 +231,8 @@
import { set } from 'lodash-es'
import { EChartsOption } from 'echarts'
import { lineOptions, pieOptions } from '../echarts-data'
-import { formatDate } from '@/utils/formatTime'
+import { formatDate,dateFormatter } from '@/utils/formatTime'
+
import * as NotifyMessageApi from '@/api/system/notify/message'
import * as IndexApi from '@/api/home'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
From 7a30e1d1a6fb8037805f6422ba8430b1bc983c49 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 16 May 2024 14:31:27 +0800
Subject: [PATCH 06/33] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=B0=E5=BD=95ID?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productscrap/productscrapRecordMain/index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
index 32d6a59c5..2ebe04e35 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
@@ -135,6 +135,7 @@ const buttonOperationClick = async (row, label, index)=> {
return
}
detatableDataBom.params.itemCode = row.itemCode
+ detatableDataBom.params.masterId = row.id
DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
bomModelVisible.value = true
await getDetailListBom()
@@ -181,7 +182,7 @@ const tableFormButton = async (val , row) => {
bomModelVisible.value = true
DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
detatableDataBom.params = {
- masterId: row.masterId
+ masterId: row.id
}
await getDetailListBom()
}
From 5fc50f56a890b5c90b51178ca0675c957c2da24f Mon Sep 17 00:00:00 2001
From: zhousq
Date: Thu, 16 May 2024 14:34:56 +0800
Subject: [PATCH 07/33] =?UTF-8?q?2024-05-16=20=E4=BF=AE=E6=94=B9=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hrPersonAbility/hrPersonAbility.data.ts | 17 +++-
src/views/mes/hrPersonAbility/index.vue | 16 +++-
src/views/mes/opersteps/index.vue | 10 +++
src/views/mes/opersteps/opersteps.data.ts | 5 +-
src/views/mes/operstepsType/index.vue | 9 +++
.../processroute/components/configDialog.vue | 30 ++++---
src/views/mes/processroute/index.vue | 19 +++--
.../mes/processroute/processroute.data.ts | 12 +--
.../components/qualifiedCheck.vue | 80 +++++++++++--------
9 files changed, 131 insertions(+), 67 deletions(-)
diff --git a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
index 81c779e86..614e2ef7f 100644
--- a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
+++ b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
@@ -1,8 +1,9 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import * as AbilityInfoApi from '@/api/mes/abilityInfo'
+import * as UserApi from "@/api/system/user";
import { AbilityInfo } from '../abilityInfo/abilityInfo.data'
-
+import {searchUser} from "@/views/wms/basicDataManage/orderManage/team/team.data";
// 表单校验
export const HrPersonAbilityRules = reactive({
@@ -116,6 +117,20 @@ export const HrPersonAbility = useCrudSchemas(reactive([
field: 'personCode',
sort: 'custom',
isSearch: true,
+ form: {
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchTitle: '人员信息', // 查询弹窗标题
+ searchAllSchemas: searchUser.allSchemas, // 查询弹窗所需类
+ searchField: 'username', // 查询弹窗赋值字段
+ searchPage: UserApi.getUserPage, // 查询弹窗所需分页方法
+ searchCondition: [{
+ action: "==",
+ column: 'userType',
+ value: 'WORKER'
+ }]
+ }
+ }
},
{
label: '能力编号',
diff --git a/src/views/mes/hrPersonAbility/index.vue b/src/views/mes/hrPersonAbility/index.vue
index f4b11845f..a4bc513f0 100644
--- a/src/views/mes/hrPersonAbility/index.vue
+++ b/src/views/mes/hrPersonAbility/index.vue
@@ -49,7 +49,7 @@
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
-
+
@@ -80,9 +80,17 @@ const tableColumns = ref(HrPersonAbility.allSchemas.tableColumns)
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
- const setV = {}
- setV[formField] = val[0][searchField]
- formRef.setValues(setV)
+ if (formField === 'ablityCode') {
+ const setV = {}
+ setV[formField] = val[0][searchField]
+ formRef.setValues(setV)
+ }
+ if (formField === 'personCode') {
+ const setV = {}
+ setV[formField] = val[0][searchField]
+ formRef.setValues(setV)
+ }
+
})
}
diff --git a/src/views/mes/opersteps/index.vue b/src/views/mes/opersteps/index.vue
index 4e2c1abc8..6250e6ef1 100644
--- a/src/views/mes/opersteps/index.vue
+++ b/src/views/mes/opersteps/index.vue
@@ -149,6 +149,16 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
+ let disabledFlag = false
+ if(type==='update'){
+ disabledFlag = true
+ }
+ Opersteps.allSchemas.formSchema.forEach(item => {
+ if (item.field == 'stepsCode') {
+ item.componentProps.disabled =disabledFlag
+ }
+ })
+ basicFormRef.value.open(type, row)
basicFormRef.value.open(type, row)
}
diff --git a/src/views/mes/opersteps/opersteps.data.ts b/src/views/mes/opersteps/opersteps.data.ts
index 96dc16c9d..6dc4c1f12 100644
--- a/src/views/mes/opersteps/opersteps.data.ts
+++ b/src/views/mes/opersteps/opersteps.data.ts
@@ -5,7 +5,10 @@ import { OperstepsType } from '../operstepsType/operstepsType.data'
// 表单校验
export const OperstepsRules = reactive({
- concurrencyStamp: [required],
+ //concurrencyStamp: [required],
+ stepsCode: [required],
+ stepsName: [required],
+ collectCode: [required],
})
export const Opersteps = useCrudSchemas(reactive([
diff --git a/src/views/mes/operstepsType/index.vue b/src/views/mes/operstepsType/index.vue
index 20c4d9940..761b74318 100644
--- a/src/views/mes/operstepsType/index.vue
+++ b/src/views/mes/operstepsType/index.vue
@@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
+ let disabledFlag = false
+ if(type==='update'){
+ disabledFlag = true
+ }
+ OperstepsType.allSchemas.formSchema.forEach(item => {
+ if (item.field == 'collectCode') {
+ item.componentProps.disabled =disabledFlag
+ }
+ })
basicFormRef.value.open(type, row)
}
diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue
index 589d36a19..08cdcd6bb 100644
--- a/src/views/mes/processroute/components/configDialog.vue
+++ b/src/views/mes/processroute/components/configDialog.vue
@@ -42,7 +42,7 @@
- 移除
@@ -250,10 +250,16 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
})
}
}
-const deleteNode=(row)=>{
- processData.value.splice(processData.value.indexOf(row),1)
+const deleteNode=(row,index:number)=>{
+ //console.log('row------',index)
+ //showProcessNodeData.value.splice(index,1)
+ processData.value.splice((page.value.current-1)*page.value.size+index,1)
page.value.total=processData.value.length
page.value.current=1
+ showProcessNodeData.value=processData.value.slice(1,1+page.value.size);
+
+ //page.value.current=1
+ //showProcessNodeData.value=processData.value.slice((page.value.current-1)*page.value.size,page.value.size)
graph.value.removeNode(row.code)
}
@@ -278,6 +284,9 @@ const openDetail = (row: any) => {
materialData.value = []
mouldData.value = []
workStationList.value = []
+ processData.value=[]
+ showProcessNodeData.value = []
+ showMaterialsData.value = []
graph.value.on('node:dblclick', ({ e, x, y, node, view }) => {
nodeClick(e, x, y, node, view)
})
@@ -297,6 +306,7 @@ const handleDrawerClose = () => {
//console.log(graph.value.toJSON())
rowData.value=null
}
+ emit('close')
}
//**获取 工序信息 */
const getProcessInfo = async (id: any) => {
@@ -440,15 +450,15 @@ const saveResult = async () => {
processrouteId: processRouteId.value
}
- let res = ProcessrouteApi.saveGraphData(gdata)
- if (res) {
- message.success('保存成功！')
- } else {
- message.error('保存失败！')
- }
+ await ProcessrouteApi.saveGraphData(gdata)
+ // if (res) {
+ // message.success('保存成功！')
+ // } else {
+ // message.error('保存失败！')
+ // }
isShowDrawer.value = false
handleDrawerClose()
- emit('close')
+ //emit('close',)
//return res
}
diff --git a/src/views/mes/processroute/index.vue b/src/views/mes/processroute/index.vue
index 45d4c879d..98b69f762 100644
--- a/src/views/mes/processroute/index.vue
+++ b/src/views/mes/processroute/index.vue
@@ -157,16 +157,25 @@ const buttonTableClick = async (val, row) => {
openDetail(row)
}
}
-const dailogClose=() => {
- console.log('close');
- nextTick?.(()=>{
- getList()
- })
+const dailogClose= () => {
+ //console.log('dailogClose--confge',getList());
+ //nextTick?.(()=>{
+ getList()
+ //})
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
+ let disabledFlag = false
+ if(type==='update'){
+ disabledFlag = true
+ }
+ Processroute.allSchemas.formSchema.forEach(item => {
+ if (item.field == 'processrouteCode') {
+ item.componentProps.disabled =disabledFlag
+ }
+ })
basicFormRef.value.open(type, row)
}
diff --git a/src/views/mes/processroute/processroute.data.ts b/src/views/mes/processroute/processroute.data.ts
index 077aecc88..c5640450b 100644
--- a/src/views/mes/processroute/processroute.data.ts
+++ b/src/views/mes/processroute/processroute.data.ts
@@ -7,8 +7,6 @@ export const ProcessrouteRules = reactive({
processrouteCode: [required],
processName: [required],
productCode: [required],
- ablityCode: [required],
- ablityCode: [required],
})
export const Processroute = useCrudSchemas(reactive([
@@ -59,15 +57,7 @@ export const Processroute = useCrudSchemas(reactive([
field: 'processrouteCode',
sort: 'custom',
isSearch: true,
- // form: {
- // component: 'Input',
-
- // componentProps: {
- // slots:{
- // default:}
- // disabled: true
- // }
- // }
+
},
{
diff --git a/src/views/mes/workScheduling/components/qualifiedCheck.vue b/src/views/mes/workScheduling/components/qualifiedCheck.vue
index bf2d7733e..0c58be7d7 100644
--- a/src/views/mes/workScheduling/components/qualifiedCheck.vue
+++ b/src/views/mes/workScheduling/components/qualifiedCheck.vue
@@ -7,29 +7,29 @@
width="600px"
>
{{ dialogTitle }}
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -51,7 +51,8 @@ const formLoading = ref(false)
const personOption=ref([])
const saveFlag=ref(false)
const planDayCode=ref()
-const form = reactive({
+const baseformRef=ref()
+const baseform = reactive({
id:0,
planDayCode: "",
processCode:"",
@@ -66,13 +67,13 @@ const openDetail = async (row: any, titleName: any,code:string) => {
//console.log('row-68',row)
dialogVisible.value = true
dialogTitle.value = titleName
- form.processCode=row.nodeCode
- form.personSelected=[]
- form.planDayCode=code
- form.personSelected=[]
- form.qualified=0
- form.unqualified=0
- form.id=row.id
+ baseform.processCode=row.nodeCode
+ baseform.personSelected=[]
+ baseform.planDayCode=code
+ baseform.personSelected=[]
+ baseform.qualified=0
+ baseform.unqualified=0
+ baseform.id=row.id
planDayCode.value=code
getCurrentWorkerList(row.nodeCode)
@@ -92,30 +93,37 @@ const qcount=ref(0)
//数量处理
const handleCount = () => {
qcount.value++
- if (form.qualified> rowData.value.planCount - form.unqualified) {
+ if (baseform.qualified> rowData.value.planCount - baseform.unqualified) {
message.alert('合格数量超限！计划总数【'+rowData.value.planCount+'】')
- form.qualified =rowData.value.planCount - form.unqualified
+ baseform.qualified =rowData.value.planCount - baseform.unqualified
return
}
- if (form.unqualified> rowData.value.planCount -form.qualified ) {
+ if (baseform.unqualified> rowData.value.planCount -baseform.qualified ) {
message.alert('不合格数量超限！')
- form.unqualified =rowData.value.planCount-form.qualified
+ baseform.unqualified =rowData.value.planCount-baseform.qualified
return
}
}
//提交质检
-const saveReport = async() => {
-
- saveFlag.value = true
- try {
- await workschedulingApi.processQualified(form)
- }finally{
- saveFlag.value = false
- dialogVisible.value = false
- emit('close')
- }
+const saveReport = () => {
+ if (!baseformRef) return
+ baseformRef.value.validate((valid) => {
+ if (valid) {
+ saveFlag.value = true
+ try {
+ workschedulingApi.processQualified(baseform)
+ }finally{
+ saveFlag.value = false
+ dialogVisible.value = false
+ emit('close')
+ }
+ } else {
+ console.log('请确认数据的正确！')
+ }
+ })
+
//console.log("report-saveReport-82",data)
//await workschedulingApi.reportWorkByProcess(data)
@@ -124,4 +132,6 @@ const saveReport = async() => {
const emit = defineEmits(['success', 'close'])
defineOptions({ name: 'qualifiedCheck' })
defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
+
+
From 3ed382f4a389baaf32d44227794e167c9614fdb2 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 16 May 2024 14:45:38 +0800
Subject: [PATCH 08/33] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB?=
=?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/TableForm/src/TableForm.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 87eb4a851..1cfc8ba01 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -303,7 +303,7 @@
From 21cf53286f8241b82630b1517634c3ec3b59e976 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Thu, 16 May 2024 14:50:57 +0800
Subject: [PATCH 09/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.hella15 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.hella15 b/.env.hella15
index 15f726a54..ee35a6305 100644
--- a/.env.hella15
+++ b/.env.hella15
@@ -4,10 +4,10 @@ NODE_ENV=production
VITE_DEV=false
# 请求路径
-VITE_BASE_URL='https://172.21.32.15:55563/api'
+VITE_BASE_URL='https://scp.faway-hella.com/api'
# 上传路径
-VITE_UPLOAD_URL='https://172.21.32.15:55563/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='https://scp.faway-hella.com/api/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
From fc0b540c98e6b6f8582d7c2ba941312ca19eb4c0 Mon Sep 17 00:00:00 2001
From: chenfang