Browse Source

翻包任务,发货单,采购收货,采购拒绝

hella_vue3
zhang_li 7 months ago
parent
commit
813738ef39
  1. 6
      src/api/request2.js
  2. 8
      src/pages/package/coms/comOverPackJobCard.vue
  3. 4
      src/pages/package/job/overPackageJob.vue
  4. 96
      src/pages/point/index.vue
  5. 21
      src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
  6. 4
      src/pages/purchaseReceipt/job/receiptJob.vue
  7. 15
      src/pages/supplierDeliver/coms/comRecordCard.vue
  8. 2
      src/pages/supplierDeliver/record/supplierDeliverRecord.vue

6
src/api/request2.js

@ -594,7 +594,7 @@ export function getCustomerItemList(params) {
*/ */
export function getSupplierDeliverRecordList(params) { export function getSupplierDeliverRecordList(params) {
return request({ return request({
url: baseApi + "/wms/supplierdeliver-record-main/senior", url: baseApi + "/wms/supplierdeliver-record-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
@ -731,7 +731,7 @@ export function inspectRequestAddAgain(id) {
*/ */
export function getPurchaseReceiptJobList(params) { export function getPurchaseReceiptJobList(params) {
return request({ return request({
url: baseApi + "/wms/purchasereceipt-job-main/senior", url: baseApi + "/wms/purchasereceipt-job-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
@ -4047,7 +4047,7 @@ export function cancleTakeOverPageJob(id) {
*/ */
export function getOverPageJobList(params) { export function getOverPageJobList(params) {
return request({ return request({
url: baseApi + "/wms/packageover-job-main/senior", url: baseApi + "/wms/packageover-job-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });

8
src/pages/package/coms/comOverPackJobCard.vue

@ -1,18 +1,16 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<view class="task_item"> <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<view class="task_text">
申请单号 {{dataContent.requestNumber}}
</view>
</view>
</job-com-main-card> </job-com-main-card>
</template> </template>
<script> <script>
import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue' import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default { export default {
components: { components: {
jobComMainCard, jobComMainCard,
jobComMainDetailCard
}, },
data() { data() {
return {}; return {};

4
src/pages/package/job/overPackageJob.vue

@ -194,7 +194,7 @@
openJobDetail(item) { openJobDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './overPackageJobDetail?id=' + item.id + '&status=' + item.status url: './overPackageJobDetail?id=' + item.masterId + '&status=' + item.status
}); });
}, },
@ -213,7 +213,7 @@
this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?", this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
res => { res => {
if (res) { if (res) {
this.cancleJob(dataContent.id); this.cancleJob(dataContent.masterId);
} }
}); });
} }

96
src/pages/point/index.vue

@ -1,70 +1,70 @@
<template> <template>
<view class="content"> <view class="content">
<view class="btn-wrap"> <view class="" style="position: absolute; bottom:80px ;left: 30px;z-index: 99999;">
<kk-printer ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint"></kk-printer> 打印
</view> </view>
<web-view src="/hybrid/html/point.html" :fullscreen='false' :webview-styles="webviewStyles"></web-view>
</view> </view>
</template> </template>
<script> <script>
import util from '@/components/kk-printer/utils/util.js'; const htmlFileUrl = '/hybrid/html/point.html';
import * as blesdk from '@/components/kk-printer/utils/bluetoolth.js';
import kkPrinter from '@/components/kk-printer/index.vue';
export default { export default {
data() { data() {
return { return {
bufferData:'' webviewStyles: {
progress: {
color: '#FF3333'
},
width: '100%',
height: '600px',
}
} }
}, },
components:{
kkPrinter
},
mounted() { mounted() {
}, },
methods: { methods: {
onPrint(opt){
let arr = ['2','3'] readFile(path, callback) {
let y = 450 plus.io.resolveLocalFileSystemURL(path, function(entry) {
let strCmd =blesdk.CreatCPCLPage(400,y*arr.length,1,0); entry.file(function(file) {
arr.forEach((item,index)=>{ var reader = new plus.io.FileReader();
strCmd += blesdk.addCPCLLine(0,210 + (y*index),400,210+ (y*index),3); reader.onloadend = function(e) {
strCmd += blesdk.addCPCLText(10,0 + (y*index),'4','3',0,'8.14'); callback(e.target.result);
strCmd += blesdk.addCPCLBarCode(270,0 + (y*index),'128',80,0,1,1,'00051'); };
strCmd += blesdk.addCPCLText(290,80 + (y*index),'7','2',0,'00051'); reader.readAsText(file);
strCmd += blesdk.addCPCLText(40,110 + (y*index),'3','0',0,'CHICKEN FEET (BONELESS)'); }, function(e) {
// strCmd += blesdk.addCPCLSETMAG(2,2); console.log("读取文件失败:" + e.message);
strCmd += blesdk.addCPCLText(40,150 + (y*index),'55','0',0,'无骨鸡爪 一盒(约1.5磅)'); });
// strCmd += blesdk.addCPCLSETMAG(0,0); }, function(e) {
strCmd += blesdk.addCPCLText(0,180 + (y*index),'7','2',0,'2019-08-12'); console.log("获取图片资源失败:" + e.message);
strCmd += blesdk.addCPCLLocation(2);// });
strCmd += blesdk.addCPCLQRCode(0,220 + (y*index),'M', 2, 6, 'qr code test');
})
console.log(strCmd)
strCmd += blesdk.addCPCLPrint();
this.bufferData = strCmd;
} }
} },
onShow() {
this.readFile(htmlFileUrl, function(htmlContent) {
console.log(htmlContent); // HTML
console.log(typeof htmlContent); // HTML
});
// uni.request({
// url: htmlFileUrl,
// method: 'GET',
// success: function(res) {
// // res.dataHTML
// var htmlString = res.data;
// console.log(htmlString);
// },
// fail: function(error) {
// console.error('HTML:', error);
// }
// });
},
} }
</script> </script>
<style> <style>
.content {
width: 100vw;
height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.btn-wrap{
width:180upx;
height: 100upx;
border-radius: 16upx;
border: 2upx solid #333333;
box-sizing: border-box;
display: flex;
justify-content: center;
align-items: center;
}
</style> </style>

21
src/pages/purchaseReceipt/coms/comReceiptJobCard.vue

@ -1,31 +1,16 @@
<template> <template>
<jobComMainCardAsn :dataContent="dataContent"> <jobComMainCardAsn :dataContent="dataContent">
<view class="task_item"> <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<!-- <view class="task_text">
<view class="">
申请单号 : {{dataContent.requestNumber}}
</view>
</view> -->
<view class="task_text">
<view class="">
任务单号 : {{dataContent.number}}
</view>
</view>
<view class="task_text">
<view class="">
供应商代码 : {{dataContent.supplierCode}}
<!-- 供应商名称 : {{dataContent.supplierName}} -->
</view>
</view>
</view>
</jobComMainCardAsn> </jobComMainCardAsn>
</template> </template>
<script> <script>
import jobComMainCardAsn from '@/mycomponents/job/jobComMainCardAsn.vue' import jobComMainCardAsn from '@/mycomponents/job/jobComMainCardAsn.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default { export default {
components: { components: {
jobComMainCardAsn, jobComMainCardAsn,
jobComMainDetailCard
}, },
data() { data() {
return {}; return {};

4
src/pages/purchaseReceipt/job/receiptJob.vue

@ -246,7 +246,7 @@
openJobDetail(item) { openJobDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './receiptDetail?id=' + item.id + '&status=' + item.status + '&operation=' + this.operation url: './receiptDetail?id=' + item.masterId + '&status=' + item.status + '&operation=' + this.operation
}); });
}, },
@ -265,7 +265,7 @@
this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?", this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
res => { res => {
if (res) { if (res) {
var id = dataContent.id var id = dataContent.masterId
this.cancleJob(id); this.cancleJob(id);
} }
}); });

15
src/pages/supplierDeliver/coms/comRecordCard.vue

@ -14,26 +14,17 @@
</view> </view>
</view> --> </view> -->
<record-com-main-card :dataContent="dataContent"> <record-com-main-card :dataContent="dataContent">
<view class="task_item"> <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<view class="task_text">
<view class="">
发货单号 : {{dataContent.asnNumber}}
</view>
</view>
<view class="task_text">
<view class="">
供应商代码 : {{dataContent.supplierCode}}
</view>
</view>
</view>
</record-com-main-card> </record-com-main-card>
</template> </template>
<script> <script>
import recordComMainCard from '@/mycomponents/record/recordComMainCard.vue' import recordComMainCard from '@/mycomponents/record/recordComMainCard.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default { export default {
components: { components: {
recordComMainCard, recordComMainCard,
jobComMainDetailCard
}, },
data() { data() {
return {}; return {};

2
src/pages/supplierDeliver/record/supplierDeliverRecord.vue

@ -165,7 +165,7 @@
openJobDetail(item) { openJobDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './supplierDeliverRecordDetail?id=' + item.id url: './supplierDeliverRecordDetail?id=' + item.masterId
}); });
}, },

Loading…
Cancel
Save