From 1a7af6fff5185bb257c16b0445140c93263a3331 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 15 一月 2024 11:18:17 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index ff2903a..61b4afb 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -78,7 +78,6 @@
</el-table-column>
<el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
<template v-slot="{ row }">
- <!-- <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>-->
<table-uploader busi-type="circulat_order" model-name="row" :dataForm="row"
v-model="row.files"/>
</template>
@@ -98,11 +97,11 @@
<div style="width: calc(100% - 120px);">
<div class="el-border-left">
<el-form-item label="鐗╁搧鏄惁闇�瑕佽繑杩�" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
- <zt-dict :disabled="stepMarker=='wplz_first'" v-model="dataForm.circulatOrder.itemRequire" :radio="true"
+ <zt-dict :disabled="stepMarker!=='wplz_first'" 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:20px;margin-bottom:0">
- <el-input :disabled="stepMarker=='wplz_first'" v-model="dataForm.circulatOrder.itemOther"></el-input>
+ <el-input :disabled="stepMarker!=='wplz_first'" v-model="dataForm.circulatOrder.itemOther"></el-input>
</el-form-item>
</div>
</div>
@@ -129,20 +128,20 @@
</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 :disabled="stepMarker=='wplz_first'" v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict>
+ <zt-dict :disabled="stepMarker!=='wplz_first'" 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 :disabled="stepMarker=='wplz_first'" v-model="dataForm.circulatOrder.virusLibraryVersion"></el-input>
+ <el-input :disabled="stepMarker!=='wplz_first'" v-model="dataForm.circulatOrder.virusLibraryVersion"></el-input>
</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">
@@ -150,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">
@@ -158,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;">
@@ -185,17 +184,17 @@
</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 :disabled="stepMarker=='wplz_xzjc'" v-model="dataForm.circulatOrder.detectSituation" :radio="true" dict="is_or_not"></zt-dict>
+ <zt-dict :disabled="stepMarker!=='wplz_xzjc'" 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 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">
@@ -203,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">
鐗╁搧鍙戞斁浜�
@@ -229,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>
@@ -238,7 +236,7 @@
</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 :disabled="stepMarker=='wplz_wpff'"v-model="dataForm.circulatOrder.issueSituation" :radio="true" dict="is_or_not"></zt-dict>
+ <zt-dict :disabled="stepMarker!=='wplz_wpff'"v-model="dataForm.circulatOrder.issueSituation" :radio="true" dict="is_or_not"></zt-dict>
</el-form-item>
</div>
</div>
@@ -278,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