Browse Source

入库不说颜色尺码不调通义千问

master
wangfukang 2 years ago
parent
commit
3b999b9fb4
  1. 12
      package1/AI/AIHangOrderList.vue
  2. 1256
      package1/AI/voiceInventory.vue
  3. 14
      package1/index/peopleList.vue
  4. 87
      package1/inventory/inventoryConfirm.vue
  5. BIN
      wxcomponents/.DS_Store
  6. BIN
      wxcomponents/image-cropper/.DS_Store

12
package1/AI/AIHangOrderList.vue

@ -451,6 +451,15 @@
jieshu() {
this.recordState = false
manager.stop()
},
replaceCharAfterNumber(str, charToFind, charToReplace) {
// 正则表达式匹配字符前是否有数字,并且该字符与charToFind相同
const regex = new RegExp(`\\d${charToFind}`, 'g');
// 使用replace方法进行替换
return str.replace(regex, (match) => {
// 将匹配到的字符中的指定字符替换为charToReplace
return match.replace(charToFind, charToReplace);
});
},
//语音识别功能初始化
initRecord() {
@ -461,7 +470,8 @@
that.voiceText = res.result
}else if(that.voiceText == null){
that.voiceText = res.result
}else{
}else{
res.result = this.removeSpacesAndCommas(res.result)
res.result = ' ' + res.result
that.voiceText += res.result
}

1256
package1/AI/voiceInventory.vue

File diff suppressed because it is too large

14
package1/index/peopleList.vue

@ -73,16 +73,16 @@
<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" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
<view v-if="item.name != '散客' && 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" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
<view v-if="item.consigneeName !='默认供应商' && 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" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
<view v-if="item.name != '散客' && 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" style="color: red;position: absolute;top: 20rpx;right: 180rpx;font-size: 28rpx;">
<view v-if="item.consigneeName != '默认供应商' && 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;">
@ -265,7 +265,8 @@
sort:'',
notBuyDays:'',
nahuoDay:false,
khName:{},
khName:{},
userType:'',
searchName:'',
pages: 1,
totalPages: 0,
@ -291,7 +292,8 @@
this.noClick = options.noClick || 0
this.companyType = options.companyType || ''
uni.setStorageSync('clearMsg','1')
this.user = uni.getStorageSync('username')
this.user = uni.getStorageSync('username')
this.userType = uni.getStorageSync('type')
if(options.khName){
this.khName = JSON.parse(options.khName) || ''
}

87
package1/inventory/inventoryConfirm.vue

@ -22,7 +22,21 @@
</view>
</view>
</view>
<view class="tui-goods-info" style="width: 95%;margin: 0 auto;">
<view class="tui-goods-info" style="width: 95%;margin: 0 auto;">
<view class="tui-price-flex tui-size32" v-if="userType == 0&& zhiqianqiankuan >= 0" style="height: 80rpx;line-height: 80rpx;">
<view class="tui-flex-shrink">之前欠款</view>
<view class="tui-goods-price">
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{zhiqianqiankuan == null ?'暂无':Math.abs(zhiqianqiankuan) }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="userType == 0&&zhiqianqiankuan < 0" style="height: 80rpx;line-height: 80rpx;">
<view class="tui-flex-shrink">客户余额</view>
<view class="tui-goods-price">
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{zhiqianqiankuan == null ?'暂无':Math.abs(zhiqianqiankuan) }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="userType == 0" style="height: 80rpx;line-height: 80rpx;">
<view class="tui-flex-shrink">应付金额</view>
<view class="tui-goods-price">
@ -36,13 +50,41 @@
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{ purchase.alreadyPay == null ?'暂无':purchase.alreadyPay }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="userType == 0" style="height: 80rpx;line-height: 80rpx;">
<view class="tui-flex-shrink">欠款</view>
<view class="tui-goods-price tui-primary-color">
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{ purchase.noPay == null ?'暂无':purchase.noPay}}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="yuedikou != 0 && userType == 0" style="height: 80rpx;line-height: 80rpx;">
<view class="tui-flex-shrink">余额抵扣</view>
<view class="tui-goods-price">
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{yuedikou == null ?'暂无':yuedikou }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="leijiqiankuan > 0 && userType == 0" style="height: 80rpx;line-height: 80rpx;">
<view class="tui-flex-shrink">累计欠款</view>
<view class="tui-goods-price">
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{leijiqiankuan == null ?'暂无':leijiqiankuan }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="leijiqiankuan < 0 && userType == 0" style="height: 80rpx;line-height: 80rpx;">
<view class="tui-flex-shrink">累计余额</view>
<view class="tui-goods-price">
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{leijiqiankuan == null ?'暂无':Math.abs(leijiqiankuan) }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="purchase.noPay >= 0 && userType == 0" style="height: 80rpx;line-height: 80rpx;">
<view class="tui-flex-shrink">本次欠款</view>
<view class="tui-goods-price">
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{purchase.noPay == null ?'暂无':purchase.noPay }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="purchase.noPay < 0 && userType == 0" style="height: 80rpx;line-height: 80rpx;">
<view class="tui-flex-shrink">本次余额</view>
<view class="tui-goods-price">
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{purchase.noPay == null ?'暂无':purchase.noPay }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" style="height: 80rpx;line-height: 80rpx;">
<view class="tui-flex-shrink">其他费用</view>
@ -76,7 +118,10 @@
purchase:'',
purchaseDetails:'',
aiinventory:0, //1是AI入库 0是普通入库
userType:1
userType:1,
leijiqiankuan:0,
zhiqianqiankuan:0,
yuedikou:0
}
},
filters: {
@ -96,6 +141,10 @@
this.purchase = JSON.parse(option.purchase)
this.aiinventory = option.aiinventory
this.userType = uni.getStorageSync('type')
this.yuedikou = option.yuedikou
this.zhiqianqiankuan = option.zhiqianqiankuan
this.leijiqiankuan = option.leijiqiankuan
},
methods: {
inventorySubmit() {
@ -111,7 +160,9 @@
}else{
url = '/app/stock/putInOfProduct'
}
this.$nextTick(()=>{
this.$nextTick(()=>{
this.purchase.balanceDeductionAmount = this.yuedikou
this.tui.request(url, "post", {
purchase: this.purchase,
purchaseDetails: this.purchaseDetails
@ -256,7 +307,21 @@
color: #088FEB !important;
}
}
.price-box{
width: 95%;
margin: 10px auto;
background: #eee;
height: 80rpx;
display: flex;
line-height: 80rpx;
text-align: center;
overflow: hidden;
border-radius: 10px;
background: #FDF5E6;
color: #EEB422;
background: linear-gradient(180deg, #fff, #FDF5E6);
border: 1px solid #FAEBD7;
}
.shop-productName {
flex: 1;
display: flex;

BIN
wxcomponents/.DS_Store

Binary file not shown.

BIN
wxcomponents/image-cropper/.DS_Store

Binary file not shown.
Loading…
Cancel
Save