| minipro_standard/components/LabelSelection.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/components/workOrderInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/pages/index/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/pages_inspect/pages/InOperation/InOperation.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
minipro_standard/components/LabelSelection.vue
@@ -71,7 +71,7 @@ } .tag_item { min-width: 120rpx; padding: 14rpx 24rpx; padding: 14rpx; border-radius: 26rpx; text-align: center; flex-shrink: 0; minipro_standard/components/workOrderInfo.vue
@@ -79,7 +79,7 @@ color: #666666; line-height: 26rpx; } .order-info { border-bottom: 20rpx #f7f7f7 solid; } // .order-info { // border-bottom: 20rpx #f7f7f7 solid; // } </style> minipro_standard/pages/index/index.vue
@@ -195,6 +195,9 @@ this.windowHeight = res.windowHeight } }) uni.$on('success', () => { this.search(); }) this.loadData() }, methods: { minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
@@ -1,10 +1,6 @@ <template> <view> <workOrderInfo :orederMessage="info" /> <!-- <view class="bg_cate"> <view @click="clickIten(index)" :class="typeView == index ? 'bg_cate_item active' : 'bg_cate_item'" v-for="(item, index) in cate" :key="index">{{ item.name }}</view> </view> --> <div class="bg_list"> <div class="bg_list_item"> <div class="bg_list_item_top"> @@ -113,6 +109,49 @@ </div> </template> </div> <div class="bg_list_item"> <div class="bg_list_item_top"> <div class="bg_list_item_top_left"> <div class="bg_list_item_top_left_x bg_m"></div> <span>工资绩效</span> </div> </div> <div class="bg_list_item_h"> <div class="bg_list_item_num"> <div class="bg_list_item_num_item"> <span>计件方式</span> <div class="bg_list_item_num_item_list"> {{ performance.salaryType == 0 ? '计件' : '计时' }} </div> </div> </div> <div class="bg_list_item_num"> <div class="bg_list_item_num_item"> <span>工资单价</span> <div class="bg_list_item_num_item_sr"> <span class="color1">{{ (performance.salaryPrice / 10 / 10).toFixed(2) }}元/{{ performance.salaryType == 0 ? '件' : '时' }}</span> </div> </div> </div> <div class="bg_list_item_num"> <div class="bg_list_item_num_item"> <span>预计工资</span> <div class="bg_list_item_num_item_sr"> <span class="color1">{{ (performance.salary / 10 / 10).toFixed(2) }}元</span> </div> </div> </div> <div class="bg_list_item_num"> <div class="bg_list_item_num_item"> <span>达标率</span> <div class="bg_list_item_num_item_sr"> <span class="color1">{{ complianceRate }}%</span> </div> </div> </div> </div> </div> </div> </view> @@ -152,13 +191,6 @@ data() { return { workorderId: '', cate: [{ name: '生产' }, { name: '点检' } ], form: { time: '', efective: [], @@ -187,9 +219,15 @@ undesirableId: '', undesirable: 5 // 不良 }, pages: { capacity: 10, page: 1, total: 0 }, djData: [], cateList: [], finished: true, performance: {} }; }, onLoad(obj) { @@ -197,6 +235,7 @@ this.queryByIds() this.getOrocessRecords() this.getData() this.pageDJs() this.getOrocessRecordCC() uni.$on('spotAdd', () => { if (this.typeView == 1) { @@ -206,43 +245,23 @@ }) }, computed: { expectedSalary() { if (this.arrType.length === 0) return 0; // 按件计算 if (this.arrType[this.form.index].type == 0) { if (!this.produceFrom.qualified) return 0 if (this.arrType[this.form.index].unqualified == 1) { // 是否计入不良品 let total = Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable) return (total * (this.arrType[this.form.index].salary / 100)).toFixed(2) || 0 } else { return (Number(this.produceFrom.qualified) * (this.arrType[this.form.index].salary / 100)).toFixed( 2) || 0 } } else { if (!this.form.duration) return 0; let h = (this.form.duration / 60 / 60).toFixed(2) return (Number(h) * (this.arrType[this.form.index].salary / 10 / 10)).toFixed(2) || 0 } }, complianceRate() { if (this.arrType.length === 0) return 0; if (!this.produceFrom.qualified && !this.produceFrom.undesirable) return 0; if (!this.form.duration) return 0; if (!this.arrType[this.form.index].num) return 0; // 按件计算 // if (infoBox.value.type == 0) { if (this.arrType[this.form.index].unqualified == 1) { // 是否计入不良品 let a = ((Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable)) / (this.form if (!this.performance) return 0; if (!this.performance.duration) return 0; if (!this.performance.qualifiedNum && !this.performance.unqualifiedNum) return 0; if (this.performance.salaryUnqualified == 1) { // 是否计入不良品 let a = ((Number(this.performance.qualifiedNum) + Number(this.performance.unqualifiedNum)) / (this.performance .duration / 3600)).toFixed(2) let b = (this.arrType[this.form.index].num / (this.arrType[form.index].times / 3600)).toFixed(2) let b = (this.performance.salaryNum / (this.performance.salaryTimes / 3600)).toFixed(2) return ((Number(a) / Number(b)) * 100).toFixed(2) // let total = (Number(from.qualified) + Number(from.undesirable)) / ((from.duration * 60 * 60) * infoBox.value.num / ) // return total * infoBox.value.salary; } else { let a = (this.produceFrom.qualified / (this.form.duration / 3600)).toFixed(2) let b = (this.arrType[this.form.index].num / (this.arrType[this.form.index].times / 3600)).toFixed(2) let a = (this.performance.qualifiedNum / (this.performance.duration / 3600)).toFixed(2) // let b = (this.arrType[this.form.index].num / (this.arrType[this.form.index].times / 3600)).toFixed(2) let b = (this.performance.salaryNum / (this.performance.salaryTimes / 3600)).toFixed(2) return ((Number(a) / Number(b)) * 100).toFixed(2) // return Number(from.qualified) * infoBox.value.salary; } } }, @@ -465,9 +484,12 @@ getWorkorderRecordListStandard({ workorderId: this.workorderId }).then(res => { console.log(res.data[0]); debugger if (res.data.length > 0) { this.produceFrom.qualified = res.data[0].qualifiedNum this.produceFrom.undesirable = res.data[0].unqualifiedNum this.performance = res.data[0] } }) }, @@ -512,13 +534,13 @@ width: 100%; display: flex; flex-direction: column; margin-top: 30rpx; // margin-top: 30rpx; .bg_list_item { display: flex; flex-direction: column; // margin-bottom: 40rpx; border-bottom: 40rpx #f7f7f7 solid; // border-bottom: 40rpx #f7f7f7 solid; .kong { text-align: center; @@ -535,9 +557,8 @@ display: flex; align-items: center; justify-content: space-between; padding-left: 30rpx; padding-right: 30rpx; margin-bottom: 30rpx; padding: 30rpx; background-color: #f7f7f7; .bg_list_item_top_left { display: flex; minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue
@@ -1218,7 +1218,7 @@ .bottom-view { left: 40rpx; right: 40rpx; bottom: 0 bottom: 20rpx } } </style> minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
@@ -256,7 +256,6 @@ }; }, onLoad(option) { debugger this.id = option.id wTransferExtDetail(option.id) .then(res => { minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue
@@ -158,7 +158,6 @@ }; }, onLoad(option) { debugger this.id = option.id getBoundDetail({ id: option.id minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
@@ -252,7 +252,7 @@ <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 class="tg_footer_fh" @click="statistics = false" v-else-if="!isSubmit">返回修改</div> </div> </div> </u-popup> @@ -345,6 +345,7 @@ this.queryByIds() this.getOrocessRecords() this.getData() this.pageDJs() uni.$on('spotAdd', () => { if (this.typeView == 1) { this.pages.page = 1 @@ -415,6 +416,7 @@ item.active = index == 0 }) this.arrType = result.data } else { this.arrType = [] } @@ -642,7 +644,10 @@ }) this.isSubmit = Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable) <= this .info.planNum; console.log(this.isSubmit); debugger } } else { console.log('推式') if (this.feedingData.length === 0) { @@ -652,7 +657,6 @@ } if (this.produceFrom.qualified <= 0 && this.produceFrom.undesirable <= 0) { uni.$u.toast('产出明细不能为空') return } this.statisticsData = [] @@ -953,14 +957,14 @@ width: 100%; display: flex; flex-direction: column; margin-top: 30rpx; // margin-top: 30rpx; .bg_list_item { display: flex; flex-direction: column; // margin-bottom: 40rpx; border-bottom: 40rpx #f7f7f7 solid; // border-bottom: 40rpx #f7f7f7 solid; // .kong { text-align: center; padding: 30rpx 0; @@ -976,9 +980,9 @@ display: flex; align-items: center; justify-content: space-between; padding-left: 30rpx; padding-right: 30rpx; margin-bottom: 30rpx; background-color: #f7f7f7; padding: 30rpx; // padding-right: 30rpx; .bg_list_item_top_left { display: flex; @@ -1224,6 +1228,7 @@ .bg_plan { width: 100%; border-top: 20rpx #f7f7f7 solid; // height: 98px; padding: 30rpx; box-sizing: border-box; @@ -1409,7 +1414,7 @@ .bottom-view { left: 40rpx; right: 40rpx; bottom: 0 bottom: 20rpx } .bl_list { minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
@@ -383,6 +383,7 @@ }).then(res => { if (res.code === 200) { this.$store.dispatch('getUpcomingNum') uni.$emit('success') uni.$u.toast('操作成功') if (this.type == '4') { // 跳转完工入库详情 // uni.navigateTo({ @@ -434,6 +435,7 @@ if (res.code === 200) { this.$store.dispatch('getUpcomingNum') uni.$u.toast('操作成功') uni.$emit('success') uni.redirectTo({ url: `/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${this.id}` }) minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
@@ -352,6 +352,7 @@ if (res.code === 200) { this.$store.dispatch('getUpcomingNum') uni.$u.toast('操作成功') uni.$emit('success') uni.redirectTo({ url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${this.id}&dbid=${this.dbid}` }) @@ -371,6 +372,7 @@ if (res.code === 200) { this.$store.dispatch('getUpcomingNum') uni.$u.toast('操作成功') uni.$emit('success') uni.redirectTo({ url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.id}` })
