From 844adb3a80b39f9a78dae89a6a27f19e58a931df Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 09 一月 2024 10:34:58 +0800
Subject: [PATCH] 1.图片预览地址配置
---
src/views/produce/stepReport.vue | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 1275cd3..6d727e9 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -88,6 +88,23 @@
@keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
/>
</el-form-item>
+ <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+ <el-select
+ v-model="form.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
+
<!-- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
<!-- <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />-->
<!-- </el-form-item>-->
@@ -205,6 +222,13 @@
</template>
</el-table-column>
<el-table-column
+ prop="wkshp_name"
+ min-width="110"
+ show-tooltip-when-overflow
+ label="杞﹂棿鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
prop="stepname"
label="宸ュ簭鍚嶇О"
show-tooltip-when-overflow
@@ -316,8 +340,10 @@
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
- <el-divider v-if="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'||activeName==='涓嶈壇寰呭鐞�'" content-position="left">鍩烘湰淇℃伅
- </el-divider>
+ <!-- <el-divider v-if="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'||activeName==='涓嶈壇寰呭鐞�'" content-position="left">鍩烘湰淇℃伅</el-divider>-->
+ <el-divider v-if="activeName==='鐢熶骇鍒楄〃'" content-position="left">鎶ュ伐淇℃伅</el-divider>
+ <el-divider v-if="activeName==='澶栧崗鏀舵枡'" content-position="left">鏀舵枡淇℃伅</el-divider>
+ <el-divider v-if="activeName==='涓嶈壇寰呭鐞�'" content-position="left">寰呭鐞嗕俊鎭�</el-divider>
<el-form-item label="宸ュ崟缂栧彿" class="dialogFormItem">
<div class="dialogFormItemDiv">{{ dialogForm.wo_code }}</div>
</el-form-item>
@@ -328,13 +354,13 @@
<div class="dialogFormItemDiv">{{ dialogForm.partname }}</div>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿" class="dialogFormItem">
- <div class="dialogFormItemDiv">{{ dialogForm.partspec? dialogForm.partspec:'/' }}</div>
+ <div class="dialogFormItemDiv">{{ dialogForm.partspec ? dialogForm.partspec : '/' }}</div>
</el-form-item>
<el-form-item label="褰撳墠宸ュ簭" class="dialogFormItem">
<div class="dialogFormItemDiv">{{ dialogForm.stepname }}</div>
</el-form-item>
<el-form-item label="涓嬮亾宸ュ簭" class="dialogFormItem">
- <div class="dialogFormItemDiv">{{ dialogForm.nextstepname?dialogForm.nextstepname :'/' }}</div>
+ <div class="dialogFormItemDiv">{{ dialogForm.nextstepname ? dialogForm.nextstepname : '/' }}</div>
</el-form-item>
<el-form-item label="浠诲姟鏁伴噺" class="dialogFormItem">
<div class="dialogFormItemDiv">{{ dialogForm.planqty }}</div>
@@ -359,12 +385,13 @@
<div class="dialogFormItemDiv" style="color:red;">{{ dialogForm.noputqty }}</div>
</el-form-item>
- <el-form-item v-if="activeName==='鐢熶骇鍒楄〃'" prop="eqpcode" label="鎶ュ伐璁惧" class="dialogFormItem">
+ <el-form-item v-if="activeName==='鐢熶骇鍒楄〃'" label="鎶ュ伐璁惧" class="dialogFormItem">
<el-select
v-model="dialogForm.eqpcode"
style="width:200px"
placeholder="璇烽�夋嫨"
filterable
+ clearable
:popper-append-to-body="false"
>
<el-option
@@ -490,7 +517,7 @@
<el-input v-model="dialogForm.sqty" oninput="value=value.replace(/[^\d]/g,'')" style="width: 200px" />
</el-form-item>
- <el-divider v-if="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'" content-position="left">涓嶈壇鏄庣粏</el-divider>
+ <el-divider v-if="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'" content-position="left">涓嶈壇鏄庣粏淇℃伅</el-divider>
<el-button
v-if="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'"
v-waves
@@ -520,7 +547,6 @@
/>
<el-table-column
prop="stepcode"
- show-tooltip-when-overflow
label="缂洪櫡缂栫爜/鍚嶇О"
align="center"
min-width="450"
@@ -547,7 +573,6 @@
<el-table-column
prop="badqty"
label="涓嶈壇鏁伴噺"
- show-tooltip-when-overflow
align="center"
>
<template slot-scope="{row}">
@@ -660,7 +685,6 @@
<el-table-column
prop="repair_qty"
label="缁翠慨鍚堟牸鏁伴噺"
- show-tooltip-when-overflow
align="center"
>
<template slot-scope="{row}">
@@ -676,7 +700,6 @@
<el-table-column
prop="laborbad_qty"
label="宸ュ簾鏁伴噺"
- show-tooltip-when-overflow
align="center"
>
<template slot-scope="{row}">
@@ -692,7 +715,6 @@
<el-table-column
prop="materielbad_qty"
label="鏂欏簾鏁伴噺"
- show-tooltip-when-overflow
align="center"
>
<template slot-scope="{row}">
@@ -781,7 +803,7 @@
EqpPermissions,
GroupsPermissions,
GroupsPersonPermissions,
- PersonPermissions
+ PersonPermissions, PrentOrganizationNoCompany
} from '@/api/GeneralBasicData'
import { nanoid } from 'nanoid'
import { LabelBarCode } from '@/api/systemSetting'
@@ -798,6 +820,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: '',
wocode: '', // 宸ュ崟鍙�
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -807,6 +830,7 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
+ wkshopcodeArr: [],
total: 10,
tableData: [],
activeName: '鐢熶骇鍒楄〃',
@@ -816,6 +840,7 @@
{ code: 'IN', name: '澶栧崗鏀舵枡' },
{ code: 'BAD', name: '涓嶈壇寰呭鐞�' }
],
+
radioSelected: '', // 澶氶�夋閫変腑鍊�
dialogVisible: false,
@@ -931,6 +956,9 @@
const { data: res5 } = await CustomerPermissions() // 寰�鏉ュ崟浣�
this.wxArr = res5
+
+ const { data: res6 } = await PrentOrganizationNoCompany()// 鏃犲叕鍙哥殑缁勭粐涓嬫媺
+ this.wkshopcodeArr = res6
},
tabClick() {
let belong
@@ -1110,13 +1138,15 @@
this.dialogForm.eqpcode = res.eqpcode
this.dialogForm.eqpname = res.eqpname
- this.dialogForm.list = []
- res.list.forEach(i => {
- i.acceptQty = parseFloat(i.fqty) - parseFloat(i.sqty) - parseFloat(i.ng_qty) - parseFloat(i.laborbad_qty) - parseFloat(i.materielbad_qty)
- if (i.acceptQty > 0) {
- this.dialogForm.list.push(i)
- }
- })
+ if (this.activeName === '澶栧崗鏀舵枡') {
+ this.dialogForm.list = []
+ res.list.forEach(i => {
+ i.acceptQty = parseFloat(i.fqty) - parseFloat(i.sqty) - parseFloat(i.ng_qty) - parseFloat(i.laborbad_qty) - parseFloat(i.materielbad_qty)
+ if (i.acceptQty > 0) {
+ this.dialogForm.list.push(i)
+ }
+ })
+ }
// this.dialogForm.list = res.list
@@ -1293,8 +1323,8 @@
return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鍙敹鏁伴噺!')
}
- if (this.dialogForm.list.find(i => i.name === this.dialogForm.wxcode)) {
- if (this.dialogForm.list.find(i => i.name === this.dialogForm.wxcode).acceptQty < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
+ if (this.dialogForm.list.find(i => i.Name === this.dialogForm.wxcode)) {
+ if (this.dialogForm.list.find(i => i.Name === this.dialogForm.wxcode).acceptQty < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庤渚涘簲鍟嗗彲鏀舵暟閲�!')
}
} else {
@@ -1425,6 +1455,7 @@
})
},
reset() {
+ this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
@@ -1461,4 +1492,12 @@
justify-content: center;
}
+::v-deep .el-dialog .el-form-item__label {
+ font-weight: lighter !important;
+}
+
+::v-deep .el-dialog .el-divider__text {
+ font-weight: bolder !important;
+}
+
</style>
--
Gitblit v1.9.3