From 8c03902a415256e14c9039dcfc6e49982a709ee8 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 13 九月 2023 17:07:31 +0800
Subject: [PATCH] 小程序
---
h5_standard/.env.development | 2
web_standard/src/views/ext/wInboundExt.vue | 2
minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue | 1
minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue | 1
minipro_standard/pages/index/index.vue | 33 +++++++++++++---
minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue | 24 +++++-------
web_standard/src/components/common/ShowImage.vue | 2 +
minipro_standard/components/SelectTraMultipleMaterial.vue | 2
minipro_standard/pages_inspect/pages/InOperation/InOperation.vue | 16 +++----
web_standard/src/components/ext/OperaDeviceCheckDetailWindow.vue | 1
web_standard/.env.development | 2
11 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/h5_standard/.env.development b/h5_standard/.env.development
index 9b3cdbe..f16c4b1 100644
--- a/h5_standard/.env.development
+++ b/h5_standard/.env.development
@@ -20,7 +20,7 @@
# VUE_APP_API = 'http://192.168.0.13:10012/'
-VUE_APP_API = 'http://192.168.0.15:10021/'
+# VUE_APP_API = 'http://192.168.0.15:10021/'
# 鍒樼纾�
# VUE_APP_API = 'http://192.168.0.18:10012/'
\ No newline at end of file
diff --git a/minipro_standard/components/SelectTraMultipleMaterial.vue b/minipro_standard/components/SelectTraMultipleMaterial.vue
index 5446bdd..81606f5 100644
--- a/minipro_standard/components/SelectTraMultipleMaterial.vue
+++ b/minipro_standard/components/SelectTraMultipleMaterial.vue
@@ -249,7 +249,7 @@
.bottom {
height: 98rpx;
-
+ // bottom: calc(env(safe-area-inset-bottom) + 20rpx);
.submit {
width: 272rpx;
height: 98rpx;
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index f8df598..8e9afcd 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -9,8 +9,25 @@
:style="{background: '#fff', zIndex: '999', paddingTop: `${statusbarHeight}px`, height: `${navHeight}px`, lineHeight:`${navHeight}px`, textAlign: 'center'}">
寰呭姙</view>
<div class="content_search">
- <v-Search @searchInput="searchInput" @submit="search" @reset="reset" :isShow="true"
+ <v-Search @searchInput="searchInput" @submit="confirm" @reset="resetType" :isShow="true"
placeholder="鎼滅储鍏抽敭瀛�">
+ <template v-slot:content>
+ <view class="rp contanir">
+ <view class="c2 b">绫诲瀷</view>
+ <view class="content">
+ <u-grid col="2" :border="false">
+ <u-grid-item v-for="item in types" :key="item.id">
+ <view class="ptb20 f26 c9 type-style tc rd10" :class="type===item.id?'sbtn_green':'sbtn_gray'"
+ @click="type=item.id">{{ item.name }}</view>
+ </u-grid-item>
+ </u-grid>
+ </view>
+ <!-- <view class="flex ap tc bottom-view">
+ <view class="fx1 ptb20 sbtn_gray c9" @click="resetType">閲嶇疆</view>
+ <view class="fx1 ml20 ptb20 sbtn_green" @click="confirm">纭畾</view>
+ </view> -->
+ </view>
+ </template>
</v-Search>
<div class="content_search_x"></div>
<LabelSelection :TagList="tagList" :isShow="true" @change="clickTag"></LabelSelection>
@@ -166,7 +183,6 @@
.in(this)
.select('.content_search')
.boundingClientRect((rect) => {
- console.log('-----',rect);
that.height = `calc(100vh - ${rect.height + 80}px)`
that.top = `${rect.height}px`
})
@@ -186,7 +202,6 @@
searchInput(val) {
this.searchForm.mixParam = val;
this.search();
- this.getPageCount()
},
getPageCount() {
pageCount({mixParam: this.searchForm.mixParam})
@@ -220,8 +235,10 @@
refresh() {
if (this.triggered) return
this.triggered = true;
- this.page.page = 1
- this.loadData()
+ this.search()
+ // this.page.page = 1
+ // this.loadData()
+ // this.getPageCount()
},
loadMore() {
this.page.page += 1
@@ -233,6 +250,7 @@
this.search()
},
jump(item) {
+ console.log(item.type);
switch(item.type) {
case 0: case 2: case 5: {
if (item.status === 0) {
@@ -240,6 +258,7 @@
url: `/pages_inspect/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7`
})
} else {
+ debugger
uni.navigateTo({
url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${item.objId}&status=${item.status}&type=${item.type}&dbid=${item.id}`
})
@@ -388,7 +407,8 @@
resetType() {
this.type = ''
this.searchForm.type = ''
- this.confirm()
+ this.confirm()
+
},
confirm() {
this.searchForm.type = this.type
@@ -398,6 +418,7 @@
search() {
this.page.page = 1
this.loadData()
+ this.getPageCount()
}
}
}
diff --git a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
index cf66e4c..6b97610 100644
--- a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
+++ b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
@@ -256,6 +256,7 @@
};
},
onLoad(option) {
+ debugger
this.id = option.id
wTransferExtDetail(option.id)
.then(res => {
diff --git a/minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue b/minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue
index d184e6e..9680dd1 100644
--- a/minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue
+++ b/minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue
@@ -158,6 +158,7 @@
};
},
onLoad(option) {
+ debugger
this.id = option.id
getBoundDetail({
id: option.id
diff --git a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue b/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
index 9a1d5b8..d5a3456 100644
--- a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
+++ b/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
@@ -6,7 +6,7 @@
<uni-collapse-item v-if="type==7" v-for="(item1, index) in wtransferWarehouseList" :key="index"
:open="item1.wtransferDetailList.length">
<view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
- <image src="../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
+ <image src="../../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
<view>{{ item1.warehouseName }}</view>
</view>
<view class="p30">
@@ -16,7 +16,7 @@
<span>寰呭叆搴撶墿鏂�</span>
</div>
</div>
- <div class="page_content" v-for="(item, index) in item1.wtransferDetailList" :key="index"
+ <div class="page_content" v-for="(item, index) in item1.wtransferDetailList" v-if="item.outActnum" :key="index"
:name="index">
<div class="page_content_title">
<div class="page_content_title_top">
@@ -59,7 +59,7 @@
</div>
<div class="right" v-if="isZKD" @click="openxz">
- <image src="../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image><span>鎵嬪姩鍏ュ簱</span>
+ <image src="../../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image><span>鎵嬪姩鍏ュ簱</span>
<!-- <img src="@/assets/icon/gongdan_ic_shoudong@2x.png" alt=""> -->
</div>
</div>
@@ -68,7 +68,6 @@
<div class="page_yxwl_list">
<div class="page_yxwl_list_item" v-for="(item, index) in woScanMaterialBeanList" :key="index">
<div class="page_yxwl_list_item_top">
- <!-- <div class="page_yxwl_list_item_top_left" v-if="item.batch">{{item.materialName}} | {{item.materialCode}}锝渰{item.batch}}</div>-->
<div class="page_yxwl_list_item_top_left">{{item.materialName}} | {{item.materialCode}}
</div>
</div>
@@ -99,7 +98,7 @@
<div class="label">宸ヨ{{item1.scanCode}}锛�</div>
<div class="nr">{{item1.num}}{{item1.unitName}}</div>
<div class="dele" @click="dele(item1)">
- <image src="../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
+ <image src="../../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
</div>
</div>
</div>
@@ -112,7 +111,6 @@
<div class="page_yxwl_list">
<div class="page_yxwl_list_item" v-for="(item1, idx) in seleMateriaList" :key="idx">
<div class="page_yxwl_list_item_top">
- <!-- <div class="page_yxwl_list_item_top_left" v-if="item1.batch">{{item1.materialName}} | {{item1.materialCode}}锝渰{item1.batch}}</div>-->
<div class="page_yxwl_list_item_top_left">{{item1.materialName}} | {{item1.materialCode}}
</div>
</div>
@@ -141,7 +139,7 @@
</div>
<!-- @click="dele()" -->
<div class="dele" @click="dele(idx)">
- <image src="../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
+ <image src="../../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
</div>
</div>
</div>
@@ -402,9 +400,9 @@
return
}
uni.redirectTo({
- url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.id}`
+ url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${this.id}`
+ // pages_adjust/pages/warehousingDetails/warehousingDetails
})
-
// setTimeout(() => {
// if (route.query.Type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
// router.push({
diff --git a/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue b/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
index d18c961..cefe4b7 100644
--- a/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
+++ b/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
@@ -4,7 +4,7 @@
<uni-collapse @change="change" @close="close" @open="open">
<uni-collapse-item :open="item1.wtransferDetailList.length" v-if="type==7" v-for="(item1, index) in warehouseList" :key="index">
<view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
- <image src="../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
+ <image src="../../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
<view>{{ item1.warehouseName }}</view>
</view>
<view class="p30">
@@ -33,7 +33,7 @@
<span>{{item.batch ? item.batch : '-'}}</span>
</div>
</div>
- <div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" :key="idxs">
+ <div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" v-if="childer.batch == item.batch" :key="idxs">
<div class="page_content_list_item">
<div class="page_content_list_item_label">鍑哄簱璐т綅锛�</div>
<div class="page_content_list_item_nr">{{ childer.locationName }}</div>
@@ -52,7 +52,7 @@
</uni-collapse-item>
<uni-collapse-item v-if="type==8">
<view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
- <image src="../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
+ <image src="../../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
<view>{{ info.warehouseName }}</view>
</view>
<view class="p30">
@@ -80,9 +80,9 @@
<span>{{item.batch ? item.batch : '-'}}</span>
</div>
</div>
- <div class="page_content_list" v-for="(items, ind) in item.wstockExtListVOList" :key="ind">
+ <div class="page_content_list" v-for="(items, ind) in item.wstockExtListVOList" v-if="items.batch == item.batch" :key="ind">
<div class="page_content_list_item">
- <div class="page_content_list_item_label">鎵规鍙凤細</div>
+ <div class="page_content_list_item_label">鎵规鍙�1锛�</div>
<div class="page_content_list_item_nr">{{ items.batch ? items.batch : '-' }}</div>
</div>
<div class="page_content_list_items">
@@ -108,7 +108,7 @@
</div>
<div class="right" v-if="isZKD" @click="openxz">
- <image src="../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image><span>鎵嬪姩鍑哄簱</span>
+ <image src="../../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image><span>鎵嬪姩鍑哄簱</span>
</div>
</div>
<div class="page_yxwl_list" v-if="outboundList.length > 0">
@@ -143,7 +143,7 @@
</div>
<div class="dele" @click="dele(index)">
<!-- <img src="@/assets/icon/chuku_ic_delete@2x.png" alt="" /> -->
- <image src="../../static/chuku_ic_delete@2x.png" class="img24" mode=""></image>
+ <image src="../../../static/chuku_ic_delete@2x.png" class="img24" mode=""></image>
</div>
</div>
</div>
@@ -280,13 +280,13 @@
hw.batch) {
let isExist = false
this.outboundList.forEach(selected => {
- if (selected.newId == materail.id) {
+ if (selected.newId == item.id) {
isExist = true
return
}
})
if (isExist) {
- uni.$u.toast('璇ョ墿鏂欐壒娆″凡瀛樺湪')
+ uni.$u.toast('璇ョ墿鏂欏凡瀛樺湪')
return
}
let obj = JSON.parse(JSON.stringify(materail))
@@ -313,7 +313,6 @@
return a;
}, {});
let tempList = this.warehouseList[0].wtransferDetailList
-
for (let i = 0; i < tempList.length; i++) {
let item = tempList[i]
for (let a in result) {
@@ -354,11 +353,8 @@
this.$store.dispatch('getUpcomingNum')
uni.$u.toast('鎿嶄綔鎴愬姛')
uni.redirectTo({
- url: `/pages/warehousingDetails/warehousingDetails?id=${this.id}&dbid=${this.dbid}`
+ url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${this.id}&dbid=${this.dbid}`
})
- // uni.redirectTo({
- // url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}&dbid=${this.dbid}`
- // })
// setTimeout(() => {
// router.replace({ name: 'wTransferDetail', query: { id: info.value.wtransfer.id, dbid: route.query.dbid } })
// }, 2000)
diff --git a/web_standard/.env.development b/web_standard/.env.development
index 9b93c1d..0689558 100644
--- a/web_standard/.env.development
+++ b/web_standard/.env.development
@@ -24,5 +24,5 @@
# VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
# 娴嬭瘯鏈嶅姟鍣�
-# VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
+VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
diff --git a/web_standard/src/components/common/ShowImage.vue b/web_standard/src/components/common/ShowImage.vue
index 16bd180..e1db855 100644
--- a/web_standard/src/components/common/ShowImage.vue
+++ b/web_standard/src/components/common/ShowImage.vue
@@ -12,6 +12,7 @@
@change="onSlideChange"
>
<el-carousel-item v-for="(item, i) in multiFilesList" :key="i">
+ {{ resourcePath + item.fileurl }}
<img v-if="item.type === 0" :src="resourcePath + item.fileurl" alt="" />
<video ref="video" v-else-if="item.type === 1" :src="resourcePath + item.fileurl" controls="controls"></video>
</el-carousel-item>
@@ -47,6 +48,7 @@
this.multiFilesList = multiFilesList
this.temp = multiFilesList[index]
this.resourcePath = resourcePath
+ console.log(this.resourcePath);
this.index = index
},
cancel () {
diff --git a/web_standard/src/components/ext/OperaDeviceCheckDetailWindow.vue b/web_standard/src/components/ext/OperaDeviceCheckDetailWindow.vue
index d345e9a..cdb84d6 100644
--- a/web_standard/src/components/ext/OperaDeviceCheckDetailWindow.vue
+++ b/web_standard/src/components/ext/OperaDeviceCheckDetailWindow.vue
@@ -23,6 +23,7 @@
<el-form-item label="妫�楠岀収鐗�/瑙嗛" style="display:flex" prop="remark">
<div class="image-style">
<div class="image-item-style" v-for="(item, index) in form.multiFilesList" :key="index" @click="showImageDeatail(index)">
+ {{ form.resourcePath + folder+ '/' + item.fileurl }}
<i v-if="item.type==1" class="el-icon-caret-right"></i>
<video class="video-inner-style" v-if="item.type==1" :src="form.resourcePath + folder+ '/' + item.fileurl">
</video>
diff --git a/web_standard/src/views/ext/wInboundExt.vue b/web_standard/src/views/ext/wInboundExt.vue
index 80d2d57..eb2523c 100644
--- a/web_standard/src/views/ext/wInboundExt.vue
+++ b/web_standard/src/views/ext/wInboundExt.vue
@@ -332,7 +332,7 @@
case 1: str += ' | 涓嶈壇'; break
case 2: str += ' | 鎶ュ簾'; break
}
- str += ` X ${item.num}`
+ str += ` X ${item.doneNum}`
return str
},
applyStr (row) {
--
Gitblit v1.9.3