wangfukang 2 years ago
parent
commit
7284b421b6
  1. BIN
      package1/.DS_Store
  2. 186
      package1/AI/AIHangOrderList.vue
  3. 3
      package1/AI/AIInventoryList.vue
  4. 4
      package1/AI/AIPicture.vue
  5. 2
      package1/AI/AiChangeGoods.vue
  6. 6
      package1/AI/AiChat.vue
  7. 332
      package1/AI/addAiList.vue
  8. 6035
      package1/AI/voiceInventory.vue
  9. 126
      package1/index/order.vue
  10. 1187
      package1/index/orderDetail.vue
  11. 65
      package1/index/peopleList.vue
  12. 27
      package1/inventory/addGoods.vue
  13. 16
      package1/stock/addStock.vue
  14. 2
      package1/stock/addStockList.vue

BIN
package1/.DS_Store

Binary file not shown.

186
package1/AI/AIHangOrderList.vue

@ -55,9 +55,10 @@
</view>
<view class="content-text">
<view class="text" style="font-weight: bold;font-size: 32rpx;color: #000;margin-top:36rpx;">
{{item.userName}}
客户:{{item.userName}}
</view>
<view class="text">{{item.createTime}}</view>
<view class="text">{{item.createTime}}</view>
<view class="text" style="position: absolute;top: 35rpx;right: 20rpx;">操作人:{{item.createByName}}</view>
</view>
<view class="content-btn" v-if="item.aiFlag == 1">
<text class="blink">识别中...</text>
@ -68,9 +69,9 @@
</text>
</view>
<view style="width: 100%;height: 100rpx;float: left;border-top: 1px solid #eee;">
<view class="btn" @tap="clickCollapse(item)" style="width: 70rpx;">
<!-- <view class="btn" @tap="clickCollapse(item,index)" style="width: 70rpx;">
<uni-icons type="down" size="11" color="#fff"></uni-icons>
</view>
</view> -->
<view class="btn" @tap.stop="toggle('center',item)" v-if="item.aiFlag == 0">语音备注</view>
<view class="btn" @tap.stop="scanCodeAdd(item)" v-if="item.aiFlag == 0">扫码选货</view>
<view class="btn" v-if="item.aiFlag != 1" @tap.stop="goGoods(item)">去开单</view>
@ -88,7 +89,7 @@
<view class="order-name">
<view style="width: 80%;float: left;">
<view style="" v-if="items.productSn != null">
{{items.productName}}({{items.productSn}})
【销】{{items.productName}}({{items.productSn}})
</view>
<view style="" v-else>
库存中没有货号为:0001的商品
@ -141,7 +142,7 @@
style="height:40rpx;line-height: 40rpx;position: absolute !important;bottom:0;right: 30rpx;"></uni-icons>
</view>
<view class="popup-container">
<textarea name="" id="" style="width:100%;border:1px solid #eee;" v-model="voiceText"
<textarea maxlength="-1" name="" id="" style="width:100%;border:1px solid #eee;" v-model="voiceText"
placeholder="等待语音识别中..."></textarea>
<view>
<text style="color:red;font-size:22rpx;">*长按“语音”按钮录入,系统将自动识别</text>
@ -304,6 +305,7 @@
attrNameList: [],
temporaryList: [],
carList: [],
returnList:new Map(),
specsList: [],
evalue: [],
attributeList: [],
@ -832,7 +834,7 @@
}
})
},
goGoods(item){
async goGoods(item){
var that = this;
if(item.aiNotRecognition != '' && item.aiNotRecognition != null){
uni.showModal({
@ -855,10 +857,49 @@
}
})
}else{
that.goSaleGoods(item)
await this.getReturnOrder(item.id)
uni.showModal({
title: "提示",
content: '确认去开单吗?',
success: function(res) {
if (res.confirm) {
that.goSaleGoods(item)
}
}
})
}
},
async getReturnOrder(id) {
let that = this;
await this.tui.request("/app/return/list", "post", {
remark: 3,
saleId: id
}, false, false).then((res) => {
if (res.code == 200 && res.result != null && res.result != undefined) {
if (res.result != '') {
res.result.forEach(item => {
this.tui.request("/app/return/get/" + item.id, "GET", null, false,false).then((res) => {
if (res.code == 200 && res.result != null && res.result != undefined) {
for(let i=0;i<res.result.saleDetailDTOList.length;i++){
res.result.saleDetailDTOList[i].returnPrice = res.result.saleDetailDTOList[i].discountAmount
res.result.saleDetailDTOList[i].stockLogList = new Map()
that.returnList.set(res.result.saleDetailDTOList[i].productId,res.result.saleDetailDTOList[i])
for(let m=0;m<res.result.saleDetailDTOList[i].stockLogList1.length;m++){
res.result.saleDetailDTOList[i].stockLogList1[m].productCount = 0-res.result.saleDetailDTOList[i].stockLogList1[m].productCount
that.returnList.get(res.result.saleDetailDTOList[i].productId).stockLogList.set(res.result.saleDetailDTOList[i].stockLogList1[m].attributeList,res.result.saleDetailDTOList[i].stockLogList1[m])
}
}
}
}).catch((res) => {})
})
}
} else {
this.tui.toast(res.message)
}
})
},
sliceMsg(val) {
var name = ''
if (typeof(val) == 'string') {
@ -872,69 +913,55 @@
//带参数跳转到开单页
goSaleGoods(item) {
let dataList = []
if(item.saleDetailDTOList){
if(item.saleDetailDTOList == null || item.saleDetailDTOList == ''){
item.saleDetailDTOList = []
}
this.returnList.forEach(function(value, key) {
item.saleDetailDTOList.push(value)
})
if (item.saleDetailDTOList) {
for (let i = 0; i < item.saleDetailDTOList.length; i++) {
let obj = {}
let attrMap = new Map()
let newSaleDetailDTOList = []
let num = 0
for(let m = 0; m < item.saleDetailDTOList[i].stockLogList1.length; m++){
if(this.isInventory == true && item.aiFlag != "0"){
if(item.saleDetailDTOList[i].stockLogList1[m].stockCount != null){
if(attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true){
let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
newSaleDetailDTOList[hasCount].productCount = Number(newSaleDetailDTOList[hasCount].productCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount)
}else{
item.saleDetailDTOList[i].stockLogList1[m].name = this.sliceMsg(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m])
attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList,num)
num++
}
}
}else{
if(attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true){
let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
newSaleDetailDTOList[hasCount].productCount = Number(newSaleDetailDTOList[hasCount].productCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount)
}else{
item.saleDetailDTOList[i].stockLogList1[m].name = this.sliceMsg(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m])
attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList,num)
num++
}
for (let m = 0; m < item.saleDetailDTOList[i].stockLogList1.length; m++) {
if (attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true) {
let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
newSaleDetailDTOList[hasCount].productCount = Number(newSaleDetailDTOList[hasCount]
.productCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount)
} else {
item.saleDetailDTOList[i].stockLogList1[m].name = this.sliceMsg(item.saleDetailDTOList[i]
.stockLogList1[m].attributeList)
newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m])
attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList, num)
num++
}
}
if(newSaleDetailDTOList.length != 0){
obj.saleDetailQueryDTO = newSaleDetailDTOList
obj.num = 0
obj.id = item.saleDetailDTOList[i].productId
obj.price = item.saleDetailDTOList[i].price
obj.lsprice = item.saleDetailDTOList[i].price
obj.categoryId=item.saleDetailDTOList[i].categoryId
obj.zPrice = item.saleDetailDTOList[i].discountAmount
obj.unitPrice = item.saleDetailDTOList[i].discountAmount || item.saleDetailDTOList[i].wholesalePrice
obj.productName = item.saleDetailDTOList[i].productName
obj.productPicture = item.saleDetailDTOList[i].productPicture+'?time='+new Date().getTime()
obj.productSn = item.saleDetailDTOList[i].productSn
obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
obj.saleId = item.id
obj.remark = item.remark
obj.xsyId = item.createBy
obj.createByName = item.createByName
dataList.push(obj)
}else{
obj.saleId = item.id
obj.remark = item.remark
obj.xsyId = item.createBy
obj.createByName = item.createByName
dataList.push(obj)
}
obj.saleDetailQueryDTO = newSaleDetailDTOList
obj.num = 0
obj.id = item.saleDetailDTOList[i].productId
obj.price = item.saleDetailDTOList[i].price
obj.lsprice = item.saleDetailDTOList[i].price
obj.categoryId = item.saleDetailDTOList[i].categoryId
obj.zPrice = item.saleDetailDTOList[i].discountAmount
obj.unitPrice = item.saleDetailDTOList[i].discountAmount || item.saleDetailDTOList[i]
.wholesalePrice
obj.productName = item.saleDetailDTOList[i].productName
obj.productPicture = item.saleDetailDTOList[i].productPicture + '?time=' + new Date().getTime()
obj.productSn = item.saleDetailDTOList[i].productSn
obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
obj.returnPrice = item.saleDetailDTOList[i].returnPrice
obj.saleId = item.id
obj.remark = item.remark
obj.xsyId = item.createBy
obj.createByName = item.createByName
dataList.push(obj)
}
}else{
} else {
let obj = {}
obj.num = 0
obj.price = 0
@ -953,6 +980,7 @@
sort: "",
}, false, false).then((res) => {
if (res.code == 200) {
this.returnList = new Map()
uni.setStorageSync('khName', JSON.stringify(res.result.records[0]))
uni.setStorageSync('carList1', JSON.stringify(dataList))
uni.setStorageSync('hangOrder', true)
@ -964,8 +992,37 @@
})
},
//点击切换折叠状态
clickCollapse(item) {
clickCollapse(item,index) {
item.isCollapse = !item.isCollapse
this.getReturnOrders(item.id,index)
},
//退款接口
async getReturnOrders(id,index) {
let that = this;
this.regList[index].returnList = []
await this.tui.request("/app/return/list", "post", {
remark: 3,
saleId: id
}, false, false).then((res1) => {
if (res1.code == 200 && res1.result != null && res1.result != undefined) {
if (res1.result != '') {
this.inventoryList = res1.result
this.inventoryList.forEach(item => {
this.tui.request("/app/return/get/" + item.id, "GET", null, false,
false).then((res) => {
if (res.code == 200 && res.result != null && res.result !=
undefined) {
this.regList[index].returnList.push(res.result.saleDetailDTOList)
}
}).catch((res) => {})
})
}
} else {
this.tui.toast(res.message)
}
})
console.log('returnList',this.regList)
},
//查看大图
largeImg(img) {
@ -1401,7 +1458,8 @@
border-radius: 10px;
margin: 0 auto 20rpx;
overflow: hidden;
display: block;
display: block;
position: relative;
}
.image-box {

3
package1/AI/AIInventoryList.vue

@ -118,7 +118,8 @@
this.tui.request("/app/purchase/getPurchaseList", "POST", {
pageNum: this.pageNum,
pageSize: 10,
isAiList: 1
isAiList: 1,
fromWhere:0
}, false, false).then((res) => {
this.status = 'nomore';
if (this.pages == 1) {

4
package1/AI/AIPicture.vue

@ -78,9 +78,9 @@
</view>
<!-- 弹出层 -->
<uni-popup ref="popup" background-color="#fff">
<view style="height:430rpx;">
<view style="height:300rpx;">
<view class="popup-photo" style="font-size: 28rpx;font-weight: 400;">提示:建议使用原相机拍照并在相册内截图后上传</view>
<view @tap="upLoadImg('pai')" class="popup-photo">拍照</view>
<!-- <view @tap="upLoadImg('pai')" class="popup-photo">拍照</view> -->
<view @tap="upLoadImg('xuan')" class="popup-photo">从相册选择</view>
<view @tap="$refs.popup.close()" class="popup-photo"
style="border-bottom:0;border-top:10px solid #eee;">取消</view>

2
package1/AI/AiChangeGoods.vue

@ -28,7 +28,7 @@
</view>
<view class="box-right">
<view class="box-right-name">
{{item.productName}}
{{item.productName == null ?'':item.productName}}
<text style="color: red;" v-if="item.delFlag == 0">(已下架)</text>
</view>
<view class="box-right-num">{{item.productSn}}</view>

6
package1/AI/AiChat.vue

@ -76,7 +76,7 @@
style="height:40rpx;line-height: 40rpx;position: absolute !important;bottom:0;right: 30rpx;"></uni-icons>
</view>
<view class="popup-container">
<textarea v-model="editText" style="padding: 20rpx;width:100%;border:1px solid #eee;"></textarea>
<textarea maxlength="-1" v-model="editText" style="padding: 20rpx;width:100%;border:1px solid #eee;"></textarea>
<view class="popup-bottom">
<view @tap="saveText" style="width: 100%;height: 70rpx;line-height: 70rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;">
确认无误
@ -154,9 +154,9 @@
'四': 4, '五': 5, '六': 6, '七': 7, '八': 8,
'九': 9,'杠':'-','刚':'-','军色':'均色','叉':'X','井':'#',
'时间':'10件','事件':'10件','世间':'10件','实践':'10件','实件':'10件',
'景':'#','警':'#','颈':'#','括号':'货号'
'景':'#','警':'#','颈':'#','括号':'货号','名城':'名称','明城':'名称','名成':'名称','名程':'名称',
};
const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|井|时间|事件|世间|实践|实件|景|警|颈|括号)/g;
const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|井|时间|事件|世间|实践|实件|景|警|颈|括号|名城|名程|名成|明城)/g;
return str.replace(regex, match => chineseNumToArabic[match]);
},
inputSaveText(){

332
package1/AI/addAiList.vue

@ -72,11 +72,13 @@
</view>
<view class="content" style="height:150rpx;">
<view class="name-box">图片上传</view>
<view class="upload-img" @tap="pictureAdd" style="background: #eee;text-align: center;line-height: 160rpx;">
<view class="upload-img" @tap="pictureAdd"
style="background: #eee;text-align: center;line-height: 160rpx;">
<uni-icons type="camera" size="28" color="#777"></uni-icons>
</view>
<view style="overflow-x: scroll;display: flex;width: 350rpx;">
<view v-if="productPicture !=''" v-for="(item,index) in productPicture" :key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
<view v-if="productPicture !=''" v-for="(item,index) in productPicture" :key="index"
style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
<img :src="item" alt="" class="upload-img">
</view>
</view>
@ -121,10 +123,12 @@
</view>
</view>
<view class="bottom-btn">
<view @tap="toggle" style="background: linear-gradient(90deg, #FF9797, #FFC1E0);margin: 10rpx auto;height: 80rpx;width: 45%;border-radius: 10px;text-align: center;line-height: 80rpx;">
<view @tap="toggle"
style="background: linear-gradient(90deg, #FF9797, #FFC1E0);margin: 10rpx auto;height: 80rpx;width: 45%;border-radius: 10px;text-align: center;line-height: 80rpx;">
语音录入
</view>
<view style="background: linear-gradient(90deg, #60F3FF, #088FEB);margin: 10rpx auto;height: 80rpx;width: 45%;border-radius: 10px;text-align: center;line-height: 80rpx;">
<view
style="background: linear-gradient(90deg, #60F3FF, #088FEB);margin: 10rpx auto;height: 80rpx;width: 45%;border-radius: 10px;text-align: center;line-height: 80rpx;">
确定
</view>
</view>
@ -139,21 +143,25 @@
<view style="width: 100%;line-height: 40rpx;font-size: 11px;color: #777;">
示例:
</view>
<view style="width: 100%;line-height: 40rpx;font-size: 11px;color: #777;display: flex;text-align: center;">
<view
style="width: 100%;line-height: 40rpx;font-size: 11px;color: #777;display: flex;text-align: center;">
<view style="flex: 1;">发货人:</view>
<view style="flex: 1;">发货电话:</view>
</view>
<view style="width: 100%;line-height: 40rpx;font-size: 11px;color: #777;display: flex;text-align: center;">
<view
style="width: 100%;line-height: 40rpx;font-size: 11px;color: #777;display: flex;text-align: center;">
<view style="flex: 1;">收货人:</view>
<view style="flex: 1;">收货电话:</view>
</view>
<view style="width: 100%;line-height: 40rpx;font-size: 11px;color: #777;display: flex;text-align: center;">
<view
style="width: 100%;line-height: 40rpx;font-size: 11px;color: #777;display: flex;text-align: center;">
<view style="flex: 1;">重量:</view>
<view style="flex: 1;">数量:</view>
</view>
<view style="width: 100%;line-height: 40rpx;font-size: 11px;color: #777;display: flex;text-align: center;">
<view
style="width: 100%;line-height: 40rpx;font-size: 11px;color: #777;display: flex;text-align: center;">
<view style="flex: 1;">小费:</view>
<view style="flex: 1;">到达站:</view>
</view>
@ -187,25 +195,26 @@
export default {
data() {
return {
voiceText:'',
voiceText: '',
isVoice: false,
voiceData:{},
voiceData: {},
recordState: false,
productPicture: [],
messages:['消息1', '消息2', '消息3']
}
},
onShow() {
uni.authorize({
scope: 'scope.record',
success() {
},fail(){
scope: 'scope.record',
success() {
},
fail() {
this.tui.toast("您未授权,语音功能可能会出现错误")
}
})
},
onLoad(option) {
},
methods: {
//按住语音识别,开始
@ -225,197 +234,63 @@
manager.stop()
},
extractInfo(str) {
const info = {};
const regexes = [
{ name: 'senderName', regex: /发货人:(.*?),/ },
{ name: 'senderPhone', regex: /发货电话:(.*?),/ },
{ name: 'receiverName', regex: /收货人:(.*?),/ },
{ name: 'receiverPhone', regex: /收货电话:(.*?),/ },
{ name: 'weight', regex: /重量:(.*?),/ },
{ name: 'count', regex: /数量:(.*?),/ },
{ name: 'methodOfSettlement', regex: /结算方式:(.*?),/ },
{ name: 'tips', regex: /小费:(.*?),/ },
{ name: 'arrivalStation', regex: /到达站:(.*)/ }
];
regexes.forEach(({name, regex}) => {
const match = str.match(regex);
if (match && match[1]) {
// 去除可能的前后空格
info[name] = match[1].trim();
}
});
return info;
const info = {};
const regexes = [{
name: 'senderName',
regex: /发货人:(.*?),/
},
{
name: 'senderPhone',
regex: /发货电话:(.*?),/
},
{
name: 'receiverName',
regex: /收货人:(.*?),/
},
{
name: 'receiverPhone',
regex: /收货电话:(.*?),/
},
{
name: 'weight',
regex: /重量:(.*?),/
},
{
name: 'count',
regex: /数量:(.*?),/
},
{
name: 'methodOfSettlement',
regex: /结算方式:(.*?),/
},
{
name: 'tips',
regex: /小费:(.*?),/
},
{
name: 'arrivalStation',
regex: /到达站:(.*)/
}
];
regexes.forEach(({
name,
regex
}) => {
const match = str.match(regex);
if (match && match[1]) {
// 去除可能的前后空格
info[name] = match[1].trim();
}
});
return info;
},
yuyinChange(){
yuyinChange() {
console.log("yuyin")
this.isVoice = false
},
getVoiceData(){
let that = this;
if (this.voiceText == '') {
this.tui.toast('识别内容不能为空')
return
}
let convertedStr = this.voiceText;
if (convertedStr.indexOf(',发货人') != -1) {
convertedStr = convertedStr.replace(/,发货人/g, '发货人')
}
if (convertedStr.indexOf('发货人,') != -1) {
convertedStr = convertedStr.replace(/发货人,/g, '发货人')
}
if (convertedStr.indexOf('发货人::') != -1) {
convertedStr = convertedStr.replace(/发货人::/g, '发货人')
}
if (convertedStr.indexOf('发货人:') != -1) {
convertedStr = convertedStr.replace(/发货人:/g, '发货人')
}
if (convertedStr.indexOf('发货人') != -1) {
convertedStr = convertedStr.replace(/发货人/g, '发货人:')
}
if (convertedStr.indexOf(',发货电话') != -1) {
convertedStr = convertedStr.replace(/,发货电话/g, '发货电话')
}
if (convertedStr.indexOf('发货电话,') != -1) {
convertedStr = convertedStr.replace(/发货电话,/g, '发货电话')
}
if (convertedStr.indexOf('发货电话::') != -1) {
convertedStr = convertedStr.replace(/发货电话::/g, '发货电话')
}
if (convertedStr.indexOf('发货电话:') != -1) {
convertedStr = convertedStr.replace(/发货电话:/g, '发货电话')
}
if (convertedStr.indexOf('发货电话') != -1) {
convertedStr = convertedStr.replace(/发货电话/g, ',发货电话:')
}
if (convertedStr.indexOf(',收货人') != -1) {
convertedStr = convertedStr.replace(/,收货人/g, '收货人')
}
if (convertedStr.indexOf('收货人,') != -1) {
convertedStr = convertedStr.replace(/收货人,/g, '收货人')
}
if (convertedStr.indexOf('收货人::') != -1) {
convertedStr = convertedStr.replace(/收货人::/g, '收货人')
}
if (convertedStr.indexOf('收货人:') != -1) {
convertedStr = convertedStr.replace(/收货人:/g, '收货人')
}
if (convertedStr.indexOf('收货人') != -1) {
convertedStr = convertedStr.replace(/收货人/g, ',收货人:')
}
if (convertedStr.indexOf(',收货电话') != -1) {
convertedStr = convertedStr.replace(/,收货电话/g, '收货电话')
}
if (convertedStr.indexOf('收货电话,') != -1) {
convertedStr = convertedStr.replace(/收货电话,/g, '收货电话')
}
if (convertedStr.indexOf('收货电话::') != -1) {
convertedStr = convertedStr.replace(/收货电话::/g, '收货电话')
}
if (convertedStr.indexOf('收货电话:') != -1) {
convertedStr = convertedStr.replace(/收货电话:/g, '收货电话')
}
if (convertedStr.indexOf('收货电话') != -1) {
convertedStr = convertedStr.replace(/收货电话/g, ',收货电话:')
}
if (convertedStr.indexOf(',到达站') != -1) {
convertedStr = convertedStr.replace(/,到达站/g, '到达站')
}
if (convertedStr.indexOf('到达站,') != -1) {
convertedStr = convertedStr.replace(/到达站,/g, '到达站')
}
if (convertedStr.indexOf('到达站::') != -1) {
convertedStr = convertedStr.replace(/到达站::/g, '到达站')
}
if (convertedStr.indexOf('到达站:') != -1) {
convertedStr = convertedStr.replace(/到达站:/g, '到达站')
}
if (convertedStr.indexOf('到达站') != -1) {
convertedStr = convertedStr.replace(/到达站/g, ',到达站:')
}
if (convertedStr.indexOf(',重量') != -1) {
convertedStr = convertedStr.replace(/,重量/g, '重量')
}
if (convertedStr.indexOf('重量,') != -1) {
convertedStr = convertedStr.replace(/重量,/g, '重量')
}
if (convertedStr.indexOf('重量::') != -1) {
convertedStr = convertedStr.replace(/重量::/g, '重量')
}
if (convertedStr.indexOf('重量:') != -1) {
convertedStr = convertedStr.replace(/重量:/g, '重量')
}
if (convertedStr.indexOf('重量') != -1) {
convertedStr = convertedStr.replace(/重量/g, ',重量:')
}
if (convertedStr.indexOf(',数量') != -1) {
convertedStr = convertedStr.replace(/,数量/g, '数量')
}
if (convertedStr.indexOf('数量,') != -1) {
convertedStr = convertedStr.replace(/数量,/g, '数量')
}
if (convertedStr.indexOf('数量::') != -1) {
convertedStr = convertedStr.replace(/数量::/g, '数量')
}
if (convertedStr.indexOf('数量:') != -1) {
convertedStr = convertedStr.replace(/数量:/g, '数量')
}
if (convertedStr.indexOf('数量') != -1) {
convertedStr = convertedStr.replace(/数量/g, ',数量:')
}
if (convertedStr.indexOf(',结算方式') != -1) {
convertedStr = convertedStr.replace(/,结算方式/g, '结算方式')
}
if (convertedStr.indexOf('结算方式,') != -1) {
convertedStr = convertedStr.replace(/结算方式,/g, '结算方式')
}
if (convertedStr.indexOf('结算方式::') != -1) {
convertedStr = convertedStr.replace(/结算方式::/g, '结算方式')
}
if (convertedStr.indexOf('结算方式:') != -1) {
convertedStr = convertedStr.replace(/结算方式:/g, '结算方式')
}
if (convertedStr.indexOf('结算方式') != -1) {
convertedStr = convertedStr.replace(/结算方式/g, ',结算方式:')
}
if (convertedStr.indexOf(',小费') != -1) {
convertedStr = convertedStr.replace(/,小费/g, '小费')
}
if (convertedStr.indexOf('小费,') != -1) {
convertedStr = convertedStr.replace(/小费,/g, '小费')
}
if (convertedStr.indexOf('小费::') != -1) {
convertedStr = convertedStr.replace(/小费::/g, '小费')
}
if (convertedStr.indexOf('小费:') != -1) {
convertedStr = convertedStr.replace(/小费:/g, '小费')
}
if (convertedStr.indexOf('小费') != -1) {
convertedStr = convertedStr.replace(/小费/g, ',小费:')
}
convertedStr = this.spliceMsg(convertedStr)
this.voiceData = this.extractInfo(convertedStr);
if(this.voiceData.weight){
this.voiceData.weight = this.voiceData.weight.replace(/[^0-9]/g, "");
}
if(this.voiceData.count){
this.voiceData.count = this.voiceData.count.replace(/[^0-9]/g, "");
}
this.voiceData.freight = this.voiceData.weight * this.voiceData.count
if(this.voiceData.arrivalStation.indexOf('。') != -1){
this.voiceData.arrivalStation = this.voiceData.arrivalStation.replace(/\。/g, '')
}
this.$forceUpdate()
getVoiceData() {
this.$refs.popup.close()
},
spliceMsg(res) {
@ -440,7 +315,7 @@
manager.onStop = (res) => {
that.voiceText = res.result
}
// 识别错误事件
manager.onError = (res) => {
if (res.retcode == '-30011') {
@ -472,16 +347,16 @@
success(res) {
uni.showLoading({
title: '加载中...',
mask:true
mask: true
})
for(let i=0;i<res.tempFiles.length;i++){
for (let i = 0; i < res.tempFiles.length; i++) {
that.upLoadFile(res.tempFiles[i].tempFilePath)
}
}
})
},
async upLoadFile(path){
async upLoadFile(path) {
let that = this;
let hiver_token = uni.getStorageSync("hiver_token")
await uni.uploadFile({
@ -506,9 +381,9 @@
})
}
});
await setTimeout(res=>{
await setTimeout(res => {
uni.hideLoading();
},1000)
}, 1000)
},
}
}
@ -538,9 +413,10 @@
font-size: 36rpx;
color: #fff;
display: flex;
z-index:99
z-index: 99
}
.circle{
.circle {
width: 40rpx;
height: 40rpx;
text-align: center;
@ -551,12 +427,14 @@
font-size: 22rpx;
margin-top: 20rpx;
}
.content{
.content {
display: flex;
height: 80rpx;
line-height: 80rpx;
}
.input-box{
.input-box {
width: 100%;
height: 60rpx;
line-height: 60rpx;
@ -565,9 +443,11 @@
border-bottom: 1px solid #eee;
padding-left: 10px;
}
.name-box{
.name-box {
width: 20%;
}
.voice-popup-content {
align-items: center;
justify-content: center;
@ -577,18 +457,18 @@
height: 720rpx;
background-color: #fff;
}
.voice-popup-title {
font-size: 36rpx;
font-weight: bold;
text-align: center;
position: relative;
}
.voice-popup-container {
margin-top: 20rpx;
}
.voice-popup-bottom {
display: flex;
height: 80rpx;
@ -596,17 +476,17 @@
line-height: 80rpx;
margin-top: 30rpx;
}
.voice-popup-btn {
flex: 1;
text-align: center;
background: linear-gradient(90deg, #FF9797, #FFC1E0);
}
.voice-popup-btn:last-child {
background: linear-gradient(90deg, #60F3FF, #088FEB);
}
.voice-model {
width: 300rpx;
height: 300rpx;
@ -623,13 +503,13 @@
margin-left: -150rpx;
z-index: 999;
}
.voice-model img {
width: 200rpx;
height: 200rpx;
margin: 0 auto;
}
.voice-btn {
position: absolute;
bottom: -250rpx;
@ -639,6 +519,7 @@
background: #eee;
border-radius: 50%;
}
.mask-model {
width: 60%;
height: 100rpx;
@ -655,7 +536,8 @@
border-radius: 5px;
z-index: 99;
}
.upload-img{
.upload-img {
width: 160rpx;
height: 160rpx;
}

6035
package1/AI/voiceInventory.vue

File diff suppressed because it is too large

126
package1/index/order.vue

@ -1,11 +1,31 @@
<template>
<view>
<view class="search" style="position: fixed;top: 0;z-index: 99;">
<uni-datetime-picker style="margin-bottom:10px;" v-model="range" @change="searchList" type="daterange" />
<uni-search-bar class="uni-mt-10" radius="5" placeholder="输入客户名称/销售人员搜索" cancelButton="none"
@confirm="searchList" />
<uni-datetime-picker style="margin-bottom:10px;" v-model="range" @change="searchList" type="daterange" />
<view style="display: flex;">
<view style="width: 80%;" :style="{'width':listStatus!= 6?'80%':'100%'}">
<uni-search-bar class="uni-mt-10" radius="5" placeholder="输入客户名称/销售人员/单号搜索" cancelButton="none"
@confirm="searchList" />
</view>
<view style="width: 20%;" v-if="listStatus !=6">
<view style="width: 80%;height: 70rpx;background: #5fd9ee;text-align: center;line-height: 70rpx;border-radius: 10px;margin: 10px;color: #fff;" @tap="changeSort('paixu')">
查看
<uni-icons type="down" color="#fff" size="11" v-if="noDaysort == false"></uni-icons>
<uni-icons type="up" color="#fff" size="11" v-if="noDaysort"></uni-icons>
</view>
</view>
</view>
</view>
<view class="nahuo-mask" v-if="noDaysort">
<view style="width: 100%;margin: 0 auto;background: #fff;height: 200rpx;border: 1px solid #eee;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px;">
<view @tap="getCancelOrder()" class="paixu-content" style="border-bottom: 1px solid #eee;">
查看全部订单
</view>
<view @tap="getCancelOrder('2')" class="paixu-content">
查看已作废状态的订单
</view>
</view>
</view>
<!-- <u-alert description="点击列表可跳转至销售单" type="primary"></u-alert> -->
<view class="u-transition" style="display:flex;background: #ecf5ff;width: 100%;color: #5fd9ee;height: 80rpx;line-height: 80rpx;padding-left: 20rpx;">
<view>点击列表可跳转至销售单</view>
<!-- <view @tap.stop="printCodeBtn" class="dayin-text" v-if="btnStatus">打印商品码</view>
@ -19,12 +39,16 @@
<checkbox v-if="btnStatus==false" :value="item" style="float: left;width: 60rpx;line-height: 300rpx;margin: 0 20rpx;" />
<view :style="{width:btnStatus==false?'95%':'100%'}" @tap="gotoDetail(item.id)">
<uni-card :title="item.userName == null ?'暂无':item.userName" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'数量:'+(item.productCount == null ?'暂无':item.productCount)">
<view class="uni-body" style="font-weight: bold;font-size: 30rpx;">
<text class="cardText" style="font-size: 30rpx;">单号:</text>
{{item.id}}
</view>
<view class="uni-body"><text class="cardText">销售员:</text> {{item.createByName == null ?'暂无':item.createByName}}</view>
<view class="uni-body">
<text class="cardText">销售金额:</text>
<text class="priceText">{{item.realAmount == null ?'暂无':item.realAmount}}</text>
<text decode class="cardText">{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款: '}}</text>
<text class="priceText">{{item.noEarn == null ?'暂无':item.noEarn}}</text>
<text class="priceText" style="color:red;">{{item.noEarn == null ?'暂无':item.noEarn}}</text>
</view>
<view class="uni-body" v-if="item.returnSaleProductCount > 0">
<text class="cardText">退货金额:</text>
@ -36,7 +60,7 @@
订单状态:</text>{{item.status == '0' ?'待抢单' :item.status == '2' ?'作废' :item.status == '1' ?'待取货' :item.status == '3' ?'待送达' :item.status == '4' ?'已完成' :item.status == '5' ?'下游客户待退货' :item.status == '00' ?'退货待抢单' :item.status == '01' ?'退货待取货' :item.status == '03' ?'退货待送达' :item.status == '04' ?'待确认退货' :item.status == '6' ?'待配货':item.status == '8' ?'待物流上门':item.status == '9' ?'已完成' :'挂单'}}
</view>
<view class="floatRight" v-if="item.status == 6" @tap.stop="goSaleGoods(item)">去开单</view>
<view class="floatRight" v-if="item.status == 4" @tap.stop="cancelOrder(item)">撤销</view>
<view class="floatRight" v-if="item.status == 4" @tap.stop="cancelOrder(item,'',index)">撤销</view>
<view class="floatRight" v-if="item.status == 4" @tap.stop="cancelOrder(item,'goPay')">撤销并复制</view>
<view class="floatRight" v-if="item.status == 2" @tap.stop="goSaleGoods(item)">重新开单</view>
<view class="floatRight" style="color: red;width: 150rpx;" @tap.stop="delItemModal(item)" v-if="item.status == 6">删除订单</view>
@ -63,7 +87,11 @@
status: 'loadmore',
page: 1,
returnList:new Map(),
noDaysort:false,
cancel:false,
totalPages: 0,
listStatus:'',
// type:'',
range:[],
btnStatus:true
@ -75,17 +103,30 @@
},
onShow(){
this.getOrderInfoList()
if(uni.getStorageSync('noReload') == true){
uni.removeStorageSync('noReload')
}else{
this.list = []
this.pageNum = 1
this.getOrderInfoList()
}
},
onReachBottom() {
if (this.page >= this.totalPages) return;
this.status = 'loading';
this.page = ++this.page;
this.getOrderInfoList();
if(this.cancel == true){
this.getOrderInfoList("2");
}else{
this.getOrderInfoList();
}
},
methods: {
gotoDetail(id) {
this.page = 1
// this.page = 1
uni.setStorageSync('noReload',true)
uni.navigateTo({
url: '/package1/index/orderDetail?id=' + id
})
@ -94,21 +135,25 @@
this.searchStr = res.value
this.page = 1;
this.inventoryList = [];
this.getOrderInfoList()
if(this.cancel == true){
this.getOrderInfoList("2");
}else{
this.getOrderInfoList();
}
},
// 订单查询
getOrderInfoList() {
getOrderInfoList(type) {
this.status = 'loading';
this.tui.request("/app/sale/listPages", "POST", {
pageVo: {
pageSize: 10,
pageNumber: this.page
},
fromWhere:this.listStatus==6?2:0,
fromWhere:type == '2' || this.listStatus==6?2:0,
startTime:this.range[0],
endTime:this.range[1],
searchStr:this.searchStr,
status:this.listStatus,
status:type == '2'?2:this.listStatus,
shopId:uni.getStorageSync('shopId')
}, false, false).then((res) => {
this.status = 'nomore';
@ -118,11 +163,26 @@
} else {
this.inventoryList = [...this.inventoryList, ...res.result.records]
}
// this.searchName = ""
this.noDaysort = false
this.totalPages = res.result.pages
} else {
this.tui.toast(res.message)
}
}).catch((res) => {})
},
changeSort(type){
this.nahuoDay = false
this.noDaysort = !this.noDaysort
},
paixuChange(text){
this.sort = text
this.popleList = []
this.pages = 1
this.searchName = ""
this.noDaysort = false
this.khOrGysList()
},
sliceMsg(val) {
var name = ''
@ -165,17 +225,27 @@
})
},
// 取消订单
async cancelOrder(item, type) {
async cancelOrder(item,type,index) {
let that = this;
await this.getReturnOrder(item.id)
await this.tui.modal("提示", "您确定要撤销订单吗?", true, (res) => {
if (res) {
that.cancelOk(item,type)
that.cancelOk(item,type,index)
}
})
},
getCancelOrder(type){
this.page =1
this.inventoryList = []
if(type == "2"){
this.cancel = true
}else{
this.cancel = false
}
this.getOrderInfoList(type)
},
// 取消订单
cancelOk(item,type) {
cancelOk(item,type,index) {
let that = this;
that.tui.request('/app/sale/cancelSale', "POST", {
id:item.id
@ -183,8 +253,10 @@
if (res1.code == 200) {
if (type == 'goPay') {
that.goSaleGoods(item)
} else {
that.getOrderInfoList()
} else {
that.inventoryList[index].status = 2
that.$forceUpdate()
// that.getOrderInfoList()
}
} else {
that.tui.toast(res.message)
@ -234,7 +306,7 @@
obj.productName = item.saleDetailDTOList[i].productName
obj.productPicture = item.saleDetailDTOList[i].productPicture + '?time=' + new Date().getTime()
obj.productSn = item.saleDetailDTOList[i].productSn
obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
obj.wholesalePrice = item.saleDetailDTOList[i].discountAmount?item.saleDetailDTOList[i].discountAmount:item.saleDetailDTOList[i].wholesalePrice
obj.returnPrice = item.saleDetailDTOList[i].returnPrice
obj.saleId = item.id
obj.remark = item.remark
@ -375,4 +447,20 @@
margin-top: 20rpx;
}
}
.paixu-content{
height: 100rpx;
line-height: 100rpx;
text-align: center;
font-size: 30rpx;
font-weight: bold;
}
.nahuo-mask{
height: 1200rpx;
background: rgba(0, 0, 0, 0.6);
position: fixed;
top: 100px;
right: 0;
z-index: 100;
width: 100%;
}
</style>

1187
package1/index/orderDetail.vue

File diff suppressed because it is too large

65
package1/index/peopleList.vue

@ -1,8 +1,13 @@
<template>
<view class="">
<view style="width: 100%;position: fixed;top: 0;z-index: 99;">
<view v-if="popleType== 'khName' || popleType== 'gysName'" style="background:#fff;padding-top:20rpx;">
<button size="default" type="default" @tap="goAddPeople" hover-class="is-hover">{{popleType=='khName'?'新增客户':'新增供应商'}}</button>
<view v-if="popleType== 'khName' || popleType== 'gysName'" style="background: #fff;padding-top: 10px;display: flex;">
<view @tap="goAddPeople" style="width: 65%;text-align: center;height: 100rpx;margin: 20rpx;background: #60F3FF;line-height: 100rpx;border-radius: 10px;color: #fff;">
{{popleType=='khName'?'新增客户':'新增供应商'}}
</view>
<view @tap="trigger" style="width: 25%;text-align: center;height: 100rpx;margin: 20rpx;background: #EEE;line-height: 100rpx;border-radius: 10px;color: #777;">
批量删除
</view>
</view>
<view class="title-box" v-if="popleType=='wlName' || popleType=='dbName' || popleType=='fcName'">
<uni-search-bar class="uni-mt-10" radius="5" placeholder="请输入名称或发货地查询" cancelButton="none"
@ -56,8 +61,12 @@
</view>
</view>
</view>
<view style="overflow:scroll;" :style="{'margin-top':popleType == 'khName' || popleType == 'gysName'?'310rpx':'110rpx'}">
<view style="overflow:scroll;" :style="{'margin-top':popleType == 'khName'? '350rpx':popleType == 'gysName'?'260rpx' :'110rpx'}">
<view v-if="popleType== 'khName' || popleType== 'gysName'" style="overflow:scroll;">
<view style="display: flex;width: 100%;line-height: 100rpx;text-align: center;background: #C6E2FF;color: #777;">
<view style="width: 50%;">欠款人数:<text style="color:red">{{allData.personCount?allData.personCount:0}}</text></view>
<view style="width: 50%;">欠款总金额:<text style="color:red">{{allData.amountOwed?allData.amountOwed:0}}</text></view>
</view>
<!-- 供应商、客户走这一套 -->
<view class="list-1" v-for="item in popleList" :key="item" @tap="clickList(item)" :style="{'min-height': item.name == '散客' || item.consigneeName == '默认供应商' ?'80rpx':'240rpx'}"
style="display: flex;flex-direction: column;height: auto;min-height: 240rpx;padding-bottom: 20rpx;">
@ -73,25 +82,25 @@
<text>{{(item.name == '散客' || item.consigneeName == '默认供应商') && item.city != null && item.city != undefined?'-':item.province + item.city + item.area}}</text>
<text style="width:75%;font-size: 26rpx;color:#747474;height: auto;line-height: 30rpx;">{{(item.name == '散客' || item.consigneeName == '默认供应商')?'-':item.address}}</text>
</view>
<view v-if="item.name != '散客' && popleType== 'khName' && item.noEarn > 0 && userType == 0" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
<view v-if="popleType== 'khName' && item.noEarn > 0 && userType == 0" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
欠款:{{item.noEarn?item.noEarn :0}}
</view>
<view v-if="item.consigneeName !='默认供应商' && popleType== 'gysName' && item.noEarn > 0 && userType == 0" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
<view v-if="popleType== 'gysName' && item.noEarn > 0 && userType == 0" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
欠款:{{item.noEarn?item.noEarn :0}}
</view>
<view v-if="item.name != '散客' && popleType== 'khName' && item.noEarn < 0 && userType == 0" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
<view v-if="popleType== 'khName' && item.noEarn < 0 && userType == 0" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
余额:{{item.noEarn?Math.abs(item.noEarn) :0}}
</view>
<view v-if="item.consigneeName != '默认供应商' && popleType== 'gysName' && item.noEarn < 0 && userType == 0" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
<view v-if="popleType== 'gysName' && item.noEarn < 0 && userType == 0" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
余额:{{item.noEarn?Math.abs(item.noEarn) :0}}
</view>
<view v-if="item.name != '散客' && item.consigneeName !='默认供应商'" class="name-edit" @tap.stop="toggle('huikuan',item)" style="top: 27rpx;">
<view class="name-edit" @tap.stop="toggle('huikuan',item)" style="top: 27rpx;">
充值
</view>
<view v-if="item.name != '散客' && item.consigneeName !='默认供应商'" class="name-edit" @tap.stop="goAddPeople('edit',item)" style="bottom: 86rpx;">
编辑
</view>
<view v-if="item.name != '散客' && item.consigneeName !='默认供应商'" class="name-edit" @tap.stop="goDetail(item)" style="background: #FF9797;bottom:16rpx">
<view class="name-edit" @tap.stop="goDetail(item)" style="background: #FF9797;bottom:16rpx">
查看明细
</view>
</view>
@ -215,6 +224,7 @@
popleList: [],
showPrice:false,
keyboardNum:'',
horizontal: 'left',
goodsNum:'',
signCompany: '', // 1物流 2快递 3发车
people: '', //快递、物流、发车的id
@ -261,12 +271,20 @@
value:'365'
}],
userId:'',
noDaysort:false,
noDaysort:false,
allData:{},
sort:'',
notBuyDays:'',
nahuoDay:false,
khName:{},
khName:{},
isPrint:false,
userType:'',
content: [{
iconPath: '/static/images/tabbar/home.png',
selectedIconPath: '/static/images/tabbar/home-sel.png',
text: '批量删除',
active: false
}],
searchName:'',
pages: 1,
totalPages: 0,
@ -284,8 +302,10 @@
onShow(){
if(this.modelShow == true){
this.popleType = this.popleType
this.khOrGysList();
}
this.khOrGysList();
}
this.getAllPeople()
},
onLoad(options) {
this.popleType = options.popleType
@ -372,6 +392,13 @@
this.showPrice = false
// this.keyboardNum = ''
},
//悬浮按钮
trigger() {
this.modelShow = true
uni.navigateTo({
url: '/package1/index/delPeople?popleType=' + this.popleType
})
},
keyCancel(){
this.showPrice = false
this.keyboardNum = ''
@ -597,6 +624,18 @@
this.tui.toast(res.message)
}
})
},
getAllPeople(){
this.tui.request('/app/debt/getAllDebtByShopId', "post", {
shopId:uni.getStorageSync('shopId'),
userType:this.popleType == 'khName'?'0':this.popleType == 'gysName'?'1':""
}, false, false).then((res) => {
if (res.code == 200) {
this.allData = res.result
}else{
}
})
},
goDetail(data){
uni.navigateTo({

27
package1/inventory/addGoods.vue

@ -169,7 +169,7 @@
<view style="font-size: 36rpx;font-weight: bold;text-align: center;">提示</view>
<view v-if="goodsList !=''"
style="width:100%;font-weight:bold;text-align: center;font-size: 28rpx;margin: 20rpx 0;">
{{goodsList[0].productName}}商品有以下库存,确认继续删除吗?
{{formData.productSn}}有以下库存,确认继续删除吗?
</view>
<view class="tui-order-item boxbg">
<view style="display: flex;border-bottom: 1px solid #eee;height: 50rpx;line-height: 50rpx;">
@ -427,7 +427,16 @@
}
},
onShow(){
let that = this;
let that = this;
uni.authorize({
scope: 'scope.writePhotosAlbum',
success() {
},
fail() {
this.tui.toast("您未授权,图片上传功能可能会出现错误")
}
})
this.typeItem = JSON.parse(JSON.stringify(this.typeItem)) || ''
if(this.typeItem){
this.formData.categoryId = this.typeItem.id
@ -480,7 +489,8 @@
valueObj.productAttributeValueVoList = []
for (var i = 0; i < newObj[val].length; i++) {
valueObj.productAttributeValueVoList.push({
value:newObj[val][i]
value:newObj[val][i],
checked:true
})
}
this.multipleList.push(valueObj)
@ -678,7 +688,7 @@
this.multipleList = this.oldMultipleList
}
},
dialogInputConfirm(e) {
async dialogInputConfirm(e) {
let that = this;
if(that.multipleList == ''){
that.multipleList = [{
@ -694,8 +704,10 @@
value: "均码"
}]
}]
}else{
for(let j=0;j<that.multipleList.length;j++){
}else{
console.log(that.multipleList)
for(let j=0;j<that.multipleList.length;j++){
console.log("111")
if(that.multipleList[j].productAttributeValueVoList == ''){
if(that.multipleList[j].attributeName == '颜色'){
that.multipleList[j].productAttributeValueVoList = [{
@ -733,9 +745,10 @@
}
}
}
setTimeout(res=>{
await setTimeout(res=>{
for(var i=0;i<that.defaultList.length;i++){
for(var m=0;m<that.defaultList[i].list.length;m++){
console.log("222")
that.defaultList[i].list[m].checked = false
}
}

16
package1/stock/addStock.vue

@ -2,7 +2,7 @@
<view class="page1">
<view class="title-box">
<uni-search-bar class="uni-mt-10" radius="5" placeholder="商品名称/货号/供应商" cancelButton="none"
@confirm="search" @blur="search" @clear="clearSearch" />
@blur="search" @clear="clearSearch" />
</view>
<view class="content-box" :style="{height:(height - 240) + 'rpx'}">
<view class="content-left">
@ -21,8 +21,11 @@
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="box-right">
<view class="box-right-name">{{item.productName}}</view>
<view class="box-right-num">{{item.productSn}}</view>
<view class="box-right-name">
{{item.productSn}}
<text v-if="item.productName">({{item.productName == null ?'':item.productName}})</text>
</view>
<view class="box-right-num">{{item.supplierName == null ?'':item.supplierName}}</view>
<view class="box-right-price">
<view class="price-box" v-if="storageType== 0">
<text>{{item.inStorageStatus==0?'待入库':item.purchasePrice == null ?'新商品':item.purchasePrice}}</text>
@ -51,8 +54,11 @@
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="box-right">
<view class="box-right-name">{{item.productName}}</view>
<view class="box-right-num">{{item.productSn}}</view>
<view class="box-right-name">
{{item.productSn}}
<text v-if="item.productName">({{item.productName == null ?'':item.productName}})</text>
</view>
<view class="box-right-num">{{item.supplierName}}</view>
<view class="box-right-price">
<view class="price-box" v-if="storageType== 0">
<text>{{item.inStorageStatus==0?'待入库':item.purchasePrice == null ?'新商品':item.purchasePrice}}</text>

2
package1/stock/addStockList.vue

@ -67,7 +67,7 @@
<view class="content-list">
<view class="list-name">备注</view>
<view class="">
<textarea v-model="remark" />
<textarea maxlength="-1" v-model="remark" />
</view>
</view>
</view>

Loading…
Cancel
Save