Browse Source

Merge remote-tracking branch 'origin/hella_online_20240803' into hella_online_20240803

linshi20240813
gaojs 3 months ago
parent
commit
c354fd481b
  1. 3
      src/api/wms/demandforecastingDetail/index.ts
  2. 52
      src/api/wms/demandforecastingMain/index.ts
  3. 9
      src/components/BasicForm/src/BasicForm.vue
  4. 2
      src/components/Search/src/Search.vue
  5. 125
      src/components/TableForm/src/TableForm.vue
  6. 5
      src/views/qms/inspectionJob/addForm.vue
  7. 78
      src/views/qms/inspectionJob/index.vue
  8. 4
      src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
  9. 6
      src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
  10. 8
      src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
  11. 34
      src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
  12. 4
      src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
  13. 4
      src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
  14. 13
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
  15. 78
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
  16. 11
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue

3
src/api/wms/demandforecastingDetail/index.ts

@ -72,6 +72,9 @@ const getPageParams = (params)=>{
export const getDemandforecastingDetailPage = async (params) => { export const getDemandforecastingDetailPage = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
if(params.flag){
delete params.flag
}
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/demandforecasting-detail/senior', data }) return await request.post({ url: '/wms/demandforecasting-detail/senior', data })
} else { } else {

52
src/api/wms/demandforecastingMain/index.ts

@ -1,4 +1,5 @@
import request from '@/config/axios' import request from '@/config/axios'
import { isString } from '@/utils/is'
export interface DemandforecastingMainVO { export interface DemandforecastingMainVO {
supplierCode: string supplierCode: string
@ -66,6 +67,56 @@ export const witPurchaseMain = async (id: number) => {
return await request.post({ url: `/wms/demandforecasting-main/wit?id=` + id }) return await request.post({ url: `/wms/demandforecasting-main/wit?id=` + id })
} }
// 要货预测-列表和头部请求参数
const getPageParams = (params)=>{
// 到货日期
if(params.dueDate&&params.dueDate.length>0){
if(isString(params.dueDate[0])){
params.startDate = params.dueDate[0]
}else{
params.startDate = params.dueDate[0].format('YYYY-MM-DD')
}
}
if(params.dueDate&&params.dueDate.length>1){
if(isString(params.dueDate[1])){
params.endDate = params.dueDate[1]
}else{
params.endDate = params.dueDate[1].format('YYYY-MM-DD')
}
}
params.dueDate = ''
//计划员
if(params.planerId&&params.planerId.length>0){
params.planers = params.planerId.join(',')
}
params.planerId = ''
// 供应商代码
if(params.supplierCode&&params.supplierCode.length>0){
let keyValue = params.supplierCode.split(' ')
keyValue.forEach(item=>{item = item.trim()})
params.supplierCodes = keyValue.join(',')
}
params.supplierCode = ''
// 物料代码
if(params.itemCode&&params.itemCode.length>0){
let keyValue = params.itemCode.split(' ')
keyValue.forEach(item=>{item = item.trim()})
params.itemCodes = keyValue.join(',')
}
params.itemCode = ''
// 版本号
if(params.version&&params.version.length>0){
let keyValue = params.version.split(' ')
keyValue.forEach(item=>{item = item.trim()})
params.versions = keyValue.join(',')
}
params.version = ''
return params
}
// 导出要货预测主 Excel // 导出要货预测主 Excel
export const exportDemandforecastingMain = async (params) => { export const exportDemandforecastingMain = async (params) => {
if (params.isSearch) { if (params.isSearch) {
@ -73,6 +124,7 @@ export const exportDemandforecastingMain = async (params) => {
const data = {...params} const data = {...params}
return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data }) return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
} else { } else {
params = getPageParams(params)
return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params }) return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
} }
} }

9
src/components/BasicForm/src/BasicForm.vue

