chenfang 11 months ago
parent
commit
36e6e274ca
  1. 2
      src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
  2. 8
      src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
  3. 10
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
  4. 29
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  5. 23
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
  6. 9
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  7. 23
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
  8. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
  9. 1045
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  10. 45
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue

2
src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue

@ -227,7 +227,7 @@ const handleExport = async () => {
}
}
const BASE_URL = import.meta.env.VITE_BASE_URL
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/894718245021065216?token=' + getAccessToken())
//
const handlePoint = async (id) => {

8
src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue

@ -182,7 +182,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'delete') { //
handleDelete(row.id)
} else if (val == 'point') { //
handlePoint(row.id)
handlePoint(row)
}
}
@ -227,11 +227,11 @@ const handleExport = async () => {
}
}
const BASE_URL = import.meta.env.VITE_BASE_URL
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken())
//
const handlePoint = async (id) => {
window.open(src.value+'&id='+id)
const handlePoint = async (row) => {
window.open(src.value+'&id='+row.id)
}
/** 导入 */

10
src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts

@ -522,6 +522,14 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150
},
},
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '项目代码',
field: 'projectCode',
@ -642,4 +650,4 @@ export const TransferreceiptRequestDetailRules = reactive({
itemCode: [
{ required: true, message: '请选择物品代码', trigger: 'change' }
],
})
})

