From 5504233baae78e2c387ea740adf17c3bce22cd26 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 12 八月 2024 11:33:42 +0800
Subject: [PATCH] 1.增加页面缓存2.工资统计精度问题
---
src/views/workOrder/workOrderList.vue | 59 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 6f348d3..1fe2f04 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -738,21 +738,37 @@
<div style="display: flex;align-items: center">
<div style="font-weight: bolder">宸ュ簭閫夋嫨锛�</div>
- <el-drag-select
+
+ <el-select
v-model="stepSelectedValue"
- style="width:930px;"
+ class="stepSelectedValueClass"
+ style="width: 930px;"
multiple
placeholder="璇烽�夋嫨鐩稿搴斿伐搴�"
@change="stepSelectedValueChange"
>
- <!-- :disabled="!(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"-->
<el-option
v-for="item in stepSelectArr"
:key="item.stepcode"
:label="item.stepname"
:value="item.stepcode"
/>
- </el-drag-select>
+ </el-select>
+
+ <!-- <el-drag-select-->
+ <!-- v-model="stepSelectedValue"-->
+ <!-- style="width:930px;"-->
+ <!-- multiple-->
+ <!-- placeholder="璇烽�夋嫨鐩稿搴斿伐搴�"-->
+ <!-- @change="stepSelectedValueChange"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in stepSelectArr"-->
+ <!-- :key="item.stepcode"-->
+ <!-- :label="item.stepname"-->
+ <!-- :value="item.stepcode"-->
+ <!-- />-->
+ <!-- </el-drag-select>-->
</div>
<el-table
@@ -1337,7 +1353,7 @@
>
<div class="elForm">
<el-form-item label="閿�鍞崟鍙�:" class="formContent">
- {{ formApprove.saleOrderCode ?formApprove.saleOrderCode :'/' }}
+ {{ formApprove.saleOrderCode ? formApprove.saleOrderCode : '/' }}
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿:" class="formContent">
{{ formApprove.mesordercode }}
@@ -1466,7 +1482,7 @@
>
<div class="elForm">
<el-form-item label="閿�鍞崟鍙�:" class="formContent">
- {{ formApprove.saleOrderCode ?formApprove.saleOrderCode :'/' }}
+ {{ formApprove.saleOrderCode ? formApprove.saleOrderCode : '/' }}
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿:" class="formContent">
{{ formApprove.mesordercode }}
@@ -2223,7 +2239,8 @@
type="primary"
style="margin-left: 37px"
@click="view"
- >棰� 瑙�/涓� 杞�</el-button>
+ >棰� 瑙�/涓� 杞�
+ </el-button>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -2265,6 +2282,7 @@
import DateType from '@/components/DateType'
import { PartSelectRpute, RouteSelectStep } from '@/api/basicSettings'
import { DeviceSopSearch } from '@/api/DeviceManager'
+
export default {
name: 'WorkOrderList',
components: {
@@ -2939,7 +2957,7 @@
})
},
// 鎸夊伐搴忔ā寮忚蛋鐨勬椂鍊� 寮曠敤鍩虹璧勬枡 宸ヨ壓
- async getBasicProcessData() {
+ async getBasicProcessData() {
const { data: res } = await PartSelectRpute({ partcode: this.dialogForm.partcode })
res.sort((a, b) => a.step_seq - b.step_seq)
this.stepTableData = []
@@ -2974,7 +2992,7 @@
}
},
- async getPartcodeChangeDialog() {
+ async getPartcodeChangeDialog() {
const { data: res } = await PartSelectRpute({ partcode: this.dialogForm.partcode })
this.routecodeArr = res
@@ -3015,7 +3033,7 @@
}
},
- async getMesOrderNewStepContent() {
+ async getMesOrderNewStepContent() {
// if (!this.mesSetting.route && this.operation === 'edit') {
// return
// }
@@ -3221,10 +3239,10 @@
div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
})
- // const div = document.getElementById('qrCode')
- // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁＄畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉＄殑楂樺害涓哄灏�
- // div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
- // div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
+ // const div = document.getElementById('qrCode')
+ // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁＄畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉＄殑楂樺害涓哄灏�
+ // div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
+ // div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
}
})
@@ -3701,6 +3719,13 @@
<style lang="scss" scoped>
$main_color: #42b983;
+.stepSelectedValueClass{
+ ::v-deep input{
+ //min-height: 34px !important;
+ height: 68px !important;
+ }
+}
+
.dialogVisibleRoute {
.myCheckboxGroup {
display: flex;
@@ -4006,8 +4031,8 @@
}
</style>
<style>
-.sortable-ghost{
+.sortable-ghost {
opacity: .8;
- color: #fff!important;
- background: #42b983!important;
+ color: #fff !important;
+ background: #42b983 !important;
}
--
Gitblit v1.9.3