sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

wms3.0_pda
lijuncheng 12 months ago
parent
2cbf2353ad 546c74c3df
commit
7ebc8fea3f
7 changed files with 87 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      common/style/new_style.css
  2. 18
      mycomponents/detail/comDetailCard.vue
  3. 3
      pages/inspect/coms/inspectComDetailCard.vue
  4. 73
      pages/issue/request/issueRequest.vue
  5. 24
      pages/issue/request/issueRequestDetail.vue
  6. 9
      pages/productionReceipt/coms/comProductionJobCard.vue
  7. 2
      pages/productionReceipt/job/productionReceiptDetail.vue

2
common/style/new_style.css
View File

@ -224,7 +224,7 @@ uni-page-head .uni-page-head__title {
position: relative; position: relative;
/* width: 25%; */ /* width: 25%; */
padding: 0 20rpx; padding: 0 20rpx;
margin: 0 0 20rpx; /* margin: 0 0 20rpx; */
text-align: center; text-align: center;
} }

18
mycomponents/detail/comDetailCard.vue
View File

@ -1,5 +1,23 @@
<template> <template>
<view class="" style="background-color: #fff;"> <view class="" style="background-color: #fff;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">车间</view>
<view>{{workShopCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>{{dataContent.productionLineCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">工位</view>
<view>{{ dataContent.workStationCode }}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">原材料库</view>
<view>{{ dataContent.toLocationCode}}</view>
</view>
</view>
<uni-collapse ref="collapse1" @change=""> <uni-collapse ref="collapse1" @change="">
<uni-collapse-item :open="true"> <uni-collapse-item :open="true">
<template v-slot:title> <template v-slot:title>

3
pages/inspect/coms/inspectComDetailCard.vue
View File

@ -44,8 +44,7 @@
:right-options="item.scaned?scanOptions:detailOptions"> :right-options="item.scaned?scanOptions:detailOptions">
<recommend :detail="item" :isShowPack="isShowPack" :isShowBatch="isShowBatch" <recommend :detail="item" :isShowPack="isShowPack" :isShowBatch="isShowBatch"
:isShowFromLocation="isShowLocation"></recommend> :isShowFromLocation="isShowLocation"></recommend>
<!-- --> <view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;padding-left: 2px;">
<view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;margin-top: 5px;">
<view class="cell_box uni-flex uni-row"> <view class="cell_box uni-flex uni-row">
<view class="cell_info uni-flex uni-row"> <view class="cell_info uni-flex uni-row">
<view class="text_lightblue"> <view class="text_lightblue">

73
pages/issue/request/issueRequest.vue
View File

@ -14,10 +14,11 @@
</view> </view>
</uni-swipe-action> </uni-swipe-action>
<uni-load-more :status="loadingType" /> <uni-load-more :status="loadingType" />
<!-- <request-info-popup ref='requestInfoPopup'></request-info-popup> -->
<request-info-popup ref='requestInfoPopup'></request-info-popup>
</view> </view>
<requestButton @goScan='openScanDetailPopup'></requestButton> <requestButton @goScan='openScanDetailPopup'></requestButton>
<!-- <com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm'></com-issue-request-popup> -->
<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirmsss'></com-issue-request-popup>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -30,6 +31,8 @@
import comIssueRequestCard from '@/pages/issue/coms/comIssueRequestCard.vue' import comIssueRequestCard from '@/pages/issue/coms/comIssueRequestCard.vue'
import requestInfoPopup from '@/pages/issue/coms/requestInfoPopup.vue' import requestInfoPopup from '@/pages/issue/coms/requestInfoPopup.vue'
import requestButton from '@/mycomponents/button/requestButton.vue' import requestButton from '@/mycomponents/button/requestButton.vue'
import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
import { import {
goHome, goHome,
updateTitle, updateTitle,
@ -64,6 +67,7 @@
comIssueRequestCard, comIssueRequestCard,
requestInfoPopup, requestInfoPopup,
requestButton, requestButton,
comIssueRequestPopup
}, },
data() { data() {
return { return {
@ -119,16 +123,16 @@
}, },
methods: { methods: {
requestConfirm(action, item) {},
openRequestDetail(item) { openRequestDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './issueRequestDetail?id=' + item.id url: './issueRequestDetail?type=query&id=' + item.id
}); });
}, },
openRequestInfoPopup(item) { openRequestInfoPopup(item) {
this.$refs.requestInfoPopup.openPopup(item) this.$refs.requestInfoPopup.openPopup(item)
}, },
getList(type) { getList(type) {
let that = this; let that = this;
uni.showLoading({ uni.showLoading({
@ -183,6 +187,7 @@
that.showMessage(error.errMsg) that.showMessage(error.errMsg)
}) })
}, },
updateOptions(status) { updateOptions(status) {
if (status == "1") { if (status == "1") {
this.showOptions = this.detailAndApproveOptions; this.showOptions = this.detailAndApproveOptions;
@ -199,42 +204,37 @@
}, },
openScanDetailPopup() { openScanDetailPopup() {
// uni.navigateTo({ this.$refs.comIssueRequestPopup.openRequestPopup(true);
// url: "../request/issueRequestSubmit?fromType=" + this.fromType
// })
uni.navigateTo({
url: "../record/issueRecord?fromType=" + this.fromType
})
}, },
swipeClick(e, dataContent) { swipeClick(e, dataContent) {
var text = clearTirmAndWrap(e.content.text) var text = clearTirmAndWrap(e.content.text)
if (text == "详情") { if (text == "详情") {
this.openRequestInfoPopup(dataContent); this.openRequestInfoPopup(dataContent);
} else if (text == "处理") { } else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{ this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.issueRequestHandle(dataContent.id) this.issueRequestHandle(dataContent.id)
}) })
} else if (text == "提交审批") { } else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{ this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.issueRequestSubmitApprove(dataContent.id) this.issueRequestSubmitApprove(dataContent.id)
}) })
} else if (text.includes("审批通过")) { } else if (text.includes("审批通过")) {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{ this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.issueRequestSubmitApproveAgree(dataContent.id) this.issueRequestSubmitApproveAgree(dataContent.id)
}) })
} else if (text == "审批驳回") { } else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{ this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.issueRequestSubmitApproveRefused(dataContent.id) this.issueRequestSubmitApproveRefused(dataContent.id)
}) })
} else if (text == "关闭") { } else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{ this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.issueRequestClose(dataContent.id) this.issueRequestClose(dataContent.id)
}) })
} }
}, },
showQuestionMessage(hint,callBack){ showQuestionMessage(hint, callBack) {
this.$refs.comMessage.showQuestionMessage(hint, this.$refs.comMessage.showQuestionMessage(hint,
res => { res => {
if (res) { if (res) {
@ -242,6 +242,7 @@
} }
}); });
}, },
switchChangeWait(state, jobStatus) { switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state; this.checkedWaitTask = state;
this.status = jobStatus; this.status = jobStatus;
@ -290,7 +291,7 @@
} }
}); });
}, },
issueRequestSubmitApprove(id) { issueRequestSubmitApprove(id) {
issueRequestSubmitApprove(id).then(res => { issueRequestSubmitApprove(id).then(res => {
if (res.data) { if (res.data) {
@ -301,13 +302,13 @@
} else { } else {
this.showMessage("申请提交审批失败") this.showMessage("申请提交审批失败")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error) this.showMessage(error)
}) })
}, },
issueRequestClose(id) { issueRequestClose(id) {
issueRequestClose(id).then(res => { issueRequestClose(id).then(res => {
if (res.data) { if (res.data) {
@ -318,12 +319,12 @@
} else { } else {
this.showMessage("申请关闭失败") this.showMessage("申请关闭失败")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error) this.showMessage(error)
}) })
}, },
issueRequestSubmitApproveAgree(id) { issueRequestSubmitApproveAgree(id) {
issueRequestSubmitApproveAgree(id).then(res => { issueRequestSubmitApproveAgree(id).then(res => {
if (res.data) { if (res.data) {
@ -334,12 +335,12 @@
} else { } else {
this.showMessage("申请审批通过失败") this.showMessage("申请审批通过失败")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error) this.showMessage(error)
}) })
}, },
issueRequestSubmitApproveRefused(id) { issueRequestSubmitApproveRefused(id) {
issueRequestSubmitApproveRefused(id).then(res => { issueRequestSubmitApproveRefused(id).then(res => {
if (res.data) { if (res.data) {
@ -350,11 +351,12 @@
} else { } else {
this.showMessage("申请审批驳回失败") this.showMessage("申请审批驳回失败")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error) this.showMessage(error)
}) })
}, },
issueRequestHandle(id) { issueRequestHandle(id) {
issueRequestHandle(id).then(res => { issueRequestHandle(id).then(res => {
if (res.data) { if (res.data) {
@ -365,13 +367,26 @@
} else { } else {
this.showMessage("申请处理失败") this.showMessage("申请处理失败")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error) this.showMessage(error)
}) })
}, },
},
requestConfirmsss(action, item) {
debugger;
uni.navigateTo({
url: './issueRequestDetail?type=add&item=' + item.id
});
} }
// requestConfirm(action, item) {
// debugger;
// uni.navigateTo({
// url: './issueRequestDetail?type=add&item=' + item.id
// });
// }
} }
</script> </script>

24
pages/issue/request/issueRequestDetail.vue
View File

@ -9,6 +9,14 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<!-- v-if="type=='add'" -->
<div class="btn_bottom" >
<view class="" style="display: flex;flex-direction: row;">
<view class="">
<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
</view>
</view>
</div>
</view> </view>
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
</view> </view>
@ -32,7 +40,7 @@
import comIssueRequestDetailCard from "@/pages/issue/coms/comIssueRequestDetailCard.vue" import comIssueRequestDetailCard from "@/pages/issue/coms/comIssueRequestDetailCard.vue"
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
export default { export default {
components: { components: {
comIssueRequestDetailCard, comIssueRequestDetailCard,
@ -43,12 +51,20 @@
id: '', id: '',
requestContent: {}, //任务内容 requestContent: {}, //任务内容
subList: [], //接口返回的任务 subList: [], //接口返回的任务
type: 'query' //来源新增add, query查询
}; };
}, },
onLoad(option) { onLoad(option) {
this.id = option.id; debugger;
this.getDetail(); this.type = option.type;
if (this.type == 'add') {
} else {
this.id = option.id;
this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
@ -79,7 +95,7 @@
} else { } else {
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.requestContent = res.data; that.requestContent = res.data;
that.requestContent.subList=res.data.subList; that.requestContent.subList = res.data.subList;
that.subList = res.data.subList; that.subList = res.data.subList;
// that.subList.forEach(res => { // that.subList.forEach(res => {
// res.fromLocationCode = res.toLocationCode // res.fromLocationCode = res.toLocationCode

9
pages/productionReceipt/coms/comProductionJobCard.vue
View File

@ -3,17 +3,12 @@
<view class="task_item"> <view class="task_item">
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
申请单号 : {{dataContent.requestNumber}} 发料任务单号:{{dataContent.issueJobNumber}}
</view> </view>
</view> </view>
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
零件号 : {{dataContent.itemCode}} 车间:{{dataContent.workshopCode}}
</view>
</view>
<view class="task_text">
<view class="">
目标库位 : {{dataContent.toLocationCode}}
</view> </view>
</view> </view>
</view> </view>

2
pages/productionReceipt/job/productionReceiptDetail.vue
View File

@ -172,7 +172,7 @@
that.toLocationCode = that.subList[0].toLocationCode that.toLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes) that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
updateTitle(this.jobContent.number); // updateTitle(this.jobContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

Write Preview
Loading…
Cancel
Save