From 46b0b4d41a260e44e5e648d79cac60e97fe17789 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期三, 13 九月 2023 14:45:59 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages_adjust/pages/workOrder/workOrder.vue | 134 +++++++-----
minipro_standard/pages/InOperation/InOperation.vue | 9
minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue | 37 ++-
minipro_standard/pages_adjust/components/multipleMaterial.vue | 5
minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue | 4
minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue | 419 +++++++++++++++++++++++++++++++++++--
minipro_standard/pages/OutOperation/OutOperation.vue | 14
minipro_standard/pages/index/index.vue | 1
8 files changed, 517 insertions(+), 106 deletions(-)
diff --git a/minipro_standard/pages/InOperation/InOperation.vue b/minipro_standard/pages/InOperation/InOperation.vue
index 6190865..1f5d688 100644
--- a/minipro_standard/pages/InOperation/InOperation.vue
+++ b/minipro_standard/pages/InOperation/InOperation.vue
@@ -21,7 +21,8 @@
<div class="page_content_title">
<div class="page_content_title_top">
<span v-if="item.batch">{{ item.materialName + ' | ' + item.materialCode }}</span>
- <span v-else>{{ item.materialName + ' | ' + item.materialCode }}</span>
+ <span v-else>{{ item.materialName + ' | ' + item.materialCode }}</span>
+ <span>{{item.outActnum}}{{item.unitName}}</span>
</div>
<div class="page_content_title_bottom">
<span class="green" v-if="item.qualityType === 0">鍚堟牸 <span
@@ -205,7 +206,8 @@
isZKD: false,
show: false,
info: {},
- ids: [],
+ ids: [],
+ mainOrder: '',
location: '',
locationName: '',
wtransferWarehouseList: [],
@@ -252,7 +254,8 @@
infoAction = wTransferForInOut
data.wTransferType = '1'
}
- infoAction(data).then(res => {
+ infoAction(data).then(res => {
+ this.mainOrder = res.data.id
if (this.isZKD) {
this.info = res.data.wtransfer
this.wareHouseId = res.data.wtransfer.inWarehouseId
diff --git a/minipro_standard/pages/OutOperation/OutOperation.vue b/minipro_standard/pages/OutOperation/OutOperation.vue
index 01809b9..61bd5e1 100644
--- a/minipro_standard/pages/OutOperation/OutOperation.vue
+++ b/minipro_standard/pages/OutOperation/OutOperation.vue
@@ -195,7 +195,8 @@
show: false,
info: {
- },
+ },
+ mainOrder: '',
warehouseId: '',
ids: [],
warehouseList: [{
@@ -244,8 +245,9 @@
infoAction = wTransferForInOut
data.wTransferType = '0'
}
- infoAction(data).then(res => {
- if (this.isZKD) {
+ infoAction(data).then(res => {
+ this.mainOrder = res.data.id
+ if (this.isZKD) {
this.info = res.data.wtransfer
this.warehouseList = res.data.wtransferWarehouseList
this.warehouseId = this.warehouseList[0].warehouseId
@@ -355,7 +357,7 @@
this.$store.dispatch('getUpcomingNum')
uni.$u.toast('鎿嶄綔鎴愬姛')
uni.redirectTo({
- url: `/pages/warehousingDetails/warehousingDetails?id=${this.info.id}&dbid=${this.dbid}`
+ url: `/pages/warehousingDetails/warehousingDetails?id=${this.id}&dbid=${this.dbid}`
})
// uni.redirectTo({
// url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}&dbid=${this.dbid}`
@@ -370,14 +372,14 @@
}
} else if (this.type === QRCodeType.CKD) {
wOutBoundForUpload({
- id: info.value.woutbound.id,
+ id: this.id,
wOutboundType: 0
}).then(res => {
if (res.code === 200) {
this.$store.dispatch('getUpcomingNum')
uni.$u.toast('鎿嶄綔鎴愬姛')
uni.redirectTo({
- url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}`
+ url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.id}`
})
// setTimeout(() => {
// // router.go(-1)
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 86bea63..4a75720 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -160,6 +160,7 @@
},
onReady() {
var that = this
+
this.$nextTick(() => {
uni.createSelectorQuery()
.in(this)
diff --git a/minipro_standard/pages_adjust/components/multipleMaterial.vue b/minipro_standard/pages_adjust/components/multipleMaterial.vue
index 7765a7d..39b921a 100644
--- a/minipro_standard/pages_adjust/components/multipleMaterial.vue
+++ b/minipro_standard/pages_adjust/components/multipleMaterial.vue
@@ -12,8 +12,13 @@
scroll-y="true"
@scrolltolower="loadMore">
<view v-for="(item1, index) in list" :key="index" class="flex mb20" @click="jump(index)">
+<<<<<<< HEAD
<view class="img36 mr20 pt10" style="position: relative;">
<u-checkbox-group style="display: block;" name="">
+=======
+ <view class="img36 mr20 pt10">
+ <u-checkbox-group style="display: block;" name="" @change="jump(index)">
+>>>>>>> 041c81a20c93a6b8238e810fe9a1adfee9c9d86f
<u-checkbox :checked="item1.isActive"></u-checkbox>
</u-checkbox-group>
<view style="width: 18px; height: 18px; position: absolute; top: 0; left: 0; z-index: 99;"></view>
diff --git a/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue b/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
index 418c60b..58b85c2 100644
--- a/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
+++ b/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
@@ -179,9 +179,7 @@
getValue(item) {
for (let i = 0; i < this.materialList.length; i++) {
if (item.id === this.materialList[i].id) {
- uni.$u.toast({
- message: '涓嶈兘閲嶅閫夋嫨鐩稿悓鐗╂枡'
- })
+ uni.$u.toast('涓嶈兘閲嶅閫夋嫨鐩稿悓鐗╂枡')
return
}
}
diff --git a/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue b/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue
index d798f56..1720d0b 100644
--- a/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue
+++ b/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue
@@ -21,7 +21,7 @@
<div class="tl_list_item_go">
<span
:style="item.attributeName ? 'color: #000;' : ''">{{ item.attributeName ? item.attributeName : '璇烽�夋嫨'}}</span>
- <van-icon name="arrow" color="#999999" />
+ <u-icon name="arrow-right" color="#999999" size="20"></u-icon>
</div>
</div>
<div class="tl_list_item" v-if="item.type === ''">
@@ -37,33 +37,38 @@
<u-radio v-for="(item1, i) in item.data" :key="i" activeColor="#4275FC" :name="item1" :label="item1">
</u-radio>
</u-radio-group>
- <!-- <van-radio-group v-model="item.num" direction="horizontal">
- <van-radio :name="item1" checked-color="#4275FC" v-for="(item1, i) in item.data" :key="i">
- {{item1}}
- </van-radio>
- </van-radio-group> -->
</div>
</div>
<div class="tl_list_item" v-else-if="item.type === 1">
<div class="tl_list_item_label">灞炴�у��</div>
<div class="tl_list_item_go">
- <u-checkbox-group v-model="item.num" placement="row">
+ <u-checkbox-group v-model="item.num" placement="row" >
<u-checkbox v-for="(item1, i) in item.data" :key="i" :label="item1" :name="item1">
</u-checkbox>
</u-checkbox-group>
</div>
</div>
- <div class="tl_list_item" v-else-if="item.type === 2 || item.type === 3">
+ <div class="tl_list_item" v-else-if="item.type === 2">
<div class="tl_list_item_label">灞炴�у��</div>
<div class="tl_list_item_go">
<input type="text" v-model="item.num" :placeholder="item.tips" />
+ </div>
+ </div><div class="tl_list_item" v-else-if="item.type === 3">
+ <div class="tl_list_item_label">灞炴�у��</div>
+ <div class="tl_list_item_go">
+ <u--input v-model="item.num" :placeholder="item.tips"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ type="digit"
+ border="surround"
+ ></u--input>
+ <input />
</div>
</div>
<div class="tl_list_item" @click="openTimer(index)" v-else-if="item.type === 4">
<div class="tl_list_item_label">灞炴�у��</div>
<div class="tl_list_item_go">
<span :style="item.num ? 'color: #000;' : ''">{{item.num ? item.num : item.tips}}</span>
- <u-icon name="arrow" color="#999999" />
+ <u-icon name="arrow-right" color="#999999" size="20"></u-icon>
</div>
</div>
</div>
@@ -389,14 +394,16 @@
.tl_list_item_label {
font-size: 30rpx;
- font-weight: 400;
+ font-weight: 400;
+ flex-shrink: 1;
color: #222222;
}
.tl_list_item_go {
display: flex;
align-items: center;
-
+ flex: 1;
+ justify-content: flex-end;
input {
text-align: right;
width: 450rpx;
@@ -447,5 +454,13 @@
justify-content: center;
}
}
+ }
+ /deep/ .u-checkbox-group {
+ flex-wrap: wrap;
+ max-width: 100%;
+ }
+ /deep/ .u-radio-group {
+ flex-wrap: wrap;
+ max-width: 100%;
}
</style>
diff --git a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
index 95a9d39..789a2cb 100644
--- a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
+++ b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
@@ -1,7 +1,7 @@
<template>
<view class="content p30 bbox">
<div class="content_search">
- <v-Search @searchInput="searchForm.mixParam" @submit="search" @reset="reset" :isShow="true"
+ <v-Search @searchInput="searchInput" @submit="search" @reset="reset" :isShow="true"
placeholder="鎼滅储宸ュ崟缂栫爜/宸ュ簭鍚嶇О">
<template v-slot:content>
<div class="Search_item">
@@ -22,68 +22,69 @@
<v-LableSelection :TagList="tagList" :isShow="true" @change="clickTag"></v-LableSelection>
</div>
<div class="content_total mt20">鍏眥{page.total}}鏉℃暟鎹�</div>
- <view class="fx1">
- <scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="getLists"
- @refresherrefresh="onRefresh">
- <div class="content_list">
- <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
- <div class="content_list_item_top">
- <div class="content_list_item_top_left">
- <span class="f32" v-if="item.mmodel">{{item.mmodel.name}} | {{item.procedureName}}</span>
- <div class="content_list_item_top_left_tag" v-if="item.urgent">浼樺厛{{item.urgent}}</div>
- <div class="content_list_item_top_left_tag backgreen" v-if="item.type === 0">姝ｅ父</div>
- <div class="content_list_item_top_left_tag backyellow" v-if="item.type === 2">杩斿伐杩斾慨</div>
- <div class="content_list_item_top_left_tagW" v-if="item.paused === 1">鍋�</div>
- </div>
- <div class="content_list_item_top_right">
- <span class="yellow" v-if="item.status === 0">宸插垱寤�</span>
- <span class="green" v-if="item.status === 1">宸插鏂�</span>
- <span v-if="item.status === 2">宸插畬宸ユ</span>
- <span class="purple" v-if="item.status === 3">宸叉楠�</span>
- <span v-if="item.status === 4">宸叉姤宸�</span>
- <span v-if="item.status === 5">宸插叆搴�</span>
- <span v-if="item.status === 6">宸插彇娑�</span>
- <span class="green" v-if="item.status === 7">杩涜涓�</span>
+ <scroll-view scroll-y="true" :style="{height:height}" refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="getLists"
+ @refresherrefresh="onRefresh">
+ <div class="content_list">
+ <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
+ <div class="content_list_item_top">
+ <div class="content_list_item_top_left">
+ <span class="f32" v-if="item.mmodel">{{item.mmodel.name}} | {{item.procedureName}}</span>
+ <div class="content_list_item_top_left_tag" v-if="item.urgent">浼樺厛{{item.urgent}}</div>
+ <div class="content_list_item_top_left_tag backgreen" v-if="item.type === 0">姝ｅ父</div>
+ <div class="content_list_item_top_left_tag backyellow" v-if="item.type === 2">杩斿伐杩斾慨</div>
+ <div class="content_list_item_top_left_tagW" v-if="item.paused === 1">鍋�</div>
+ </div>
+ <div class="content_list_item_top_right">
+ <span class="yellow" v-if="item.status === 0">宸插垱寤�</span>
+ <span class="green" v-if="item.status === 1">宸插鏂�</span>
+ <span v-if="item.status === 2">宸插畬宸ユ</span>
+ <span class="purple" v-if="item.status === 3">宸叉楠�</span>
+ <span v-if="item.status === 4">宸叉姤宸�</span>
+ <span v-if="item.status === 5">宸插叆搴�</span>
+ <span v-if="item.status === 6">宸插彇娑�</span>
+ <span class="green" v-if="item.status === 7">杩涜涓�</span>
+ </div>
+ </div>
+ <span class="f24">宸ュ崟缂栧彿: {{item.code}}</span>
+ <div class="content_list_item_content">
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">鐗╂枡缂栫爜锛�</div>
+ <div class="content_list_item_content_item_nr" v-if="item.mmodel">{{item.mmodel.code}}</div>
+ </div>
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">璁″垝寮�宸ワ細</div>
+ <div class="content_list_item_content_item_nr">{{item.planDate}}</div>
+ </div>
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">鐢熶骇鎵规锛�</div>
+ <div class="content_list_item_content_item_nr">{{item.batch}}</div>
+ </div>
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">璁″垝鏁伴噺锛�</div>
+ <div class="content_list_item_content_item_nr" v-if="item.umodel">
+ {{item.planNum}}{{item.umodel.name}}
</div>
</div>
- <span class="f24">宸ュ崟缂栧彿: {{item.code}}</span>
- <div class="content_list_item_content">
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐗╂枡缂栫爜锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.mmodel">{{item.mmodel.code}}</div>
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">鐢熶骇璁惧锛�</div>
+ <div class="content_list_item_content_item_nr" v-if="item.pgmodel">{{item.pgmodel.code}}
</div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">璁″垝寮�宸ワ細</div>
- <div class="content_list_item_content_item_nr">{{item.planDate}}</div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐢熶骇鎵规锛�</div>
- <div class="content_list_item_content_item_nr">{{item.batch}}</div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">璁″垝鏁伴噺锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.umodel">
- {{item.planNum}}{{item.umodel.name}}
- </div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐢熶骇璁惧锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.pgmodel">{{item.pgmodel.code}}
- </div>
- </div>
-
- <div class="content_list_item_content_item" v-if="item.status === 5">
- <div class="content_list_item_content_item_label">瀹屽伐鏁伴噺锛�</div>
- <div class="content_list_item_content_item_nr">{{item.proNum}}</div>
- </div>
+ </div>
+
+ <div class="content_list_item_content_item" v-if="item.status === 5">
+ <div class="content_list_item_content_item_label">瀹屽伐鏁伴噺锛�</div>
+ <div class="content_list_item_content_item_nr">{{item.proNum}}</div>
</div>
</div>
</div>
- </scroll-view>
+ </div>
+ </scroll-view>
+ <view class="fx1">
+
</view>
<!-- <u-calendar :show="isOpenDate" mode="range" @confirm="dateConfirm"></u-calendar> -->
- <l-calendar :lunar="false" v-model="isOpenDate" @change="onConfirm" :isRange="true" activeBgColor="#305ED5"
+ <l-calendar :lunar="false" v-model="isOpenDate" @change="dateConfirm" :isRange="true" activeBgColor="#305ED5"
rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
</view>
</template>
@@ -119,7 +120,8 @@
name: '宸插畬鎴�',
num: '0'
}
- ],
+ ],
+ height: '',
triggered: false,
_freshing: false,
searchForm: {
@@ -135,6 +137,21 @@
},
list: [],
}
+ },
+ onReady() {
+ var that = this
+
+ this.$nextTick(() => {
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.content_search')
+ .boundingClientRect((rect) => {
+ console.log('-----',rect);
+ that.height = `calc(100vh - ${rect.height + 80}px)`
+ that.top = `${rect.height}px`
+ })
+ .exec()
+ })
},
onLoad() {
this.pageCounts()
@@ -151,9 +168,14 @@
this.page.page = 1
this.pageCounts()
this.loadData()
+ },
+ searchInput(data) {
+ this.searchForm.mixParam = data
+ this.page.page = 1
+ this.pageCounts()
+ this.loadData()
},
loadData() {
-
getList({
...this.page,
model: {
diff --git a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
index 7f7965e..1cbbb33 100644
--- a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
+++ b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
@@ -125,7 +125,7 @@
<image src="../../../static/ic_ar@2x.png" class="img_ar" mode=""></image>
</div>
</div>
- <div class="bg_list_item" v-if="arrType && arrType.length > 0">
+ <div class="bg_list_item" v-if="form.duration && arrType && arrType.length > 0">
<div class="bg_list_item_top">
<div class="bg_list_item_top_left">
<div class="bg_list_item_top_left_x bg_m"></div>
@@ -223,6 +223,39 @@
</view>
</view>
</u-popup>
+ <u-popup :show="statistics" @close="statistics=false" :round="8" closeable zIndex="20000">
+ <div class="tg">
+ <div class="tg_header">璇风‘璁ゆ姤宸ヤ俊鎭�</div>
+ <div class="tg_table">
+ <div class="tg_table_header">
+ <div class="tg_table_header_item">绫诲瀷</div>
+ <div class="tg_table_header_item">鐗╂枡鍚嶇О</div>
+ <!-- <div class="tg_table_header_item">宸ヨ鏁伴噺</div> -->
+ <div class="tg_table_header_item">鐗╂枡鏁伴噺</div>
+ </div>
+ <div class="nr" v-if="statisticsData.length > 0">
+ <div class="tg_table_nr" v-for="(item, index) in statisticsData" :key="index">
+ <div class="tg_table_nr_item">{{ item.name }}</div>
+ <div class="tg_table_nr_item">{{ item.materialName }}</div>
+ <!-- <div class="tg_table_nr_item">{{item.gznum}}</div> -->
+ <div class="tg_table_nr_item" :style="item.name === '宸ュ崟鏈姇鏂�' ? 'color: #DE5243' : ''">
+ {{ item.num }}
+ </div>
+ </div>
+ </div>
+ <div class="nr" v-else>
+ <div class="tg_table_nr">
+ <div class="tg_table_nr_item1">鏆傛棤鏁版嵁</div>
+ </div>
+ </div>
+ </div>
+ <div class="tg_footer">
+ <!-- proxy.$auth('h5:workorderoutput:confirm') && -->
+ <button class="tg_footer_qr" @click="submitBG" v-if="isSubmit">纭鎶ュ伐</button>
+ <div class="tg_footer_fh" @click="gofh" v-else-if="!isSubmit">杩斿洖淇敼</div>
+ </div>
+ </div>
+ </u-popup>
</view>
</template>
@@ -301,7 +334,10 @@
capacity: 10,
page: 1,
total: 0
- }
+ },
+ statisticsData: [],
+ isSubmit: false,
+ statistics: false
};
},
onLoad(obj) {
@@ -444,46 +480,39 @@
if (unitAttribute == 0 && num != '') {
if (!REGULAR.positiveInteger.test(num)) {
obj.num = obj.ynum
- Toast({
- message: '鍙兘杈撳叆姝ｆ暣鏁�'
- })
+ uni.$u.toast('鍙兘杈撳叆姝ｆ暣鏁�')
return
}
}
if (unitAttribute == 1 && num != '') {
if (!REGULAR.number.test(num)) {
- Toast({
- message: '鍙兘杈撳叆姝ｆ暣鏁版垨灏忔暟锛堟渶澶氬洓浣嶏級'
- })
+ uni.$u.toast('鍙兘杈撳叆姝ｆ暣鏁版垨灏忔暟锛堟渶澶氬洓浣嶏級')
obj.num = obj.ynum
return
}
}
if (num > maxNum) {
obj.num = obj.ynum
- Toast.fail({
- message: '瓒呭嚭宸ヨ鎬绘暟'
- })
+ uni.$u.toast('瓒呭嚭宸ヨ鎬绘暟')
return
}
} else if (type === 'C' && num > info.value.planNum) {
obj.num = obj.ynum
- Toast.fail({
- message: '浜у嚭鏁伴噺涓嶈兘瓒呰繃璁″垝鏁伴噺'
- })
+ uni.$u.toast('浜у嚭鏁伴噺涓嶈兘瓒呰繃璁″垝鏁伴噺')
return
}
- // updateById({ id, num }).then(res => {
- // if (res.code === 200 && type === 'T') {
- // getOrocessRecords()
- // } else if (res.code === 200 && type === 'C') {
- // // getOrocessRecordCC()
- // }
- // })
+ updateById({
+ id,
+ num
+ })
+ .then(res => {
+ if (res.code === 200 && type === 'T') {
+ this.getOrocessRecords()
+ }
+ })
},
changeCC(downType, num, recordId) {
if (!num) return
- console.log(Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable))
if ((Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable)) > this.info.planNum) {
uni.showToast({
title: '浜у嚭鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺',
@@ -519,7 +548,197 @@
this.form.index = index
this.form.type = item.type
},
+ getGroupNum(arr) {
+ let newArry = {};
+ for (let i = 0; i < arr.length; i++) {
+ if (newArry[arr[i].materialName]) {
+ newArry[arr[i].materialName].push(arr[i])
+ } else {
+ newArry[arr[i].materialName] = [arr[i]]
+ }
+ }
+ return newArry;
+ },
submit() {
+ let res = this.getGroupNum(this.feedingData)
+ if (this.info.bomType === 1) { // 鎷夊紡
+ console.log('鎷夊紡')
+ this.statisticsData = []
+ if (this.produceFrom.qualified <= 0 && this.produceFrom.undesirable <= 0) {
+ uni.$u.toast('浜у嚭鏄庣粏涓嶈兘涓虹┖')
+ return
+ }
+ if (this.info.hasBom === 0) {
+ console.log('鏃燽om')
+ let arr = []
+ let tl = 0
+ for (let i in res) {
+ let num = 0
+ res[i].forEach(item => {
+ num += Number(item.num)
+ })
+ arr.push({
+ name: '宸ュ崟鎶曟枡',
+ materialName: i + res[i][0].procedureName,
+ num: num
+ })
+ }
+ this.feedingData.forEach(item => {
+ tl += Number(item.num)
+ })
+ this.statisticsData = [...this.statisticsData, ...arr]
+ this.statisticsData.push({
+ name: '宸ュ崟鍚堟牸浜у嚭',
+ materialName: this.info.mmodel.name + '-' + this.info.procedureName,
+ num: this.produceFrom.qualified
+ })
+ this.infostatisticsData.push({
+ name: '宸ュ崟涓嶈壇浜у嚭',
+ materialName: this.info.mmodel.name + '-' + this.info.procedureName,
+ num: this.produceFrom.undesirable
+ })
+ this.statisticsData.push({
+ name: '宸ュ崟鏈姇鏂�',
+ materialName: '',
+ num: this.info.planNum - Number(this.produceFrom.qualified) - Number(this.produceFrom
+ .undesirable)
+ })
+ let total = this.info.planNum - (Number(this.produceFrom.qualified) + Number(this.produceFrom
+ .undesirable))
+ if (total === 0) {
+ this.isSubmit = true
+ } else {
+ this.isSubmit = false
+ }
+ } else if (this.info.hasBom === 1) { // 鏈塨om鎯呭喌
+ console.log('鏈塨om')
+ let arr = []
+ let tl = 0
+ // let res = getGroupNum(feedingData)
+ for (let i in res) {
+ let num = 0
+ res[i].forEach(item => {
+ num += Number(item.num)
+ })
+ arr.push({
+ name: '宸ュ崟鎶曟枡',
+ materialName: i,
+ num: num
+ })
+ }
+ this.feedingData.forEach(item => {
+ tl += Number(item.num)
+ })
+ this.statisticsData = [...this.statisticsData, ...arr]
+ this.statisticsData.push({
+ name: '宸ュ崟鍚堟牸浜у嚭',
+ materialName: this.info.mmodel.name + '-' + this.info.procedureName,
+ num: this.produceFrom.qualified
+ })
+ this.statisticsData.push({
+ name: '宸ュ崟涓嶈壇浜у嚭',
+ materialName: this.info.mmodel.name + '-' + this.info.procedureName,
+ num: this.produceFrom.undesirable
+ })
+ this.isSubmit = Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable) <= this
+ .info.planNum;
+ }
+ } else {
+ console.log('鎺ㄥ紡')
+ if (this.feedingData.length === 0) {
+ uni.$u.toast('鎶曟枡鏄庣粏涓嶈兘涓虹┖')
+
+ return
+ }
+ if (this.produceFrom.qualified <= 0 && this.produceFrom.undesirable <= 0) {
+ uni.$u.toast('浜у嚭鏄庣粏涓嶈兘涓虹┖')
+
+ return
+ }
+ this.statisticsData = []
+ if (this.info.hasBom === 0) {
+ console.log('鏃燽om')
+ let arr = []
+ let tl = 0
+ for (let i in res) {
+ let num = 0
+ res[i].forEach(item => {
+ num += Number(item.num)
+ })
+ arr.push({
+ name: '宸ュ崟鎶曟枡',
+ materialName: i + '-' + res[i][0].procedureName,
+ num: num
+ })
+ }
+ this.feedingData.forEach(item => {
+ tl += Number(item.num)
+ })
+ this.statisticsData = [...this.statisticsData, ...arr]
+ this.statisticsData.push({
+ name: '宸ュ崟鍚堟牸浜у嚭',
+ materialName: this.info.mmodel.name + '-' + this.info.procedureName,
+ num: this.produceFrom.qualified
+ })
+ this.statisticsData.push({
+ name: '宸ュ崟涓嶈壇浜у嚭',
+ materialName: this.info.mmodel.name + '-' + this.info.procedureName,
+ num: this.produceFrom.undesirable
+ })
+ if (Number(tl) <= this.info.planNum) {
+ let total = Number(tl) - Number(this.produceFrom.qualified) - Number(this.produceFrom
+ .undesirable) // 鏄惁鏈変綑
+ this.statisticsData.push({
+ name: '宸ュ崟鏈姇鏂�',
+ materialName: '',
+ num: (Number(tl) - Number(this.produceFrom.qualified) - Number(this.produceFrom
+ .undesirable))
+ .toFixed(2)
+ })
+ if (total === 0) {
+ this.isSubmit = true
+ } else {
+ this.isSubmit = false
+ }
+ } else {
+ this.isSubmit = false
+ }
+ } else if (this.info.hasBom === 1) { // 鏈塨om鎯呭喌
+ console.log('鏈塨om')
+ let arr = []
+ let tl = 0
+ for (let i in res) {
+ let num = 0
+ res[i].forEach(item => {
+ num += Number(item.num)
+ })
+ arr.push({
+ name: '宸ュ崟鎶曟枡',
+ materialName: i,
+ num: num
+ })
+ }
+ this.feedingData.forEach(item => {
+ tl += Number(item.num)
+ })
+ this.statisticsData = [...this.statisticsData, ...arr]
+ this.statisticsData.push({
+ name: '宸ュ崟鍚堟牸浜у嚭',
+ materialName: this.info.mmodel.name + '-' + this.info.procedureName,
+ num: this.produceFrom.qualified
+ })
+ this.statisticsData.push({
+ name: '宸ュ崟涓嶈壇浜у嚭',
+ materialName: this.info.mmodel.name + '-' + this.info.procedureName,
+ num: this.produceFrom.undesirable
+ })
+ // isSubmit.value = produceFrom.qualified + produceFrom.undesirable <= info.value.planNum;
+ this.isSubmit = true
+ }
+ }
+ this.statistics = true
+ },
+ submitBG() {
let createUnqualifiedDTOList = this.form.defective.map((item) => {
return {
categoryId: item.id,
@@ -547,6 +766,36 @@
}
})
},
+ // => {
+ // // if (!from.duration || from.duration <= 0) {
+ // // return Toast('鎶ュ伐鏃堕暱涓嶈兘涓虹┖')
+ // // }
+ // let createUnqualifiedDTOList = from.defective.map(item => {
+ // return {
+ // categoryId: item.id,
+ // unQualifiedNum: item.num
+ // }
+ // })
+ // let createWorkorderRecordDTO = {
+ // workorderId: route.query.id,
+ // duration: from.duration ? from.duration : 0,
+ // qualifiedNum: produceFrom.qualified ? produceFrom.qualified : 0,
+ // unQualifiedNum: produceFrom.undesirable ? produceFrom.undesirable : 0
+ // }
+ // // id: route.query.id
+ // comfirmDoneStandard({
+ // createUnqualifiedDTOList,
+ // createWorkorderRecordDTO
+ // }).then(res => {
+ // if (res.code === 200) {
+ // Toast.success({ message: '鎶ュ伐鎴愬姛', forbidClick: true, duration: 2000 })
+ // setTimeout(() => {
+ // router.go(-2)
+ // }, 2000)
+ // }
+ // })
+ // }
+
jumpdj() {
uni.navigateTo({
url: `/pages_adjust/pages/spotCheck/spotCheck?id=${this.workorderId}`
@@ -655,16 +904,15 @@
content: '纭畾鍒犻櫎姝ゆ潯璁板綍鍚楋紵',
success: (res) => {
if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
deleteCT(id)
- .then(res => {
+ .then(res => {
this.getOrocessRecords()
// if (type === 'C') {
// this.getOrocessRecordCC()
// } else if (type === 'T') {
// this.getOrocessRecords()
// }
- })
+ })
.catch(err => {})
}
}
@@ -1049,6 +1297,7 @@
width: 100%;
padding: 30rpx 30rpx 60rpx 30rpx;
box-sizing: border-box;
+ z-index: 9999;
.bg_footer_submit1 {
width: 690rpx;
@@ -1203,8 +1452,9 @@
.bl_list_item_right {
flex: 1;
height: 50rpx;
- text-align: right;
-
+ text-align: right;
+ display: flex;
+ justify-content: flex-end;
input {
padding-left: 5rpx;
width: 160rpx;
@@ -1227,4 +1477,119 @@
}
}
}
+
+ .tg {
+ width: 100%;
+ height: 800rpx;
+ padding: 30rpx;
+ box-sizing: border-box;
+
+ .tg_header {
+ width: 100%;
+ height: 45rpx;
+ text-align: center;
+ line-height: 45rpx;
+ font-size: 30rpx;
+ font-weight: 500;
+ color: #222222;
+ }
+
+ .tg_table {
+ width: 100%;
+ margin-top: 40rpx;
+
+ .tg_table_header {
+ width: 100%;
+ height: 72rpx;
+ background: #EFF2FC;
+ display: flex;
+ align-items: center;
+
+ .tg_table_header_item {
+ flex: 1;
+ font-size: 26rpx;
+ font-weight: 500;
+ color: #333333;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+ }
+
+ .nr {
+ width: 100%;
+ max-height: calc(100% - 133rpx);
+ overflow-x: scroll;
+
+ .tg_table_nr {
+ width: 100%;
+ padding: 24rpx 10rpx;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ background: white;
+ box-shadow: inset 0px -2rpx 0px 0px #E5E5E5;
+
+ .tg_table_nr_item {
+ flex: 1;
+ font-size: 26rpx;
+ font-weight: 500;
+ color: #333333;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .tg_table_nr_item1 {
+ flex: 1;
+ font-size: 26rpx;
+ font-weight: 500;
+ color: #333333;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+ }
+ }
+
+ .tg_footer {
+ width: calc(100% - 60rpx);
+ position: fixed;
+ bottom: 0;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ box-sizing: border-box;
+ padding-bottom: 40rpx;
+
+ .tg_footer_fh {
+ width: 100%;
+ height: 88rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: rgba(66, 117, 252, 0.05);
+ border-radius: 8rpx;
+ border: 1rPX solid #4275FC;
+ font-size: 32rpx;
+ font-weight: 500;
+ color: $nav-color;
+ }
+
+ .tg_footer_qr {
+ width: 100%;
+ height: 88rpx;
+ border: none;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: $nav-color;
+ border-radius: 8rpx;
+ font-size: 32rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ }
+ }
</style>
--
Gitblit v1.9.3