From ac1cf9f57ed1ef031ddd57fa8c6a9fee3f18e158 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 12 一月 2024 10:23:21 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 1f4403c..61b4afb 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -135,13 +135,13 @@
</el-form-item>
</div>
</div>
- <!--<div class="el-flexCirculationDialog el-border-bottom">
+ <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}}
+ {{dataForm.circulatOrder.detectAcceptor}}
</el-form-item>
</div>
<div style="width: 52px;text-align: center;font-weight: 600">
@@ -149,7 +149,7 @@
</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}}
+ {{dataForm.circulatOrder.detectAcceptDate| filterTime('YYYY骞碝M鏈圖D鏃�')}}
</el-form-item>
</div>
<div style="width: 84px;text-align: center;font-weight: 600">
@@ -157,13 +157,13 @@
</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.cscs" :radio="true" dict="is_or_not"></zt-dict>
+ <zt-dict :disabled="stepMarker!=='wplz_jcjs'" v-model="dataForm.circulatOrder.detectAcceptSituation" :radio="true" dict="is_or_not"></zt-dict>
</el-form-item>
</div>
- </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;">
@@ -188,13 +188,13 @@
</el-form-item>
</div>
</div>
- <!-- <div class="el-flexCirculationDialog el-border-bottom">
+ <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}}
+ {{dataForm.circulatOrder.depositor}}
</el-form-item>
</div>
<div style="width: 52px;text-align: center;font-weight: 600">
@@ -202,18 +202,18 @@
</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}}
+ {{dataForm.circulatOrder.depositDate| filterTime('YYYY骞碝M鏈圖D鏃�')}}
</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 label="鏄惁宸插叆鏍峰搧搴�" label-width="150px" style="padding-left:20px;margin-bottom:0">
+ <zt-dict :disabled="stepMarker!=='wplz_wprk'" v-model="dataForm.circulatOrder.depositSituation" :radio="true" dict="is_or_not"></zt-dict>
</el-form-item>
</div>
- </div>-->
+ </div>
<div class="el-flexCirculationDialog el-border-bottom">
<div style="width: 112px;text-align: center;font-weight: 600">
鐗╁搧鍙戞斁浜�
@@ -228,7 +228,6 @@
</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}}-->
{{ dataForm.circulatOrder.issueDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</el-form-item>
</div>
@@ -277,12 +276,15 @@
itemOther: '',
acceptSituation: '',
acceptDate: '',
+ detectAcceptor:'',
+ detectAcceptDate:'',
+ detectAcceptSituation:'',
calibratDetector: '',
detectDate: '',
detectSituation: '',
- warehouse: '',
- warehouseDate: '',
- warehouseSituation: '',
+ depositor: '',
+ depositDate: '',
+ depositSituation: '',
itemIssuer: '',
issueDate: '',
issueSituation: '',
--
Gitblit v1.9.1