From 9fdaed10b31fd0c5d365cf90ee454cb0f90ac1be Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 08 三月 2023 16:11:24 +0800
Subject: [PATCH] 1.提交
---
src/views/scgl/gd.vue | 32 ++++++++++++++++----------------
src/views/bbgl/bzgz.vue | 2 +-
src/views/scgl/sckbg.vue | 4 ++--
src/views/zzmx/gxdy.vue | 4 ++--
src/views/bbgl/rygz.vue | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 75d3358..4a48745 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -186,7 +186,7 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="璁颁欢宸ヨ祫"
+ label="璁′欢宸ヨ祫"
width="110"
sortable="custom"
>
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 0ebe102..eb67c62 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -189,7 +189,7 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="涓汉璁颁欢宸ヨ祫"
+ label="涓汉璁′欢宸ヨ祫"
width="130"
sortable="custom"
>
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 8bc0a55..00b1d41 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -20,7 +20,7 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label-width="70px" label="璁㈠崟鐘舵��" style=" display: flex;">
+ <el-form-item label-width="70px" label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.mesorderstus"
:popper-append-to-body="false"
@@ -37,7 +37,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
@@ -158,7 +158,7 @@
/>
<el-table-column
prop="status"
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟鐘舵��"
sortable="custom"
width="110"
>
@@ -449,7 +449,7 @@
label-width="110px"
>
<el-form-item
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟鐘舵��"
prop="mesorderstus"
>
<el-select
@@ -843,7 +843,7 @@
size="mini"
/>
</el-form-item>
- <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
+ <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
v-model="sourceForm.erporderstus"
filterable
@@ -859,7 +859,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandDialog" label="璁㈠崟缂栧彿" style=" display: flex;">
+ <el-form-item v-show="isExpandDialog" label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧缂栫爜" style=" display: flex;">
@@ -940,12 +940,12 @@
/>
<el-table-column
prop="status"
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟鐘舵��"
sortable="custom"
width="110"
>
<template slot-scope="{row}">
- <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+ <div v-if="row.status==='NEW'">鏂板伐鍗�</div>
<div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>
<div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>
<div v-if="row.status==='CLOSED'">宸插叧闂�</div>
@@ -953,7 +953,7 @@
</el-table-column>
<el-table-column
prop="wo"
- label="璁㈠崟缂栧彿"
+ label="宸ュ崟缂栧彿"
sortable="custom"
min-width="150"
/>
@@ -982,7 +982,7 @@
</el-table-column>
<el-table-column
prop="qty"
- label="璁㈠崟鏁伴噺"
+ label="宸ュ崟鏁伴噺"
width="150"
sortable="custom"
/>
@@ -1680,7 +1680,7 @@
operation: '',
dialogFormRules: {
mesorderstus: [
- { required: true, message: '璇烽�夋嫨璁㈠崟鐘舵��', trigger: ['blur', 'change'] }
+ { required: true, message: '璇烽�夋嫨宸ュ崟鐘舵��', trigger: ['blur', 'change'] }
],
partcode: [
{ required: true, message: '璇烽�夋嫨浜у搧淇℃伅', trigger: ['blur', 'change'] }
@@ -1782,8 +1782,8 @@
dialogVisibleSource: false,
sourceTableData: [],
sourceForm: {
- erporderstus: '', // 璁㈠崟鐘舵�佺爜
- erpordercode: '', // 璁㈠崟缂栧彿
+ erporderstus: '', // 宸ュ崟鐘舵�佺爜
+ erpordercode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
@@ -1880,7 +1880,7 @@
const { data: res1 } = await PartSelect()
this.partArr = res1
},
- // 璁㈠崟鐘舵�佹敼鍙樻椂
+ // 宸ュ崟鐘舵�佹敼鍙樻椂
erporderstusChange(val) {
this.form.mesorderstus = val
},
@@ -2411,8 +2411,8 @@
}
const data = {
- erporderstus: this.sourceForm.erporderstus, // 璁㈠崟鐘舵�佺爜
- erpordercode: this.sourceForm.erpordercode, // 璁㈠崟缂栧彿
+ erporderstus: this.sourceForm.erporderstus, // 宸ュ崟鐘舵�佺爜
+ erpordercode: this.sourceForm.erpordercode, // 宸ュ崟缂栧彿
partcode: this.sourceForm.partcode, // 浜у搧缂栫爜
partname: this.sourceForm.partname, // 浜у搧鍚嶇О
partspec: this.sourceForm.partspec, // 浜у搧瑙勬牸
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 0f6c542..a58e108 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1699,7 +1699,7 @@
this.dialogForm.startqty = obj.noreportqty
this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode
+ this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
this.dialogForm.startqtySum = obj.noreportqty
})
@@ -1760,7 +1760,7 @@
this.dialogForm.stepcode = obj.stepcode
this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode
+ this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
this.dialogForm.noputqty = obj.noputqty
this.dialogForm.stepseq = obj.seq
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index edc9fc6..21754f1 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -364,7 +364,7 @@
:data="workDialogForm.workTreeArr"
show-checkbox
node-key="code"
- style="height: 280px;"
+ style="height: 280px;overflow: auto"
default-expand-all
:props="workTreeDefaultProps"
@check="checkBoxClick"
@@ -411,7 +411,7 @@
:data="defectTree"
show-checkbox
node-key="code"
- style="height: 400px;"
+ style="height: 400px;overflow: auto"
default-expand-all
:props="workTreeDefaultProps"
/>
--
Gitblit v1.9.3