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. 8
      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. 35
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  10. 43
      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 src = ref(BASE_URL + '/jmreport/view/894718245021065216?token=' + getAccessToken())
// //
const handlePoint = async (id) => { 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') { // } else if (val == 'delete') { //
handleDelete(row.id) handleDelete(row.id)
} else if (val == 'point') { // } 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 src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken())
// //
const handlePoint = async (id) => { const handlePoint = async (row) => {
window.open(src.value+'&id='+id) window.open(src.value+'&id='+row.id)
} }
/** 导入 */ /** 导入 */

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

@ -522,6 +522,14 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150 width: 150
}, },
}, },
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '项目代码', label: '项目代码',
field: 'projectCode', field: 'projectCode',

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

@ -313,29 +313,30 @@ const buttonTableClick = async (val, row) => {
// //
if (res.list[0].type == "RAW") { if (res.list[0].type == "RAW") {
// tableform // tableform
detailListTableColumns.tableFormColumns.map(item => { detailListTableColumns.tableFormColumns.map(itemColumns => {
if(item.field == 'productionLineCodePackage') { if(itemColumns.field == 'productionLineCodePackage') {
item.tableForm.isInpuFocusShow = false // itemColumns.tableForm.isInpuFocusShow = false
item.tableForm.disabled = true // itemColumns.tableForm.disabled = true
ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false
} }
if(item.field == 'supplierItemCode') { if(itemColumns.field == 'supplierItemCode') {
item.tableForm.isInpuFocusShow = true itemColumns.tableForm.isInpuFocusShow = true
item.tableForm.disabled = false itemColumns.tableForm.disabled = false
ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true
} }
}) })
} else { } else {
// tableform // tableform
detailListTableColumns.tableFormColumns.map(item => { detailListTableColumns.tableFormColumns.map(itemColumns => {
if(item.field == 'supplierItemCode') { if(itemColumns.field == 'supplierItemCode') {
item.tableForm.isInpuFocusShow = false itemColumns.tableForm.isInpuFocusShow = false
item.tableForm.disabled = true itemColumns.tableForm.disabled = true
ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false
} }
if(item.field == 'productionLineCodePackage') { if(itemColumns.field == 'productionLineCodePackage') {
item.tableForm.isInpuFocusShow = true item.productionLineCodePackage = item.productionLineCode
item.tableForm.disabled = false // itemColumns.tableForm.isInpuFocusShow = true
// itemColumns.tableForm.disabled = false
ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true 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 width: 150
}, },
tableForm:{ tableForm:{
isInpuFocusShow: true, disabled: true
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 // isInpuFocusShow: true,
searchField: 'productionLineCode', // 查询弹窗赋值字段 // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchTitle: '生产线物品关系信息', // 查询弹窗标题 // searchField: 'productionLineCode', // 查询弹窗赋值字段
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 // searchTitle: '生产线物品关系信息', // 查询弹窗标题
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchCondition:[{ // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
key: 'itemCode', // searchCondition:[{
value: 'itemCode', // key: 'itemCode',
isMainValue: true // value: 'itemCode',
}] // isMainValue: true
// }]
} }
}, },
{ {

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

@ -322,8 +322,8 @@ const buttonTableClick = async (val, row) => {
// tableform // tableform
detailListTableColumns.tableFormColumns.map(item => { detailListTableColumns.tableFormColumns.map(item => {
if(item.field == 'productionLineCodePackage') { if(item.field == 'productionLineCodePackage') {
item.tableForm.isInpuFocusShow = false // item.tableForm.isInpuFocusShow = false
item.tableForm.disabled = true // item.tableForm.disabled = true
ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = false ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = false
} }
if(item.field == 'supplierItemCode') { if(item.field == 'supplierItemCode') {
@ -341,8 +341,9 @@ const buttonTableClick = async (val, row) => {
ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = false ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = false
} }
if(item.field == 'productionLineCodePackage') { if(item.field == 'productionLineCodePackage') {
item.tableForm.isInpuFocusShow = true item.productionLineCodePackage = item.productionLineCode
item.tableForm.disabled = false // item.tableForm.isInpuFocusShow = true
// item.tableForm.disabled = false
ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = true 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 width: 150
}, },
tableForm:{ tableForm:{
isInpuFocusShow: true, disabled: true
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 // isInpuFocusShow: true,
searchField: 'productionLineCode', // 查询弹窗赋值字段 // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchTitle: '生产线物品关系信息', // 查询弹窗标题 // searchField: 'productionLineCode', // 查询弹窗赋值字段
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 // searchTitle: '生产线物品关系信息', // 查询弹窗标题
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchCondition:[{ // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
key: 'itemCode', // searchCondition:[{
value: 'itemCode', // key: 'itemCode',
isMainValue: true // 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 src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken())
// //
const handlePoint = async (id) => { const handlePoint = async (id) => {

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

@ -116,7 +116,9 @@
item.batch = item.toBatch item.batch = item.toBatch
item.qty = 1 item.qty = 1
}) })
}).catch(err => { console.log(err) }) }).catch(err => {
console.log(err)
})
} }
formRef.setValues(setV) formRef.setValues(setV)
} }
@ -192,7 +194,17 @@
defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), //
defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), //
defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierdeliver-request-main:update' }), // defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierdeliver-request-main:update' }), //
defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), //
{
label: '生成标签',
name: 'ssbq',
hide: isShowMainButton(row, ['3']),
type: 'primary',
icon: '',
color: '',
hasPermi: '',
link: true, //
},
defaultButtons.mainListPointBtn(null), // defaultButtons.mainListPointBtn(null), //
defaultButtons.mainListDocumentPrintBtn(null), // defaultButtons.mainListDocumentPrintBtn(null), //
// //
@ -227,8 +239,10 @@
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // } else if (val == 'delete') { //
handleDelete(row.id) handleDelete(row.id)
} else if (val == 'point') { // } else if (val == 'ssbq') { //
handlePoint(row) handlePoint(row)
} else if (val == 'point') { //
labelPrint(row)
} else if (val == 'documentPrint') { // } else if (val == 'documentPrint') { //
handleDocumentPrint(row.id) handleDocumentPrint(row.id)
} }
@ -378,18 +392,19 @@
} catch { } } catch { }
} }
const BASE_URL = 'http://dev.ccwin-in.com:25110' const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken()) const src = ref(BASE_URL + '/jmreport/view/897700407827668992?token=' + getAccessToken())
const genLabelId = ref(); const genLabelId = ref();
// //
const pointRef = ref() const pointRef = ref()
const handlePoint = async (row) => { const handlePoint = async (row) => {
pointRef.value.openPoint(row.id) pointRef.value.openPoint(row.id)
// console.log(tableObject.params); }
// dialogVisible.value = true //
// dialogTitle.value = row.number + '' const labelPrint = async (row) => {
// genLabelId.value = row.number window.open(src.value+'&asn_number='+row.asnNumber)
} }
const print = async () => { const print = async () => {

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

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

Loading…
Cancel
Save