From e3e35ace6ff48882dadaa7d8ea408e864670f951 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 30 十一月 2023 11:15:27 +0800
Subject: [PATCH] 项目表

---
 web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 0a1b4af..6afe80e 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -4,7 +4,7 @@
              label-width="120px" class="circulationFormAuto">
       <div>
         <el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
-          <span>{{dataForm.circulatOrder.code}}</span>
+          <span>{{dataForm.circulatOrder.code || '缂栧彿鑷姩鐢熸垚'}}</span>
         </el-form-item>
       </div>
       <div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
@@ -121,7 +121,7 @@
           </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}}
+              {{ dataForm.circulatOrder.acceptDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
             </el-form-item>
           </div>
           <div style="width: 84px;text-align: center;font-weight: 600">
@@ -176,7 +176,8 @@
           </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}}
+<!--              {{dataForm.circulatOrder.detectDate}}-->
+              {{ dataForm.circulatOrder.detectDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
             </el-form-item>
           </div>
           <div style="width: 84px;text-align: center;font-weight: 600">
@@ -228,7 +229,8 @@
           </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}}-->
+              {{ dataForm.circulatOrder.issueDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
             </el-form-item>
           </div>
           <div style="width: 84px;text-align: center;font-weight: 600">
@@ -300,12 +302,17 @@
         return index += 1
       },
       init(id, row) {
+        console.log(id,row,'娴佽浆鍗曠殑')
         if (id) {
           this.dataForm.id = id
         } else {
           this.dataForm.id = row.id
         }
-        this.dataForm.projectId = row.projectId
+        if(row.projectId){
+          this.dataForm.projectId =row.projectId
+        } else {
+          this.dataForm.projectId=row.bizGroupId
+        }
         // this.dataForm.disabled
         this.getInfo()
         if (!this.dataForm.disabled) {
@@ -337,6 +344,18 @@
           ...this.dataForm,
           ...res.data
         }
+        if(this.dataForm.project === null){
+          this.dataForm.project={}
+        }
+        if(this.dataForm.circulatOrder === null){
+          this.dataForm.circulatOrder={}
+        }
+        if(this.dataForm.testAgencyInfo === null){
+          this.dataForm.testAgencyInfo={}
+        }
+        if(this.dataForm.flowInfoDto === null){
+          this.dataForm.flowInfoDto={}
+        }
         console.log(this.dataForm, "getInfo this.dataForm")
       },
       // 琛ㄥ崟鎻愪氦

--
Gitblit v1.9.1