From 287934f48daa9889f824e12d1af687bc5aa3bbe2 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 14 八月 2023 18:59:20 +0800
Subject: [PATCH] 工资
---
web_standard/src/components/ext/OperaWorkorderDetailWindow.vue | 217 +++++++++++++++++++++++++-----------------------------
1 files changed, 101 insertions(+), 116 deletions(-)
diff --git a/web_standard/src/components/ext/OperaWorkorderDetailWindow.vue b/web_standard/src/components/ext/OperaWorkorderDetailWindow.vue
index a189878..a5bfa91 100644
--- a/web_standard/src/components/ext/OperaWorkorderDetailWindow.vue
+++ b/web_standard/src/components/ext/OperaWorkorderDetailWindow.vue
@@ -1,28 +1,23 @@
<template>
- <GlobalWindow
- :title="title"
- width="1182px"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- >
+ <GlobalWindow :title="title" width="1182px" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
<div style="min-width:1150px">
<el-form :model="form" ref="form" label-width="100px" label-suffix="锛�" inline>
<div style="margin-bottom:15px">
<span class="text-code">{{ form.procedureName + ' | ' + form.mmodel.name + ' ' + form.mmodel.code }}</span>
<!-- 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ユ銆�3宸叉楠屻��4宸叉姤宸ャ�併��6宸插彇娑� -->
- <span v-if="form.status==0" style="background-color: #305ED5;" class="status-log">宸插垱寤�</span>
- <span v-else-if="form.status==6" style="background-color: #BBBBBB;" class="status-log">宸插彇娑�</span>
- <span v-else style="background-color: #03AF76;" class="status-log">{{ form.status==1 ? '宸插鏂�' : form.status==2 ? '宸插畬宸ユ' : form.status==3 ? '宸叉楠�' : '宸叉姤宸�' }}</span>
+ <span v-if="form.status == 0" style="background-color: #305ED5;" class="status-log">宸插垱寤�</span>
+ <span v-else-if="form.status == 6" style="background-color: #BBBBBB;" class="status-log">宸插彇娑�</span>
+ <span v-else style="background-color: #03AF76;" class="status-log">{{ form.status == 1 ? '宸插鏂�' : form.status == 2 ?
+ '宸插畬宸ユ' : form.status == 3 ? '宸叉楠�' : '宸叉姤宸�' }}</span>
<!-- <span v-if="form.status==3" style="background-color: #BBBBBB;" class="status-log">宸插彇娑�</span> -->
</div>
- <el-form-item label="宸ュ崟缂栧彿" prop="workorderCode" class="count-style" >
+ <el-form-item label="宸ュ崟缂栧彿" prop="workorderCode" class="count-style">
{{ form.code }}
</el-form-item>
- <el-form-item label="鐢熶骇鏃ユ湡" prop="proTime" class="count-style" >
+ <el-form-item label="鐢熶骇鏃ユ湡" prop="proTime" class="count-style">
{{ form.planDate }}
</el-form-item>
- <el-form-item label="鐢熶骇鎵规鍙�" prop="batch" class="count-style" >
+ <el-form-item label="鐢熶骇鎵规鍙�" prop="batch" class="count-style">
{{ form.batch }}
</el-form-item>
<!-- <el-form-item label="璁″垝浜哄憳" prop="planUser" class="count-style" >
@@ -31,8 +26,8 @@
<el-form-item label="璁″垝鏃ユ湡" prop="planDate" class="count-style" >
{{ form.pmodel.createTime }}
</el-form-item> -->
- <el-form-item label="鐢熶骇鏁伴噺" prop="machine" class="count-style" >
- {{ form.planNum ? (form.planNum + (form.umodel.name ? form.umodel.name : '')) : '0' }}
+ <el-form-item label="鐢熶骇鏁伴噺" prop="machine" class="count-style">
+ {{ form.planNum ? (form.planNum + (form.umodel.name ? form.umodel.name : '')) : '0' }}
</el-form-item>
<!-- <el-form-item label="璁″垝鏁伴噺" prop="planNum" class="count-style" >
{{ form.pmodel.num }}
@@ -43,42 +38,36 @@
<!-- <el-form-item label="鍙戝竷鏃ユ湡" prop="startDate" class="count-style" >
{{ form.pmodel.publishDate }}
</el-form-item> -->
- <el-form-item label="鍘熷伐鍗曞彿" prop="originWorkorderId" class="count-style" >
+ <el-form-item label="鍘熷伐鍗曞彿" prop="originWorkorderId" class="count-style">
{{ form.originWorkorderId }}
</el-form-item>
- <el-form-item label="鍒嗛厤浜哄憳" prop="distributeUser" class="count-style" >
+ <el-form-item label="鍒嗛厤浜哄憳" prop="distributeUser" class="count-style">
{{ form.userName }}
</el-form-item>
- <el-form-item label="鍒嗛厤鏃堕棿" prop="distributeTime" class="count-style" >
+ <el-form-item label="鍒嗛厤鏃堕棿" prop="distributeTime" class="count-style">
{{ form.createTime }}
</el-form-item>
- <el-form-item label="鐢熶骇浜哄憳" prop="proUser" class="count-style" >
-
+ <el-form-item label="鐢熶骇浜哄憳" prop="proUser" class="count-style">
+
<div v-for="(item, index) in form.proUserList" :key="index">{{ item.proUserDepartName }}</div>
<!-- {{ form.proUserName + (form.proUserDepartName ? ('/' + form.proUserDepartName) : '') }} -->
</el-form-item>
- <el-form-item label="鐢熶骇璁惧" prop="machine" class="count-style" >
- {{ form.pgmodel && `銆�${form.pgmodel.code}銆�${form.pgmodel.name}`}}
+ <el-form-item label="鐢熶骇璁惧" prop="machine" class="count-style">
+ {{ form.pgmodel && `銆�${form.pgmodel.code}銆�${form.pgmodel.name}` }}
</el-form-item>
-
- <el-form-item label="鍚堟牸鏁伴噺" prop="qualifiedNum" class="count-style" >
+
+ <el-form-item label="鍚堟牸鏁伴噺" prop="qualifiedNum" class="count-style">
{{ form.qualifiedNum ? (form.qualifiedNum + (form.umodel.name ? form.umodel.name : '')) : '0' }}
</el-form-item>
- <el-form-item label="涓嶈壇鏁伴噺" prop="unqualifiedNum" class="count-style" >
+ <el-form-item label="涓嶈壇鏁伴噺" prop="unqualifiedNum" class="count-style">
{{ form.unqualifiedNum ? (form.unqualifiedNum + (form.umodel.name ? form.umodel.name : '')) : '0' }}
</el-form-item>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="鐢熶骇鎶ュ伐" name="first">
- <el-table
- v-loading="isSearch"
- :data="report"
- border
- show-summary
- :summary-method="getReportSummaries"
- >
- <!-- stripe -->
+ <el-table v-loading="isSearch" :data="report" border show-summary :summary-method="getReportSummaries">
+ <!-- stripe -->
<el-table-column prop="createTime" label="鎶ュ伐鏃堕棿" min-width="140px"></el-table-column>
<el-table-column label="鐢熶骇浜哄憳" show-overflow-tooltip min-width="100px">
<template slot-scope="{row}">
@@ -86,11 +75,27 @@
</template>
</el-table-column>
<el-table-column prop="machine" label="鐢熶骇璁惧" min-width="100px">
- {{ form.pgmodel && `銆�${form.pgmodel.code}銆�${form.pgmodel.name}`}}
+ {{ form.pgmodel && `銆�${form.pgmodel.code}銆�${form.pgmodel.name}` }}
</el-table-column>
<!-- <el-table-column prop="amodel.code" label="宸ヨ瀹瑰櫒缂栧彿" show-overflow-tooltip="" min-width="100px"></el-table-column> -->
<el-table-column prop="mmodel.name" label="鐗╂枡鍚嶇О" show-overflow-tooltip min-width="100px"></el-table-column>
- <el-table-column prop="doneType" label="鎶ュ伐绫诲瀷" min-width="60px">
+ <el-table-column prop="qualifiedNum" label="鍚堟牸鏁伴噺" min-width="100px">
+ <template slot-scope="{row}">
+ <span class="valid-style">{{ row.qualifiedNum + row.umodel.name }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unqualifiedNum" label="涓嶈壇鏁伴噺" min-width="100px">
+ <template slot-scope="{row}">
+ <span class="unvalid-style">{{ row.unqualifiedNum + row.umodel.name }}</span>
+ <!-- <span :class="row.materialDonetype==0 ? 'valid-style' : ''">{{ row.num + row.umodel.name }}</span> -->
+ </template>
+ </el-table-column>
+ <el-table-column prop="num" label="鎶ュ伐鏁伴噺" min-width="100px">
+ <template slot-scope="{row}">
+ <span>{{ row.num + row.umodel.name }}</span>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column prop="doneType" label="鎶ュ伐绫诲瀷" min-width="60px">
<template slot-scope="{row}">
<span v-if="row.doneType==0" class="valid-style">鍚堟牸</span>
<span v-else-if="row.doneType==1" class="unvalid-style">涓嶈壇</span>
@@ -102,15 +107,11 @@
<template slot-scope="{row}">
<span :class="row.doneType==0 ? 'valid-style' : (row.doneType==1 ? 'unvalid-style' :(row.doneType==2 ? 'scrap-style' : ''))">{{ row.num ? (row.num + (row.umodel.name ? row.umodel.name : '')) : '0' }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</el-tab-pane>
<el-tab-pane label="鐢熶骇妫�楠�" name="second">
- <el-table
- v-loading="isSearch"
- :data="verify"
- stripe
- border>
+ <el-table v-loading="isSearch" :data="verify" stripe border>
<el-table-column prop="code" label="妫�楠岃褰曠紪鍙�" min-width="140px"></el-table-column>
<el-table-column prop="createTime" label="妫�楠屾椂闂�" min-width="140px"></el-table-column>
<el-table-column prop="smodelRealName" label="妫�楠屼汉鍛�" min-width="100px"></el-table-column>
@@ -138,30 +139,23 @@
</el-table-column>
<el-table-column prop="devmodel.code" label="鐢熶骇璁惧" min-width="100px">
<template slot-scope="{row}">
- {{ row.devmodel && `銆�${row.devmodel.code}銆�${row.devmodel.name}`}}
+ {{ row.devmodel && `銆�${row.devmodel.code}銆�${row.devmodel.name}` }}
</template>
</el-table-column>
<!-- <el-table-column prop="proUserids" label="鐢熶骇浜哄憳" show-overflow-tooltip min-width="100px"></el-table-column> -->
</el-table>
</el-tab-pane>
<el-tab-pane label="鐢熶骇鎶曟枡" name="third">
- <el-table
- v-loading="isSearch"
- :data="feeds"
- stripe
- border
- show-summary
- :summary-method="getPutSummaries"
- >
+ <el-table v-loading="isSearch" :data="feeds" stripe border show-summary :summary-method="getPutSummaries">
<el-table-column prop="createTime" label="鎶曟枡鏃堕棿" min-width="140px"></el-table-column>
<!-- <el-table-column prop="amodel.code" label="宸ヨ瀹瑰櫒缂栧彿" min-width="100px"></el-table-column> -->
<el-table-column prop="mmodel.name" label="鐗╂枡鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="promodel.name" label="宸ュ簭鍚嶇О" min-width="100px"></el-table-column>
<el-table-column label="璐ㄩ噺灞炴��" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.materialDonetype==0" class="valid-style">鍚堟牸</span>
- <span v-else-if="row.materialDonetype==1" class="unvalid-style">涓嶈壇</span>
- <span v-else-if="row.materialDonetype==2" class="scrap-style">鎶ュ簾</span>
+ <span v-if="row.materialDonetype == 0" class="valid-style">鍚堟牸</span>
+ <span v-else-if="row.materialDonetype == 1" class="unvalid-style">涓嶈壇</span>
+ <span v-else-if="row.materialDonetype == 2" class="scrap-style">鎶ュ簾</span>
<span v-else>-</span>
</template>
</el-table-column>
@@ -178,12 +172,7 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="鐢熶骇鐐规" name="fourth">
- <el-table
- v-loading="isSearch"
- :data="check"
- stripe
- border
- >
+ <el-table v-loading="isSearch" :data="check" stripe border>
<el-table-column prop="createTime" label="璁板綍鏃堕棿" min-width="140px"></el-table-column>
<el-table-column prop="userName" label="鎿嶄綔浜哄憳" min-width="100px"></el-table-column>
<el-table-column prop="attrName" label="妫�鐐瑰睘鎬�" min-width="100px"></el-table-column>
@@ -203,12 +192,8 @@
<el-table-column prop="value" align="left"></el-table-column>
</el-table> -->
</el-tab-pane>
- <Pagination
- style="margin-top:10px"
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="pagination"
- ></Pagination>
+ <Pagination style="margin-top:10px" @size-change="handleSizeChange" @current-change="handlePageChange"
+ :pagination="pagination"></Pagination>
</el-tabs>
</div>
<div slot="footer" class="window__header">
@@ -229,7 +214,7 @@
name: 'OperaWorkorderDetailWindow',
extends: BaseOpera,
components: { GlobalWindow, Pagination },
- data () {
+ data() {
return {
// 琛ㄥ崟鏁版嵁
form: {
@@ -287,7 +272,7 @@
}
},
inject: ['origins'],
- created () {
+ created() {
this.config({
api: '/ext/materialExt',
'field.id': 'id'
@@ -302,39 +287,39 @@
// })
},
methods: {
- open (title, target) {
+ open(title, target) {
this.title = title
this.visible = true
this.activeName = 'first',
- // 缂栬緫
- this.$nextTick(() => {
- for (const key in this.form) {
- this.form[key] = target[key]
- }
- // console.log('this.form', this.form)
- workorderRecordExtPage(
- {
- capacity: this.pagination.pageSize,
- model: {
- type: 1,
- workorderId: this.form.id
- },
- page: this.pagination.pageIndex,
- sorts: null
- })
- .then(res => {
- // console.log(res)
- this.report = res.records
- this.pagination.pageIndex = res.page
- this.pagination.total = res.total
- this.pagination.pageSize = res.capacity
- })
- .catch(err => {
- console.log(err)
- })
- })
+ // 缂栬緫
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ // console.log('this.form', this.form)
+ workorderRecordExtPage(
+ {
+ capacity: this.pagination.pageSize,
+ model: {
+ type: 1,
+ workorderId: this.form.id
+ },
+ page: this.pagination.pageIndex,
+ sorts: null
+ })
+ .then(res => {
+ // console.log(res)
+ this.report = res.records
+ this.pagination.pageIndex = res.page
+ this.pagination.total = res.total
+ this.pagination.pageSize = res.capacity
+ })
+ .catch(err => {
+ console.log(err)
+ })
+ })
},
- cancel () {
+ cancel() {
this.$refs.form.resetFields()
this.activeName = 'first'
this.pagination.pageIndex = 1
@@ -342,21 +327,21 @@
this.pagination.total = 0
this.visible = false
},
- statusToStr (status) {
+ statusToStr(status) {
for (const item of this.status) {
if (item.id === status) {
return item.name
}
}
},
- originToStr (id) {
+ originToStr(id) {
for (const item of this.origins()) {
if (item.id === id) {
return item.code
}
}
},
- columnStyle ({ row, column, rowIndex, columnIndex }) {
+ columnStyle({ row, column, rowIndex, columnIndex }) {
if (rowIndex % 2 === 0) {
// 淇敼姣忚绗竴涓崟鍏冩牸鐨勮儗鏅壊
return 'background:#f3f6fc;'
@@ -364,22 +349,22 @@
return 'background:#ffffff;'
}
},
- handleClick (tab, event) {
+ handleClick(tab, event) {
this.pagination.pageIndex = 1
this.pagination.pageSize = 10
this.pagination.total = 0
this.search()
},
- handleSizeChange (pageSize) {
+ handleSizeChange(pageSize) {
this.pagination.pageSize = pageSize
this.search()
},
- handlePageChange (pageIndex) {
+ handlePageChange(pageIndex) {
this.pagination.pageIndex = pageIndex
// console.log('鑾峰彇鏁版嵁')
this.search()
},
- search () {
+ search() {
if (this.activeName === 'first') {
workorderRecordExtPage(
{
@@ -389,7 +374,7 @@
workorderId: this.form.id
},
page: this.pagination.pageIndex,
- sorts: [{direction: "DESC", property: "CREATE_TIME"}]
+ sorts: [{ direction: "DESC", property: "CREATE_TIME" }]
})
.then(res => {
// console.log(res)
@@ -408,7 +393,7 @@
workorderId: this.form.id
},
page: this.pagination.pageIndex,
- sorts: [{direction: "DESC", property: "CREATE_TIME"}]
+ sorts: [{ direction: "DESC", property: "CREATE_TIME" }]
})
.then(res => {
// console.log(res.records)
@@ -429,7 +414,7 @@
workorderId: this.form.id
},
page: this.pagination.pageIndex,
- sorts: [{direction: "DESC", property: "CREATE_TIME"}]
+ sorts: [{ direction: "DESC", property: "CREATE_TIME" }]
})
.then(res => {
// console.log(res)
@@ -449,7 +434,7 @@
workorderId: this.form.id
},
page: this.pagination.pageIndex,
- sorts: [{direction: "DESC", property: "CREATE_TIME"}]
+ sorts: [{ direction: "DESC", property: "CREATE_TIME" }]
})
.then(res => {
// console.log(res)
@@ -463,7 +448,7 @@
})
}
},
- getPutSummaries (param) {
+ getPutSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
@@ -476,7 +461,7 @@
} else if (index === 5) {
sums[index] = '-';
return;
- }
+ }
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = 0
@@ -489,15 +474,12 @@
});
return sums
},
- getReportSummaries (param) {
+ getReportSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '鍚堣';
- return;
- } else if (index === 4) {
- sums[index] = '-';
return;
}
const values = data.map(item => Number(item[column.property]));
@@ -522,21 +504,24 @@
width: 23%;
// height: 32px;
}
+
::v-deep .el-form-item {
margin-bottom: 8px !important;
}
+
.text-code {
color: #333;
font-weight: 500;
padding-right: 15px;
font-size: 15px;
- vertical-align:middle;
+ vertical-align: middle;
}
+
.status-log {
padding: 1px 5px;
border-radius: 3px;
font-size: 12px;
- color:#fff;
- vertical-align:middle;
+ color: #fff;
+ vertical-align: middle;
}
</style>
--
Gitblit v1.9.3