From 89513a76e1ea16d602f5d12949f61e880fafb9f6 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 19 十一月 2025 15:26:18 +0800
Subject: [PATCH] 1.生产报工 查询条件 变更
---
config/api.js | 14 ++++
pages/scgl/scbg.vue | 148 ++++++++++++++++++++++++++----------------------
pages/znfx/chda.vue | 16 +---
3 files changed, 99 insertions(+), 79 deletions(-)
diff --git a/config/api.js b/config/api.js
index fc56e4a..630c698 100644
--- a/config/api.js
+++ b/config/api.js
@@ -430,4 +430,18 @@
export const AppDailyWageReportSearch = (data, config = {}) => http.get(
'/AppPersonal/DailyWageReportSearch', {
params: data
+ })
+
+
+//App宸叉淳鍙戝伐鍗曠殑鐗╂枡
+export const DistrInventory = (data, config = {}) => http.get(
+ '/AppProduct/DistrInventory', {
+ params: data
+ })
+
+
+//App鏌ョ湅鍗曟嵁鍙婂伐鑹轰俊鎭�
+export const ProductOrderSearch = (data, config = {}) => http.get(
+ '/AppProduct/ProductOrderSearch', {
+ params: data
})
\ No newline at end of file
diff --git a/pages/scgl/scbg.vue b/pages/scgl/scbg.vue
index ecb87a3..cd15dce 100644
--- a/pages/scgl/scbg.vue
+++ b/pages/scgl/scbg.vue
@@ -42,25 +42,26 @@
<!-- @change="collapseChange" -->
<u-collapse style="max-height: 590px;overflow: auto;">
<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
- <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 in collapseArr" :key="item.ordercode">
- <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)}}
@@ -73,55 +74,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>
-
+ </u-collapse-item>
+ </scroll-view>
</u-collapse>
@@ -144,6 +145,10 @@
</u-radio-group>
</view>
+ <u--input :placeholder="'璇疯緭鍏�'+placeholder2" style="border: 1rpx solid #eee;" :clearable='true'
+ v-model="order"></u--input>
+
+
<view style="margin-top: 20px;display: flex;align-items: center;">
<view class="">
@@ -156,6 +161,7 @@
</view>
+
<view style="display: flex;flex-wrap: wrap;">
<u-tag style="width:220rpx;" :text="item.name" v-for="item in tagArr" :key="item.code"
:closable="true" :show="item.close" @close="tagClose(item)"></u-tag>
@@ -163,7 +169,7 @@
- <view class="head" style="margin-top: 10px;">
+ <!-- <view class="head" style="margin-top: 10px;">
<view class="head_block" style="height: 80rpx; display: flex;justify-content: space-around;">
<u-button :plain='today' style="width: 70px;height: 25px;" @click="dateChange('today')"
type="primary" shape="circle" text="浠婃棩">
@@ -174,9 +180,9 @@
<u-button :plain='custom' style="width: 70px;height: 25px;" @click="dateChange('custom')"
type="primary" shape="circle" text="鑷畾涔�"></u-button>
</view>
- </view>
+ </view> -->
- <view v-if="!custom" class="flex_column"
+ <!-- <view v-if="!custom" class="flex_column"
style="display: flex;justify-content: space-around;width: 100%;">
<view class="" style="display: flex;justify-content: space-evenly;width: 100%;">
<view class="titleFont">寮�濮嬫棩鏈�</view>
@@ -189,7 +195,7 @@
</u-button>
</view>
- <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" />
+ <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" /> -->
</view>
</u-popup>
@@ -208,7 +214,7 @@
<script>
import {
- ProductionScheduleKanban
+ ProductOrderSearch
} from '../../config/api.js';
export default {
onLoad(option) {
@@ -288,7 +294,8 @@
// code: '1006'
// },
], //宸查�変腑鐨勪骇鍝佹爣绛�
-
+ order: '', //鍗曞彿
+ placeholder2: '鐢熶骇璁㈠崟'
}
},
@@ -297,7 +304,7 @@
let that = this
uni.startPullDownRefresh({
success() {
- that.getProductionScheduleKanban()
+ that.getProductOrderSearch()
uni.showToast({
title: "涓嬫媺鍒锋柊",
icon: 'none'
@@ -314,7 +321,7 @@
mounted() {
this.init()
- this.getProductionScheduleKanban()
+ this.getProductOrderSearch()
},
methods: {
init() {
@@ -347,7 +354,7 @@
},
// 鎺ュ彛鑾峰彇
- async getProductionScheduleKanban() {
+ async getProductOrderSearch() {
let ordertype = '' // SO锛氶攢鍞鍗� MO锛氱敓浜ц鍗� PO锛氱敓浜у伐鍗�
switch (this.radiovalue) {
case '鐢熶骇宸ュ崟':
@@ -371,12 +378,14 @@
const data = {
ordertype,
partcode: this.tagArr.map(i => i.code).join(','),
- Ratetime: this.calendarRange,
+ ordercode: this.order,
+ Ratetime: '',
+ // Ratetime: this.calendarRange,
}
const {
data: res
- } = await ProductionScheduleKanban(data)
+ } = await ProductOrderSearch(data)
this.collapseArr = res
this.collapseArrAll = res
@@ -384,7 +393,9 @@
1]
},
+ loadMore() {
+ },
//杈撳叆妗嗗洖杞︾‘璁や簨浠�
confirmInputBoxValue(val) {
@@ -476,7 +487,7 @@
// 寮瑰嚭灞傛敹璧�
popupClose() {
- this.getProductionScheduleKanban()
+ this.getProductOrderSearch()
this.popupShow = false
},
@@ -561,6 +572,7 @@
// 鍗曢�夋寜閽垏鎹�
groupChange(val) {
console.log(val)
+ this.placeholder2 = val
},
diff --git a/pages/znfx/chda.vue b/pages/znfx/chda.vue
index 5af2f7a..78e0365 100644
--- a/pages/znfx/chda.vue
+++ b/pages/znfx/chda.vue
@@ -45,17 +45,11 @@
<script>
import {
- InventoryTreePermissions
+ DistrInventory
} from '../../config/api.js';
export default {
onLoad(option) {
- App.watch(this.getTopRightMessageCountIsChange, 'topRightMessageCountIsChange')
-
- console.log(option, 66)
-
this.checkboxValue = JSON.parse(option.param)
-
- console.log(this.checkboxValue)
},
onPullDownRefresh() {
@@ -84,7 +78,7 @@
mounted() {
this.init()
- this.getInventoryTreePermissions()
+ this.getDistrInventory()
},
methods: {
init() {
@@ -94,18 +88,18 @@
//杈撳叆妗嗗洖杞︾‘璁や簨浠�
confirmInputBoxValue(val) {
console.log('纭', val)
- // this.getInventoryTreePermissions(val)
+ // this.getDistrInventory(val)
this.collapseArr = this.collapseArrAll.filter((p) => {
return p.code.indexOf(val) !== -1
})
},
- async getInventoryTreePermissions(param) {
+ async getDistrInventory(param) {
const {
data: res
- } = await InventoryTreePermissions()
+ } = await DistrInventory()
this.collapseArrAll = res
this.collapseArr = res
--
Gitblit v1.9.3