@ -107,6 +107,7 @@
:routeName="routeName" :routeName="routeName"
@visibleChange="visibleChange" @visibleChange="visibleChange"
@inputStringFcous='inputStringFcous' @inputStringFcous='inputStringFcous'
:sureDisabled="sureDisabled"
> >
<template v-slot="{ row }"> <template v-slot="{ row }">
<slot :row="row"></slot> <slot :row="row"></slot>
@ -373,6 +374,7 @@ const tableAllSchemas = ref(props.tableAllSchemas)
const tableFormRules = ref(props.tableFormRules) const tableFormRules = ref(props.tableFormRules)
const route = useRoute() // const route = useRoute() //
const routeName = ref('') const routeName = ref('')
const sureDisabled = ref(false)
routeName.value = route.name routeName.value = route.name
// - // -
@ -888,6 +890,7 @@ const onBlur = async (field, e) => {
] ]
count.value++ count.value++
} }
sureDisabled.value= false
} else { } else {
emit('onBlur', field, e) emit('onBlur', field, e)
} }
@ -956,7 +959,9 @@ const inputStringBlur = async (headerItem, val, row, index) => {
defaultButtons.formCloseBtn(null) // defaultButtons.formCloseBtn(null) //
] ]
count.value++ count.value++
} }
sureDisabled.value= false
} }
// //
const onFocus = (field) => { const onFocus = (field) => {
@ -969,6 +974,7 @@ const onFocus = (field) => {
] ]
} }
count.value++ count.value++
sureDisabled.value= true
} }
} }
const inputStringFcous= (headerItem) => { const inputStringFcous= (headerItem) => {
@ -980,6 +986,7 @@ const inputStringFcous= (headerItem) => {
] ]
} }
count.value++ count.value++
sureDisabled.value= true
} }
} }
/** /**

2
src/components/Search/src/Search.vue

@ -271,7 +271,7 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
} }
const Search = ref() const Search = ref()
onMounted(() => {}) onMounted(() => {})
defineExpose({setFormValues}) // open defineExpose({setFormValues,search}) // open
</script> </script>

125
src/components/TableForm/src/TableForm.vue

@ -65,7 +65,8 @@
:width="headerItem?.tableForm?.width" :width="headerItem?.tableForm?.width"
:min-width="headerItem?.tableForm?.minWidth || '200px'" :min-width="headerItem?.tableForm?.minWidth || '200px'"
> >
<el-form @submit.native.prevent <el-form
@submit.native.prevent
ref="TableBaseForm_Ref" ref="TableBaseForm_Ref"
:model="row" :model="row"
style="width: 100%" style="width: 100%"
@ -92,7 +93,7 @@
:disabled="disabledInput(headerItem, row)" :disabled="disabledInput(headerItem, row)"
style="flex: 1" style="flex: 1"
@blur="inputStringBlur(headerItem, row[headerItem.field], row, index)" @blur="inputStringBlur(headerItem, row[headerItem.field], row, index)"
@clear='clearInput(headerItem.field, row, index)' @clear="clearInput(headerItem.field, row, index)"
@focus="inputStringFcous(headerItem)" @focus="inputStringFcous(headerItem)"
/> />
<Icon <Icon
@ -116,7 +117,7 @@
<slot :row="row"></slot> <slot :row="row"></slot>
</el-form-item> </el-form-item>
<!-- 金额输入框 --> <!-- 金额输入框 -->
<el-form-item v-if="headerItem?.tableForm?.type == 'number'" :prop="headerItem.field" > <el-form-item v-if="headerItem?.tableForm?.type == 'number'" :prop="headerItem.field">
<el-input <el-input
:key="headerItem.field + $index" :key="headerItem.field + $index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
@ -169,10 +170,10 @@
@visible-change="visibleChange(headerItem.field, $event, row, $index)" @visible-change="visibleChange(headerItem.field, $event, row, $index)"
> >
<el-option <el-option
v-for="op in initSelectOptions(headerItem,row)" v-for="op in initSelectOptions(headerItem, row)"
:label="t(`ts.${initLabel(headerItem,op)}`).replace('ts.', '')" :label="t(`ts.${initLabel(headerItem, op)}`).replace('ts.', '')"
:value="initValue(headerItem,op)" :value="initValue(headerItem, op)"
:key="initValue(headerItem,op)" :key="initValue(headerItem, op)"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -199,7 +200,7 @@
@blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)" @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
> >
<el-option-group <el-option-group
v-for="group in initSelectOptions(headerItem,row)" v-for="group in initSelectOptions(headerItem, row)"
:key="group.type" :key="group.type"
:label="t(`ts.${group.name}`).replace('ts.', '')" :label="t(`ts.${group.name}`).replace('ts.', '')"
> >
@ -305,7 +306,7 @@
:id="headerItem?.tableForm?.id" :id="headerItem?.tableForm?.id"
> >
<el-radio <el-radio
v-for="(item, index) in initSelectOptions(headerItem,row)" v-for="(item, index) in initSelectOptions(headerItem, row)"
:key="index" :key="index"
:label="t(`ts.${item.value}`).replace('ts.', '')" :label="t(`ts.${item.value}`).replace('ts.', '')"
:size="headerItem?.tableForm?.size" :size="headerItem?.tableForm?.size"
@ -329,7 +330,7 @@
:fill="headerItem?.tableForm?.fill" :fill="headerItem?.tableForm?.fill"
> >
<el-checkbox <el-checkbox
v-for="(item, index) in initSelectOptions(headerItem,row)" v-for="(item, index) in initSelectOptions(headerItem, row)"
:key="index" :key="index"
:label="t(`ts.${item.value}`).replace('ts.', '')" :label="t(`ts.${item.value}`).replace('ts.', '')"
:disabled="itemIsDisabled(headerItem, row)" :disabled="itemIsDisabled(headerItem, row)"
@ -391,32 +392,34 @@
layout="total, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
:total="tableData.length" :total="tableData.length"
/> />
<div class="button flex" v-if="isShowButton || isShowReduceButtonSelection"> <div class="button flex" style="padding-top: 10px" v-if="isShowButton || isShowReduceButtonSelection">
<div class="p-12px" v-if="isShowButton" @click.stop="handleAddTable"> <el-button
<Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" /> type="primary"
<div>{{ t('ts.添加明细') }}</div> link
</div> v-if="isShowButton"
<div class="p-12px" v-if="isShowReduceButtonSelection" @click.stop="handleSelectionDelete"> @click.stop="handleAddTable"
<Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer" /> :disabled="sureDisabled"
<div>{{ t('ts.批量删除') }}</div> :icon="CirclePlus"
</div> size="large"
<div >
class="p-12px" <span>{{ t('ts.添加明细') }}</span>
v-if=" </el-button>
isShowTableFormSearch?.isShowTableFormSearch|| <el-button
routeName == 'PurchaseMain' || type="primary"
routeName == 'PurchaseMain' || link
routeName == 'ProductionMain' || v-if="isShowReduceButtonSelection"
routeName == 'ZZBJDeliverPlanMain' || @click.stop="handleSelectionDelete"
routeName == 'DeliverPlanMain' || :icon="Remove"
routeName == 'DeliverRequestMain' || size="large"
routeName == 'ZZBJDeliverRequestMain' ||
routeName == 'UnplannedreceiptRequestMain'||
routeName == 'RepleinshRequestMain'
"
> >
<el-input v-model="keyWord" style="width: 240px" :placeholder="`请输入${isShowTableFormSearch?.label},多条数据逗号分隔`" /> <span>{{ t('ts.批量删除') }}</span>
</el-button>
<div class="p-12px" v-if="isShowTableFormSearch?.isShowTableFormSearch">
<el-input
v-model="keyWord"
style="width: 240px"
:placeholder="`请输入${isShowTableFormSearch?.label},多条数据逗号分隔`"
/>
<el-button type="primary" style="margin-left: 10px" @click.stop="batchAdd">{{ <el-button type="primary" style="margin-left: 10px" @click.stop="batchAdd">{{
t('批量添加') t('批量添加')
}}</el-button> }}</el-button>
@ -429,6 +432,7 @@
const { t } = useI18n() // const { t } = useI18n() //
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
import { CirclePlus, Remove } from '@element-plus/icons-vue'
const props = defineProps({ const props = defineProps({
// //
isShowButton: { isShowButton: {
@ -502,11 +506,16 @@ const props = defineProps({
type: String, type: String,
required: false, required: false,
default: '' default: ''
},
//
sureDisabled: {
type: Boolean,
default: false
} }
}) })
let isShowTableFormSearch = ref({}) let isShowTableFormSearch = ref({})
console.log(33333,props.tableFields) console.log(33333, props.tableFields)
isShowTableFormSearch.value =props.tableFields.find(item=>item.isShowTableFormSearch) isShowTableFormSearch.value = props.tableFields.find((item) => item.isShowTableFormSearch)
// //
const emit = defineEmits([ const emit = defineEmits([
@ -531,11 +540,13 @@ const emit = defineEmits([
'inputStringFcous' 'inputStringFcous'
]) ])
// | type = radio | type = select // | type = radio | type = select
const initSelectOptions = (headerItem,row) => { const initSelectOptions = (headerItem, row) => {
if(row[headerItem.field+'InitOptions']){ if (row[headerItem.field + 'InitOptions']) {
return row[headerItem.field+'InitOptions'] return row[headerItem.field + 'InitOptions']
}else{ } else {
return headerItem.dictType ? getStrDictOptions(headerItem.dictType) : headerItem.tableForm.initOptions return headerItem.dictType
? getStrDictOptions(headerItem.dictType)
: headerItem.tableForm.initOptions
} }
} }
// //
@ -622,7 +633,7 @@ const TableBaseForm_Ref = ref()
const validateForm = () => { const validateForm = () => {
let _lists = TableBaseForm_Ref.value?.map((v) => v.validate()) let _lists = TableBaseForm_Ref.value?.map((v) => v.validate())
if(!_lists ||_lists.length == 0){ if (!_lists || _lists.length == 0) {
return false return false
} }
return Promise.all(_lists) return Promise.all(_lists)
@ -657,7 +668,7 @@ const inputStringBlur = (headerItem, val, row, index) => {
} }
// //
const inputStringFcous = (headerItem) => { const inputStringFcous = (headerItem) => {
emit('inputStringFcous', headerItem) emit('inputStringFcous', headerItem)
} }
const clearInput = (field, row, index) => { const clearInput = (field, row, index) => {
emit('clearInput', field, row, index) emit('clearInput', field, row, index)
@ -667,7 +678,7 @@ const buttonOperationClick = (row, label, index) => {
emit('buttonOperationClick', row, label, index) emit('buttonOperationClick', row, label, index)
} }
const visibleChange = (field, val, row, index) => { const visibleChange = (field, val, row, index) => {
emit('visibleChange',field, val, row, index) emit('visibleChange', field, val, row, index)
} }
const currentPage = ref(1) const currentPage = ref(1)
const pageSize = ref(10) const pageSize = ref(10)
@ -711,19 +722,19 @@ const disabledInput = (headerItem, row) => {
) )
} }
} }
const initLabel=(headerItem,op)=>{ const initLabel = (headerItem, op) => {
if(headerItem?.tableForm?.labelField){ if (headerItem?.tableForm?.labelField) {
return op[headerItem?.tableForm?.labelField] return op[headerItem?.tableForm?.labelField]
}else{ } else {
return op.label return op.label
} }
}
const initValue=(headerItem,op)=>{
if(headerItem?.tableForm?.valueField){
return op[headerItem?.tableForm?.valueField]
}else{
return op.value
} }
const initValue = (headerItem, op) => {
if (headerItem?.tableForm?.valueField) {
return op[headerItem?.tableForm?.valueField]
} else {
return op.value
}
} }
// setup // setup
defineExpose({ defineExpose({

5
src/views/qms/inspectionJob/addForm.vue

@ -925,8 +925,9 @@ const buttonBaseClick = async (val) => {
} }
// //
else if (val == 'close') { else if (val == 'close') {
// await InspectionJobMainApi.abandonInspectionJobMain(data.value.id) await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
dialogVisible.value = false dialogVisible.value = false
emit('close')
} }
// //
else if (val == 'staging') { else if (val == 'staging') {
@ -934,7 +935,7 @@ const buttonBaseClick = async (val) => {
} }
} }
// //
const emit = defineEmits(['submitForm', 'searchTableSuccess']) const emit = defineEmits(['submitForm', 'searchTableSuccess','close'])
const validateForm = (formRef) => { const validateForm = (formRef) => {
let _lists = formRef?.map((v) => v.validate()) let _lists = formRef?.map((v) => v.validate())
return Promise.all(_lists) return Promise.all(_lists)

78
src/views/qms/inspectionJob/index.vue

@ -20,7 +20,8 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table v-clientTable <Table
v-clientTable
:columns="tableColumns" :columns="tableColumns"
:data="tableObject.tableList" :data="tableObject.tableList"
:loading="tableObject.loading" :loading="tableObject.loading"
@ -57,6 +58,7 @@
:rules="InspectionJobMainRules" :rules="InspectionJobMainRules"
:formAllSchemas="InspectionJobMain.allSchemas" :formAllSchemas="InspectionJobMain.allSchemas"
@submitForm="submitForm" @submitForm="submitForm"
@close="getList"
/> />
<!-- 详情 --> <!-- 详情 -->
<Detail <Detail
@ -83,13 +85,13 @@
:list="list" :list="list"
/> />
<el-dialog <el-dialog
v-model="showQualityReport" v-model="showQualityReport"
:title="t('质检明细')" :title="t('质检明细')"
:append-to-body="false" :append-to-body="false"
destroy-on-close destroy-on-close
fullscreen fullscreen
> >
<iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe> <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
</el-dialog> </el-dialog>
</template> </template>
@ -119,6 +121,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
import AddForm from './addForm.vue' import AddForm from './addForm.vue'
import Detail from './detail.vue' import Detail from './detail.vue'
import { getReportUrl } from '@/utils/systemParam' import { getReportUrl } from '@/utils/systemParam'
import { useUserStore } from '@/store/modules/user'
// //
defineOptions({ name: 'inspectionJobMain' }) defineOptions({ name: 'inspectionJobMain' })
@ -129,6 +132,7 @@ const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(InspectionJobMain.allSchemas.tableColumns) const tableColumns = ref(InspectionJobMain.allSchemas.tableColumns)
const userStore = useUserStore()
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -199,7 +203,7 @@ const buttonBaseClick = (val, item) => {
handleExport() handleExport()
} else if (val == 'refresh') { } else if (val == 'refresh') {
// //
if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { if (tableObject.params.filters && tableObject.params.filters.length > 0) {
searchFormClick({ searchFormClick({
filters: tableObject.params.filters filters: tableObject.params.filters
}) })
@ -231,24 +235,35 @@ const isShowMainButton2 = (row, val) => {
return true return true
} }
} }
//
const isShowMainButton1 = (row, val) => {
if (val.indexOf(row.status) > -1) {
if (userStore.getUser.id == row.acceptUserId) {
return false
} else {
return true
}
} else {
return true
}
}
// - // -
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListJobAccBtn({ // defaultButtons.mainListJobAccBtn({
hide: isShowMainButton(row, ['1']), // hide: isShowMainButton(row, ['1']),
hasPermi: 'qms:inspection-job-main:accept' // hasPermi: 'qms:inspection-job-main:accept'
}), // // }), //
defaultButtons.mainListJobCloBtn({ defaultButtons.mainListJobCloBtn({
hide: isShowMainButton(row, ['1']), hide: isShowMainButton(row, ['1']),
hasPermi: 'qms:inspection-job-main:close' hasPermi: 'qms:inspection-job-main:close'
}), // }), //
defaultButtons.mainListJobAbaBtn({ defaultButtons.mainListJobAbaBtn({
hide: isShowMainButton(row, ['2']), hide: isShowMainButton1(row, ['2']),
hasPermi: 'qms:inspection-job-main:abandon' hasPermi: 'qms:inspection-job-main:abandon'
}), // }), //
defaultButtons.mainListJobExeBtn({ defaultButtons.mainListJobExeBtn({
hide: isShowMainButton(row, ['2']), hide: isShowMainButton(row, ['1', '2']),
hasPermi: 'qms:inspection-job-main:execute' hasPermi: 'qms:inspection-job-main:execute'
}), // }), //
defaultButtons.mainListOrderPubBtn({ defaultButtons.mainListOrderPubBtn({
@ -312,10 +327,19 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionJobMain') detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionJobMain')
} }
// //
const formRef = ref() const formRef = ref()
const execute = async (type: string, row?: number) => { const execute = async (type: string, row?: any) => {
formRef.value.open(type, row) if (row.status == '2') {
if (userStore.getUser.id == row.acceptUserId) {
formRef.value.open(type, row)
} else {
message.error('承接人与当前登录人不一致')
}
} else if (row.status == '1') {
await handleAccept(row.id)
formRef.value.open(type, row)
await getList()
}
} }
/** 关闭按钮操作 */ /** 关闭按钮操作 */
const handleClose = async (id: number) => { const handleClose = async (id: number) => {
@ -326,7 +350,7 @@ const handleClose = async (id: number) => {
await InspectionJobMainApi.closeInspectionJobMain(id) await InspectionJobMainApi.closeInspectionJobMain(id)
message.success(t('common.closeSuccess')) message.success(t('common.closeSuccess'))
// //
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} catch {} } catch {}
} }
/** 发布按钮操作 */ /** 发布按钮操作 */
@ -338,19 +362,19 @@ const handleRelease = async (id: number) => {
await InspectionJobMainApi.releaseInspectionJobMain(id) await InspectionJobMainApi.releaseInspectionJobMain(id)
message.success('发布成功!') message.success('发布成功!')
// //
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} catch {} } catch {}
} }
// //
const handleAccept = async (id: number) => { const handleAccept = async (id: number) => {
try { try {
// //
await message.confirm(t('common.confirmAccept')) // await message.confirm(t('common.confirmAccept'))
// //
await InspectionJobMainApi.acceptInspectionJobMain(id) await InspectionJobMainApi.acceptInspectionJobMain(id)
message.success(t('common.acceptSuccess')) // message.success(t('common.acceptSuccess'))
// (TB) // (TB)
buttonBaseClick('refresh',null) // buttonBaseClick('refresh',null)
} catch {} } catch {}
} }
// //
@ -362,7 +386,7 @@ const handleAbandon = async (id: number) => {
await InspectionJobMainApi.abandonInspectionJobMain(id) await InspectionJobMainApi.abandonInspectionJobMain(id)
message.success(t('common.giveupSuccess')) message.success(t('common.giveupSuccess'))
// //
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} catch {} } catch {}
} }
@ -408,8 +432,8 @@ const submitForm = async (formType, data) => {
// //
if (formType === 'create') { if (formType === 'create') {
getList() getList()
}else{ } else {
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} }
} finally { } finally {
formRef.value.formLoading = false formRef.value.formLoading = false

4
src/views/wms/basicDataManage/itemManage/bom/bom.data.ts

@ -255,7 +255,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isDetail: true, isDetail: true,
isForm: false, isForm: false,
isTable: false, isTable: true,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -278,7 +278,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
field: 'updater', field: 'updater',
isDetail: true, isDetail: true,
isForm: false, isForm: false,
isTable: false, isTable: true,
table: { table: {
width: 150 width: 150
} }

6
src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@ -669,7 +669,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
field: 'creator', field: 'creator',
sort: 'custom', sort: 'custom',
isForm: false, isForm: false,
isTable: false, isTable: true,
table: { table: {
width: 150 width: 150
}, },
@ -680,7 +680,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
formatter: dateFormatter, formatter: dateFormatter,
isForm: false, isForm: false,
isTable: false, isTable: true,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
@ -693,7 +693,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
field: 'updater', field: 'updater',
sort: 'custom', sort: 'custom',
isForm: false, isForm: false,
isTable: false, isTable: true,
table: { table: {
width: 150 width: 150
}, },

8
src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts

@ -199,7 +199,7 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isDetail: true, isDetail: true,
isForm: false, isForm: false,
isTable: false, isTable: true,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -222,7 +222,7 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
field: 'updater', field: 'updater',
isDetail: true, isDetail: true,
isForm: false, isForm: false,
isTable: false, isTable: true,
table: { table: {
width: 150 width: 150
} }
@ -543,7 +543,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isDetail: true, isDetail: true,
isForm: false, isForm: false,
isTable: false, isTable: true,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -566,7 +566,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
field: 'updater', field: 'updater',
isDetail: true, isDetail: true,
isForm: false, isForm: false,
isTable: false, isTable: true,
table: { table: {
width: 150 width: 150
} }

34
src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts

@ -129,6 +129,40 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive<CrudSchem
}, },
isForm: false, isForm: false,
}, },
{
label: '创建者',
field: 'creator',
sort: 'custom',
isForm: false,
isTable: true,
table: {
width: 150
},
},
{
label: '最后更新时间',
field: 'updateTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
isTable: true,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
},
},
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
isForm: false,
isTable: true,
table: {
width: 150
},
},
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',

