Browse Source

整理样式

hella_online_20240829
niexiting 4 months ago
parent
commit
aabb5b1df3
  1. 4
      src/mycomponents/scan/winComScanBalanceLocation.vue
  2. 4
      src/mycomponents/scan/winScanItem.vue
  3. 14
      src/pages/count/job/countBlindDetail.vue
  4. 10
      src/pages/count/job/countDetail.vue
  5. 5
      src/pages/count/job/fuzzyCountDetail.vue
  6. 25
      src/pages/customerReturn/job/returnDetail.vue
  7. 7
      src/pages/deliver/job/deliverDetail.vue
  8. 22
      src/pages/inspect/request/inspectRequestDetail.vue
  9. 14
      src/pages/inventoryMove/job/inventoryMoveDetail.vue
  10. 1
      src/pages/issue/coms/comIssueRequestPopup.vue
  11. 35
      src/pages/package/job/overPackageJobDetail.vue
  12. 18
      src/pages/productPutaway/job/productPutawayDetail.vue
  13. 16
      src/pages/productReceipt/job/ccProductReceiptDetail.vue
  14. 19
      src/pages/productReceipt/job/productReceiptDetail.vue
  15. 4
      src/pages/productReceipt/job/scrapReceiptDetail.vue
  16. 7
      src/pages/productRecycle/job/productRecycleJobDetail.vue
  17. 11
      src/pages/productionReceipt/coms/comProductionJobCard.vue
  18. 3
      src/pages/productionReceipt/job/productionReceiptDetail.vue
  19. 1
      src/pages/productionReturn/coms/comReturnRequestPopup.vue
  20. 6
      src/pages/productionReturn/job/returnDetail.vue
  21. 6
      src/pages/repleinsh/job/repleinshDetail.vue
  22. 20
      src/pages/stockUp/job/stockUpJobDetail.vue
  23. 15
      src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
  24. 19
      src/pages/transfer/job/issueDetail.vue
  25. 13
      src/pages/transfer/job/receiptDetail.vue
  26. 4
      src/pages/transfer/job/transferDetail.vue
  27. 3
      src/pages/unPlanned/coms/comReceiptRequestPopup.vue
  28. 4
      src/pages/unPlanned/job/issueJobDetail.vue
  29. 17
      src/pages/unPlanned/job/receiptJobDetail.vue
  30. 3
      src/pages/unPlanned/request/issueRequestDetail.vue
  31. 3
      src/pages/unPlanned/request/receiptRequestDetail.vue

4
src/mycomponents/scan/winComScanBalanceLocation.vue

