Commit b0a6568c by LJM

css

parent 597bd27a
......@@ -106,15 +106,15 @@
<text class="t2">{{ item.goods_name }}</text>
</view>
<view class="row verCenter">
<view class="bar row verCenter" style="flex: 0 0 40%;">
<view class="bar row verCenter" style="width: 40%;">
<text class="tt">标准品牌:</text>
<text class="yy">{{ item.brand_name }}</text>
</view>
<view class="bar row verCenter" style="flex: 0 0 30%;">
<view class="bar row verCenter" style="width: 20%;">
<text class="tt">数量:</text>
<text class="yy">{{ item.expect_qty }}</text>
</view>
<view class="bar row verCenter" style="flex: 0 0 30%;">
<view class="bar row verCenter" style="width: 40%;">
<text class="tt">入仓号:</text>
<text class="yy">{{ item.inhouse }}</text>
</view>
......
......@@ -61,7 +61,7 @@
</template>
<!--出库单状态为全部拣货-->
<template v-if="item.stock_out_status == 5">
<template v-if="item.stock_out_status == 5 || item.stock_out_status == 8">
<navigator :url="'/pages/picking/record?stock_out_sn=' + item.stock_out_sn" hover-class="none" class="btn2 row rowCenter verCenter">详情</navigator>
</template>
</view>
......
......@@ -64,6 +64,10 @@
<text class="label">拣货时间:</text>
<text class="text">{{ item.create_time }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">备注:</text>
<text class="text" style="color: #F98119;">{{ item.upstream_remark }}</text>
</view>
</view>
</view>
<!-- 无数据展示 -->
......@@ -212,7 +216,7 @@ export default {
* 获取列表数据
*/
getData() {
this.request(API.getAllPickedList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
this.request(API.getAllPickedList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, true).then(res => {
if (res.code === 0) {
this.list = res.data.list;
this.filter_list = createArray(this.list.length, false);
......
......@@ -91,7 +91,9 @@
<text class="label">销 售 员:</text>
<text class="text">{{ item.sale_name }}</text>
</view>
<view class="btn row rowCenter verCenter" @click="showDrawer(1, item)">拣货</view>
<template v-if="item.lock_qty !== item.pick_qty">
<view class="btn row rowCenter verCenter" @click="showDrawer(1, item)">拣货</view>
</template>
</view>
</view>
<!-- 无数据展示 -->
......@@ -119,9 +121,11 @@
</view>
<view class="input-box row verCenter">
<text class="label">合计应拣数量:</text>
<text class="text">{{ item.total_pick_num }}</text>
<text class="text">{{ item.total_lock_num - item.total_pick_num }}</text>
</view>
<view class="btn row rowCenter verCenter" @click="showDrawer(2, item)">选择</view>
<template v-if="item.total_lock_num != item.total_pick_num">
<view class="btn row rowCenter verCenter" @click="showDrawer(2, item)">选择</view>
</template>
</view>
</view>
<!-- 无数据展示 -->
......
......@@ -91,7 +91,7 @@
<view class="pack">
<view class="h2">库位:</view>
<view class="row verCenter bothSide">
<view class="search row bothSide verCenter" :class="{ 'error-style': !is_submit }" style="width: 100%;"><input type="text" placeholder-style="color:#919399" class="uni-input" placeholder="请输入库位编码" @input="inputPositionCodeChange()" v-model="formParams.position_code" /></view>
<view class="search row bothSide verCenter" :class="{ 'error-style': !is_submit }" style="width: 100%;"><input type="text" placeholder-style="color:#919399" style="width: 100%;text-indent: 1em;" class="uni-input" placeholder="请输入库位编码" @input="inputPositionCodeChange()" v-model="formParams.position_code" /></view>
</view>
</view>
<view class="btn row verCenter bothSide">
......
......@@ -12,7 +12,7 @@
<view class="search-bar row bothSide verCenter">
<view class="row verCenter">
<text class="iconfont icon-juxing1"></text>
<input class="uni-input" placeholder="请扫描或输入入库批次号" placeholder-style="color:#919399" v-model="searchParams.stock_in_batch_sn" @input="handleInput" />
<input class="uni-input" placeholder="请扫描或输入入库批次号" placeholder-style="color:#919399" v-model="searchParams.stock_in_batch_sn" @input="handleInput" maxlength="15" />
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</view>
......
......@@ -12,7 +12,7 @@
<view class="search-bar row bothSide verCenter">
<view class="row verCenter">
<text class="iconfont icon-juxing1"></text>
<input class="uni-input" v-model="formParams.sn" placeholder="请输入入库批次号" placeholder-style="color:#919399" @input="handleInput(1, formParams.sn)" />
<input class="uni-input" v-model="formParams.sn" placeholder="请输入入库标签" placeholder-style="color:#919399" @input="handleInput(1, formParams.sn)" maxlength="15" />
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput(1)" v-if="input_flag"></text>
</view>
......
......@@ -27,7 +27,7 @@
<view class="search-bar row bothSide verCenter">
<view class="row verCenter">
<text class="iconfont icon-juxing1"></text>
<input class="uni-input" placeholder="请扫描或输入入库批次号" placeholder-style="color:#919399" v-model="searchParams.stock_in_batch_sn" @input="handleInput(2, searchParams.stock_in_batch_sn)" />
<input class="uni-input" placeholder="请扫描入库标签" placeholder-style="color:#919399" v-model="searchParams.stock_in_batch_sn" @input="handleInput(2, searchParams.stock_in_batch_sn)" maxlength="15" />
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput(2)" v-if="input_flag_stock_in_batch_sn"></text>
</view>
......
......@@ -152,7 +152,6 @@
import { API } from '@/util/api.js';
import { createArray } from '@/util/util.js';
import debounce from 'lodash/debounce';
import w_md5 from '@/util/md5.js';
export default {
data() {
......@@ -493,7 +492,6 @@ export default {
chooseImageChange() {
this.noexebshowFalg = false;
var self = this;
var time = parseInt(new Date().getTime() / 1000);
uni.chooseImage({
count: self.maxNums,
sourceType: ['album', 'camera'],
......@@ -513,22 +511,20 @@ export default {
}
for (let i = 0; i < tempFilePaths.length; i++) {
uni.uploadFile({
url: API.upload,
url: API.upload + '?sys_type=4',
filePath: tempFilePaths[i],
name: 'upload',
formData: {
source: '1',
k1: time,
k2: w_md5.hex_md5_32(w_md5.hex_md5_32(String(time)) + 'fh6y5t4rr351d2c3bryi')
name: 'file',
header: {
'Content-Type': 'multipart/form-data'
},
success: uploadFileRes => {
uni.hideLoading();
var data = JSON.parse(uploadFileRes.data);
if (data.code === 200) {
self.image_list.push(data.data[0]);
self.image_list.push(data.data.oss_file_url);
} else {
uni.showToast({
title: data.message,
title: '网络出现问题',
icon: 'error'
});
}
......
......@@ -169,7 +169,6 @@
<script>
import { API } from '@/util/api.js';
import debounce from 'lodash/debounce';
import w_md5 from '@/util/md5.js';
export default {
data() {
......@@ -436,7 +435,6 @@ export default {
chooseImageChange() {
this.noexebshowFalg = false;
var self = this;
var time = parseInt(new Date().getTime() / 1000);
uni.chooseImage({
count: self.maxNums,
sourceType: ['album', 'camera'],
......@@ -456,22 +454,20 @@ export default {
}
for (let i = 0; i < tempFilePaths.length; i++) {
uni.uploadFile({
url: API.upload,
url: API.upload + '?sys_type=4',
filePath: tempFilePaths[i],
name: 'upload',
formData: {
source: '1',
k1: time,
k2: w_md5.hex_md5_32(w_md5.hex_md5_32(String(time)) + 'fh6y5t4rr351d2c3bryi')
name: 'file',
header: {
'Content-Type': 'multipart/form-data'
},
success: uploadFileRes => {
uni.hideLoading();
var data = JSON.parse(uploadFileRes.data);
if (data.code === 200) {
self.image_list.push(data.data[0]);
if (data.code === 0) {
self.image_list.push(data.data.oss_file_url);
} else {
uni.showToast({
title: data.message,
title: '网络出现问题',
icon: 'error'
});
}
......
......@@ -5,6 +5,7 @@ const API_BASE_SUPPLIER = 'http://supplier.liexin.net'; //供应商系统
const API_BASE_CRM = 'http://crmnew.liexindev.net'; //CRM系统
const API_BASE = 'http://wms.liexindev.net'; //WMS系统
const API_BASE_LIEXIN = 'http://api.liexin.com'; //api系统
const API_BASE_OSS = 'http://file.liexindev.net'; //oss系统
const API = {
/**
......@@ -170,7 +171,7 @@ const API = {
/**
* 上传文件
* */
upload: API_BASE_LIEXIN + '/oss/upload',
upload: API_BASE_OSS + '/uploadFile',
/**
* 标签补打
* */
......
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