Browse Source

业务标签所有打印业务功能调整

dev_web_online
安虹睿 2 years ago
parent
commit
21e5d7b246
  1. 3
      fe/PC/src/components/currenForm/index.vue
  2. 15
      fe/PC/src/filters/status.js
  3. 269
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
  4. 299
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
  5. 297
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/__PartiallyPreparedProducts.vue
  6. 424
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/__RecycledMaterialsLabel.vue
  7. 352
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/__productionReturnLabel.vue
  8. 80
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue

3
fe/PC/src/components/currenForm/index.vue

@ -10,6 +10,7 @@
:rules="rules"
:model="searchData"
@submit.native.prevent
v-if="!hide ? true : false"
>
<el-row :gutter="40">
<el-col
@ -20,7 +21,7 @@
<el-form-item
:label="item.label"
:prop="item.showProp ? item.prop + '.' + item.showProp : item.prop"
v-if="!hide ? true : false"
v-if="!item.hide ? true : false"
>
<!-- 输入框 onkeyup: 正则表达式用于前端输入校验工作-->
<!-- :onkeyup="item.onkeyup" -->

15
fe/PC/src/filters/status.js

@ -2135,6 +2135,21 @@ export function SupplierAsnCtypeStaBack(name){
}
return Enum(type, index, prop)
}
// 标签类型 下拉选择 使用位置 创建标签
export function labelTypeSelectOption(index, prop) {
let filter = {
1: {
label: "采购标签",
value: 1,
},
2: {
label: '生产标签',
value: 2,
},
}
return Enum(filter, index, prop)
}
// 菜单维护
/**

269
fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue

@ -57,18 +57,19 @@
</div>
</template>
<script>
import { getPageList } from "@/api/wms-api"
import { postInventoryLabelCode_count } from "@/api/wms-core"
import currenForm from "@/components/currenForm"
import StepsFormAlone from "@/components/StepsFormAlone"
import resultStatus from "@/components/resultStatus"
import currenTableFlex from "@/components/currenTableFlex"
import {initPrintPackingCodeManyData} from "@/mixins/printMixin"
import { getPageList,getDetailed} from "@/api/wms-api"
import _ from "lodash"
import { mixins } from "@/mixins/mixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
import { filterSelectMixins } from '@/mixins/filter-Select'
export default {
name: "PartiallyPreparedProductsLabel",
mixins: [
mixins,
LoadingMixins,
@ -80,7 +81,12 @@ export default {
currenTableFlex,
resultStatus,
},
name: "PartiallyPreparedProductsLabel",
watch:{
"selectData.labelType"(val){
console.log("watch",val)
this.changeFormItemShow(val)
}
},
data () {
let _this = this
return {
@ -88,166 +94,234 @@ export default {
// options
stepArray:[
{title:"信息筛选",next:()=>{return _this.firstNext()}},
{title:"预览信息"},
{title:"预览信息",cancle:()=>{return _this.sencondPre()}},
{title:"打印"},
],
itemPackInfo:{},//
selectItemInfo:{},//
//
selectData:{
itemCode:"",
itemName:"",
itemPackInfo:{},//
selectSupplierItemInfo:{},//
selectSupplierInfo:{},//
selectPoNumberInfo:{},//
//
defaultSelectData:{
itemCode:"",//
itemName:"",//
canMake:null,//
packQty:"",
canBuy:null,//
labelType:null,//1 2
isRecycled:null,//
canOutsourcing:null,//
qty:"",
lot:"",
labelQty:"",
supplierCode:"",
poNumber:"",
// remark:"",
},
//
selectData:{},
//
selectForm:[
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", [
{logic:"And",column:"canMake",action:"==",value:"true"},
// {logic:"And",column:"canMake",action:"==",value:"true"},
{logic:"And",column:"type",action:"==",value:"半成品"}
])},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
{logic:"And",column:"canMake",action:"==",value:"true"},
// {logic:"And",column:"canMake",action:"==",value:"true"},
{logic:"And",column:"type",action:"==",value:"半成品"}
]) },
colSpan: 12,
},
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
{ type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
{ type: "input",disabled:true,label: "标包数量", prop: "packQty", colSpan: 12 },
{ type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12},
{ type: "select", disabled:true,label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "标签类型", prop: "labelType", options: "labelTypeSelectOption", colSpan: 12 },
{ type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 },
{ type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12 },
{ type: "input", label: "批次", prop: "lot", colSpan: 12 },
{ type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
// { type: "input", label: "", prop: "remark", colSpan: 12 },
{
hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
this.isFilter("itemCode", this.selectData.itemCode)
) },
colSpan: 12,
},
{
hide:false,type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
colSpan: 12,
},
],
// Rules
selectRules:{
itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
labelType:[{ required: true, trigger: "change", message: "标签类型不能为空" }],
qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
supplierCode: [{ required: false, trigger: "change", message: "当前为采购标签,供应商代码为必填项" }],
poNumber: [{ required: false, trigger: "change", message: "当前为采购标签,采购订单为必填项" }],
},
//
//
flexTableColumns:[
{ width:"auto",label: "物品代码", prop: "itemCode", },
{ width:"auto",label: "物品名称", prop: "itemName", },
{ width:"auto",label: "批次", prop: "lot", },
{ width:"auto",label: "标包数量", prop: "packQty", },
{ width:"auto",label: "标包单位", prop: "packUom", },
{ width:"auto",label: "实际数量", prop: "qty", },
{ label: "物品代码", prop: "itemCode", },
{ label: "物品名称", prop: "itemName", },
{ label: "批次", prop: "lot", },
{ label: "实际数量", prop: "qty", },
{ width:"auto",label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "供应商代码", prop: "supplierCode", },
{ label: "供应商简称", prop: "supplierSimpleName", },
{ width:"auto",label: "供应商零件号", prop: "supplierItemCode", },
{ width:"auto",label: "供应商零件名", prop: "supplierItemName", },
{ width:"auto",label: "采购订单号", prop: "poNumber",type: "dateTime" },
// { width:"auto",label: "", prop: "remark", },
{ width:"auto",label: "箱标签", prop: "packingCode",fixed:"right" },
],
//
flexSelectTableData:[]
flexSelectTableData:[],
};
},
created(){
this.selectData = this.defaultSelectData
},
methods: {
consoleLog(){
console.log('selectItemInfo',this.selectItemInfo)//basedata/item-basic/list
console.log('selectData',this.selectData)
console.log('selectSupplierItemInfo',this.selectSupplierItemInfo)//basedata/supplier-item/list
console.log('selectSupplierInfo',this.selectSupplierInfo)//basedata/supplier/{id}
console.log('selectPoNumberInfo',this.selectPoNumberInfo)
},
//
rest(){
this.itemPackInfo = {}
this.selectItemInfo={};
this.selectData={
itemCode:"",
itemName:"",
canMake:null,//
packQty:"",
qty:"",
lot:"",
labelQty:"",
};
this.selectSupplierItemInfo = {}
this.selectPoNumberInfo = {}
this.selectSupplierInfo = {}
this.selectData = this.defaultSelectData
this.flexSelectTableData = [];
this.$refs.steps_bcpsj.returnFirstActive()
this.$refs.form_bcpsj.getDom().resetFields();
},
// prop
getFormPropIndex(prop){
let _index = null
this.selectForm.forEach((item,key)=>{
if(item.prop == prop)_index = key
})
return _index
},
//
detailsDataPush (val) {
//
if(val[1].prop == "itemCode"){
this.pageLoading = true
this.rest()
this.selectItemInfo = val[0];
this.selectData.itemCode = this.selectItemInfo.code
this.selectData.itemName = this.selectItemInfo.name
this.selectData.canBuy=this.selectItemInfo.canBuy;
this.selectData.canMake=this.selectItemInfo.canMake;
this.selectData.isRecycled=this.selectItemInfo.isRecycled;
this.selectData.canOutsourcing=this.selectItemInfo.canOutsourcing;
// true
let _labelType_index = this.getFormPropIndex('labelType')
if((this.selectItemInfo.canBuy && !this.selectItemInfo.canMake) || (!this.selectItemInfo.canBuy && this.selectItemInfo.canMake)){
this.selectData.labelType = this.selectItemInfo.canBuy ? 1 : 2;
this.selectForm[_labelType_index].disabled = true
}else{
this.selectData.labelType = null
this.selectForm[_labelType_index].disabled = false
}
}
//
if(val[1].prop == "supplierCode"){
this.selectSupplierItemInfo = val[0];
this.selectData.supplierCode = this.selectSupplierItemInfo.supplierCode
let params = {
condition: {
filters: []
}
}
params.condition.filters.push(...this.isFilter("itemCode", this.selectData.itemCode))
getPageList(params, "basedata/item-pack")
.then(res => {
if (res.items.length > 0) {
this.itemPackInfo = res.items[0]
this.selectData.packQty=res.items[0].qty
// this.selectItemInfo = res.items[0];
}
getDetailed(val[0].id, "basedata/item-basic").then(res => {
this.pageLoading = false
this.selectItemInfo = Object.assign(this.selectItemInfo,res);
this.selectData.itemName=this.selectItemInfo.name;
this.selectData.canMake=this.selectItemInfo.canMake;
})
.catch(err => {
this.pageLoading = false
})
})
.catch(err => {
this.pageLoading = false
})
params.condition.filters.push(...this.isFilter("code", this.selectData.supplierCode))
getPageList(params, "basedata/supplier").then(res => {
this.selectSupplierInfo = res.items[0]
})
}
//
if(val[1].prop == "poNumber"){
this.selectPoNumberInfo = val[0];
}
},
//
changeFormItemShow(val){
this.selectData.labelType = val
let _poNumber_index = this.getFormPropIndex('poNumber')
let _supplierCode_index = this.getFormPropIndex('supplierCode')
//
if(this.selectData.labelType == 1){
this.selectForm[_poNumber_index].hide = false
this.selectForm[_supplierCode_index].hide = false
this.selectRules.poNumber[0].required = true
this.selectRules.supplierCode[0].required = true
}
//
else{
this.selectForm[_poNumber_index].hide = true
this.selectForm[_supplierCode_index].hide = true
this.selectRules.poNumber[0].required = false
this.selectRules.supplierCode[0].required = false
}
},
//
firstNext(){
return new Promise((resolve,reject) => {
this.$refs['form_bcpsj'].getDom().validate(valid=>{
if(valid){
// this.consoleLog()
let _data = {
fullBarcodeString: undefined,//
// fullBarcodeString: undefined,//
itemCode: this.selectData.itemCode || null,
itemName: this.selectItemInfo.name || null,
itemDesc1: this.selectItemInfo.desc1 || null,
itemDesc2: this.selectItemInfo.desc2 || null,
lot: this.selectData.lot || "",
supplierBatch: undefined,//
arriveDate: undefined,//
produceDate: undefined,//
expireDate: undefined,//
// supplierBatch: undefined,//
arriveDate: this.selectPoNumberInfo.arriveDate,
// produceDate: undefined,//
// expireDate: undefined,//
stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
uom: this.selectItemInfo.basicUom || "",
qty: Number(this.selectData.qty),
labelStatus: undefined,//
recommendLocationCode: undefined,//
locationErpCode: undefined,//
containerCode: undefined,//
poNumber: undefined,//
rpNumber: undefined,//
asnNumber: undefined,//
qLevel: undefined,//
qualityFile: undefined,//
prodLine: undefined,//
team: undefined,//
shift: undefined,//
labelStatus: 1,//
// recommendLocationCode: undefined,//
// locationErpCode: undefined,//
// containerCode: undefined,//
supplierCode: this.selectData.supplierCode,
poNumber: this.selectData.poNumber,
rpNumber: this.selectPoNumberInfo.rpNumber,
asnNumber: this.selectPoNumberInfo.number,
// qLevel: this.selectItemInfo.qLevel || undefined,//
// qualityFile: undefined,//
// prodLine: undefined,//
// team: undefined,//
// shift: undefined,//
specifications: this.selectItemInfo.color || null,
supplierCode: undefined,//
supplierName: undefined,//
supplierSimpleName: undefined,//
supplierItemCode: undefined,//
supplierItemName: undefined,//
labelType: 2,
planArriveDate: undefined,//
supplierName: this.selectSupplierItemInfo.supplierName,
supplierSimpleName: this.selectSupplierItemInfo.supplierSimpleName,
supplierItemCode: this.selectSupplierItemInfo.supplierItemCode,
supplierItemName: this.selectSupplierItemInfo.itemName,
labelType: this.selectData.labelType,
planArriveDate: this.selectPoNumberInfo.planArriveDate,
// remark:this.selectData.remark,//
}
// let _data = this.selectItemInfo
// _data.itemCode=this.selectData.itemCode,
// _data.itemName= this.selectData.itemName,
// _data.stdPackQty= Number(this.selectData.packQty) || 0,
// _data.lot=this.selectData.lot,
// _data.qty=Number(this.selectData.qty),
// _data.uom= this.selectItemInfo.basicUom || "",
// _data.itemDesc1= this.selectItemInfo.desc1 || "",
// _data.itemDesc2= this.selectItemInfo.desc2 || "",
// _data.labelType= 2,
// _data.company= localStorage.getItem("company"),
//
this.pageLoading = true;
postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
@ -256,8 +330,6 @@ export default {
this.flexSelectTableData = res
this.flexSelectTableData.forEach(item=>{
item.packingCode=item.code
item.packQty=this.itemPackInfo.qty
item.packUom=this.itemPackInfo.basicUom
})
resolve()
})
@ -269,9 +341,14 @@ export default {
})
})
},
//
sencondPre(){
return new Promise((resolve,reject) => {
resolve()
})
},
//
printHandle(){
// let _printData = {details:[]}
let _printData = this.flexSelectTableData[0]
_printData.details = []
this.flexSelectTableData.forEach(item=>{

299
fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue

@ -54,26 +54,10 @@
@CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
@tableButtonClick="searchSubmit(arguments)"
></searchPage>
<!-- 制造件/采购件选择 -->
<el-dialog
:title="canTypeTitle"
:visible.sync="canTypeShow"
>
<el-form :model="canForm" :rules="canRules" ref="form_canType" >
<el-form-item prop="canType">
<el-radio v-model="canForm.canType" label="1">采购标签</el-radio>
<el-radio v-model="canForm.canType" label="2">生产标签</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="canSelectHandle('0')"> </el-button>
<el-button type="primary" @click="canSelectHandle('1')"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getPageList } from "@/api/wms-api"
import { postInventoryLabelCode_count } from "@/api/wms-core"
import currenForm from "@/components/currenForm"
import StepsFormAlone from "@/components/StepsFormAlone"
@ -85,6 +69,7 @@ import { mixins } from "@/mixins/mixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
import { filterSelectMixins } from '@/mixins/filter-Select'
export default {
name: "RecycledMaterialsLabel",
mixins: [
mixins,
LoadingMixins,
@ -96,7 +81,12 @@ export default {
currenTableFlex,
resultStatus,
},
name: "RecycledMaterialsLabel",
watch:{
"selectData.labelType"(val){
console.log("watch",val)
this.changeFormItemShow(val)
}
},
data () {
let _this = this
return {
@ -108,22 +98,24 @@ export default {
{title:"打印"},
],
selectItemInfo:{},//
selectSupplierInfo:{},//
selectSupplierItemInfo:{},//
selectSupplierInfo:{},//
selectPoNumberInfo:{},//
//
defaultSelectData:{
itemCode:"",
itemName:"",
// packQty:"",
itemCode:"",//
itemName:"",//
canMake:null,//
canBuy:null,//
labelType:null,//1 2
// isRecycled:null,//
// canOutsourcing:null,//
qty:"",
lot:"",
labelQty:"",
supplierCode:"",
poNumber:"",
remark:"",
canBuy:null,//
canMake:null,//
isRecycled:null,//
canOutsourcing:null,//
labelType:null,// /
},
//
selectData:{},
@ -142,13 +134,15 @@ export default {
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
{ type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 },
// { type: "input",disabled:true,label: "", prop: "packQty", colSpan: 12 },
{ type: "select", disabled:true,label: "标签类型", prop: "labelType", options: "labelTypeSelectOption", colSpan: 12 },
// { type: "select", disabled:true,label: "", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
// { type: "select", disabled:true,label: "", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 },
{ type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12 },
{ type: "input", label: "批次", prop: "lot", colSpan: 12 },
{ type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
{ type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
{ type: "input", label: "备注", prop: "remark", colSpan: 12 },
{
hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
@ -156,118 +150,131 @@ export default {
) },
colSpan: 12,
},
{ type: "input", label: "备注", prop: "remark", colSpan: 12 },
{
hide:false,type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
colSpan: 12,
},
],
// Rules
selectRules:{
itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
// lot: [{ required: true, trigger: "change", message: "" }],
labelType:[{ required: true, trigger: "change", message: "标签类型不能为空" }],
qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
supplierCode: [{ required: false, trigger: "change", message: "当前为采购标签,供应商代码为必填项" }],
poNumber: [{ required: false, trigger: "change", message: "当前为采购标签,采购订单为必填项" }],
},
//
flexTableColumns:[
{ label: "物品代码", prop: "itemCode", },
{ label: "物品名称", prop: "itemName", },
{ label: "批次", prop: "lot", },
// { width:"auto",label: "", prop: "packQty", },
// { width:"auto",label: "", prop: "packUom", },
{ label: "实际数量", prop: "qty", },
{ width:"auto",label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "供应商代码", prop: "supplierCode", },
{ label: "供应商简称", prop: "supplierSimpleName", },
{ width:"auto",label: "供应商零件号", prop: "supplierItemCode", },
{ width:"auto",label: "供应商零件名", prop: "supplierItemName", },
{ width:"auto",label: "采购订单号", prop: "poNumber",type: "dateTime" },
{ width:"auto",label: "备注", prop: "remark", },
{ width:"auto",label: "生产日期", prop: "produceDate",type: "dateTime" },
{ width:"auto",label: "箱标签", prop: "packingCode",fixed:"right" },
],
//
flexSelectTableData:[],
canTypeShow:false,///
canTypeTitle:"",///
canForm:{
canType:null
},///
canRules:{
canType: [{ required: true, trigger: "change", message: "请选择类型" }],
},
};
},
created(){
this.selectData = this.defaultSelectData
},
methods: {
consoleLog(){
console.log('selectItemInfo',this.selectItemInfo)//basedata/item-basic/list
console.log('selectData',this.selectData)
console.log('selectSupplierItemInfo',this.selectSupplierItemInfo)//basedata/supplier-item/list
console.log('selectSupplierInfo',this.selectSupplierInfo)//basedata/supplier/{id}
console.log('selectPoNumberInfo',this.selectPoNumberInfo)
},
//
rest(){
this.selectItemInfo={};
this.selectSupplierItemInfo = {}
this.selectPoNumberInfo = {}
this.selectSupplierInfo = {}
this.selectData = this.defaultSelectData
this.flexSelectTableData = [];
this.$refs.steps_create.returnFirstActive()
this.$refs.form_create.getDom().resetFields();
},
// prop
getFormPropIndex(prop){
let _index = null
this.selectForm.forEach((item,key)=>{
if(item.prop == prop)_index = key
})
return _index
},
//
detailsDataPush (val) {
//
if(val[1].prop == "itemCode"){
this.canForm.canType = null
this.rest()
this.selectItemInfo = val[0];
this.selectData.itemCode = this.selectItemInfo.code
this.selectData.itemName = this.selectItemInfo.name
this.selectData.canBuy=this.selectItemInfo.canBuy;
this.selectData.canMake=this.selectItemInfo.canMake;
this.selectData.isRecycled=this.selectItemInfo.isRecycled;
this.selectData.canOutsourcing=this.selectItemInfo.canOutsourcing;
this.selectData.supplierCode = ""
// this.pageLoading = true
// let params = {
// condition: {
// filters: []
// }
// }
// params.condition.filters.push(...this.isFilter("itemCode", this.selectData.itemCode))
// getPageList(params, "basedata/item-pack")
// .then(res => {
// if (res.items.length > 0) {
// this.selectItemInfo = res.items[0];
// // this.selectItemInfo.itemCode = selectData.itemCode
// // this.selectItemInfo.itemName = val[0].name
// }
// getDetailed(val[0].id, "basedata/item-basic").then(res => {
// this.pageLoading = false
// this.selectItemInfo = Object.assign(this.selectItemInfo,res);
// this.selectData.itemName=this.selectItemInfo.name;
// this.selectData.packQty=this.selectItemInfo.packQty || "";
// })
// .catch(err => {
// this.pageLoading = false
// })
// })
// .catch(err => {
// this.pageLoading = false
// })
// this.selectData.isRecycled=this.selectItemInfo.isRecycled;
// this.selectData.canOutsourcing=this.selectItemInfo.canOutsourcing;
// true
let _labelType_index = this.getFormPropIndex('labelType')
if((this.selectItemInfo.canBuy && !this.selectItemInfo.canMake) || (!this.selectItemInfo.canBuy && this.selectItemInfo.canMake)){
this.selectData.labelType = this.selectItemInfo.canBuy ? 1 : 2;
this.selectForm[_labelType_index].disabled = true
}else{
this.selectData.labelType = null
this.selectForm[_labelType_index].disabled = false
}
}
//
if(val[1].prop == "supplierCode"){
this.selectSupplierInfo = val[0];
this.selectData.supplierCode = this.selectSupplierInfo.supplierCode
this.selectSupplierItemInfo = val[0];
this.selectData.supplierCode = this.selectSupplierItemInfo.supplierCode
let params = {
condition: {
filters: []
}
}
params.condition.filters.push(...this.isFilter("code", this.selectData.supplierCode))
getPageList(params, "basedata/supplier").then(res => {
this.selectSupplierInfo = res.items[0]
})
}
//
if(val[1].prop == "poNumber"){
this.selectPoNumberInfo = val[0];
}
},
// /--
canSelectHandle(val){
//
if(val == '0'){
this.canTypeShow = false
this.canForm.canType = null
//
changeFormItemShow(val){
this.selectData.labelType = val
let _poNumber_index = this.getFormPropIndex('poNumber')
let _supplierCode_index = this.getFormPropIndex('supplierCode')
//
if(this.selectData.labelType == 1){
this.selectForm[_poNumber_index].hide = false
this.selectForm[_supplierCode_index].hide = false
this.selectRules.poNumber[0].required = true
this.selectRules.supplierCode[0].required = true
}
//
//
else{
this.$refs['form_canType'].validate(valid=>{
if(valid){
this.canTypeShow = false
document.getElementsByClassName("stepsAloneBtn-next")[0].click()
}
})
this.selectForm[_poNumber_index].hide = true
this.selectForm[_supplierCode_index].hide = true
this.selectRules.poNumber[0].required = false
this.selectRules.supplierCode[0].required = false
}
},
//
@ -275,105 +282,51 @@ export default {
return new Promise((resolve,reject) => {
this.$refs['form_create'].getDom().validate(valid=>{
if(valid){
// /
if(this.selectItemInfo.canBuy && this.selectItemInfo.canMake && this.canForm.canType == null){
this.canForm.canType = null
this.canTypeShow = true
this.canTypeTitle = `${this.selectData.itemCode}】即是采购件,也是制造件,请选择生成标签的类型`
reject()
return
}
// /
if(!this.selectItemInfo.canBuy && !this.selectItemInfo.canMake && this.canForm.canType == null){
this.canForm.canType = null
this.canTypeShow = true
this.canTypeTitle = `${this.selectData.itemCode}】即不是采购件,也不是制造件,请选择生成标签的类型`
reject()
return
}
// true
if((this.selectItemInfo.canBuy && !this.selectItemInfo.canMake) || (!this.selectItemInfo.canBuy && this.selectItemInfo.canMake)){
this.canForm.canType = this.selectItemInfo.canBuy ? "1" : "2";
}
// console.log(this.selectItemInfo)//basedata/item-basic/list
// console.log(this.selectData)
// console.log(this.selectSupplierInfo)//basedata/supplier-item/list
// this.consoleLog()
let _data = {
fullBarcodeString: undefined,//
// fullBarcodeString: undefined,//
itemCode: this.selectData.itemCode || null,
itemName: this.selectItemInfo.name || null,
itemDesc1: this.selectItemInfo.desc1 || null,
itemDesc2: this.selectItemInfo.desc2 || null,
lot: this.selectData.lot || "",
supplierBatch: undefined,//
arriveDate: undefined,//
produceDate: undefined,//
expireDate: undefined,//
// supplierBatch: undefined,//
arriveDate: this.selectPoNumberInfo.arriveDate,
// produceDate: undefined,//
// expireDate: undefined,//
stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
uom: this.selectItemInfo.basicUom || "",
qty: Number(this.selectData.qty),
labelStatus: undefined,//
recommendLocationCode: undefined,//
locationErpCode: undefined,//
containerCode: undefined,//
supplierCode: this.selectData.supplierCode || null,
poNumber: undefined,//
rpNumber: undefined,//
asnNumber: undefined,//
qLevel: undefined,//
qualityFile: undefined,//
prodLine: undefined,//
team: undefined,//
shift: undefined,//
labelStatus: 1,//
// recommendLocationCode: undefined,//
// locationErpCode: undefined,//
// containerCode: undefined,//
supplierCode: this.selectData.supplierCode,
poNumber: this.selectData.poNumber,
rpNumber: this.selectPoNumberInfo.rpNumber,
asnNumber: this.selectPoNumberInfo.number,
// qLevel: this.selectItemInfo.qLevel || undefined,//
// qualityFile: undefined,//
// prodLine: undefined,//
// team: undefined,//
// shift: undefined,//
specifications: this.selectItemInfo.color || null,
supplierName: this.selectSupplierInfo.supplierName || undefined,//
supplierSimpleName: this.selectSupplierInfo.supplierSimpleName || null,
supplierItemCode: this.selectSupplierInfo.supplierItemCode || null,
supplierItemName: this.selectSupplierInfo.itemName || null,
labelType: Number(this.canForm.canType),
planArriveDate: undefined,//
supplierName: this.selectSupplierItemInfo.supplierName,
supplierSimpleName: this.selectSupplierItemInfo.supplierSimpleName,
supplierItemCode: this.selectSupplierItemInfo.supplierItemCode,
supplierItemName: this.selectSupplierItemInfo.itemName,
labelType: this.selectData.labelType,
planArriveDate: this.selectPoNumberInfo.planArriveDate,
remark:this.selectData.remark,//
}
// let _data = JSON.parse(JSON.stringify(this.selectItemInfo))
// delete _data.concurrencyStamp;
// delete _data.company;
// delete _data.id;
// delete _data.lastModificationTime;
// delete _data.lastModifierId;
// delete _data.creationTime;
// delete _data.creatorId;
// _data.itemCode=this.selectData.itemCode,
// _data.itemName= this.selectData.itemName,
// _data.stdPackQty= Number(this.selectData.packQty) || 0,
// _data.lot=this.selectData.lot || "",
// _data.qty=Number(this.selectData.qty),
// _data.remark=this.selectData.remark,
// // _data.uom= this.selectItemInfo.packUom || "",
// _data.uom= this.selectItemInfo.basicUom || "",
// _data.itemDesc1= this.selectItemInfo.desc1 || "",
// _data.itemDesc2= this.selectItemInfo.desc2 || "",
// _data.labelType= Number(this.canForm.canType),
// _data.company= localStorage.getItem("company"),
// //
// _data.supplierCode = this.selectData.supplierCode || "",
// _data.supplierName = this.selectSupplierInfo.supplierName || "",
// _data.supplierSimpleName = this.selectSupplierInfo.supplierSimpleName || "",
// _data.supplierItemCode = this.selectSupplierInfo.supplierItemCode || "",
// _data.supplierItemName = this.selectSupplierInfo.supplierItemName || this.selectSupplierInfo.itemName || "",
// _data.supplierPackQty = this.selectSupplierInfo.supplierPackQty || "",
// _data.supplierPackUom = this.selectSupplierInfo.supplierPackUom || "",
//
this.pageLoading = true;
postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
.then(res => {
this.canForm.canType = null
this.pageLoading = false
this.flexSelectTableData = res
this.flexSelectTableData.forEach(item=>{
item.packingCode=item.code
// item.itemName=this.selectData.itemName
// item.packQty=this.selectData.packQty
// item.packUom=this.selectItemInfo.basicUom
})
resolve()
})
@ -388,17 +341,11 @@ export default {
//
sencondPre(){
return new Promise((resolve,reject) => {
this.canForm.canType = null
resolve()
})
},
//
printHandle(){
// let _printData = {
// // supplierCode:this.selectData.supplierCode || "",
// // supplierSimpleName:this.selectSupplierInfo.supplierSimpleName || "",
// details:[]
// }
let _printData = this.flexSelectTableData[0]
_printData.details = []
this.flexSelectTableData.forEach(item=>{

297
fe/PC/src/views/labelManage/PartiallyPreparedProducts/__PartiallyPreparedProducts.vue

@ -0,0 +1,297 @@
<template>
<div class="appMainPage" v-loading="pageLoading">
<!-- 标签管理-业务标签-半成品上架标签 -->
<StepsFormAlone
:stepArray="stepArray"
ref="steps_bcpsj"
:hideLastBtsn="true"
>
<template v-slot:stepSlot1>
<curren-Form
ref="form_bcpsj"
size="medium"
:searchData="selectData"
:searchForm="selectForm"
:rules="selectRules"
:searchOptions="editOptions"
@push="detailsDataPush(arguments)"
></curren-Form>
</template>
<template v-slot:stepSlot2>
<currenTableFlex
:flexTableData="flexSelectTableData"
:flexSearchOptions="editOptions"
:flexTableColumns="flexTableColumns"
:showAddBtn="false"
:showAllDeleteButton="false"
:isShowIndex="true"
></currenTableFlex>
</template>
<template v-slot:stepSlot3>
<!-- 结果 -->
<resultStatus>
<template>
<el-button @click="rest()">返回</el-button>
<el-button type="primary" @click="printHandle()">打印</el-button>
</template>
</resultStatus>
</template>
</StepsFormAlone>
<!-- 搜索按钮窗体组件 -->
<searchPage
ref="searchTable"
:tableLoading="Loading.autoTableLoading"
:advancedFilter="advancedFilter()"
:filterPageListParams="filterPageListParams"
:formTitle="searchTitle"
:displayDialog="displayDialog.AddNewDialog"
:searchTableData="searchData"
:searchTableColumns="searchColumns"
:searchTotalCount="searchTotalCount"
:supplierItemPage="searchPageListParams"
@handleSelectionChange="prepareFormData"
@SizeChange="searchAlterResultCount($event, searchPageListParams)"
@CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
@tableButtonClick="searchSubmit(arguments)"
></searchPage>
</div>
</template>
<script>
import { postInventoryLabelCode_count } from "@/api/wms-core"
import currenForm from "@/components/currenForm"
import StepsFormAlone from "@/components/StepsFormAlone"
import resultStatus from "@/components/resultStatus"
import currenTableFlex from "@/components/currenTableFlex"
import {initPrintPackingCodeManyData} from "@/mixins/printMixin"
import { getPageList,getDetailed} from "@/api/wms-api"
import _ from "lodash"
import { mixins } from "@/mixins/mixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
import { filterSelectMixins } from '@/mixins/filter-Select'
export default {
name: "PartiallyPreparedProductsLabel",
mixins: [
mixins,
LoadingMixins,
filterSelectMixins
],
components: {
currenForm,
StepsFormAlone,
currenTableFlex,
resultStatus,
},
data () {
let _this = this
return {
pageLoading:false,
// options
stepArray:[
{title:"信息筛选",next:()=>{return _this.firstNext()}},
{title:"预览信息"},
{title:"打印"},
],
itemPackInfo:{},//
selectItemInfo:{},//
//
selectData:{
itemCode:"",
itemName:"",
canMake:null,//
packQty:"",
qty:"",
lot:"",
labelQty:"",
},
//
selectForm:[
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", [
{logic:"And",column:"canMake",action:"==",value:"true"},
{logic:"And",column:"type",action:"==",value:"半成品"}
])},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
{logic:"And",column:"canMake",action:"==",value:"true"},
{logic:"And",column:"type",action:"==",value:"半成品"}
]) },
colSpan: 12,
},
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
{ type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
{ type: "input",disabled:true,label: "标包数量", prop: "packQty", colSpan: 12 },
{ type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12},
{ type: "input", label: "批次", prop: "lot", colSpan: 12 },
{ type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
],
// Rules
selectRules:{
itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
},
//
flexTableColumns:[
{ width:"auto",label: "物品代码", prop: "itemCode", },
{ width:"auto",label: "物品名称", prop: "itemName", },
{ width:"auto",label: "批次", prop: "lot", },
{ width:"auto",label: "标包数量", prop: "packQty", },
{ width:"auto",label: "标包单位", prop: "packUom", },
{ width:"auto",label: "实际数量", prop: "qty", },
{ width:"auto",label: "生产日期", prop: "produceDate",type: "dateTime" },
{ width:"auto",label: "箱标签", prop: "packingCode",fixed:"right" },
],
//
flexSelectTableData:[]
};
},
methods: {
//
rest(){
this.itemPackInfo = {}
this.selectItemInfo={};
this.selectData={
itemCode:"",
itemName:"",
canMake:null,//
packQty:"",
qty:"",
lot:"",
labelQty:"",
};
this.flexSelectTableData = [];
this.$refs.steps_bcpsj.returnFirstActive()
this.$refs.form_bcpsj.getDom().resetFields();
},
//
detailsDataPush (val) {
if(val[1].prop == "itemCode"){
this.pageLoading = true
let params = {
condition: {
filters: []
}
}
params.condition.filters.push(...this.isFilter("itemCode", this.selectData.itemCode))
getPageList(params, "basedata/item-pack")
.then(res => {
if (res.items.length > 0) {
this.itemPackInfo = res.items[0]
this.selectData.packQty=res.items[0].qty
// this.selectItemInfo = res.items[0];
}
getDetailed(val[0].id, "basedata/item-basic").then(res => {
this.pageLoading = false
this.selectItemInfo = Object.assign(this.selectItemInfo,res);
this.selectData.itemName=this.selectItemInfo.name;
this.selectData.canMake=this.selectItemInfo.canMake;
})
.catch(err => {
this.pageLoading = false
})
})
.catch(err => {
this.pageLoading = false
})
}
},
//
firstNext(){
return new Promise((resolve,reject) => {
this.$refs['form_bcpsj'].getDom().validate(valid=>{
if(valid){
let _data = {
fullBarcodeString: undefined,//
itemCode: this.selectData.itemCode || null,
itemName: this.selectItemInfo.name || null,
itemDesc1: this.selectItemInfo.desc1 || null,
itemDesc2: this.selectItemInfo.desc2 || null,
lot: this.selectData.lot || "",
supplierBatch: undefined,//
arriveDate: undefined,//
produceDate: undefined,//
expireDate: undefined,//
stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
uom: this.selectItemInfo.basicUom || "",
qty: Number(this.selectData.qty),
labelStatus: undefined,//
recommendLocationCode: undefined,//
locationErpCode: undefined,//
containerCode: undefined,//
poNumber: undefined,//
rpNumber: undefined,//
asnNumber: undefined,//
qLevel: undefined,//
qualityFile: undefined,//
prodLine: undefined,//
team: undefined,//
shift: undefined,//
specifications: this.selectItemInfo.color || null,
supplierCode: undefined,//
supplierName: undefined,//
supplierSimpleName: undefined,//
supplierItemCode: undefined,//
supplierItemName: undefined,//
labelType: 2,
planArriveDate: undefined,//
}
// let _data = this.selectItemInfo
// _data.itemCode=this.selectData.itemCode,
// _data.itemName= this.selectData.itemName,
// _data.stdPackQty= Number(this.selectData.packQty) || 0,
// _data.lot=this.selectData.lot,
// _data.qty=Number(this.selectData.qty),
// _data.uom= this.selectItemInfo.basicUom || "",
// _data.itemDesc1= this.selectItemInfo.desc1 || "",
// _data.itemDesc2= this.selectItemInfo.desc2 || "",
// _data.labelType= 2,
// _data.company= localStorage.getItem("company"),
//
this.pageLoading = true;
postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
.then(res => {
this.pageLoading = false
this.flexSelectTableData = res
this.flexSelectTableData.forEach(item=>{
item.packingCode=item.code
item.packQty=this.itemPackInfo.qty
item.packUom=this.itemPackInfo.basicUom
})
resolve()
})
.catch(err => {
this.pageLoading = false
reject()
})
}
})
})
},
//
printHandle(){
// let _printData = {details:[]}
let _printData = this.flexSelectTableData[0]
_printData.details = []
this.flexSelectTableData.forEach(item=>{
_printData.details.push(item)
})
_printData.title = "半成品上架标签"
this.Print(initPrintPackingCodeManyData(_printData))
},
//
isFilter (val, data) {
let filter = [
{
logic: "And",
column: val,
action: "==",
value: data
}
]
return filter
},
},
}
</script>

424
fe/PC/src/views/labelManage/PartiallyPreparedProducts/__RecycledMaterialsLabel.vue

@ -0,0 +1,424 @@
<template>
<div class="appMainPage" v-loading="pageLoading">
<!-- 标签管理-业务标签-创建标签(原回收料标签) -->
<StepsFormAlone
:stepArray="stepArray"
ref="steps_create"
:hideLastBtsn="true"
>
<template v-slot:stepSlot1>
<curren-Form
ref="form_create"
size="medium"
:searchData="selectData"
:searchForm="selectForm"
:rules="selectRules"
:searchOptions="editOptions"
@push="detailsDataPush(arguments)"
></curren-Form>
</template>
<template v-slot:stepSlot2>
<currenTableFlex
:flexTableData="flexSelectTableData"
:flexSearchOptions="editOptions"
:flexTableColumns="flexTableColumns"
:showAddBtn="false"
:showAllDeleteButton="false"
:isShowIndex="true"
></currenTableFlex>
</template>
<template v-slot:stepSlot3>
<!-- 结果 -->
<resultStatus>
<template>
<el-button @click="rest()">返回</el-button>
<el-button type="primary" @click="printHandle()">打印</el-button>
</template>
</resultStatus>
</template>
</StepsFormAlone>
<!-- 搜索按钮窗体组件 -->
<searchPage
ref="searchTable"
:tableLoading="Loading.autoTableLoading"
:advancedFilter="advancedFilter()"
:filterPageListParams="filterPageListParams"
:formTitle="searchTitle"
:displayDialog="displayDialog.AddNewDialog"
:searchTableData="searchData"
:searchTableColumns="searchColumns"
:searchTotalCount="searchTotalCount"
:supplierItemPage="searchPageListParams"
@handleSelectionChange="prepareFormData"
@SizeChange="searchAlterResultCount($event, searchPageListParams)"
@CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
@tableButtonClick="searchSubmit(arguments)"
></searchPage>
<!-- 制造件/采购件选择 -->
<el-dialog
:title="canTypeTitle"
:visible.sync="canTypeShow"
>
<el-form :model="canForm" :rules="canRules" ref="form_canType" >
<el-form-item prop="canType">
<el-radio v-model="canForm.canType" label="1">采购标签</el-radio>
<el-radio v-model="canForm.canType" label="2">生产标签</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="canSelectHandle('0')"> </el-button>
<el-button type="primary" @click="canSelectHandle('1')"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { postInventoryLabelCode_count } from "@/api/wms-core"
import currenForm from "@/components/currenForm"
import StepsFormAlone from "@/components/StepsFormAlone"
import resultStatus from "@/components/resultStatus"
import currenTableFlex from "@/components/currenTableFlex"
import {initPrintPackingCodeManyData} from "@/mixins/printMixin"
import _ from "lodash"
import { mixins } from "@/mixins/mixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
import { filterSelectMixins } from '@/mixins/filter-Select'
export default {
mixins: [
mixins,
LoadingMixins,
filterSelectMixins
],
components: {
currenForm,
StepsFormAlone,
currenTableFlex,
resultStatus,
},
name: "RecycledMaterialsLabel",
data () {
let _this = this
return {
pageLoading:false,
// options
stepArray:[
{title:"信息筛选",next:()=>{return _this.firstNext()}},
{title:"预览信息",cancle:()=>{return _this.sencondPre()}},
{title:"打印"},
],
selectItemInfo:{},//
selectSupplierInfo:{},//
//
defaultSelectData:{
itemCode:"",
itemName:"",
// packQty:"",
qty:"",
lot:"",
labelQty:"",
supplierCode:"",
remark:"",
canBuy:null,//
canMake:null,//
isRecycled:null,//
canOutsourcing:null,//
labelType:null,// /
},
//
selectData:{},
//
selectForm:[
{
type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic",
// [{logic:"And",column:"canMake",action:"!=",value:"true"}] //
)},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,
// [{logic:"And",column:"canMake",action:"!=",value:"true"}] //
)},
colSpan: 12,
},
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
{ type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 },
// { type: "input",disabled:true,label: "", prop: "packQty", colSpan: 12 },
{ type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12 },
{ type: "input", label: "批次", prop: "lot", colSpan: 12 },
{ type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
{ type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
this.isFilter("itemCode", this.selectData.itemCode)
) },
colSpan: 12,
},
{ type: "input", label: "备注", prop: "remark", colSpan: 12 },
],
// Rules
selectRules:{
itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
// lot: [{ required: true, trigger: "change", message: "" }],
qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
},
//
flexTableColumns:[
{ label: "物品代码", prop: "itemCode", },
{ label: "物品名称", prop: "itemName", },
{ label: "批次", prop: "lot", },
// { width:"auto",label: "", prop: "packQty", },
// { width:"auto",label: "", prop: "packUom", },
{ label: "实际数量", prop: "qty", },
{ label: "供应商代码", prop: "supplierCode", },
{ label: "供应商简称", prop: "supplierSimpleName", },
{ width:"auto",label: "供应商零件号", prop: "supplierItemCode", },
{ width:"auto",label: "供应商零件名", prop: "supplierItemName", },
{ width:"auto",label: "备注", prop: "remark", },
{ width:"auto",label: "生产日期", prop: "produceDate",type: "dateTime" },
{ width:"auto",label: "箱标签", prop: "packingCode",fixed:"right" },
],
//
flexSelectTableData:[],
canTypeShow:false,///
canTypeTitle:"",///
canForm:{
canType:null
},///
canRules:{
canType: [{ required: true, trigger: "change", message: "请选择类型" }],
},
};
},
created(){
this.selectData = this.defaultSelectData
},
methods: {
//
rest(){
this.selectItemInfo={};
this.selectSupplierInfo = {}
this.selectData = this.defaultSelectData
this.flexSelectTableData = [];
this.$refs.steps_create.returnFirstActive()
this.$refs.form_create.getDom().resetFields();
},
//
detailsDataPush (val) {
//
if(val[1].prop == "itemCode"){
this.canForm.canType = null
this.selectItemInfo = val[0];
this.selectData.itemName = this.selectItemInfo.name
this.selectData.canBuy=this.selectItemInfo.canBuy;
this.selectData.canMake=this.selectItemInfo.canMake;
this.selectData.isRecycled=this.selectItemInfo.isRecycled;
this.selectData.canOutsourcing=this.selectItemInfo.canOutsourcing;
this.selectData.supplierCode = ""
// this.pageLoading = true
// let params = {
// condition: {
// filters: []
// }
// }
// params.condition.filters.push(...this.isFilter("itemCode", this.selectData.itemCode))
// getPageList(params, "basedata/item-pack")
// .then(res => {
// if (res.items.length > 0) {
// this.selectItemInfo = res.items[0];
// // this.selectItemInfo.itemCode = selectData.itemCode
// // this.selectItemInfo.itemName = val[0].name
// }
// getDetailed(val[0].id, "basedata/item-basic").then(res => {
// this.pageLoading = false
// this.selectItemInfo = Object.assign(this.selectItemInfo,res);
// this.selectData.itemName=this.selectItemInfo.name;
// this.selectData.packQty=this.selectItemInfo.packQty || "";
// })
// .catch(err => {
// this.pageLoading = false
// })
// })
// .catch(err => {
// this.pageLoading = false
// })
}
//
if(val[1].prop == "supplierCode"){
this.selectSupplierInfo = val[0];
this.selectData.supplierCode = this.selectSupplierInfo.supplierCode
}
},
// /--
canSelectHandle(val){
//
if(val == '0'){
this.canTypeShow = false
this.canForm.canType = null
}
//
else{
this.$refs['form_canType'].validate(valid=>{
if(valid){
this.canTypeShow = false
document.getElementsByClassName("stepsAloneBtn-next")[0].click()
}
})
}
},
//
firstNext(){
return new Promise((resolve,reject) => {
this.$refs['form_create'].getDom().validate(valid=>{
if(valid){
// /
if(this.selectItemInfo.canBuy && this.selectItemInfo.canMake && this.canForm.canType == null){
this.canForm.canType = null
this.canTypeShow = true
this.canTypeTitle = `${this.selectData.itemCode}】即是采购件,也是制造件,请选择生成标签的类型`
reject()
return
}
// /
if(!this.selectItemInfo.canBuy && !this.selectItemInfo.canMake && this.canForm.canType == null){
this.canForm.canType = null
this.canTypeShow = true
this.canTypeTitle = `${this.selectData.itemCode}】即不是采购件,也不是制造件,请选择生成标签的类型`
reject()
return
}
// true
if((this.selectItemInfo.canBuy && !this.selectItemInfo.canMake) || (!this.selectItemInfo.canBuy && this.selectItemInfo.canMake)){
this.canForm.canType = this.selectItemInfo.canBuy ? "1" : "2";
}
// console.log(this.selectItemInfo)//basedata/item-basic/list
// console.log(this.selectData)
// console.log(this.selectSupplierInfo)//basedata/supplier-item/list
let _data = {
fullBarcodeString: undefined,//
itemCode: this.selectData.itemCode || null,
itemName: this.selectItemInfo.name || null,
itemDesc1: this.selectItemInfo.desc1 || null,
itemDesc2: this.selectItemInfo.desc2 || null,
lot: this.selectData.lot || "",
supplierBatch: undefined,//
arriveDate: undefined,//
produceDate: undefined,//
expireDate: undefined,//
stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
uom: this.selectItemInfo.basicUom || "",
qty: Number(this.selectData.qty),
labelStatus: undefined,//
recommendLocationCode: undefined,//
locationErpCode: undefined,//
containerCode: undefined,//
supplierCode: this.selectData.supplierCode || null,
poNumber: undefined,//
rpNumber: undefined,//
asnNumber: undefined,//
qLevel: undefined,//
qualityFile: undefined,//
prodLine: undefined,//
team: undefined,//
shift: undefined,//
specifications: this.selectItemInfo.color || null,
supplierName: this.selectSupplierInfo.supplierName || undefined,//
supplierSimpleName: this.selectSupplierInfo.supplierSimpleName || null,
supplierItemCode: this.selectSupplierInfo.supplierItemCode || null,
supplierItemName: this.selectSupplierInfo.itemName || null,
labelType: Number(this.canForm.canType),
planArriveDate: undefined,//
remark:this.selectData.remark,//
}
// let _data = JSON.parse(JSON.stringify(this.selectItemInfo))
// delete _data.concurrencyStamp;
// delete _data.company;
// delete _data.id;
// delete _data.lastModificationTime;
// delete _data.lastModifierId;
// delete _data.creationTime;
// delete _data.creatorId;
// _data.itemCode=this.selectData.itemCode,
// _data.itemName= this.selectData.itemName,
// _data.stdPackQty= Number(this.selectData.packQty) || 0,
// _data.lot=this.selectData.lot || "",
// _data.qty=Number(this.selectData.qty),
// _data.remark=this.selectData.remark,
// // _data.uom= this.selectItemInfo.packUom || "",
// _data.uom= this.selectItemInfo.basicUom || "",
// _data.itemDesc1= this.selectItemInfo.desc1 || "",
// _data.itemDesc2= this.selectItemInfo.desc2 || "",
// _data.labelType= Number(this.canForm.canType),
// _data.company= localStorage.getItem("company"),
// //
// _data.supplierCode = this.selectData.supplierCode || "",
// _data.supplierName = this.selectSupplierInfo.supplierName || "",
// _data.supplierSimpleName = this.selectSupplierInfo.supplierSimpleName || "",
// _data.supplierItemCode = this.selectSupplierInfo.supplierItemCode || "",
// _data.supplierItemName = this.selectSupplierInfo.supplierItemName || this.selectSupplierInfo.itemName || "",
// _data.supplierPackQty = this.selectSupplierInfo.supplierPackQty || "",
// _data.supplierPackUom = this.selectSupplierInfo.supplierPackUom || "",
//
this.pageLoading = true;
postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
.then(res => {
this.canForm.canType = null
this.pageLoading = false
this.flexSelectTableData = res
this.flexSelectTableData.forEach(item=>{
item.packingCode=item.code
// item.itemName=this.selectData.itemName
// item.packQty=this.selectData.packQty
// item.packUom=this.selectItemInfo.basicUom
})
resolve()
})
.catch(err => {
this.pageLoading = false
reject()
})
}
})
})
},
//
sencondPre(){
return new Promise((resolve,reject) => {
this.canForm.canType = null
resolve()
})
},
//
printHandle(){
// let _printData = {
// // supplierCode:this.selectData.supplierCode || "",
// // supplierSimpleName:this.selectSupplierInfo.supplierSimpleName || "",
// details:[]
// }
let _printData = this.flexSelectTableData[0]
_printData.details = []
this.flexSelectTableData.forEach(item=>{
_printData.details.push(item)
})
_printData.title = "标签"
this.Print(initPrintPackingCodeManyData(_printData))
},
//
isFilter (val, data) {
let filter = [
{
logic: "And",
column: val,
action: "==",
value: data
}
]
return filter
},
},
}
</script>

352
fe/PC/src/views/labelManage/PartiallyPreparedProducts/__productionReturnLabel.vue

@ -0,0 +1,352 @@
<template>
<div class="appMainPage" v-loading="pageLoading">
<!-- 标签管理-业务标签-生产退库标签 -->
<StepsFormAlone
:stepArray="stepArray"
ref="steps_sctk"
:hideLastBtsn="true"
>
<template v-slot:stepSlot1>
<curren-Form
ref="form_sctk"
size="medium"
:searchData="selectData"
:searchForm="selectForm"
:rules="selectRules"
:searchOptions="editOptions"
@push="detailsDataPush(arguments)"
@clear="filterClearHandle(arguments)"
></curren-Form>
</template>
<template v-slot:stepSlot2>
<currenTableFlex
:flexTableData="flexSelectTableData"
:flexSearchOptions="editOptions"
:flexTableColumns="flexTableColumns"
:showAddBtn="false"
:showAllDeleteButton="false"
:isShowIndex="true"
></currenTableFlex>
</template>
<template v-slot:stepSlot3>
<!-- 结果 -->
<resultStatus>
<template>
<el-button @click="rest()">返回</el-button>
<el-button type="primary" @click="printHandle()">打印</el-button>
</template>
</resultStatus>
</template>
</StepsFormAlone>
<!-- 搜索按钮窗体组件 -->
<searchPage
ref="searchTable"
:tableLoading="Loading.autoTableLoading"
:advancedFilter="advancedFilter()"
:filterPageListParams="filterPageListParams"
:formTitle="searchTitle"
:displayDialog="displayDialog.AddNewDialog"
:searchTableData="searchData"
:searchTableColumns="searchColumns"
:searchTotalCount="searchTotalCount"
:supplierItemPage="searchPageListParams"
@handleSelectionChange="prepareFormData"
@SizeChange="searchAlterResultCount($event, searchPageListParams)"
@CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
@tableButtonClick="searchSubmit(arguments)"
></searchPage>
</div>
</template>
<script>
import { postInventoryLabelCode_count } from "@/api/wms-core"
import currenForm from "@/components/currenForm"
import StepsFormAlone from "@/components/StepsFormAlone"
import resultStatus from "@/components/resultStatus"
import currenTableFlex from "@/components/currenTableFlex"
import {initPrintPackingCodeManyData} from "@/mixins/printMixin"
import { getPageList,getDetailed, getPage} from "@/api/wms-api"
import _ from "lodash"
import { mixins } from "@/mixins/mixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
import { filterSelectMixins } from '@/mixins/filter-Select'
export default {
mixins: [
mixins,
LoadingMixins,
filterSelectMixins
],
components: {
currenForm,
StepsFormAlone,
currenTableFlex,
resultStatus,
},
name: "productionReturnLabel",
data () {
let _this = this
return {
pageLoading:false,
// options
stepArray:[
{title:"信息筛选",next:()=>{return _this.firstNext()}},
{title:"预览信息"},
{title:"打印"},
],
itemPackInfo:{},//
poNumberInfo:{},//
selectItemInfo:{},//
selectSupplierInfo:{},//
//
selectData:{
itemCode:"",
itemName:"",
packQty:"",
qty:"",
lot:"",
labelQty:"",
supplierCode:"",
supplierName:"",
poNumber:"",
},
//
selectForm:[
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic",[
{logic:"And",column:"canMake",action:"!=",value:"true"},
{logic:"And",column:"isRecycled",action:"!=",value:"true"},
])},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
{logic:"And",column:"canMake",action:"!=",value:"true"},
{logic:"And",column:"isRecycled",action:"!=",value:"true"},
]) },
colSpan: 12,
},
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
{ type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
this.isFilter("itemCode", this.selectData.itemCode)
) },
colSpan: 12,
},
{
type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
colSpan: 12,
},
{ type: "input",disabled:true,label: "标包数量", prop: "packQty", colSpan: 12 },
{ type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12 },
{ type: "input", label: "批次", prop: "lot", colSpan: 12 },
{ type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
],
// Rules
selectRules:{
itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
supplierCode: [{ required: true, trigger: "change", message: "供应商代码不能为空" }],
poNumber: [{ required: true, trigger: "change", message: "采购订单号不能为空" }],
lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
},
//
flexTableColumns:[
{ width:"auto",label: "物品代码", prop: "itemCode", },
{ width:"auto",label: "物品名称", prop: "itemName", },
{ width:"auto",label: "批次", prop: "lot", },
{ width:"auto",label: "订单号", prop: "poNumber", },
{ width:"auto",label: "供应商代码", prop: "supplierCode", },
{ width:"auto",label: "供应商名称", prop: "supplierSimpleName", },
{ width:"auto",label: "标包数量", prop: "packQty", },
{ width:"auto",label: "标包单位", prop: "packUom", },
{ width:"auto",label: "实际数量", prop: "qty", },
{ width:"auto",label: "生产日期", prop: "produceDate",type: "dateTime" },
{ width:"auto",label: "箱标签", prop: "packingCode",fixed:"right" },
],
//
flexSelectTableData:[]
};
},
methods: {
//
rest(){
this.selectSupplierInfo = {}
this.selectItemInfo={};
this.itemPackInfo = {}
this.poNumberInfo = {}
this.selectData={
itemCode:"",
itemName:"",
packQty:"",
qty:"",
lot:"",
labelQty:"",
};
this.flexSelectTableData = [];
this.$refs.steps_sctk.returnFirstActive()
this.$refs.form_sctk.getDom().resetFields();
},
//
detailsDataPush (val) {
if(val[1].prop == "itemCode"){
this.pageLoading = true
let params = {
condition: {
filters: []
}
}
params.condition.filters.push(...this.isFilter("itemCode", this.selectData.itemCode))
getPageList(params, "basedata/item-pack")
.then(res => {
if (res.items.length > 0) {
this.itemPackInfo = res.items[0]
this.selectData.packQty=res.items[0].qty
// this.selectItemInfo = res.items[0];
}
getDetailed(val[0].id, "basedata/item-basic").then(res => {
this.pageLoading = false
this.selectItemInfo = Object.assign(this.selectItemInfo,res);
this.selectData.itemName=this.selectItemInfo.name;
// this.selectData.packQty=this.selectItemInfo.packQty || "";
})
.catch(err => {
this.pageLoading = false
})
})
.catch(err => {
this.pageLoading = false
})
}
else if (val[1].prop == "supplierCode"){
this.selectSupplierInfo = val[0]
// this.selectData.supplierName = val[0].supplierName
// this.selectData.supplierSimpleName = val[0].supplierSimpleName
}
//
else if(val[1].prop == "poNumber"){
this.poNumberInfo = val[0]
// this.selectData.poNumber = val[0].poNumber
}
},
//
filterClearHandle(val){
if(val[0].prop == "itemCode"){
this.selectData.supplierCode = ""
this.selectData.poNumber = ""
this.$refs.form_sctk.getDom().resetFields();
}
},
//
firstNext(){
return new Promise((resolve,reject) => {
this.$refs['form_sctk'].getDom().validate(valid=>{
if(valid){
let _data = {
fullBarcodeString: undefined,//
itemCode: this.selectData.itemCode || null,
itemName: this.selectItemInfo.name || null,
itemDesc1: this.selectItemInfo.desc1 || null,
itemDesc2: this.selectItemInfo.desc2 || null,
lot: this.selectData.lot || "",
supplierBatch: undefined,//
arriveDate: undefined,//
produceDate: undefined,//
expireDate: undefined,//
stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
uom: this.selectItemInfo.basicUom || "",
qty: Number(this.selectData.qty),
labelStatus: undefined,//
recommendLocationCode: undefined,//
locationErpCode: undefined,//
containerCode: undefined,//
supplierCode: this.selectData.supplierCode || null,
poNumber: this.selectData.poNumber,
rpNumber: undefined,//
asnNumber: undefined,//
qLevel: undefined,//
qualityFile: undefined,//
prodLine: undefined,//
team: undefined,//
shift: undefined,//
specifications: this.selectItemInfo.color || null,
supplierName: this.selectSupplierInfo.supplierName || undefined,//
supplierSimpleName: this.selectSupplierInfo.supplierSimpleName || null,
supplierItemCode: this.selectSupplierInfo.supplierItemCode || null,
supplierItemName: this.selectSupplierInfo.itemName || null,
labelType: 1,
planArriveDate: undefined,//
}
// let _data = this.selectItemInfo
// _data.itemCode=this.selectData.itemCode,
// _data.itemName= this.selectData.itemName,
// _data.stdPackQty= Number(this.selectData.packQty) || 0,
// _data.lot=this.selectData.lot,
// _data.qty=Number(this.selectData.qty),
// _data.uom= this.selectItemInfo.packUom || "",
// _data.itemDesc1= this.selectItemInfo.desc1 || "",
// _data.itemDesc2= this.selectItemInfo.desc2 || "",
// _data.poNumber= this.selectData.poNumber,
// _data.labelType= 1,
// _data.company= localStorage.getItem("company"),
//
this.pageLoading = true;
postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
.then(res => {
this.pageLoading = false
this.flexSelectTableData = res
this.flexSelectTableData.forEach(item=>{
item.packingCode=item.code
// item.itemName=this.selectData.itemName
item.packQty=this.itemPackInfo.qty
item.packUom=this.itemPackInfo.basicUom
// item.packQty=this.selectData.packQty
// item.packUom=this.selectItemInfo.packUom
// item.supplierName=this.selectData.supplierName
// item.supplierCode=this.selectData.supplierCode
// item.poNumber=this.selectData.poNumber
})
resolve()
})
.catch(err => {
this.pageLoading = false
reject()
})
}
})
})
},
//
printHandle(){
// let _printData = {
// poNumber:this.selectData.poNumber,
// asnNumber:this.flexSelectTableData[0].asnNumber,
// supplierCode:this.flexSelectTableData[0].supplierCode,
// supplierName:this.flexSelectTableData[0].supplierName,
// supplierSimpleName:this.flexSelectTableData[0].supplierName,
// details:[]
// }
let _printData = this.flexSelectTableData[0]
_printData.details = []
this.flexSelectTableData.forEach(item=>{
_printData.details.push(JSON.parse(JSON.stringify(item)))
})
_printData.title = "生产退库标签"
this.Print(initPrintPackingCodeManyData(_printData))
},
//
isFilter (val, data) {
let filter = [
{
logic: "And",
column: val,
action: "==",
value: data
}
]
return filter
},
},
}
</script>

80
fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue

@ -64,7 +64,7 @@ import StepsFormAlone from "@/components/StepsFormAlone"
import resultStatus from "@/components/resultStatus"
import currenTableFlex from "@/components/currenTableFlex"
import {initPrintPackingCodeManyData} from "@/mixins/printMixin"
import { getPageList,getDetailed, getPage} from "@/api/wms-api"
import { getPageList,getDetailed } from "@/api/wms-api"
import _ from "lodash"
import { mixins } from "@/mixins/mixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
@ -202,13 +202,11 @@ export default {
if (res.items.length > 0) {
this.itemPackInfo = res.items[0]
this.selectData.packQty=res.items[0].qty
// this.selectItemInfo = res.items[0];
}
getDetailed(val[0].id, "basedata/item-basic").then(res => {
this.pageLoading = false
this.selectItemInfo = Object.assign(this.selectItemInfo,res);
this.selectData.itemName=this.selectItemInfo.name;
// this.selectData.packQty=this.selectItemInfo.packQty || "";
})
.catch(err => {
this.pageLoading = false
@ -220,13 +218,10 @@ export default {
}
else if (val[1].prop == "supplierCode"){
this.selectSupplierInfo = val[0]
// this.selectData.supplierName = val[0].supplierName
// this.selectData.supplierSimpleName = val[0].supplierSimpleName
}
//
else if(val[1].prop == "poNumber"){
this.poNumberInfo = val[0]
// this.selectData.poNumber = val[0].poNumber
}
},
//
@ -243,52 +238,42 @@ export default {
this.$refs['form_sctk'].getDom().validate(valid=>{
if(valid){
let _data = {
fullBarcodeString: undefined,//
// fullBarcodeString: undefined,//
itemCode: this.selectData.itemCode || null,
itemName: this.selectItemInfo.name || null,
itemDesc1: this.selectItemInfo.desc1 || null,
itemDesc2: this.selectItemInfo.desc2 || null,
lot: this.selectData.lot || "",
supplierBatch: undefined,//
arriveDate: undefined,//
produceDate: undefined,//
expireDate: undefined,//
// supplierBatch: undefined,//
arriveDate: this.poNumberInfo.arriveDate,
// arriveDate: undefined,//
// produceDate: undefined,//
// expireDate: undefined,//
stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
uom: this.selectItemInfo.basicUom || "",
qty: Number(this.selectData.qty),
labelStatus: undefined,//
recommendLocationCode: undefined,//
locationErpCode: undefined,//
containerCode: undefined,//
supplierCode: this.selectData.supplierCode || null,
labelStatus: 1,//
// recommendLocationCode: undefined,//
// locationErpCode: undefined,//
// containerCode: undefined,//
supplierCode: this.selectData.supplierCode,
poNumber: this.selectData.poNumber,
rpNumber: undefined,//
asnNumber: undefined,//
qLevel: undefined,//
qualityFile: undefined,//
prodLine: undefined,//
team: undefined,//
shift: undefined,//
rpNumber: this.poNumberInfo.rpNumber,
asnNumber: this.poNumberInfo.number,
// qLevel: this.selectItemInfo.qLevel || undefined,//
// qualityFile: undefined,//
// prodLine: undefined,//
// team: undefined,//
// shift: undefined,//
specifications: this.selectItemInfo.color || null,
supplierName: this.selectSupplierInfo.supplierName || undefined,//
supplierSimpleName: this.selectSupplierInfo.supplierSimpleName || null,
supplierItemCode: this.selectSupplierInfo.supplierItemCode || null,
supplierItemName: this.selectSupplierInfo.itemName || null,
supplierName: this.selectSupplierInfo.supplierName,
supplierSimpleName: this.selectSupplierInfo.supplierSimpleName,
supplierItemCode: this.selectSupplierInfo.supplierItemCode,
supplierItemName: this.selectSupplierInfo.itemName,
labelType: 1,
planArriveDate: undefined,//
planArriveDate: this.poNumberInfo.planArriveDate,
remark:this.selectData.remark,//
}
// let _data = this.selectItemInfo
// _data.itemCode=this.selectData.itemCode,
// _data.itemName= this.selectData.itemName,
// _data.stdPackQty= Number(this.selectData.packQty) || 0,
// _data.lot=this.selectData.lot,
// _data.qty=Number(this.selectData.qty),
// _data.uom= this.selectItemInfo.packUom || "",
// _data.itemDesc1= this.selectItemInfo.desc1 || "",
// _data.itemDesc2= this.selectItemInfo.desc2 || "",
// _data.poNumber= this.selectData.poNumber,
// _data.labelType= 1,
// _data.company= localStorage.getItem("company"),
//
this.pageLoading = true;
postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
@ -297,14 +282,9 @@ export default {
this.flexSelectTableData = res
this.flexSelectTableData.forEach(item=>{
item.packingCode=item.code
// item.itemName=this.selectData.itemName
item.packQty=this.itemPackInfo.qty
item.packUom=this.itemPackInfo.basicUom
// item.packQty=this.selectData.packQty
// item.packUom=this.selectItemInfo.packUom
// item.supplierName=this.selectData.supplierName
// item.supplierCode=this.selectData.supplierCode
// item.poNumber=this.selectData.poNumber
})
resolve()
})
@ -318,14 +298,6 @@ export default {
},
//
printHandle(){
// let _printData = {
// poNumber:this.selectData.poNumber,
// asnNumber:this.flexSelectTableData[0].asnNumber,
// supplierCode:this.flexSelectTableData[0].supplierCode,
// supplierName:this.flexSelectTableData[0].supplierName,
// supplierSimpleName:this.flexSelectTableData[0].supplierName,
// details:[]
// }
let _printData = this.flexSelectTableData[0]
_printData.details = []
this.flexSelectTableData.forEach(item=>{

Loading…
Cancel
Save