sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'hella_online_20240904' into master_hella

hella_online_20240911
陈薪名 2 months ago
parent
efa4c72aba 93bea9160b
commit
7fa7443c2a
23 changed files with 358 additions and 308 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/api/wms/demandforecastingDetail/index.ts
  2. 6
      src/api/wms/demandforecastingMain/index.ts
  3. 4
      src/components/Annex/src/Annex.vue
  4. 57
      src/views/qms/inspectionQ2/index.vue
  5. 2
      src/views/qms/inspectionQ2/inspectionQ2.data.ts
  6. 4
      src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
  7. 15
      src/views/wms/inventoryManage/balanceSummary/index.vue
  8. 6
      src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
  9. 14
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
  10. 6
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
  11. 2
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
  12. 152
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
  13. 80
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
  14. 124
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
  15. 10
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
  16. 3
      src/views/wms/issueManage/issue/issueRequestMain/index.vue
  17. 90
      src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
  18. 3
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
  19. 8
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
  20. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
  21. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
  22. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
  23. 67
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

8
src/api/wms/demandforecastingDetail/index.ts
View File

@ -35,7 +35,12 @@ const getPageParams = (params)=>{
params.endDate = params.dueDate[1].format('YYYY-MM-DD')
}
}
params.dueDate = ''
console.log(params.dueDate)
if (!params.dueDate || params.dueDate.length == 0) {
params.startDate = ''
params.endDate = ''
}
// params.dueDate = ''
//计划员
if(params.planerId&&params.planerId.length>0){
@ -79,7 +84,6 @@ export const getDemandforecastingDetailPage = async (params) => {
return await request.post({ url: '/wms/demandforecasting-detail/senior', data })
} else {
params = getPageParams(params)
console.log('params',params)
return await request.get({ url: `/wms/demandforecasting-detail/page`, params })
}
}

6
src/api/wms/demandforecastingMain/index.ts
View File

