From 5aab6ac6995253fd7b68c0f32b75e4ddcc946dc7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 14 十一月 2022 16:25:24 +0800
Subject: [PATCH] 1.根据需求修改报工界面样式
---
src/views/scgl/sckbg.vue | 88 ++++++++++++++++++++++++++-----------------
1 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 6107924..c272afa 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -490,7 +490,7 @@
:visible.sync="dialogVisible"
width="850px"
class="dialogVisible"
- :top="dialogTitle==='鑷埗鎶ュ伐'?'5vh':'15vh'"
+ top="15vh"
:close-on-click-modal="false"
@close="handleClose"
@closed="handleClose"
@@ -563,36 +563,52 @@
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�">
<div style="width: 200px">{{ dialogForm.nextstepname }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="productionType" label="鐢熶骇绫诲瀷锛�">
+ <!-- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="productionType" label="鐢熶骇绫诲瀷锛�">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.productionType"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- @change="usergroupChange111"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in productionTypeSelect"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" :prop="dialogForm.productionType==='personal'?'':'usergroupcode'" label="鐢熶骇鐝粍锛�">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.usergroupcode"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- @change="usergroupChange"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in ZZtreams"-->
+ <!-- :key="item.group_code"-->
+ <!-- :label="item.group_name"-->
+ <!-- :value="item.group_code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="productionType" label="鎶ュ伐浜哄憳锛�">
<el-select
- v-model="dialogForm.productionType"
+ v-model="dialogForm.reportuser"
style="width: 200px;"
placeholder="璇烽�夋嫨"
- @change="usergroupChange111"
>
<el-option
- v-for="item in productionTypeSelect"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in ZZuserArr"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
/>
</el-select>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" :prop="dialogForm.productionType==='personal'?'':'usergroupcode'" label="鐢熶骇鐝粍锛�">
- <el-select
- v-model="dialogForm.usergroupcode"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- @change="usergroupChange"
- >
- <el-option
- v-for="item in ZZtreams"
- :key="item.group_code"
- :label="item.group_name"
- :value="item.group_code"
- />
- </el-select>
- </el-form-item>
+
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�" prop="eqpcode">
<el-select
v-model="dialogForm.eqpcode"
@@ -634,7 +650,7 @@
<!-- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐浜哄憳锛�">-->
<!-- <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />-->
<!-- </el-form-item>-->
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐浜猴細">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎿嶄綔浜哄憳锛�">
<el-select
v-model="dialogForm.operation"
style="width: 200px;"
@@ -651,7 +667,8 @@
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="澶囨敞锛�">
<el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
</el-form-item>
- <div v-if="dialogTitle==='鑷埗鎶ュ伐'">
+ <!-- <div v-if="dialogTitle==='鑷埗鎶ュ伐'">-->
+ <div v-if="false">
<i class="el-icon-s-operation" style="color:#42b983;" /> 浜哄憳鍒楄〃
<el-button type="primary" style="margin: 10px 0" @click="userAdd">澧炶</el-button>
<el-table
@@ -1935,7 +1952,7 @@
this.dialogForm.reportqty = '', // 宸叉姤鏁伴噺
this.dialogForm.noreportqty = '', // 鏈姤鏁伴噺
this.dialogForm.startqty = '', // 寮�(鎶�)宸ユ暟閲�
-
+ this.dialogForm.reportuser = '', // 鎶ュ伐浜哄憳
this.dialogForm.wxcode = '', // 澶栧崗渚涘簲鍟嗙紪鐮�
this.dialogForm.outuser = '', // 鍙戞枡浜哄憳
this.dialogForm.taskqty = '', // 浠诲姟鏁伴噺
@@ -2068,9 +2085,9 @@
if (parseFloat(this.dialogForm.startqtySum) < parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.noputqty)) {
return this.$message.info('鎶ュ伐鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈姤鏁伴噺!')
}
- if (this.userTableData.length < 1) {
- return this.$message.info('浜哄憳鍒楄〃涓嶈兘涓虹┖!')
- }
+ // if (this.userTableData.length < 1) {
+ // return this.$message.info('浜哄憳鍒楄〃涓嶈兘涓虹┖!')
+ // }
if (parseFloat(this.dialogForm.noputqty) > 0) {
if (this.dialogForm.badcode.length < 1) {
@@ -2078,13 +2095,13 @@
}
}
// this.userTableData = [...new Set(this.userTableData)]// 鏁扮粍鍘婚噸
- this.userTableData = this.userTableData.filter(item => item.usercode !== '')
+ // this.userTableData = this.userTableData.filter(item => item.usercode !== '')
// 鏁扮粍涓璞＄浉鍚岀殑鍘婚噸
- this.userTableData = this.userTableData.filter((currentValue, currentIndex, selfArr) => {
- return selfArr.findIndex(item => item.usercode === currentValue.usercode) === currentIndex
- })
+ // this.userTableData = this.userTableData.filter((currentValue, currentIndex, selfArr) => {
+ // return selfArr.findIndex(item => item.usercode === currentValue.usercode) === currentIndex
+ // })
// console.log(this.userTableData, 1)
- const reportuser = this.userTableData.map(item => item.usercode).join(';')
+ // const reportuser = this.userTableData.map(item => item.usercode).join(';')
const data = {
mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
@@ -2092,7 +2109,8 @@
stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
eqpcode: this.dialogForm.eqpcode, // 璁惧缂栫爜
usergroupcode: this.dialogForm.usergroupcode, // 鐝粍缂栫爜
- reportuser: reportuser, // 鎶ュ伐浜哄憳
+ // reportuser: reportuser, // 鎶ュ伐浜哄憳
+ reportuser: this.dialogForm.reportuser, // 鎶ュ伐浜哄憳
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
// startqty: this.dialogForm.startqty, // 寮�宸ユ暟閲�
startqty: this.dialogForm.reportqty, // 寮�宸ユ暟閲�
--
Gitblit v1.9.3