yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
jiyufei 2 months ago
parent 613fcaa12f 4157f12b7f
commit e2aef8608b
2 changed files with 331 additions and 1 deletions
Show Stats Download Patch File Download Diff File

306
jnpf-app/pages/yys/dayWork/components/PopSureInfo.vue
Unescape View File

@ -0,0 +1,306 @@
<template>
<view>
<u-popup
v-model="isShow"
mode="left"
:border-radius="10"
:closeable="true"
@close="fnCancel"
width="100%"
height="100%"
>
<u-row gutter="12">
<u-col span="12">
<view
:style="{ textAlign: 'center', height: '60px', lineHeight: '60px' }"
>
<text
:style="{ fontSize: '40rpx', fontWeight: 500, color: '#1D2129' }"
>报工详情</text
>
</view>
</u-col>
<u-col span="3" :style="{ padding: '5px', textAlign: 'right' }">
<text>机采数量：</text>
</u-col>
<u-col span="9" :style="{ padding: '5px' }">
<text>{{ dataItem.isConfirmNums }}</text>
</u-col>
<u-col span="3" :style="{ padding: '5px', textAlign: 'right' }">
<text>合格数量：</text>
</u-col>
<u-col span="9" :style="{ padding: '5px' }">
<text>{{ dataItem.defectiveNum }}</text>
</u-col>
<u-col span="3" :style="{ padding: '5px', textAlign: 'right' }">
<text>次品数量：</text>
</u-col>
<u-col span="9" :style="{ padding: '5px' }">
<text>{{ dataItem.qualifiedNum }}</text>
</u-col>
<u-col span="3" :style="{ padding: '5px', textAlign: 'right' }">
<text>报工班组：</text>
</u-col>
<u-col span="9" :style="{ padding: '5px' }">
<text>{{ dataItem.groupName }}</text>
</u-col>
<u-col
v-if="dataItem.groupType == '1'"
span="12"
:style="{ padding: '5px' }"
>
<view
:style="{
color: '#0D0D26',
fontWeight: 'bloder',
textAlign: 'center',
padding: '10px',
}"
>
<text>报工成员(生成线报工)</text>
</view>
<view>
<u-table>
<u-tr class="u-tr">
<u-th>
<view class="u-th">
<text>姓名</text>
</view>
</u-th>
<u-th>
<view class="u-th">
<text>报工数量</text>
</view>
</u-th>
<u-th>
<view class="u-th">
<text>补偿工时</text>
</view>
</u-th>
</u-tr>
<u-tr
class="u-tr"
v-for="(
prodReportItem, prodReportIndex
) in dataItem.prodReportList"
:key="prodReportIndex"
>
<u-td>
<view class="u-td">
{{ fnReportMemberName(prodReportItem.reportMember) }}
</view>
</u-td>
<u-td>
<view class="u-td">
<text>{{ prodReportItem.defectiveNum }}</text>
</view>
</u-td>
<u-td>
<view class="u-td">
{{ prodReportItem.compensatoryHour }}
</view>
</u-td>
</u-tr>
</u-table>
</view>
</u-col>
<u-col
v-else-if="dataItem.groupType == '2'"
span="12"
:style="{ padding: '5px' }"
>
<view
:style="{
color: '#0D0D26',
fontWeight: 'bloder',
textAlign: 'center',
padding: '10px',
}"
>
<text>报工成员(包装线报工)</text>
</view>
<view>
<u-table>
<u-tr class="u-tr">
<u-th>
<view class="u-th">
<text>姓名</text>
</view>
</u-th>
<u-th>
<view class="u-th">
<text>报工数量</text>
</view>
</u-th>
<u-th>
<view class="u-th">
<text>补偿工时</text>
</view>
</u-th>
</u-tr>
<u-tr
class="u-tr"
v-for="(
packageReportItem, packageReportIndex
) in dataItem.packageReportList"
:key="packageReportIndex"
>
<u-td>
<view class="u-td">
{{ fnReportMemberName(packageReportItem.reportMember) }}
</view>
</u-td>
<u-td>
<view class="u-td">{{ packageReportItem.defectiveNum }}</view>
</u-td>
<u-td>
<view class="u-td">
{{ packageReportItem.compensatoryHour }}
</view>
</u-td>
</u-tr>
</u-table>
</view>
</u-col>
<u-col span="12" :style="{ padding: '5px' }">
<view
:style="{
color: '#0D0D26',
fontWeight: 'bloder',
textAlign: 'center',
padding: '10px',
}"
>
<text>领料上报</text>
</view>
<view>
<u-table>
<u-tr class="u-tr">
<u-th>
<view class="u-th">
<text>材料名称</text>
</view>
</u-th>
<u-th>
<view class="u-th">
<text>当班领用</text>
</view>
</u-th>
<u-th>
<view class="u-th">
<text>本班结存</text>
</view>
</u-th>
</u-tr>
<u-tr
class="u-tr"
v-for="(
requisitionReportItem, requisitionReportIndex
) in dataItem.requisitionReportList"
:key="requisitionReportIndex"
>
<u-td>
<view class="u-td">
{{ requisitionReportItem.materialName }}
</view>
</u-td>
<u-td>
<view class="u-td">
{{ requisitionReportItem.duty }}
</view>
</u-td>
<u-td>
<view class="u-td">
{{ requisitionReportItem.classBalance }}
</view>
</u-td>
</u-tr>
</u-table>
</view>
</u-col>
</u-row>
</u-popup>
<u-top-tips ref="uTips"></u-top-tips>
</view>
</template>
<script>
import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
import { mapGetters } from "vuex";
import { userList } from "@/api/yys/dayWork.js";
import dayjs from "dayjs";
export default {
components: {},
mixins: [],
data() {
return {
isShow: false,
dataItem: {},
reportMemberList: [],
};
},
watch: {},
computed: {},
onLoad(params) {},
onUnload() {},
methods: {
init(dataItem) {
this.fnReportMemberList();
this.dataItem = dataItem;
switch (this.dataItem.groupType) {
case "1":
this.dataItem.defectiveNum = this.dataItem.prodReportList[0]['defectiveNum']
this.dataItem.qualifiedNum = this.dataItem.prodReportList[0]['qualifiedNum']
break;
case "2":
this.dataItem.defectiveNum = this.dataItem.packageReportList[0]['defectiveNum']
this.dataItem.qualifiedNum = this.dataItem.packageReportList[0]['qualifiedNum']
break;
default:
break;
}
this.isShow = true;
},
fnCancel() {
this.dataItem = {};
this.isShow = false;
},
fnOk() {
this.fnCancel();
},
fnReportMemberList() {
userList()
.then((res) => {
if (res.code == 200) {
this.reportMemberList = res.data;
}
})
.catch((err) => {
console.log(err);
});
},
fnReportMemberName(reportMember) {
let _list = [...this.reportMemberList];
let _one = _list.find((o1) => {
return o1.id == reportMember;
});
if (_one) {
return _one.realName;
} else {
return "";
}
},
},
};
</script>
<style lang="scss" scoped>
/deep/.u-th {
width: 100%;
height: 32px;
}
/deep/.u-td {
width: 100%;
height: 32px;
}
</style>

