Browse Source

修改样式及翻包功能

hella_vue3
niexiting 8 months ago
parent
commit
a16bdb3639
  1. 12
      src/common/style/new_style.css
  2. 10
      src/mycomponents/balance/balance.vue
  3. 4
      src/mycomponents/item/item.vue
  4. 2
      src/mycomponents/item/itemQty.vue
  5. 6
      src/mycomponents/qty/compareQty.vue
  6. 3
      src/mycomponents/qty/packUnit.vue
  7. 4
      src/mycomponents/qty/qty.vue
  8. 56
      src/pages/package/record/overPackageRecord.vue
  9. 2
      src/pages/query/coms/comItemBalance.vue

12
src/common/style/new_style.css

@ -2033,14 +2033,20 @@ button::after {
.card_itemCode { .card_itemCode {
font-size: 38rpx; font-size: 38rpx;
font-weight: bold; font-weight: bold;
/* font-weight: 500; */ font-weight: 500;
padding: 5rpx 10rpx; /* padding: 5rpx 10rpx; */
/* width: 210rpx; */
word-wrap: break-word;
word-break: break-all;
} }
.card_itemName { .card_itemName {
color: #909399; color: #909399;
font-size: 30rpx; font-size: 30rpx;
padding: 5rpx 20rpx; /* padding: 5rpx 10rpx; */
/* width: 210rpx; */
word-wrap: break-word;
word-break: break-all;
} }
.card_ProdLine { .card_ProdLine {

10
src/mycomponents/balance/balance.vue

@ -8,19 +8,21 @@
<to-location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode"> <to-location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode">
</to-location> </to-location>
</view> </view>
<view> <view class="uni-flex uni-row center">
<!-- <qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent" <!-- <qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty> --> :isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty> -->
<qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent" <qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent"
:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty> :isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty>
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)" <compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)"
:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack" :isShowStatus='isShowStatus'> :handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack"
:isShowStatus='isShowStatus'>
</compare-qty> </compare-qty>
<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()"> <view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text> <text style="font-size: 30rpx;color: #2979ff; width: 20px;" @click="copy">复制</text>
<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
</view> </view>
</view> </view>
</view> </view>
<!-- <u-line></u-line> --> <!-- <u-line></u-line> -->
</view> </view>

4
src/mycomponents/item/item.vue

@ -1,8 +1,6 @@
<template> <template>
<view> <view>
<view class="uni-flex u-col-center space-between" style=" <view class="uni-flex u-col-center space-between">
background-color:#fff;
margin-left: 10rpx;">
<view > <view >
<view class="card_itemCode" :class="openPopup(dataContent)"> <view class="card_itemCode" :class="openPopup(dataContent)">
{{dataContent.itemCode}} {{dataContent.itemCode}}

2
src/mycomponents/item/itemQty.vue

@ -1,5 +1,5 @@
<template> <template>
<view class="uni-flex uni-row space-between center" style="background-color:#fff;"> <view class="uni-flex uni-row space-between center" style="background-color:#fff; margin-left: 15px;">
<view> <view>
<item :dataContent="dataContent"></item> <item :dataContent="dataContent"></item>
</view> </view>

6
src/mycomponents/qty/compareQty.vue

@ -1,8 +1,8 @@
<template> <template>
<view> <view >
<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status> <status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
<view class="uni-flex uni-row "> <view class="uni-flex uni-row center">
<view class="uni-flex uni-row center"> <view class="uni-flex uni-row ">
<view v-if="Number(handleQty)!=0"> <view v-if="Number(handleQty)!=0">
<view v-if="isShowRecommendQty"> <view v-if="isShowRecommendQty">
<view v-if="Number(recommendQty)>Number(handleQty)" class="text_greater"> <view v-if="Number(recommendQty)>Number(handleQty)" class="text_greater">

3
src/mycomponents/qty/packUnit.vue

@ -1,7 +1,8 @@
<template> <template>
<view class="std_pack" v-if="dataContent.packQty!=undefined"> <view class="std_pack" v-if="dataContent.packQty!=undefined">
<text> <text>
{{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}}/{{getPackUnitName(dataContent.packUnit)}} <!-- {{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}}/{{getPackUnitName(dataContent.packUnit)}} -->
{{getPackUnitName(dataContent.packUnit)}}({{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}})
</text> </text>
</view> </view>
</template> </template>

4
src/mycomponents/qty/qty.vue

@ -1,11 +1,11 @@
<template> <template>
<view class="center uni-column"> <view class="center uni-column">
<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
<view class="uni-flex uni-row"> <view class="uni-flex uni-row">
<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
<view class="text_default center"> <view class="text_default center">
{{Number(dataContent.qty)}} {{Number(dataContent.qty)}}
</view> </view>
<uom :uom="dataContent.uom"></uom> <uom :uom="dataContent.uom"></uom>
</view> </view>
<view> <view>

56
src/pages/package/record/overPackageRecord.vue

@ -3,21 +3,28 @@
<view class=""> <view class="">
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length>0">
<view class="cen_card" style="background-color: #fff; margin:10px 0px 0px 10px;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">库位</view>
<view>{{fromLocationCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">包装规格</view>
<view>{{getPackUnitName(fromPack.packUnit)}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">包装数量</view>
<view>{{fromPack.packQty}}{{getUomInfo(fromPack.uom)}}</view>
</view>
</view>
</view>
<view class="split_line"></view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<view class="" style="padding: 20rpx; font-size: 32rpx;">
<view> 来源库位 : {{item.subList[0].locationCode}}
</view>
<view> 来源包装规格 :
{{fromPackUnit}}/{{item.subList[0].packQty}}{{getUomInfo(item.subList[0].uom)}}
</view>
</view>
<record-com-detail-card :dataContent="item" :index="index" <record-com-detail-card :dataContent="item" :index="index"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack" @removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"
:isShowFromLocation="false" :isShowToLocation="false"> :isShowFromLocation="false" :isShowToLocation="false">
@ -32,15 +39,14 @@
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<view class="uni-flex uni-row title u-col-center" style="font-size: 28rpx;"> <view class="uni-flex uni-row">
<text>目标包装规格 :</text> <text>目标包装规格:</text>
<view class="uni-flex u-col-center uni-row" @click="showPackage"> <view class="uni-flex u-col-center uni-row" @click="showPackage">
<view class="" style="margin-left: 5rpx;width: 100%;"> <view class="" style="margin-left: 5rpx;width: 100%;">
{{toPackUnitShow}} {{toPackUnitShow}}
</view> </view>
<u-select v-model="show" mode="single-column" :list="packageList" <u-select v-model="show" mode="single-column" :list="packageList"
@confirm="confirmSelect"> @confirm="confirmSelect">
</u-select> </u-select>
</view> </view>
</view> </view>
@ -122,9 +128,10 @@
businessType: {}, businessType: {},
dataContent: {}, dataContent: {},
fromPackUnit: "", fromPackUnit: "",
fromPack: {},
packageList: [], packageList: [],
show: false, show: false,
toPackUnitShow: "包装规格", toPackUnitShow: "请选择",
toPackQty: "", toPackQty: "",
itemCode: "" itemCode: ""
}; };
@ -170,9 +177,11 @@
getPackUnitByItemCode(this.itemCode).then(res => { getPackUnitByItemCode(this.itemCode).then(res => {
if (res.data != null && res.data.list.length > 0) { if (res.data != null && res.data.list.length > 0) {
res.data.list.forEach(item => { res.data.list.forEach(item => {
item.value = item.packQty; // item.value = item.packQty;
item.label = item.packUnit + "/" + item.packQty + this item.value = item.packUnit;
.getUomInfo(item.uom); item.label = this.getPackUnitName(item.packUnit) + "(" + item.packQty + this
.getUomInfo(item.uom) + ")";
item.data = 'a';
}) })
this.packageList = res.data.list this.packageList = res.data.list
this.show = true; this.show = true;
@ -183,17 +192,19 @@
}).catch(error => { }).catch(error => {
this.showErrorMessage("未查找到包装规格" + error); this.showErrorMessage("未查找到包装规格" + error);
}) })
}, },
confirmSelect(e) { confirmSelect(e) {
if (this.fromPackUnit == e[0].label) { if (this.fromPackUnit == e[0].label) {
this.showErrorMessage("来源包装规格【" + this.fromPackUnit + "】与目标包装规格【" + e[0].label + "】不能相等") this.showErrorMessage("来源包装规格【" + this.fromPackUnit + "】与目标包装规格【" + e[0].label + "】不能相等")
return return
} }
// var toPackUnit = e[0].label.split("(")[0]
// this.toPackUnit = toPackUnit
// this.toPackQty = e[0].value
this.toPackUnit = e[0].value
let pack = this.packageList.filter(r => r.packUnit == this.toPackUnit)[0];
this.toPackQty = pack.packQty;
this.toPackUnitShow = e[0].label this.toPackUnitShow = e[0].label
var toPackUnit = e[0].label.split("/")[0]
this.toPackUnit =toPackUnit
this.toPackQty = e[0].value
}, },
getScanResult(result) { getScanResult(result) {
@ -201,6 +212,7 @@
let label = result.label; let label = result.label;
let pack = result.package; let pack = result.package;
this.fromPackUnit = pack.packUnit; this.fromPackUnit = pack.packUnit;
this.fromPack = pack;
var item = this.detailSource.find(res => { var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) { if (res.itemCode == balance.itemCode) {
return res return res
@ -308,7 +320,7 @@
// //
if (tempHandleQty % toPackQty > 0) { if (tempHandleQty % toPackQty > 0) {
// var count = Math.ceil(tempHandleQty / toPackQty); // var count = Math.ceil(tempHandleQty / toPackQty);
this.$refs.comMessage.showQuestionMessage( "扫描数量【" + tempHandleQty + this.$refs.comMessage.showQuestionMessage("扫描数量【" + tempHandleQty +
"】,将有1个非整包,是否提交?", res => { "】,将有1个非整包,是否提交?", res => {
if (res) { if (res) {
this.submitJob() this.submitJob()

2
src/pages/query/coms/comItemBalance.vue

@ -1,6 +1,6 @@
<template> <template>
<view :class="dataContent.scaned?'scan_view':''" style="width: 100%;"> <view :class="dataContent.scaned?'scan_view':''" style="width: 100%;">
<view class="uni-flex uni-row space-between"> <view class="uni-flex uni-row space-between center">
<view> <view>
<pack v-if="isShowPack" :packingCode="dataContent.packingNumber"></pack> <pack v-if="isShowPack" :packingCode="dataContent.packingNumber"></pack>
<batch v-if="isShowBatch" :batch="dataContent.batch"></batch> <batch v-if="isShowBatch" :batch="dataContent.batch"></batch>

Loading…
Cancel
Save