From da65440626a5c429c202aa2d8b28db392a4d60b0 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期一, 27 六月 2022 09:51:42 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 29 ++++++++------
pages/login/login.vue | 3 +
pages/basics/matQuery.vue | 21 +++++-----
main.js | 2
pages/index/index.vue | 60 +++++++++++++++---------------
5 files changed, 60 insertions(+), 55 deletions(-)
diff --git a/main.js b/main.js
index d80c672..80e79eb 100644
--- a/main.js
+++ b/main.js
@@ -5,7 +5,7 @@
// Vue.prototype.baseUrl = "http://localhost:8081/acs"
Vue.prototype.baseHttp = 'http://'
Vue.prototype.basePort = '8080'
-Vue.prototype.baseUrl = '/lywms'
+Vue.prototype.baseUrl = '/jldqwms'
Vue.config.productionTip = false
App.mpType = 'app'
const app = new Vue({
diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index 991cd95..15868cf 100644
--- a/pages/basics/matQuery.vue
+++ b/pages/basics/matQuery.vue
@@ -4,25 +4,25 @@
<view class="container">
<view class="text-box">
<view class="text-title"><text>鍟嗗搧缂栫爜</text></view>
- <view class="text-title"><text>{{matData.matnr}}</text></view>
+ <view class="text-title"><text>{{matData.matNo}}</text></view>
</view>
<view class="text-box">
<view class="text-title"><text>鍟嗗搧鍚嶇О</text></view>
- <view class="text-title">{{matData.maktx}}</view>
+ <view class="text-title">{{matData.matName}}</view>
</view>
<view class="text-box">
<view class="text-title"><text>瑙勬牸</text></view>
- <view class="text-title">{{matData.specs}}</view>
+ <view class="text-title">{{matData.str2}}</view>
</view>
<view class="text-box">
- <view class="text-title"><text>搴忓垪鍙�</text></view>
- <view class="text-title"><input type="text" v-model="matData.batch"></view>
+ <view class="text-title"><text>鍗曚綅</text></view>
+ <view class="text-title"><input type="text" v-model="matData.str1"></view>
</view>
<view class="text-box">
<view class="text-title"><text>鏁伴噺</text></view>
<view class="text-title">
<view>
- <uni-number-box v-model="matData.anfme" :max="9999" color="#747474" @change="changeValue"/>
+ <uni-number-box v-model="matData.count" :max="9999" color="#747474" @change="changeValue"/>
</view>
</view>
</view>
@@ -41,9 +41,9 @@
data() {
return {
matData: {
- matnr: null,
- maktx: null,
- batch: null,
+ matNo: null,
+ matName: null,
+ str2: null,
anfme: null,
},
baseIP:'',
@@ -62,11 +62,12 @@
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('matData', function(data) {
that.matData = data.data
+ console.log(that.matData)
})
},
onShow() {
- this.matData.anfme = 0
+ this.matData.count = 0
},
methods: {
blur() {
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 06f3bb5..b7ab2c2 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -52,11 +52,11 @@
<!-- <view>
<checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
</view> -->
- <view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
- <view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
- <view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+ <view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matNo}}</text></view>
+ <view><text style="width: 400rpx;">鍝佸悕锛歿{item.matName}}</text></view>
+ <view><text style="width: 400rpx;">瑙勬牸锛歿{item.str2}}</text></view>
<view>
- <text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+ <text style="width: 400rpx;">鏁伴噺锛歿{item.count}}</text>
</view>
</view>
<view class="data-list-right">
@@ -204,13 +204,14 @@
this.focus = true;
});
},
- remove() {
- // this.matList.splice(index,1)
- for (var i = 0; i < this.matList.length; i++) {
- if (this.matList[i].checked == true) {
- this.matList.splice(i,1)
- }
- }
+ remove(item,index) {
+ this.matList.splice(index,1)
+
+ // for (var i = 0; i < this.matList.length; i++) {
+ // if (this.matList[i].checked == true) {
+ // this.matList.splice(i,1)
+ // }
+ // }
this.checkList();
uni.vibrateShort();
},
@@ -237,6 +238,7 @@
'token':uni.getStorageSync('token')
},
success(result) {
+ console.log(result)
uni.hideLoading();
var res = result.data
if (res.code === 200) {
@@ -282,14 +284,15 @@
findMat() {
let that = this
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/auth',
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/matCode/auth',
data: {
- matnr:that.matnr
+ id:that.matnr
},
header: {
'token':uni.getStorageSync('token')
},
success(result) {
+ console.log(result)
uni.vibrateShort();
let res = result.data
if (res.code === 200 && res.data) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b9860c7..d8f5b22 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -30,36 +30,36 @@
color: 'blue',
cuIcon: 'copy'
},
- {
- title: '璁㈠崟缁勬墭',
- name: 'order',
- color: 'blue',
- cuIcon: 'goods'
- },
- {
- title: '搴撳瓨鏌ヨ',
- name: 'stockQuery',
- color: 'blue',
- cuIcon: 'searchlist'
- },
- {
- title: '鍗曟嵁鍑哄簱',
- name: 'orderOut',
- color: 'blue',
- cuIcon: 'video'
- },
- {
- title: '搴撲綅鍑哄簱',
- name: 'stoOut',
- color: 'blue',
- cuIcon: 'video'
- },
- {
- title: '搴撳瓨鐩樼偣',
- name: 'stockCheck',
- color: 'blue',
- cuIcon: 'safe'
- },
+ // {
+ // title: '璁㈠崟缁勬墭',
+ // name: 'order',
+ // color: 'blue',
+ // cuIcon: 'goods'
+ // },
+ // {
+ // title: '搴撳瓨鏌ヨ',
+ // name: 'stockQuery',
+ // color: 'blue',
+ // cuIcon: 'searchlist'
+ // },
+ // {
+ // title: '鍗曟嵁鍑哄簱',
+ // name: 'orderOut',
+ // color: 'blue',
+ // cuIcon: 'video'
+ // },
+ // {
+ // title: '搴撲綅鍑哄簱',
+ // name: 'stoOut',
+ // color: 'blue',
+ // cuIcon: 'video'
+ // },
+ // {
+ // title: '搴撳瓨鐩樼偣',
+ // name: 'stockCheck',
+ // color: 'blue',
+ // cuIcon: 'safe'
+ // },
{
title: '閫�鍑虹櫥褰�',
name: 'logOut',
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 8f7c1c7..b760a68 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -225,13 +225,14 @@
uni.request({
url: this.baseHttp + this.baseIP + ':' +this.basePORT + this.baseUrl + '/login.action',
data: {
- username:this.userName,
+ mobile:this.userName,
password:md5.hex_md5(this.password)
},
header: {
"content-type": "application/json"
},
success: (result) => {
+ console.log(result)
let res = result.data;
uni.hideLoading();
if (res.code == 200) {
--
Gitblit v1.9.1