@ -238,9 +238,9 @@
getBasicItemByCode(itemCode).then(res => {
if (res.data != null && res.data.list.length > 0) {
var result = res.data.list[0];
var status = result.status;
var status = result.available;
var type = result.type;
if (status == "ENABLE") {
if (status == "TRUE") {
if (checkDirectoryItemExist(this.itemTypesList, type)) {
callBack()
} else {

4
src/mycomponents/scan/winScanItem.vue

@ -110,14 +110,14 @@
uni.hideLoading();
if (res.data != null && res.data.list.length > 0) {
var result =res.data.list[0];
var status =result.status;
var status =result.available;
var type = result.type;
var itemCode = result.code
var itemName =result.name
var uom = result.uom
var std = result.uom
result.package = scanResult.package
if(status=="ENABLE"){
if(status=="TRUE"){
if(checkDirectoryItemExist(this.itemCodeTypeList,type)){
this.result =result;
this.callBack()

14
src/pages/count/job/countBlindDetail.vue

@ -1,7 +1,8 @@
<template>
<view class="page-wraper">
<view class="header">
<view class="">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
@ -25,6 +26,7 @@
</view>
</view>
</view>
</view>
<u-line color="#D8D8D8" style="margin-bottom: 10rpx"></u-line>
<view style="margin-top: 160rpx; margin-bottom: 50rpx;">
<u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
@ -40,8 +42,7 @@
</view>
<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index"
@editItem="editItem" :settingParam="jobContent" @remove="updateData"
:isShowRecommendQty ="false"
@updateData="updateData">
:isShowRecommendQty="false" @updateData="updateData">
</comCountDetailcards>
</view>
<view class='split_line'></view>
@ -67,9 +68,8 @@
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location
:allowModifyLocation="false"
ref="scanPopup" :noShowBalanceMessage="true" :queryBalance="true" @getResult='getScanResult'>
<win-scan-pack-and-location :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true"
:queryBalance="true" @getResult='getScanResult'>
</win-scan-pack-and-location>
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">

10
src/pages/count/job/countDetail.vue

@ -1,6 +1,7 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
@ -21,6 +22,7 @@
</view>
</view>
</view>
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;"></u-line>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
@ -48,15 +50,11 @@
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location
ref="scanPopup" :noShowBalanceMessage="true"
:isCount="true"
<win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" :isCount="true"
@getCountScanResult='getScanResult'>
</win-scan-pack-and-location>
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
:allowEditStatus="editInventoryStatus"
:isShowBalance="jobContent.isOpenCount=='TRUE'">
:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
</count-qty-edit>
<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
<comMessage ref="comMessage"></comMessage>

5
src/pages/count/job/fuzzyCountDetail.vue

@ -2,6 +2,7 @@
<view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<view class="header-view">
<job-top :dataContent="jobContent"></job-top>
<uni-collapse ref="collapse">
<uni-collapse-item :open="true">
@ -19,6 +20,7 @@
</uni-collapse-item>
</uni-collapse>
</view>
</view>
<view class="card_view" v-if="fromLocationCode!=''">
<text class="card_location">盘点库位</text>
<text class="card_content ">{{fromLocationCode}}</text>
@ -328,8 +330,7 @@
if (index < 0) {
this.showErrorMessage("物料代码【" + packInfo.itemCode + "】,不在盘点范围【" + this.itemRangeValue + "】内")
return;
}
else {
} else {
this.onScan(packInfo);
}
} else {

25
src/pages/customerReturn/job/returnDetail.vue

@ -1,5 +1,17 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
<view>客户代码:{{jobContent.customerCode}}</view>
</view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -9,7 +21,6 @@
:locationAreaTypeList="toLocationAreaTypeList">
</com-detail-card>
</view>
<view class='split_line'></view>
</view>
</scroll-view>
</view>
@ -18,9 +29,10 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref='comScanLocation' :isShowEdit="jobContent.allowModifyLocation=='TRUE'" title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
<locationCompare ref='comScanLocation' :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' :locationAreaTypeList="toLocationAreaTypeList">
</locationCompare>
</view>
<view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -67,9 +79,11 @@
import locationCompare from '@/mycomponents/location/locationCompare.vue'
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/customerReturn/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default {
components: {
jobTop,
winScanButton,
winScanPackAndLocation,
locationCompare,
@ -281,7 +295,8 @@
}
});
} else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
});

7
src/pages/deliver/job/deliverDetail.vue

@ -1,13 +1,10 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<!-- <view class="header_item">
申请单号{{jobContent.requestNumber}}
</view>
-->
<view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
@ -25,7 +22,7 @@
<view>{{toLocationCode}}</view>
</view>
</view>
<view class='split_line'></view>
</view>
</view>
</view>

22
src/pages/inspect/request/inspectRequestDetail.vue

@ -1,22 +1,22 @@
<template>
<view class="page-wraper">
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="" style="background-color: #fff; padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
<view class="" style="font-size: 35rpx;">
<view class="page-header">
<view class="header-view">
<view class="header_item" >
单据号 : {{requestContent.number}}
</view>
<view class="" style="font-size: 35rpx;">
<view class="header_item" >
<text>供应商代码 : {{requestContent.supplierCode}} </text>
</view>
</view>
</view>
<view class='split_line'></view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<comRequestDetailCard :dataContent="item"
:isShowBatch ="false"
@openDetail="openDetail">
<comRequestDetailCard :dataContent="item" :isShowBatch="false" @openDetail="openDetail">
</comRequestDetailCard>
</view>
</view>
@ -29,7 +29,6 @@
</template>
<script>
import {
getInspectRequestDetail,
} from '@/api/request2.js';
@ -115,8 +114,7 @@
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {
}
if (res) {}
});
},

14
src/pages/inventoryMove/job/inventoryMoveDetail.vue

@ -1,13 +1,11 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
@ -175,8 +173,7 @@
name = "不合格转隔离";
this.toLocationCode = 'HOLD';
this.toInventoryStatus = 'HOLD';
}
else if (this.businessTypeCode == "OktoScrap") {
} else if (this.businessTypeCode == "OktoScrap") {
name = "合格转报废";
this.toLocationCode = 'SCRAP';
this.toInventoryStatus = 'SCRAP';
@ -454,12 +451,9 @@
detail.toBatch = info.batch;
detail.toContainerNumber = '';
// detail.toLocationCode = this.toLocationCode;
if(this.businessTypeCode == "Move")
{
if (this.businessTypeCode == "Move") {
detail.toInventoryStatus = detail.inventoryStatus;
}
else
{
} else {
detail.toInventoryStatus = this.toInventoryStatus;
}
subList.push(detail)

1
src/pages/issue/coms/comIssueRequestPopup.vue

@ -99,7 +99,6 @@
<script>
import {
getBasicItemByCode,
getProductionlineItem,
getWorkShopLineStation,
getWarehouseCodeList

35
src/pages/package/job/overPackageJobDetail.vue

@ -1,44 +1,51 @@
<template>
<view class="page-wraper">
<div style="background: white;">
<print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
</div>
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<!-- <view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view> -->
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view v-for="(toLocation, index) in detailSource" :key="index">
<view class="cen_card" style="padding: 5rpx;" v-if='subList.length>0'>
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">翻包前包装规格</view>
<view>
{{subList[0].fromPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].fromPackUnit)}}
{{getPackUnitName(subList[0].fromPackUnit)}}/{{subList[0].fromPackQty}}({{getUomInfo(subList[0].uom)}})
</view>
</view>
<view class="cell_info">
<view class="text_lightblue">翻包后包装规格</view>
<view>
{{subList[0].toPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].toPackUnit)}}
{{getPackUnitName(subList[0].toPackUnit)}}/{{subList[0].toPackQty}}({{getUomInfo(subList[0].uom)}})
</view>
</view>
</view>
</view>
<view class="split_line"></view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view v-for="(toLocation, index) in detailSource" :key="index">
<comOverPackJobDetailCard ref='comOverPackJobDetailCard' :dataContent="toLocation"
@updateData='updateData'>
</comOverPackJobDetailCard>
</view>
</scroll-view>
</view>
<div style="background: white;">
<uni-collapse>
<uni-collapse-item>
<template v-slot:title>
<view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;">
打印设置
</view>
</template>
<print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
</uni-collapse-item>
</uni-collapse>
</div>
<view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">

18
src/pages/productPutaway/job/productPutawayDetail.vue

@ -1,20 +1,21 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
<!-- <view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view> -->
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false"
@remove="updateData" @updateData="updateData" @openDetail="openDetail"
<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
:isShowStatus="false" @remove="updateData" @updateData="updateData" @openDetail="openDetail"
:locationAreaTypeList='toLocationAreaTypeList'>
</com-detail-card>
</view>
@ -36,7 +37,8 @@
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup"
@getResult='getScanResult'></win-scan-pack-and-location>
<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="comMessage"></comMessage>
@ -273,7 +275,8 @@
}
})
}
this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,scanMessage);
this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
scanMessage);
},
openScanPopup() {
@ -453,7 +456,8 @@
productPutawayJobSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成"+this.hintTitle+"记录<br>" + res.data)
this.showCommitSuccessMessage("提交成功<br>生成" + this.hintTitle + "记录<br>" +
res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}

16
src/pages/productReceipt/job/ccProductReceiptDetail.vue

@ -1,14 +1,10 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
@ -20,7 +16,7 @@
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>
{{item.subList[0].productionLineCode}}
{{jobContent.subList[0].productionLineCode}}
</view>
</view>
<view class="cell_info">
@ -36,8 +32,14 @@
</view>
</view>
</view>
<view class="split_line"></view>
</view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"

19
src/pages/productReceipt/job/productReceiptDetail.vue

@ -1,14 +1,11 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<!-- <view class="header_item">生产计划{{productionPlanNumber}}</view> -->
<view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
@ -20,7 +17,7 @@
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>
{{item.subList[0].productionLineCode}}
{{jobContent.subList[0].productionLineCode}}
</view>
</view>
<view class="cell_info">
@ -36,8 +33,13 @@
</view>
</view>
</view>
<view class="split_line"></view>
</view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@ -53,7 +55,8 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref="comScanLocation" title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode"
<locationCompare ref="comScanLocation" title="收货库位"
:isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>

4
src/pages/productReceipt/job/scrapReceiptDetail.vue

@ -1,13 +1,11 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">

7
src/pages/productRecycle/job/productRecycleJobDetail.vue

@ -1,13 +1,11 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号{{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
@ -34,7 +32,8 @@
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location ref="scanPopup" title="制品标签" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-pack-and-location ref="scanPopup" title="制品标签"
@getResult='getScanResult'></win-scan-pack-and-location>
<recycleDetailInfoPopup ref="jobDetailPopup"></recycleDetailInfoPopup>
<comMessage ref="comMessage"></comMessage>
</view>

11
src/pages/productionReceipt/coms/comProductionJobCard.vue

@ -1,10 +1,13 @@
<template>
<job-com-main-card :dataContent="dataContent">
<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<view class="" >
<text style="font-size: 32rpx; margin-left: 35rpx;">生产线</text>
<text style="font-size: 35rpx; margin-left: 10rpx; font-weight: bold;" >{{dataContent.productionLineCode}}</text>
<view class="task_item" style="margin-left: 15px;">
<view class="task_text">
<view class="card_view">
<text class="card_packing_code ">生产线</text>
<text class="card_content ">{{dataContent.productionLineCode}}</text>
</view>
</view>
</view>
</job-com-main-card>
</template>

3
src/pages/productionReceipt/job/productionReceiptDetail.vue

@ -2,13 +2,14 @@
<view class="page-wraper">
<view class="page-main">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
发料任务单号 : {{jobContent.issueJobNumber}}
</view>
<view class="split_line"></view>
</view>
</view>
<scroll-view scroll-y="true">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">

1
src/pages/productionReturn/coms/comReturnRequestPopup.vue

@ -74,7 +74,6 @@
<script>
import {
getBasicItemByCode,
getProductionlineItem,
getWorkShopLineStation
} from '@/api/request2.js';

6
src/pages/productionReturn/job/returnDetail.vue

@ -1,21 +1,19 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<!-- <view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view> -->
<work-station :workshopCode="jobContent.workshopCode" :productionLineCode="titleInfo.productionLineCode"
:workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.fromLocationCode">
</work-station>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<view class="split_line"></view>
<com-return-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>

6
src/pages/repleinsh/job/repleinshDetail.vue

@ -1,13 +1,14 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class="split_line"></view>
</view>
</view>
<view class="page-main">
@ -191,7 +192,8 @@
that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.detailSource, that.subList)
if (that.scanMessage) {
this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent,that.scanMessage);
this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this
.jobContent, that.scanMessage);
}
setTimeout(r => {

20
src/pages/stockUp/job/stockUpJobDetail.vue

@ -1,26 +1,11 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号{{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
<!-- <view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">客户代码</view>
<view>{{jobContent.customerCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">客户寄售库</view>
<view>{{toLocationCode}}</view>
</view>
</view>
<view class='split_line'></view>
</view> -->
</view>
<view class="page-main">
@ -324,7 +309,8 @@
.packingNumber;
record.toBatch = r.batch;
} else {
var info = getPackingNumberAndBatch(
var info =
getPackingNumberAndBatch(
this.managementList, r
.itemCode,
r.packingNumber, r

15
src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue

@ -1,18 +1,17 @@
<template>
<view class="page-wraper">
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class=""
style="padding:10rpx 30rpx ;font-size: 32rpx; ">
<!-- padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx -->
<view style="padding: 5rpx;">
<view class="page-header">
<view class="header-view">
<view class="header_item">
发货单号:{{dataContent.asnNumber}}
</view>
<view style="padding: 5rpx;">
<view class="header_item">
供应商代码:{{dataContent.supplierCode}}
</view>
</view>
<u-line />
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<com-record-detail-card :dataContent="item" :index="index" @remove="updateData"

19
src/pages/transfer/job/issueDetail.vue

@ -1,11 +1,10 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
</view>
<view class="page-main">
@ -26,8 +25,8 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode'
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
<view class=" uni-flex uni-row">
@ -262,16 +261,19 @@
r.batch == batch && r.fromLocationCode == result.fromLocationCode
})
if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中")
} else {
if (itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】已经扫描")
} else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,是否继续出库?', res => {
if (res) {
itemDetail.scaned = true;
@ -287,7 +289,8 @@
}
});
} else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
});

13
src/pages/transfer/job/receiptDetail.vue

@ -1,24 +1,23 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class="header_item">
来源仓库 : {{jobContent.fromWarehouseCode}}
</view>
<view class='split_line'></view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
@remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</com-receipt-detail-card>
</view>
</view>
@ -29,8 +28,8 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode'
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
<view class=" uni-flex uni-row">

4
src/pages/transfer/job/transferDetail.vue

@ -1,13 +1,11 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">

3
src/pages/unPlanned/coms/comReceiptRequestPopup.vue

@ -76,9 +76,6 @@
</template>
<script>
import {
getBasicItemByCode,
} from '@/api/request2.js';
import {
getLocationTypeName,
getListLocationTypeDesc,

4
src/pages/unPlanned/job/issueJobDetail.vue

@ -1,13 +1,11 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">

17
src/pages/unPlanned/job/receiptJobDetail.vue

@ -1,13 +1,11 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
@ -15,7 +13,8 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
@remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</com-receipt-detail-card>
</view>
<view class='split_line'></view>
@ -27,8 +26,8 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode'
<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
<view class=" uni-flex uni-row">
@ -221,8 +220,7 @@
this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
} else {
var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch
);
var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch);
if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" + "不在列表中")
} else {
@ -231,7 +229,8 @@
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty);
itemDetail.toLocationCode = this.toLocationCode? this.toLocationCode:itemDetail.toLocationCode ;
itemDetail.toLocationCode = this.toLocationCode ? this.toLocationCode : itemDetail
.toLocationCode;
itemDetail.packQty = result.package.packQty
itemDetail.labelQty = Number(result.label.qty);
calcHandleQty(this.detailSource);

3
src/pages/unPlanned/request/issueRequestDetail.vue

@ -1,13 +1,14 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
从仓库代码 : {{requestContent.fromWarehouseCode}}
</view>
<view class='split_line'></view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">

3
src/pages/unPlanned/request/receiptRequestDetail.vue

@ -1,13 +1,14 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
到仓库代码 : {{requestContent.toWarehouseCode}}
</view>
<view class='split_line'></view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">

Loading…
Cancel
Save