From 9166395640600a5ec596bfbeefa00906597f095d Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 26 六月 2024 17:33:35 +0800
Subject: [PATCH] feat:库管测试问题& 客户 产品名称展示 & 库管日计划更换图标
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 666 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 591 insertions(+), 75 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 77b3642..ce523c3 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -1,11 +1,33 @@
<template>
<view class="main">
- <u--form labelPosition="top"
+ <!-- 褰撳墠閫夋嫨浠撳簱 -->
+ <view class="top-tag">
+ <text>鐐瑰嚮鍒囨崲/閫夋嫨浠撳簱</text>
+ <u-tag
+ size='large'
+ icon='map'
+ :text="dataForm.firstClass ? dataForm.firstClass : '璇烽�夋嫨浠撳簱'"
+ @click="firstClassSelect"
+ ></u-tag>
+ </view>
+ <!-- 鐐瑰嚮鏌ョ湅鍘熺洂閽欓晛 -->
+ <view class="self-deliver">
+ <view class="self-deliver_text">
+ 鏌ョ湅鍘熺洂閽欓晛缁撴灉
+ </view>
+ <view class="self-deliver_btn">
+ <u-button text="鏌ョ湅"
+ type="primary"
+ shape="cirle"
+ @click="todoDetail"></u-button>
+ </view>
+ </view>
+ <!-- <u--form labelPosition="top"
labelWidth="20%"
:borderBottom="false"
:model="dataForm"
ref="uForm">
- <u-form-item label="鐓ゅ満"
+ <u-form-item label="浠撳簱"
prop="firstClass"
:borderBottom="false">
<u-cell-group>
@@ -17,65 +39,208 @@
size="30"></u-icon></u-cell>
</u-cell-group>
</u-form-item>
- <u-form-item label="鐓や粨"
- prop="secondClass"
- :borderBottom="false">
- <u-cell-group>
- <u-cell :title="dataForm.secondClass"
- value="璇烽�夋嫨"
- @click="secondClassSelect">
- <u-icon name="arrow-right"
- slot="right-icon"
- size="30"></u-icon></u-cell>
- </u-cell-group>
- </u-form-item>
- </u--form>
- <view class="coal-name"
- v-show="coalList.length!==0">
- <u-checkbox-group v-model="checkedCoal"
- placement="row"
- @change="checkboxChange"
- size="30">
- <u-checkbox :customStyle="{marginBottom: '8px',fontSize:'20px'}"
- v-for="(item, index) in coalList"
- :key="item.id"
- :label="item.name"
- :name="item.name"
- labelSize='40'
- iconSize='40'></u-checkbox></u-checkbox-group>
- </view>
- <view style="margin-top: 20rpx;">
+
+ </u--form> -->
+
+ <!-- <view style="margin-top: 20rpx;">
<u-button type="primary"
shape="circle"
- text="鎻愪氦"
+ text="鏌ョ湅璇ヤ粨搴撴敹鍙戝崟"
@click.stop="formHandle"></u-button>
- </view>
+ </view> -->
<!-- 鐓ゅ満 -->
+ <view class='div-box'>
+ <u-empty mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ text="鏆傛棤鏁版嵁"
+ textSize="30"
+ iconSize="1000"
+ v-if="detailData.length===0"></u-empty>
+ <!-- 娓叉煋鍖哄煙 -->
+
+ <view class="history-information" v-for="item,i in detailData"
+ :key="i">
+ <view class="first">
+ <view class="">{{ item.carNo || '' }}</view>
+ <view class=""></view>
+ </view>
+ <view class="second">
+ <view class="coal-name">{{ item.productName || '' }}</view>
+ <view class="order-type">{{ item.orderType || '' }}</view>
+ </view>
+ <view class="third">
+ <view class="third-line">
+ <view class="third-line_text">瀹㈡埛鍚嶇О:</view>
+ <view>{{ item.customerName }}</view>
+ </view>
+ <view class="third-line">
+ <view class="third-line_text">浠撳簱:</view>
+ <view >{{ item.bunkerName }}</view>
+ </view>
+ <view class="third-line" v-if="item.productName === 'EDC'">
+ <view class="third-line_text">璐ㄦ鐘舵��:</view>
+ <view> <u-tag :text="checkStatusList[item.checkStatus]" plain > </u-tag></view>
+ </view>
+ </view>
+ <view class="fourth">
+ <view class="fourth-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ </view>
+ </view>
+ <view class="senddate">{{ item.sendDate }}</view>
+ </view>
+ <view class="fourth">
+ <view class="fourth-icon">
+ <view
+ style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
+ </view>
+ </view>
+ <view class="senddate">{{ item.orderCode }}</view>
+ </view>
+ <view class="table">
+ <uni-table border stripe
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th width='140'
+ align="center">鎿嶄綔</uni-th>
+ <uni-th align="center" width='120'>浜у搧</uni-th>
+ <uni-th align="center">绫诲瀷</uni-th>
+ <uni-th align="center">鐨噸</uni-th>
+ <uni-th align="center">姣涢噸</uni-th>
+ <uni-th align="center">鍑�閲�</uni-th>
+ <uni-th align="center">鏁伴噺</uni-th>
+ <!-- <uni-th align="center">浠撳簱</uni-th> -->
+ <!-- <uni-th align="center">鐘舵��</uni-th> -->
+
+ </uni-tr>
+ <uni-tr v-for="(subItem, index) in item.tmTaskCoalList" :key="index">
+ <uni-td align="center">
+ <view class="btnBox">
+ <!-- -->
+ <u-button text='鏌ョ湅' @click="viewDetail(subItem)"></u-button>
+ <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag" @click="enterOk(subItem)"></u-button>
+ </view></uni-td>
+ <uni-td align="center">
+ <view>{{ subItem.productName }}</view></uni-td>
+ <uni-td>
+ <view class="name">{{ subItem.orderType }}</view>
+ </uni-td>
+ <uni-td>
+ <view class="name">{{ subItem.skin }}</view>
+ </uni-td>
+ <uni-td>
+ <view class="name">{{ subItem.hair }}</view>
+ </uni-td>
+ <uni-td>
+ <view class="name">{{ subItem.clean }}</view>
+ </uni-td>
+ <uni-td>
+ <view class="name">{{ subItem.productQuantity }}</view>
+ </uni-td>
+<!--
+ 聽 <uni-td align="center">
+ <view>{{ subItem.bunkerName }}</view></uni-td> -->
+ <!-- <uni-td align="center">
+ <view class="name">{{ subItem.statusView }}</view></uni-td> -->
+
+ </uni-tr>
+ </uni-table>
+ </view>
+ </view>
+
+
+ </view>
<u-action-sheet :actions="firstClassActionsList"
:show="firstClassShow"
cancelText='鍙栨秷'
:closeOnClickOverlay='true'
@close='firstClassClose'
@select="firstClassSelectClick"></u-action-sheet>
+ <u-modal :show="enterZx"
+ :title="'鎻愮ず'"
+ @close="closeModal"
+ @cancel="cancelModal"
+ @confirm="confirmModal"
+ :closeOnClickOverlay="true"
+ :showCancelButton="true">
+ <view class="slot-content">
+ 鏄惁纭瑁呭嵏锛�
+ <view v-if="isNumOk || isClean">
+ <text>浜у搧鍚嶇О锛歿{activeObj.productName}}</text>
+
+ <view class="queren">
+ <text>璇疯緭鍏�</text>锛�
+ <u--input
+ border="bottom"
+ :disabled="activeObj.productName === 'PVC' && activeObj.packingType === 5"
+ :placeholder="isNumOk ? '鏁伴噺' :'鎶樺惃'"
+ v-model="checkNum"
+ >
+ </u--input>
+ <text> {{isNumOk ? '浠�' : '鍚�' }}</text>
+ </view>
+ <!-- pvc 骞朵笖鏄ぇ鍖� -->
+ <view class="pvcBig" v-if="activeObj.productName === 'PVC' && activeObj.packingType === 5">
+
+ </view>
+ <view v-if="isNumOk && activeObj.productQuantity">褰撳墠鏁伴噺锛歿{activeObj.productQuantity}}浠�</view>
+ <view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
+ </view>
+
+ </view>
+ </u-modal>
<!-- 鐓や粨 -->
- <u-action-sheet :actions="secondClassActionsList"
+ <!-- <u-action-sheet :actions="secondClassActionsList"
:show="secondClassShow"
cancelText='鍙栨秷'
:closeOnClickOverlay='true'
@close='secondClassClose'
- @select="secondClassSelectClick"></u-action-sheet>
+ @select="secondClassSelectClick"></u-action-sheet> -->
+ <!--纾呭崟绫诲瀷 -->
+ <!-- <u-action-sheet :actions="orderTypeList"
+ :show="orderTypeShow"
+ cancelText='鍙栨秷'
+ :closeOnClickOverlay='true'
+ @close='orderTypeClose'
+ @select="orderTypeSelectClick"></u-action-sheet> -->
</view>
</template>
<script>
export default {
+ props: {
+ loadUnloadData: {
+ type: Object,
+ default: {}
+ }
+ },
+ watch: {
+ loadUnloadData: {
+ handler(v) {
+ console.log(v,'vvvvvv')
+ this.loadUnloadData = v;
+ },
+ deep: true,
+ immediate: true
+ }
+ },
data() {
return {
dataForm: {
firstClass: "",
secondClass: "",
+ orderType: '',
+ bunkerId:""
},
+ checkStatusList:[
+ '寰呭彇鏍�','宸插彇鏍�','璐ㄦ涓�','寰呭鏍�','澶嶆牳涓�','寰呭瀹�','瀹″畾涓�','宸插畬鎴�'
+ ],
index: '',
+ enterZx:false,
+ typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
+ isNumOk:false, //璁′欢
+ isClean:false, // 鎶樺惃
// 鐓ゅ満鎿嶄綔鑿滃崟
firstClassActionsList: [],
firstClassShow: false,
@@ -84,12 +249,35 @@
secondClassShow: false,
coalList: [],
checkedCoal: [],
+ checkNum:'',
+ activeObj:{},
userInfo: {},
+ detailData:[],
filedId: "",
- selectedCoal: []
+ selectedCoal: [],
+ orderTypeShow: false,
+ orderTypeList: [{
+ name: '澶栭攢',
+ id: Math.floor(Math.random() * 100) + 1,
+ },
+ {
+ name: '澶栬喘',
+ id: Math.floor(Math.random() * 100) + 1,
+ }
+ ],
+ isOrderType: '璇烽�夋嫨', //纾呮埧绫诲瀷鏄惁閫夋嫨浜� 閫夋嫨浜嗘竻绌�
+ cleanIconClick: true, //淇敼鐐瑰嚮娓呯┖纾呮埧閫夋嫨浼氬嚭鐜�
+
};
},
methods: {
+ viewDetail(item){
+ //鏌ョ湅鏀跺彂鍗曡鎯�
+ uni.navigateTo({
+ url: `/pages/loadUnload-page/loadUnlaodPageDetail/detail?id=${item.id}&checkId=${item.checkId}`
+ });
+
+ },
getUserInfo() {
this.$reqGet('getUserEntity').then(res => {
this.userInfo = res.data;
@@ -101,10 +289,17 @@
uni.showLoading({
title: "鍔犺浇涓�"
})
- this.$reqGet('getDeptIdFiled').then(res => {
+ this.$reqGet('getWarehouseList').then(res => {
uni.hideLoading()
if (res.code === 0) {
- this.firstClassActionsList = res.data
+ this.firstClassActionsList = res.data;
+ if(res.data.length){
+ this.dataForm.bunkerId = res.data[0].id;
+ uni.setStorageSync('bunkerId',res.data[0].id)
+ this.dataForm.firstClass = res.data[0].name;
+ this.getDetailData();
+
+ }
} else {
this.$u.toast('鍔犺浇澶辫触')
}
@@ -118,61 +313,270 @@
firstClassClose() {
this.firstClassShow = false
},
+ getDetailData(){
+ uni.showLoading({
+ title:'鍔犺浇涓�'
+ })
+ this.$reqGet('getTaskCoalListByBunkerId', { bunkerId:this.dataForm.bunkerId }).then(res => {
+ uni.hideLoading();
+ if (res.code === 0) {
+ this.detailData = res.data.map(item=>{
+ item.tmTaskCoalList.map(el=>{
+ el.flag = el.isPretendDischar ? false : true
+ return el
+ })
+ return item;
+ });
+ console.log(this.detailData,'detailData')
+ }else if(res.code === 1){
+ this.detailData = [];
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触锛侊紒')
+ }
+ }).catch(err=>{
+ this.detailData = [];
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触锛侊紒')
+ })
+
+ },
firstClassSelectClick(val) {
- this.dataForm.firstClass = val.name
- this.getFiledIdCoalBunker(val.id)
+ this.dataForm.firstClass = val.name;
+ this.dataForm.bunkerId= val.id;
+ uni.setStorageSync('bunkerId', val.id);
+ this.getDetailData();
this.filedId = val.id
},
- // 鑾峰彇鐓や粨
- getFiledIdCoalBunker(filedId) {
- this.$reqGet('getFiledIdCoalBunker', { filedId, }).then(res => {
- this.secondClassActionsList = res.data
- })
- },
- //鐓や粨鑿滃崟
- secondClassSelect() {
- this.secondClassShow = true
- },
- secondClassClose() {
- this.secondClassShow = false
- },
- secondClassSelectClick(val) {
- this.dataForm.secondClass = val.name
- this.coalList = this.secondClassActionsList.find(v => v.id === val.id).coalNames.split(',').map(v => {
- return {
- name: v,
- id: Math.floor(Math.random() * 100) + 1,
- checked: false
- }
- })
- console.log(this.coalList);
- },
- checkboxChange(e) {
- this.selectedCoal = e
- },
formHandle() {
- this.$reqPost('updateUser', Object.assign(this.userInfo, {
- responsibilityCoal: this.selectedCoal.join(),
- filedId: this
- .filedId
- }), 'json').then(res => {
- uni.navigateTo({
- url: `/pages/loadUnload-page/loadUnload-detail/loadUnload-detail`
+ if (!this.dataForm.firstClass) return this.$u.toast('璇烽�夋嫨鐓ゅ満鎴栬�呯叅浠�');
+ this.$nextTick(()=>{
+ uni.navigateTo({
+ url: `/pages/loadUnload-page/loadUnload-detail/loadUnload-detail?bunkerId=${this.dataForm.bunkerId}`
})
})
+
+ },
+ change(){
+
+ },
+ close(){
+
+ },
+ open(){},
+ enterOk(item){
+ this.activeObj = item;
+ if( (item.orderType === '澶栬喘' ||item.orderType === '澶栬喘閫�' ) && item.productQuantity){
+ this.isNumOk = true;
+ this.isClean = false;
+ }else if( item.orderType ==='澶栬喘' && item.isWeight === 1){
+ this.isClean = true;
+ this.isNumOk = false;
+ }else{
+ this.isNumOk = false;
+ this.isClean = false;
+ }
+ //pvc澶у寘鑷姩璁＄畻鎶樺惃
+ if(item.productName === 'PVC' && item.packingType === 5){
+ this.checkNum = (Number(item.productQuantity) * 60)
+
+ }
+ this.enterZx = true;
+
+ },
+ closeModal(){
+ this.enterZx = false;
+ this.checkNum = '';
+ },
+ cancelModal(){
+ this.enterZx = false;
+ this.checkNum = '';
+ },
+ confirmModal(){
+ this.enterZx = false;
+ uni.showLoading({
+ title:'鍔犺浇涓�'
+ })
+ this.$reqPost('confirmLoadAndUnload',{
+ id: this.activeObj.id,
+ productQuantity:this.isNumOk ? this.checkNum :this.activeObj.skin,
+ discount:this.isClean ? this.checkNum : null,
+ isPretendDischar:this.activeObj.isPretendDischar
+ },'json').then(res=>{
+ uni.hideLoading();
+ console.log(res,'rez')
+ this.checkNum = '';
+ if(res.code === 1){
+ console.log('瑙﹀彂')
+ this.$u.toast(res.msg || '澶辫触');
+ uni.hideLoading();
+ }else{
+ this.$u.toast('鎿嶄綔鎴愬姛');
+ }
+ setTimeout(() => {
+ this.getDetailData();
+ }, 500);
+
+ }).catch((err) => {
+ this.$u.toast(err.msg || '澶辫触');
+ }).finally(() => {
+ uni.hideLoading();
+
+ })
+ },
+ //鍒ゆ柇鏄惁鏄� 涓夌鐗规畩绫诲瀷瀵瑰簲寮圭獥
+ judgeTypeFun(name){
+
+
+ },
+ //鏌ョ湅鏈�杩戜竴娆＄殑鍘熺洂閽欓晛
+ todoDetail(){
+ console.log()
+ uni.navigateTo({
+ url: `/pages/loadUnload-page/checkTestDetails/index`
+ })
+
}
+
+
+
+ },
+ onShow(){
+ uni.showLoading({
+ title: "鍔犺浇涓�"
+ })
+ this.$reqGet('getWarehouseList').then(res => {
+ uni.hideLoading()
+ if (res.code === 0) {
+ this.firstClassActionsList = res.data;
+ if(res.data.length === 1){
+ this.dataForm.bunkerId = res.data[0].id;
+ uni.setStorageSync('bunkerId', res.data[0].id)
+ this.dataForm.firstClass = res.data[0].name;
+
+ }
+ } else {
+ this.$u.toast('鍔犺浇澶辫触')
+ }
+ }).then(() => {
+ this.getUserInfo()
+ })
}
}
</script>
<style lang="scss"
scoped>
+::-webkit-scrollbar{
+ display: none;
+ }
+ .table{
+ width: 100%;
+ /deep/ .uni-table{
+ min-width: 0!important;
+ margin-left: 20rpx;
+ }
+
+}
+ // 鑷富閰嶉��
+ .self-deliver {
+ position: relative;
+ top: vww(10);
+ width: 95%;
+ height: vww(40);
+ margin: vww(8) 10rpx;
+ padding: 0 vww(8);
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ @include flex;
+ align-items: center;
+ justify-content: space-between;
+ /deep/.u-button {
+ width: 100%;
+ height: 28px !important;
+ line-height: 40px;
+ padding: 0 12px;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #ffffff;
+ background: #497bfb !important;
+ letter-spacing: 4rpx;
+ border-radius: 37rpx 37rpx 37rpx 37rpx !important;
+ box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
+ }
+ }
+ .queren{
+ display: flex;
+ justify-content: space-between;
+ /deep/ .u-input {
+ border-bottom: 1px solid #ccc;
+ }
+ }
+ .name{
+ width: 50rpx;
+ }
+ .table{
+ width: 94%;
+ margin-left: 20rpx;
+ position: relative;
+ margin-top: 30rpx;
+ overflow-x: auto;
+ /deep/ .uni-table-th{
+ font-size: 12px;
+ }
+ /deep/ .uni-table-td {
+ font-size: 12px;
+ }
+ /deep/ .uni-table{
+ min-width: 0rpx!important;
+ // position: sticky !important;;
+ }
+ /deep/ .uni-table-body-wrapper {
+ position: relative;
+}
+ /deep/ .uni-table-body {
+ display: flex;
+}
+.fixed {
+position: absolute;
+right: -35px;
+background: #fff;
+}
+
+ }
+ .btnBox{
+ min-width: 130rpx;
+ display: flex;
+ justify-content: space-around;
+ text{
+ color: #035cfb;
+ }
+ }
.main {
width: 94%;
margin: 10px;
// margin-top: vww(100);
position: relative;
- top: vww(-120);
+ top: vww(-160);
+ .top-tag{
+ width: 33%;
+ height: 100rpx;
+ margin-left: 65%;
+ display: flex;
+ /* margin-top: 40rpx; */
+ color: #fff;
+ align-items: center;
+ justify-content: space-between;
+ }
+
+ .div-box{
+ width: 100%;
+ display: flex;
+ margin-left: 10rpx;
+ flex-direction: column;
+ /deep/ .u-collapse{
+ background: #fff;
+ }
+
+ }
}
.slide-fade-enter-active {
@@ -180,11 +584,123 @@
}
.coal-name {
- width: 95%;
+ width: 75%;
min-height: vww(100);
.u-checkbox-group {
.u-checkbox {}
}
}
+ .box{
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ .box-top{
+ width: 100%;
+ height: 100rpx;
+ display: inline-block;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ }
+ }
+ .collItem{
+ margin-top: 30rpx;
+ /deep/ .content{
+ background: none!important;
+ }
+ }
+ .history-information {
+ margin-bottom:50rpx;
+ margin-top: 10rpx;
+ background: #ffffff;
+ border-radius: 20rpx;
+ @include flex flex-direction: column;
+ padding: 10px;
+ align-items: flex-start;
+ justify-content: space-evenly;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+
+
+ .first {
+ width: 96%;
+ height: 34rpx;
+ font-size: 32rpx;
+ font-weight: 300;
+ color: #303030;
+ @include flex;
+ margin: vww(10) vww(10) 0;
+ }
+
+ .second {
+ width: 100%;
+ height: 31rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ margin: vww(10) vww(10) 0;
+ @include flex;
+ justify-content: flex-start;
+
+ .coal-name {
+ min-width: vww(20);
+ height: vww(20);
+ margin-right: vww(21);
+ }
+
+ .order-type {
+ height: 45rpx;
+ color: #035cfb;
+ border: 2px solid #035cfb;
+ border-radius: 4rpx;
+ padding: vww(2) vww(4);
+ text-align: center;
+ }
+ }
+
+ .third {
+ width: 96%;
+ height: auto;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ margin: vww(10) vww(10) 0;
+ @include flex;
+ flex-direction: column;
+
+ .third-line {
+ @include flex;
+ align-items: center;;
+
+ &_text {
+ color: #919090;
+ }
+
+ &_num {
+ color: #035cfb;
+ }
+ }
+ }
+
+ .fourth {
+ width: 100%;
+ height: 31rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ margin: vww(10) vww(10) 0;
+ @include flex;
+
+ .fourth-icon {
+ width: vww(13);
+ height: vww(13);
+ margin-right: vww(14);
+ }
+
+ .senddate {
+ flex: 1;
+ }
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1