From 490f96a98df043849aade6cd004bc20f8aa7fe9e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 23 十一月 2023 15:46:07 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 173 +++++++++++++++++++++++++++++++++++++++++--
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 4
web/src/assets/css/custom.css | 4 +
3 files changed, 170 insertions(+), 11 deletions(-)
diff --git a/web/src/assets/css/custom.css b/web/src/assets/css/custom.css
index ec16e5c..060f782 100644
--- a/web/src/assets/css/custom.css
+++ b/web/src/assets/css/custom.css
@@ -327,6 +327,10 @@
.el-border-bottom {
border-bottom: 1px solid rgba(0, 0, 0, .2);
}
+.el-border-left-right{
+ border-left: 1px solid rgba(0, 0, 0, .2);
+ border-right: 1px solid rgba(0, 0, 0, .2);
+}
.table-container {
position: relative;
}
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index f70a834..04e7563 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -90,22 +90,165 @@
</div>
</div>
<div class="el-flexCirculationDialog el-border-bottom">
- <div class="DHold">
+ <div style="width: 112px;text-align: center;font-weight: 600">
鐗╁搧鐨勫叾瀹冭姹�
</div>
<div style="width: calc(100% - 120px);">
<div class="el-border-left">
- <el-form-item label="鐗╁搧鏄惁闇�瑕佽繑杩�" label-width="150px" style="width:100%;padding-left:5%;margin-bottom:0">
+ <el-form-item label="鐗╁搧鏄惁闇�瑕佽繑杩�" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
<zt-dict v-model="dataForm.circulatOrder.itemRequire" :radio="true"
dict="is_or_not"></zt-dict>
</el-form-item>
- <el-form-item label="鐗╁搧鐨勫叾浠栬姹傦細" label-width="150px" style="width:100%;padding-left:5%;margin-bottom:0">
+ <el-form-item label="鐗╁搧鐨勫叾浠栬姹傦細" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
<el-input v-model="dataForm.circulatOrder.itemOther"></el-input>
</el-form-item>
</div>
</div>
</div>
- <div class="circulationContentWidth">
+ <div class="el-flexCirculationDialog el-border-bottom">
+ <div style="width: 112px;text-align: center;font-weight: 600">
+ 鐗╁搧鎺ユ敹浜�
+ </div>
+ <div class="el-border-left-right acceptDate" style="width: 20%;;height: 80px;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.itemAccept}}
+ </el-form-item>
+ </div>
+ <div style="width: 52px;text-align: center;font-weight: 600">
+ 鏃堕棿
+ </div>
+ <div class="el-border-left-right acceptDate" style="width: 20%;height: 80px;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.acceptDate}}
+ </el-form-item>
+ </div>
+ <div style="width: 84px;text-align: center;font-weight: 600">
+ 鎯呭喌璇存槑
+ </div>
+ <div class="el-border-left " style="width: 35%;height: 80px;">
+ <el-form-item label="鏄惁瀹屾垚鐥呮瘨鏌ユ潃" label-width="150px" style="padding-left:20px;margin-bottom:0">
+ <zt-dict v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict>
+ </el-form-item>
+ <el-form-item label="鐥呮瘨搴撶増鏈細" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
+ <el-input v-model="dataForm.circulatOrder.itemOther"></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flexCirculationDialog el-border-bottom">
+ <div style="width: 112px;text-align: center;font-weight: 600">
+ 鏍″噯/妫�娴嬫帴鏀朵汉
+ </div>
+ <div class="el-border-left-right" style="width: 20%;height: 40px;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.itemAccept}}
+ </el-form-item>
+ </div>
+ <div style="width: 52px;text-align: center;font-weight: 600">
+ 鏃堕棿
+ </div>
+ <div class="el-border-left-right" style="width: 20%;height: 40px;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.acceptDate}}
+ </el-form-item>
+ </div>
+ <div style="width: 84px;text-align: center;font-weight: 600">
+ 鎯呭喌璇存槑
+ </div>
+ <div class="el-border-left " style="width: 35%;height: 40px;">
+ <el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰" label-width="150px" style="padding-left:20px;margin-bottom:0">
+ <zt-dict v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flexCirculationDialog el-border-bottom">
+ <div style="width: 112px;text-align: center;font-weight: 600">
+ 鏍″噯妫�娴嬩汉
+ </div>
+ <div class="el-border-left-right" style="width: 20%;height: 40px;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.calibratDetect}}
+ </el-form-item>
+ </div>
+ <div style="width: 52px;text-align: center;font-weight: 600">
+ 鏃堕棿
+ </div>
+ <div class="el-border-left-right" style="width: 20%;height: 40px;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.detectDate}}
+ </el-form-item>
+ </div>
+ <div style="width: 84px;text-align: center;font-weight: 600">
+ 鎯呭喌璇存槑
+ </div>
+ <div class="el-border-left " style="width: 35%;height: 40px;">
+ <el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰" label-width="150px" style="padding-left:20px;margin-bottom:0">
+ <zt-dict v-model="dataForm.circulatOrder.detectSituation" :radio="true" dict="is_or_not"></zt-dict>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flexCirculationDialog el-border-bottom">
+ <div style="width: 112px;text-align: center;font-weight: 600">
+ 鐗╁搧鍏ュ簱浜�
+ </div>
+ <div class="el-border-left-right" style="width: 20%;height: 40px;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.warehouse}}
+ </el-form-item>
+ </div>
+ <div style="width: 52px;text-align: center;font-weight: 600">
+ 鏃堕棿
+ </div>
+ <div class="el-border-left-right" style="width: 20%;height: 40px;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.warehouseDate}}
+ </el-form-item>
+ </div>
+ <div style="width: 84px;text-align: center;font-weight: 600">
+ 鎯呭喌璇存槑
+ </div>
+ <div class="el-border-left " style="width: 35%;height: 40px;">
+ <el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰" label-width="150px" style="padding-left:20px;margin-bottom:0">
+ <zt-dict v-model="dataForm.circulatOrder.warehouseSituation" :radio="true" dict="is_or_not"></zt-dict>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flexCirculationDialog el-border-bottom">
+ <div style="width: 112px;text-align: center;font-weight: 600">
+ 鐗╁搧鍙戞斁浜�
+ </div>
+ <div class="el-border-left-right " style="width: 20%;height: 40px;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.itemIssue}}
+ </el-form-item>
+ </div>
+ <div style="width: 52px;text-align: center;font-weight: 600">
+ 鏃堕棿
+ </div>
+ <div class="el-border-left-right " style="width: 20%;height: 40px;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.issueDate}}
+ </el-form-item>
+ </div>
+ <div style="width: 84px;text-align: center;font-weight: 600">
+ 鎯呭喌璇存槑
+ </div>
+ <div class="el-border-left " style="width: 35%;height: 40px;">
+ <el-form-item label="鏄惁瀹屾垚鏍峰搧鍙戞斁" label-width="150px" style="padding-left:20px;margin-bottom:0">
+ <zt-dict v-model="dataForm.circulatOrder.issueSituation" :radio="true" dict="is_or_not"></zt-dict>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flexCirculationDialog">
+ <div style="width: 112px;text-align: center;font-weight: 600">
+ 澶囨敞
+ </div>
+ <div class="el-border-left " style="width: 20%;height: 40px">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.itemAccept}}
+ </el-form-item>
+ </div>
+ </div>
+<!-- <div class="circulationContentWidth">
<el-form-item class="marginTopAndMarginBottom" label="鐗╁搧鎺ユ敹浜�" style="width: 32%">
<el-input v-model="dataForm.circulatOrder.itemAccept" placeholder="鐗╁搧鎺ユ敹浜�"></el-input>
</el-form-item>
@@ -113,7 +256,10 @@
<el-input v-model="dataForm.circulatOrder.acceptDate" placeholder="鏃堕棿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="鎯呭喌璇存槑" style="width: 32%">
- <el-input v-model="dataForm.circulatOrder.acceptSituation" placeholder="鎯呭喌璇存槑"></el-input>
+ <span>鏄惁瀹屾垚鐥呮瘨鏌ユ潃锛�
+ <zt-dict v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict>
+ </span>
+ <span>鐥呮瘨搴撶増鏈細<el-input v-model="dataForm.circulatOrder.acceptSituation" placeholder="鐥呮瘨搴撶増鏈�"></el-input></span>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="鏍″噯妫�娴嬩汉" style="width: 32%">
<el-input v-model="dataForm.circulatOrder.calibratDetect" placeholder="鏍″噯妫�娴嬩汉"></el-input>
@@ -122,7 +268,8 @@
<el-input v-model="dataForm.circulatOrder.detectDate" placeholder="鏃堕棿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="鎯呭喌璇存槑" style="width: 32%">
- <el-input v-model="dataForm.circulatOrder.detectSituation" placeholder="鎯呭喌璇存槑"></el-input>
+<!– <el-input v-model="dataForm.circulatOrder.detectSituation" placeholder="鎯呭喌璇存槑"></el-input>–>
+ <zt-dict v-model="dataForm.circulatOrder.detectSituation" :radio="true" dict="is_or_not"></zt-dict>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2" label="鐗╁搧鍏ュ簱浜�" style="width: 32%">
<el-input v-model="dataForm.circulatOrder.warehouse" placeholder="鐗╁搧鍏ュ簱浜�"></el-input>
@@ -131,7 +278,8 @@
<el-input v-model="dataForm.circulatOrder.warehouseDate" placeholder="鏃堕棿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2" label="鎯呭喌璇存槑" style="width: 32%">
- <el-input v-model="dataForm.circulatOrder.warehouseSituation" placeholder="鎯呭喌璇存槑"></el-input>
+<!– <el-input v-model="dataForm.circulatOrder.warehouseSituation" placeholder="鎯呭喌璇存槑"></el-input>–>
+ <zt-dict v-model="dataForm.circulatOrder.warehouseSituation" :radio="true" dict="is_or_not"></zt-dict>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2" label="鐗╁搧鍙戞斁浜�" style="width: 32%">
<el-input v-model="dataForm.circulatOrder.itemIssue" placeholder="鐗╁搧鍙戞斁浜�"></el-input>
@@ -140,12 +288,13 @@
<el-input v-model="dataForm.circulatOrder.issueDate" placeholder="鏃堕棿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2" label="鎯呭喌璇存槑" style="width: 32%">
- <el-input v-model="dataForm.circulatOrder.issueSituation" placeholder="鎯呭喌璇存槑"></el-input>
+<!– <el-input v-model="dataForm.circulatOrder.issueSituation" placeholder="鎯呭喌璇存槑"></el-input>–>
+ <zt-dict v-model="dataForm.circulatOrder.issueSituation" :radio="true" dict="is_or_not"></zt-dict>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2 lastChild" label="澶囨敞" style="width: 100%">
<el-input v-model="dataForm.circulatOrder.remark" placeholder="澶囨敞"></el-input>
</el-form-item>
- </div>
+ </div>-->
</div>
</el-form>
</zt-dialog>
@@ -253,4 +402,10 @@
margin-top: 0 !important;
margin-bottom: 10px !important;
}
+.acceptDate> .el-form-item > .el-form-item__content {
+ line-height: 80px;
+}
+.circulationFormAuto .el-radio {
+ margin-right: 10px;
+}
</style>
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 3f53646..0bf16d6 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -295,8 +295,8 @@
<div class="DWidth DAlign DHold">
鐗╁搧鎬ц川
</div>
- <div class="el-border-left" style="width: 15%">
- <el-form-item style="width: 98%;padding-left:20px;margin:0;">
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item style="width: 20%;padding-left:20px;margin:0;">
<zt-dict v-model="dataForm.softwareTestOrder.articleNature" :radio="true"
origin="otherNature" @getChangeInputData="getChangeInputData"
dict="article_nature" :inputName="dataForm.softwareTestOrder.otherNature"></zt-dict>
--
Gitblit v1.9.1