4
src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts

@ -246,7 +246,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isDetail: true, isDetail: true,
isForm: false, isForm: false,
isTable: false, isTable: true,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -269,7 +269,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
field: 'updater', field: 'updater',
isDetail: true, isDetail: true,
isForm: false, isForm: false,
isTable: false, isTable: true,
table: { table: {
width: 150 width: 150
} }

4
src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts

@ -198,7 +198,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isDetail: true, isDetail: true,
isForm: false, isForm: false,
isTable: false, isTable: true,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -221,7 +221,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
field: 'updater', field: 'updater',
isDetail: true, isDetail: true,
isForm: false, isForm: false,
isTable: false, isTable: true,
table: { table: {
width: 150 width: 150
} }

13
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@ -208,13 +208,14 @@ const searchFormClick = (searchData) => {
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
try { // try {
await getListHead() // await getListHead()
} catch (error) { // } catch (error) {
} // }
// updateDateTableColumns() // // updateDateTableColumns()
getList() // getList()
seachRef.value.search()
importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate() importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
}) })
</script> </script>

78
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts

@ -109,45 +109,45 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{ // {
label: '版本号', // label: '版本号',
field: 'version', // field: 'version',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
isSearch:true, // isSearch:true,
search: { // search: {
// labelMessage: '信息提示说明!!!', // // labelMessage: '信息提示说明!!!',
componentProps: { // componentProps: {
multiple: true, // multiple: true,
enterSearch: true, // enterSearch: true,
isSearchList: true, // 开启查询弹窗 // isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择版本号', // 输入框占位文本 // searchListPlaceholder: '请选择版本号', // 输入框占位文本
searchField: 'detailVersion', // 查询弹窗赋值字段 // searchField: 'detailVersion', // 查询弹窗赋值字段
searchTitle: '版本号', // 查询弹窗标题 // searchTitle: '版本号', // 查询弹窗标题
searchAllSchemas: Version.allSchemas, // 查询弹窗所需类 // searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法 // searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
searchCondition: [{ // searchCondition: [{
key: 'supplierCodes', // key: 'supplierCodes',
value: 'supplierCode', // value: 'supplierCode',
message: '请填写供应商代码!', // message: '请填写供应商代码!',
isMainValue: true, // isMainValue: true,
isCSV:true,//是否用逗号分隔参数 // isCSV:true,//是否用逗号分隔参数
},{ // },{
key: 'itemCodes', // key: 'itemCodes',
value: 'itemCode', // value: 'itemCode',
message: '请填写物料代码!', // message: '请填写物料代码!',
isMainValue: true, // isMainValue: true,
isCSV:true,//是否用逗号分隔参数 // isCSV:true,//是否用逗号分隔参数
},{ // },{
key: 'available', // key: 'available',
value: 'TRUE', // value: 'TRUE',
isMainValue: false // isMainValue: false
}] // }]
} // }
} // }
}, // },
{ {
label: '到货日期', label: '到货日期',
field: 'dueDate', field: 'dueDate',

11
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/> <Search ref="seachRef" :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/>
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -174,6 +174,7 @@ const buttonBaseClick = async (val, item) => {
const searchClick = async (data)=>{ const searchClick = async (data)=>{
data.flag = 1
console.log('searchClick',data) console.log('searchClick',data)
await setSearchParamsHead(data) await setSearchParamsHead(data)
// updateDateTableColumns() // updateDateTableColumns()
@ -267,12 +268,14 @@ const readHandle = (row,isAll)=>{
}) })
} }
const seachRef = ref()
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
await getListHead() // await getListHead()
// updateDateTableColumns() // // updateDateTableColumns()
getList() // getList()
seachRef.value.search()
importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate() importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
}) })
</script> </script>

Loading…
Cancel
Save