From cd3d47e7fdb04ab40bb3e871637279ef0ca3ca23 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 13 十一月 2023 11:22:07 +0800
Subject: [PATCH] 1.生产报工 50%
---
pages/scgl/scbg.vue | 77 +++++++++++++++++---------------------
1 files changed, 35 insertions(+), 42 deletions(-)
diff --git a/pages/scgl/scbg.vue b/pages/scgl/scbg.vue
index 52b85e3..1d05155 100644
--- a/pages/scgl/scbg.vue
+++ b/pages/scgl/scbg.vue
@@ -50,7 +50,7 @@
<view>{{item.stepname}}</view>
<view>{{item.planqty}}</view>
<view>{{item.noreportqty}}/{{item.reportqty}}</view>
- <view>{{item.nextstepname}}</view>
+ <view>{{item.nextstepname?item.nextstepname:'/'}}</view>
</view>
</view>
@@ -230,7 +230,7 @@
</view>
<u-icon @click="deleteUser(item)" style="width: 50rpx;text-align: center;" name="trash"
- min='0' max='100' color="#2979ff" size="40">
+ min='0' max='100' color="#2979ff" size="24">
</u-icon>
</view>
@@ -275,7 +275,7 @@
<u-checkbox-group @change="checkboxChange" size='20px' v-model="checkBoxValue" iconPlacement="right"
placement="column">
<view v-for="(item,index) in badSelectArr">
- <u-checkbox activeColor="rgb(0, 102, 255)" labelSize='40' :key="item.code" :name='item.name'
+ <u-checkbox activeColor="rgb(0, 102, 255)" labelSize='18' :key="item.code" :name='item.name'
:label="item.name">
</u-checkbox>
<u-divider :key="item.code"></u-divider>
@@ -329,7 +329,12 @@
<script>
import {
- MesOrderStepStart
+ MesOrderStepStart,
+ PersonPermissions,
+ EqpPermissionsPlus,
+ GroupsPermissions,
+ GroupsPersonPermissions,
+ DefectPermissions
} from '../../config/api.js';
// import scanCode from '@/components/scan-code/scan-code.vue'
export default {
@@ -427,11 +432,11 @@
this.getMesOrderStepStart('SGPO20231110_1;101')
- // this.getMesOrderStepReportSelectUserGroup() //鑾峰彇鐢熶骇鐝粍
- // this.getMesOrderStepStartSelectEqp('MO-2023-02-1502;GX002') //鑾峰彇璁惧鍚嶇О
- // this.getMesOrderStepSelectCause('MO-2023-02-1502;GX002')
- // this.getMesOrderSelectUser() //鑾峰彇鎿嶄綔浜哄憳
- // this.getMesOrderGroupSelectUser('BZ001') //鏍规嵁鐝粍鑾峰彇浜哄憳
+ this.getGroupsPermissions() //鑾峰彇鐢熶骇鐝粍
+ this.getEqpPermissionsPlus() //鑾峰彇璁惧鍚嶇О
+ this.getDefectPermissions() //鑾峰彇缂洪櫡涓嬫媺
+ this.getPersonPermissions() //鑾峰彇鎿嶄綔浜哄憳
+ // this.getGroupsPersonPermissions('BZ001') //鏍规嵁鐝粍鑾峰彇浜哄憳
},
methods: {
init() {
@@ -439,50 +444,42 @@
},
//鑾峰彇鐢熶骇鐝粍
- async getMesOrderStepReportSelectUserGroup(wkshopcode) {
- const data = {
- stu_torgcode: uni.getStorageSync('stu_torgcode'),
- stu_torgtypecode: uni.getStorageSync('description'),
- wkshopcode
- }
+ async getGroupsPermissions(wkshopcode) {
- const res = await MesOrderStepReportSelectUserGroup(this.global.formatData(data))
+ const res = await GroupsPermissions()
if (res.code === '200') {
// 鏁扮粍瀵硅薄 鏇挎崲瀵硅薄閿悕
this.userGroupSheetList = res.data.map(({
- group_code,
- group_name
+ usergroupcode,
+ usergroupname
}) => ({
- code: group_code,
- name: group_name
+ code: usergroupcode,
+ name: usergroupname
}))
this.userGroupColumns = [this.userGroupSheetList.map(i => i.name)]
}
},
// 鑾峰彇璁惧鍚嶇О
- async getMesOrderStepStartSelectEqp(orderstepqrcode) {
- const res = await MesOrderStepStartSelectEqp(this.global.formatData({
- orderstepqrcode
- }))
+ async getEqpPermissionsPlus() {
+ const res = await EqpPermissionsPlus()
if (res.code === '200') {
this.eqpSheetList = res.data
this.eqpColumns = [this.eqpSheetList.map(i => i.name)]
}
},
// 鑾峰彇涓嶈壇鍘熷洜
- async getMesOrderStepSelectCause(orderstepqrcode) {
- const res = await MesOrderStepSelectCause(this.global.formatData({
- orderstepqrcode
- }))
+ async getDefectPermissions(orderstepqrcode) {
+ const res = await DefectPermissions()
if (res.code === '200') {
this.badSelectArr = res.data
}
},
// 鑾峰彇鎿嶄綔浜哄憳
- async getMesOrderSelectUser() {
- const res = await MesOrderSelectUser()
+ async getPersonPermissions() {
+ const res = await PersonPermissions()
if (res.code === '200') {
+ // this.operSheetList = res.data
this.operSheetList = res.data.map(({
usercode,
username
@@ -495,12 +492,8 @@
}
},
// 鏍规嵁鐢熶骇鐝粍鑾峰彇浜哄憳
- async getMesOrderGroupSelectUser(usergroupcode) {
- const data = {
- usergroupcode,
- stu_torgcode: uni.getStorageSync('stu_torgcode')
- }
- const res = await MesOrderGroupSelectUser(this.global.formatData(data))
+ async getGroupsPersonPermissions(usergroupcode) {
+ const res = await GroupsPersonPermissions()
if (res.code === '200') {
this.userArr = res.data
this.calculatedValue()
@@ -533,11 +526,11 @@
if (res.code === '200' && res.count === 1) {
this.formData = res.data
this.topContent.unshift(res.data)
- this.getMesOrderStepReportSelectUserGroup(res.data.wkshopcode)
- let o = res.data.wo_code + ';' + res.data.stepcode
- this.getMesOrderStepStartSelectEqp(o)
- this.getMesOrderStepSelectCause(o)
- this.getMesOrderSelectUser()
+ // this.getGroupsPermissions(res.data.wkshopcode)
+ // let o = res.data.wo_code + ';' + res.data.stepcode
+ // this.getEqpPermissionsPlus(o)
+ // this.getDefectPermissions(o)
+ // this.getPersonPermissions()
} else if (res.code === '200' && res.count !== 1) {
this.$u.toast('姝ゅ伐搴忓凡鎶ュ伐锛�')
@@ -806,7 +799,7 @@
},
userGroupPickerConfirm(val) {
console.log(val, 11)
- this.getMesOrderGroupSelectUser(this.userGroupSheetList.find(i => i.name === val.value[0]).code)
+ this.getGroupsPersonPermissions(this.userGroupSheetList.find(i => i.name === val.value[0]).code)
this.userGroupSheetValue = val.value[0]
this.userGroupSheetShow = false
},
--
Gitblit v1.9.3