29
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@ -313,29 +313,30 @@ const buttonTableClick = async (val, row) => {
//
if (res.list[0].type == "RAW") {
// tableform
detailListTableColumns.tableFormColumns.map(item => {
if(item.field == 'productionLineCodePackage') {
item.tableForm.isInpuFocusShow = false
item.tableForm.disabled = true
detailListTableColumns.tableFormColumns.map(itemColumns => {
if(itemColumns.field == 'productionLineCodePackage') {
// itemColumns.tableForm.isInpuFocusShow = false
// itemColumns.tableForm.disabled = true
ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false
}
if(item.field == 'supplierItemCode') {
item.tableForm.isInpuFocusShow = true
item.tableForm.disabled = false
if(itemColumns.field == 'supplierItemCode') {
itemColumns.tableForm.isInpuFocusShow = true
itemColumns.tableForm.disabled = false
ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true
}
})
} else {
// tableform
detailListTableColumns.tableFormColumns.map(item => {
if(item.field == 'supplierItemCode') {
item.tableForm.isInpuFocusShow = false
item.tableForm.disabled = true
detailListTableColumns.tableFormColumns.map(itemColumns => {
if(itemColumns.field == 'supplierItemCode') {
itemColumns.tableForm.isInpuFocusShow = false
itemColumns.tableForm.disabled = true
ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false
}
if(item.field == 'productionLineCodePackage') {
item.tableForm.isInpuFocusShow = true
item.tableForm.disabled = false
if(itemColumns.field == 'productionLineCodePackage') {
item.productionLineCodePackage = item.productionLineCode
// itemColumns.tableForm.isInpuFocusShow = true
// itemColumns.tableForm.disabled = false
ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true
}
})

23
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@ -888,17 +888,18 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
width: 150
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'productionLineCode', // 查询弹窗赋值字段
searchTitle: '生产线物品关系信息', // 查询弹窗标题
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
searchCondition:[{
key: 'itemCode',
value: 'itemCode',
isMainValue: true
}]
disabled: true
// isInpuFocusShow: true,
// searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
// searchField: 'productionLineCode', // 查询弹窗赋值字段
// searchTitle: '生产线物品关系信息', // 查询弹窗标题
// searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
// searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
// searchCondition:[{
// key: 'itemCode',
// value: 'itemCode',
// isMainValue: true
// }]
}
},
{

9
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@ -322,8 +322,8 @@ const buttonTableClick = async (val, row) => {
// tableform
detailListTableColumns.tableFormColumns.map(item => {
if(item.field == 'productionLineCodePackage') {
item.tableForm.isInpuFocusShow = false
item.tableForm.disabled = true
// item.tableForm.isInpuFocusShow = false
// item.tableForm.disabled = true
ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = false
}
if(item.field == 'supplierItemCode') {
@ -341,8 +341,9 @@ const buttonTableClick = async (val, row) => {
ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = false
}
if(item.field == 'productionLineCodePackage') {
item.tableForm.isInpuFocusShow = true
item.tableForm.disabled = false
item.productionLineCodePackage = item.productionLineCode
// item.tableForm.isInpuFocusShow = true
// item.tableForm.disabled = false
ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = true
}
})

23
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@ -821,17 +821,18 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
width: 150
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'productionLineCode', // 查询弹窗赋值字段
searchTitle: '生产线物品关系信息', // 查询弹窗标题
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
searchCondition:[{
key: 'itemCode',
value: 'itemCode',
isMainValue: true
}]
disabled: true
// isInpuFocusShow: true,
// searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
// searchField: 'productionLineCode', // 查询弹窗赋值字段
// searchTitle: '生产线物品关系信息', // 查询弹窗标题
// searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
// searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
// searchCondition:[{
// key: 'itemCode',
// value: 'itemCode',
// isMainValue: true
// }]
}
},
{

2
src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue

@ -227,7 +227,7 @@ const handleExport = async () => {
}
}
const BASE_URL = import.meta.env.VITE_BASE_URL
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken())
//
const handlePoint = async (id) => {

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

File diff suppressed because it is too large

45
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue

@ -1,7 +1,8 @@
<template>
<!-- 打印 -->
<el-dialog v-model="dialogVisiblePoint" :title="dialogTitle" width="60%">
<Table :columns="detailListTableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
<ContentWrap>
<Table :columns="detailListTableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
total: tableObject.total
}" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort">
@ -9,22 +10,16 @@
<el-input v-model="row.batch">{{ row.batch }}</el-input>
</template>
</Table>
<el-button @click="closeDialog">关闭</el-button>
<el-button @click="genLabel()">生成标签</el-button>
<el-button @click="print">打印</el-button>
</ContentWrap>
<ButtonBase :Butttondata="Butttondata" @button-base-click="buttonTableClick($event)"/>
</el-dialog>
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { getAccessToken } from '@/utils/auth'
import { SupplierdeliverRequestMain, SupplierdeliverRequestMainRules, SupplierdeliverRequestDetail, SupplierdeliverRequestDetailRules } from './supplierdeliverRequestMain.data'
import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
// import * as PackageApi from '@/api/wms/package'
// import * as BarbasicApi from '@/api/wms/barbasic'
const props = defineProps({
//
detailListTableColumns: {
@ -39,11 +34,20 @@ defineOptions({ name: 'SupplierdeliverRequestMain' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(SupplierdeliverRequestMain.allSchemas.tableColumns)
const Butttondata = [
{
label: '生成标签',
name: 'ssbq',
hide: false,
type: 'primary',
icon: 'ep:select',
color: '',
hasPermi: '',
link: false, //
},
defaultButtons.formCloseBtn(null) //
]
const dialogVisiblePoint = ref(false)
const { tableObject, tableMethods } = useTable({
@ -56,9 +60,6 @@ const closeDialog = () => {
dialogVisiblePoint.value = false
isShow.value = false
}
// const print = async () => {
// window.open(src.value + '&number=' + detatableData.tableList[0].number)
// }
/** 生成标签按钮操作 */
const genLabel = async () => {
@ -78,7 +79,7 @@ const genLabel = async () => {
}
//
const { getList, setSearchParams } = tableMethods
const { getList } = tableMethods
const genLabelId = ref();
const openPoint = async (masterId)=>{
tableObject.params = {
@ -90,6 +91,14 @@ const openPoint = async (masterId)=>{
}
defineExpose({ openPoint }) // open
// -
const buttonTableClick = async (val) => {
if (val == 'ssbq') { //
genLabel()
} else if (val == 'close') {//
closeDialog()
}
}
/** 初始化 **/
onMounted(async () => {

Loading…
Cancel
Save