Browse Source

Merge branch 'hella_online_20240911' into master_hella

hella_online_20240913
陈薪名 2 months ago
parent
commit
ebdfa197dd
  1. 2
      README.md
  2. 1
      src/locales/en-US.ts
  3. 1
      src/locales/zh-CN.ts
  4. 21
      src/views/login/components/LoginForm.vue
  5. 17
      src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
  6. 11
      src/views/wms/agvManage/backflushDetailbQad/index.vue
  7. 2
      src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
  8. 5
      src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
  9. 27
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
  10. 4
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
  11. 29
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
  12. 47
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

2
README.md

@ -5,7 +5,7 @@ dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string', dictClass: 'string',
dictAllOption:true,// true 字典中--下拉框中展示全选按钮 dictAllOption:true,// true 字典中--下拉框中展示全选按钮
dictAllValue:'全选', // 全选按钮的value值 dictAllValue:'全选', // 全选按钮的value值
hiddenSearchHigh?: boolean // 是否隐藏高级筛选 hiddenSearchHigh: boolean // 是否隐藏高级筛选
**form表单查询弹窗配置** **form表单查询弹窗配置**
form: { form: {

1
src/locales/en-US.ts

@ -760,6 +760,7 @@ export default {
:'Change Record', :'Change Record',
:'Add Detail', :'Add Detail',
:'Upload quality report', :'Upload quality report',
:'Upload your resume',
:'Upload the quality inspection report', :'Upload the quality inspection report',
:'piece', :'piece',
:'sheet', :'sheet',

1
src/locales/zh-CN.ts

@ -760,6 +760,7 @@ export default {
:'变更记录', :'变更记录',
:'添加明细', :'添加明细',
:'上传质量报告', :'上传质量报告',
:'上传履历表',
:'上传质检报告', :'上传质检报告',
:'个', :'个',
:'张', :'张',

21
src/views/login/components/LoginForm.vue

@ -258,18 +258,15 @@
} }
console.log('登陆res',res) console.log('登陆res',res)
try{ const msg = await PassWordApi.validateResetTime(res.userId)
await PassWordApi.validateResetTime(res.userId) if(msg){
}catch (e) { await ElMessageBox.alert(
if (e.code === 1002000010) { '<strong>'+msg+'</strong>',
await ElMessageBox.alert( '重要提示',
'<strong>密码长时间未修改,存在安全隐患,请及时修改</strong>', {
'重要提示', dangerouslyUseHTMLString: true,
{ }
dangerouslyUseHTMLString: true, )
}
)
}
} }
if (!res) { if (!res) {
console.log('登录-195') console.log('登录-195')

17
src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts

@ -11,11 +11,7 @@ export const BackflushDetailbQadRules = reactive({
}) })
export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '数量',
field: 'qty',
sort: 'custom',
},
{ {
label: '制品收货记录单据号', label: '制品收货记录单据号',
field: 'productreceiptNumber', field: 'productreceiptNumber',
@ -96,6 +92,17 @@ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{
label: '备注',
field: 'remark',
sort: 'custom',
isSearch: true,
},
{
label: '数量',
field: 'qty',
sort: 'custom',
},
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',

11
src/views/wms/agvManage/backflushDetailbQad/index.vue

@ -27,6 +27,10 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
> >
<template #qty="{row}">
<span :class="{'red-text':row.qty<0}">{{ row.qty}}</span>
</template>
<template #status="{row}"> <template #status="{row}">
<span>{{ row.status==0?'未执行':row.status==1?'成功':'失败'}}</span> <span>{{ row.status==0?'未执行':row.status==1?'成功':'失败'}}</span>
</template> </template>
@ -258,3 +262,10 @@ onMounted(async () => {
}) })
</script> </script>
<style lang="scss" scoped>
.red-text{
color:var(--el-color-danger);
font-weight:700;
}
</style>

2
src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@ -41,7 +41,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="t('ts.状态').replace('ts.','')" prop="status"> <el-form-item :label="t('ts.状态').replace('ts.','')" prop="status">
<el-switch key="status" v-model="formData.status" /> <el-switch key="status" v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

5
src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@ -419,7 +419,10 @@ export const ScrapJobMain = useCrudSchemas(
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
} },
isTable:false,
isForm:false,
isTableForm:false,
}, },
{ {
label: '自动完成', label: '自动完成',

27
src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@ -383,17 +383,17 @@ export const ScrapRecordMain = useCrudSchemas(
width: 150 width: 150
} }
}, },
{ // {
label: '接口类型', // label: '接口类型',
field: 'interfaceType', // field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE, // dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string', // dictClass: 'string',
isTable: true, // isTable: true,
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
} // }
}, // },
{ {
label: '通知单描述', label: '通知单描述',
field: 'noticeRemark', field: 'noticeRemark',
@ -411,7 +411,10 @@ export const ScrapRecordMain = useCrudSchemas(
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
} },
isTable:false,
isForm:false,
isTableForm:false,
}, },
{ {
label: '是否已撤销', label: '是否已撤销',

4
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@ -1101,14 +1101,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
disabled:true, disabled:true,
min: 0, min: 0,
precision: 6, precision: 2,
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
disabled:true, disabled:true,
min: 0, min: 0,
precision: 6, precision: 2,
}, },
}, },
{ {

29
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts

@ -159,3 +159,32 @@ export const SupplierdeliverInspectionDetailRules = reactive({
{ required: true, message: '请输入发货数量', trigger: 'blur' } { required: true, message: '请输入发货数量', trigger: 'blur' }
], ],
}) })
export const CurriculumVitae = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '上传履历表',
field: 'uploadFile',
sort: 'custom',
isTable:false,
isTableForm:false,
form: {
component: 'UploadFile',
componentProps: {
upData:{
tableId: '',
tableName: 'SupplierdeliverInspectionDetail',
},
fileType:['pdf'],
fileSize:100,
limit:20000
}
},
}
]))
//表单校验
export const CurriculumVitaeRules = reactive({
uploadFile: [
{ required: true, message: '请上传文件', trigger: 'blur' }
]
})

