From b51127d0c62eaa3ae7f44419f137550efde06f15 Mon Sep 17 00:00:00 2001
From: zhangjun <jiqimao123>
Date: Thu, 22 Sep 2022 10:17:55 +0800
Subject: [PATCH] =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=95=B4=E6=94=B9=E5=BA=93=EF=BC=8C?=
 =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E5=BA=93=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E5=AD=97=EF=BC=8C=E4=B8=8D=E5=90=88=E8=A7=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E4=B8=8D=E5=90=88=E8=A7=84=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/complianceDetails/index.vue        |  2 +-
 .../processCenter/pages/creatProcess/bzpg/step5.vue  |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg/step3.vue  |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg2/step6.vue | 12 ++++++------
 .../nonConfomity/pages/rectificationDatabase.vue     |  4 ++--
 src/pages/searchCenter/pages/standardSearch.vue      |  3 +++
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 47b4d66dd..f8add1ece 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -22,7 +22,7 @@
         </el-table-column>
         <el-table-column
           prop="researchNonCompliance"
-          label="不合规项目"
+          label="不合规项"
           align="center"
         >
         </el-table-column>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index fcbc02427..5e65ecf6a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -266,14 +266,14 @@
                 v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
                 disabled
                 v-model="dataList[scope.$index].noCompliance"
-                placeholder="请输入不合规项目"
+                placeholder="请输入不合规项"
               >
               </el-input>
               <el-input
                 v-else
                 :disabled="acceptShow"
                 v-model="dataList[scope.$index].noCompliance"
-                placeholder="请输入不合规项目"
+                placeholder="请输入不合规项"
               >
               </el-input>
             </template>
@@ -475,14 +475,14 @@
               v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
               disabled
               v-model="batchEditForm.noCompliance"
-              placeholder="请输入不合规项目"
+              placeholder="请输入不合规项"
             >
             </el-input>
             <el-input
               v-else
               :disabled="acceptShow"
               v-model="batchEditForm.noCompliance"
-              placeholder="请输入不合规项目"
+              placeholder="请输入不合规项"
             >
             </el-input>
           </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index e6c2483d2..2c76c5d4c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -172,7 +172,7 @@
                     || scope.row.remarks && scope.row.remarks.length>0"
                   disabled
                   v-model="scope.row.noCompliance"
-                  placeholder="请输入不合规项目"
+                  placeholder="请输入不合规项"
                 >
                 </el-input>
                 <el-input
@@ -180,7 +180,7 @@
                   clearable
                   :disabled="acceptShow"
                   v-model="scope.row.noCompliance"
-                  placeholder="请输入不合规项目"
+                  placeholder="请输入不合规项"
                 >
                 </el-input>
               </template>
@@ -412,14 +412,14 @@
                   || batchEditForm.remarks && batchEditForm.remarks.length>0"
               disabled
               v-model="batchEditForm.noCompliance"
-              placeholder="请输入不合规项目"
+              placeholder="请输入不合规项"
             >
             </el-input>
             <el-input
               v-else
               :disabled="acceptShow"
               v-model="batchEditForm.noCompliance"
-              placeholder="请输入不合规项目"
+              placeholder="请输入不合规项"
             >
             </el-input>
           </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 9e6ff64b5..aaba103e5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -154,20 +154,20 @@
               prop="researchNonCompliance"
               align="center"
               width="170"
-              label="不合规项目">
+              label="不合规项">
               <template slot-scope="scope">
                 <el-input
                   v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
                   disabled
                   v-model="scope.row.noCompliance"
-                  placeholder="请输入不合规项目"
+                  placeholder="请输入不合规项"
                 >
                 </el-input>
                 <el-input
                   v-else
                   :disabled="acceptShow"
                   v-model="scope.row.noCompliance"
-                  placeholder="请输入不合规项目"
+                  placeholder="请输入不合规项"
                 >
                 </el-input>
               </template>
@@ -363,19 +363,19 @@
             >
             </el-input>
           </el-formItem>
-          <el-form-item label="不合规项目" class="add-form-item">
+          <el-form-item label="不合规项" class="add-form-item">
               <el-input
                 v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
                 disabled
                 v-model="batchEditForm.noCompliance"
-                placeholder="请输入不合规项目"
+                placeholder="请输入不合规项"
               >
               </el-input>
               <el-input
                 v-else
                 :disabled="acceptShow"
                 v-model="batchEditForm.noCompliance"
-                placeholder="请输入不合规项目"
+                placeholder="请输入不合规项"
               >
               </el-input>
           </el-form-item>
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index fe78b5fa0..f3f6bee93 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -486,7 +486,7 @@
                                 class="add-form-item">
                     <el-input
                       v-model="addForm.reason"
-                      placeholder="请输入不合规项目"
+                      placeholder="请输入不合规项"
                       :maxlength="500" />
                   </el-form-item>
                   <el-form-item prop="dutyEngineerName" label="责任工程师" style="width: 100%; margin-right:10px"
@@ -768,7 +768,7 @@ export default {
           { required: true, message: "请输入项目编号", trigger: "change" }
         ],
         reason: [
-          { required: true, message: "请输入不合规项目", trigger: "change" }
+          { required: true, message: "请输入不合规项", trigger: "change" }
         ],
         // responsibleUnit: [
         //   { required: true, message: "请输入责任部门", trigger: "change" }
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index c9daa37cd..aa558990c 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -2039,6 +2039,9 @@
                     } else if (type === 6) {
                         this.goProcess(item)
                     }
+                    if (item.nameshow === '' || item.nameshow === null){
+                        item.nameshow = item.standEnName
+                    }
 
                     // 先不加判断
                     // if (type === 1) {