Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

hella_vue3
lijuncheng 7 months ago
parent
commit
2fcc173aad
  1. 10
      src/api/request2.js
  2. 27
      src/pages/count/coms/comCountJobCard.vue
  3. 4
      src/pages/count/job/countJob.vue
  4. 10
      src/pages/inventoryMove/coms/comInventoryJobCard.vue
  5. 4
      src/pages/inventoryMove/coms/comMoveJob.vue
  6. 8
      src/pages/package/coms/comOverPackJobCard.vue
  7. 4
      src/pages/package/job/overPackageJob.vue
  8. 96
      src/pages/point/index.vue
  9. 21
      src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
  10. 4
      src/pages/purchaseReceipt/job/receiptJob.vue
  11. 15
      src/pages/supplierDeliver/coms/comRecordCard.vue
  12. 2
      src/pages/supplierDeliver/record/supplierDeliverRecord.vue

10
src/api/request2.js

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

27
src/pages/count/coms/comCountJobCard.vue

@ -1,29 +1,6 @@
<template>
<job-com-main-card :dataContent="dataContent">
<view class="task_item">
<view class="task_text">
<view class="">
申请单号 : {{dataContent.requestNumber}}
</view>
</view>
<view class="task_text">
<view class="">
盘点阶段 : {{getCountStageName(dataContent.stage)}}
</view>
</view>
<view class="task_text">
<view class="">
盘点库位 : {{dataContent.locationCode}}
</view>
</view>
<view class="task_text">
<view class="">
盘点策略 : {{isOpenCount(dataContent.isOpenCount)}}
</view>
</view>
</view>
<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
</job-com-main-card>
</template>
@ -32,9 +9,11 @@
getCountStageName
} from '@/common/directory.js';
import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default {
components: {
jobComMainCard,
jobComMainDetailCard
},
data() {
return {};

4
src/pages/count/job/countJob.vue

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

10
src/pages/inventoryMove/coms/comInventoryJobCard.vue

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

4
src/pages/inventoryMove/coms/comMoveJob.vue

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

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

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

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

@ -194,7 +194,7 @@
openJobDetail(item) {
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("确定要放弃当前任务?",
res => {
if (res) {
this.cancleJob(dataContent.id);
this.cancleJob(dataContent.masterId);
}
});
}

96
src/pages/point/index.vue

@ -1,70 +1,70 @@
<template>
<view class="content">
<view class="btn-wrap">
<kk-printer ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint"></kk-printer>
<view class="" style="position: absolute; bottom:80px ;left: 30px;z-index: 99999;">
打印
</view>
<web-view src="/hybrid/html/point.html" :fullscreen='false' :webview-styles="webviewStyles"></web-view>
</view>
</template>
<script>
import util from '@/components/kk-printer/utils/util.js';
import * as blesdk from '@/components/kk-printer/utils/bluetoolth.js';
import kkPrinter from '@/components/kk-printer/index.vue';
const htmlFileUrl = '/hybrid/html/point.html';
export default {
data() {
return {
bufferData:''
}
webviewStyles: {
progress: {
color: '#FF3333'
},
components:{
kkPrinter
width: '100%',
height: '600px',
}
}
},
mounted() {
},
methods: {
onPrint(opt){
let arr = ['2','3']
let y = 450
let strCmd =blesdk.CreatCPCLPage(400,y*arr.length,1,0);
arr.forEach((item,index)=>{
strCmd += blesdk.addCPCLLine(0,210 + (y*index),400,210+ (y*index),3);
strCmd += blesdk.addCPCLText(10,0 + (y*index),'4','3',0,'8.14');
strCmd += blesdk.addCPCLBarCode(270,0 + (y*index),'128',80,0,1,1,'00051');
strCmd += blesdk.addCPCLText(290,80 + (y*index),'7','2',0,'00051');
strCmd += blesdk.addCPCLText(40,110 + (y*index),'3','0',0,'CHICKEN FEET (BONELESS)');
// strCmd += blesdk.addCPCLSETMAG(2,2);
strCmd += blesdk.addCPCLText(40,150 + (y*index),'55','0',0,'无骨鸡爪 一盒(约1.5磅)');
// strCmd += blesdk.addCPCLSETMAG(0,0);
strCmd += blesdk.addCPCLText(0,180 + (y*index),'7','2',0,'2019-08-12');
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;
}
readFile(path, callback) {
plus.io.resolveLocalFileSystemURL(path, function(entry) {
entry.file(function(file) {
var reader = new plus.io.FileReader();
reader.onloadend = function(e) {
callback(e.target.result);
};
reader.readAsText(file);
}, function(e) {
console.log("读取文件失败:" + e.message);
});
}, function(e) {
console.log("获取图片资源失败:" + e.message);
});
}
},
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>
<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>

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

@ -1,31 +1,16 @@
<template>
<jobComMainCardAsn :dataContent="dataContent">
<view class="task_item">
<!-- <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>
<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
</jobComMainCardAsn>
</template>
<script>
import jobComMainCardAsn from '@/mycomponents/job/jobComMainCardAsn.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default {
components: {
jobComMainCardAsn,
jobComMainDetailCard
},
data() {
return {};

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

@ -246,7 +246,7 @@
openJobDetail(item) {
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("确定要放弃当前任务?",
res => {
if (res) {
var id = dataContent.id
var id = dataContent.masterId
this.cancleJob(id);
}
});

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

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

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

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

Loading…
Cancel
Save