From e9db6c25fbf11b214abf5561f592eeb86a2e61be Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 03 十一月 2023 23:57:53 +0800
Subject: [PATCH] #
---
pages/api/addMat.js | 1
pages/project/project.json | 12 +++---
pages/LoginDemo/LoginDemo.vue | 4 +-
pages/project/pakin/pakin.vue | 47 ++++++++++++++++-------
components/z-data-list/z-data-list.vue | 13 +++++-
5 files changed, 52 insertions(+), 25 deletions(-)
diff --git a/components/z-data-list/z-data-list.vue b/components/z-data-list/z-data-list.vue
index 2f91166..7fba8cc 100644
--- a/components/z-data-list/z-data-list.vue
+++ b/components/z-data-list/z-data-list.vue
@@ -2,11 +2,12 @@
<view >
<view class="main">
<view class="main-left" >
- <view class="main-list" v-for="it in list" style="width: 100%;">
+ <view class="main-list" v-for="it in lable" style="width: 100%;">
<view class="left-key">{{it.label}}</view>
<view>:</view>
<view class="left-val">
- <text :class="it.valText">{{it.value}}</text>
+ <text :class="it.valText">{{fields[it.attribute]}}</text>
+ <text :class="it.valText" v-show="!fields[it.attribute]">--</text>
</view>
</view>
</view>
@@ -54,12 +55,18 @@
// this.dataList = this.list.detl
},
props: {
- list: {
+ lable: {
type: Array,
default() {
return {}
}
},
+ fields: {
+ type: Object,
+ default() {
+ return {}
+ }
+ },
keyName: {
type: Object,
default() {
diff --git a/pages/LoginDemo/LoginDemo.vue b/pages/LoginDemo/LoginDemo.vue
index 95eaf34..e399630 100644
--- a/pages/LoginDemo/LoginDemo.vue
+++ b/pages/LoginDemo/LoginDemo.vue
@@ -71,8 +71,8 @@
version: '',
remberPassword: true,
user: {
- username: '1',
- password: '2'
+ username: '',
+ password: ''
},
network: [{
name: 'wms',
diff --git a/pages/api/addMat.js b/pages/api/addMat.js
index fc0a80e..a4e0b4d 100644
--- a/pages/api/addMat.js
+++ b/pages/api/addMat.js
@@ -8,6 +8,7 @@
data: {matnr: matnr},
}).then((result)=> {
let mat = result.data.data
+ console.log(mat);
item['detl'] = [
{key: '鍟嗗搧鐮�',value: mat.matnr},
{key: '鍟嗗搧鍚嶇О',value: mat.maktx},
diff --git a/pages/project/pakin/pakin.vue b/pages/project/pakin/pakin.vue
index 042f428..b72d760 100644
--- a/pages/project/pakin/pakin.vue
+++ b/pages/project/pakin/pakin.vue
@@ -21,10 +21,16 @@
<z-data-list class="data-list"
v-for="(it,i) in zDataList"
:key="i"
- :list="list"
+ :lable="lable"
+ :fields="it"
:index="i+1"
@goDetail='goDetail(it.detl,i)'
></z-data-list>
+
+
+
+
+
<!-- 鍨珮 -->
<view style="height: 100rpx;"></view>
@@ -44,19 +50,10 @@
data() {
return {
zDataList: [
- {
- detl: [
- {key: '鍟嗗搧鐮�',value: 'LSH90152025',valText: 'val-text'},
- {key: '鍟嗗搧鍚嶇О',value: '灏奸緳澶达紙鐏扮櫧锛�5.2x25'},
- {key: '瑙勬牸',value: '700*699*80'},
- {key: '鎵瑰彿',value: '20231007204944',type: 'input'},
- {key: '鏁伴噺',value: 951326478,type: 'number-box',valText: 'val-num'},
- ]
- },
+ {matnr: 'A1001',maktx: '1鍙风墿鏂�',count: 99},
+ {matnr: 'A1002',maktx: '2鍙风墿鏂�',count: 77},
+ {matnr: 'A1002',maktx: '2鍙风墿鏂�',count: 77}
],
- // list: [
- // {}
- // ]
}
},
onShow() {
@@ -64,7 +61,7 @@
},
computed: mapState({
input: state => state.project.menu[0].page.input,
- list: state => state.project.menu[0].page.list
+ lable: state => state.project.menu[0].page.lable
}),
methods: {
input2(arr) {
@@ -76,6 +73,28 @@
let mat = await addMat.addMat(matnr)
this.zDataList.push(mat)
},
+ goDetail(param,index) {
+ let _this = this
+ uni.navigateTo({
+ url: '/pages/common/data-list/dataDetail',
+ // 浼�
+ success: function(data) {
+ data.eventChannel.emit('param', {
+ param: param,
+ index: index
+ })
+ },
+ // 鎺�
+ events: {
+ dataList: function(data) {
+ console.log(data);
+ },
+ del: function(data) {
+ _this.zDataList.splice(data.data,1)
+ }
+ },
+ })
+ }
}
}
</script>
diff --git a/pages/project/project.json b/pages/project/project.json
index 5625321..3ace745 100644
--- a/pages/project/project.json
+++ b/pages/project/project.json
@@ -15,12 +15,12 @@
{"id":1,"name": "barcode","title": "鎵樼洏鐮�","val": "2","lenCheck": 8,"focus": true},
{"id":2,"name": "matnr","title": "鐗╂枡鐮�","val": "2","btn": true,"btnName": "鎻愬彇","focus": true}
],
- "list": [
- {"label": "鍟嗗搧鐮�","value": "fbr3242","valText": "val-text"},
- {"label": "鍟嗗搧鍚嶇О","value": "fbr3242"},
- {"label": "瑙勬牸","value": "fbr3242"},
- {"label": "鎵瑰彿","value": "fbr3242"},
- {"label": "鏁伴噺","value": 9999,"type": "number-box","valText": "val-num"}
+ "lable": [
+ {"label": "鍟嗗搧鐮�","attribute":"matnr","value": "fbr3242","valText": "val-text"},
+ {"label": "鍟嗗搧鍚嶇О","attribute":"maktx","value": "fbr3242"},
+ {"label": "瑙勬牸","attribute":"specs","value": "fbr3242"},
+ {"label": "鎵瑰彿","attribute":"batch","value": "fbr3242"},
+ {"label": "鏁伴噺","attribute":"count","value": 9999,"type": "number-box","valText": "val-num"}
]
}
--
Gitblit v1.9.1