From 20691a0ed768ed2b70020ed2db61913b356f765b Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Fri, 30 Sep 2022 16:07:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E6=B8=85=E7=A9=BA=E3=80=81=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=94=B6=E8=97=8F=20=E5=8F=96=E6=B6=88=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/my-collection/components/CollectionStandard.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
index dab85f964..0d956b6d5 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
@@ -18,15 +18,16 @@
                 type="primary"
                 class="common-button-primary"
                 size="mini"
-                v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"
                 @click="selectStandardBtn">
                 查询
               </el-button>
+              <!--                v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"-->
               <el-button
                 class="common-button-default"
                 size="mini"
-                v-btn-permission="'16c7a9cd3d9c5d8e0575593e0f632d85'"
                 @click="resetSelect">清空</el-button>
+<!--              v-btn-permission="'16c7a9cd3d9c5d8e0575593e0f632d85'"-->
+
 <!--              <el-button-->
 <!--                      class="common-button-default"-->
 <!--                      size="mini"-->
@@ -63,7 +64,8 @@
                 <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
               </div>
               <el-col :span="4">
-                <el-button size="mini" v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
+<!--                v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'"-->
+                <el-button size="mini"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
               </el-col>
             </el-row>
           </div>

From 27be01df2378529b94fe02d18fbe0d585bc27fd3 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Fri, 30 Sep 2022 17:27:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E4=B8=BA=E5=95=A5=E6=B2=A1=E6=9C=89=E4=B8=8D=E6=B6=89=E5=8F=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzpg/step5.vue         | 80 ++++++++++++++++---
 .../pages/creatProcess/bzpg/step6.vue         |  7 ++
 .../pages/creatProcess/bzpg/step7.vue         |  7 ++
 .../pages/creatProcess/bzpg/step8.vue         |  7 ++
 4 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index 5e65ecf6a..e9a6301d8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -235,7 +235,8 @@
             <el-input
               v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
                     || dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
-                    || dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null"
+                    || dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null
+                || dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
               disabled
               v-model="dataList[scope.$index].complianceReasons"
               placeholder="请输入合规原因"
@@ -263,7 +264,8 @@
             label="不合规项目">
             <template slot-scope="scope">
               <el-input
-                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0
+                || dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
                 disabled
                 v-model="dataList[scope.$index].noCompliance"
                 placeholder="请输入不合规项"
@@ -285,7 +287,8 @@
             label="应对措施">
             <template slot-scope="scope">
               <el-input
-                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0
+                || dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
                 disabled
                 v-model="dataList[scope.$index].countermeasures"
                 placeholder="请输入应对措施"
@@ -307,7 +310,8 @@
             label="完成时间">
             <template slot-scope="scope">
               <el-date-picker
-                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0
+                || dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
                 disabled
                 v-model="dataList[scope.$index].completionTime"
                 type="date"
@@ -326,6 +330,32 @@
             </template>
           </el-table-column>
         </el-table-column>
+        <el-table-column
+                prop="researchCompliance"
+                align="center"
+                width="160"
+                label="不涉及理由">
+          <template slot-scope="scope">
+            <el-input
+                    v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
+                    || dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
+                    || dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null
+                    || dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                    disabled
+                    v-model="dataList[scope.$index].noInvolve"
+                    placeholder="请输入不涉及理由"
+            >
+            </el-input>
+            <el-input
+                    v-else
+                    :disabled="acceptShow"
+                    clearable
+                    v-model="dataList[scope.$index].noInvolve"
+                    placeholder="请输入不涉及理由"
+            >
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
       <el-collapse accordion>
         <el-collapse-item title="回执说明">
@@ -456,7 +486,8 @@
             <el-input
               v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
                     || batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
-                    || batchEditForm.completionTime && batchEditForm.completionTime !== null"
+                    || batchEditForm.completionTime && batchEditForm.completionTime !== null
+                    || batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
               disabled
               v-model="batchEditForm.complianceReasons"
               placeholder="请输入合规原因"
@@ -472,7 +503,8 @@
           </el-formItem>
           <el-form-item label="不合规项目" class="add-form-item">
             <el-input
-              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0
+              || batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
               disabled
               v-model="batchEditForm.noCompliance"
               placeholder="请输入不合规项"
@@ -488,7 +520,8 @@
           </el-form-item>
           <el-form-item label="不合规应对措施" class="add-form-item">
             <el-input
-              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0
+              || batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
               disabled
               v-model="batchEditForm.countermeasures"
               placeholder="请输入不合规应对措施"
