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

修改发料申请

wms3.0_pda
niexiting 10 months ago
parent
b897fb611f
commit
e4e77e15d2
8 changed files with 115 additions and 88 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. 54
      mycomponents/detail/comRequestDetailCard.vue
  2. 2
      mycomponents/qty/balanceQty.vue
  3. 3
      pages/issue/coms/comIssueRequestCard.vue
  4. 57
      pages/issue/coms/comIssueRequestInfo.vue
  5. 10
      pages/issue/coms/comScanIssuePack.vue
  6. 26
      pages/issue/job/issueDetail.vue
  7. 49
      pages/issue/request/issueRequestDetail.vue
  8. 2
      static/config.json

54
mycomponents/detail/comRequestDetailCard.vue
View File

@ -1,28 +1,19 @@
<template> <template>
<view class="" style="background-color: #fff;"> <view class="" style="background-color: #fff;">
<uni-collapse ref="collapse1" @change=""> <view class="uni-flex uni-column">
<uni-collapse-item :open="true"> <com-issue-request-info :workShopCode="dataContent.workshopCode" :dataContent="requestItem">
<template v-slot:title> </com-issue-request-info>
<item-compare-qty <uni-swipe-action ref="swipeAction">
:dataContent="dataContent" <view v-for="(item, index) in dataContent.subList" :key="index">
:handleQty="Number(dataContent.handleQty)" <uni-swipe-action-item @click="swipeClick($event,item)" :right-options="detailOptions">
:isShowStdPack="false"> <item-qty :dataContent="item" :isShowStdPack="false">
</item-compare-qty> </item-qty>
</template> <u-line />
<u-line /> </uni-swipe-action-item>
<view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)"
:right-options="item.scaned?scanOptions:detailOptions">
<recommend :detail="item" :record="item.record" :isShowPack="isShowPack"
:isShowBatch="isShowBatch" :isShowFromLocation="isShowLocation"></recommend>
</uni-swipe-action-item>
</uni-swipe-action>
<u-line />
</view> </view>
</uni-collapse-item> </uni-swipe-action>
</uni-collapse> </view>
<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit> <request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
<com-message ref="message"></com-message> <com-message ref="message"></com-message>
</view> </view>
</template> </template>
@ -32,6 +23,10 @@
import recommend from '@/mycomponents/recommend/recommend.vue' import recommend from '@/mycomponents/recommend/recommend.vue'
import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue' import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import itemQty from '@/mycomponents/item/itemQty.vue'
import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
import { import {
getDetailOption, getDetailOption,
getDetailEditRemoveOption, getDetailEditRemoveOption,
@ -45,6 +40,9 @@
recommend, recommend,
balanceQtyEdit, balanceQtyEdit,
comMessage, comMessage,
itemQty,
comIssueRequestInfo,
requestDetailInfoPopup
}, },
props: { props: {
dataContent: { dataContent: {
@ -69,7 +67,9 @@
}, },
}, },
watch: { watch: {
dataContent(newVal) {
this.requestItem = newVal.subList[0];
},
}, },
data() { data() {
@ -81,6 +81,7 @@
} }
}, },
requestItem: {},
detailOptions: [], detailOptions: [],
scanOptions: [] scanOptions: []
} }
@ -116,9 +117,10 @@
}, },
detail(item) { detail(item) {
this.$emit('openDetail', item); this.$refs.jobDetailPopup.openPopup(item)
// this.showItem = item; // this.$emit('openDetail', item);
// this.$refs.jobDetailPopup.openPopup(item) // // this.showItem = item;
// // this.$refs.jobDetailPopup.openPopup(item)
}, },
remove(item) { remove(item) {
this.$refs.message.showQuestionMessage("确定移除扫描信息?", this.$refs.message.showQuestionMessage("确定移除扫描信息?",

2
mycomponents/qty/balanceQty.vue
View File

@ -6,7 +6,7 @@
{{Number(dataContent.qty)}} {{Number(dataContent.qty)}}
</text> </text>
</view> </view>
<!-- <uom :uom="dataContent.uom"></uom> --> <uom v-if="dataContent.stdPackQty==undefined" :uom="dataContent.uom"></uom>
</view> </view>
<view class="uni-flex uni-row center"> <view class="uni-flex uni-row center">
<std-pack-qty :dataContent="dataContent"></std-pack-qty> <std-pack-qty :dataContent="dataContent"></std-pack-qty>

3
pages/issue/coms/comIssueRequestCard.vue
View File

@ -1,9 +1,6 @@
<template> <template>
<request-com-main-card :dataContent="dataContent"> <request-com-main-card :dataContent="dataContent">
<view class="task_item"> <view class="task_item">
<view class="task_text">
部门 : {{dataContent.departmentCode}}
</view>
<view class="task_text"> <view class="task_text">
车间代码 : {{dataContent.WorkshopCode}} 车间代码 : {{dataContent.WorkshopCode}}
</view> </view>

57
pages/issue/coms/comIssueRequestInfo.vue
View File

@ -0,0 +1,57 @@
<template>
<view class="cen_card" style="padding: 20rpx;">
<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>
<u-line />
</view>
</template>
<script>
export default {
components: {
},
data() {
return {};
},
props: {
workShopCode: {
type: String,
default: ''
},
dataContent: {
type: Object,
default: {}
},
},
methods: {
}
}
</script>
<style lang="scss">
</style>
<style>
</style>

10
pages/issue/coms/comScanIssuePack.vue
View File

@ -7,7 +7,7 @@
扫描箱码 扫描箱码
<text class="fr" @click="closeScanPopup()">关闭</text> <text class="fr" @click="closeScanPopup()">关闭</text>
</view> </view>
<view class="uni-flex uni-row" style="align-items: center; <!-- <view class="uni-flex uni-row" style="align-items: center;
background-color: #fff; background-color: #fff;
margin-left: 20rpx; margin-left: 20rpx;
margin-right: 20rpx; margin-right: 20rpx;
@ -21,12 +21,12 @@
<view class="" style="margin-left: 15rpx;font-size: 30rpx;"> <view class="" style="margin-left: 15rpx;font-size: 30rpx;">
{{positionInfo}} {{positionInfo}}
</view> </view>
<!-- <u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList" <u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
@confirm="confirmSelect"></u-select> --> @confirm="confirmSelect"></u-select>
</view> </view>
</view> </view>
</view> </view> -->
<u-line class='line_color'></u-line> <!-- <u-line class='line_color'></u-line> -->
<view class="uni-flex uni-row" style="align-items: center; <view class="uni-flex uni-row" style="align-items: center;
background-color: #fff; background-color: #fff;

26
pages/issue/job/issueDetail.vue
View File

@ -7,27 +7,7 @@
<scroll-view scroll-y="true" class=""> <scroll-view scroll-y="true" class="">
<view v-for="(toLocation, index) in detailSource"> <view v-for="(toLocation, index) in detailSource">
<view class="cen_card" style="padding: 20rpx;"> <com-issue-request-info :workShopCode="jobContent.workShopCode" :dataContent="toLocation"></com-issue-request-info>
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">车间</view>
<view>{{jobContent.workShopCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>{{toLocation.productionLineCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">工位</view>
<view>{{ toLocation.workStationCode }}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">原材料库</view>
<view>{{ toLocation.toLocationCode}}</view>
</view>
</view>
<u-line />
</view>
<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'> <com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
</com-issue-detail-card> </com-issue-detail-card>
</view> </view>
@ -80,13 +60,15 @@
import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue' import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue' import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
export default { export default {
name: 'issueDetail', name: 'issueDetail',
components: { components: {
jobDetailPopup, jobDetailPopup,
winScanButton, winScanButton,
comIssueDetailCard, comIssueDetailCard,
comIssueRequestInfo,
comScanIssuePack, comScanIssuePack,
comMessage comMessage
}, },

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

@ -1,19 +1,15 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list">
<view class=""> <view class="">
<comRequestDetailCard :dataContent="item" <com-request-detail-card :dataContent="requestContent">
@openDetail="openDetail"> </com-request-detail-card>
</comRequestDetailCard>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
</view> </view>
</template> </template>
@ -34,13 +30,12 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue" import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
requestDetailInfoPopup,
comMessage, comMessage,
}, },
data() { data() {
@ -48,7 +43,6 @@
id: '', id: '',
requestContent: {}, //任务内容 requestContent: {}, //任务内容
subList: [], //接口返回的任务 subList: [], //接口返回的任务
detailSource: [], //绑定在页面上的数据源
}; };
}, },
onLoad(option) { onLoad(option) {
@ -83,36 +77,31 @@
if (res.data == null) { if (res.data == null) {
that.showMessage('未获取到详情'); that.showMessage('未获取到详情');
} else { } else {
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.requestContent = res.data; that.requestContent = res.data;
that.subList = res.data.subList; that.requestContent.subList=res.data.subList;
that.subList.forEach(res=>{ that.subList = res.data.subList;
res.fromLocationCode = res.toLocationCode // that.subList.forEach(res => {
}) // res.fromLocationCode = res.toLocationCode
that.detailSource = getDataSource(that.subList); // })
updateTitle(this.requestContent.number); // that.detailSource = getDataSource(that.subList);
} else { updateTitle(this.requestContent.number);
that.showMessage('列表数据为0'); } else {
} that.showMessage('列表数据为0');
}
} }
}).catch(error => { }).catch(error => {
uni.hideLoading() uni.hideLoading()
this.showMessage(error) this.showMessage(error)
}) })
}, },
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {
if (res) { if (res) {}
}
}); });
}, },
openDetail(item) {
this.$refs.jobDetailPopup.openPopup(item)
},
} }
} }
</script> </script>

2
static/config.json
View File

@ -18,7 +18,7 @@
"request_url": { "request_url": {
"name": "request_url", "name": "request_url",
"value": "http://192.168.0.230:12080/admin-api", "value": "http://dev.ccwin-in.com:25100/api/admin-api",
"dev2":"http://192.168.0.157:12080/admin-api", "dev2":"http://192.168.0.157:12080/admin-api",
"dev":"http://dev.ccwin-in.com:25100/api/admin-api", "dev":"http://dev.ccwin-in.com:25100/api/admin-api",
"local":"http://localhost:12080", "local":"http://localhost:12080",

Write Preview
Loading…
Cancel
Save