@ -85,7 +85,11 @@ const getPageParams = (params)=>{
params.endDate = params.dueDate[1].format('YYYY-MM-DD')
}
}
params.dueDate = ''
if (!params.dueDate || params.dueDate.length == 0) {
params.startDate = ''
params.endDate = ''
}
// params.dueDate = ''
//计划员
if(params.planerId&&params.planerId.length>0){

4
src/components/Annex/src/Annex.vue
View File

@ -4,7 +4,9 @@
<div class="title flex items-center">
<!-- <div class="title-txt">附件</div> -->
<UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :fileSize="fileSize" :title="t('ts.添加附件')" :upData="upData" :limit="10"
@update:modelValue="handleAnnexSuccess" v-if="showAddBtn&&annexData.annexList.length<5"/>
@update:modelValue="handleAnnexSuccess" v-if="showAddBtn"/>
<!-- HL-5838 5条限制影响了供应商发货申请上传质检报告，这个限制没找到认领的需求，所以放开 -->
<!-- @update:modelValue="handleAnnexSuccess" v-if="showAddBtn&&annexData.annexList.length<5"/> -->
</div>
<div class="list">
<div class="item flex items-start" v-for="(item, index) in annexData.annexList" :key="index">

57
src/views/qms/inspectionQ2/index.vue
View File

@ -131,13 +131,20 @@ const clearSearchInput = (formField) => {
if (formField == 'itemCode') {
basicFormRef.value.formRef.setValues({
itemName: '',
SupplierCode: '',
SupplierName: ''
supplierCode: '',
supplierName: '',
purchaseReceiptNumber: ''
})
Q2.allSchemas.formSchema.forEach((item) => {
if (item.field == 'supplierCode') {
item.componentProps.options = []
}
})
}
if (formField == 'lightItemCode') {
basicFormRef.value.formRef.setValues({
standardCostPrice: '',
lightItemName: '',
lightQty: 0,
claimAmount: '',
otherClaimAmount: 0,
@ -147,7 +154,9 @@ const clearSearchInput = (formField) => {
})
const params2 = {
by: 'ASC',
filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }],
filters: [
{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }
],
pageNo: 1,
pageSize: 500,
sort: ''
@ -212,22 +221,22 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
setV['summaryAmount'] = 0
setV['disbursementAmount'] = 0
setV['remainingAmount'] = 0
 const params2 = {
        by: 'ASC',
        filters: [{ column: 'itemCode', action: '==', value: val[0].code }],
        pageNo: 1,
        pageSize: 500,
        sort: ''
      }
      params2.isSearch = true
      StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
        if (res.list?.length > 0) {
          priceObj.value = res.list[0]
          formRef.setValues({
            standardCostPrice: priceObj.value.price
          })
        }
      })
const params2 = {
by: 'ASC',
filters: [{ column: 'itemCode', action: '==', value: val[0].code }],
pageNo: 1,
pageSize: 500,
sort: ''
}
params2.isSearch = true
StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
if (res.list?.length > 0) {
priceObj.value = res.list[0]
formRef.setValues({
standardCostPrice: priceObj.value.price
})
}
})
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}
@ -245,9 +254,10 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
}
if (formField == 'itemCode') {
setV['SupplierCode'] = ''
setV['SupplierName'] = ''
setV['supplierCode'] = ''
setV['supplierName'] = ''
setV['itemName'] = ''
setV['purchaseReceiptNumber'] = ''
setV['uom'] = val[0].supplierUom
Q2Api.getEmail().then((res) => {
@ -293,8 +303,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
})
}
})
if (val[0].lightItemCode == null) {
if (basicFormRef.value.formRef.formModel.lightItemCode == null||
basicFormRef.value.formRef.formModel.lightItemCode == ''
) {
setV['standardCostPrice'] = ''
setV['lightQty'] = 0
setV['claimAmount'] = ''

2
src/views/qms/inspectionQ2/inspectionQ2.data.ts
View File

@ -23,7 +23,7 @@ export const Q2Rules = reactive({
itemCode: [{ required: true, message: '请选择供应商物料代码', trigger: 'change' }],
supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }],
purchaseReceiptNumber: [
{ required: true, message: '请选择采购收货单号', trigger: 'change' },
// { required: true, message: '请选择采购收货单号', trigger: 'change' },
{ max: 255, message: '不得超过255个字符', trigger: 'blur' }
],
claimTime: [{ required: true, message: '请选择索赔日期', trigger: 'change' }],

4
src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
View File

@ -63,6 +63,10 @@ export const BalanceSummary = useCrudSchemas(
label: ' ',
field: 'name',
sort: 'custom',
align: 'left',
table:{
width: 350
}
},
{
label: '总数',

15
src/views/wms/inventoryManage/balanceSummary/index.vue
View File

@ -26,6 +26,7 @@
</el-table>
</template>
<script setup lang="ts">
// 库存汇总
import * as BalanceApi from '@/api/wms/balance'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { formatDate } from '@/utils/formatTime'
@ -77,9 +78,15 @@ let defaultParams = {
itemCode:itemCode.value
}
const getList = async (params)=>{
let res = await BalanceApi.getBalanceSummaryPageAll(params)
tableData.value = res
console.log('库存汇总list',res)
loadStart()
try {
let res = await BalanceApi.getBalanceSummaryPageAll(params)
tableData.value = res
console.log('库存汇总list',res)
} finally {
loadDone()
}
}
@ -152,7 +159,7 @@ const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row
// 列表头部按钮
const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:balance:export'}), // 导出
defaultButtons.defaultExportBtn({hasPermi:'wms:balancesummary:export'}), // 导出
defaultButtons.defaultFreshBtn(null),//刷新
]
// 头部按钮事件

6
src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
View File

@ -370,8 +370,8 @@ export const ScrapJobMain = useCrudSchemas(
}
},
{
label: '备注',
field: 'remark',
label: '单据备注',
field: 'remarkMain',
sort: 'custom',
table: {
width: 150
@ -904,7 +904,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
// },
// },
{
label: '备注',
label: '明细备注',
field: 'remark',
sort: 'custom',
table: {

14
src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
View File

@ -373,8 +373,8 @@ export const ScrapRecordMain = useCrudSchemas(
}
},
{
label: '备注',
field: 'remark',
label: '单据备注',
field: 'remarkMain',
sort: 'custom',
table: {
width: 150
@ -399,6 +399,14 @@ export const ScrapRecordMain = useCrudSchemas(
// }
}
},
{
label: '关联单据号',
field: 'relateRecordNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '创建时间',
field: 'createTime',
@ -728,7 +736,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
// },
// },
{
label: '备注',
label: '明细备注',
field: 'remark',
sort: 'custom',
table: {

6
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
View File

@ -625,8 +625,8 @@ export const ScrapRequestMain = useCrudSchemas(
}
},
{
label: '备注',
field: 'remark',
label: '单据备注',
field: 'remarkMain',
sort: 'custom',
table: {
width: 150
@ -1171,7 +1171,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
isForm: false,
},
{
label: '备注',
label: '明细备注',
field: 'remark',
sort: 'custom',
table: {

2
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
View File

@ -907,7 +907,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '备注',
label: '明细备注',
field: 'remark',
sort: 'custom',
table: {

152
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
View File

@ -409,43 +409,43 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '创建时间',
field: 'createTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
isSearch: true,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
},
// {
// label: '创建时间',
// field: 'createTime',
// formatter: dateFormatter,
// detail: {
// dateFormat: 'YYYY-MM-DD HH:mm:ss'
// },
// sort: 'custom',
// table: {
// width: 180
// },
// form: {
// component: 'DatePicker',
// componentProps: {
// type: 'datetime',
// dateFormat: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'x',
// }
// },
// isSearch: true,
// search: {
// component: 'DatePicker',
// componentProps: {
// valueFormat: 'YYYY-MM-DD HH:mm:ss',
// type: 'daterange',
// defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
// }
// },
// },
// {
// label: '创建者',
// field: 'creator',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '最后更新时间',
field: 'updateTime',
@ -488,26 +488,26 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
// width: 150
// },
// },
{
label: '是否可用',
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isSearch: false,
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
},
// {
// label: '是否可用',
// field: 'available',
// dictType: DICT_TYPE.TRUE_FALSE,
// dictClass: 'string',
// isSearch: false,
// isTable: true,
// sort: 'custom',
// table: {
// width: 150
// },
// form: {
// component: 'Switch',
// value: 'TRUE',
// componentProps: {
// inactiveValue: 'FALSE',
// activeValue: 'TRUE'
// }
// }
// },
{
label: '操作',
field: 'action',
@ -757,25 +757,25 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '接口类型',
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
// {
// label: '项目代码',
// field: 'projectCode',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '接口类型',
// field: 'interfaceType',
// dictType: DICT_TYPE.INTERFACE_TYPE,
// dictClass: 'string',
// isTable: true,
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '明细备注',
field: 'remark',

80
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
View File

@ -351,13 +351,13 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
// },
// },
{
label: '备注',
label: '单据备注',
field: 'remarkMain',
sort: 'custom',
table: {
width: 150
},
isTable: false,
isTable: true,
},
{
label: '自动完成',
@ -625,43 +625,43 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '创建时间',
field: 'createTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
isSearch: true,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
},
// {
// label: '创建时间',
// field: 'createTime',
// formatter: dateFormatter,
// detail: {
// dateFormat: 'YYYY-MM-DD HH:mm:ss'
// },
// sort: 'custom',
// table: {
// width: 180
// },
// form: {
// component: 'DatePicker',
// componentProps: {
// type: 'datetime',
// dateFormat: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'x',
// }
// },
// isSearch: true,
// search: {
// component: 'DatePicker',
// componentProps: {
// valueFormat: 'YYYY-MM-DD HH:mm:ss',
// type: 'daterange',
// defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
// }
// },
// },
// {
// label: '创建者',
// field: 'creator',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '最后更新时间',
field: 'updateTime',
@ -1026,7 +1026,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '备注',
label: '明细备注',
field: 'remark',
sort: 'custom',
table: {

124
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
View File

@ -358,9 +358,9 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
},
},
{
label: '备注',
label: '单据备注',
field: 'remarkMain',
isTable:false,
isTable:true,
sort: 'custom',
table: {
width: 150
@ -393,45 +393,45 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
},
{
label: '创建时间',
field: 'createTime',
formatter: dateFormatter,
isTable:false,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
isSearch: true,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'datetimerange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
isTable:false,
table: {
width: 150
},
},
// {
// label: '创建时间',
// field: 'createTime',
// formatter: dateFormatter,
// isTable:false,
// detail: {
// dateFormat: 'YYYY-MM-DD HH:mm:ss'
// },
// sort: 'custom',
// table: {
// width: 180
// },
// form: {
// component: 'DatePicker',
// componentProps: {
// type: 'datetime',
// dateFormat: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'x',
// }
// },
// isSearch: true,
// search: {
// component: 'DatePicker',
// componentProps: {
// valueFormat: 'YYYY-MM-DD HH:mm:ss',
// type: 'datetimerange',
// defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
// }
// },
// },
// {
// label: '创建者',
// field: 'creator',
// sort: 'custom',
// isTable:false,
// table: {
// width: 150
// },
// },
{
label: '最后更新时间',
field: 'updateTime',
@ -474,26 +474,26 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
// width: 150
// },
// },
{
label: '是否可用',
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isSearch: false,
isTable: false,
sort: 'custom',
table: {
width: 150
},
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
},
// {
// label: '是否可用',
// field: 'available',
// dictType: DICT_TYPE.TRUE_FALSE,
// dictClass: 'string',
// isSearch: false,
// isTable: false,
// sort: 'custom',
// table: {
// width: 150
// },
// form: {
// component: 'Switch',
// value: 'TRUE',
// componentProps: {
// inactiveValue: 'FALSE',
// activeValue: 'TRUE'
// }
// }
// },
{
label: '操作',
field: 'action',
@ -840,7 +840,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
},
},
{
label: '备注',
label: '明细备注',
field: 'remark',
sort: 'custom',
table: {

10
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
View File

@ -538,14 +538,14 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
}
},
{
label: '备注',
label: '单据备注',
field: 'remarkMain',
sort: 'custom',
table: {
width: 150
},
isTable:false,
sortTableDefault: 1000,
isTable:true,
//sortTableDefault: 1000,
},
{
label: '创建时间',
@ -668,7 +668,7 @@ export const UnplannedreceiptRequestMainRules = reactive({
directCreateRecord: [
{ required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
],
remark: [
remarkMain: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
usageDescription:[
@ -1244,7 +1244,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
}
},
{
label: '备注',
label: '明细备注',
field: 'remark',
sort: 'custom',
table: {

3
src/views/wms/issueManage/issue/issueRequestMain/index.vue
View File

@ -487,6 +487,9 @@ const submitForm = async (formType, submitData) => {
if(data.masterId){
data.id = data.masterId
}
tableData.value.forEach((item,index)=>{
item['orderNumber'] = index+1
})
data.subList = tableData.value // 拼接子表数据参数
if(tableData.value.find(item => (item.qty <= 0))) {
message.warning('数量必须大于0')

90
src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
View File

@ -100,22 +100,22 @@ export const ProductscrapRecordMain = useCrudSchemas(
width: 150
}
},
{
label: '班组',
field: 'team',
sort: 'custom',
table: {
width: 150
}
},
{
label: '班次',
field: 'shift',
sort: 'custom',
table: {
width: 150
}
},
// {
// label: '班组',
// field: 'team',
// sort: 'custom',
// table: {
// width: 150
// }
// },
// {
// label: '班次',
// field: 'shift',
// sort: 'custom',
// table: {
// width: 150
// }
// },
{
label: '报废原因',
field: 'scrappingReason',
@ -270,15 +270,15 @@ export const ProductscrapRecordMain = useCrudSchemas(
},
isTable: false
},
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
// {
// label: '备注',
// field: 'remark',
// sort: 'custom',
// table: {
// width: 150
// },
// isTable: false
// },
{
label: '是否已撤销',
field: 'revokeFlag',
@ -298,6 +298,14 @@ export const ProductscrapRecordMain = useCrudSchemas(
// }
}
},
{
label: '关联单据号',
field: 'relateRecordNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '创建者',
field: 'creator',
@ -721,22 +729,22 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
isTable: false,
},
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
search: {
component: 'Input',
componentProps: {
placeholder: '请输入备注'
}
},
isTable: true,
},
// {
// label: '备注',
// field: 'remark',
// sort: 'custom',
// table: {
// width: 150
// },
// isSearch: true,
// search: {
// component: 'Input',
// componentProps: {
// placeholder: '请输入备注'
// }
// },
// isTable: true,
// },
{
label: '创建时间',
field: 'createTime',

3
src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
View File

@ -390,6 +390,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
// 明细查询页赋值
if(formField == 'productionLineCode'){
row['productionLineCode'] = val[0]['code']
tableData.value = []
}else if(formField == 'fromLocationCode'){
// val.forEach(item=>{
// const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
@ -458,6 +459,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
//成本中心代码
//成本中心类型
setV['costCenterType'] = val[0]['costcentreType']
}else if(formField == 'productionLineCode'){
tableData.value = []
}
formRef.setValues(setV)
}

8
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
View File

@ -723,7 +723,8 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch: true,
isTable:false,
isSearch: false,
sortTableDefault: 10,
},
{
@ -733,6 +734,8 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
isSearch: false,
sortTableDefault: 10,
},
{
@ -746,6 +749,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
hiddenInMain:true,
isTableForm: false,
isForm: false,
isTable:false,
},
// {
// label: '器具号',
@ -820,6 +824,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
sortTableDefault: 16,
hiddenInMain:true,
isTable:false,
},
{
label: '到货主代码',
@ -830,6 +835,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
sortTableDefault: 16,
hiddenInMain:true,
isTable:false,
},
{
label: '订单号',

2
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
View File

@ -76,7 +76,7 @@ export const Supplier1 = useCrudSchemas(reactive<CrudSchema[]>([
export const Version = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '供应商代码',
field: 'supplerCodes',
field: 'supplierCodes',
sort: 'custom',
isSearch:true,
},

1
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
View File

@ -171,7 +171,6 @@ const onSearchChange = (field, value)=>{
}
}
const searchClick = async (data)=>{
console.log('searchClick',data)
await setSearchParamsHead(data)
// updateDateTableColumns()
setSearchParams(data)

2
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
View File

@ -15,7 +15,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
tableId: '',
tableName: 'SupplierdeliverInspectionDetail',
},
fileType:['pdf','png','jpg','jpeg'],
fileType:['pdf'],
fileSize:100,
limit:20000
}

67
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
View File

@ -100,43 +100,7 @@
<Detail
ref="detailRef"
:annexTable="[
{
label: '质检明细',
prop: 'uploadFile',
tableName: 'SupplierdeliverInspectionDetail',
hasSubDetail: true, // 附件中是否展示明细表
showPreview: true, // 附件中是否展示预览按钮
hiddenUpload:false,
hiddenDelete:false,
fileType: ['pdf', 'jpg', 'png', 'jpeg'],
align: 'left',
//明细表数据
subDetailTableData: {
queryParams: [
{
queryField: 'masterId',
rowField: 'masterId'
}
], // 查询参数
getSubList: SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage, //请求接口
tableColumns: SupplierdeliverInspectionDetail.allSchemas.tableColumns,
tableList: [], //表格数据
total: 1,
pageSize: 10,
currentPage: 1
}
}
,{
label: '履历表',
prop: 'uploadFile',
tableName: 'SupplierdeliverInspectionDetail',
hasSubDetail: true, // 附件中是否展示明细表
showPreview: true, // 附件中是否展示预览按钮
hiddenUpload:false,
hiddenDelete:false,
fileType: ['pdf'],
align: 'left'
}
annexInspectionDetail
]"
:isBasic="false"
:allSchemas="SupplierdeliverRequestMain.allSchemas"
@ -250,12 +214,38 @@ const route = useRoute() // 路由信息
const routeName = ref()
const count = ref(0)
routeName.value = route.name
const annexInspectionDetail = ref({
label: '质检明细',
prop: 'uploadFile',
tableName: 'SupplierdeliverInspectionDetail',
hasSubDetail: true, // 附件中是否展示明细表
showPreview: true, // 附件中是否展示预览按钮
hiddenUpload:false,
hiddenDelete:false,
fileType: ['pdf'],
align: 'left',
//明细表数据
subDetailTableData: {
queryParams: [
{
queryField: 'masterId',
rowField: 'masterId'
}
], // 查询参数
getSubList: SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage, //请求接口
tableColumns: SupplierdeliverInspectionDetail.allSchemas.tableColumns,
tableList: [], //表格数据
total: 1,
pageSize: 10,
currentPage: 1
}
})
const tableColumns = ref([
...SupplierdeliverRequestMain.allSchemas.tableColumns,
...SupplierdeliverRequestDetail.allSchemas.tableMainColumns
])
// 字段设置 更新主列表字段
const updataTableColumns = (val) => {
tableColumns.value = val
@ -801,6 +791,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
.get(CACHE_KEY.DEPT)
.find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
annexInspectionDetail.value.hiddenDelete = row.status==8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示
detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain')
}
//添加/修改操作

Write Preview
Loading…
Cancel
Save