From c4bf789deae97a35db17378ae7565cff435bac59 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 11 九月 2023 18:15:09 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages_adjust/pages/workOrder/workOrder.vue | 139 ++++++++++------------
minipro_standard/pages/OutOperation/OutOperation.vue | 61 +++++----
minipro_standard/pages/index/index.vue | 118 ++++++++++++++++---
3 files changed, 198 insertions(+), 120 deletions(-)
diff --git a/minipro_standard/pages/OutOperation/OutOperation.vue b/minipro_standard/pages/OutOperation/OutOperation.vue
index bf9c0d5..01809b9 100644
--- a/minipro_standard/pages/OutOperation/OutOperation.vue
+++ b/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}`
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 5d46c91..9cdf458 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/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
diff --git a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
index 3425d8c..95a9d39 100644
--- a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
+++ b/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;
--
Gitblit v1.9.3