@@ -504,7 +537,8 @@
           </el-form-item>
           <el-form-item label="完成时间" class="add-form-item">
             <el-date-picker
-              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0
+              || batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
               disabled
               v-model="batchEditForm.completionTime"
               type="date"
@@ -521,6 +555,25 @@
               placeholder="请选择日期">
             </el-date-picker>
           </el-form-item>
+          <el-formItem label="不涉及理由" class="add-form-item">
+            <el-input
+                    v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
+                    || batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
+                    || batchEditForm.completionTime && batchEditForm.completionTime !== null
+                    || batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+                    disabled
+                    v-model="batchEditForm.noInvolve"
+                    placeholder="请输入不涉及理由"
+            >
+            </el-input>
+            <el-input
+                    v-else
+                    :disabled="acceptShow"
+                    v-model="batchEditForm.noInvolve"
+                    placeholder="请输入不涉及理由"
+            >
+            </el-input>
+          </el-formItem>
           <br>
         </el-form>
       </div>
@@ -573,6 +626,8 @@ export default {
         noCompliance: "",
         // 应对措施
         countermeasures: "",
+        // 不涉及理由
+        noInvolve: "",
         // 完成时间
         completionTime: "",
       },
@@ -620,6 +675,8 @@ export default {
           complianceReasons: "", //在研合规原因
           noCompliance: "", //在研不合规项目
           countermeasures: "", //在研应对措施
+          // 不涉及理由
+          noInvolve: "",
           completionTime: "", //在研完成时间
         }]
       },
@@ -818,6 +875,9 @@ export default {
         if(item.complianceReasons){
           this.comFlag = 0;
           return
+        }else if (item.noInvolve){
+          this.comFlag = 0;
+          return
         }else{
           for (let i = 0; i < this.dataList.length; i++) {
             if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
@@ -834,7 +894,7 @@ export default {
     handleSubmit() {
       let submitFlag = 0;
       this.dataList.forEach(item => {
-        if(item.complianceReasons || item.noCompliance){
+        if(item.complianceReasons || item.noCompliance || item.noInvolve){
           submitFlag = 1
         }
         return
@@ -905,6 +965,8 @@ export default {
             item.countermeasures = this.batchEditForm.countermeasures;
             //完成时间
             item.completionTime = this.batchEditForm.completionTime;
+            //不涉及理由
+            item.noInvolve = this.batchEditForm.noInvolve;
           }
         });
       });
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
index 7d7f12485..0c8193924 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
@@ -251,6 +251,12 @@
             </template>
           </el-table-column>
         </el-table-column>
+        <el-table-column
+            prop="noInvolve"
+            align="center"
+            width="160"
+            label="不涉及理由">
+        </el-table-column>
         <el-table-column
           prop="implementer"
           align="center"
@@ -445,6 +451,7 @@ export default {
           distributePersonId: "",
           complianceReasons: "", //在研合规原因
           noCompliance: "", //在研不合规项目
+          noInvolve: "", //不涉及理由
           countermeasures: "", //在研应对措施
           completionTime: "", //在研完成时间
           zcComplianceReasons: "", //在产的合规原因
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
index 97c619746..982972053 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
@@ -260,6 +260,12 @@
             </template>
           </el-table-column>
         </el-table-column>
+        <el-table-column
+          prop="noInvolve"
+          align="center"
+          width="160"
+          label="不涉及理由">
+        </el-table-column>
         <el-table-column
           prop="implementer"
           align="center"
@@ -456,6 +462,7 @@ export default {
           noCompliance: "", //在研不合规项目
           countermeasures: "", //在研应对措施
           completionTime: "", //在研完成时间
+          noInvolve: "", //不涉及理由
           zcComplianceReasons: "", //在产的合规原因
           zcNoCompliance: "", //在产不合规项目
           zcCountermeasures: "", //在产的应对措施
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
index a15cbf8a0..226a842e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
@@ -260,6 +260,12 @@
             </template>
           </el-table-column>
         </el-table-column>
+        <el-table-column
+          prop="noInvolve"
+          align="center"
+          width="160"
+          label="不涉及理由">
+        </el-table-column>
         <el-table-column
           prop="implementer"
           align="center"
@@ -456,6 +462,7 @@ export default {
           noCompliance: "", //在研不合规项目
           countermeasures: "", //在研应对措施
           completionTime: "", //在研完成时间
+          noInvolve: "", //不涉及理由
           zcComplianceReasons: "", //在产的合规原因
           zcNoCompliance: "", //在产不合规项目
           zcCountermeasures: "", //在产的应对措施