From f708f4b99e4d4103d4812e95e4c96f7c8c12a615 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Sun, 29 Aug 2021 22:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ysjl/3000/common/index.vue            | 11 ++++-------
 src/views/ysjl/3000/common/inspection-items.vue |  8 +++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue
index 7781d83..6f05c65 100644
--- a/src/views/ysjl/3000/common/index.vue
+++ b/src/views/ysjl/3000/common/index.vue
@@ -127,12 +127,7 @@
               </el-col>
               <el-col :span="9">
                 <el-form-item label="制造日期" prop="zhizaoriqi">
-                  <el-date-picker
-                    v-model="ysjl.zhizaoriqi"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                    style="width: 100%"
-                  />
+                  <el-input v-model="ysjl.zhizaoriqi" type="text" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -1193,10 +1188,12 @@ export default {
       subArr.forEach((item) => {
         if (item.some((k) => k.jianyanjieguo.indexOf('×') === 0)) {
           this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = '不合格'
-        } else if (item.some((k) => k.jianyanjieguo.indexOf('√') === 0)) {
+        } else if (item.some((k) => k.jianyanjieguo.indexOf('√') === 0 || k.jianyanjieguo.indexOf('○') === 0)) {
           this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = '合格'
         } else if (item.every((k) => k.jianyanjieguo.indexOf('/') === 0)) {
           this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = '无此项'
+        } else {
+          this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = ''
         }
       })
       const tableData = []
diff --git a/src/views/ysjl/3000/common/inspection-items.vue b/src/views/ysjl/3000/common/inspection-items.vue
index 305ec4f..bf8ddb0 100644
--- a/src/views/ysjl/3000/common/inspection-items.vue
+++ b/src/views/ysjl/3000/common/inspection-items.vue
@@ -92,11 +92,9 @@ export default {
       if (val.indexOf('×') === 0) {
         jybgJyjgJyxm.jianyanjieguo = '不符合' + beizhu
       } else if (val.indexOf('√') === 0) {
-        let jyjg = '符合'
-        if (row.xiangmuleibie === 'C') {
-          jyjg = '资料确认符合'
-        }
-        jybgJyjgJyxm.jianyanjieguo = jyjg + beizhu
+        jybgJyjgJyxm.jianyanjieguo = '符合' + beizhu
+      } else if (val.indexOf('○') === 0) {
+        jybgJyjgJyxm.jianyanjieguo = '资料确认符合' + beizhu
       } else if (val.indexOf('/') === 0) {
         jybgJyjgJyxm.jianyanjieguo = '无此项' + beizhu
       } else {