From 0131c412252988303068ff25b908ed5f57d5e37b Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 27 十一月 2023 11:55:09 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 2
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue | 2
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 156 +++++++++++++++++++++++++++++++++++----------------
web/src/assets/css/custom.css | 3 +
4 files changed, 111 insertions(+), 52 deletions(-)
diff --git a/web/src/assets/css/custom.css b/web/src/assets/css/custom.css
index 060f782..5d4b486 100644
--- a/web/src/assets/css/custom.css
+++ b/web/src/assets/css/custom.css
@@ -324,6 +324,9 @@
.el-border-left {
border-left: 1px solid rgba(0, 0, 0, .2);
}
+.el-border-top {
+ border-top: 1px solid rgba(0, 0, 0, .2);
+}
.el-border-bottom {
border-bottom: 1px solid rgba(0, 0, 0, .2);
}
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index 94dea83..1a6c476 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -1,16 +1,17 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
- <el-form ref="dataForm" style="padding-top: 0" :inline="true" :model="dataForm" label-width="120px" class="ManageFormAuto">
- <div class="DManageForm">
- <el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: 0">
+ <el-form ref="dataForm" style="padding-top: 0" :inline="true" :model="dataForm" label-width="120px" class="warehouseFormAuto">
+ <div >
+ <el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
<span>{{dataForm.code}}</span>
</el-form-item>
</div>
- <div class="confirmDAuto DManageForm">
- <el-form-item label="椤圭洰缂栧彿" style="width: 49%">
+ <div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
+ <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="warehouseContentWidth">
+ <el-form-item class="marginTopAndMarginBottom" label="椤圭洰缂栧彿" style="width: 49%">
<el-input v-model="dataForm.itemNumber" placeholder="璇疯緭鍏ラ」鐩紪鍙�"></el-input>
</el-form-item>
- <el-form-item label="椤圭洰鍚嶇О" style="width: 49%">
+ <el-form-item class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 49%">
<el-input v-model="dataForm.name" placeholder="璇疯緭鍏ョ紪鍙峰悕绉�"></el-input>
</el-form-item>
<el-form-item label="鐢宠浜�" style="width: 49%">
@@ -19,34 +20,66 @@
<el-form-item label="鐢宠鏃ユ湡" style="width: 49%">
<el-input v-model="dataForm.date" placeholder="璇疯緭鍏ョ紪鍙峰悕绉�"></el-input>
</el-form-item>
- <el-form-item label="搴撶被鍨�" style="width: 99%">
+ <el-form-item class="marginTopAndMarginBottom2" label="搴撶被鍨�" style="width: 99%">
<el-radio-group v-model="dataForm.type">
<el-radio :label="0">鍙楁帶搴�</el-radio>
<el-radio :label="1">浜у搧搴�</el-radio>
</el-radio-group>
</el-form-item>
- <div class="el-flexManageDialog el-form-border">
+ </div>
+ <div class="el-flexManageDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
鍏ュ簱閰嶇疆椤�
</div>
- <div class="el-wt-border-left" style="padding-left:5px;width: calc(100% - 130px)">
- <el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.storageData"
+ <div class="el-border-left" style="width: calc(100% - 120px)">
+ <div class="table-container">
+ <el-table class="el-software el-margin-top-bot" style="width: 99%;margin-left: 5px" border :data="dataForm.storageData"
stripe>
- <el-table-column prop="code" align="center" width="60" label="搴忓彿"></el-table-column>
- <el-table-column prop="name" min-width="200" label="閰嶇疆椤瑰悕绉�"></el-table-column>
- <el-table-column prop="identification" align="center" width="220" label="閰嶇疆椤规爣璇�"></el-table-column>
- <el-table-column prop="versions" align="center" width="120" label="鐗堟湰"></el-table-column>
- <el-table-column prop="rollBackVersions" label="涓婃函鐗�" width="120" align="center"></el-table-column>
- <el-table-column prop="secretClass" label="瀵嗙骇" width="80" align="center"></el-table-column>
+ <el-table-column prop="code" align="center" width="60" label="搴忓彿">
+ <template slot-scope="scope">
+ <span v-html="indexFormat(scope.$index)"></span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="name" min-width="200" label="閰嶇疆椤瑰悕绉�">
+ <template v-slot="{ row }">
+ <el-input v-model="row.name" placeholder="閰嶇疆椤瑰悕绉�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="identification" align="center" width="220" label="閰嶇疆椤规爣璇�">
+ <template v-slot="{ row }">
+ <el-input v-model="row.identification" placeholder="閰嶇疆椤规爣璇�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="versions" align="center" width="120" label="鐗堟湰">
+ <template v-slot="{ row }">
+ <el-input v-model="row.versions" placeholder="鐗堟湰"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="rollBackVersions" label="涓婃函鐗�" width="120" align="center">
+ <template v-slot="{ row }">
+ <el-input v-model="row.rollBackVersions" placeholder="涓婃函鐗�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="secretClass" label="瀵嗙骇" width="80" align="center">
+ <template v-slot="{ row }">
+ <zt-dict v-model="row.secretClass" placeholder="瀵嗙骇" dict="secret_class"
+ clearable></zt-dict>
+ </template>
+ </el-table-column>
</el-table>
+ <div class="icon-container" @click="addConfigItemWarehouseRow()">
+ <!-- 鏀剧疆鍥哄畾鐨勫浘鏍� -->
+ <i class="el-icon-plus"></i>
+ </div>
+ </div>
</div>
</div>
- <div class="el-flexManageDialog el-B-border">
+ <div class="el-flexManageDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
椤圭洰QA瀹℃牳
</div>
- <div class="el-wt-border-left" style="padding-left:5px;width: calc(100% - 130px)">
- <el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.examineData"
+ <div class="el-border-left" style="width: calc(100% - 120px)">
+ <el-table class="el-software el-margin-top-bot" style="width: 99%;margin-left: 5px" border :data="dataForm.examineData"
stripe>
<el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
<el-table-column prop="checkItem" min-width="300" label="妫�鏌ラ」"></el-table-column>
@@ -59,8 +92,9 @@
</el-radio-group>
</template>
</el-table-column>
- <el-table-column prop="remark" align="center" width="100" label="涓嶉�傜敤璇存槑"></el-table-column>
+ <el-table-column prop="remark" align="center" width="120" label="涓嶉�傜敤璇存槑"></el-table-column>
</el-table>
+ <div class="el-border-top">
<el-form-item label="瀹℃牳缁撴灉" style="width: 99%">
<el-radio-group v-model="dataForm.result">
<el-radio :label="0">閫氳繃</el-radio>
@@ -73,14 +107,15 @@
<el-form-item label="瀹℃牳鏃ユ湡锛�" style="width: 48%">
<span>{{dataForm.auditDate}}</span>
</el-form-item>
+ </div>
</div>
</div>
- <div class="el-flexManageDialog el-B-border">
+ <div class="el-flexManageDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
CM瀹℃牳
</div>
- <div class="el-wt-border-left" style="padding-left:5px;width: calc(100% - 130px)">
- <el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.CMData"
+ <div class="el-border-left" style="width: calc(100% - 120px)">
+ <el-table class="el-software el-margin-top-bot" style="width: 99%;margin-left: 5px" border :data="dataForm.CMData"
stripe>
<el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
<el-table-column prop="checkItem" min-width="300" label="妫�鏌ラ」"></el-table-column>
@@ -93,28 +128,31 @@
</el-radio-group>
</template>
</el-table-column>
- <el-table-column prop="remark" align="center" width="100" label="涓嶉�傜敤璇存槑"></el-table-column>
+ <el-table-column prop="remark" align="center" width="120" label="涓嶉�傜敤璇存槑"></el-table-column>
</el-table>
- <el-form-item label="瀹℃牳缁撴灉" style="width: 99%">
- <el-radio-group v-model="dataForm.CMResult">
- <el-radio :label="0">閫氳繃</el-radio>
- <el-radio :label="1">涓嶉�氳繃</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="瀹℃牳浜�" style="width: 48%">
- <span>{{dataForm.CMAuditor}}</span>
- </el-form-item>
- <el-form-item label="瀹℃牳鏃ユ湡" style="width: 48%">
- <span>{{dataForm.CMAuditDate}}</span>
- </el-form-item>
+ <div class="el-border-top">
+ <el-form-item label="瀹℃牳缁撴灉" style="width: 99%">
+ <el-radio-group v-model="dataForm.CMResult">
+ <el-radio :label="0">閫氳繃</el-radio>
+ <el-radio :label="1">涓嶉�氳繃</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="瀹℃牳浜�" style="width: 48%">
+ <span>{{dataForm.CMAuditor}}</span>
+ </el-form-item>
+ <el-form-item label="瀹℃牳鏃ユ湡" style="width: 48%">
+ <span>{{dataForm.CMAuditDate}}</span>
+ </el-form-item>
+ </div>
+
</div>
</div>
- <div class="el-flexManageDialog el-B-border">
+ <div class="el-flexManageDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
鎵瑰噯鎰忚
</div>
- <div style="width: calc(100% - 120px)" class="el-wt-border-left">
- <el-form-item class="el-wt-form-item-margin" label-width="120px" style="width: 99%">
+ <div style="width: calc(100% - 120px)" class="el-border-left">
+ <el-form-item class="el-wt-form-item-margin" label-width="120px" style="width: 85%">
<el-radio-group v-model="dataForm.opinion">
<el-radio :label="0">鍚屾剰</el-radio>
<el-radio :label="1">涓嶅悓鎰�</el-radio>
@@ -128,12 +166,12 @@
</el-form-item>
</div>
</div>
- <div class="el-flexManageDialog el-B-border">
+ <div class="el-flexManageDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
椤圭洰CM鎿嶄綔
</div>
- <div style="width: calc(100% - 120px)" class="el-wt-border-left">
- <el-form-item class="el-CMTextarea" style="width: 100%">
+ <div style="width: calc(100% - 120px)" class="el-border-left">
+ <el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
<el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�" v-model="dataForm.CMTextarea"></el-input>
</el-form-item>
<el-form-item label-width="80%" label="鎿嶄綔浜猴細" style="width: 65%">
@@ -148,8 +186,8 @@
<div class="DFormWidth DAlign DHold">
澶囨敞
</div>
- <div style="width: calc(100% - 120px)" class="el-wt-border-left">
- <el-form-item class="el-CMTextarea" style="width: 100%">
+ <div style="width: calc(100% - 120px)" class="el-border-left">
+ <el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
<el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�" v-model="dataForm.textarea"></el-input>
</el-form-item>
</div>
@@ -184,6 +222,16 @@
}
},
methods: {
+ indexFormat(index){
+ return index += 1
+ },
+ addConfigItemWarehouseRow(){
+ // this.dataForm.technicalList.push({})
+ // this.$nextTick(()=>{
+ // const tableBody=this.$refs.tableCirculatOrderList.$el.querySelector('.el-table__body-wrapper')
+ // tableBody.scrollTop = tableBody.scrollHeight;
+ // })
+ },
// 鑾峰彇淇℃伅
async getInfo() {
let res = await this.$http.get(`/configItemWarehouse/ConfigItemWarehouse/${this.dataForm.id}`)
@@ -244,15 +292,9 @@
border-top: 1px solid;
border-bottom: 1px solid;
}
-.el-B-border{
- border-bottom: 1px solid;
-}
.el-margin-top-bot{
margin-top:5px;
margin-bottom:5px;
-}
-.el-wt-border-left{
- border-left:1px solid;
}
.zt .el-table.el-software th {
background: transparent;
@@ -267,4 +309,18 @@
.zt .el-table.el-software{
font-size: 14px;
}
+.warehouseContentWidth > .el-form-item > .el-form-item__content {
+ width: calc(100% - 120px);
+}
+.warehouseContentWidth > .el-form-item.lastChild > .el-form-item__content {
+ width: calc(100% - 142px);
+}
+.warehouseFormAuto .marginTopAndMarginBottom {
+ margin-top: 10px !important;
+ margin-bottom: 0 !important;
+}
+.warehouseFormAuto .marginTopAndMarginBottom2 {
+ margin-top: -10px !important;
+ margin-bottom: 0 !important;
+}
</style>
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
index 68f9b69..30e0824 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
@@ -60,7 +60,7 @@
},
methods:{
add() {
- this.$refs.projectSelect.$refs.dialog.init("item_warehouse_order")
+ this.$refs.projectSelect.$refs.dialog.init("config_item_warehouse")
},
openAddWin(row) {
console.log(row.id, 'row.id')
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 59a3e4e..be72b12 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -1,7 +1,7 @@
<template>
<zt-dialog ref="dialog" column="3" @confirm="formSubmit">
<el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled" label-width="120px" class="circulationFormAuto">
- <div class="">
+ <div>
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
<span>{{dataForm.circulatOrder.code}}</span>
</el-form-item>
--
Gitblit v1.9.1