47
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -152,6 +152,14 @@
@footButtonClick="footButtonClick" @footButtonClick="footButtonClick"
@formSelectChange="formSelectChangeLabel" @formSelectChange="formSelectChangeLabel"
/> />
<!-- 上传履历表 -->
<BasicForm
ref="curriculumVitaeRef"
:formAllSchemas="CurriculumVitae.allSchemas"
@success="submitCurriculumVitae"
:tableFormRules="CurriculumVitaeRules"
:isBusiness="false"
/>
<!-- 上传质量报告 --> <!-- 上传质量报告 -->
<BasicForm <BasicForm
ref="ploadQualityReportRef" ref="ploadQualityReportRef"
@ -199,7 +207,9 @@ import {
} from './supplierdeliverRequestMain.data' } from './supplierdeliverRequestMain.data'
import { import {
SupplierdeliverInspectionDetail, SupplierdeliverInspectionDetail,
SupplierdeliverInspectionDetailRules SupplierdeliverInspectionDetailRules,
CurriculumVitae,
CurriculumVitaeRules
} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data' } from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain' import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail' import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
@ -534,6 +544,16 @@ const butttondata = (row, $index) => {
hide: isShowMainButton(row, ['1', '2', '3']), hide: isShowMainButton(row, ['1', '2', '3']),
hasPermi: 'wms:supplierdeliver-request-main:uploadCheck' hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'
}), // }), //
// {
// label: t('ts.'),
// name: 'mainPlanCurriculumVitae',
// hide: row.status!=5,
// type: 'primary',
// icon: '',
// color: '',
// hasPermi: '',
// link: true //
// }, //
defaultButtons.mainListPlanSubBtn({ defaultButtons.mainListPlanSubBtn({
hide: isShowMainButton(row, ['1']), hide: isShowMainButton(row, ['1']),
hasPermi: 'wms:supplierdeliver-request-main:sub' hasPermi: 'wms:supplierdeliver-request-main:sub'
@ -606,6 +626,9 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanUploadQualityReport') { } else if (val == 'mainPlanUploadQualityReport') {
// //
handleUploadQualityReport(row) handleUploadQualityReport(row)
}else if (val == 'mainPlanCurriculumVitae') {
//
handleUploadCurriculumVitae(row)
} else if (val == 'mainPlanSub') { } else if (val == 'mainPlanSub') {
// //
handleSub(row.masterId) handleSub(row.masterId)
@ -948,6 +971,28 @@ const handleUploadQualityReport = async (row) => {
//uploadQualityReportTableData.value = [tableFormKeys] //uploadQualityReportTableData.value = [tableFormKeys]
} }
const curriculumVitaeRef = ref()
const submitCurriculumVitae = async (formType, data) => {
console.log('上传履历表',data)
}
/** 上传质量报告 */
const handleUploadCurriculumVitae = async (row) => {
const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(
(item) => item.field == 'uploadFile'
)
if (uploadFile) {
uploadFile['componentProps']['upData']['tableId'] = row.masterId
}
curriculumVitaeRef.value.open(
'create',
null,
{ masterId: row.masterId },
t('ts.上传履历表'),
t('ts.上传履历表')
)
}
const submitFormUploadQualityReport = async (formType, data) => { const submitFormUploadQualityReport = async (formType, data) => {
delete data.number delete data.number
data.subList = uploadQualityReportTableData.value // data.subList = uploadQualityReportTableData.value //

Loading…
Cancel
Save