| minipro_standard/pages/OutOperation/OutOperation.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/pages/index/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/pages_adjust/pages/workOrder/workOrder.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
minipro_standard/pages/OutOperation/OutOperation.vue
@@ -244,7 +244,6 @@ infoAction = wTransferForInOut data.wTransferType = '0' } console.log('------'); infoAction(data).then(res => { if (this.isZKD) { this.info = res.data.wtransfer @@ -272,29 +271,36 @@ selectMaterail(v) { let tempList = this.warehouseList[0].wtransferDetailList let materials = v.materials materials.forEach(materail => { tempList.forEach(item => { if (materail.materialId == item.materialId && materail.procedureId == item .procedureId && materail.qualityType == item.qualityType && materail.batch == item.batch) { let isExist = false this.outboundList.forEach(selected => { if (selected.newId == materail.id) { isExist = true return } }) if (isExist) { uni.$u.toast('该物料批次已存在') return } let obj = JSON.parse(JSON.stringify(materail)) obj.newId = item.id this.outboundList.push(obj) } materials.forEach(materail => { tempList.forEach(item => { item.wstockExtListVOList.forEach(hw => { if (materail.materialId == hw.materialId && materail.procedureId == hw .procedureId && materail.qualityType == hw.qualityType && materail.batch == hw.batch) { let isExist = false this.outboundList.forEach(selected => { if (selected.newId == materail.id) { isExist = true return } }) if (isExist) { uni.$u.toast('该物料批次已存在') return } let obj = JSON.parse(JSON.stringify(materail)) obj.newId = item.id this.outboundList.push(obj) } }) }) }) }, dele(index) { this.outboundList.splice(index, 1) }, submit() { if (this.type == QRCodeType.ZKD) { @@ -346,11 +352,14 @@ wtransferId: this.id }).then(res => { if (res.code === 200) { this.$store.dispatch.dispatch('getUpcomingNum') this.$store.dispatch('getUpcomingNum') uni.$u.toast('操作成功') uni.redirectTo({ url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}&dbid=${this.dbid}` }) url: `/pages/warehousingDetails/warehousingDetails?id=${this.info.id}&dbid=${this.dbid}` }) // uni.redirectTo({ // url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}&dbid=${this.dbid}` // }) // setTimeout(() => { // router.replace({ name: 'wTransferDetail', query: { id: info.value.wtransfer.id, dbid: route.query.dbid } }) // }, 2000) @@ -365,7 +374,7 @@ wOutboundType: 0 }).then(res => { if (res.code === 200) { this.$store.dispatch.dispatch('getUpcomingNum') this.$store.dispatch('getUpcomingNum') uni.$u.toast('操作成功') uni.redirectTo({ url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}` minipro_standard/pages/index/index.vue
@@ -2,7 +2,27 @@ <view class="index"> <!-- <web-view v-if="show" @onPostMessage="onMessage" :src="'https://dmtest.ahapp.net/doumeeplant_h5/#/appletLogin?code=' + code"></web-view> --> <!-- {{$store.state.statusbarHeight}} --> <div class="content_search"> <v-Search @searchInput="searchForm.mixParam" @submit="search" @reset="reset" :isShow="true" placeholder="搜索关键字"> <template v-slot:content> <div class="Search_item"> <div class="Search_item_label">计划日期</div> <div class="Search_item_content" @click="isOpenDate = true"> <div class="Search_item_content_a" :style="searchForm.startDate ? 'color: #000;' : ''"> {{ searchForm.startDate ? searchForm.startDate : '开始日期'}} </div> <span>-</span> <div class="Search_item_content_a" :style="searchForm.endDate ? 'color: #000;' : ''"> {{ searchForm.endDate ? searchForm.endDate : '结束日期'}} </div> </div> </div> </template> </v-Search> <div class="content_search_x"></div> <v-LableSelection :TagList="tagList" :isShow="true" @change="clickTag"></v-LableSelection> </div> <u-sticky> <view class="plr30 pb30 nav-style"> <view @@ -13,7 +33,7 @@ shape="square" v-model="searchForm.mixParam"></u-search> <image src="../../static/filter@2x.png" class="img48 ml20" @click="filterAction" mode=""></image> </view> <view class="cY mt30"> <view class="cY mt30 bg_w"> <view v-for="item in tagList" :key="item.id" class="tag_item mr10" :class="searchForm.status==item.id?'sbtn_green':'sbtn_black_rim'" @click="selectType(item.id)"> {{`${item.name}(${item.num})`}} @@ -201,20 +221,65 @@ this.search() }, jump(item) { if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 0) { // 跳转出库(转库单) uni.navigateTo({ url: `/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7` }) } else if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 1) { // router.push({ // name: 'wTransferDetail', // query: { // id: item.objId, // status: item.status, // type: item.type, // dbid: item.id // } // }) switch(item.type) { case 0: case 2: case 5: { if (item.status === 0) { uni.navigateTo({ url: `/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7` }) } else { uni.navigateTo({ url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${item.objId}&status=${item.status}&type=${item.type}&dbid=${item.id}` }) } break } case 3: { if (item.status==0) { } else{ uni.navigateTo({ url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${item.objId}` }) } break } case 4: { break } case 1: case 6: { if (item.status === 0) { uni.navigateTo({ url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7` }) } else { uni.navigateTo({ url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${item.objId}` }) } break } case 9: { if (item.status === 0) { uni.navigateTo({ url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9` }) } else{ uni.navigateTo({ url: `/pages_adjust/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${item.objId}` }) } } default: { } } /** * * if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 0) { // 跳转出库(转库单) } else if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 1) { } else if ((item.type === 1 || item.type === 4 || item.type === 6) && item.status === 0) { // 跳转入库(转库单) if (item.type === 4) { // 跳转完工入库详情 // router.push({ @@ -245,7 +310,10 @@ // } // }) return } } uni.navigateTo({ url: `/pages/warehousingDetails/warehousingDetails?id=${item.objId}` }) // router.push({ // name: 'wTransferDetail', // query: { @@ -261,7 +329,9 @@ // } // }) } else if (item.type === 3 && item.status === 1) { // 备料（转库单详情） // router.push({ name: 'wInboundDetail', query: { id: item.objId } }) uni.navigateTo({ url: `/pages/warehousingDetails/warehousingDetails?id=${item.objId}` }) // router.push({ // name: 'wTransferDetail', // query: { @@ -280,14 +350,22 @@ // type: 9 // } // }) } else if (item.type === 9 && item.status === 1) { } else if (item.type === 9 && item.status === 1) { uni.navigateTo({ url: `/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${item.objId}` }) // router.push({ // name: 'wInboundDetail', // query: { // id: item.objId // } // }) } } * * * */ }, filterAction() { this.show = true minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
@@ -1,5 +1,5 @@ <template> <view class="content p30"> <view class="content p30 bbox"> <div class="content_search"> <v-Search @searchInput="searchForm.mixParam" @submit="search" @reset="reset" :isShow="true" placeholder="搜索工单编码/工序名称"> @@ -21,64 +21,67 @@ <div class="content_search_x"></div> <v-LableSelection :TagList="tagList" :isShow="true" @change="clickTag"></v-LableSelection> </div> <div class="content_total mt20">共{{page.total}}条数据</div> <scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="getLists" @refresherrefresh="onRefresh"> <div class="content_list"> <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)"> <div class="content_list_item_top"> <div class="content_list_item_top_left"> <span class="f32" v-if="item.mmodel">{{item.mmodel.name}} | {{item.procedureName}}</span> <div class="content_list_item_top_left_tag" v-if="item.urgent">优先{{item.urgent}}</div> <div class="content_list_item_top_left_tag backgreen" v-if="item.type === 0">正常</div> <div class="content_list_item_top_left_tag backyellow" v-if="item.type === 2">返工返修</div> <div class="content_list_item_top_left_tagW" v-if="item.paused === 1">停</div> </div> <div class="content_list_item_top_right"> <span class="yellow" v-if="item.status === 0">已创建</span> <span class="green" v-if="item.status === 1">已备料</span> <span v-if="item.status === 2">已完工检</span> <span class="purple" v-if="item.status === 3">已检验</span> <span v-if="item.status === 4">已报工</span> <span v-if="item.status === 5">已入库</span> <span v-if="item.status === 6">已取消</span> <span class="green" v-if="item.status === 7">进行中</span> </div> </div> <span class="f24">工单编号: {{item.code}}</span> <div class="content_list_item_content"> <div class="content_list_item_content_item"> <div class="content_list_item_content_item_label">物料编码：</div> <div class="content_list_item_content_item_nr" v-if="item.mmodel">{{item.mmodel.code}}</div> </div> <div class="content_list_item_content_item"> <div class="content_list_item_content_item_label">计划开工：</div> <div class="content_list_item_content_item_nr">{{item.planDate}}</div> </div> <div class="content_list_item_content_item"> <div class="content_list_item_content_item_label">生产批次：</div> <div class="content_list_item_content_item_nr">{{item.batch}}</div> </div> <div class="content_list_item_content_item"> <div class="content_list_item_content_item_label">计划数量：</div> <div class="content_list_item_content_item_nr" v-if="item.umodel"> {{item.planNum}}{{item.umodel.name}} </div> </div> <div class="content_list_item_content_item"> <div class="content_list_item_content_item_label">生产设备：</div> <div class="content_list_item_content_item_nr" v-if="item.pgmodel">{{item.pgmodel.code}} </div> </div> <div class="content_list_item_content_item" v-if="item.status === 5"> <div class="content_list_item_content_item_label">完工数量：</div> <div class="content_list_item_content_item_nr">{{item.proNum}}</div> </div> </div> </div> </div> </scroll-view> <div class="content_total mt20">共{{page.total}}条数据</div> <view class="fx1"> <scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="getLists" @refresherrefresh="onRefresh"> <div class="content_list"> <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)"> <div class="content_list_item_top"> <div class="content_list_item_top_left"> <span class="f32" v-if="item.mmodel">{{item.mmodel.name}} | {{item.procedureName}}</span> <div class="content_list_item_top_left_tag" v-if="item.urgent">优先{{item.urgent}}</div> <div class="content_list_item_top_left_tag backgreen" v-if="item.type === 0">正常</div> <div class="content_list_item_top_left_tag backyellow" v-if="item.type === 2">返工返修</div> <div class="content_list_item_top_left_tagW" v-if="item.paused === 1">停</div> </div> <div class="content_list_item_top_right"> <span class="yellow" v-if="item.status === 0">已创建</span> <span class="green" v-if="item.status === 1">已备料</span> <span v-if="item.status === 2">已完工检</span> <span class="purple" v-if="item.status === 3">已检验</span> <span v-if="item.status === 4">已报工</span> <span v-if="item.status === 5">已入库</span> <span v-if="item.status === 6">已取消</span> <span class="green" v-if="item.status === 7">进行中</span> </div> </div> <span class="f24">工单编号: {{item.code}}</span> <div class="content_list_item_content"> <div class="content_list_item_content_item"> <div class="content_list_item_content_item_label">物料编码：</div> <div class="content_list_item_content_item_nr" v-if="item.mmodel">{{item.mmodel.code}}</div> </div> <div class="content_list_item_content_item"> <div class="content_list_item_content_item_label">计划开工：</div> <div class="content_list_item_content_item_nr">{{item.planDate}}</div> </div> <div class="content_list_item_content_item"> <div class="content_list_item_content_item_label">生产批次：</div> <div class="content_list_item_content_item_nr">{{item.batch}}</div> </div> <div class="content_list_item_content_item"> <div class="content_list_item_content_item_label">计划数量：</div> <div class="content_list_item_content_item_nr" v-if="item.umodel"> {{item.planNum}}{{item.umodel.name}} </div> </div> <div class="content_list_item_content_item"> <div class="content_list_item_content_item_label">生产设备：</div> <div class="content_list_item_content_item_nr" v-if="item.pgmodel">{{item.pgmodel.code}} </div> </div> <div class="content_list_item_content_item" v-if="item.status === 5"> <div class="content_list_item_content_item_label">完工数量：</div> <div class="content_list_item_content_item_nr">{{item.proNum}}</div> </div> </div> </div> </div> </scroll-view> </view> <!-- <u-calendar :show="isOpenDate" mode="range" @confirm="dateConfirm"></u-calendar> --> <l-calendar :lunar="false" v-model="isOpenDate" @change="onConfirm" :isRange="true" activeBgColor="#305ED5" rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar> @@ -233,21 +236,9 @@ <style lang="scss" scoped> .content { .content_code { position: fixed; right: 30rpx; bottom: 100rpx; img { width: 138rpx; height: 138rpx; } } .content_top { top: 0 !important; } display: flex; flex-direction: column; height: 100vh; .content_search { background: white; z-index: 9;
