From e232ce8f6b8d3a5784c4eb6b880c8bb04c9981c8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 22 三月 2024 09:53:00 +0800
Subject: [PATCH] 1.打印模板异常调整
---
src/views/produce/stepReport.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 2b67881..b48169f 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -41,18 +41,24 @@
</el-button>
</div>
+ <div v-if="form.wocode" style="position: absolute;left: 460px;z-index: 2;top: 23px;font-weight: bolder">
+ 褰撳墠宸ュ崟鍙蜂负锛歿{ form.wocode }}
+ </div>
+
<el-tabs
ref="elTabs"
v-model="activeName"
type="border-card"
@tab-click="tabClick"
>
+
<el-tab-pane
v-for="item in elTabsArr"
:key="item.code"
:label="item.name"
:name="item.name"
>
+
<div class="bodyTopFormGroup">
<el-form
ref="form"
@@ -65,10 +71,11 @@
<el-form-item label="宸ュ崟鍙�" style=" display: flex;">
<el-input
- v-model="form.wocode"
+ v-model="workOrderCurrentValue"
:name="'produceCode'+item.code"
placeholder="璇锋壂鎻忔垨杈撳叆"
style="width: 300px"
+
@keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
/>
</el-form-item>
@@ -77,6 +84,7 @@
v-model="form.partcode"
placeholder="璇疯緭鍏�"
style="width: 200px"
+
@keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
/>
</el-form-item>
@@ -84,10 +92,29 @@
<el-input
v-model="form.partname"
placeholder="璇疯緭鍏�"
+
style="width: 200px"
@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>-->
@@ -204,6 +231,13 @@
{{ row.partspec ? row.partspec : '/' }}
</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="宸ュ簭鍚嶇О"
@@ -361,12 +395,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
@@ -778,7 +813,7 @@
EqpPermissions,
GroupsPermissions,
GroupsPersonPermissions,
- PersonPermissions
+ PersonPermissions, PrentOrganizationNoCompany
} from '@/api/GeneralBasicData'
import { nanoid } from 'nanoid'
import { LabelBarCode } from '@/api/systemSetting'
@@ -795,6 +830,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: '',
wocode: '', // 宸ュ崟鍙�
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -804,6 +840,7 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
+ wkshopcodeArr: [],
total: 10,
tableData: [],
activeName: '鐢熶骇鍒楄〃',
@@ -813,6 +850,7 @@
{ code: 'IN', name: '澶栧崗鏀舵枡' },
{ code: 'BAD', name: '涓嶈壇寰呭鐞�' }
],
+
radioSelected: '', // 澶氶�夋閫変腑鍊�
dialogVisible: false,
@@ -897,7 +935,8 @@
wxArr: [], // 寰�鏉ュ崟浣嶄笅鎷�
defectTableData: [],
- badTableData: []
+ badTableData: [],
+ workOrderCurrentValue: ''
}
},
@@ -928,6 +967,9 @@
const { data: res5 } = await CustomerPermissions() // 寰�鏉ュ崟浣�
this.wxArr = res5
+
+ const { data: res6 } = await PrentOrganizationNoCompany()// 鏃犲叕鍙哥殑缁勭粐涓嬫媺
+ this.wkshopcodeArr = res6
},
tabClick() {
let belong
@@ -950,7 +992,7 @@
break
}
this.enterNative(this.form.wocode, belong)
- // this.search()
+
this.radioSelected = ''
},
enterNative(val, belong) {
@@ -991,6 +1033,8 @@
},
// 鏌ヨ
async search() {
+ this.form.wocode = this.workOrderCurrentValue
+ this.workOrderCurrentValue = ''
if (this.activeName === '鐢熶骇鍒楄〃') {
const res = await MesOrderStepSearch(this.form)
this.tableData = res.data
@@ -1292,8 +1336,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 {
@@ -1424,7 +1468,9 @@
})
},
reset() {
+ this.form.wkshopcode = ''
this.form.wocode = ''
+ this.form.workOrderCurrentValue = ''
this.form.partcode = ''
this.form.partname = ''
this.form.partspec = ''
--
Gitblit v1.9.3