wangfukang 3 years ago
parent
commit
a1a80fa77f
  1. 18
      package1/AI/AIHangOrderList.vue
  2. 9
      package1/AI/AIInventoryList.vue
  3. 6
      package1/AI/AIPicture.vue
  4. 10
      package1/AI/AiChat.vue
  5. 1
      package1/inventory/addGoods.vue
  6. 20
      package1/inventory/batchPrint.vue
  7. 24
      package1/inventory/gategory.vue
  8. 1
      package1/inventory/getProductIdToList.vue
  9. 2
      package1/inventory/inventoryConfirm.vue
  10. 6
      package1/other/customDetail.vue
  11. 12
      package1/other/logistics.vue
  12. 1
      package1/other/logisticsAddress.vue
  13. 3
      package1/staff/clock.vue
  14. 6
      package1/stock/addStock.vue
  15. 1
      package1/stock/addStockList.vue
  16. 2
      package1/stock/stockDetail.vue

18
package1/AI/AIHangOrderList.vue

@ -539,14 +539,14 @@
value.push(value1) value.push(value1)
evalue.push(name) evalue.push(name)
} }
console.log(jishuqi)
// if (jishuqi == 0) { // if (jishuqi == 0) {
// this.oldTemList = [] // this.oldTemList = []
// } // }
// if (this.temporaryList.length == 0) { // if (this.temporaryList.length == 0) {
if (jishuqi == this.goodsList.length) { if (jishuqi == this.goodsList.length) {
console.log('value',value)
console.log('temporaryList',this.temporaryList)
for (var i = 0; i < value.length; i++) { for (var i = 0; i < value.length; i++) {
let isTrue = false let isTrue = false
for (var m = 0; m < this.temporaryList.length; m++) { for (var m = 0; m < this.temporaryList.length; m++) {
@ -620,7 +620,7 @@
for (var i = 0; i < this.temporaryList.length; i++) { for (var i = 0; i < this.temporaryList.length; i++) {
for (var m = 0; m < this.pecsList.length; m++) { for (var m = 0; m < this.pecsList.length; m++) {
if (this.temporaryList[i].attributeList == this.pecsList[m].attributeList) { if (this.temporaryList[i].attributeList == this.pecsList[m].attributeList) {
console.log('走进来',this.pecsList[m].stockCount)
this.temporaryList[i].productNum = this.pecsList[m].stockCount this.temporaryList[i].productNum = this.pecsList[m].stockCount
} }
} }
@ -806,7 +806,7 @@
//带参数跳转到开单页 //带参数跳转到开单页
goSaleGoods(item) { goSaleGoods(item) {
let dataList = [] let dataList = []
console.log('11',item);
if(item.saleDetailDTOList){ if(item.saleDetailDTOList){
for (let i = 0; i < item.saleDetailDTOList.length; i++) { for (let i = 0; i < item.saleDetailDTOList.length; i++) {
@ -828,7 +828,7 @@
} }
} }
console.log(newSaleDetailDTOList.length)
if(newSaleDetailDTOList.length != 0){ if(newSaleDetailDTOList.length != 0){
obj.saleDetailQueryDTO = newSaleDetailDTOList obj.saleDetailQueryDTO = newSaleDetailDTOList
obj.num = 0 obj.num = 0
@ -1073,9 +1073,9 @@
}, },
//删除商品下的单条规格 //删除商品下的单条规格
delGoodsPrecs(item, index, index1) { delGoodsPrecs(item, index, index1) {
console.log(item);
console.log(index);
console.log(index1);
let that = this; let that = this;
this.hangId = item.id; this.hangId = item.id;
uni.showModal({ uni.showModal({

9
package1/AI/AIInventoryList.vue

@ -41,10 +41,10 @@
</view> </view>
<view class="content-btn"> <view class="content-btn">
<text class="blink" v-if="item.inStorageStatus==2">识别中...</text> <text class="blink" v-if="item.inStorageStatus==2">识别中...</text>
<text style="position: absolute;top: 40rpx;right: 20rpx;" v-if="item.inStorageStatus == 3">识别完成</text> <text style="position: absolute;top: 40rpx;right: 20rpx;" v-if="item.inStorageStatus == 3 || (item.inStorageStatus == 4 && item.ocrCount > 0)">识别完成</text>
<text style="position: absolute;top: 40rpx;right: 20rpx;" v-if="item.inStorageStatus == 4">识别失败</text> <text style="position: absolute;top: 40rpx;right: 20rpx;" v-if="item.ocrCount == 0 && item.inStorageStatus == 4">识别失败</text>
<view class="btn" @tap="montageData(item.id)" v-if="item.inStorageStatus==3">去入库</view> <view class="btn" @tap="montageData(item.id)">去入库</view>
<view @tap="delItem(item.id)" class="btn" style="background:linear-gradient(90deg, #FF9797, #FFC1E0);position: absolute;bottom: 20rpx;" :style="{right:item.inStorageStatus!=3?'20rpx':'160rpx'}"> <view @tap="delItem(item.id)" class="btn" style="background:linear-gradient(90deg, #FF9797, #FFC1E0);position: absolute;bottom: 20rpx;" :style="{right:item.ocrCount == 0 && item.inStorageStatus == 4?'20rpx':'160rpx'}">
删除 删除
</view> </view>
</view> </view>
@ -165,7 +165,6 @@
}, },
goInventory(){ goInventory(){
console.log('来来',this.carList1)
uni.setStorageSync('carList1', this.carList1) uni.setStorageSync('carList1', this.carList1)
uni.navigateTo({ uni.navigateTo({
url: '/pages/inventory/AIInventory' url: '/pages/inventory/AIInventory'

6
package1/AI/AIPicture.vue

@ -150,7 +150,7 @@
} }
} }
} }
console.log(this.newSubmit)
this.tui.request("/purchaseOcrPicture/batchSave", "POST", { this.tui.request("/purchaseOcrPicture/batchSave", "POST", {
orderId: "", orderId: "",
purchaseOcrPictureList: this.newSubmit purchaseOcrPictureList: this.newSubmit
@ -271,7 +271,7 @@
that.purchaseOcrPictureList.push(data) that.purchaseOcrPictureList.push(data)
} }
console.log('查看图片', that.purchaseOcrPictureList)
}, },
fail: (err) => { fail: (err) => {
uni.showToast({ uni.showToast({
@ -295,7 +295,7 @@
}, },
delSonImage(index,indexs) { delSonImage(index,indexs) {
let that = this; let that = this;
console.log(that.purchaseOcrPictureList)
uni.showModal({ uni.showModal({
title: "提示", title: "提示",
content: "确定删除该子图吗?", content: "确定删除该子图吗?",

10
package1/AI/AiChat.vue

@ -108,7 +108,7 @@
this.height = wx.getSystemInfoSync().windowHeight this.height = wx.getSystemInfoSync().windowHeight
this.khName = JSON.parse(option.khName) this.khName = JSON.parse(option.khName)
console.log(this.khName)
this.initRecord(); this.initRecord();
}, },
methods: { methods: {
@ -173,7 +173,7 @@
manager.stop() manager.stop()
// 识别结束事件 // 识别结束事件
manager.onStop = (res) => { manager.onStop = (res) => {
console.log(res)
if (res.result == '') { if (res.result == '') {
uni.showToast({ uni.showToast({
title: "请重新说一遍", title: "请重新说一遍",
@ -181,13 +181,13 @@
}) })
return return
} }
console.log('语音',res)
let data = { let data = {
text:this.spliceMsg(res.result) text:this.spliceMsg(res.result)
} }
that.msgList.push(data) that.msgList.push(data)
that.$forceUpdate() that.$forceUpdate()
console.log('语音',that.msgList)
} }
// 识别错误事件 // 识别错误事件
@ -230,7 +230,7 @@
this.msgList[i].text this.msgList[i].text
text += this.msgList[i].text + ' ' text += this.msgList[i].text + ' '
} }
console.log(text)
this.tui.request("/app/sale/buyAiSync", "POST", { this.tui.request("/app/sale/buyAiSync", "POST", {
aiMsg:text, aiMsg:text,
saleId:saleId, saleId:saleId,

1
package1/inventory/addGoods.vue

@ -267,7 +267,6 @@
uni.scanCode({ uni.scanCode({
scanType: ['barCode'], scanType: ['barCode'],
success: (res) => { success: (res) => {
console.log(res)
that.tui.request('/app/product/getByBarcode', "post", { that.tui.request('/app/product/getByBarcode', "post", {
barcode:res.result barcode:res.result
}, false, true).then((res1) => { }, false, true).then((res1) => {

20
package1/inventory/batchPrint.vue

@ -154,10 +154,10 @@
this.purchase = JSON.parse(options.purchase) this.purchase = JSON.parse(options.purchase)
this.goodsList = JSON.parse(options.purchaseDetails) this.goodsList = JSON.parse(options.purchaseDetails)
console.log("新增入库打印");
console.log(this.goodsList);
}else{ }else{
console.log("普通批量打印");
this.type = uni.getStorageSync('type') this.type = uni.getStorageSync('type')
this.getGategoryList() this.getGategoryList()
} }
@ -258,7 +258,7 @@
} }
} }
} }
console.log(this.carList)
}, },
//选中商品 //选中商品
checkboxChange(item) { checkboxChange(item) {
@ -279,7 +279,7 @@
} }
} }
} }
console.log(this.carList)
}, },
//点击批量打印按钮 //点击批量打印按钮
clickPrint() { clickPrint() {
@ -319,7 +319,7 @@
} }
} }
console.log(this.multipleList);
}, },
//点击打印按钮 //点击打印按钮
goPrint(){ goPrint(){
@ -330,19 +330,19 @@
let strCmd = blesdk.CreatCPCLPage(440, 320, 1, 0); let strCmd = blesdk.CreatCPCLPage(440, 320, 1, 0);
strCmd += blesdk.addCPCLText('0', '30', '24', '0', 0, '商品名:'+item.productName) strCmd += blesdk.addCPCLText('0', '30', '24', '0', 0, '商品名:'+item.productName)
if(this.multipleList.indexOf('货号') != -1){ if(this.multipleList.indexOf('货号') != -1){
console.log(this.multipleList.indexOf('货号'))
strCmd += blesdk.addCPCLText('0', '80', '24', '0', 0, '货 号:'+item.productSn) strCmd += blesdk.addCPCLText('0', '80', '24', '0', 0, '货 号:'+item.productSn)
} }
if(this.multipleList.indexOf('供应商') != -1){ if(this.multipleList.indexOf('供应商') != -1){
console.log(this.multipleList.indexOf('供应商'))
strCmd += blesdk.addCPCLText('0', '130', '24', '0', 0, '供应商:'+(this.purchase !=''?this.purchase.supplierName:item.supplierName)) strCmd += blesdk.addCPCLText('0', '130', '24', '0', 0, '供应商:'+(this.purchase !=''?this.purchase.supplierName:item.supplierName))
} }
if(this.multipleList.indexOf('批发价') != -1){ if(this.multipleList.indexOf('批发价') != -1){
console.log(this.multipleList.indexOf('批发价'))
strCmd += blesdk.addCPCLText('0', '180', '24', '0', 0, '批发价:'+item.wholesalePrice) strCmd += blesdk.addCPCLText('0', '180', '24', '0', 0, '批发价:'+item.wholesalePrice)
} }
if(this.multipleList.indexOf('零售价') != -1){ if(this.multipleList.indexOf('零售价') != -1){
console.log(this.multipleList.indexOf('零售价'))
strCmd += blesdk.addCPCLText('0', '230', '24', '0', 0, '零售价:'+(item.lsprice || item.price)) strCmd += blesdk.addCPCLText('0', '230', '24', '0', 0, '零售价:'+(item.lsprice || item.price))
} }
strCmd += blesdk.addCPCLQRCode(200, 140, 'H', '1', 6, [this.purchase!=''?item.productId:item.id,this.shopId]) //二维码 strCmd += blesdk.addCPCLQRCode(200, 140, 'H', '1', 6, [this.purchase!=''?item.productId:item.id,this.shopId]) //二维码

24
package1/inventory/gategory.vue

@ -348,7 +348,7 @@
this.$refs.addDialog.open() this.$refs.addDialog.open()
}, },
addSpec(e){ addSpec(e){
console.log(e)
let data = { let data = {
value:e, value:e,
checked:false checked:false
@ -519,12 +519,12 @@
}, },
//选择多个规格保存 //选择多个规格保存
addMultipleType(item,item1,index){ addMultipleType(item,item1,index){
console.log(item);
console.log(item1);
item.list[index].checked = !item.list[index].checked item.list[index].checked = !item.list[index].checked
var list = [] var list = []
if(this.multipleList == ''){ if(this.multipleList == ''){
console.log("首次");
list.push(item.list[index]) list.push(item.list[index])
var data = { var data = {
attributeName:item.name, attributeName:item.name,
@ -535,25 +535,25 @@
for(var i=0;i<this.multipleList.length;i++){ for(var i=0;i<this.multipleList.length;i++){
if(this.multipleList[i].attributeName == item.name){ //同种分类 if(this.multipleList[i].attributeName == item.name){ //同种分类
console.log("同分类");
for(var m=0;m<this.multipleList[i].productAttributeValueVoList.length;m++){ for(var m=0;m<this.multipleList[i].productAttributeValueVoList.length;m++){
if(this.multipleList[i].productAttributeValueVoList[m].value == item.list[index].value){ //规格相同 if(this.multipleList[i].productAttributeValueVoList[m].value == item.list[index].value){ //规格相同
console.log("同规格");
this.multipleList[i].productAttributeValueVoList.splice(m,1) this.multipleList[i].productAttributeValueVoList.splice(m,1)
console.log(this.multipleList);
return; return;
}else{ //规格不同 }else{ //规格不同
if(m+1 == this.multipleList[i].productAttributeValueVoList.length){ if(m+1 == this.multipleList[i].productAttributeValueVoList.length){
console.log("不同规格");
this.multipleList[i].productAttributeValueVoList.push(item.list[index]) this.multipleList[i].productAttributeValueVoList.push(item.list[index])
console.log(this.multipleList);
return; return;
} }
} }
} }
}else{ //不同分类 }else{ //不同分类
if(this.multipleList.length == i+1){ if(this.multipleList.length == i+1){
console.log("不同分类");
list.push(item.list[index]) list.push(item.list[index])
var data = { var data = {
@ -561,14 +561,14 @@
productAttributeValueVoList: list productAttributeValueVoList: list
} }
this.multipleList.push(data) this.multipleList.push(data)
console.log(this.multipleList);
return; return;
} }
} }
} }
} }
console.log(this.multipleList);
}, },
} }
} }

1
package1/inventory/getProductIdToList.vue

@ -113,7 +113,6 @@
this.list[i].productCount += this.list[i].saleDetailDTOList[m].stockLogList1[0].productCount this.list[i].productCount += this.list[i].saleDetailDTOList[m].stockLogList1[0].productCount
} }
} }
console.log(this.list)
this.pageNum = res.result.pages this.pageNum = res.result.pages
} else { } else {
this.tui.toast(res.message) this.tui.toast(res.message)

2
package1/inventory/inventoryConfirm.vue

@ -94,8 +94,6 @@
this.purchaseDetails = JSON.parse(option.purchaseDetails) this.purchaseDetails = JSON.parse(option.purchaseDetails)
this.purchase = JSON.parse(option.purchase) this.purchase = JSON.parse(option.purchase)
this.aiinventory = option.aiinventory this.aiinventory = option.aiinventory
console.log(this.purchaseDetails)
console.log(this.purchase)
}, },
methods: { methods: {
inventorySubmit() { inventorySubmit() {

6
package1/other/customDetail.vue

@ -300,11 +300,11 @@
} }
}) })
console.log(returnDat);
returnDat.forEach(function(value, key) { returnDat.forEach(function(value, key) {
that.zReturnNum -= value that.zReturnNum -= value
}) })
console.log('退货',that.zReturnNum)
} }
}).catch((res) => {}) }).catch((res) => {})
}) })
@ -320,7 +320,7 @@
this.tui.toast(res.message) this.tui.toast(res.message)
} }
}) })
console.log('刷新',that.list)
}, },
//点击图片放大 //点击图片放大
showImage() { showImage() {

12
package1/other/logistics.vue

@ -304,7 +304,7 @@
}) })
}, },
copyText(text,type){ copyText(text,type){
console.log('这里',text)
if(type == 'orderAddress'){ if(type == 'orderAddress'){
let data = "" let data = ""
if(text.indexOf("-") == -1){ if(text.indexOf("-") == -1){
@ -315,14 +315,14 @@
uni.setClipboardData({ uni.setClipboardData({
data: data, data: data,
success: function () { success: function () {
console.log('复制成功');
} }
}); });
}else{ }else{
uni.setClipboardData({ uni.setClipboardData({
data: text, data: text,
success: function () { success: function () {
console.log('复制成功');
} }
}); });
} }
@ -330,14 +330,14 @@
}, },
//复制地址 //复制地址
copyAddress(item,type){ copyAddress(item,type){
console.log(item);
this.copyType = type this.copyType = type
this.copyItem = item this.copyItem = item
this.$refs.copyPopup.open() this.$refs.copyPopup.open()
}, },
//复制地址 //复制地址
upDoorCopyAddress(item,type){ upDoorCopyAddress(item,type){
console.log(item);
this.copeType = type this.copeType = type
this.copeItem = item this.copeItem = item
this.$refs.copyPopup.open() this.$refs.copyPopup.open()
@ -447,7 +447,7 @@
} }
this.totalPages = res.data.result.totalPages this.totalPages = res.data.result.totalPages
} }
console.log('bList',this.bList)
}, },
fail: (res) => { fail: (res) => {
this.tui.toast("网络不给力,请稍后再试~") this.tui.toast("网络不给力,请稍后再试~")

1
package1/other/logisticsAddress.vue

@ -112,7 +112,6 @@
}, },
methods: { methods: {
priceDetail(item){ priceDetail(item){
console.log(item)
this.chargingStandard = item.chargingStandard this.chargingStandard = item.chargingStandard
this.$refs.payDialog.open() this.$refs.payDialog.open()
}, },

3
package1/staff/clock.vue

@ -79,8 +79,7 @@
isHighAccuracy:true, isHighAccuracy:true,
accuracy:'best', accuracy:'best',
success: function (res) { success: function (res) {
console.log('当前位置的经度:' + res.longitude);
console.log('当前位置的纬度:' + res.latitude);
} }
}); });
// if (!this.isClock) { // if (!this.isClock) {

