From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/technology/document/document-form.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index 6877f74..19348cf 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -11,7 +11,7 @@
</div>
</div>
<div class="page-main">
- <div class="document-basic">
+ <div class="document-basic" style="height: 28%;">
<el-form
:model="dataForm"
:rules="dataRule"
@@ -160,6 +160,15 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="椤圭洰鍙�" prop="projectNo">
+ <el-input
+ v-model="dataForm.projectNo"
+ placeholder="椤圭洰鍙�"
+ style="width:100%"
+ ></el-input>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="澶囨敞" prop="remark">
<el-input
@@ -854,7 +863,7 @@
{ required: true, message: '鐗堟湰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
],
projectNo: [
- { required: true, message: '椤圭洰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
+ // { required: true, message: '椤圭洰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
],
projectType: [
{ required: true, message: '椤圭洰绫诲埆涓嶈兘涓虹┖', trigger: 'change' }
@@ -1205,7 +1214,6 @@
if (this.currTechnologyName != null && this.currTechnologyName !== '') {
// 褰撶敤鎴峰垹闄ゅ伐鑹烘枃浠朵腑鍏宠仈鐨勫伐鑹鸿矾绾挎椂锛岃嫢璇ユ枃浠跺搴擝OM涓墍闇�鍗婃垚鍝佺殑宸ヨ壓璺嚎涔熷凡涓庡綋鍓嶅伐鑹烘枃浠跺叧鑱�
routingChildCheck(this.currTechnologyBomPartName).then((res) => {
- console.log('res', res.data)
const resData = res.data
let num = 0
if (resData.code === 0) {
@@ -1902,7 +1910,6 @@
if (this.dataForm.id) {
this.getDocumentInfo(this.dataForm.id)
}
- console.log('涓婁紶鎴愬姛')
},
handleStructureExceed(files, fileList) {
// this.$message.warning(
@@ -1944,7 +1951,6 @@
this.dialogFlowVisible = true
},
handleFlowSuccess(response, file, fileList) {
- console.log('涓婁紶鎴愬姛')
},
handleFlowExceed(files, fileList) {
this.$message.warning(
@@ -1988,8 +1994,6 @@
},
getSummaries(param) {
const { columns, data } = param
- // console.log(columns, 'A')
- // console.log(data, 'B')
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
--
Gitblit v1.9.3