Browse Source

Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into hella_online_20240803

hella_online_20240819
ljlong_2630 3 months ago
parent
commit
863b3abfbe
  1. 2
      src/api/wms/productputawayRecordDetail/index.ts
  2. 8
      src/api/wms/productputawayRecordMain/index.ts
  3. 10
      src/api/wms/purchasereturnRequestMain/index.ts
  4. 10
      src/api/wms/supplierinvoiceRecordMain/index.ts
  5. 6
      src/components/Search/src/Search.vue
  6. 1
      src/utils/dict.ts
  7. 8
      src/views/login/components/LoginForm.vue
  8. 94
      src/views/qms/inspectionQ2/inspectionQ2.data.ts
  9. 89
      src/views/qms/inspectionQ3/inspectionQ3.data.ts
  10. 27
      src/views/qms/inspectionRequest/index.vue
  11. 7
      src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
  12. 16
      src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
  13. 12
      src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
  14. 2
      src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
  15. 2
      src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
  16. 62
      src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
  17. 70
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
  18. 100
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  19. 102
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
  20. 100
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
  21. 9
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
  22. 3
      src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
  23. 3
      src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
  24. 3
      src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
  25. 5
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
  26. 10
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
  27. 5
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
  28. 3
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  29. 3
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
  30. 28
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
  31. 5
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
  32. 43
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
  33. 3
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  34. 34
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
  35. 28
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
  36. 1
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
  37. 5
      src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
  38. 3
      src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
  39. 3
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
  40. 3
      src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
  41. 3
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
  42. 3
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
  43. 3
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
  44. 3
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
  45. 3
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
  46. 3
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
  47. 10
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
  48. 7
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
  49. 52
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  50. 7
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
  51. 10
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
  52. 7
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
  53. 20
      src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

2
src/api/wms/productputawayRecordDetail/index.ts

