From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
minipro_standard/pages_adjust/components/Warehouse.vue | 141 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 107 insertions(+), 34 deletions(-)
diff --git a/minipro_standard/pages_adjust/components/Warehouse.vue b/minipro_standard/pages_adjust/components/Warehouse.vue
index 9911c53..031cea2 100644
--- a/minipro_standard/pages_adjust/components/Warehouse.vue
+++ b/minipro_standard/pages_adjust/components/Warehouse.vue
@@ -1,64 +1,134 @@
<template>
+<<<<<<< HEAD
<u-popup :show="show" mode="bottom" :closeable="true" :round="10" @open="open" @close="close">
<view class="title">
<text>閫夋嫨浠撳簱</text>
</view>
<view class="content">
<view class="content_search">
- <u-search :showAction="false" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" v-model="keyword"></u-search>
+ <u-search :showAction="false" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" v-model="form.name" @search="searchInput"></u-search>
</view>
- <div class="content_total">鍏眥{total}}鏉℃暟鎹�</div>
- <view class="content_list">
- <u-list @scrolltolower="scrolltolower">
- <u-list-item v-for="(item, index) in indexList" :key="index">
- <div class="content_list_item" @click="getVal(item)">
+ <div class="content_total">鍏眥{form.total}}鏉℃暟鎹�</div>
+ <scroll-view
+ class="content_list"
+ @scrolltolower="getList"
+ scroll-y>
+ <!-- <u-list @scrolltolower="scrolltolower"> -->
+ <!-- <u-list-item > -->
+ <div class="content_list_item"v-for="(item, index) in list" :key="index" @click="getVal(item)">
<div class="content_list_item_name">
- <span style="color: #03AF76;">[DTFHNE]</span>
- <!-- <span style="color: #03AF76;" v-if="item.tmodel.label == 'APPLIANCE_ONTEST'">[{{ item.tmodel.code }}]</span>
+ <span style="color: #03AF76;" v-if="item.tmodel.label == 'APPLIANCE_ONTEST'">[{{ item.tmodel.code }}]</span>
<span style="color: #305ED5;" v-if="item.tmodel.label == 'APPLIANCE_MIX'">[{{ item.tmodel.code }}]</span>
- <span style="color: #F5A400;" v-if="item.tmodel.label == 'APPLIANCE_OFFTEST'">[{{ item.tmodel.code }}]</span> -->
- <!-- <span style="color: red;" v-if="item.tmodel.label == 'APPLIANCE_USELESS'">[{{ item.tmodel.code }}]</span> -->
+ <span style="color: #F5A400;" v-if="item.tmodel.label == 'APPLIANCE_OFFTEST'">[{{ item.tmodel.code }}]</span>
+ <span style="color: red;" v-if="item.tmodel.label == 'APPLIANCE_USELESS'">[{{ item.tmodel.code }}]</span>
<span>{{item.name}}</span>
</div>
</div>
- </u-list-item>
- </u-list>
- </view>
+ <!-- </u-list-item>
+ </u-list> -->
+ </scroll-view>
</view>
+=======
+ <u-popup :show="show" mode="bottom" :closeable="true" :round="10" @close="close">
+ <view class="title">
+ <text>閫夋嫨浠撳簱</text>
+ </view>
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
</u-popup>
</template>
<script>
+<<<<<<< HEAD
+ import { warehouseList } from '@/util/api/WorkOrderAPI'
+
export default {
+ props: {
+ show: Boolean,
+ systemDicDataId: {
+ type: String,
+ default: ''
+ }
+ },
+ data() {
+ return {
+ form: {
+ capacity: 50,
+ page: 0,
+ total: 0,
+ name: '',
+ },
+ list: [],
+ loading: false,
+ finished: false,
+ refreshing: false
+ };
+ },
+ methods: {
+ searchInput() {
+ this.form.page = 0
+ this.finished = false
+ this.list = []
+ this.getList()
+ },
+ getVal(item) {
+ this.$emit('value', item)
+ },
+ open() {
+ this.form.page = 0
+ this.finished = false
+ this.list = []
+ this.getList()
+ },
+ scrolltolower() {
+ this.getList()
+ },
+ getList() {
+ if (!this.finished) {
+ this.loading = true;
+ this.form.page = this.form.page += 1
+ warehouseList({
+ capacity: this.form.capacity,
+ page: this.form.page,
+ model: {
+ systemDicDataId: this.systemDicDataId,
+ name: this.form.name,
+ status: 1
+ }
+ }).then(res => {
+ if (this.refreshing) {
+ this.list = []
+ this.refreshing = false;
+ }
+ this.loading = false;
+ if (res.code === 200 && res.data.records && res.data.records.length !== 0) {
+ this.form.total = res.data.total
+ this.list.push(...res.data.records)
+ } else {
+ this.finished = true;
+ }
+ }).catch(err => {
+ this.loading = false;
+ this.finished = true;
+ if (this.refreshing) {
+ this.list = []
+ this.refreshing = false;
+ }
+ })
+ }
+ },
+=======
+ export default {
+ name:"Warehouse",
props: {
show: Boolean
},
data() {
return {
- keyword: '',
- total: 0,
- indexList: []
+
};
},
methods: {
- getVal(item) {
- this.$emit('value', item)
- },
- open() {
- this.indexList = []
- this.loadmore()
- },
- scrolltolower() {
- this.loadmore()
- },
- loadmore() {
- for (let i = 0; i < 20; i++) {
- this.indexList.push({
- id: i,
- name: `浠撳簱${i}`
- })
- }
- },
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
close() {
this.$emit('close')
}
@@ -79,6 +149,7 @@
color: #222222;
}
}
+<<<<<<< HEAD
.content {
width: 100%;
.content_search {
@@ -133,4 +204,6 @@
}
}
}
+=======
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
</style>
\ No newline at end of file
--
Gitblit v1.9.3