6
package1/stock/addStock.vue

@ -229,7 +229,7 @@
} }
} }
} }
console.log(this.carList)
}, },
onLoad() { onLoad() {
this.height = wx.getSystemInfoSync().windowHeight this.height = wx.getSystemInfoSync().windowHeight
@ -260,7 +260,7 @@
backPrevPage() { backPrevPage() {
var data = [] var data = []
this.carList.forEach(item => { this.carList.forEach(item => {
console.log(item)
data.push(item) data.push(item)
item.stockLogList1 = [] item.stockLogList1 = []
item.stockLogList.forEach(item1 => { item.stockLogList.forEach(item1 => {
@ -403,7 +403,7 @@
//删除整条商品 //删除整条商品
delShop(item) { delShop(item) {
var that = this; var that = this;
console.log(item)
let dataList = [] let dataList = []
var itemData; var itemData;
itemData = { itemData = {

1
package1/stock/addStockList.vue

@ -230,7 +230,6 @@
//删除整条商品 //删除整条商品
delShop(item) { delShop(item) {
var that = this; var that = this;
console.log(item)
let dataList = [] let dataList = []
var itemData; var itemData;
itemData = { itemData = {

2
package1/stock/stockDetail.vue

@ -105,9 +105,7 @@
data.push(item) data.push(item)
} }
} }
console.log('第一个',data)
this.dataList.checkStockAttributeVos = data this.dataList.checkStockAttributeVos = data
console.log('二个',this.dataList)
let dataList = [] let dataList = []
var itemData; var itemData;
itemData = { itemData = {

Loading…
Cancel
Save