From 390971e4ef1ae90722baf984fcc4fe67a74438b6 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 27 十一月 2023 10:29:04 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue | 22 +++
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 265 +++++++++++++++++++++++++++++++++++++++++++---------
2 files changed, 238 insertions(+), 49 deletions(-)
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index 6e150f7..94dea83 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -1,51 +1,160 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
- <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
- <zt-form-item label="椤圭洰ID" prop="projectId" rules="required">
- <el-input v-model="dataForm.projectId"></el-input>
- </zt-form-item>
- <zt-form-item label="閰嶇疆椤瑰叆搴撶紪鍙�" prop="code" rules="required">
- <el-input v-model="dataForm.code"></el-input>
- </zt-form-item>
- <zt-form-item label="椤圭洰缂栧彿" prop="projectCode" rules="required">
- <el-input v-model="dataForm.projectCode"></el-input>
- </zt-form-item>
- <zt-form-item label="椤圭洰鍚嶇О" prop="projectName" rules="required">
- <el-input v-model="dataForm.projectName"></el-input>
- </zt-form-item>
- <zt-form-item label="鐢宠浜�" prop="applicant" rules="required">
- <el-input v-model="dataForm.applicant"></el-input>
- </zt-form-item>
- <zt-form-item label="鐢宠鏃ユ湡" prop="applyDate" rules="required">
- <el-input v-model="dataForm.applyDate"></el-input>
- </zt-form-item>
- <zt-form-item label="搴撶被鍨�" prop="libraryType" rules="required">
- <zt-dict v-model="dataForm.libraryType" dict="library_type"></zt-dict>
- </zt-form-item>
- <zt-form-item label="鎵瑰噯鎰忚" prop="approvalOpinions" rules="required">
- <zt-dict v-model="dataForm.approvalOpinions" dict="is_agree"></zt-dict>
- </zt-form-item>
- <zt-form-item label="鎵瑰噯绛惧瓧" prop="approvalSign" rules="required">
- <el-input v-model="dataForm.approvalSign"></el-input>
- </zt-form-item>
- <zt-form-item label="鎵瑰噯鏃ユ湡" prop="approvalDate" rules="required">
- <el-input v-model="dataForm.approvalDate"></el-input>
- </zt-form-item>
- <zt-form-item label="椤圭洰CM鎿嶄綔" prop="projectCmOperations" rules="required">
- <el-input v-model="dataForm.projectCmOperations"></el-input>
- </zt-form-item>
- <zt-form-item label="鎿嶄綔浜�" prop="operator" rules="required">
- <el-input v-model="dataForm.operator"></el-input>
- </zt-form-item>
- <zt-form-item label="鎿嶄綔鏃ユ湡" prop="operateDate" rules="required">
- <el-input v-model="dataForm.operateDate"></el-input>
- </zt-form-item>
- <zt-form-item label="澶囨敞" prop="remark" rules="required">
- <el-input v-model="dataForm.remark"></el-input>
- </zt-form-item>
- <zt-form-item label="骞翠唤" prop="year" rules="required">
- <el-input v-model="dataForm.year"></el-input>
- </zt-form-item>
+ <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">
+ <span>{{dataForm.code}}</span>
+ </el-form-item>
+ </div>
+ <div class="confirmDAuto DManageForm">
+ <el-form-item label="椤圭洰缂栧彿" style="width: 49%">
+ <el-input v-model="dataForm.itemNumber" placeholder="璇疯緭鍏ラ」鐩紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item label="椤圭洰鍚嶇О" style="width: 49%">
+ <el-input v-model="dataForm.name" placeholder="璇疯緭鍏ョ紪鍙峰悕绉�"></el-input>
+ </el-form-item>
+ <el-form-item label="鐢宠浜�" style="width: 49%">
+ <el-input v-model="dataForm.applicant" placeholder="璇疯緭鍏ョ紪鍙峰悕绉�"></el-input>
+ </el-form-item>
+ <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-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 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"
+ 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>
+ </div>
+ </div>
+ <div class="el-flexManageDialog el-B-border">
+ <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"
+ 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>
+ <el-table-column label="妫�鏌ョ粨鏋�" width="250" align="center">
+ <template slot-scope="scope">
+ <el-radio-group v-model="scope.row.result">
+ <el-radio :label="0">鏄�</el-radio>
+ <el-radio :label="1">鍚�</el-radio>
+ <el-radio :label="2">涓嶉�傜敤</el-radio>
+ </el-radio-group>
+ </template>
+ </el-table-column>
+ <el-table-column prop="remark" align="center" width="100" label="涓嶉�傜敤璇存槑"></el-table-column>
+ </el-table>
+ <el-form-item label="瀹℃牳缁撴灉" style="width: 99%">
+ <el-radio-group v-model="dataForm.result">
+ <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.auditor}}</span>
+ </el-form-item>
+ <el-form-item label="瀹℃牳鏃ユ湡锛�" style="width: 48%">
+ <span>{{dataForm.auditDate}}</span>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flexManageDialog el-B-border">
+ <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"
+ 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>
+ <el-table-column label="妫�鏌ョ粨鏋�" width="250" align="center">
+ <template slot-scope="scope">
+ <el-radio-group v-model="scope.row.result">
+ <el-radio :label="0">鏄�</el-radio>
+ <el-radio :label="1">鍚�</el-radio>
+ <el-radio :label="2">涓嶉�傜敤</el-radio>
+ </el-radio-group>
+ </template>
+ </el-table-column>
+ <el-table-column prop="remark" align="center" width="100" 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>
+ </div>
+ <div class="el-flexManageDialog el-B-border">
+ <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%">
+ <el-radio-group v-model="dataForm.opinion">
+ <el-radio :label="0">鍚屾剰</el-radio>
+ <el-radio :label="1">涓嶅悓鎰�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label-width="80%" label="绛惧瓧锛�" style="width: 65%">
+ <span>{{dataForm.signature}}</span>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡锛�" style="width: 20%">
+ <span>{{dataForm.approvalOpinionDate}}</span>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flexManageDialog el-B-border">
+ <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%">
+ <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%">
+ <span>{{dataForm.CMSignature}}</span>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡锛�" style="width: 20%">
+ <span>{{dataForm.CMDate}}</span>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flexManageDialog">
+ <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%">
+ <el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�" v-model="dataForm.textarea"></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ </div>
</el-form>
</zt-dialog>
</template>
@@ -95,3 +204,67 @@
}
}
</script>
+<style>
+.ManageFormAuto {
+ width: 70%;
+ margin: 0 auto;
+}
+.confirmDAuto{
+ border: 1px solid;
+}
+
+.el-flexManageDialog {
+ display: flex;
+ align-items: center;
+}
+
+.DFormWidth {
+ width: 120px;
+}
+
+.DAlign {
+ text-align: center;
+}
+
+.DManageForm{
+ /*border-left: 1px solid;*/
+ width: 100%;
+}
+
+.DManageForm> .el-form-item > .el-form-item__content {
+ width: calc(100% - 120px);
+}
+.el-form-item.el-CMTextarea>.el-form-item__content{
+ width: 100%;
+}
+.el-form .el-form-item.el-wt-form-item-margin{
+ margin-left: 120px;
+}
+.el-form-border{
+ 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;
+}
+
+.zt .el-table.el-software th > .cell {
+ font-weight: 500;
+}
+.DHold{
+ font-weight: 600;
+}
+.zt .el-table.el-software{
+ font-size: 14px;
+}
+</style>
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
index f468349..68f9b69 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
@@ -17,7 +17,7 @@
</el-form-item>
<el-form-item>
<zt-button type="query" @click="table.query()"/>
- <zt-button type="add" perm="configItemWarehouse:add" @click="table.editHandle()"/>
+ <zt-button type="primary" class="el-icon-edit" perm="configItemWarehouse:add" @click="add()">鏂板</zt-button>
<zt-button type="delete" perm="configItemWarehouse:delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
@@ -30,7 +30,11 @@
<zt-table-column-handle :table="table" edit-perm="configItemWarehouse:update" delete-perm="configItemWarehouse::delete"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <add-or-update @refreshDataList="table.query"/>
+ <add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
+ <ProjectSelect ref="projectSelect"
+ @refreshDataList="table.query"
+ @setProjectInfo="openAddWin">
+ </ProjectSelect>
</zt-table-wraper>
</div>
</el-card>
@@ -38,6 +42,7 @@
<script>
import AddOrUpdate from './ConfigItemWarehouse-AddOrUpdate'
+ import ProjectSelect from "../project/Project-select";
export default {
data() {
return {
@@ -50,7 +55,18 @@
}
},
components: {
- AddOrUpdate
+ AddOrUpdate,
+ ProjectSelect
+ },
+ methods:{
+ add() {
+ this.$refs.projectSelect.$refs.dialog.init("item_warehouse_order")
+ },
+ openAddWin(row) {
+ console.log(row.id, 'row.id')
+ // this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
+ this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
+ },
}
}
</script>
--
Gitblit v1.9.1