From cb59a1ff2e14d892a4b085d8dadbf564073d25a3 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 05 一月 2026 15:42:14 +0800
Subject: [PATCH] 1.生产管理、质量管理
---
pages/zlgl/wgjy1.vue | 6
pages/zlgl/xjjy.vue | 202 ++++++++------
pages/zlgl/sjjy.vue | 206 ++++++++------
pages/zlgl/wgjy2.vue | 2
pages/zlgl/wgjy.vue | 204 ++++++++------
pages/scgl/scbg.vue | 172 ++++++------
pages/zlgl/sjjy1.vue | 6
pages/scgl/scbg2.vue | 11
pages/zlgl/sjjy2.vue | 2
pages/zlgl/xjjy2.vue | 2
pages/zlgl/xjjy1.vue | 6
11 files changed, 444 insertions(+), 375 deletions(-)
diff --git a/pages/scgl/scbg.vue b/pages/scgl/scbg.vue
index 53fa0ef..febdd71 100644
--- a/pages/scgl/scbg.vue
+++ b/pages/scgl/scbg.vue
@@ -34,7 +34,7 @@
</view>
- <u-alert :title="alertTitle" type="info"></u-alert>
+ <u-alert :title="'宸ュ崟鏁伴噺锛�'+total+'锛�'" type="info"></u-alert>
<!-- 鎶樺彔闈㈡澘 -->
@@ -44,26 +44,26 @@
<u-collapse style="max-height: 62vh;overflow: auto;">
<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
- <!-- <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> -->
- <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
- v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
- :label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
- v-for="item in collapseArr" :key="item.ordercode">
+ <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore">
+ <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
+ v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
+ :label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
+ v-for="(item,index) in collapseArr" :key="item.ordercode+index">
- <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
- {{item.partname}} {{item.partspec}}
- </view>
+ <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
+ {{item.partname}} {{item.partspec}}
+ </view>
- <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> -->
- <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff"
- @click="progressClick(item.ordercode)">
- <!-- {{item.partname}}{{item.partspec}} -->
- <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
- inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
- </view>
+ <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> -->
+ <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff">
+ <!-- @click="progressClick(item.ordercode)" -->
+ <!-- {{item.partname}}{{item.partspec}} -->
+ <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
+ inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
+ </view>
- <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; ">
+ <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; ">
<view class="" style="display: flex;justify-content: flex-end;">
<view style="color: #0659ff;">
{{parseFloat(item.ordergoodqty)}}
@@ -76,55 +76,55 @@
-->
- <view v-if="radiovalue==='鐢熶骇宸ュ崟'" style="margin:0 0 5px">
- <view class="flex_column">
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧缂栫爜锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view>
- </view>
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧鍚嶇О锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view>
- </view>
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧瑙勬牸锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}}
+ <view v-if="radiovalue==='鐢熶骇宸ュ崟'" style="margin:0 0 5px">
+ <view class="flex_column">
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧缂栫爜锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view>
</view>
- </view>
- </view>
- </view>
-
-
- <!-- {{item.children}} -->
- <!-- <u--text class="u-collapse-content"> -->
- <u-steps :current="-1" inactiveColor='#0659FF' direction="column">
- <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
- @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
-
- <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
- <u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
- <view class="" style="width: 100px;">
- <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
- inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
- </view>
- <view style="width: 30%;text-align: right;">
- <view class="" style="display: flex;justify-content: flex-end;">
- <view style="color: #0659ff;">
- {{parseFloat(it.goodqty)}}
- </view>
- <view>
- /{{ parseFloat(it.planqty)}}
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧鍚嶇О锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view>
+ </view>
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧瑙勬牸锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}}
</view>
</view>
</view>
</view>
- </u-steps>
- <!-- </u--text> -->
+
+ <!-- {{item.children}} -->
+ <!-- <u--text class="u-collapse-content"> -->
+ <u-steps :current="-1" inactiveColor='#0659FF' direction="column">
+ <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
+ @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
+
+ <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
+ <u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
+ <view class="" style="width: 100px;">
+ <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
+ inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
+ </view>
+ <view style="width: 30%;text-align: right;">
+ <view class="" style="display: flex;justify-content: flex-end;">
+ <view style="color: #0659ff;">
+ {{parseFloat(it.goodqty)}}
+ </view>
+ <view>
+ /{{ parseFloat(it.planqty)}}
+ </view>
+ </view>
+ </view>
+ </view>
+
+ </u-steps>
+ <!-- </u--text> -->
- </u-collapse-item>
- <!-- </scroll-view> -->
+ </u-collapse-item>
+ </scroll-view>
</u-collapse>
@@ -241,11 +241,8 @@
uni.$off('scancodedate') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
uni.$on('scancodedate', function(content) {
console.log("鎵弿鍒扮殑鍐呭涓�:", content)
- // _this.getCheckScanDeviceQrCodeData(content)
+ _this.getCheckScanDeviceQrCodeData(content)
})
-
-
- console.log(option, 8)
},
onPullDownRefresh() {
@@ -315,7 +312,7 @@
], //宸查�変腑鐨勪骇鍝佹爣绛�
order: '', //鍗曞彿
placeholder2: '鐢熶骇璁㈠崟',
- total: 10,
+ total: 0,
currentpage: 1, //绗嚑椤�
pageSize: 10, //姣忛〉鏄剧ず澶氬皯鏉�
@@ -360,7 +357,7 @@
uni.navigateTo({
- url: './scbg2?orderstep=' + orderstep
+ url: './scbg2?orderstep=' + orderstep + '¤tpage=' + this.currentpage
})
},
@@ -386,20 +383,20 @@
let ordertype = '' // SO锛氶攢鍞鍗� MO锛氱敓浜ц鍗� PO锛氱敓浜у伐鍗�
switch (this.radiovalue) {
case '鐢熶骇宸ュ崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ュ伐鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ュ伐鍗曚俊鎭�'
ordertype = 'PO'
break
case '鐢熶骇璁㈠崟':
// this.alertTitle = '鐢熶骇璁㈠崟鏁伴噺锛堝叡/涓級'
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ョ敓浜ц鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ョ敓浜ц鍗曚俊鎭�'
ordertype = 'MO'
break
case '閿�鍞鍗�':
// this.alertTitle = '閿�鍞鍗曟暟閲忥紙鍏�/涓級'
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ラ攢鍞鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ラ攢鍞鍗曚俊鎭�'
ordertype = 'SO'
break
}
@@ -424,8 +421,8 @@
this.collapseArr = res.data
this.collapseArrAll = res.data
- this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[
- 1]
+ // this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[
+ // 1]
},
loadMore() {
@@ -434,22 +431,25 @@
//杈撳叆妗嗗洖杞︾‘璁や簨浠�
confirmInputBoxValue(val) {
- this.collapseArr = this.collapseArrAll.filter((p) => {
- return p.ordercode.indexOf(val) !== -1
- })
+ this.order = val
+ this.currentpage = 1
+ this.getProductOrderSearch(1)
+ // this.collapseArr = this.collapseArrAll.filter((p) => {
+ // return p.ordercode.indexOf(val) !== -1
+ // })
- switch (this.radiovalue) {
- case '鐢熶骇宸ュ崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- case '鐢熶骇璁㈠崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- case '閿�鍞鍗�':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- }
+ // switch (this.radiovalue) {
+ // case '鐢熶骇宸ュ崟':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // case '鐢熶骇璁㈠崟':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // case '閿�鍞鍗�':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // }
diff --git a/pages/scgl/scbg2.vue b/pages/scgl/scbg2.vue
index cad25df..bdaa388 100644
--- a/pages/scgl/scbg2.vue
+++ b/pages/scgl/scbg2.vue
@@ -3,15 +3,15 @@
<page-nav title="鐢熶骇鎶ュ伐"></page-nav>
- <view v-show="topContent.length===0">
+ <!-- <view v-show="topContent.length===0">
<div class="sacnBody">
<div class="scanImg" @click="topScanClick"></div>
<div class="scanText">璇锋壂鎻忎换鍔℃潯鐮�</div>
</div>
- </view>
+ </view> -->
<view v-show="topContent.length!==0">
- <view class="mainContent" :style="{maxHeight:'1260rpx',overflow: 'scroll'}">
+ <view class="mainContent" :style="{maxHeight:'72vh',overflow: 'scroll'}">
<!-- 鎶ュ伐淇℃伅 -->
<u-gap height="5" bgColor="#eff0f1"></u-gap>
@@ -320,6 +320,7 @@
onLoad(option) {
if (option.orderstep) {
this.fromType = '1'
+ this.currentpage = option.currentpage
this.getMesOrderStepStart(option.orderstep)
} else {
this.fromType = '2'
@@ -428,6 +429,8 @@
userSheetShow: false,
fromType: '1', //鏉ユ簮浜庡摢閲� 鏄〉闈�1杩樻槸2
+
+ currentpage: 1,
}
},
created() {
@@ -739,7 +742,7 @@
let pages = getCurrentPages(); // 椤甸潰闆嗗悎
let beforePage = pages[pages.length - 2]; //涓婁竴涓〉闈�
// beforePage.$vm.getProductionScheduleKanban()
- beforePage.$vm.getProductOrderSearch()
+ beforePage.$vm.getProductOrderSearch(this.currentpage)
uni.navigateBack()
}
diff --git a/pages/zlgl/sjjy.vue b/pages/zlgl/sjjy.vue
index 2abda6b..aa8b7c7 100644
--- a/pages/zlgl/sjjy.vue
+++ b/pages/zlgl/sjjy.vue
@@ -1,6 +1,6 @@
<template>
<view>
- <page-nav title="棣栨妫�楠�"></page-nav>
+ <page-nav title="棣栦欢妫�楠�"></page-nav>
<view class="flex_center" style="margin: 20rpx;">
@@ -34,34 +34,36 @@
</view>
- <u-alert :title="alertTitle" type="info"></u-alert>
+ <u-alert :title="'宸ュ崟鏁伴噺锛�'+total+'锛�'" type="info"></u-alert>
<!-- 鎶樺彔闈㈡澘 -->
<!-- <u-collapse @change="change" @close="close" @open="open"> -->
<!-- @change="collapseChange" -->
+
+
<u-collapse style="max-height: 62vh;overflow: auto;">
<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
- <!-- <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> -->
- <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
- v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
- :label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
- v-for="item in collapseArr" :key="item.ordercode">
+ <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore">
+ <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
+ v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
+ :label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
+ v-for="(item,index) in collapseArr" :key="item.ordercode+index">
- <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
- {{item.partname}} {{item.partspec}}
- </view>
+ <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
+ {{item.partname}} {{item.partspec}}
+ </view>
- <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> -->
- <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff"
- @click="progressClick(item.ordercode)">
- <!-- {{item.partname}}{{item.partspec}} -->
- <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
- inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
- </view>
+ <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> -->
+ <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff">
+ <!-- @click="progressClick(item.ordercode)" -->
+ <!-- {{item.partname}}{{item.partspec}} -->
+ <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
+ inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
+ </view>
- <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; ">
+ <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; ">
<view class="" style="display: flex;justify-content: flex-end;">
<view style="color: #0659ff;">
{{parseFloat(item.ordergoodqty)}}
@@ -74,61 +76,65 @@
-->
- <view v-if="radiovalue==='鐢熶骇宸ュ崟'" style="margin:0 0 5px">
- <view class="flex_column">
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧缂栫爜锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view>
- </view>
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧鍚嶇О锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view>
- </view>
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧瑙勬牸锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}}
+ <view v-if="radiovalue==='鐢熶骇宸ュ崟'" style="margin:0 0 5px">
+ <view class="flex_column">
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧缂栫爜锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view>
</view>
- </view>
- </view>
- </view>
-
-
- <!-- {{item.children}} -->
- <!-- <u--text class="u-collapse-content"> -->
- <u-steps :current="-1" inactiveColor='#0659FF' direction="column">
- <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
- @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
-
- <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
- <u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
- <view class="" style="width: 100px;">
- <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
- inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
- </view>
- <view style="width: 30%;text-align: right;">
- <view class="" style="display: flex;justify-content: flex-end;">
- <view style="color: #0659ff;">
- {{parseFloat(it.goodqty)}}
- </view>
- <view>
- /{{ parseFloat(it.planqty)}}
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧鍚嶇О锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view>
+ </view>
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧瑙勬牸锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}}
</view>
</view>
</view>
</view>
- </u-steps>
- <!-- </u--text> -->
+
+ <!-- {{item.children}} -->
+ <!-- <u--text class="u-collapse-content"> -->
+ <u-steps :current="-1" inactiveColor='#0659FF' direction="column">
+ <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
+ @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
+
+ <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
+ <u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
+ <view class="" style="width: 100px;">
+ <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
+ inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
+ </view>
+ <view style="width: 30%;text-align: right;">
+ <view class="" style="display: flex;justify-content: flex-end;">
+ <view style="color: #0659ff;">
+ {{parseFloat(it.goodqty)}}
+ </view>
+ <view>
+ /{{ parseFloat(it.planqty)}}
+ </view>
+ </view>
+ </view>
+ </view>
+
+ </u-steps>
+ <!-- </u--text> -->
- </u-collapse-item>
- <!-- </scroll-view> -->
+ </u-collapse-item>
+ </scroll-view>
</u-collapse>
+
+
+
<view class="uni-pagination-box">
<uni-pagination show-icon :page-size="pageSize" :current="currentpage" :total="total"
@change="pageChange" />
</view>
+
<!-- 寮瑰嚭灞� -->
<!-- closeIconPos='top-left' closeOnClickOverlay closeable='true' -->
@@ -212,6 +218,10 @@
<view @click="scan2">
<drag-ball :x='300' :y="600"></drag-ball>
</view>
+
+
+ <scan-code></scan-code>
+
</view>
</template>
@@ -220,7 +230,12 @@
import {
ProductOrderSearch
} from '../../config/api.js';
+ import scanCode from '@/components/scan-code/scan-code.vue'
+
export default {
+ components: {
+ scanCode
+ },
onLoad(option) {
const _this = this
uni.$off('scancodedate') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
@@ -228,9 +243,6 @@
console.log("鎵弿鍒扮殑鍐呭涓�:", content)
_this.getCheckScanDeviceQrCodeData(content)
})
-
-
- console.log(option, 8)
},
onPullDownRefresh() {
@@ -300,7 +312,7 @@
], //宸查�変腑鐨勪骇鍝佹爣绛�
order: '', //鍗曞彿
placeholder2: '鐢熶骇璁㈠崟',
- total: 10,
+ total: 0,
currentpage: 1, //绗嚑椤�
pageSize: 10, //姣忛〉鏄剧ず澶氬皯鏉�
@@ -334,11 +346,6 @@
init() {
uni.stopPullDownRefresh();
},
- // 椤垫暟鏀瑰彉鏃� 鍒嗛〉瑙﹀彂
- pageChange(e) {
- this.currentpage = e.current
- this.getProductOrderSearch(e.current)
- },
gotoPage(p1, p2) {
let orderstep = null
@@ -350,7 +357,7 @@
uni.navigateTo({
- url: './sjjy1?orderstep=' + orderstep
+ url: './sjjy1?orderstep=' + orderstep + '¤tpage=' + this.currentpage
})
},
@@ -365,25 +372,31 @@
})
},
+ // 椤垫暟鏀瑰彉鏃� 鍒嗛〉瑙﹀彂
+ pageChange(e) {
+ this.currentpage = e.current
+ this.getProductOrderSearch(e.current)
+ },
+
// 鎺ュ彛鑾峰彇
async getProductOrderSearch(current) {
let ordertype = '' // SO锛氶攢鍞鍗� MO锛氱敓浜ц鍗� PO锛氱敓浜у伐鍗�
switch (this.radiovalue) {
case '鐢熶骇宸ュ崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ュ伐鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ュ伐鍗曚俊鎭�'
ordertype = 'PO'
break
case '鐢熶骇璁㈠崟':
// this.alertTitle = '鐢熶骇璁㈠崟鏁伴噺锛堝叡/涓級'
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ョ敓浜ц鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ョ敓浜ц鍗曚俊鎭�'
ordertype = 'MO'
break
case '閿�鍞鍗�':
// this.alertTitle = '閿�鍞鍗曟暟閲忥紙鍏�/涓級'
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ラ攢鍞鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ラ攢鍞鍗曚俊鎭�'
ordertype = 'SO'
break
}
@@ -395,17 +408,21 @@
ordercode: this.order,
Ratetime: '',
// Ratetime: this.calendarRange,
+
page: current,
rows: this.pageSize,
prop: 'lm_date',
sortorder: 'desc'
+
}
const res = await ProductOrderSearch(data)
+
this.total = res.count
+
this.collapseArr = res.data
this.collapseArrAll = res.data
- this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[
- 1]
+ // this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[
+ // 1]
},
loadMore() {
@@ -414,21 +431,27 @@
//杈撳叆妗嗗洖杞︾‘璁や簨浠�
confirmInputBoxValue(val) {
- this.collapseArr = this.collapseArrAll.filter((p) => {
- return p.ordercode.indexOf(val) !== -1
- })
+ this.order = val
+ this.currentpage = 1
+ this.getProductOrderSearch(1)
+ // this.collapseArr = this.collapseArrAll.filter((p) => {
+ // return p.ordercode.indexOf(val) !== -1
+ // })
- switch (this.radiovalue) {
- case '鐢熶骇宸ュ崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- case '鐢熶骇璁㈠崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- case '閿�鍞鍗�':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- }
+
+ // switch (this.radiovalue) {
+ // case '鐢熶骇宸ュ崟':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // case '鐢熶骇璁㈠崟':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // case '閿�鍞鍗�':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // }
+
+
// this.alertTitle = this.alertTitle.split('/')[0] + this.collapseArr.length + this.alertTitle.split('/')[
// 1]
@@ -680,7 +703,6 @@
::v-deep .u-cell__body {
padding-bottom: 40rpx;
}
-
.uni-pagination-box {
height: 4vh;
diff --git a/pages/zlgl/sjjy1.vue b/pages/zlgl/sjjy1.vue
index 62dcd70..0c61af4 100644
--- a/pages/zlgl/sjjy1.vue
+++ b/pages/zlgl/sjjy1.vue
@@ -2,15 +2,15 @@
<view>
<page-nav title="棣栨妫�楠�"></page-nav>
- <view v-if="processArr.length===0">
+ <!-- <view v-if="processArr.length===0">
<div class="sacnBody">
<div class="scanImg" @click="topScanClick"></div>
<div class="scanText">鎵弿宸ュ簭浠诲姟鐮�</div>
</div>
- </view>
+ </view> -->
- <view v-if="processArr.length!==0" class="mainContent" style="height: 1340rpx;overflow: auto">
+ <view v-if="processArr.length!==0" class="mainContent" style="height: 72vh;overflow: auto">
<view>
<u-gap height="10" bgColor="#eff0f1"></u-gap>
<view class="head" style="height: 386rpx;overflow: auto;">
diff --git a/pages/zlgl/sjjy2.vue b/pages/zlgl/sjjy2.vue
index df7ca39..81ed49d 100644
--- a/pages/zlgl/sjjy2.vue
+++ b/pages/zlgl/sjjy2.vue
@@ -3,7 +3,7 @@
<page-nav title="棣栨妫�楠�"></page-nav>
- <view class="mainContent">
+ <view class="mainContent" style="height: 72vh;overflow: auto">
<view>
<u-gap height="10" bgColor="#eff0f1"></u-gap>
<view class="head">
diff --git a/pages/zlgl/wgjy.vue b/pages/zlgl/wgjy.vue
index d2de5e7..d106eaf 100644
--- a/pages/zlgl/wgjy.vue
+++ b/pages/zlgl/wgjy.vue
@@ -34,34 +34,36 @@
</view>
- <u-alert :title="alertTitle" type="info"></u-alert>
+ <u-alert :title="'宸ュ崟鏁伴噺锛�'+total+'锛�'" type="info"></u-alert>
<!-- 鎶樺彔闈㈡澘 -->
<!-- <u-collapse @change="change" @close="close" @open="open"> -->
<!-- @change="collapseChange" -->
+
+
<u-collapse style="max-height: 62vh;overflow: auto;">
<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
- <!-- <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> -->
- <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
- v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
- :label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
- v-for="item in collapseArr" :key="item.ordercode">
+ <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore">
+ <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
+ v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
+ :label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
+ v-for="(item,index) in collapseArr" :key="item.ordercode+index">
- <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
- {{item.partname}} {{item.partspec}}
- </view>
+ <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
+ {{item.partname}} {{item.partspec}}
+ </view>
- <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> -->
- <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff"
- @click="progressClick(item.ordercode)">
- <!-- {{item.partname}}{{item.partspec}} -->
- <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
- inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
- </view>
+ <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> -->
+ <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff">
+ <!-- @click="progressClick(item.ordercode)" -->
+ <!-- {{item.partname}}{{item.partspec}} -->
+ <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
+ inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
+ </view>
- <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; ">
+ <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; ">
<view class="" style="display: flex;justify-content: flex-end;">
<view style="color: #0659ff;">
{{parseFloat(item.ordergoodqty)}}
@@ -74,61 +76,65 @@
-->
- <view v-if="radiovalue==='鐢熶骇宸ュ崟'" style="margin:0 0 5px">
- <view class="flex_column">
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧缂栫爜锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view>
- </view>
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧鍚嶇О锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view>
- </view>
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧瑙勬牸锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}}
+ <view v-if="radiovalue==='鐢熶骇宸ュ崟'" style="margin:0 0 5px">
+ <view class="flex_column">
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧缂栫爜锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view>
</view>
- </view>
- </view>
- </view>
-
-
- <!-- {{item.children}} -->
- <!-- <u--text class="u-collapse-content"> -->
- <u-steps :current="-1" inactiveColor='#0659FF' direction="column">
- <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
- @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
-
- <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
- <u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
- <view class="" style="width: 100px;">
- <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
- inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
- </view>
- <view style="width: 30%;text-align: right;">
- <view class="" style="display: flex;justify-content: flex-end;">
- <view style="color: #0659ff;">
- {{parseFloat(it.goodqty)}}
- </view>
- <view>
- /{{ parseFloat(it.planqty)}}
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧鍚嶇О锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view>
+ </view>
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧瑙勬牸锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}}
</view>
</view>
</view>
</view>
- </u-steps>
- <!-- </u--text> -->
+
+ <!-- {{item.children}} -->
+ <!-- <u--text class="u-collapse-content"> -->
+ <u-steps :current="-1" inactiveColor='#0659FF' direction="column">
+ <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
+ @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
+
+ <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
+ <u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
+ <view class="" style="width: 100px;">
+ <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
+ inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
+ </view>
+ <view style="width: 30%;text-align: right;">
+ <view class="" style="display: flex;justify-content: flex-end;">
+ <view style="color: #0659ff;">
+ {{parseFloat(it.goodqty)}}
+ </view>
+ <view>
+ /{{ parseFloat(it.planqty)}}
+ </view>
+ </view>
+ </view>
+ </view>
+
+ </u-steps>
+ <!-- </u--text> -->
- </u-collapse-item>
- <!-- </scroll-view> -->
+ </u-collapse-item>
+ </scroll-view>
</u-collapse>
+
+
+
<view class="uni-pagination-box">
<uni-pagination show-icon :page-size="pageSize" :current="currentpage" :total="total"
@change="pageChange" />
</view>
+
<!-- 寮瑰嚭灞� -->
<!-- closeIconPos='top-left' closeOnClickOverlay closeable='true' -->
@@ -212,6 +218,10 @@
<view @click="scan2">
<drag-ball :x='300' :y="600"></drag-ball>
</view>
+
+
+ <scan-code></scan-code>
+
</view>
</template>
@@ -220,7 +230,12 @@
import {
ProductOrderSearch
} from '../../config/api.js';
+ import scanCode from '@/components/scan-code/scan-code.vue'
+
export default {
+ components: {
+ scanCode
+ },
onLoad(option) {
const _this = this
uni.$off('scancodedate') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
@@ -228,9 +243,6 @@
console.log("鎵弿鍒扮殑鍐呭涓�:", content)
_this.getCheckScanDeviceQrCodeData(content)
})
-
-
- console.log(option, 8)
},
onPullDownRefresh() {
@@ -300,7 +312,7 @@
], //宸查�変腑鐨勪骇鍝佹爣绛�
order: '', //鍗曞彿
placeholder2: '鐢熶骇璁㈠崟',
- total: 10,
+ total: 0,
currentpage: 1, //绗嚑椤�
pageSize: 10, //姣忛〉鏄剧ず澶氬皯鏉�
@@ -334,11 +346,6 @@
init() {
uni.stopPullDownRefresh();
},
- // 椤垫暟鏀瑰彉鏃� 鍒嗛〉瑙﹀彂
- pageChange(e) {
- this.currentpage = e.current
- this.getProductOrderSearch(e.current)
- },
gotoPage(p1, p2) {
let orderstep = null
@@ -350,7 +357,7 @@
uni.navigateTo({
- url: './wgjy1?orderstep=' + orderstep
+ url: './wgjy1?orderstep=' + orderstep + '¤tpage=' + this.currentpage
})
},
@@ -365,25 +372,31 @@
})
},
+ // 椤垫暟鏀瑰彉鏃� 鍒嗛〉瑙﹀彂
+ pageChange(e) {
+ this.currentpage = e.current
+ this.getProductOrderSearch(e.current)
+ },
+
// 鎺ュ彛鑾峰彇
async getProductOrderSearch(current) {
let ordertype = '' // SO锛氶攢鍞鍗� MO锛氱敓浜ц鍗� PO锛氱敓浜у伐鍗�
switch (this.radiovalue) {
case '鐢熶骇宸ュ崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ュ伐鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ュ伐鍗曚俊鎭�'
ordertype = 'PO'
break
case '鐢熶骇璁㈠崟':
// this.alertTitle = '鐢熶骇璁㈠崟鏁伴噺锛堝叡/涓級'
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ョ敓浜ц鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ョ敓浜ц鍗曚俊鎭�'
ordertype = 'MO'
break
case '閿�鍞鍗�':
// this.alertTitle = '閿�鍞鍗曟暟閲忥紙鍏�/涓級'
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ラ攢鍞鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ラ攢鍞鍗曚俊鎭�'
ordertype = 'SO'
break
}
@@ -395,17 +408,21 @@
ordercode: this.order,
Ratetime: '',
// Ratetime: this.calendarRange,
+
page: current,
rows: this.pageSize,
prop: 'lm_date',
sortorder: 'desc'
+
}
const res = await ProductOrderSearch(data)
+
this.total = res.count
+
this.collapseArr = res.data
this.collapseArrAll = res.data
- this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[
- 1]
+ // this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[
+ // 1]
},
loadMore() {
@@ -414,21 +431,27 @@
//杈撳叆妗嗗洖杞︾‘璁や簨浠�
confirmInputBoxValue(val) {
- this.collapseArr = this.collapseArrAll.filter((p) => {
- return p.ordercode.indexOf(val) !== -1
- })
+ this.order = val
+ this.currentpage = 1
+ this.getProductOrderSearch(1)
+ // this.collapseArr = this.collapseArrAll.filter((p) => {
+ // return p.ordercode.indexOf(val) !== -1
+ // })
- switch (this.radiovalue) {
- case '鐢熶骇宸ュ崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- case '鐢熶骇璁㈠崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- case '閿�鍞鍗�':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- }
+
+ // switch (this.radiovalue) {
+ // case '鐢熶骇宸ュ崟':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // case '鐢熶骇璁㈠崟':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // case '閿�鍞鍗�':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // }
+
+
// this.alertTitle = this.alertTitle.split('/')[0] + this.collapseArr.length + this.alertTitle.split('/')[
// 1]
@@ -680,7 +703,6 @@
::v-deep .u-cell__body {
padding-bottom: 40rpx;
}
-
.uni-pagination-box {
height: 4vh;
diff --git a/pages/zlgl/wgjy1.vue b/pages/zlgl/wgjy1.vue
index 384019b..fae38be 100644
--- a/pages/zlgl/wgjy1.vue
+++ b/pages/zlgl/wgjy1.vue
@@ -2,15 +2,15 @@
<view>
<page-nav title="瀹屽伐妫�楠�"></page-nav>
- <view v-if="processArr.length===0">
+ <!-- <view v-if="processArr.length===0">
<div class="sacnBody">
<div class="scanImg" @click="topScanClick"></div>
<div class="scanText">鎵弿宸ュ簭浠诲姟鐮�</div>
</div>
- </view>
+ </view> -->
- <view v-if="processArr.length!==0" class="mainContent" style="height: 1340rpx;overflow: auto">
+ <view v-if="processArr.length!==0" class="mainContent" style="height: 72vh;overflow: auto">
<view>
<u-gap height="10" bgColor="#eff0f1"></u-gap>
<view class="head" style="height: 386rpx;overflow: auto;">
diff --git a/pages/zlgl/wgjy2.vue b/pages/zlgl/wgjy2.vue
index ad93150..b2f9565 100644
--- a/pages/zlgl/wgjy2.vue
+++ b/pages/zlgl/wgjy2.vue
@@ -3,7 +3,7 @@
<page-nav title="瀹屽伐妫�楠�"></page-nav>
- <view class="mainContent">
+ <view class="mainContent" style="height: 72vh;overflow: auto">
<view>
<u-gap height="10" bgColor="#eff0f1"></u-gap>
<view class="head">
diff --git a/pages/zlgl/xjjy.vue b/pages/zlgl/xjjy.vue
index 3c203b4..deb243a 100644
--- a/pages/zlgl/xjjy.vue
+++ b/pages/zlgl/xjjy.vue
@@ -34,34 +34,36 @@
</view>
- <u-alert :title="alertTitle" type="info"></u-alert>
+ <u-alert :title="'宸ュ崟鏁伴噺锛�'+total+'锛�'" type="info"></u-alert>
<!-- 鎶樺彔闈㈡澘 -->
<!-- <u-collapse @change="change" @close="close" @open="open"> -->
<!-- @change="collapseChange" -->
+
+
<u-collapse style="max-height: 62vh;overflow: auto;">
<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
- <!-- <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> -->
- <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
- v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
- :label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
- v-for="item in collapseArr" :key="item.ordercode">
+ <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore">
+ <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
+ v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
+ :label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
+ v-for="(item,index) in collapseArr" :key="item.ordercode+index">
- <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
- {{item.partname}} {{item.partspec}}
- </view>
+ <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
+ {{item.partname}} {{item.partspec}}
+ </view>
- <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> -->
- <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff"
- @click="progressClick(item.ordercode)">
- <!-- {{item.partname}}{{item.partspec}} -->
- <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
- inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
- </view>
+ <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> -->
+ <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff">
+ <!-- @click="progressClick(item.ordercode)" -->
+ <!-- {{item.partname}}{{item.partspec}} -->
+ <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
+ inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
+ </view>
- <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; ">
+ <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; ">
<view class="" style="display: flex;justify-content: flex-end;">
<view style="color: #0659ff;">
{{parseFloat(item.ordergoodqty)}}
@@ -74,61 +76,65 @@
-->
- <view v-if="radiovalue==='鐢熶骇宸ュ崟'" style="margin:0 0 5px">
- <view class="flex_column">
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧缂栫爜锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view>
- </view>
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧鍚嶇О锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view>
- </view>
- <view style="display:flex">
- <view class="titleFont" style="font-size: 14px;">浜у搧瑙勬牸锛�</view>
- <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}}
+ <view v-if="radiovalue==='鐢熶骇宸ュ崟'" style="margin:0 0 5px">
+ <view class="flex_column">
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧缂栫爜锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view>
</view>
- </view>
- </view>
- </view>
-
-
- <!-- {{item.children}} -->
- <!-- <u--text class="u-collapse-content"> -->
- <u-steps :current="-1" inactiveColor='#0659FF' direction="column">
- <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
- @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
-
- <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
- <u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
- <view class="" style="width: 100px;">
- <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
- inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
- </view>
- <view style="width: 30%;text-align: right;">
- <view class="" style="display: flex;justify-content: flex-end;">
- <view style="color: #0659ff;">
- {{parseFloat(it.goodqty)}}
- </view>
- <view>
- /{{ parseFloat(it.planqty)}}
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧鍚嶇О锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view>
+ </view>
+ <view style="display:flex">
+ <view class="titleFont" style="font-size: 14px;">浜у搧瑙勬牸锛�</view>
+ <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}}
</view>
</view>
</view>
</view>
- </u-steps>
- <!-- </u--text> -->
+
+ <!-- {{item.children}} -->
+ <!-- <u--text class="u-collapse-content"> -->
+ <u-steps :current="-1" inactiveColor='#0659FF' direction="column">
+ <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
+ @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
+
+ <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
+ <u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
+ <view class="" style="width: 100px;">
+ <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
+ inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
+ </view>
+ <view style="width: 30%;text-align: right;">
+ <view class="" style="display: flex;justify-content: flex-end;">
+ <view style="color: #0659ff;">
+ {{parseFloat(it.goodqty)}}
+ </view>
+ <view>
+ /{{ parseFloat(it.planqty)}}
+ </view>
+ </view>
+ </view>
+ </view>
+
+ </u-steps>
+ <!-- </u--text> -->
- </u-collapse-item>
- <!-- </scroll-view> -->
+ </u-collapse-item>
+ </scroll-view>
</u-collapse>
+
+
+
<view class="uni-pagination-box">
<uni-pagination show-icon :page-size="pageSize" :current="currentpage" :total="total"
@change="pageChange" />
</view>
+
<!-- 寮瑰嚭灞� -->
<!-- closeIconPos='top-left' closeOnClickOverlay closeable='true' -->
@@ -212,6 +218,10 @@
<view @click="scan2">
<drag-ball :x='300' :y="600"></drag-ball>
</view>
+
+
+ <scan-code></scan-code>
+
</view>
</template>
@@ -220,7 +230,12 @@
import {
ProductOrderSearch
} from '../../config/api.js';
+ import scanCode from '@/components/scan-code/scan-code.vue'
+
export default {
+ components: {
+ scanCode
+ },
onLoad(option) {
const _this = this
uni.$off('scancodedate') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
@@ -228,9 +243,6 @@
console.log("鎵弿鍒扮殑鍐呭涓�:", content)
_this.getCheckScanDeviceQrCodeData(content)
})
-
-
- console.log(option, 8)
},
onPullDownRefresh() {
@@ -300,7 +312,7 @@
], //宸查�変腑鐨勪骇鍝佹爣绛�
order: '', //鍗曞彿
placeholder2: '鐢熶骇璁㈠崟',
- total: 10,
+ total: 0,
currentpage: 1, //绗嚑椤�
pageSize: 10, //姣忛〉鏄剧ず澶氬皯鏉�
@@ -334,11 +346,6 @@
init() {
uni.stopPullDownRefresh();
},
- // 椤垫暟鏀瑰彉鏃� 鍒嗛〉瑙﹀彂
- pageChange(e) {
- this.currentpage = e.current
- this.getProductOrderSearch(e.current)
- },
gotoPage(p1, p2) {
let orderstep = null
@@ -365,25 +372,31 @@
})
},
+ // 椤垫暟鏀瑰彉鏃� 鍒嗛〉瑙﹀彂
+ pageChange(e) {
+ this.currentpage = e.current
+ this.getProductOrderSearch(e.current)
+ },
+
// 鎺ュ彛鑾峰彇
async getProductOrderSearch(current) {
let ordertype = '' // SO锛氶攢鍞鍗� MO锛氱敓浜ц鍗� PO锛氱敓浜у伐鍗�
switch (this.radiovalue) {
case '鐢熶骇宸ュ崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ュ伐鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ュ伐鍗曚俊鎭�'
ordertype = 'PO'
break
case '鐢熶骇璁㈠崟':
// this.alertTitle = '鐢熶骇璁㈠崟鏁伴噺锛堝叡/涓級'
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ョ敓浜ц鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ョ敓浜ц鍗曚俊鎭�'
ordertype = 'MO'
break
case '閿�鍞鍗�':
// this.alertTitle = '閿�鍞鍗曟暟閲忥紙鍏�/涓級'
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
- this.placeholder = '璇疯緭鍏ラ攢鍞鍗曚俊鎭�'
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+ // this.placeholder = '璇疯緭鍏ラ攢鍞鍗曚俊鎭�'
ordertype = 'SO'
break
}
@@ -395,17 +408,21 @@
ordercode: this.order,
Ratetime: '',
// Ratetime: this.calendarRange,
+
page: current,
rows: this.pageSize,
prop: 'lm_date',
sortorder: 'desc'
+
}
const res = await ProductOrderSearch(data)
+
this.total = res.count
+
this.collapseArr = res.data
this.collapseArrAll = res.data
- this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[
- 1]
+ // this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[
+ // 1]
},
loadMore() {
@@ -414,21 +431,27 @@
//杈撳叆妗嗗洖杞︾‘璁や簨浠�
confirmInputBoxValue(val) {
- this.collapseArr = this.collapseArrAll.filter((p) => {
- return p.ordercode.indexOf(val) !== -1
- })
+ this.order = val
+ this.currentpage = 1
+ this.getProductOrderSearch(1)
+ // this.collapseArr = this.collapseArrAll.filter((p) => {
+ // return p.ordercode.indexOf(val) !== -1
+ // })
- switch (this.radiovalue) {
- case '鐢熶骇宸ュ崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- case '鐢熶骇璁㈠崟':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- case '閿�鍞鍗�':
- this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
- break
- }
+
+ // switch (this.radiovalue) {
+ // case '鐢熶骇宸ュ崟':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // case '鐢熶骇璁㈠崟':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // case '閿�鍞鍗�':
+ // this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+ // break
+ // }
+
+
// this.alertTitle = this.alertTitle.split('/')[0] + this.collapseArr.length + this.alertTitle.split('/')[
// 1]
@@ -680,7 +703,6 @@
::v-deep .u-cell__body {
padding-bottom: 40rpx;
}
-
.uni-pagination-box {
height: 4vh;
diff --git a/pages/zlgl/xjjy1.vue b/pages/zlgl/xjjy1.vue
index fd4aa61..25f6c0a 100644
--- a/pages/zlgl/xjjy1.vue
+++ b/pages/zlgl/xjjy1.vue
@@ -2,15 +2,15 @@
<view>
<page-nav title="宸℃妫�楠�"></page-nav>
- <view v-if="processArr.length===0">
+ <!-- <view v-if="processArr.length===0">
<div class="sacnBody">
<div class="scanImg" @click="topScanClick"></div>
<div class="scanText">鎵弿宸ュ簭浠诲姟鐮�</div>
</div>
- </view>
+ </view> -->
- <view v-if="processArr.length!==0" class="mainContent" style="height: 1340rpx;overflow: auto">
+ <view v-if="processArr.length!==0" class="mainContent" style="height: 72vh;overflow: auto">
<view>
<u-gap height="10" bgColor="#eff0f1"></u-gap>
<view class="head" style="height: 386rpx;overflow: auto;">
diff --git a/pages/zlgl/xjjy2.vue b/pages/zlgl/xjjy2.vue
index 5033830..beb20d3 100644
--- a/pages/zlgl/xjjy2.vue
+++ b/pages/zlgl/xjjy2.vue
@@ -3,7 +3,7 @@
<page-nav title="宸℃妫�楠�"></page-nav>
- <view class="mainContent">
+ <view class="mainContent" style="height: 72vh;overflow: auto">
<view>
<u-gap height="10" bgColor="#eff0f1"></u-gap>
<view class="head">
--
Gitblit v1.9.3