10539622/2025-03-JS-SDK-CLI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修改打印

Browse Source
This commit is contained in:
郭飞 2025-04-22 18:57:01 +08:00
parent 5009f73821
commit 7432fb4e7c
6 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/label/index.ts
View File

@ -23,7 +23,7 @@ export function printLabel2(data: any) {
export function printLabelWithRemark(data: any) {
return request({
url: '/api/label/existingStockLabel',
url: '/api/api/label/existingStockLabel',
method: 'post',
data: data,
});

36
src/views/Query/BasicQuery/ProductPreStockedQuery/index.vue
View File

@ -38,9 +38,9 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="物料编号" prop="params.PRODCUTSPECNAME">
<el-form-item label="物料编号" prop="params.PRODUCTSPECNAME">
<el-Input
v-model="queryParamsOrder.params.PRODCUTSPECNAME"
v-model="queryParamsOrder.params.PRODUCTSPECNAME"
placeholder="输入物料编号"
clearable
@change="getSdkInfo"
@ -166,10 +166,10 @@
<span v-else class="table-status-inActive">禁用</span>
</span>
<span v-else-if="col.field === 'ORDERTYPE'">
<span v-if="scope.row[col.field] == 'DC'" class="table-status-active"
<span v-if="scope.row[col.field] == 'NLCC'" class="table-status-active"
>调拨入库</span
>
<span v-else-if="scope.row[col.field] == 'A2'" class="table-status-active"
<span v-else-if="scope.row[col.field] == 'FG'" class="table-status-active"
>产成品入库</span
>
<span v-else class="table-status-active">生产退料</span>
@ -230,7 +230,7 @@
<span v-else class="table-status-inActive">禁用</span>
</span>
<span v-else-if="col.field === 'RECEIVE_FLAG'" class="flag-layout">
<span v-if="scope.row[col.field] == 'N'" style="background-color: yellow;display: inline-block;width: 100%">未入库</span>
<span v-if="scope.row[col.field] == 'N' || scope.row[col.field] == 'Z'" style="background-color: yellow;display: inline-block;width: 100%">未入库</span>
<span v-else style="background-color: lightgreen;display: inline-block;width: 100%">
<!-- {{scope.row[col.field] == 'N' ? '未入库' : '已入库'}} -->
已入库
@ -299,7 +299,7 @@ const state = reactive({
ERPLOCATION: '',
ERPFACTORY: '',
AREA: '',
PRODCUTSPECNAME: '',
PRODUCTSPECNAME: '',
SDK_ID: '',
SOURCEORDER: '', // 单据号
ORDERTYPE: '', // 单据类型
@ -324,7 +324,7 @@ const state = reactive({
// ERPLOCATION: '',
// ERPFACTORY: '',
// AREA: '',
PRODCUTSPECNAME: '',
PRODUCTSPECNAME: '',
FROMDATE:'',
TODATE: ''
// SDK_ID: '',
@ -393,7 +393,7 @@ const state = reactive({
orderTypeList: [] as any,
areaList: [] as any,
Spec: {
PRODCUTSPECNAME: ''
PRODUCTSPECNAME: ''
},
StockStateList: [{
ENUMVALUE: '',
@ -463,9 +463,9 @@ onMounted(() => {
state.Column_Order = [
{ header: '单据类型', field: 'ORDERTYPE', hide: false },
{ header: '单号', field: 'SOURCEORDER', hide: false },
{ header: '料号', field: 'PRODCUTSPECNAME', hide: false },
{ header: '规格', field: 'SDK_ID', hide: false },
{ header: '阶段', field: 'STAGECODE', hide: false },
{ header: '料号', field: 'PRODUCTSPECNAME', hide: false },
// { header: '规格', field: 'SDK_ID', hide: false },
// { header: '阶段', field: 'STAGECODE', hide: false },
{ header: '品名', field: 'DESC_CN', hide: false },
{ header: '车间', field: 'AREANAME', hide: false },
{ header: '标签数量', field: 'MAINQUANTITY', hide: false },
@ -505,8 +505,8 @@ const updateList2 = (col: any) => {
state.Column_Order = col
}
function getSdkInfo() {
state.Spec.PRODCUTSPECNAME = state.queryParamsOrder.params.PRODCUTSPECNAME
console.log(state.queryParamsOrder.params.PRODCUTSPECNAME)
state.Spec.PRODUCTSPECNAME = state.queryParamsOrder.params.PRODUCTSPECNAME
console.log(state.queryParamsOrder.params.PRODUCTSPECNAME)
getSpecList(state.Spec)
.then((res: any) => {
state.sdkList = res.resultObj
@ -566,10 +566,10 @@ function handleQueryInfo() {
}
function handleQuery() {
if (state.queryParamsOrder.params.ORDERTYPE) {
if (state.queryParamsOrder.params.ORDERTYPE == 'A2') {
if (state.queryParamsOrder.params.ORDERTYPE == 'FG') {
state.queryParamsOrder.queryId = 'GetProductOrder'
state.queryParamsOrder.version = 'WEB00024'
} else if (state.queryParamsOrder.params.ORDERTYPE == 'DC') {
} else if (state.queryParamsOrder.params.ORDERTYPE == 'NLCC') {
state.queryParamsOrder.queryId = 'GetProductOrder2'
state.queryParamsOrder.version = 'WEB00024'
} else {
@ -621,7 +621,7 @@ function queryOrderType() {
function orderHandle(row: any, event: any, column: any) {
console.log(row)
state.queryParams.params.SOURCEORDER = row.SOURCEORDER
state.queryParams.params.PRODCUTSPECNAME = row.PRODCUTSPECNAME
state.queryParams.params.PRODUCTSPECNAME = row.PRODUCTSPECNAME
state.queryParams.params.PHASE = row.STAGECODE
state.queryParams.params.CHARGE = row.CHARGE
state.queryParams.params.SDK_ID = row.SDK_IDS
@ -635,11 +635,11 @@ function orderHandle(row: any, event: any, column: any) {
).hasTime
}
if (state.queryParamsOrder.params.ORDERTYPE == 'A2') {
if (state.queryParamsOrder.params.ORDERTYPE == 'FG') {
state.queryParams.queryId = 'GetProductOrderPkg'
state.queryParams.version = 'WEB00025'
handleQuery2()
} else if (state.queryParamsOrder.params.ORDERTYPE == 'DC') {
} else if (state.queryParamsOrder.params.ORDERTYPE == 'NLCC') {
state.queryParams.queryId = 'GetProductOrderPkg2'
state.queryParams.version = 'WEB00025'
handleQuery2()

1
src/views/label/modifyRemark/index.vue
View File

@ -747,6 +747,7 @@ function print() {
USER: localStorage.get('userId'),
LABELCODE: state.LABELCODE
}
state.button_print = true
state.loadings = true
printLabelWithRemark(PRINT)

7
src/views/stockIn/AllocateStockIn/index.vue
View File

@ -368,11 +368,12 @@ async function handleReserve() {
})
}
let param = {
userId: localStorage.get('userId'),
siteName : localStorage.get('SITENAME') || 'SDK',
userId: localStorage.getItem('userId'),
siteName : localStorage.getItem('SITENAME') || 'SDK',
shipRequestName : state.formData.SHIPREQUESTNAME,
erpLocation: state.formData.ERPRECEIVELOCATION,
erpFactory: state.formData.ERPRECEIVEFACTORY,
locationName: state.StorageSelect[0] || '',
boxList: objectFull
}
await allocateStockInCommit(param)
@ -402,6 +403,7 @@ async function handleReserve() {
// confirmButtonText: 'OK'
// })
state.Button_state = false
state.loading = false
})
} else {
// ElMessageBox.alert("入库标签列表为空", '提示框', {
@ -411,6 +413,7 @@ async function handleReserve() {
confirmButtonText: 'OK'
})
state.Button_state = false
state.loading = false
}
}

13
src/views/stockOut/shipRequestReserve/index.vue
View File

@ -1006,9 +1006,18 @@ function handleStockOut() {
if (state.queryParams.params.SHIPREQUESTNAME!='' && state.queryParams.params.SHIPREQUESTNAME!=null && state.queryParams.params.SHIPREQUESTNAME != undefined)
{
// 如果数量不与原数量相等，就数量被修改
let boxList: any[] = [];
state.MaterialPackingUsername.map((item: any) => {
if(item.MATERIALQUANTITY != item.MATERIALQUANTITY2) {
boxList.push({MATERIALPACKINGNAME: item.MATERIALPACKINGNAME, MATERIALQUANTITY2: item.MATERIALQUANTITY2});
}
});
const params = {
//materialPackingName: boxId,
boxList: boxList,
user: localStorage.get('userId'),
shipRequestName: state.queryParams.params.SHIPREQUESTNAME,
commitDate: state.commitDate,
@ -1018,7 +1027,7 @@ function handleStockOut() {
//state.loading = true;
state.buttonOut_loading = true;
//state.buttonOut_state = true;
CompleteShipRequest(params).then((res: any) => {
if (res.success) {

2
src/views/stocked/MoveTransformation/index.vue
View File

@ -591,7 +591,7 @@ function handleStockOut() {
};
state.buttonOut_loading = true;
MoveTransform(params).then((res: any) => {
if (res.success) {
if (res.code == "200") {
handleQuery();
state.buttonOut_loading = false;
} else {