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 | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 168 insertions(+), 0 deletions(-)
diff --git a/minipro_standard/pages_adjust/components/Warehouse.vue b/minipro_standard/pages_adjust/components/Warehouse.vue
index 54504a8..031cea2 100644
--- a/minipro_standard/pages_adjust/components/Warehouse.vue
+++ b/minipro_standard/pages_adjust/components/Warehouse.vue
@@ -1,12 +1,122 @@
<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="form.name" @search="searchInput"></u-search>
+ </view>
+ <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;" 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>{{item.name}}</span>
+ </div>
+ </div>
+ <!-- </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: {
@@ -18,6 +128,7 @@
};
},
methods: {
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
close() {
this.$emit('close')
}
@@ -38,4 +149,61 @@
color: #222222;
}
}
+<<<<<<< HEAD
+ .content {
+ width: 100%;
+ .content_search {
+ width: 100%;
+ padding: 0 30rpx 30rpx 30rpx;
+ background: white;
+ position: sticky;
+ top: 85rpx;
+ z-index: 9;
+ box-sizing: border-box;
+ }
+ .content_total {
+ padding: 24rpx 30rpx;
+ background: #F7F7F7;
+ font-size: 24rpx;
+ font-weight: 400;
+ color: #666666;
+ }
+ .content_list {
+ width: 100%;
+ height: 800rpx;
+ display: flex;
+ flex-direction: column;
+ .content_list_item {
+ padding: 30rpx;
+ display: flex;
+ border-bottom: 1rpx solid #ececec;
+ .serious {
+ color: $nav-stateColor4 !important;
+ }
+ .success {
+ color: $nav-stateColor2 !important;
+ }
+ .warning {
+ color: $nav-stateColor5 !important;
+ }
+ .content_list_item_status {
+ font-size: 28rpx;
+ margin-right: 10rpx;
+ }
+ .content_list_item_name {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ span {
+ font-size: 30rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #222222;
+ }
+ }
+ }
+ }
+ }
+=======
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
</style>
\ No newline at end of file
--
Gitblit v1.9.3