@ -54,7 +54,7 @@ export const getProductputawayRecordDetailPage = async (params) => {
// 查询制品上架记录子列表 // 查询制品上架记录子列表
export const getProductputawayRecordDetailPageAssemble = async (params) => { export const getProductputawayRecordDetailPageAssemble = async (params) => {
  params.type = 'assemble' params.type = 'assemble'
if (params.isSearch) { if (params.isSearch) {
const cmd = { const cmd = {
'column':'type', 'column':'type',

8
src/api/wms/productputawayRecordMain/index.ts

@ -74,8 +74,14 @@ export const deleteProductputawayRecordMain = async (id: number) => {
// 导出制品上架记录主 Excel // 导出制品上架记录主 Excel
export const exportProductputawayRecordMain = async (params) => { export const exportProductputawayRecordMain = async (params) => {
params.type = 'predict' params.type = 'assemble'
if (params.isSearch) { if (params.isSearch) {
const cmd = {
'column':'type',
'action':'==',
'value':'assemble'
}
params.filters.push(cmd)
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data })

10
src/api/wms/purchasereturnRequestMain/index.ts

@ -101,6 +101,11 @@ export const importTemplateSpare = () => {
return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-spare' }) return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-spare' })
} }
// 下载用户导入模板(新)
export const importTemplateNew = () => {
return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-new' })
}
// 关闭采购退货申请主 Excel // 关闭采购退货申请主 Excel
export const closePurchasereturnRequestMain = async (id) => { export const closePurchasereturnRequestMain = async (id) => {
return await request.put({ url: `/wms/purchasereturn-request-main/close?id=` + id }) return await request.put({ url: `/wms/purchasereturn-request-main/close?id=` + id })
@ -131,6 +136,11 @@ export const handlePurchasereturnRequestMain = async (id) => {
return await request.put({ url: `/wms/purchasereturn-request-main/handle?id=` + id }) return await request.put({ url: `/wms/purchasereturn-request-main/handle?id=` + id })
} }
// 处理采购退货申请主(新)
export const handlePurchasereturnRequestMainNew = async (id) => {
return await request.put({ url: `/wms/purchasereturn-request-main/handleNew?id=` + id })
}
// 生成标签 // 生成标签
export const genLabel = async (data) => { export const genLabel = async (data) => {
return await request.post({ url: `/wms/purchasereturn-request-main/genLabel`, data }) return await request.post({ url: `/wms/purchasereturn-request-main/genLabel`, data })

10
src/api/wms/supplierinvoiceRecordMain/index.ts

@ -53,8 +53,14 @@ export const deleteSupplierinvoiceRecordMain = async (id: number) => {
} }
// 导出供应商发票记录主 Excel // 导出供应商发票记录主 Excel
export const exportSupplierinvoiceRecordMain = async (data) => { export const exportSupplierinvoiceRecordMain = async (params) => {
return await request.downloadPost({ url: `/wms/supplierinvoice-record-main/export-excel`, data }) console.log(params)
if (params.isSearch) {
const data = { ...params }
return await request.downloadPost({ url: `/wms/supplierinvoice-record-main/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/supplierinvoice-record-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板

6
src/components/Search/src/Search.vue

@ -342,12 +342,12 @@ defineExpose({setFormValues,search}) // 提供 open 方法,用于打开弹窗
<style lang="scss" scoped> <style lang="scss" scoped>
.search ::v-deep(.el-form-item) { .search ::v-deep(.el-form-item) {
margin-right: 1%; margin-right: 1%;
width: 20%; width: 24%;
} }
.dateSearch ::v-deep(.el-form-item) { .dateSearch ::v-deep(.el-form-item) {
margin-right: 1%; margin-right: 1%;
min-width: 20%; min-width: 320px;
width: auto; width:30%;
} }
.search ::v-deep(.el-form-item:nth-last-child(1)) { .search ::v-deep(.el-form-item:nth-last-child(1)) {
margin-right: 0px; margin-right: 0px;

1
src/utils/dict.ts

@ -346,6 +346,7 @@ export enum DICT_TYPE {
SUPPLIERINVOICE_REQUEST_STATUS = 'supplierinvoice_request_status', //发票申请状态 SUPPLIERINVOICE_REQUEST_STATUS = 'supplierinvoice_request_status', //发票申请状态
SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态 SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态
INVOICE_REQUEST_STATUS = 'invoice_request_status', //待开票申请状态
// ========== system - 消息通知优化 - ========== // ========== system - 消息通知优化 - ==========
MESSAGE_NOTICE_TABLE = 'message_notice_table', //消息通知表 MESSAGE_NOTICE_TABLE = 'message_notice_table', //消息通知表

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

@ -33,7 +33,7 @@
:prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" /> :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px" v-if="needCode!='false'"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px" v-if="needCode">
<el-form-item prop="code"> <el-form-item prop="code">
<div class="flex w-[100%]"> <div class="flex w-[100%]">
<el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')" <el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')"
@ -97,7 +97,7 @@
import * as DeptApi from '@/api/system/dept' import * as DeptApi from '@/api/system/dept'
import { getTenant } from '@/utils/systemParam' import { getTenant } from '@/utils/systemParam'
import { getSystermUpdateAlert,getSystermUpdateUrl,getNeedCode } from '@/utils/systemParam' import { getSystermUpdateAlert,getSystermUpdateUrl,getNeedCode } from '@/utils/systemParam'
const needCode = ref(getNeedCode()) const needCode = ref(getNeedCode()==true||getNeedCode()=='true')
defineOptions({ name: 'LoginForm' }) defineOptions({ name: 'LoginForm' })
@ -174,7 +174,7 @@
// } // }
// } // }
function getCode() { function getCode() {
if(needCode.value=='false'){ if(!needCode.value){
return return
} }
getCodeImg().then(res => { getCodeImg().then(res => {
@ -234,7 +234,7 @@
return return
} }
let res = null let res = null
if(needCode.value=='false'){ if(!needCode.value){
res = await LoginApi.loginNoCode(loginData.loginForm) res = await LoginApi.loginNoCode(loginData.loginForm)
}else{ }else{
res = await LoginApi.login(loginData.loginForm) res = await LoginApi.login(loginData.loginForm)

94
src/views/qms/inspectionQ2/inspectionQ2.data.ts

@ -49,50 +49,7 @@ export const Q2 = useCrudSchemas(
fixed: 'left' fixed: 'left'
} }
}, },
{
label: 'Q1通知单号',
field: 'q1Number',
sort: 'custom',
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q1通知单', // 查询弹窗标题
searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
},
isSearch: true
},
{ {
label: '状态', label: '状态',
field: 'status', field: 'status',
@ -380,6 +337,7 @@ export const Q2 = useCrudSchemas(
} }
} }
}, },
{ {
label: '索赔日期', label: '索赔日期',
field: 'claimTime', field: 'claimTime',
@ -422,6 +380,50 @@ export const Q2 = useCrudSchemas(
} }
} }
}, },
{
label: 'Q1通知单号',
field: 'q1Number',
sort: 'custom',
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q1通知单', // 查询弹窗标题
searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
},
isSearch: true
},
{ {
label: '描述', label: '描述',
field: 'desc', field: 'desc',
@ -473,8 +475,8 @@ export const Q2 = useCrudSchemas(
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange', type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}, }
}, }
}, },
{ {
label: '操作', label: '操作',

89
src/views/qms/inspectionQ3/inspectionQ3.data.ts

@ -48,50 +48,7 @@ export const InspectionQ3Main = useCrudSchemas(
fixed: 'left' fixed: 'left'
} }
}, },
{
label: 'Q1通知单号',
field: 'q1Number',
sort: 'custom',
isSearch: true,
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q1通知单', // 查询弹窗标题
searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
{ {
label: '负责用户', label: '负责用户',
field: 'responUser', field: 'responUser',
@ -157,6 +114,50 @@ export const InspectionQ3Main = useCrudSchemas(
} }
} }
}, },
{
label: 'Q1通知单号',
field: 'q1Number',
sort: 'custom',
isSearch: true,
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q1通知单', // 查询弹窗标题
searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
{ {
label: '描述', label: '描述',
field: 'desc', field: 'desc',

27
src/views/qms/inspectionRequest/index.vue

@ -88,6 +88,17 @@
@ListTableSubmit="ListTableSubmit" @ListTableSubmit="ListTableSubmit"
/> />
</div> </div>
<el-dialog
v-model="showQualityReport"
:title="t('质检明细')"
:append-to-body="false"
destroy-on-close
fullscreen
>
<iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
</el-dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -105,6 +116,7 @@ import ListTable from '@/components/ListTable/src/ListTable.vue'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { getReportUrl } from '@/utils/systemParam'
// import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data' // import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
defineOptions({ name: 'inspectionMain' }) defineOptions({ name: 'inspectionMain' })
@ -226,7 +238,8 @@ const butttondata = (row) => {
defaultButtons.mainListEditBtn({ defaultButtons.mainListEditBtn({
hide: isShowMainButton(row, ['1']), hide: isShowMainButton(row, ['1']),
hasPermi: 'qms:inspection-request-main:edit' hasPermi: 'qms:inspection-request-main:edit'
}) // }),//
defaultButtons.mainListPlanCheckQualityReportBtn({}) //
] ]
} }
const listTableRef = ref() const listTableRef = ref()
@ -263,6 +276,9 @@ const buttonTableClick = async (val, row) => {
'包装信息', '包装信息',
InspectionRequestPackage.allSchemas.tableColumns InspectionRequestPackage.allSchemas.tableColumns
) )
}else if (val == 'mainPlanCheckQualityReport') {
//
checkQualityReport(row)
} }
} }
@ -350,6 +366,15 @@ const handleSubmit = async (id: number) => {
} }
} }
//
const reportHeight = ref(window.innerHeight - 120)
const showQualityReport = ref(false)
const qualityReport = ref('')
const checkQualityReport = async (row) => {
showQualityReport.value = true
qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
}
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm = async (type: string, row?: number) => { const openForm = async (type: string, row?: number) => {

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

@ -446,8 +446,14 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '超过高储是否允许叫料', label: '超过高储是否允许叫料',
field: 'allowIssueRequest', field: 'allowIssueRequest',
sort: 'custom', sort: 'custom',
isSearch: false,
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
// colorType: 'danger',
isTable: true,
table: {
width: 150
},
form: { form: {
component: 'Switch', component: 'Switch',
value: 'TRUE', value: 'TRUE',
@ -456,7 +462,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
activeValue: 'TRUE' activeValue: 'TRUE'
} }
}, },
isTable: false
}, },
// { // {
// label: '优先空库位', // label: '优先空库位',

16
src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts

@ -133,7 +133,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 1, min: 0,
precision: 6 precision: 6
} }
} }
@ -295,12 +295,22 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
])) ]))
const validateQty = (rule: any, value: any, callback: any,a,b) => {
console.log('validateQty',rule, value,a,b)
if (!value) {
callback(new Error('包装数量必须大于0'));
} else {
callback();
}
}
// 表单校验 // 表单校验
export const ItempackagingRules = reactive({ export const ItempackagingRules = reactive({
itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }], itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }],
uom: [{ required: true, message: '计量单位不能为空', trigger: 'change' }], uom: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
packUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }], packUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }],
packQty: [{ required: true, message: '包装数量不能为空', trigger: 'change' }], packQty: [
{ required: true, message: '包装数量不能为空', trigger: 'change' },
{ validator: validateQty, trigger: 'change' }
],
available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }] available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
}) })

12
src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue

@ -77,14 +77,14 @@ const route = useRoute() //路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(Supplieritem.allSchemas.tableColumns) const tableColumns = ref(Supplieritem.allSchemas.tableColumns)
if(routeName.value.includes('SCP')){ // if(routeName.value.includes('SCP')){
tableColumns.value = tableColumns.value.filter(item=>item.field!='action') // tableColumns.value = tableColumns.value.filter(item=>item.field!='action')
} // }
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
if(routeName.value.includes('SCP')){ // if(routeName.value.includes('SCP')){
val = val.filter(item=>item.field!='action') // val = val.filter(item=>item.field!='action')
} // }
tableColumns.value = val tableColumns.value = val
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({

2
src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue

@ -221,12 +221,14 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
tableObject.loading = true
const excelTitle = ref(route.meta.title) const excelTitle = ref(route.meta.title)
const data = await SupplierUserApi.exportSupplierUser(tableObject.params) const data = await SupplierUserApi.exportSupplierUser(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
tableObject.loading = false
} }
} }

2
src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue

@ -142,7 +142,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-job-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-main-job:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //

62
src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue

@ -142,67 +142,70 @@ const importFileName = ref()
*/ */
if ( routeName.value == 'OktoholdJobMain') { if ( routeName.value == 'OktoholdJobMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', // fromInventoryStatus: 'OK',
toInventoryStatus:'HOLD', // toInventoryStatus:'HOLD',
businessType :'OkToHold' businessType :'OkToHold'
} }
fromInventoryStatus.value = 'OK' // fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "HOLD" // toInventoryStatus.value = "HOLD"
businessType.value = 'OkToHold' businessType.value = 'OkToHold'
importFileName.value = '合格转隔离任务' importFileName.value = '合格转隔离任务'
} else if ( routeName.value == 'NoktoholdJobMain') { } else if ( routeName.value == 'NoktoholdJobMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'NOK', // fromInventoryStatus: 'NOK',
toInventoryStatus:'HOLD', // toInventoryStatus:'HOLD',
businessType :'NokToHold' businessType :'NokToHold'
} }
fromInventoryStatus.value = 'NOK' // fromInventoryStatus.value = 'NOK'
toInventoryStatus.value = "HOLD" // toInventoryStatus.value = "HOLD"
businessType.value = 'NokToHold' businessType.value = 'NokToHold'
importFileName.value = '不合格转隔离任务' importFileName.value = '不合格转隔离任务'
} else if ( routeName.value == 'HoldtookJobMain') { } else if ( routeName.value == 'HoldtookJobMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', // fromInventoryStatus: 'HOLD',
toInventoryStatus:'OK', // toInventoryStatus:'OK',
businessType :'HoldToOk' businessType :'HoldToOk'
} }
fromInventoryStatus.value = 'HOLD' // fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "OK" // toInventoryStatus.value = "OK"
businessType.value = 'HoldToOk' businessType.value = 'HoldToOk'
importFileName.value = '隔离转合格任务' importFileName.value = '隔离转合格任务'
} else if ( routeName.value == 'HoldtoscrapJobMain') { } else if ( routeName.value == 'HoldtoscrapJobMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', // fromInventoryStatus: 'HOLD',
toInventoryStatus:'SCRAP', // toInventoryStatus:'SCRAP',
businessType:'HoldToScrap' businessType:'HoldToScrap'
} }
fromInventoryStatus.value = 'HOLD' // fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "SCRAP" // toInventoryStatus.value = "SCRAP"
businessType.value = 'HoldToScrap' businessType.value = 'HoldToScrap'
importFileName.value = '隔离转报废任务' importFileName.value = '隔离转报废任务'
} else if ( routeName.value == 'OktoscrapJobMain') { } else if ( routeName.value == 'OktoscrapJobMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', // fromInventoryStatus: 'OK',
toInventoryStatus:'SCRAP', // toInventoryStatus:'SCRAP',
businessType :'OkToScrap' businessType :'OkToScrap'
} }
fromInventoryStatus.value = 'OK' // fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "SCRAP" // toInventoryStatus.value = "SCRAP"
businessType.value = 'OkToScrap' businessType.value = 'OkToScrap'
importFileName.value = '合格转报废任务' importFileName.value = '合格转报废任务'
} else if ( routeName.value == 'ScraptoholdJobMain') { } else if ( routeName.value == 'ScraptoholdJobMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'SCRAP', // fromInventoryStatus: 'SCRAP',
toInventoryStatus:'HOLD', // toInventoryStatus:'HOLD',
businessType :'ScrapToHold' businessType :'ScrapToHold'
} }
fromInventoryStatus.value = 'SCRAP' // fromInventoryStatus.value = 'SCRAP'
toInventoryStatus.value = "HOLD" // toInventoryStatus.value = "HOLD"
businessType.value = 'ScrapToHold' businessType.value = 'ScrapToHold'
importFileName.value = '报废转隔离任务' importFileName.value = '报废转隔离任务'
} else { } else {
console.log(146 , fromInventoryStatus.value) console.log(146 , fromInventoryStatus.value)
fromInventoryStatus.value = null tableObject.params = {
businessType :'Move'
}
// fromInventoryStatus.value = null
businessType.value = 'Move' businessType.value = 'Move'
importFileName.value = '库存移动任务' importFileName.value = '库存移动任务'
} }
@ -332,6 +335,15 @@ const handleExport = async () => {
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
const cmd = {
'column':'businessType',
'action':'==',
'value':businessType.value
}
if (!Array.isArray(searchData.filters)) {
searchData.filters = [];
}
searchData.filters.push(cmd)
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters

70
src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue

@ -103,61 +103,68 @@ const { tableObject, tableMethods } = useTable({
*/ */
if ( routeName.value == 'OktoholdRecordMain') { if ( routeName.value == 'OktoholdRecordMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', // fromInventoryStatus: 'OK',
toInventoryStatus: 'HOLD', // toInventoryStatus: 'HOLD',
businessType:'OkToHold' businessType:'OkToHold'
} }
fromInventoryStatus.value = 'OK' // fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "HOLD" // toInventoryStatus.value = "HOLD"
businessType.value = 'OkToHold'
importFileName.value = '合格转隔离记录' importFileName.value = '合格转隔离记录'
} else if ( routeName.value == 'NoktoholdRecordMain') { } else if ( routeName.value == 'NoktoholdRecordMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'NOK', // fromInventoryStatus: 'NOK',
toInventoryStatus:'HOLD', // toInventoryStatus:'HOLD',
businessType:'NoktoHold' businessType:'NoktoHold'
} }
fromInventoryStatus.value = 'NOK' // fromInventoryStatus.value = 'NOK'
toInventoryStatus.value = "HOLD" // toInventoryStatus.value = "HOLD"
businessType.value = 'NoktoHold'
importFileName.value = '不合格转隔离记录' importFileName.value = '不合格转隔离记录'
}else if ( routeName.value == 'HoldtookRecordMain') { }else if ( routeName.value == 'HoldtookRecordMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', // fromInventoryStatus: 'HOLD',
toInventoryStatus:'OK', // toInventoryStatus:'OK',
businessType:'HoldtoOk' businessType:'HoldtoOk'
} }
fromInventoryStatus.value = 'HOLD' // fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "OK" // toInventoryStatus.value = "OK"
businessType.value = 'HoldtoOk'
importFileName.value = '隔离转合格记录' importFileName.value = '隔离转合格记录'
} else if ( routeName.value == 'HoldtoscrapRecordMain') { } else if ( routeName.value == 'HoldtoscrapRecordMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', // fromInventoryStatus: 'HOLD',
toInventoryStatus:'SCRAP', // toInventoryStatus:'SCRAP',
businessType:'HoldtoScrap' businessType:'HoldtoScrap'
} }
fromInventoryStatus.value = 'HOLD' // fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "SCRAP" // toInventoryStatus.value = "SCRAP"
businessType.value = 'HoldtoScrap'
importFileName.value = '隔离转报废记录' importFileName.value = '隔离转报废记录'
} else if ( routeName.value == 'OktoscrapRecordMain') { } else if ( routeName.value == 'OktoscrapRecordMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', // fromInventoryStatus: 'OK',
toInventoryStatus:'SCRAP', // toInventoryStatus:'SCRAP',
businessType:'OktoScrap' businessType:'OktoScrap'
} }
fromInventoryStatus.value = 'OK' // fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "SCRAP" // toInventoryStatus.value = "SCRAP"
businessType.value = 'OktoScrap'
importFileName.value = '合格转报废记录' importFileName.value = '合格转报废记录'
} else if ( routeName.value == 'ScraptoholdRecordMain') { } else if ( routeName.value == 'ScraptoholdRecordMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'SCRAP', // fromInventoryStatus: 'SCRAP',
toInventoryStatus:'HOLD', // toInventoryStatus:'HOLD',
businessType:'ScraptoHold' businessType:'ScraptoHold'
} }
fromInventoryStatus.value = 'SCRAP' // fromInventoryStatus.value = 'SCRAP'
toInventoryStatus.value = "HOLD" // toInventoryStatus.value = "HOLD"
businessType.value = 'ScraptoHold'
importFileName.value = '报废转隔离记录' importFileName.value = '报废转隔离记录'
} else { } else {
console.log(146, fromInventoryStatus.value) tableObject.params = {
fromInventoryStatus.value = null businessType :'Move'
}
businessType.value = 'Move' businessType.value = 'Move'
importFileName.value = '库存移动记录' importFileName.value = '库存移动记录'
@ -281,6 +288,15 @@ const importSuccess = () => {
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
const cmd = {
'column':'businessType',
'action':'==',
'value':businessType.value
}
if (!Array.isArray(searchData.filters)) {
searchData.filters = [];
}
searchData.filters.push(cmd)
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters

100
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@ -115,73 +115,78 @@ const { tableObject, tableMethods } = useTable({
/** /**
* OktoholdRequestMain 合格转隔离 * OktoholdRequestMain 合格转隔离
*/ */
if ( routeName.value == 'OktoholdRequestMain') { if ( routeName.value == 'OktoholdRequestMain') {
tableObject.params = { tableObject.params = {
toInventoryStatus:'HOLD' // fromInventoryStatus: 'OK',
// toInventoryStatus:'HOLD',
businessType :'OkToHold'
} }
toInventoryStatus.value = "HOLD" // fromInventoryStatus.value = 'OK'
// toInventoryStatus.value = "HOLD"
businessType.value = 'OkToHold' businessType.value = 'OkToHold'
importFileName.value = '物料转隔离申请' importFileName.value = '物料转隔离申请'
} }
// else if ( routeName.value == 'NoktoholdRequestMain') { else if ( routeName.value == 'NoktoholdRequestMain') {
// tableObject.params = {
// fromInventoryStatus: 'NOK',
// toInventoryStatus:'HOLD'
// }
// fromInventoryStatus.value = 'NOK'
// toInventoryStatus.value = "HOLD"
// businessType.value = 'NokToHold'
// importFileName.value = ''
// }
else if ( routeName.value == 'HoldtookRequestMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', // fromInventoryStatus: 'NOK',
toInventoryStatus:'OK' // toInventoryStatus:'HOLD',
businessType :'NokToHold'
}
// fromInventoryStatus.value = 'NOK'
// toInventoryStatus.value = "HOLD"
businessType.value = 'NokToHold'
importFileName.value = '不合格转隔离申请'
}
else if ( routeName.value == 'HoldtookRequestMain') {
tableObject.params = {
// fromInventoryStatus: 'HOLD',
// toInventoryStatus:'OK',
businessType :'HoldToOk'
} }
fromInventoryStatus.value = 'HOLD' // fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "OK" // toInventoryStatus.value = "OK"
businessType.value = 'HoldToOk' businessType.value = 'HoldToOk'
importFileName.value = '隔离转合格申请' importFileName.value = '隔离转合格申请'
} else if ( routeName.value == 'HoldtoscrapRequestMain') { } else if ( routeName.value == 'HoldtoscrapRequestMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', // fromInventoryStatus: 'HOLD',
toInventoryStatus:'SCRAP' // toInventoryStatus:'SCRAP',
businessType:'HoldToScrap'
} }
fromInventoryStatus.value = 'HOLD' // fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "SCRAP" // toInventoryStatus.value = "SCRAP"
businessType.value = 'HoldToScrap' businessType.value = 'HoldToScrap'
importFileName.value = '隔离转报废申请' importFileName.value = '隔离转报废申请'
} else if ( routeName.value == 'OktoscrapRequestMain') { } else if ( routeName.value == 'OktoscrapRequestMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', // fromInventoryStatus: 'OK',
toInventoryStatus:'SCRAP' // toInventoryStatus:'SCRAP',
businessType :'OkToScrap'
} }
fromInventoryStatus.value = 'OK' // fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "SCRAP" // toInventoryStatus.value = "SCRAP"
businessType.value = 'OkToScrap' businessType.value = 'OkToScrap'
importFileName.value = '合格转报废申请' importFileName.value = '合格转报废申请'
} }
// else if ( routeName.value == 'ScraptoholdRequestMain') { else if ( routeName.value == 'ScraptoholdRequestMain') {
// tableObject.params = { tableObject.params = {
// fromInventoryStatus: 'SCRAP', // fromInventoryStatus: 'SCRAP',
// toInventoryStatus:'HOLD' // toInventoryStatus:'HOLD',
// } businessType :'ScrapToHold'
// fromInventoryStatus.value = 'SCRAP' }
// toInventoryStatus.value = "HOLD" // fromInventoryStatus.value = 'SCRAP'
// businessType.value = 'ScrapToHold' // toInventoryStatus.value = "HOLD"
// importFileName.value = '' businessType.value = 'ScrapToHold'
// } importFileName.value = '报废转隔离申请'
else if( routeName.value == 'InventorymoveRequestMain'){ } else {
fromInventoryStatus.value = null
businessType.value = 'Move'
importFileName.value = '库存移动申请'
}else {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', businessType :'Move'
toInventoryStatus:'SCRAP'
} }
businessType.value = 'Move'
importFileName.value = '库存移动申请'
} }
console.log(99 , businessType.value) console.log(99 , businessType.value)
InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
if(item.field == 'fromWarehouseCode') { if(item.field == 'fromWarehouseCode') {
if (fromInventoryStatus.value) { if (fromInventoryStatus.value) {
@ -789,6 +794,15 @@ const importSuccess = () => {
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
const cmd = {
'column':'businessType',
'action':'==',
'value':businessType.value
}
if (!Array.isArray(searchData.filters)) {
searchData.filters = [];
}
searchData.filters.push(cmd)
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters

102
src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue

@ -116,73 +116,80 @@ const { tableObject, tableMethods } = useTable({
/** /**
* OktoholdRequestMain 合格转隔离 * OktoholdRequestMain 合格转隔离
*/ */
if ( routeName.value == 'OktoholdRequestMain') { if ( routeName.value == 'OktoholdRequestMain') {
tableObject.params = { tableObject.params = {
toInventoryStatus:'HOLD' // fromInventoryStatus: 'OK',
// toInventoryStatus:'HOLD',
businessType :'OkToHold'
} }
toInventoryStatus.value = "HOLD" // fromInventoryStatus.value = 'OK'
// toInventoryStatus.value = "HOLD"
businessType.value = 'OkToHold' businessType.value = 'OkToHold'
importFileName.value = '物料转隔离申请' importFileName.value = '物料转隔离申请'
} }
// else if ( routeName.value == 'NoktoholdRequestMain') { else if ( routeName.value == 'NoktoholdRequestMain') {
// tableObject.params = {
// fromInventoryStatus: 'NOK',
// toInventoryStatus:'HOLD'
// }
// fromInventoryStatus.value = 'NOK'
// toInventoryStatus.value = "HOLD"
// businessType.value = 'NokToHold'
// importFileName.value = ''
// }
else if ( routeName.value == 'HoldtookRequestMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', // fromInventoryStatus: 'NOK',
toInventoryStatus:'OK' // toInventoryStatus:'HOLD',
businessType :'NokToHold'
}
// fromInventoryStatus.value = 'NOK'
// toInventoryStatus.value = "HOLD"
businessType.value = 'NokToHold'
importFileName.value = '不合格转隔离申请'
}
else if ( routeName.value == 'HoldtookRequestMain') {
tableObject.params = {
// fromInventoryStatus: 'HOLD',
// toInventoryStatus:'OK',
businessType :'HoldToOk'
} }
fromInventoryStatus.value = 'HOLD' // fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "OK" // toInventoryStatus.value = "OK"
businessType.value = 'HoldToOk' businessType.value = 'HoldToOk'
importFileName.value = '隔离转合格申请' importFileName.value = '隔离转合格申请'
} else if ( routeName.value == 'HoldtoscrapRequestMain') { } else if ( routeName.value == 'HoldtoscrapRequestMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', // fromInventoryStatus: 'HOLD',
toInventoryStatus:'SCRAP' // toInventoryStatus:'SCRAP',
businessType:'HoldToScrap'
} }
fromInventoryStatus.value = 'HOLD' // fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "SCRAP" // toInventoryStatus.value = "SCRAP"
businessType.value = 'HoldToScrap' businessType.value = 'HoldToScrap'
importFileName.value = '隔离转报废申请' importFileName.value = '隔离转报废申请'
} else if ( routeName.value == 'OktoscrapRequestMain') { } else if ( routeName.value == 'OktoscrapRequestMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', // fromInventoryStatus: 'OK',
toInventoryStatus:'SCRAP' // toInventoryStatus:'SCRAP',
businessType :'OkToScrap'
} }
fromInventoryStatus.value = 'OK' // fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "SCRAP" // toInventoryStatus.value = "SCRAP"
businessType.value = 'OkToScrap' businessType.value = 'OkToScrap'
importFileName.value = '合格转报废申请' importFileName.value = '合格转报废申请'
} }
// else if ( routeName.value == 'ScraptoholdRequestMain') { else if ( routeName.value == 'ScraptoholdRequestMain') {
// tableObject.params = { tableObject.params = {
// fromInventoryStatus: 'SCRAP', // fromInventoryStatus: 'SCRAP',
// toInventoryStatus:'HOLD' // toInventoryStatus:'HOLD',
// } businessType :'ScrapToHold'
// fromInventoryStatus.value = 'SCRAP' }
// toInventoryStatus.value = "HOLD" // fromInventoryStatus.value = 'SCRAP'
// businessType.value = 'ScrapToHold' // toInventoryStatus.value = "HOLD"
// importFileName.value = '' businessType.value = 'ScrapToHold'
// } importFileName.value = '报废转隔离申请'
else if( routeName.value == 'InventorymoveRequestMain'){ } else {
fromInventoryStatus.value = null
businessType.value = 'Move'
importFileName.value = '库存移动申请'
}else {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', businessType :'Move'
toInventoryStatus:'SCRAP'
} }
businessType.value = 'Move'
importFileName.value = '库存移动申请'
} }
console.log(99 , businessType.value) console.log(99 , businessType.value)
InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
if(item.field == 'fromWarehouseCode') { if(item.field == 'fromWarehouseCode') {
if (fromInventoryStatus.value) { if (fromInventoryStatus.value) {
@ -803,6 +810,15 @@ const importSuccess = () => {
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
const cmd = {
'column':'businessType',
'action':'==',
'value':businessType.value
}
if (!Array.isArray(searchData.filters)) {
searchData.filters = [];
}
searchData.filters.push(cmd)
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters

100
src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue

@ -116,73 +116,78 @@ const { tableObject, tableMethods } = useTable({
/** /**
* OktoholdRequestMain 合格转隔离 * OktoholdRequestMain 合格转隔离
*/ */
if ( routeName.value == 'OktoholdRequestMain') { if ( routeName.value == 'OktoholdRequestMain') {
tableObject.params = { tableObject.params = {
toInventoryStatus:'HOLD' // fromInventoryStatus: 'OK',
// toInventoryStatus:'HOLD',
businessType :'OkToHold'
} }
toInventoryStatus.value = "HOLD" // fromInventoryStatus.value = 'OK'
// toInventoryStatus.value = "HOLD"
businessType.value = 'OkToHold' businessType.value = 'OkToHold'
importFileName.value = '物料转隔离申请' importFileName.value = '物料转隔离申请'
} }
// else if ( routeName.value == 'NoktoholdRequestMain') { else if ( routeName.value == 'NoktoholdRequestMain') {
// tableObject.params = {
// fromInventoryStatus: 'NOK',
// toInventoryStatus:'HOLD'
// }
// fromInventoryStatus.value = 'NOK'
// toInventoryStatus.value = "HOLD"
// businessType.value = 'NokToHold'
// importFileName.value = ''
// }
else if ( routeName.value == 'HoldtookRequestMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', // fromInventoryStatus: 'NOK',
toInventoryStatus:'OK' // toInventoryStatus:'HOLD',
businessType :'NokToHold'
}
// fromInventoryStatus.value = 'NOK'
// toInventoryStatus.value = "HOLD"
businessType.value = 'NokToHold'
importFileName.value = '不合格转隔离申请'
}
else if ( routeName.value == 'HoldtookRequestMain') {
tableObject.params = {
// fromInventoryStatus: 'HOLD',
// toInventoryStatus:'OK',
businessType :'HoldToOk'
} }
fromInventoryStatus.value = 'HOLD' // fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "OK" // toInventoryStatus.value = "OK"
businessType.value = 'HoldToOk' businessType.value = 'HoldToOk'
importFileName.value = '隔离转合格申请' importFileName.value = '隔离转合格申请'
} else if ( routeName.value == 'HoldtoscrapRequestMain') { } else if ( routeName.value == 'HoldtoscrapRequestMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', // fromInventoryStatus: 'HOLD',
toInventoryStatus:'SCRAP' // toInventoryStatus:'SCRAP',
businessType:'HoldToScrap'
} }
fromInventoryStatus.value = 'HOLD' // fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "SCRAP" // toInventoryStatus.value = "SCRAP"
businessType.value = 'HoldToScrap' businessType.value = 'HoldToScrap'
importFileName.value = '隔离转报废申请' importFileName.value = '隔离转报废申请'
} else if ( routeName.value == 'OktoscrapRequestMain') { } else if ( routeName.value == 'OktoscrapRequestMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', // fromInventoryStatus: 'OK',
toInventoryStatus:'SCRAP' // toInventoryStatus:'SCRAP',
businessType :'OkToScrap'
} }
fromInventoryStatus.value = 'OK' // fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "SCRAP" // toInventoryStatus.value = "SCRAP"
businessType.value = 'OkToScrap' businessType.value = 'OkToScrap'
importFileName.value = '合格转报废申请' importFileName.value = '合格转报废申请'
} }
// else if ( routeName.value == 'ScraptoholdRequestMain') { else if ( routeName.value == 'ScraptoholdRequestMain') {
// tableObject.params = { tableObject.params = {
// fromInventoryStatus: 'SCRAP', // fromInventoryStatus: 'SCRAP',
// toInventoryStatus:'HOLD' // toInventoryStatus:'HOLD',
// } businessType :'ScrapToHold'
// fromInventoryStatus.value = 'SCRAP' }
// toInventoryStatus.value = "HOLD" // fromInventoryStatus.value = 'SCRAP'
// businessType.value = 'ScrapToHold' // toInventoryStatus.value = "HOLD"
// importFileName.value = '' businessType.value = 'ScrapToHold'
// } importFileName.value = '报废转隔离申请'
else if( routeName.value == 'InventorymoveRequestMain'){ } else {
fromInventoryStatus.value = null
businessType.value = 'Move'
importFileName.value = '库存移动申请'
}else {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', businessType :'Move'
toInventoryStatus:'SCRAP'
} }
businessType.value = 'Move'
importFileName.value = '库存移动申请'
} }
console.log(99 , businessType.value) console.log(99 , businessType.value)
InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
if(item.field == 'fromWarehouseCode') { if(item.field == 'fromWarehouseCode') {
if (fromInventoryStatus.value) { if (fromInventoryStatus.value) {
@ -803,6 +808,15 @@ const importSuccess = () => {
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
const cmd = {
'column':'businessType',
'action':'==',
'value':businessType.value
}
if (!Array.isArray(searchData.filters)) {
searchData.filters = [];
}
searchData.filters.push(cmd)
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters

9
src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@ -305,6 +305,15 @@ const handleExport = async () => {
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
const cmd = {
'column':'type',
'action':'==',
'value':'predict'
}
if (!Array.isArray(searchData.filters)) {
searchData.filters = [];
}
searchData.filters.push(cmd)
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters

3
src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue

@ -233,8 +233,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params) const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue

@ -179,8 +179,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params) const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@ -322,8 +322,9 @@
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params) const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

5
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@ -303,12 +303,13 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value.includes('SCP')){ if(routeName.value.includes('SCP')){
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params) const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{ }else{
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params) const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} }
} catch { } catch {
} finally { } finally {

10
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@ -48,6 +48,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false, isSearch: false,
sortTableDefault:3 sortTableDefault:3
}, },
{
label: '明细备注',
field: 'remark',
sort: 'custom',
table: {
width: 180
},
isSearch: false,
sortTableDefault:3
},
{ {
label: '发货单号', label: '发货单号',
field: 'asnNumber', field: 'asnNumber',

5
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue

@ -291,12 +291,13 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value.includes('SCP')){ if(routeName.value.includes('SCP')){
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params) const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{ }else{
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params) const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} }
} catch { } catch {
} finally { } finally {

3
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@ -762,8 +762,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params) const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue

@ -238,8 +238,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params) const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

28
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@ -935,6 +935,34 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
disabled:false disabled:false
} }
}, },
{
label: '退货原因',
field: 'reasonType',
dictType: DICT_TYPE.RETURN_REASON_TYPE,
dictClass: 'string',
// isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm:{
type: 'Select',
},
form: {
componentProps:{
disabled:true
}
}
},
{
label: '退货原因描述',
field: 'reason',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '计量单位', label: '计量单位',
field: 'uom', field: 'uom',

5
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@ -169,12 +169,13 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value.includes('SCP')){ if(routeName.value.includes('SCP')){
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params) const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{ }else{
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params) const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} }
} catch { } catch {
} finally { } finally {

43
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@ -744,19 +744,6 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
hiddenInMain: true, hiddenInMain: true,
isSearch: false isSearch: false
}, },
{
label: '原因',
field: 'reason',
dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
sortTableDefault: 1013,
hiddenInMain: true
},
{ {
label: '物料代码', label: '物料代码',
@ -887,7 +874,35 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
// }, // },
// }, // },
{ {
label: '原因', label: '退货原因',
field: 'reasonType',
dictType: DICT_TYPE.RETURN_REASON_TYPE,
dictClass: 'string',
// isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm:{
type: 'Select',
},
form: {
componentProps:{
disabled:true
}
}
},
{
label: '退货原因描述',
field: 'reason',
sort: 'custom',
table: {
width: 150
},
},
{
label: '备注',
field: 'remark', field: 'remark',
sort: 'custom', sort: 'custom',
table: { table: {

3
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@ -756,10 +756,11 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain( const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
tableObject.params tableObject.params
) )
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

34
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue

@ -83,7 +83,7 @@
</template> </template>
</BasicForm> </BasicForm>
<!-- 添加明细采购收货记录单号 --> <!-- 添加明细采购收货记录单号 -->
<SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" > <SearchTable ref="searchTableRef" :hiddenFilterBtnFields="['hahaha']" @searchTableSuccess="searchTableSuccess1" >
<template #searchQueryhahaha> <template #searchQueryhahaha>
<el-form :inline="true"> <el-form :inline="true">
<el-form-item label="供应商"> <el-form-item label="供应商">
@ -129,11 +129,11 @@
@searchTableSuccess="searchTableSuccessLabel" @searchTableSuccess="searchTableSuccessLabel"
/> />
<!-- 标签打印 --> <!-- 标签打印 -->
<SearchTable style="width: 905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" /> <SearchTable style="width: 905px" :hiddenFilterBtn="true" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" />
<!-- 导入 --> <!-- 导入 -->
<ImportForm <ImportForm
ref="importFormRef" ref="importFormRef"
url="/wms/purchasereturn-request-main/import" url="/wms/purchasereturn-request-main/importNew"
:importTemplateData="importTemplateData" :importTemplateData="importTemplateData"
@success="importSuccess" @success="importSuccess"
:updateIsDisable="true" :updateIsDisable="true"
@ -278,10 +278,13 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
setV['asnNumber'] = '' setV['asnNumber'] = ''
tableData.value = [] tableData.value = []
getSupplierOptions(val[0][searchField]) getSupplierOptions(val[0][searchField])
} }
formRef.setValues(setV) formRef.setValues(setV)
if(formField=='itemCode'){
onChangeForm('itemCode',null,formRef)
}
} }
}) })
} }
@ -637,7 +640,7 @@ const handleHandle = async (id: number) => {
try { try {
await message.confirm(t('common.confirmHandle')) await message.confirm(t('common.confirmHandle'))
tableObject.loading = true tableObject.loading = true
await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id) await PurchasereturnRequestMainApi.handlePurchasereturnRequestMainNew(id)
message.success(t('common.handleSuccess')) message.success(t('common.handleSuccess'))
buttonBaseClick('refresh',null) buttonBaseClick('refresh',null)
} catch { } catch {
@ -669,10 +672,11 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain( const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
tableObject.params tableObject.params
) )
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -788,7 +792,6 @@ const handleAddTable = () => {
// }) // })
} }
const onChangeForm = async (field, cur, formRef)=>{ const onChangeForm = async (field, cur, formRef)=>{
console.log('onChangeForm',field, cur, formRef)
if(field=='supplierCode'){ if(field=='supplierCode'){
// //
PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{ PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
@ -799,23 +802,30 @@ const onChangeForm = async (field, cur, formRef)=>{
formRef.value.setValues(setV) formRef.value.setValues(setV)
} }
}) })
}else if(field == 'locationCode'){ }else if(field == 'locationCode' || field == 'itemCode'){
// 退 // 退
let itemCode = formRef.formModel?formRef.formModel.itemCode:formRef.value.formModel.itemCode
let fromLocationCode = formRef.formModel?formRef.formModel.locationCode:formRef.value.formModel.locationCode
if(!itemCode||!fromLocationCode){
return
}
let subList = await PurchasereturnRequestDetailApi.getBalancePurchaseReceiptReturn({ let subList = await PurchasereturnRequestDetailApi.getBalancePurchaseReceiptReturn({
itemCode:formRef.value.formModel.itemCode, itemCode,
fromLocationCode:formRef.value.formModel.locationCode fromLocationCode
}) })
console.log('subList',subList) console.log('subList',subList)
if(subList&&subList.length>0){ if(subList&&subList.length>0){
tableData.value = subList.map(item=>({ tableData.value = subList.map(item=>({
'batch':item['batch'], 'batch':item['batch'],
'status':item['inventoryStatus'], 'inventoryStatus':item['inventoryStatus'],
'inventoryBalance':item['qty'], 'inventoryBalance':item['qty'],
'qty':0, 'qty':0,
'reason_type':'', 'reason_type':'',
'reason':'' 'reason':''
})) }))
}else{
tableData.value = []
} }
} }
} }
@ -1055,6 +1065,6 @@ const showLabelSuccess = async (formField, searchField, val, formRef, type, row)
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()
importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplate() importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplateNew()
}) })
</script> </script>

28
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts

@ -1236,6 +1236,34 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
precision: 6 precision: 6
} }
}, },
{
label: '退货原因',
field: 'reasonType',
dictType: DICT_TYPE.RETURN_REASON_TYPE,
dictClass: 'string',
// isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm:{
type: 'Select',
},
form: {
componentProps:{
disabled:true
}
}
},
{
label: '退货原因描述',
field: 'reason',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '库存状态', label: '库存状态',
field: 'inventoryStatus', field: 'inventoryStatus',

1
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts

@ -254,6 +254,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
}, },
form: { form: {
component: 'Select', component: 'Select',
value:locationList[0]['value'],
componentProps: { componentProps: {
options: locationList options: locationList
} }

5
src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue

@ -169,12 +169,13 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value.includes('SCP')){ if(routeName.value.includes('SCP')){
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params) const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{ }else{
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params) const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} }
} catch { } catch {

3
src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue

@ -706,10 +706,11 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare( const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare(
tableObject.params tableObject.params
) )
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@ -348,8 +348,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params) const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue

@ -211,8 +211,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params) const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@ -406,8 +406,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params) const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue

@ -259,8 +259,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params) const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue

@ -160,8 +160,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params) const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@ -560,8 +560,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params) const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue

@ -156,8 +156,9 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params) const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

@ -414,8 +414,9 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(tableObject.params) const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

10
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

@ -280,7 +280,12 @@ const searchList = (model)=>{
model.postingDate[1] = model.postingDate[1].replace('00:00:00','23:59:59') model.postingDate[1] = model.postingDate[1].replace('00:00:00','23:59:59')
} }
selectionRows.value = [] selectionRows.value = []
setSearchParams(model) let model1 = {
...model,
statuss: model.status.join(',')?model.status.join(','):''
}
delete model1.status
setSearchParams(model1)
} }
const selectionRows = ref<any>([]) const selectionRows = ref<any>([])
const tableRef = ref() const tableRef = ref()
@ -303,6 +308,9 @@ const handleExport = async () => {
selectionRows.value.forEach(item=>{ selectionRows.value.forEach(item=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.number)] rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
}) })
if (!tableObject.params.createTime || tableObject.params.createTime && tableObject.params. createTime.length == 0) {
delete tableObject.params.createTime
}
try { try {
// //
await message.exportConfirm() await message.exportConfirm()

7
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@ -73,6 +73,13 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
search: {
componentProps: {
multiple: true,
collapseTags: true,
collapseTagsTooltip: true,
}
},
isSearch: true, isSearch: true,
form: { form: {
value: '1', value: '1',

52
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -378,7 +378,12 @@ const searchTableParams = ref([
const formPurchasePassRef = ref() const formPurchasePassRef = ref()
const searchList = (model) => { const searchList = (model) => {
selectionRows.value = [] selectionRows.value = []
setSearchParams(model) let model1 = {
...model,
statuss: model.status.join(',')?model.status.join(','):''
}
delete model1.status
setSearchParams(model1)
} }
const selectionRows = ref<any>([]) const selectionRows = ref<any>([])
const tableRef = ref() const tableRef = ref()
@ -702,16 +707,16 @@ const buttonTableClick = async (val, row) => {
handleRepeal(row.id) handleRepeal(row.id)
} }
} }
const procurementCreators = ref([]) // const procurementCreators = ref([])
SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ // SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({
roleCode: 'purchase', // roleCode: 'purchase',
pageSize: 1000, // pageSize: 1000,
pageNo: 1, // pageNo: 1,
sort: '', // sort: '',
by: 'ASC' // by: 'ASC'
}).then((res) => { // }).then((res) => {
procurementCreators.value = res.list // procurementCreators.value = res.list
}) // })
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm = async (type: string, row?: any) => { const openForm = async (type: string, row?: any) => {
@ -787,10 +792,10 @@ const openForm = async (type: string, row?: any) => {
item.componentProps.disabled = false item.componentProps.disabled = false
} }
if (item.field == 'procurementCreator') { // if (item.field == 'procurementCreator') {
item.componentProps.options = procurementCreators.value // item.componentProps.options = procurementCreators.value
} // }
}) })
} }
if (row && (row.status == '3' || row.status == '7')) { if (row && (row.status == '3' || row.status == '7')) {
@ -813,13 +818,13 @@ const openForm = async (type: string, row?: any) => {
} }
tableData.value = [] // tableData.value = [] //
formRef.value.open(type, row) formRef.value.open(type, row)
if(type=='create'){ // if(type=='create'){
nextTick(() => { // nextTick(() => {
formRef.value.formRef.setValues({ // formRef.value.formRef.setValues({
procurementCreator:procurementCreators.value[0].id // procurementCreator:procurementCreators.value[0].id
}) // })
}) // })
} // }
}) })
} }
const defaultSupplierCode = ref('') const defaultSupplierCode = ref('')
@ -1159,6 +1164,7 @@ const genRecords = async (id: number) => {
/** 导出按钮操作 */ /** 导出按钮操作 */
const exportLoading = ref(false) // const exportLoading = ref(false) //
const handleExport = async () => { const handleExport = async () => {
console.log(111)
let rows: any = [] let rows: any = []
selectionRows.value.forEach((item) => { selectionRows.value.forEach((item) => {
rows = [...rows, ...item.selectionRows.map((item1) => item1.number)] rows = [...rows, ...item.selectionRows.map((item1) => item1.number)]
@ -1174,7 +1180,9 @@ const handleExport = async () => {
} else { } else {
paramsData = { ...paramsData, checkNums: rows } paramsData = { ...paramsData, checkNums: rows }
} }
console.log('批量导出', paramsData) if (!paramsData.createTime || paramsData.createTime && paramsData.createTime.length == 0) {
delete paramsData.createTime
}
try { try {
// //
await message.exportConfirm() await message.exportConfirm()

7
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -220,6 +220,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
}, },
sortTableDefault:9, sortTableDefault:9,
isSearch: true, isSearch: true,
search: {
componentProps: {
multiple: true,
collapseTags: true,
collapseTagsTooltip: true,
}
},
form: { form: {
value: '1', value: '1',
componentProps: { componentProps: {

10
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue

@ -185,7 +185,12 @@ const searchList = (model)=>{
model.endDifferencePrice = endDifferencePrice.value model.endDifferencePrice = endDifferencePrice.value
console.log('searchList',model) console.log('searchList',model)
selectionRows.value = [] selectionRows.value = []
setSearchParams(model) let model1 = {
...model,
statuss: model.status.join(',')?model.status.join(','):''
}
delete model1.status
setSearchParams(model1)
} }
const resetList = (model)=>{ const resetList = (model)=>{
staDifferencePrice.value = null staDifferencePrice.value = null
@ -324,6 +329,9 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
}else{ }else{
paramsData = {...paramsData,checkNums:rows} paramsData = {...paramsData,checkNums:rows}
} }
if (!paramsData.createTime || paramsData.createTime && paramsData.createTime.length == 0) {
delete paramsData.createTime
}
console.log('批量导出',paramsData) console.log('批量导出',paramsData)
try { try {
// //

7
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

@ -212,6 +212,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
}, },
sortTableDefault:9, sortTableDefault:9,
isSearch: true, isSearch: true,
search: {
componentProps: {
multiple: true,
collapseTags: true,
collapseTagsTooltip: true,
}
},
form: { form: {
value: '1', value: '1',
componentProps: { componentProps: {

20
src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

@ -143,6 +143,26 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
{
label: '发票申请状态',
field: 'requestStatus',
dictType: DICT_TYPE.INVOICE_REQUEST_STATUS,
dictClass: 'string',
isTable: true,
isForm:false,
sort: 'custom',
table: {
width: 150
},
isSearch: false,
form: {
value: '1',
componentProps: {
disabled: true
}
}
},
{ {
label: '订单行', label: '订单行',

Loading…
Cancel
Save