26
jnpf-app/pages/yys/dayWork/index.vue
Unescape View File

@ -47,6 +47,7 @@
</view>
<view :style="{ textAlign: 'center' }" slot="foot">
<u-button
v-if="fnTabsNow(tabsCurrent)['flag'] == '1'"
size="mini"
:custom-style="{
color: 'white',
@ -59,9 +60,24 @@
>
<text :style="{ padding: '20px' }">去确认</text>
</u-button>
<u-button
v-else-if="fnTabsNow(tabsCurrent)['flag'] == '2'"
size="mini"
:custom-style="{
color: 'white',
margin: '5px',
backgroundColor: '#2A4BB4',
}"
:plain="true"
shape="circle"
@click="fnPopSureInfo(orderItem)"
>
<text :style="{ padding: '20px' }">查看详情</text>
</u-button>
</view>
</u-card>
<PopSure ref="refPopSure" @evtRefresh="fnRefreshA"></PopSure>
<PopSureInfo ref="refPopSureInfo"></PopSureInfo>
<u-top-tips ref="uTips"></u-top-tips>
</view>
</template>
@ -78,8 +94,9 @@ import {
import { confirm } from "@/api/yys/dayWork.js";
import CustomNavbar from "./components/CustomNavbar";
import PopSure from "./components/PopSure";
import PopSureInfo from "./components/PopSureInfo";
export default {
components: { CustomNavbar, PopSure },
components: { CustomNavbar, PopSure, PopSureInfo },
mixins: [],
data() {
return {
@ -103,6 +120,10 @@ export default {
this.tabsCurrent = index;
this.fnGetList();
},
fnTabsNow(tabsCurrent) {
let tabsNow = this.tabsList[this.tabsCurrent];
return tabsNow;
},
fnGetList() {
let tabsNow = this.tabsList[this.tabsCurrent];
let params = {
@ -122,6 +143,9 @@ export default {
fnPopSure(orderItem) {
this.$refs.refPopSure.init(orderItem);
},
fnPopSureInfo(orderItem) {
this.$refs.refPopSureInfo.init(orderItem);
},
fnRefreshA() {
this.$refs.uTips.show({
title: "报工确认提交成功",

Write Preview
Loading…
Cancel
Save