From 9242d0da6005e070b0197a26b12ba24d1361466d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 9月 2024 14:21:35 +0800
Subject: [PATCH] 修复
---
yiqi_pda/config/modules/ajax.js | 4 ++--
yiqi_pda/manifest.json | 2 +-
yiqi_pda/pages/outBoundWorkPieceInfoCount/index.vue | 20 ++++++++++++--------
yiqi_pda/api/outBound/index.js | 10 ++++++++++
yiqi_pda/config/index.js | 3 ++-
yiqi_pda/api/api.js | 4 ++--
yiqi_pda/pages.json | 3 +++
7 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/yiqi_pda/api/api.js b/yiqi_pda/api/api.js
index bd42100..d246566 100644
--- a/yiqi_pda/api/api.js
+++ b/yiqi_pda/api/api.js
@@ -1,7 +1,7 @@
// 鍚屾椂鍙戦�佸紓姝ヨ姹傜殑娆℃暟锛岄槻姝竴娆＄偣鍑绘湁澶氭璇锋眰
let ajaxTime = 0;
-export const baseUrl = 'http://localhost:7788'
-//export const baseUrl = 'http://10.135.75.70:7788' //鐢熶骇鐢�
+//export const baseUrl = 'http://localhost:7788'
+export const baseUrl = 'http://10.135.75.70:7788' //鐢熶骇鐢�
//export const baseUrl = 'http://192.168.216.203:7788' //娴嬭瘯鐢�
// 鍏叡鐨剅equest鏂规硶
diff --git a/yiqi_pda/api/outBound/index.js b/yiqi_pda/api/outBound/index.js
index 3d36675..b2f96be 100644
--- a/yiqi_pda/api/outBound/index.js
+++ b/yiqi_pda/api/outBound/index.js
@@ -44,3 +44,13 @@
data
})
}
+
+
+// 鍑哄簱缁熻 /api/pdaservice/getOutBoundWorkPieceInfoCountList
+export function getOutBoundWorkPieceInfoCountList(data) {
+ return request({
+ url: `/api/pdaservice/getOutBoundWorkPieceInfoCountList`,
+ method: 'post',
+ data
+ })
+}
diff --git a/yiqi_pda/config/index.js b/yiqi_pda/config/index.js
index 69a994d..37d2d67 100644
--- a/yiqi_pda/config/index.js
+++ b/yiqi_pda/config/index.js
@@ -19,6 +19,7 @@
production:"/pages/production/index",
outBound:'/pages/outBound/index',
unLine:'/pages/unLine/index',
- outBoundNew:'/pages/outBoundNew/index'
+ outBoundNew:'/pages/outBoundNew/index',
+ outBoundWorkPieceInfoCount:'/pages/outBoundWorkPieceInfoCount/index'
}
}
\ No newline at end of file
diff --git a/yiqi_pda/config/modules/ajax.js b/yiqi_pda/config/modules/ajax.js
index 93463f7..e1134aa 100644
--- a/yiqi_pda/config/modules/ajax.js
+++ b/yiqi_pda/config/modules/ajax.js
@@ -1,9 +1,9 @@
export default {
errMsg:'缃戠粶閿欒锛�',
host:{ //鎺ュ彛璋冪敤鐨勫煙鍚嶈缃�
- //'default':'http://10.135.75.70:7788',//鐢熶骇鐢�
+ 'default':'http://10.135.75.70:7788',//鐢熶骇鐢�
//'default':'http://192.168.216.203:7788', //鐢熶骇鐜鍦板潃
- 'default':'http://localhost:7788',
+ //'default':'http://localhost:7788',
'mock':'http://localhost:3012'
},
block:{
diff --git a/yiqi_pda/manifest.json b/yiqi_pda/manifest.json
index 25defba..fc94eb5 100644
--- a/yiqi_pda/manifest.json
+++ b/yiqi_pda/manifest.json
@@ -2,7 +2,7 @@
"name" : "杩炴潌绾挎暟閲�",
"appid" : "__UNI__F24DEB0",
"description" : "涓�姹借繛鏉�",
- "versionName" : "2.0.16",
+ "versionName" : "2.0.19",
"versionCode" : 6,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/yiqi_pda/pages.json b/yiqi_pda/pages.json
index 9ae0edf..c14d3b9 100644
--- a/yiqi_pda/pages.json
+++ b/yiqi_pda/pages.json
@@ -85,6 +85,9 @@
"path": "pages/unLine/index"
},
{
+ "path": "pages/outBoundWorkPieceInfoCount/index"
+ },
+ {
"path": "pages/outBoundNew/index"
}
],
diff --git a/yiqi_pda/pages/outBoundWorkPieceInfoCount/index.vue b/yiqi_pda/pages/outBoundWorkPieceInfoCount/index.vue
index 123c400..b99ddbe 100644
--- a/yiqi_pda/pages/outBoundWorkPieceInfoCount/index.vue
+++ b/yiqi_pda/pages/outBoundWorkPieceInfoCount/index.vue
@@ -14,20 +14,21 @@
/> -->
<u-form :model="form" ref="uForm" label-width="65" labelAlign="right">
<u-form-item required label="鍑哄簱鏃ユ湡:" prop="planTime">
- <u-input :readonly="true" placeholder="璇烽�夋嫨鍑哄簱鏃ユ湡" v-model="form.planTime"
- @click.native="timeShow = true"></u-input>
- </u-form-item>
- <!-- 鏃堕棿閫夋嫨鍣� -->
- <u-datetime-picker closeOnClickOverlay :show="timeShow" @confirm="timeConfirm" :mode="mode"
- v-model="value1" @close="timeShow=false" @cancel="timeShow=false"></u-datetime-picker>
+ <u-input :readonly="true" placeholder="璇烽�夋嫨鍑哄簱鏃ユ湡" v-model="form.planTime"
+ @click.native="timeShow = true"></u-input>
+ </u-form-item>
+
</u-form>
+ <!-- 鏃堕棿閫夋嫨鍣� -->
+ <u-datetime-picker closeOnClickOverlay :show="timeShow" @confirm="timeConfirm" :mode="mode"
+ @close="timeShow=false" v-model="value1" @cancel="timeShow=false"></u-datetime-picker>
<view class="btn-view">
<view class="search-btn" @tap.stop="onSearchContainter">鎼滅储</view>
</view>
<!-- 璇︽儏 -->
<view>
<!-- 鍩虹淇℃伅 -->
- <bar-content v-for="item in list" :title="'鍑哄簱浜�:' + item.workPieceOutboundUserName" :content="item" :propArr="detailArr" :key="item.id"></bar-content>
+ <bar-content v-for="item in list" :title="'鍑哄簱浜�:' + item.workPieceOutboundUserName" :content="item" :propArr="detailArr" :key="item.workPieceOutboundUserName"></bar-content>
</view>
</view>
</view>
@@ -82,6 +83,7 @@
// this.barDetail = {special: "SAE1041(0.80%~1.10%Mn)",barType: "楂樼⒊閽�",barSpec: "70鍙�",material: "229-255HBS",status: 1};
// this.statusArr = [{code: 1,title: '涓嶅悎鏍�'},{code: 2,title: '鍚堟牸'},{code: 3,title: '鐤戜技'}]
this.detailArr = [{code: "count",title: '鍑哄簱鏁伴噺'}]
+ this.mode = 'date'
var date=new Date();
this.form.planTime = moment(date).format('YYYY-MM-DD')
this.onSearchContainter();
@@ -103,16 +105,18 @@
this.timeShow = false
},
- onSearchContainter(barId) {
+ onSearchContainter() {
if(this.form.planTime == '') {
return uni.showModal({
title:'鍑哄簱鏃ユ湡涓嶈兘涓虹┖',
showCancel: false
})
}
+ this.list = []
//debugger
const param = {Date: this.form.planTime}
getOutBoundWorkPieceInfoCountList(param).then(res => {
+ //debugger
this.list = res.data
})
},
--
Gitblit v1.9.3