Commit c3178223 by LJM

二期

parent 83f0a649
...@@ -156,8 +156,20 @@ ...@@ -156,8 +156,20 @@
margin-right: 32rpx; margin-right: 32rpx;
} }
.curr { .curr {
position: relative;
color: #1969f9; color: #1969f9;
font-weight: bold; font-weight: bold;
&::after {
content: '';
background-color: #1969f9;
width: 51%;
height: 2px;
position: absolute;
bottom: -10rpx;
left: 0;
right: 0;
margin: 0 auto;
}
} }
} }
.h2 { .h2 {
......
...@@ -233,8 +233,27 @@ ...@@ -233,8 +233,27 @@
.item-tit { .item-tit {
font-size: 20rpx; font-size: 20rpx;
color: #292b33; color: #292b33;
font-weight: bold;
margin-bottom: 18rpx; margin-bottom: 18rpx;
transition: all 0.2s ease;
text:first-child {
margin-right: 32rpx;
}
.curr {
position: relative;
color: #1969f9;
font-weight: bold;
&::after {
content: '';
background-color: #1969f9;
width: 51%;
height: 2px;
position: absolute;
bottom: -10rpx;
left: 0;
right: 0;
margin: 0 auto;
}
}
} }
.h2 { .h2 {
font-size: 17rpx; font-size: 17rpx;
......
...@@ -38,7 +38,12 @@ ...@@ -38,7 +38,12 @@
</view> </view>
<view class="bor"></view> <view class="bor"></view>
<view class="item-tit row verCenter"> <view class="item-tit row verCenter">
<text v-for="(v, index) in item" :key="index" :class="{ curr: curr == index }" @click="tab(index)">{{ v }}</text> <template v-if="detail.sku_id > 0">
<text v-for="(v, index) in item" :key="index" :class="{ curr: curr == index }" @click="tab(index)">{{ v }}</text>
</template>
<template v-else>
<text>货品信息</text>
</template>
</view> </view>
<template v-if="curr == 1"> <template v-if="curr == 1">
<view class="field-item row" style="margin-bottom: 40rpx;"> <view class="field-item row" style="margin-bottom: 40rpx;">
......
...@@ -71,6 +71,10 @@ ...@@ -71,6 +71,10 @@
<text class="label">入仓号:</text> <text class="label">入仓号:</text>
<text class="tt">{{ item.inhouse }}</text> <text class="tt">{{ item.inhouse }}</text>
</view> </view>
<view class="text-item row verCenter" v-if="item.sku_id > 0">
<text class="label" style="width: 100rpx;">自营货品ID:</text>
<text class="tt">{{ item.sku_id }}</text>
</view>
<view class="text-item row verCenter"> <view class="text-item row verCenter">
<text class="label">货品名称:</text> <text class="label">货品名称:</text>
<text class="tt">{{ item.goods_name }}</text> <text class="tt">{{ item.goods_name }}</text>
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
</view> </view>
<view> <view>
<text class="iconfont icon-juxing3" @click="createTallyContainer()"></text> <text class="iconfont icon-juxing3" @click="createTallyContainer()"></text>
<!-- <text class="iconfont icon-zimu-M" @click="createTallyContainer(1)"></text> -->
<text class="iconfont icon-a-juxing11" @click="clearInput(2)" v-if="input_contaion"></text> <text class="iconfont icon-a-juxing11" @click="clearInput(2)" v-if="input_contaion"></text>
</view> </view>
</view> </view>
...@@ -65,135 +64,212 @@ ...@@ -65,135 +64,212 @@
</view> </view>
</view> </view>
<view class="bor"></view> <view class="bor"></view>
<view class="item-tit">货品详情</view> <view class="item-tit row verCenter">
<view class="field-item row"> <template v-if="detail.sku_id > 0">
<view class="item row verCenter" style="flex: 0 0 100%;"> <text v-for="(v, index) in item" :key="index" :class="{ curr: curr == index }" @click="tab(index)">{{ v }}</text>
<text class="label">货品编码:</text> </template>
<text class="tt" style="max-width: 100%;">{{ detail.goods_sn }}</text> <template v-else>
</view> <text>货品信息</text>
<view class="item row verCenter" style="flex: 0 0 100%;"> </template>
<text class="label">货品名称:</text>
<text class="tt" style="max-width: 100%;">{{ detail.goods_name }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">标准品牌:</text>
<text class="tt" style="max-width: 100%;">{{ detail.brand_name }}</text>
</view>
<view class="item row verCenter">
<text class="label">货品品质:</text>
<text class="tt">{{ detail.quality_cn }}</text>
</view>
<view class="item row verCenter">
<text class="label">预期数量:</text>
<text class="tt">{{ detail.expect_qty }}</text>
</view>
<view class="item row verCenter">
<text class="label">单 位:</text>
<text class="tt">{{ detail.goods_unit }}</text>
</view>
<view class="item row verCenter">
<text class="label">待理货数量:</text>
<text class="tt" style="color: #f98119;font-weight: bold;">{{ detail.wait_tally_qty }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">是否质检:</text>
<text class="text" style="font-weight: bold;">{{ detail.is_qc_cn }}</text>
</view>
<view class="item row verCenter">
<text class="label">销售员:</text>
<text class="tt">{{ detail.sale_user }}</text>
</view>
<view class="item row verCenter">
<text class="label">采购员:</text>
<text class="tt">{{ detail.purchase_user }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">客户:</text>
<text class="text" style="font-weight: bold;max-width: 491rpx;">{{ detail.customer_name }}</text>
</view>
<view class="item row" style="flex: 0 0 100%;" v-if="detail.customer_material_number">
<text class="label" style="width: 112rpx;">客户物料编码:</text>
<text class="tt" style="max-width: 491rpx;">{{ detail.customer_material_number }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">供应商:</text>
<text class="tt" style="max-width: 491rpx;">{{ detail.supplier_name }}</text>
</view>
<view class="item row" style="flex: 0 0 100%;">
<text class="label">上游备注:</text>
<text class="desc" style="max-width: 491rpx;">{{ detail.stock_in_upstream_remark }}</text>
</view>
<view class="item row" style="flex: 0 0 100%;">
<text class="label">明细备注:</text>
<text class="desc" style="max-width: 491rpx;">{{ detail.upstream_remark }}</text>
</view>
</view> </view>
<view class="form-input"> <template v-if="curr == 0">
<view class="row bothSide verCenter input-box-wrap"> <view class="field-item row">
<view> <template v-if="detail.sku_id > 0">
<view class="input-title"> <view class="item row verCenter">
<text class="input-title-t1">*</text> <text class="label">货品编码:</text>
<text class="input-title-t2">理货数量:</text> <text class="tt" style="max-width: 100%;">{{ detail.goods_sn }}</text>
</view> </view>
<view class="input-box"><input type="number" class="uni-input" placeholder-style="color:#919399" placeholder="请输入理货数量" v-model="formParams.tally_qty" @input="handleInputNumber($event, detail.wait_tally_qty)" /></view> <view class="item row verCenter">
<text class="label">自营货品ID:</text>
<text class="tt" style="max-width: 100%;">{{ detail.sku_id }}</text>
</view>
</template>
<template v-else>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">货品编码:</text>
<text class="tt" style="max-width: 100%;">{{ detail.goods_sn }}</text>
</view>
</template>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">货品名称:</text>
<text class="tt" style="max-width: 100%;">{{ detail.goods_name }}</text>
</view> </view>
<view> <view class="item row verCenter" style="flex: 0 0 100%;">
<view class="input-title"><text class="input-title-t2">其它批次属性:</text></view> <text class="label">标准品牌:</text>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.other_batch_attr" /></view> <text class="tt" style="max-width: 100%;">{{ detail.brand_name }}</text>
</view>
<view class="item row verCenter">
<text class="label">货品品质:</text>
<text class="tt">{{ detail.quality_cn }}</text>
</view>
<view class="item row verCenter">
<text class="label">预期数量:</text>
<text class="tt">{{ detail.expect_qty }}</text>
</view>
<view class="item row verCenter">
<text class="label">单 位:</text>
<text class="tt">{{ detail.goods_unit }}</text>
</view>
<view class="item row verCenter">
<text class="label">待理货数量:</text>
<text class="tt" style="color: #f98119;font-weight: bold;">{{ detail.wait_tally_qty }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">是否质检:</text>
<text class="text" style="font-weight: bold;">{{ detail.is_qc_cn }}</text>
</view>
<view class="item row verCenter">
<text class="label">销售员:</text>
<text class="tt">{{ detail.sale_user }}</text>
</view>
<view class="item row verCenter">
<text class="label">采购员:</text>
<text class="tt">{{ detail.purchase_user }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">客户:</text>
<text class="text" style="font-weight: bold;max-width: 491rpx;">{{ detail.customer_name }}</text>
</view>
<view class="item row" style="flex: 0 0 100%;" v-if="detail.customer_material_number">
<text class="label" style="width: 112rpx;">客户物料编码:</text>
<text class="tt" style="max-width: 491rpx;">{{ detail.customer_material_number }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">供应商:</text>
<text class="tt" style="max-width: 491rpx;">{{ detail.supplier_name }}</text>
</view>
<view class="item row" style="flex: 0 0 100%;">
<text class="label">上游备注:</text>
<text class="desc" style="max-width: 491rpx;">{{ detail.stock_in_upstream_remark }}</text>
</view>
<view class="item row" style="flex: 0 0 100%;">
<text class="label">明细备注:</text>
<text class="desc" style="max-width: 491rpx;">{{ detail.upstream_remark }}</text>
</view> </view>
</view> </view>
<view class="row bothSide verCenter input-box-wrap"> <view class="form-input">
<view> <view class="row bothSide verCenter input-box-wrap">
<view class="input-title"><text class="input-title-t2">D / C:</text></view> <view>
<template v-if="is_print"> <view class="input-title">
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#EC7935" placeholder="建议填写批次" v-model="formParams.date_code" /></view> <text class="input-title-t1">*</text>
</template> <text class="input-title-t2">理货数量:</text>
<template v-else> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入D/C" v-model="formParams.date_code" /></view> <view class="input-box"><input type="number" class="uni-input" placeholder-style="color:#919399" placeholder="请输入理货数量" v-model="formParams.tally_qty" @input="handleInputNumber($event, detail.wait_tally_qty)" /></view>
</template> </view>
<view>
<view class="input-title"><text class="input-title-t2">其它批次属性:</text></view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.other_batch_attr" /></view>
</view>
</view> </view>
<view> <view class="row bothSide verCenter input-box-wrap">
<view class="input-title"> <view>
<text class="input-title-t1" v-if="detail.stock_in_type == 4">*</text> <view class="input-title"><text class="input-title-t2">D / C:</text></view>
<text class="input-title-t2">产 地:</text> <template v-if="is_print">
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#EC7935" placeholder="建议填写批次" v-model="formParams.date_code" /></view>
</template>
<template v-else>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入D/C" v-model="formParams.date_code" /></view>
</template>
</view> </view>
<view class="pick-box"> <view>
<picker @change="bindPickerChange($event, 1)" :value="useOptionIndex" :range="useOption" :range-key="'country_cn'"> <view class="input-title">
<view class="row verCenter"> <text class="input-title-t1" v-if="detail.stock_in_type == 4">*</text>
<view class="uni-input">{{ useOptionIndex == -1 ? '请选择' : useOption[useOptionIndex].country_cn }}</view> <text class="input-title-t2">产 地:</text>
<view class="uni-arrow"></view> </view>
</view> <view class="pick-box">
</picker> <picker @change="bindPickerChange($event, 1)" :value="useOptionIndex" :range="useOption" :range-key="'country_cn'">
<view class="row verCenter">
<view class="uni-input">{{ useOptionIndex == -1 ? '请选择' : useOption[useOptionIndex].country_cn }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> <view class="h2 row bothSide verCenter" style="margin-top: 34rpx;">
<view class="h2 row bothSide verCenter" style="margin-top: 34rpx;"> <view>
<view> <text>理货照片:</text>
<text>理货照片:</text> <text class="tt">最多只支持{{ maxNum }}张图</text>
<text class="tt">最多只支持{{ maxNum }}张图</text> </view>
<view class="num">
<text class="t1">{{ image_list.length }}</text>
<text class="t2">/10</text>
</view>
</view> </view>
<view class="num"> <view class="pic-list row">
<text class="t1">{{ image_list.length }}</text> <template v-if="image_list.length > 0">
<text class="t2">/10</text> <view class="box" v-for="(item, index) in image_list" :key="index">
<image :src="item" mode="aspectFill" @click="previewChange(image_list, index)"></image>
<text class="iconfont icon-a-juxing11" @click="deletePic(index)"></text>
</view>
</template>
<view class="default row rowCenter verCenter" @click="chooseImageChange()" v-if="image_list.length < maxNum"><text class="iconfont icon-a-juxing3"></text></view>
</view> </view>
</view> <p style="color: red;font-size: 17rpx;margin-bottom: 10rpx;" v-if="is_watch">选中包含有采购需看货的物料,建议上传理货照片!</p>
<view class="pic-list row"> <view class="print row verCenter" @click="toggle(2)">
<template v-if="image_list.length > 0"> <text class="check-box-icon" :class="{ curr: pic_flag }"></text>
<view class="box" v-for="(item, index) in image_list" :key="index"> <text class="tt">整单照片</text>
<image :src="item" mode="aspectFill" @click="previewChange(image_list, index)"></image> </view>
<text class="iconfont icon-a-juxing11" @click="deletePic(index)"></text> <view class="h2">理货备注:</view>
<view class="textarea-box"><textarea placeholder-style="color:#919399" placeholder="请输入理货备注" v-model="formParams.tally_remark" /></view>
</template>
<template v-else>
<view class="field-item row">
<view class="item row verCenter" style="flex: 0 0 100%;" v-if="detail.sku_id">
<text class="label">自营货品ID:</text>
<text class="text" style="max-width: 100%;">{{ detail.sku_id }}</text>
</view> </view>
</template> <view class="item row verCenter">
<view class="default row rowCenter verCenter" @click="chooseImageChange()" v-if="image_list.length < maxNum"><text class="iconfont icon-a-juxing3"></text></view> <text class="label">货品名称:</text>
</view> <text class="tt">{{ detail.goods_name }}</text>
<p style="color: red;font-size: 17rpx;margin-bottom: 10rpx;" v-if="is_watch">选中包含有采购需看货的物料,建议上传理货照片!</p> </view>
<view class="print row verCenter" @click="toggle(2)"> <view class="item row verCenter">
<text class="check-box-icon" :class="{ curr: pic_flag }"></text> <text class="label">标准品牌:</text>
<text class="tt">整单照片</text> <text class="tt">{{ detail.brand_name }}</text>
</view> </view>
<view class="h2">理货备注:</view> <view class="item row verCenter">
<view class="textarea-box"><textarea placeholder-style="color:#919399" placeholder="请输入理货备注" v-model="formParams.tally_remark" /></view> <text class="label">包装方式:</text>
<text class="tt">{{ detail.packing_cn }}</text>
</view>
<view class="item row verCenter">
<text class="label">标准包装量:</text>
<text class="tt">{{ detail.mpq }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label" style="width: 128rpx;">标准包装长宽高:</text>
<text class="tt" style="max-width: 100%;">{{ detail.standard_length }}&nbsp;*{{ detail.standard_width }}&nbsp;*{{ detail.standard_high }}</text>
</view>
<view class="item row verCenter">
<text class="label" style="width: 113rpx;">标准包装净重:</text>
<text class="tt">{{ detail.standard_net_weight }}</text>
</view>
<view class="item row verCenter">
<text class="label" style="width: 113rpx;">标准包装毛重:</text>
<text class="tt">{{ detail.standard_gross_weight }}</text>
</view>
<view class="item row verCenter">
<text class="label">其他属性:</text>
<text class="tt">{{ detail.picking_other_attr }}</text>
</view>
<view class="item row verCenter">
<text class="label">销售员:</text>
<text class="tt">{{ detail.sale_user }}</text>
</view>
<view class="item row verCenter">
<text class="label">采购员:</text>
<text class="tt">{{ detail.purchase_user }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">客户:</text>
<text class="text" style="font-weight: bold;max-width: 491rpx;">{{ detail.customer_name }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">供应商:</text>
<text class="tt" style="max-width: 491rpx;">{{ detail.supplier_name }}</text>
</view>
</view>
</template>
</view> </view>
<view class="fix-btn row verCenter"> <view class="fix-btn row verCenter">
<view class="btn1 row rowCenter verCenter" @click="toggle(1)"> <view class="btn1 row rowCenter verCenter" @click="toggle(1)">
...@@ -227,6 +303,8 @@ export default { ...@@ -227,6 +303,8 @@ export default {
page: 1, page: 1,
limit: 1, limit: 1,
index: 0, index: 0,
curr: 0,
item: ['货品信息', '其他信息'],
indexContainer: -1, indexContainer: -1,
array: ['物流单号', '入库单号', '入仓号'], array: ['物流单号', '入库单号', '入仓号'],
tallyContainer: [], //容器列表 tallyContainer: [], //容器列表
...@@ -275,6 +353,13 @@ export default { ...@@ -275,6 +353,13 @@ export default {
} }
}, },
methods: { methods: {
/**
* @param {Object} index
* tab切换
*/
tab(index) {
this.curr = index;
},
bindPickerChange: function(e, type) { bindPickerChange: function(e, type) {
console.log('picker发送选择改变,携带值为', e.detail.value); console.log('picker发送选择改变,携带值为', e.detail.value);
if (type == 1) { if (type == 1) {
......
...@@ -74,6 +74,10 @@ ...@@ -74,6 +74,10 @@
<text class="label">入仓号:</text> <text class="label">入仓号:</text>
<text class="tt">{{ item.inhouse }}</text> <text class="tt">{{ item.inhouse }}</text>
</view> </view>
<view class="text-item row verCenter" v-if="item.sku_id > 0">
<text class="label" style="width: 100rpx;">自营货品ID:</text>
<text class="tt">{{ item.sku_id }}</text>
</view>
<view class="text-item row verCenter"> <view class="text-item row verCenter">
<text class="label">货品名称:</text> <text class="label">货品名称:</text>
<text class="tt">{{ item.goods_name }}</text> <text class="tt">{{ item.goods_name }}</text>
...@@ -109,7 +113,7 @@ ...@@ -109,7 +113,7 @@
<text class="iconfont icon-a-juxing21"></text> <text class="iconfont icon-a-juxing21"></text>
<text class="text">查不到当前数据</text> <text class="text">查不到当前数据</text>
</view> </view>
<view class="fix-btn row verCenter"> <view class="fix-btn row verCenter" v-if="list.length > 0">
<view class="btn1 row rowCenter verCenter" style="width: 127rpx;" @click="allChnage()"> <view class="btn1 row rowCenter verCenter" style="width: 127rpx;" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text> <text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text> <text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
...@@ -153,6 +157,10 @@ ...@@ -153,6 +157,10 @@
<text class="label">货品编码:</text> <text class="label">货品编码:</text>
<text class="tt" style="max-width: 100%;">{{ detail.goods_sn }}</text> <text class="tt" style="max-width: 100%;">{{ detail.goods_sn }}</text>
</view> </view>
<view class="item row verCenter" style="flex: 0 0 100%;" v-if="detail.sku_id > 0">
<text class="label">自营货品ID:</text>
<text class="tt" style="max-width: 100%;">{{ detail.sku_id }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;"> <view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">货品名称:</text> <text class="label">货品名称:</text>
<text class="tt" style="max-width: 100%;">{{ detail.goods_name }}</text> <text class="tt" style="max-width: 100%;">{{ detail.goods_name }}</text>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment