feat(scanner): 多厂商PDA扫码器兼容方案及扫码功能重构
- 采用策略模式及配置表驱动方式支持多品牌扫码器广播注册 - 实现扫码广播的统一注册和注销管理，支持并发多个扫码广播接收器 - 重构扫码处理逻辑，统一处理扫码结果，支持条码和二维码识别 - 移除原有单一品牌扫码注册，整合商米、新大陆等扫码头支持 - 调整扫码相关页面代码，集成scanMixin，实现扫码广播注册和注销自动化 - 优化扫码结果处理，支持删除模式及整缸扫描状态区分 - 修正多处界面文本格式与代码风格，提高代码一致性和可维护性 - 升级manifest版本号至1.1.3，标记此功能更新
This commit is contained in:
@@ -2,12 +2,12 @@
|
||||
<view class="wrap">
|
||||
<u-form ref="uForm">
|
||||
<u-form-item>
|
||||
<text class="title" style="width:200px;">单号：{{GoodsCheckBillNo}}</text>
|
||||
<text class="title" style="width:200px;">日期：{{GoodsCheckBillDate}}</text>
|
||||
<text class="title" style="width:200px;">单号：{{ GoodsCheckBillNo }}</text>
|
||||
<text class="title" style="width:200px;">日期：{{ GoodsCheckBillDate }}</text>
|
||||
</u-form-item>
|
||||
<u-form-item>
|
||||
<text class="title" style="width:200px;">仓库名称：{{StoreName}}</text>
|
||||
<text class="title" style="width:200px;">仓位名称：{{StoreStationName}}</text>
|
||||
<text class="title" style="width:200px;">仓库名称：{{ StoreName }}</text>
|
||||
<text class="title" style="width:200px;">仓位名称：{{ StoreStationName }}</text>
|
||||
</u-form-item>
|
||||
<u-form-item label-width="150" label="条码资料:">
|
||||
<input type="text" v-model="QRBarCode" maxlength="-1" style="width:200px;"
|
||||
@@ -17,32 +17,32 @@
|
||||
</checkbox-group>
|
||||
</u-form-item>
|
||||
<u-form-item>
|
||||
<text class="title">{{BillDataMessage}}</text>
|
||||
<text class="title">{{ BillDataMessage }}</text>
|
||||
</u-form-item>
|
||||
<u-form-item>
|
||||
<text class="title" style="width:200px;">成品编号：{{FabricGoodsNo}}</text>
|
||||
<text class="title" style="width:200px;">成品重量：{{GoodsQty}}KG</text>
|
||||
<text class="title" style="width:200px;">成品编号：{{ FabricGoodsNo }}</text>
|
||||
<text class="title" style="width:200px;">成品重量：{{ GoodsQty }}KG</text>
|
||||
</u-form-item>
|
||||
<u-form-item>
|
||||
<text class="title" style="width:200px;">成品色号：{{GoodsCodeNo}}</text>
|
||||
<text class="title" style="width:200px;">成品颜色：{{GoodsCodeName}}</text>
|
||||
<text class="title" style="width:200px;">成品色号：{{ GoodsCodeNo }}</text>
|
||||
<text class="title" style="width:200px;">成品颜色：{{ GoodsCodeName }}</text>
|
||||
</u-form-item>
|
||||
<u-form-item>
|
||||
<text class="title" style="width:200px;">成品缸号：{{CrockNo}}</text>
|
||||
<text class="title" style="width:200px;">缸号卷号：{{GoodsBillNo}}</text>
|
||||
<text class="title" style="width:200px;">成品缸号：{{ CrockNo }}</text>
|
||||
<text class="title" style="width:200px;">缸号卷号：{{ GoodsBillNo }}</text>
|
||||
|
||||
</u-form-item>
|
||||
<u-form-item>
|
||||
<text class="title" style="width:200px;">本架盘前：{{BillSumOldRoll}}条</text>
|
||||
<text class="title" style="width:200px;">本架实盘：{{BillSumNewRoll}}条</text>
|
||||
<text class="title" style="width:200px;">本架盘前：{{ BillSumOldRoll }}条</text>
|
||||
<text class="title" style="width:200px;">本架实盘：{{ BillSumNewRoll }}条</text>
|
||||
</u-form-item>
|
||||
<u-form-item>
|
||||
<text class="title" style="width:200px;">本色盘前：{{GoodsCodeNoSumOldRoll}}条</text>
|
||||
<text class="title" style="width:200px;">本色实盘：{{GoodsCodeNoSumNewRoll}}条</text>
|
||||
<text class="title" style="width:200px;">本色盘前：{{ GoodsCodeNoSumOldRoll }}条</text>
|
||||
<text class="title" style="width:200px;">本色实盘：{{ GoodsCodeNoSumNewRoll }}条</text>
|
||||
</u-form-item>
|
||||
<u-form-item>
|
||||
<text class="title" style="width:200px;">本缸盘前：{{CrockNoSumOldRoll}}条</text>
|
||||
<text class="title" style="width:200px;">本缸实盘：{{CrockNoSumNewRoll}}条</text>
|
||||
<text class="title" style="width:200px;">本缸盘前：{{ CrockNoSumOldRoll }}条</text>
|
||||
<text class="title" style="width:200px;">本缸实盘：{{ CrockNoSumNewRoll }}条</text>
|
||||
</u-form-item>
|
||||
</u-form>
|
||||
<view class="u-demo-area">
|
||||
@@ -55,417 +55,425 @@
|
||||
<view class="submitView">
|
||||
<u-button type="primary" style="width:100px;" class="commitBtn" :ripple="true" ripple-bg-color="#909399"
|
||||
@click="commitBtnFun">
|
||||
{{CommitType ? '消审' : '审核'}}
|
||||
{{ CommitType ? '消审' : '审核' }}
|
||||
</u-button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import util, {
|
||||
parFabricGoodsBarCode2D,
|
||||
parYarnGoodsBarCode2D,
|
||||
playSuccessAudio,
|
||||
playErrorAudio
|
||||
} from '../../common/util';
|
||||
import scanMixin from '@/common/scanMixin.js';
|
||||
import wybTable from '@/components/wyb-table/wyb-table.vue';
|
||||
//let that = '';
|
||||
export default {
|
||||
mixins: [scanMixin],
|
||||
data() {
|
||||
return {
|
||||
borderColor: '#e4e7ed',
|
||||
align: 'center',
|
||||
index: 0,
|
||||
CommitType: '',
|
||||
CommitProcName: '',
|
||||
actionSheetShow: false,
|
||||
QRBarCode: '',
|
||||
GoodsCheckBillID: 0,
|
||||
GoodsCheckBillNo: '',
|
||||
GoodsCheckBillDate: '',
|
||||
GoodsCheckBillMasterNo: '',
|
||||
StoreNameID: '',
|
||||
StoreName: '',
|
||||
StoreStationID: '',
|
||||
StoreStationNo: '',
|
||||
StoreStationName: '',
|
||||
CustomerName: '',
|
||||
FabricGoodsNo: '',
|
||||
FabricGoodsName: '',
|
||||
GoodsCodeNo: '',
|
||||
GoodsCodeName: '',
|
||||
CrockNo: '',
|
||||
GoodsBillNo: '',
|
||||
GoodsQty: 0,
|
||||
StoreStationNameFocus: false,
|
||||
BillSumOldRoll: 0,
|
||||
BillSumNewRoll: 0,
|
||||
GoodsCodeNoSumOldRoll: 0,
|
||||
GoodsCodeNoSumNewRoll: 0,
|
||||
CrockNoSumOldRoll: 0,
|
||||
CrockNoSumNewRoll: 0,
|
||||
BarCodeDelStatus: false,
|
||||
GoodsDetailList: [],
|
||||
BillDataMessage: '',
|
||||
headersMaster: [{
|
||||
label: '成品编号',
|
||||
key: 'product_code'
|
||||
}, {
|
||||
label: '成品名称',
|
||||
key: 'product_name'
|
||||
}, {
|
||||
label: '成品色号',
|
||||
key: 'product_color_code'
|
||||
}, {
|
||||
label: '成品颜色',
|
||||
key: 'product_color_name'
|
||||
}, {
|
||||
label: '成品缸号',
|
||||
key: 'dyelot_number'
|
||||
}, {
|
||||
label: '盘前条数',
|
||||
key: 'roll'
|
||||
}, {
|
||||
label: '实盘条数',
|
||||
key: 'check_roll'
|
||||
}, {
|
||||
label: '盈亏条数',
|
||||
key: 'different_roll'
|
||||
}],
|
||||
// 移除了 scanReceiver 和 isPageActive，因为它们现在由 scanMixin 提供
|
||||
}
|
||||
},
|
||||
import util, {
|
||||
parFabricGoodsBarCode2D,
|
||||
parYarnGoodsBarCode2D,
|
||||
playSuccessAudio,
|
||||
playErrorAudio
|
||||
} from '../../common/util';
|
||||
import scanMixin from '@/common/scanMixin.js';
|
||||
import wybTable from '@/components/wyb-table/wyb-table.vue';
|
||||
//let that = '';
|
||||
export default {
|
||||
mixins: [scanMixin],
|
||||
data() {
|
||||
return {
|
||||
borderColor: '#e4e7ed',
|
||||
align: 'center',
|
||||
index: 0,
|
||||
CommitType: '',
|
||||
CommitProcName: '',
|
||||
actionSheetShow: false,
|
||||
QRBarCode: '',
|
||||
GoodsCheckBillID: 0,
|
||||
GoodsCheckBillNo: '',
|
||||
GoodsCheckBillDate: '',
|
||||
GoodsCheckBillMasterNo: '',
|
||||
StoreNameID: '',
|
||||
StoreName: '',
|
||||
StoreStationID: '',
|
||||
StoreStationNo: '',
|
||||
StoreStationName: '',
|
||||
CustomerName: '',
|
||||
FabricGoodsNo: '',
|
||||
FabricGoodsName: '',
|
||||
GoodsCodeNo: '',
|
||||
GoodsCodeName: '',
|
||||
CrockNo: '',
|
||||
GoodsBillNo: '',
|
||||
GoodsQty: 0,
|
||||
StoreStationNameFocus: false,
|
||||
BillSumOldRoll: 0,
|
||||
BillSumNewRoll: 0,
|
||||
GoodsCodeNoSumOldRoll: 0,
|
||||
GoodsCodeNoSumNewRoll: 0,
|
||||
CrockNoSumOldRoll: 0,
|
||||
CrockNoSumNewRoll: 0,
|
||||
BarCodeDelStatus: false,
|
||||
GoodsDetailList: [],
|
||||
BillDataMessage: '',
|
||||
headersMaster: [{
|
||||
label: '成品编号',
|
||||
key: 'product_code'
|
||||
}, {
|
||||
label: '成品名称',
|
||||
key: 'product_name'
|
||||
}, {
|
||||
label: '成品色号',
|
||||
key: 'product_color_code'
|
||||
}, {
|
||||
label: '成品颜色',
|
||||
key: 'product_color_name'
|
||||
}, {
|
||||
label: '成品缸号',
|
||||
key: 'dyelot_number'
|
||||
}, {
|
||||
label: '盘前条数',
|
||||
key: 'roll'
|
||||
}, {
|
||||
label: '实盘条数',
|
||||
key: 'check_roll'
|
||||
}, {
|
||||
label: '盈亏条数',
|
||||
key: 'different_roll'
|
||||
}],
|
||||
// 移除了 scanReceiver 和 isPageActive，因为它们现在由 scanMixin 提供
|
||||
}
|
||||
},
|
||||
|
||||
onLoad(e) {
|
||||
//that = this;
|
||||
if (e.billid) {
|
||||
this.GoodsCheckBillID = e.billid;
|
||||
this.GoodsCheckBillDetailData();
|
||||
}
|
||||
},
|
||||
|
||||
onShow() {
|
||||
// 调用 mixin 中的 onShow 方法
|
||||
if (this.$options.mixins && this.$options.mixins[0] && this.$options.mixins[0].onShow) {
|
||||
this.$options.mixins[0].onShow.call(this);
|
||||
}
|
||||
|
||||
// #ifdef APP-PLUS
|
||||
this.registerScanBroadcast((scanResult) => {
|
||||
console.log("扫码结果:", scanResult);
|
||||
|
||||
// 处理扫描结果，按照原有逻辑
|
||||
if(!this.QRBarCode){
|
||||
console.log("请先扫描资料！", scanResult);
|
||||
this.QRBarCode = scanResult;
|
||||
this.$nextTick(() => {
|
||||
this.GoodsCheckBillDetailScan();
|
||||
});
|
||||
return;
|
||||
}
|
||||
onLoad(e) {
|
||||
//that = this;
|
||||
if (e.billid) {
|
||||
this.GoodsCheckBillID = e.billid;
|
||||
this.GoodsCheckBillDetailData();
|
||||
}
|
||||
},
|
||||
|
||||
onShow() {
|
||||
// 设置页面激活状态
|
||||
this.isPageActive = true;
|
||||
|
||||
// #ifdef APP-PLUS
|
||||
this.registerScanBroadcast((scanResult) => {
|
||||
console.log("扫码结果:", scanResult);
|
||||
|
||||
// 处理扫描结果
|
||||
this.QRBarCode = scanResult;
|
||||
this.$nextTick(() => {
|
||||
this.GoodsCheckBillDetailScan();
|
||||
});
|
||||
});
|
||||
// #endif
|
||||
},
|
||||
|
||||
onHide() {
|
||||
this.isPageActive = false;
|
||||
// #ifdef APP-PLUS
|
||||
this.unregisterScanBroadcast();
|
||||
// #endif
|
||||
},
|
||||
|
||||
onUnload() {
|
||||
this.isPageActive = false;
|
||||
// #ifdef APP-PLUS
|
||||
this.unregisterScanBroadcast();
|
||||
// #endif
|
||||
},
|
||||
methods: {
|
||||
// 添加通用错误提示方法
|
||||
showError(message) {
|
||||
this.playError();
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: message,
|
||||
showCancel: false
|
||||
});
|
||||
// #endif
|
||||
},
|
||||
methods: {
|
||||
// 添加通用错误提示方法
|
||||
showError(message) {
|
||||
this.playError();
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: message,
|
||||
showCancel: false
|
||||
});
|
||||
},
|
||||
|
||||
playSuccess() {
|
||||
util.playSuccessAudio();
|
||||
},
|
||||
playError() {
|
||||
util.playErrorAudio();
|
||||
},
|
||||
|
||||
BarCodeDelChange: function() {
|
||||
this.BarCodeDelStatus = !this.BarCodeDelStatus;
|
||||
},
|
||||
playSuccess() {
|
||||
util.playSuccessAudio();
|
||||
},
|
||||
playError() {
|
||||
util.playErrorAudio();
|
||||
},
|
||||
|
||||
GoodsCheckBillDetailScan() {
|
||||
if (this.StoreNameID == 0 && this.GoodsCheckBillNo == '') {
|
||||
this.QRBarCode = '';
|
||||
this.showError('请先新增单据');
|
||||
return;
|
||||
}
|
||||
|
||||
// 数据清理：去除空格、换行符等
|
||||
let cleanCode = this.QRBarCode.replace(/\s+/g, '').replace(/[\r\n]/g, '');
|
||||
|
||||
console.log("this.QRBarCode ---->>" + cleanCode);
|
||||
|
||||
var aQRBarCode = '';
|
||||
var aBarCode = '';
|
||||
if (cleanCode.startsWith('66^')>0 || cleanCode.startsWith('99^')>0 || /[\u4E00-\u9FA5]/.test(cleanCode)){
|
||||
aQRBarCode = cleanCode
|
||||
}else {
|
||||
aBarCode = cleanCode;
|
||||
}
|
||||
|
||||
if (aQRBarCode == '' && aBarCode == ''){
|
||||
this.QRBarCode = '';
|
||||
this.aBarCode = ''
|
||||
this.showError('请扫描二维码或者条码');
|
||||
return;
|
||||
}
|
||||
|
||||
let aBarCodeDelStatus = 1
|
||||
if (this.BarCodeDelStatus) {
|
||||
aBarCodeDelStatus = 3;
|
||||
};
|
||||
|
||||
util.request({
|
||||
url: '/product/productCheckOrder/updateProductCheckOrder',
|
||||
method: 'put',
|
||||
data: {
|
||||
'arrange_type': aBarCodeDelStatus,
|
||||
'id': parseInt(this.GoodsCheckBillID),
|
||||
'bar_code': aBarCode,
|
||||
'qr_code': aQRBarCode,
|
||||
},
|
||||
success: (res) => {
|
||||
console.log("-->>--" + JSON.stringify(res.data));
|
||||
if (res.data.code == '0'){
|
||||
let aResultData = res.data.data;
|
||||
this.FabricGoodsNo = aResultData.product_code;
|
||||
this.FabricGoodsName = aResultData.product_name;
|
||||
this.GoodsCodeNo = aResultData.product_color_code;
|
||||
this.GoodsCodeName = aResultData.product_color_name;
|
||||
this.CrockNo = aResultData.dyelot_number;
|
||||
this.GoodsBillNo = aResultData.volume_number;
|
||||
this.GoodsQty = aResultData.weight / 10000;
|
||||
this.BillSumOldRoll = aResultData.warehouse_bin_check_before_roll/100;
|
||||
this.BillSumNewRoll = aResultData.warehouse_bin_check_roll/100;
|
||||
this.GoodsCodeNoSumOldRoll = aResultData.color_check_before_roll/100;
|
||||
this.GoodsCodeNoSumNewRoll = aResultData.color_check_roll/100;
|
||||
this.CrockNoSumOldRoll = aResultData.dye_check_before_roll/100;
|
||||
this.CrockNoSumNewRoll = aResultData.dye_check_roll/100;
|
||||
|
||||
BarCodeDelChange: function () {
|
||||
this.BarCodeDelStatus = !this.BarCodeDelStatus;
|
||||
},
|
||||
|
||||
GoodsCheckBillDetailScan() {
|
||||
if (this.StoreNameID == 0 && this.GoodsCheckBillNo == '') {
|
||||
this.QRBarCode = '';
|
||||
this.showError('请先新增单据');
|
||||
return;
|
||||
}
|
||||
|
||||
// 数据清理：去除空格、换行符等
|
||||
let cleanCode = this.QRBarCode.replace(/\s+/g, '').replace(/[\r\n]/g, '');
|
||||
|
||||
console.log("this.QRBarCode ---->>" + cleanCode);
|
||||
|
||||
var aQRBarCode = '';
|
||||
var aBarCode = '';
|
||||
if (cleanCode.startsWith('66^') > 0 || cleanCode.startsWith('99^') > 0 || /[\u4E00-\u9FA5]/.test(cleanCode)) {
|
||||
aQRBarCode = cleanCode
|
||||
} else {
|
||||
aBarCode = cleanCode;
|
||||
}
|
||||
|
||||
if (aQRBarCode == '' && aBarCode == '') {
|
||||
this.QRBarCode = '';
|
||||
this.aBarCode = ''
|
||||
this.showError('请扫描二维码或者条码');
|
||||
return;
|
||||
}
|
||||
|
||||
let aBarCodeDelStatus = 1
|
||||
if (this.BarCodeDelStatus) {
|
||||
aBarCodeDelStatus = 3;
|
||||
};
|
||||
|
||||
util.request({
|
||||
url: '/product/productCheckOrder/updateProductCheckOrder',
|
||||
method: 'put',
|
||||
data: {
|
||||
'arrange_type': aBarCodeDelStatus,
|
||||
'id': parseInt(this.GoodsCheckBillID),
|
||||
'bar_code': aBarCode,
|
||||
'qr_code': aQRBarCode,
|
||||
},
|
||||
success: (res) => {
|
||||
console.log("-->>--" + JSON.stringify(res.data));
|
||||
if (res.data.code == '0') {
|
||||
let aResultData = res.data.data;
|
||||
this.FabricGoodsNo = aResultData.product_code;
|
||||
this.FabricGoodsName = aResultData.product_name;
|
||||
this.GoodsCodeNo = aResultData.product_color_code;
|
||||
this.GoodsCodeName = aResultData.product_color_name;
|
||||
this.CrockNo = aResultData.dyelot_number;
|
||||
this.GoodsBillNo = aResultData.volume_number;
|
||||
this.GoodsQty = aResultData.weight / 10000;
|
||||
this.BillSumOldRoll = aResultData.warehouse_bin_check_before_roll / 100;
|
||||
this.BillSumNewRoll = aResultData.warehouse_bin_check_roll / 100;
|
||||
this.GoodsCodeNoSumOldRoll = aResultData.color_check_before_roll / 100;
|
||||
this.GoodsCodeNoSumNewRoll = aResultData.color_check_roll / 100;
|
||||
this.CrockNoSumOldRoll = aResultData.dye_check_before_roll / 100;
|
||||
this.CrockNoSumNewRoll = aResultData.dye_check_roll / 100;
|
||||
|
||||
this.playSuccess();
|
||||
this.GoodsCheckBillDetailData();
|
||||
this.BillDataMessage = res.data.msg;
|
||||
this.QRBarCode = '';
|
||||
}
|
||||
else {
|
||||
this.showError(res.data.msg);
|
||||
this.QRBarCode = '';
|
||||
}
|
||||
},
|
||||
fail: (error) => {
|
||||
this.showError('连接服务器出错，请检查后台服务是否启动！');
|
||||
console.log('error', error)
|
||||
},
|
||||
})
|
||||
},
|
||||
|
||||
GoodsCheckBillDetailData: function () {
|
||||
console.log("--aaa->>" + this.GoodsCheckBillID);
|
||||
console.log("--aaa->>" + this.GoodsCheckBillID);
|
||||
util.request({
|
||||
url: '/product/productCheckOrder/getProductCheckOrder',
|
||||
method: 'get',
|
||||
data: {
|
||||
'id': parseInt(this.GoodsCheckBillID),
|
||||
},
|
||||
success: (res) => {
|
||||
console.log("-->>--" + JSON.stringify(res.data.data));
|
||||
this.GoodsDetailList = [];
|
||||
this.GoodsCheckBillNo = res.data.data.order_no;
|
||||
this.StoreName = res.data.data.warehouse_name
|
||||
this.StoreStationName = res.data.data.warehouse_bin_name;
|
||||
this.GoodsCheckBillDate = this.$u.timeFormat(res.data.data.check_time, 'yyyy-mm-dd')
|
||||
/* this.BillSumOldRoll = res.data.data.item_data.roll;
|
||||
this.BillSumNewRoll = res.data.data.item_data.check_roll; */
|
||||
var aResultData = res.data.data.item_data;
|
||||
this.BillSumOldRoll = 0;
|
||||
this.BillSumNewRoll = 0;
|
||||
for (var i = 0; i < aResultData.length; i++) {
|
||||
aResultData[i].roll = aResultData[i].roll / 100;
|
||||
aResultData[i].check_roll = aResultData[i].check_roll / 100;
|
||||
aResultData[i].different_roll = aResultData[i].different_roll / 100;
|
||||
|
||||
this.BillSumOldRoll = this.BillSumOldRoll + aResultData[i].roll;
|
||||
this.BillSumNewRoll = this.BillSumNewRoll + aResultData[i].check_roll;
|
||||
};
|
||||
|
||||
this.GoodsDetailList = aResultData;
|
||||
},
|
||||
})
|
||||
},
|
||||
|
||||
// 审核按钮方法
|
||||
commitBtnFun: function () {
|
||||
if (this.BillMasterID <= 0) {
|
||||
this.showError('当前单据未提交，不能审核或消审！');
|
||||
return;
|
||||
}
|
||||
|
||||
var aCommitRecallName = '审核';
|
||||
if (this.CommitType == '') {
|
||||
aCommitRecallName = '审核';
|
||||
} else {
|
||||
aCommitRecallName = '消审';
|
||||
}
|
||||
|
||||
// if (this.CommitProcName == '') {
|
||||
// this.playError();
|
||||
// this.BillDataMessage = '当前' + aCommitRecallName + '操作配置有误，不能审核！';
|
||||
// return;
|
||||
// }
|
||||
console.log('GoodsCheckBillID', this.GoodsCheckBillID)
|
||||
util.request({
|
||||
url: '/product/productCheckOrder/updateProductCheckOrderAuditStatusPass',
|
||||
method: 'put',
|
||||
data: {
|
||||
'id': parseInt(this.GoodsCheckBillID),
|
||||
},
|
||||
success: (res) => {
|
||||
console.log('审核', res)
|
||||
if (res.data.code == '0') {
|
||||
var aResultData = JSON.parse(res.data.data);
|
||||
console.log('aResultData', aResultData)
|
||||
if (aResultData.code == '0' && aResultData.msg ==
|
||||
'success') {
|
||||
this.playSuccess();
|
||||
this.GoodsCheckBillDetailData();
|
||||
this.BillDataMessage = res.data.msg;
|
||||
this.QRBarCode = '';
|
||||
}
|
||||
else {
|
||||
this.showError(res.data.msg);
|
||||
this.QRBarCode = '';
|
||||
}
|
||||
},
|
||||
fail: (error) => {
|
||||
this.showError('连接服务器出错，请检查后台服务是否启动！');
|
||||
console.log('error',error)
|
||||
},
|
||||
})
|
||||
},
|
||||
this.BillDataMessage = aCommitRecallName + "成功！";
|
||||
|
||||
GoodsCheckBillDetailData: function() {
|
||||
console.log("--aaa->>" + this.GoodsCheckBillID);
|
||||
console.log("--aaa->>" + this.GoodsCheckBillID);
|
||||
util.request({
|
||||
url: '/product/productCheckOrder/getProductCheckOrder',
|
||||
method: 'get',
|
||||
data: {
|
||||
'id': parseInt(this.GoodsCheckBillID),
|
||||
},
|
||||
success: (res) => {
|
||||
console.log("-->>--" + JSON.stringify(res.data.data));
|
||||
this.GoodsDetailList = [];
|
||||
this.GoodsCheckBillNo = res.data.data.order_no;
|
||||
this.StoreName = res.data.data.warehouse_name
|
||||
this.StoreStationName = res.data.data.warehouse_bin_name;
|
||||
this.GoodsCheckBillDate = this.$u.timeFormat(res.data.data.check_time, 'yyyy-mm-dd')
|
||||
/* this.BillSumOldRoll = res.data.data.item_data.roll;
|
||||
this.BillSumNewRoll = res.data.data.item_data.check_roll; */
|
||||
var aResultData = res.data.data.item_data;
|
||||
this.BillSumOldRoll = 0;
|
||||
this.BillSumNewRoll = 0;
|
||||
for (var i = 0; i < aResultData.length; i++) {
|
||||
aResultData[i].roll = aResultData[i].roll / 100;
|
||||
aResultData[i].check_roll = aResultData[i].check_roll / 100;
|
||||
aResultData[i].different_roll = aResultData[i].different_roll / 100;
|
||||
|
||||
this.BillSumOldRoll = this.BillSumOldRoll + aResultData[i].roll;
|
||||
this.BillSumNewRoll = this.BillSumNewRoll + aResultData[i].check_roll;
|
||||
};
|
||||
|
||||
this.GoodsDetailList = aResultData;
|
||||
},
|
||||
})
|
||||
},
|
||||
|
||||
// 审核按钮方法
|
||||
commitBtnFun: function() {
|
||||
if (this.BillMasterID <= 0) {
|
||||
this.showError('当前单据未提交，不能审核或消审！');
|
||||
return;
|
||||
}
|
||||
|
||||
var aCommitRecallName = '审核';
|
||||
if (this.CommitType == '') {
|
||||
aCommitRecallName = '审核';
|
||||
} else {
|
||||
aCommitRecallName = '消审';
|
||||
}
|
||||
|
||||
// if (this.CommitProcName == '') {
|
||||
// this.playError();
|
||||
// this.BillDataMessage = '当前' + aCommitRecallName + '操作配置有误，不能审核！';
|
||||
// return;
|
||||
// }
|
||||
console.log('GoodsCheckBillID',this.GoodsCheckBillID)
|
||||
util.request({
|
||||
url: '/product/productCheckOrder/updateProductCheckOrderAuditStatusPass',
|
||||
method: 'put',
|
||||
data: {
|
||||
'id': parseInt(this.GoodsCheckBillID),
|
||||
},
|
||||
success: (res) => {
|
||||
console.log('审核',res)
|
||||
if (res.data.code == '0') {
|
||||
var aResultData = JSON.parse(res.data.data);
|
||||
console.log('aResultData',aResultData)
|
||||
if (aResultData.code == '0' && aResultData.msg ==
|
||||
'success') {
|
||||
this.playSuccess();
|
||||
this.BillDataMessage = aCommitRecallName + "成功！";
|
||||
|
||||
if (aCommitRecallName == '审核') {
|
||||
this.CommitType = '已审核'
|
||||
} else {
|
||||
this.CommitType = ''
|
||||
}
|
||||
if (aCommitRecallName == '审核') {
|
||||
this.CommitType = '已审核'
|
||||
} else {
|
||||
this.showError(aCommitRecallName + '出错！' + aResultData.BillDataMessage);
|
||||
return;
|
||||
this.CommitType = ''
|
||||
}
|
||||
} else {
|
||||
this.showError(aCommitRecallName + '出错，' + res.data.msg);
|
||||
this.showError(aCommitRecallName + '出错！' + aResultData.BillDataMessage);
|
||||
return;
|
||||
}
|
||||
},
|
||||
fail: (error) => {
|
||||
this.showError('连接服务器出错，请检查后台服务是否启动！');
|
||||
},
|
||||
})
|
||||
},
|
||||
} else {
|
||||
this.showError(aCommitRecallName + '出错，' + res.data.msg);
|
||||
return;
|
||||
}
|
||||
},
|
||||
fail: (error) => {
|
||||
this.showError('连接服务器出错，请检查后台服务是否启动！');
|
||||
},
|
||||
})
|
||||
},
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
page {
|
||||
background-color: #F8F8F8;
|
||||
padding-bottom: 260rpx;
|
||||
}
|
||||
page {
|
||||
background-color: #F8F8F8;
|
||||
padding-bottom: 260rpx;
|
||||
}
|
||||
|
||||
.u-radio {
|
||||
width: 200rpx !important;
|
||||
}
|
||||
.u-radio {
|
||||
width: 200rpx !important;
|
||||
}
|
||||
|
||||
.submitView {
|
||||
width: 100%;
|
||||
padding: 16rpx 0 26rpx;
|
||||
background-color: #FFFFFF;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
border-top: 1rpx solid #f1f1f1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 100;
|
||||
}
|
||||
.submitView {
|
||||
width: 100%;
|
||||
padding: 16rpx 0 26rpx;
|
||||
background-color: #FFFFFF;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
border-top: 1rpx solid #f1f1f1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
.submitBtn {
|
||||
width: 666rpx;
|
||||
}
|
||||
.submitBtn {
|
||||
width: 666rpx;
|
||||
}
|
||||
|
||||
.productBox {
|
||||
background-color: #FFFFFF;
|
||||
margin-top: 32rpx;
|
||||
padding: 26rpx 0;
|
||||
}
|
||||
.productBox {
|
||||
background-color: #FFFFFF;
|
||||
margin-top: 32rpx;
|
||||
padding: 26rpx 0;
|
||||
}
|
||||
|
||||
.tjcpName {
|
||||
width: 686rpx;
|
||||
height: 40rpx;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
border-left: 6rpx solid #007AFF;
|
||||
padding-left: 12rpx;
|
||||
margin-left: 26rpx;
|
||||
margin-top: 26rpx;
|
||||
}
|
||||
.tjcpName {
|
||||
width: 686rpx;
|
||||
height: 40rpx;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
border-left: 6rpx solid #007AFF;
|
||||
padding-left: 12rpx;
|
||||
margin-left: 26rpx;
|
||||
margin-top: 26rpx;
|
||||
}
|
||||
|
||||
.cpInput {
|
||||
width: 150rpx !important;
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
.cpInput {
|
||||
width: 150rpx !important;
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
|
||||
.cpInput>input {
|
||||
box-sizing: border-box;
|
||||
border: 1rpx solid #DDDDDD;
|
||||
width: 100%;
|
||||
height: 60rpx;
|
||||
border-radius: 10rpx;
|
||||
padding: 0 10rpx;
|
||||
}
|
||||
.cpInput>input {
|
||||
box-sizing: border-box;
|
||||
border: 1rpx solid #DDDDDD;
|
||||
width: 100%;
|
||||
height: 60rpx;
|
||||
border-radius: 10rpx;
|
||||
padding: 0 10rpx;
|
||||
}
|
||||
|
||||
.cpInput1 {
|
||||
width: 200rpx !important;
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
.cpInput1 {
|
||||
width: 200rpx !important;
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
|
||||
.cpInput1>input {
|
||||
box-sizing: border-box;
|
||||
border: 1rpx solid #DDDDDD;
|
||||
width: 100%;
|
||||
height: 60rpx;
|
||||
border-radius: 10rpx;
|
||||
padding: 0 10rpx;
|
||||
}
|
||||
.cpInput1>input {
|
||||
box-sizing: border-box;
|
||||
border: 1rpx solid #DDDDDD;
|
||||
width: 100%;
|
||||
height: 60rpx;
|
||||
border-radius: 10rpx;
|
||||
padding: 0 10rpx;
|
||||
}
|
||||
|
||||
.clearIcon {
|
||||
position: absolute;
|
||||
right: 6rpx;
|
||||
top: 6rpx;
|
||||
}
|
||||
.clearIcon {
|
||||
position: absolute;
|
||||
right: 6rpx;
|
||||
top: 6rpx;
|
||||
}
|
||||
|
||||
.greenPrice {
|
||||
font-size: 16px;
|
||||
color: #19BE6B !important;
|
||||
font-weight: bold;
|
||||
}
|
||||
.greenPrice {
|
||||
font-size: 16px;
|
||||
color: #19BE6B !important;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.disFlex {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 8rpx;
|
||||
}
|
||||
.disFlex {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 8rpx;
|
||||
}
|
||||
|
||||
.inputName {
|
||||
color: #ADADAD;
|
||||
font-size: 16px;
|
||||
}
|
||||
.inputName {
|
||||
color: #ADADAD;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.addHKQS {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 16rpx 26rpx;
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.addHKQS {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 16rpx 26rpx;
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
</style>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user