From 7d1e82b8181788a15c55f47e1136ec3a3139be3a Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Wed, 19 Jul 2023 16:49:48 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=B9=E5=8F=98navbar=E5=B0=8F=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/common.scss | 10 ++++++++--
 src/icons/svg/首页.svg      | 12 ++++++++++++
 src/store/index.js          | 12 ++++++------
 src/views/main-content.vue  | 17 +++++++++++++----
 src/views/main-navbar.vue   |  4 ++--
 5 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 src/icons/svg/首页.svg

diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 4655141..4f6379e 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -599,13 +599,19 @@ img {
             display: none;
           }
           & > .el-tabs__item {
-            height: $content--tabs-header-height;
             border: 0;
             padding: 0 10px;
-            color: rgba(89, 89, 89, 1);
+            margin: 6px 5px 6px 0px;
+            height: 24px;
+            font-size: 12px;
+            line-height: 24px;
+            border-radius: 5px;
+            background-color: rgba(239, 239, 239, 1);
             &:focus,
             &:hover,
             &.is-active {
+              color: rgba(255, 255, 255, 1);
+              background-color: rgba(62, 142, 247, 1);
               &:after {
                 display: block;
               }
diff --git a/src/icons/svg/首页.svg b/src/icons/svg/首页.svg
new file mode 100644
index 0000000..7d24e13
--- /dev/null
+++ b/src/icons/svg/首页.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>首页</title>
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon" transform="translate(-506.000000, -176.000000)" fill-rule="nonzero">
+            <g id="首页" transform="translate(506.000000, 176.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="24" height="24"></rect>
+                <path d="M11.1710783,2.42919989 C11.7298936,2.09409047 12.4328291,2.12455473 12.9654367,2.52059014 L12.9654367,2.52059014 L20.3218013,7.99000647 L20.4665209,8.10559268 C21.0744501,8.62656431 21.4302636,9.40344805 21.4302636,10.227099 L21.4302636,10.227099 L21.4302636,19.0470569 L21.4250327,19.2212289 C21.3382831,20.6611171 20.1833875,21.8011882 18.7715031,21.8011882 L18.7715031,21.8011882 L5.2284969,21.8011882 L5.06035624,21.7957697 C3.67032883,21.7059084 2.56973638,20.5095861 2.56973638,19.0470569 L2.56973638,19.0470569 L2.56973638,10.2273587 L2.57600507,10.0381789 C2.63012926,9.22282649 3.03207443,8.47038558 3.67819781,7.99000711 L3.67819781,7.99000711 L11.034559,2.52059336 Z M12.0713092,3.55793652 C11.9772762,3.53774358 11.8769764,3.55793433 11.7954857,3.6185066 L11.7954857,3.6185066 L4.43911542,9.0879271 L4.32641124,9.18150853 C4.04059293,9.44596068 3.87451485,9.82573182 3.87451485,10.2273587 L3.87451485,10.2273587 L3.87451485,19.0470569 L3.880713,19.1821318 C3.94632222,19.8933667 4.52470053,20.4496068 5.2284969,20.4496068 L5.2284969,20.4496068 L11.2507497,20.4487759 L11.3507364,20.3451977 L11.3512202,14.4627186 L11.3582338,14.3683764 C11.4044406,14.0603828 11.6734228,13.8227675 12,13.8227675 C12.3345637,13.8227675 12.6123182,14.0734451 12.6454705,14.3976012 L12.6454705,14.3976012 L12.6489183,14.4681588 L12.6487364,20.3451881 L12.7487231,20.4487759 L18.7714898,20.4496068 L18.9018895,20.4431864 C19.5885066,20.3752237 20.1254851,19.7760987 20.1254851,19.0470569 L20.1254851,19.0470569 L20.1254851,10.2273587 L20.1177907,10.0779557 C20.0769951,9.68325297 19.8759128,9.32208831 19.5608746,9.08791971 L19.5608746,9.08791971 L12.2045243,3.61851399 L12.1402672,3.58065321 Z" id="形状结合" fill="#000"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 956d7c5..026734e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-01-04 10:29:39
  * @LastEditors: zwq
- * @LastEditTime: 2023-01-05 16:14:45
+ * @LastEditTime: 2023-07-19 16:33:56
  * @Description: 
  */
 import Vue from 'vue'
@@ -28,11 +28,11 @@ export default new Vuex.Store({
     contentIsNeedRefresh: false,
     // 内容, 标签页(默认添加首页)
     contentTabs: [
-      {
-        ...window.SITE_CONFIG['contentTabDefault'],
-        'name': 'home',
-        'title': '首页'
-      }
+      // {
+      //   ...window.SITE_CONFIG['contentTabDefault'],
+      //   'name': 'home',
+      //   'title': '首页'
+      // }
     ],
     contentTabsActiveName: 'home'
   },
diff --git a/src/views/main-content.vue b/src/views/main-content.vue
index 26be890..5ad4970 100644
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -1,3 +1,10 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-07-13 15:31:21
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-07-19 16:34:06
+ * @Description: 
+-->
 <template>
   <main :class="['aui-content', { 'aui-content--tabs': $route.meta.isTab }]">
     <!-- tab展示内容 -->
@@ -16,11 +23,13 @@
           :key="item.name"
           :name="item.name"
           :label="item.title"
-          :closable="item.name !== 'home'"
+          closable
           :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }">
-          <template v-if="item.name === 'home'">
-            <svg slot="label" class="icon-svg aui-content--tabs-icon-nav" aria-hidden="true"><use xlink:href="#icon-home"></use></svg>
-          </template>
+          <!-- <template v-if="item.name === 'home'">
+            <svg slot="label" class="icon-svg aui-content--tabs-icon-nav" aria-hidden="true">
+              <use xlink:href="#首页"></use>
+            </svg>
+          </template> -->
           <iframe v-if="tabIsIframe(item.iframeURL)" :src="item.iframeURL" width="100%" height="100%" frameborder="0" scrolling="yes"></iframe>
           <!-- <keep-alive > -->
             <router-view v-if="item.name === $store.state.contentTabsActiveName" />
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 1de9761..9cd241e 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-22 14:57:51
  * @LastEditors: zwq
- * @LastEditTime: 2023-07-14 15:53:17
+ * @LastEditTime: 2023-07-19 09:27:53
  * @Description: 
 -->
 <template>
@@ -36,7 +36,7 @@
          
         <el-menu-item index="6" @click="$router.push({ name: 'home' })">
           <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
-            <use xlink:href="#icon-home"></use>
+            <use xlink:href="#首页"></use>
           </svg>
         </el-menu-item>
         <!-- 中英文 -->

From 97fe6d23b3fe4ed8839e11fd204e6bafed92e530 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Thu, 20 Jul 2023 09:07:53 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0nav-tab=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8F=AF=E4=BB=A5=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/common.scss | 1 +
 src/views/main-content.vue  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 4f6379e..cbae7a7 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -636,6 +636,7 @@ img {
               line-height: 24px;
               border-radius: 5px;
               background-color: rgba(239, 239, 239, 1);
+              &:hover,
               &.is-active {
                 color: rgba(255, 255, 255, 1);
                 background-color: rgba(62, 142, 247, 1);
diff --git a/src/views/main-content.vue b/src/views/main-content.vue
index 5ad4970..7dacc20 100644
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-07-13 15:31:21
  * @LastEditors: zwq
- * @LastEditTime: 2023-07-19 16:34:06
+ * @LastEditTime: 2023-07-20 09:05:48
  * @Description: 
 -->
 <template>
@@ -71,9 +71,9 @@ export default {
     },
     // tabs, 删除tab
     tabRemoveHandle (tabName) {
-      if (tabName === 'home') {
-        return false
-      }
+      // if (tabName === 'home') {
+      //   return false
+      // }
       this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
       if (this.$store.state.contentTabs.length <= 0) {
         this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home'

From d942fd83f8fc81a7054f410736f4097348fc0cee Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Thu, 20 Jul 2023 15:07:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B08Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/code/startEightDisciplineCreateTeam.vue      | 3 ++-
 .../code/startEightDisciplineTemporaryTreatmentMeasures.vue    | 3 ++-
 src/views/modules/code/startEightGrade.vue                     | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/code/startEightDisciplineCreateTeam.vue b/src/views/modules/code/startEightDisciplineCreateTeam.vue
index 0f53475..980d72b 100644
--- a/src/views/modules/code/startEightDisciplineCreateTeam.vue
+++ b/src/views/modules/code/startEightDisciplineCreateTeam.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-17 10:39:16
+ * @LastEditTime: 2023-07-20 10:50:58
  * @LastEditors: zwq
  * @Description: 
 -->
@@ -41,6 +41,7 @@
         @cancel="handleCancel"
         @confirm="handleConfirm"
         :before-close="handleCancel"
+        :destroy-on-close="true"
       >
         <add-or-update
           ref="teamSet"
diff --git a/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue b/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue
index 7748cb3..2c9bcd8 100644
--- a/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue
+++ b/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-17 10:39:25
+ * @LastEditTime: 2023-07-20 10:49:29
  * @LastEditors: zwq
  * @Description: 
 -->
@@ -27,6 +27,7 @@
         @cancel="handleCancel"
         @confirm="handleConfirm"
         :before-close="handleCancel"
+        :destroy-on-close="true"
         width=70%
       >
         <add-or-update
diff --git a/src/views/modules/code/startEightGrade.vue b/src/views/modules/code/startEightGrade.vue
index 5a31caf..8c96f28 100644
--- a/src/views/modules/code/startEightGrade.vue
+++ b/src/views/modules/code/startEightGrade.vue
@@ -30,6 +30,7 @@
         @cancel="handleCancel"
         @confirm="handleConfirm"
         :before-close="handleCancel"
+        :destroy-on-close="true"
       >
         <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
       </base-dialog>

From 2ba0a42a1fd659e3642a24f66c3f3b0707b661b8 Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Fri, 21 Jul 2023 16:45:10 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |   4 +-
 src/assets/img/add_new.png                    | Bin 0 -> 1325 bytes
 src/icons/svg/icon-del.svg                    |  12 +
 src/icons/svg/icon-del1.svg                   |  12 +
 src/icons/svg/icon-edit0.svg                  |  17 ++
 src/icons/svg/icon-edit1.svg                  |  17 ++
 src/icons/svg/icon-look.svg                   |  12 +
 src/icons/svg/icon-look1.svg                  |  12 +
 .../modules/supplier/components/addPlan.vue   |   7 +-
 .../supplier/components/addProjects.vue       |  26 +-
 .../components/evaluationTemplate-add.vue     | 239 ++++++++++++++----
 .../modules/supplier/components/first.vue     |  41 +--
 .../modules/supplier/components/second.vue    |  21 ++
 .../modules/supplier/components/third.vue     |   0
 .../supplier/qmsEvaluationItemList.vue        |   8 +-
 .../modules/supplier/qmsEvaluationPlan.vue    |  11 +-
 .../supplier/qmsEvaluationTemplate.vue        | 145 ++++++++---
 .../supplier/qmsSupplierProjectList.vue       |  90 ++++++-
 .../supplier/qmsSupplierRequirementList.vue   |  41 ++-
 19 files changed, 584 insertions(+), 131 deletions(-)
 create mode 100644 src/assets/img/add_new.png
 create mode 100644 src/icons/svg/icon-del.svg
 create mode 100644 src/icons/svg/icon-del1.svg
 create mode 100644 src/icons/svg/icon-edit0.svg
 create mode 100644 src/icons/svg/icon-edit1.svg
 create mode 100644 src/icons/svg/icon-look.svg
 create mode 100644 src/icons/svg/icon-look1.svg
 create mode 100644 src/views/modules/supplier/components/second.vue
 create mode 100644 src/views/modules/supplier/components/third.vue

diff --git a/public/index.html b/public/index.html
index 01f0c36..fb08323 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2022-08-22 14:57:50
- * @LastEditors: zhp
- * @LastEditTime: 2023-07-11 10:23:31
+ * @LastEditors: DY
+ * @LastEditTime: 2023-07-17 14:23:36
  * @Description: 
 -->
 <!DOCTYPE html>
diff --git a/src/assets/img/add_new.png b/src/assets/img/add_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..623a1fe45b158eb28a1aee8a41f97a5e3e1cc95b
GIT binary patch
literal 1325
zcmeAS@N?(olHy`uVBq!ia0vp^lR%h*4M?u5p4<nd7>k44ofy`glX=O&!1CPF#WAEJ
z?(JQBKWRsawvYKgo-gf4d@7nNCGaIiVPX-}bCxBnujVM4UO2>gh*L>bd;z=TWU;kd
zCAi8MtCd=sWLPQ;-g_PVe4$FBa^BC6jlPNLHGvKR2ROeaaC1paa8S@>Q1Ns#V-#Xj
zVQo-3c|y(MP{R_22`Z8|Sv({rh%j6dmi)XZYxd{aX?b7sI_(YKZ`-tGqrRqn+H8iG
z6S>cJ7u}w-*1qccy|PUvHzkbO*W2+;kW+ahGClj=&b!Y~S-s!C<<iZ);n(FC^EP~W
zVDx$OrweDMwcq&|Xf}UM&&1|%c~%c*&hzJMU$2UPsu-HCCKb8)rIliKas=~|#%Q~@
z)4GN4^*QV9d!Lh;sAtI;DScQ<f%i_)_GrC0cBffo+f3M({H}6fnv{~j#OdKMNrYjN
zin8#?Vm<Z{e);Y43h(%(yeETy)SG>rJo$ZoUX{Jmyo*<^JW;>?`Y&JP@33njY14MN
z8J=3+zMms#`Hq;+=W0ziKiw|W{@gOCQTh4b?O|5C#edyBIN{TxJ7(#x7fNr=<Ke2f
zeezO@@)H%u37@)G<=XzYO>w@~6Uq4AE<H23{>I8f3UjC0pM7(9!`X@&9qvD;o=xsQ
z>?g*t(#rhv`?lO;j~_=Ih)wz2`)tEx#>|L?FXX2?JqnLLGOuO-t*%wMefHZHA6fDz
z`L~&Z{(t3^C3Qdln=9sfxHYfbXRg97{7GNP_@C>i_xzz3R&R@_<J*0==;N*1g(oVP
z&(%G9R#hFAMA$C9c+$wS<l<MJ8ubYcEGnLi3Z6zr6GslKvC-FW_tQr%57KXao2#q)
zVdl2)UuSqQPsp>k{R7HV4k&qwefymGQ`^(F**y8wzv*X+Dx1Q>be2oaL31A!oweTn
zJI3Mp-|3)~AZ6KB>QMD$+GlWT=x6${ZSvBSZafxoMQ#eVf!g}3wps4ad=~b8+7IT>
zdD`C6zx6p~PDd#mExK$vU)aNxy)U(zB+h64DSIa$==|bj2`v8@JYD@<);T3K0RY8@
B?^XZ+

literal 0
HcmV?d00001

diff --git a/src/icons/svg/icon-del.svg b/src/icons/svg/icon-del.svg
new file mode 100644
index 0000000..2ff4e08
--- /dev/null
+++ b/src/icons/svg/icon-del.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>删除</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.69689">
+        <g id="供应商评估_评估模版" transform="translate(-1241.000000, -403.000000)" fill-rule="nonzero">
+            <g id="删除" transform="translate(1241.000000, 403.000000)">
+                <rect id="矩形" opacity="0" x="0" y="0" width="40" height="40"></rect>
+                <path d="M25.5755088,1.28498542 C27.8552525,1.28498542 29.739258,3.1141321 29.8368374,5.37516257 L29.840807,5.5594082 L29.84046,6.86781876 L36.7102456,6.86802554 C37.3996072,6.86802554 37.8113884,7.26595838 38.0368575,7.91362769 L38.0794942,8.04644746 L38.1173248,8.18566341 L38.13,8.28889447 C38.13,9.06911419 37.5468225,9.64626258 36.8307452,9.70485377 L36.7102456,9.70976341 L35.16042,9.70934985 L35.1607368,33.8468114 C35.1607368,36.0667398 33.4366512,37.9141397 31.2664665,38.1049823 L31.079388,38.1172534 L30.8954386,38.1212342 L9.6157193,38.1212342 C7.3359756,38.1212342 5.45197012,36.2920875 5.3543907,34.0310571 L5.35042105,33.8468114 L5.35024,9.70934985 L3.42975439,9.70976341 C2.69477563,9.70976341 2.14173305,9.19187233 2.03050853,8.53418971 L2.01489493,8.40932835 L2.01,8.28889447 C2.01,7.50867476 2.59317752,6.93152637 3.30925482,6.87293518 L3.42975439,6.86802554 L9.92802,6.86781876 L9.92803509,5.5594082 C9.92803509,3.33947983 11.6521207,1.49207995 13.8223054,1.30123731 L14.0093839,1.28896619 L14.1933333,1.28498542 L25.5755088,1.28498542 Z M32.3207,9.70934985 L8.31122,9.70934985 L8.18992982,33.970879 C8.18992982,34.6086332 8.93553979,35.2156816 9.73635524,35.274792 L9.86315789,35.2794963 L31.1428772,35.2794963 C31.7547945,35.2794963 32.2675306,34.5542502 32.3172744,33.6232439 L32.3212281,33.4746088 L32.3207,9.70934985 Z M14.4407719,14.1880115 C15.1760909,14.1880115 15.5955852,14.6407706 15.8100205,15.3664334 L15.8478511,15.5056493 L15.8605263,15.6088804 L15.8605263,28.8841091 C15.8605263,29.7076744 15.2107514,30.3049781 14.4407719,30.3049781 C13.7113177,30.3049781 13.0897479,29.7688939 13.0263401,29.0122113 L13.0210175,28.8841091 L13.0210175,15.6088804 C13.0210175,14.7526239 13.5840451,14.1880115 14.4407719,14.1880115 Z M20.6267368,14.1880115 C21.3620559,14.1880115 21.7815501,14.6407706 21.9959854,15.3664334 L22.0338161,15.5056493 L22.0464912,15.6088804 L22.0464912,28.8841091 C22.0464912,29.7076744 21.3967163,30.3049781 20.6267368,30.3049781 C19.8972826,30.3049781 19.2757128,29.7688939 19.212305,29.0122113 L19.2069825,28.8841091 L19.2069825,15.6088804 C19.2069825,14.7526239 19.77001,14.1880115 20.6267368,14.1880115 Z M26.8127018,14.1880115 C27.5480208,14.1880115 27.967515,14.6407706 28.1819503,15.3664334 L28.219781,15.5056493 L28.2324561,15.6088804 L28.2324561,28.8841091 C28.2324561,29.7076744 27.5826812,30.3049781 26.8127018,30.3049781 C26.0832476,30.3049781 25.4616777,29.7688939 25.39827,29.0122113 L25.3929474,28.8841091 L25.3929474,15.6088804 C25.3929474,14.7526239 25.9559749,14.1880115 26.8127018,14.1880115 Z M25.6992281,4.1267233 L14.3170526,4.1267233 C13.6049877,4.1267233 12.9624425,4.73349464 12.8967786,5.44069788 L12.8912632,5.5594082 L12.89072,6.86781876 L27.12458,6.86781876 L27.1250175,5.5594082 C27.1250175,4.84260863 26.5199494,4.19811099 25.8171749,4.13225473 L25.6992281,4.1267233 Z" id="形状结合" fill="#000000"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/icon-del1.svg b/src/icons/svg/icon-del1.svg
new file mode 100644
index 0000000..3b9a2fe
--- /dev/null
+++ b/src/icons/svg/icon-del1.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>删除</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="供应商评估_评估模版" transform="translate(-689.000000, -403.000000)" fill-rule="nonzero">
+            <g id="删除" transform="translate(689.000000, 403.000000)">
+                <rect id="矩形" opacity="0" x="0" y="0" width="40" height="40"></rect>
+                <path d="M25.5755088,1.28498542 C27.8552525,1.28498542 29.739258,3.1141321 29.8368374,5.37516257 L29.840807,5.5594082 L29.84046,6.86781876 L36.7102456,6.86802554 C37.3996072,6.86802554 37.8113884,7.26595838 38.0368575,7.91362769 L38.0794942,8.04644746 L38.1173248,8.18566341 L38.13,8.28889447 C38.13,9.06911419 37.5468225,9.64626258 36.8307452,9.70485377 L36.7102456,9.70976341 L35.16042,9.70934985 L35.1607368,33.8468114 C35.1607368,36.0667398 33.4366512,37.9141397 31.2664665,38.1049823 L31.079388,38.1172534 L30.8954386,38.1212342 L9.6157193,38.1212342 C7.3359756,38.1212342 5.45197012,36.2920875 5.3543907,34.0310571 L5.35042105,33.8468114 L5.35024,9.70934985 L3.42975439,9.70976341 C2.69477563,9.70976341 2.14173305,9.19187233 2.03050853,8.53418971 L2.01489493,8.40932835 L2.01,8.28889447 C2.01,7.50867476 2.59317752,6.93152637 3.30925482,6.87293518 L3.42975439,6.86802554 L9.92802,6.86781876 L9.92803509,5.5594082 C9.92803509,3.33947983 11.6521207,1.49207995 13.8223054,1.30123731 L14.0093839,1.28896619 L14.1933333,1.28498542 L25.5755088,1.28498542 Z M32.3207,9.70934985 L8.31122,9.70934985 L8.18992982,33.970879 C8.18992982,34.6086332 8.93553979,35.2156816 9.73635524,35.274792 L9.86315789,35.2794963 L31.1428772,35.2794963 C31.7547945,35.2794963 32.2675306,34.5542502 32.3172744,33.6232439 L32.3212281,33.4746088 L32.3207,9.70934985 Z M14.4407719,14.1880115 C15.1760909,14.1880115 15.5955852,14.6407706 15.8100205,15.3664334 L15.8478511,15.5056493 L15.8605263,15.6088804 L15.8605263,28.8841091 C15.8605263,29.7076744 15.2107514,30.3049781 14.4407719,30.3049781 C13.7113177,30.3049781 13.0897479,29.7688939 13.0263401,29.0122113 L13.0210175,28.8841091 L13.0210175,15.6088804 C13.0210175,14.7526239 13.5840451,14.1880115 14.4407719,14.1880115 Z M20.6267368,14.1880115 C21.3620559,14.1880115 21.7815501,14.6407706 21.9959854,15.3664334 L22.0338161,15.5056493 L22.0464912,15.6088804 L22.0464912,28.8841091 C22.0464912,29.7076744 21.3967163,30.3049781 20.6267368,30.3049781 C19.8972826,30.3049781 19.2757128,29.7688939 19.212305,29.0122113 L19.2069825,28.8841091 L19.2069825,15.6088804 C19.2069825,14.7526239 19.77001,14.1880115 20.6267368,14.1880115 Z M26.8127018,14.1880115 C27.5480208,14.1880115 27.967515,14.6407706 28.1819503,15.3664334 L28.219781,15.5056493 L28.2324561,15.6088804 L28.2324561,28.8841091 C28.2324561,29.7076744 27.5826812,30.3049781 26.8127018,30.3049781 C26.0832476,30.3049781 25.4616777,29.7688939 25.39827,29.0122113 L25.3929474,28.8841091 L25.3929474,15.6088804 C25.3929474,14.7526239 25.9559749,14.1880115 26.8127018,14.1880115 Z M25.6992281,4.1267233 L14.3170526,4.1267233 C13.6049877,4.1267233 12.9624425,4.73349464 12.8967786,5.44069788 L12.8912632,5.5594082 L12.89072,6.86781876 L27.12458,6.86781876 L27.1250175,5.5594082 C27.1250175,4.84260863 26.5199494,4.19811099 25.8171749,4.13225473 L25.6992281,4.1267233 Z" id="形状结合" fill="#FF2323"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/icon-edit0.svg b/src/icons/svg/icon-edit0.svg
new file mode 100644
index 0000000..a257814
--- /dev/null
+++ b/src/icons/svg/icon-edit0.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编辑</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="供应商评估_评估模版" transform="translate(-513.000000, -404.000000)">
+            <g id="编组-2备份" transform="translate(512.000000, 404.000000)">
+                <g id="编辑" transform="translate(1.000000, 0.000000)">
+                    <rect id="矩形" x="0" y="0" width="35.5555556" height="35.5555556"></rect>
+                    <g id="常用购票人／编辑32" fill-rule="nonzero">
+                        <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="40" height="40"></rect>
+                        <path d="M21.9461538,3.08333333 C22.4935031,3.08333333 22.9992746,3.37534065 23.2729492,3.84935897 C23.5466238,4.32337729 23.5466238,4.90739194 23.2729492,5.38141027 C23.0241541,5.81233601 22.5835434,6.09283945 22.0942569,6.14027869 L21.9461538,6.1474359 L9.74358974,6.1474359 C7.82155659,6.1474359 6.25170159,7.65528983 6.15242066,9.55260178 L6.1474359,9.74358974 L6.1474359,30.2564103 C6.1474359,32.1784434 7.65528983,33.7482984 9.55260178,33.8475793 L9.74358974,33.8525641 L30.2564103,33.8525641 C32.1784434,33.8525641 33.7482984,32.3447102 33.8475793,30.4473982 L33.8525641,30.2564103 L33.8525641,19.5602564 C33.8525641,18.7141279 34.5384868,18.0282051 35.3846154,18.0282051 C36.1837368,18.0282051 36.8399586,18.6400313 36.9104057,19.4208085 L36.9166667,19.5602564 L36.9166667,30.2564103 C36.9166667,33.8565054 34.0603077,36.7894621 30.4902312,36.912639 L30.2564103,36.9166667 L9.74358974,36.9166667 C6.14349464,36.9166667 3.21053791,34.0603077 3.08736098,30.4902312 L3.08333333,30.2564103 L3.08333333,9.74358974 C3.08333333,6.14349464 5.93969229,3.21053791 9.50976879,3.08736098 L9.74358974,3.08333333 L21.9461538,3.08333333 Z M35.5111781,5.19079908 C36.0819035,5.72326795 36.1560265,6.59166826 35.7034748,7.2136457 L35.6059332,7.334583 L21.6187527,22.3371482 C21.2454671,22.7375271 20.6869374,22.908347 20.1535563,22.7852616 C19.6201753,22.6621763 19.1929761,22.2638853 19.0328806,21.7404211 C18.8873392,21.2645445 18.9826458,20.7509435 19.2816371,20.3606783 L19.3774079,20.2474599 L33.3698382,5.24073629 C33.951474,4.64500849 34.9024043,4.62283227 35.5111781,5.19079908 Z" id="形状结合" fill="#0B58FF"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/icon-edit1.svg b/src/icons/svg/icon-edit1.svg
new file mode 100644
index 0000000..f9b2ea6
--- /dev/null
+++ b/src/icons/svg/icon-edit1.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编辑</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.69689">
+        <g id="供应商评估_评估模版" transform="translate(-1065.000000, -404.000000)">
+            <g id="编组-2备份-3" transform="translate(1064.000000, 404.000000)">
+                <g id="编辑" transform="translate(1.000000, 0.000000)">
+                    <rect id="矩形" x="0" y="0" width="35.5555556" height="35.5555556"></rect>
+                    <g id="常用购票人／编辑32" fill="#000000" fill-rule="nonzero">
+                        <rect id="矩形" opacity="0" x="0" y="0" width="40" height="40"></rect>
+                        <path d="M21.9461538,3.08333333 C22.4935031,3.08333333 22.9992746,3.37534065 23.2729492,3.84935897 C23.5466238,4.32337729 23.5466238,4.90739194 23.2729492,5.38141027 C23.0241541,5.81233601 22.5835434,6.09283945 22.0942569,6.14027869 L21.9461538,6.1474359 L9.74358974,6.1474359 C7.82155659,6.1474359 6.25170159,7.65528983 6.15242066,9.55260178 L6.1474359,9.74358974 L6.1474359,30.2564103 C6.1474359,32.1784434 7.65528983,33.7482984 9.55260178,33.8475793 L9.74358974,33.8525641 L30.2564103,33.8525641 C32.1784434,33.8525641 33.7482984,32.3447102 33.8475793,30.4473982 L33.8525641,30.2564103 L33.8525641,19.5602564 C33.8525641,18.7141279 34.5384868,18.0282051 35.3846154,18.0282051 C36.1837368,18.0282051 36.8399586,18.6400313 36.9104057,19.4208085 L36.9166667,19.5602564 L36.9166667,30.2564103 C36.9166667,33.8565054 34.0603077,36.7894621 30.4902312,36.912639 L30.2564103,36.9166667 L9.74358974,36.9166667 C6.14349464,36.9166667 3.21053791,34.0603077 3.08736098,30.4902312 L3.08333333,30.2564103 L3.08333333,9.74358974 C3.08333333,6.14349464 5.93969229,3.21053791 9.50976879,3.08736098 L9.74358974,3.08333333 L21.9461538,3.08333333 Z M35.5111781,5.19079908 C36.0819035,5.72326795 36.1560265,6.59166826 35.7034748,7.2136457 L35.6059332,7.334583 L21.6187527,22.3371482 C21.2454671,22.7375271 20.6869374,22.908347 20.1535563,22.7852616 C19.6201753,22.6621763 19.1929761,22.2638853 19.0328806,21.7404211 C18.8873392,21.2645445 18.9826458,20.7509435 19.2816371,20.3606783 L19.3774079,20.2474599 L33.3698382,5.24073629 C33.951474,4.64500849 34.9024043,4.62283227 35.5111781,5.19079908 Z" id="形状结合"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/icon-look.svg b/src/icons/svg/icon-look.svg
new file mode 100644
index 0000000..fa04971
--- /dev/null
+++ b/src/icons/svg/icon-look.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>预览</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="供应商评估_评估模版" transform="translate(-333.000000, -404.000000)" fill-rule="nonzero">
+            <g id="预览" transform="translate(333.000000, 404.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="39.7350993" height="40"></rect>
+                <path d="M38.0837006,36.8192237 L34.2436156,32.9468752 C34.9636315,31.7367663 35.4436422,30.2846356 35.4436422,28.8325049 C35.4436422,24.7181346 32.0835677,21.3298297 28.0034774,21.3298297 C23.923387,21.3298297 20.5633126,24.7181346 20.5633126,28.8325049 C20.5633126,32.9468752 23.923387,36.3351801 28.0034774,36.3351801 C29.6835146,36.3351801 31.1235465,35.8511366 32.3235731,34.8830494 L36.1636581,38.7553979 C36.6436687,39.2394415 37.60369,39.2394415 38.0837006,38.7553979 C38.5637113,38.2713544 38.5637113,37.3032673 38.0837006,36.8192237 Z M27.7634721,33.4309188 C25.1234136,33.4309188 23.2033711,31.2527227 23.2033711,28.8325049 C23.2033711,26.1702653 25.3634189,24.234091 27.7634721,24.234091 C30.4035305,24.234091 32.3235731,26.4122871 32.3235731,28.8325049 C32.5635784,31.4947445 30.4035305,33.4309188 27.7634721,33.4309188 Z M8.5630468,39.4814633 C6.64300427,39.4814633 2.56291391,38.2713544 2.56291391,34.1569841 L2.56291391,8.26065345 C2.56291391,3.42021782 5.68298301,1 8.5630468,1 L29.4435093,1 C33.043589,1 35.4436422,3.42021782 35.4436422,7.29256632 L35.4436422,16.0053505 C35.4436422,16.7314158 34.9636315,17.6995029 34.0036103,17.6995029 C32.8035837,17.4574812 32.3235731,16.9734376 32.3235731,16.0053505 L32.3235731,7.77660989 C32.3235731,5.11437029 29.9235199,4.14628316 28.9634986,4.14628316 L8.5630468,4.14628316 C7.36302022,4.14628316 5.4429777,5.59841385 5.4429777,8.74469702 L5.4429777,32.9468752 C5.4429777,36.5772019 7.84303085,36.5772019 8.80305212,36.5772019 L16.0032116,36.5772019 C16.9632329,36.3351801 17.4432435,37.3032673 17.4432435,38.0293326 C17.4432435,38.7553979 16.9632329,39.4814633 15.7632063,39.4814633 L8.5630468,39.4814633 Z M10.7230946,7.53458811 L27.0434561,7.53458811 C27.7634721,7.53458811 28.2434827,8.01863167 28.2434827,8.74469702 C28.2434827,9.47076236 27.7634721,9.95480592 27.0434561,9.95480592 L10.7230946,9.95480592 C10.0030787,9.95480592 9.52306806,9.47076236 9.52306806,8.74469702 C9.52306806,8.01863167 9.76307338,7.53458811 10.7230946,7.53458811 Z M10.7230946,14.5532198 L27.0434561,14.5532198 C27.7634721,14.5532198 28.2434827,15.0372633 28.2434827,15.7633287 C28.2434827,16.489394 27.7634721,16.9734376 27.0434561,16.9734376 L10.7230946,16.9734376 C10.0030787,16.9734376 9.52306806,16.489394 9.52306806,15.7633287 C9.52306806,15.2792851 9.76307338,14.5532198 10.7230946,14.5532198 Z M10.7230946,21.8138732 L17.6832488,21.8138732 C18.4032647,21.8138732 18.8832754,22.2979168 18.8832754,23.0239821 C18.8832754,23.7500475 18.1632594,24.234091 17.6832488,24.234091 L10.7230946,24.234091 C10.0030787,24.234091 9.52306806,23.7500475 9.52306806,23.0239821 C9.52306806,22.2979168 9.76307338,21.8138732 10.7230946,21.8138732 Z" id="形状" fill="#0B58FF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/icon-look1.svg b/src/icons/svg/icon-look1.svg
new file mode 100644
index 0000000..9e3cda7
--- /dev/null
+++ b/src/icons/svg/icon-look1.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>预览</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.69689">
+        <g id="供应商评估_评估模版" transform="translate(-885.000000, -404.000000)" fill="#000000" fill-rule="nonzero">
+            <g id="预览" transform="translate(885.000000, 404.000000)">
+                <rect id="矩形" opacity="0" x="0" y="0" width="39.7350993" height="40"></rect>
+                <path d="M38.0837006,36.8192237 L34.2436156,32.9468752 C34.9636315,31.7367663 35.4436422,30.2846356 35.4436422,28.8325049 C35.4436422,24.7181346 32.0835677,21.3298297 28.0034774,21.3298297 C23.923387,21.3298297 20.5633126,24.7181346 20.5633126,28.8325049 C20.5633126,32.9468752 23.923387,36.3351801 28.0034774,36.3351801 C29.6835146,36.3351801 31.1235465,35.8511366 32.3235731,34.8830494 L36.1636581,38.7553979 C36.6436687,39.2394415 37.60369,39.2394415 38.0837006,38.7553979 C38.5637113,38.2713544 38.5637113,37.3032673 38.0837006,36.8192237 Z M27.7634721,33.4309188 C25.1234136,33.4309188 23.2033711,31.2527227 23.2033711,28.8325049 C23.2033711,26.1702653 25.3634189,24.234091 27.7634721,24.234091 C30.4035305,24.234091 32.3235731,26.4122871 32.3235731,28.8325049 C32.5635784,31.4947445 30.4035305,33.4309188 27.7634721,33.4309188 Z M8.5630468,39.4814633 C6.64300427,39.4814633 2.56291391,38.2713544 2.56291391,34.1569841 L2.56291391,8.26065345 C2.56291391,3.42021782 5.68298301,1 8.5630468,1 L29.4435093,1 C33.043589,1 35.4436422,3.42021782 35.4436422,7.29256632 L35.4436422,16.0053505 C35.4436422,16.7314158 34.9636315,17.6995029 34.0036103,17.6995029 C32.8035837,17.4574812 32.3235731,16.9734376 32.3235731,16.0053505 L32.3235731,7.77660989 C32.3235731,5.11437029 29.9235199,4.14628316 28.9634986,4.14628316 L8.5630468,4.14628316 C7.36302022,4.14628316 5.4429777,5.59841385 5.4429777,8.74469702 L5.4429777,32.9468752 C5.4429777,36.5772019 7.84303085,36.5772019 8.80305212,36.5772019 L16.0032116,36.5772019 C16.9632329,36.3351801 17.4432435,37.3032673 17.4432435,38.0293326 C17.4432435,38.7553979 16.9632329,39.4814633 15.7632063,39.4814633 L8.5630468,39.4814633 Z M10.7230946,7.53458811 L27.0434561,7.53458811 C27.7634721,7.53458811 28.2434827,8.01863167 28.2434827,8.74469702 C28.2434827,9.47076236 27.7634721,9.95480592 27.0434561,9.95480592 L10.7230946,9.95480592 C10.0030787,9.95480592 9.52306806,9.47076236 9.52306806,8.74469702 C9.52306806,8.01863167 9.76307338,7.53458811 10.7230946,7.53458811 Z M10.7230946,14.5532198 L27.0434561,14.5532198 C27.7634721,14.5532198 28.2434827,15.0372633 28.2434827,15.7633287 C28.2434827,16.489394 27.7634721,16.9734376 27.0434561,16.9734376 L10.7230946,16.9734376 C10.0030787,16.9734376 9.52306806,16.489394 9.52306806,15.7633287 C9.52306806,15.2792851 9.76307338,14.5532198 10.7230946,14.5532198 Z M10.7230946,21.8138732 L17.6832488,21.8138732 C18.4032647,21.8138732 18.8832754,22.2979168 18.8832754,23.0239821 C18.8832754,23.7500475 18.1632594,24.234091 17.6832488,24.234091 L10.7230946,24.234091 C10.0030787,24.234091 9.52306806,23.7500475 9.52306806,23.0239821 C9.52306806,22.2979168 9.76307338,21.8138732 10.7230946,21.8138732 Z" id="形状"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/modules/supplier/components/addPlan.vue b/src/views/modules/supplier/components/addPlan.vue
index 6bd16bc..be2a479 100644
--- a/src/views/modules/supplier/components/addPlan.vue
+++ b/src/views/modules/supplier/components/addPlan.vue
@@ -109,6 +109,9 @@ export default {
     this.getUser()
   },
   methods: {
+    init(val) {
+      this.ruleForm = val
+    },
     setDay() {
       switch (this.ruleForm.reminderTimeMonth) {
         case 2:
@@ -196,7 +199,7 @@ export default {
       console.log('nich ', this.chooseSupplierList)
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.$http["post"](this.urlOptions.addURL, this.ruleForm)
+          this.$http[!this.ruleForm.id ? "post" : "put"](this.urlOptions.addURL, this.ruleForm)
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg);
@@ -207,7 +210,7 @@ export default {
                   supplierId: item,
                   evaluationPlanId: res.data
                 }
-                this.$http["post"](this.urlOptions.addQmsRelation, param)
+                this.$http[!this.ruleForm.id ? "post" : "put"](this.urlOptions.addQmsRelation, param)
                   .then(({ data: res }) => {
                     if (res.code !== 0) {
                       return this.$message.error(res.msg);
diff --git a/src/views/modules/supplier/components/addProjects.vue b/src/views/modules/supplier/components/addProjects.vue
index faa2f3e..f2e589c 100644
--- a/src/views/modules/supplier/components/addProjects.vue
+++ b/src/views/modules/supplier/components/addProjects.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-07-04 09:34:07
- * @LastEditTime: 2023-07-05 15:03:52
+ * @LastEditTime: 2023-07-21 16:38:39
  * @LastEditors: DY
  * @Description: 
 -->
@@ -9,28 +9,40 @@
   <el-card shadow="never" class="aui-card--fill">
     <el-tabs tab-position="left" style="min-height: 200px;">
       <el-tab-pane label="项目概述">
-        <first></first>
+        <first ref="first" @refreshDataList="refreashData"></first>
       </el-tab-pane>
-      <el-tab-pane label="配置管理">配置管理</el-tab-pane>
-      <el-tab-pane label="角色管理">角色管理</el-tab-pane>
-      <el-tab-pane label="定时任务补偿">定时任务补偿</el-tab-pane>
+      <el-tab-pane label="要求清单">
+        <second></second>
+      </el-tab-pane>
+      <el-tab-pane label="项目设置">项目设置</el-tab-pane>
     </el-tabs>
   </el-card>
 </template>
 
 <script>
 import first from './first.vue'
+import second from './second.vue'
 
 export default {
-  components: { first },
+  components: { first, second },
   data() {
     return {
+      project: {}
     }
   },
   mounted() {
   },
   methods: {
-    
+    refreashData() {
+      this.$emit("refresh");
+    },
+    init(val) {
+      // this.project = val
+      this.$nextTick(() => {
+        this.$refs.first.init(val);
+      });
+      console.log('你好', val)
+    }
   }
 }
 </script>
\ No newline at end of file
diff --git a/src/views/modules/supplier/components/evaluationTemplate-add.vue b/src/views/modules/supplier/components/evaluationTemplate-add.vue
index bb1460a..0dc200b 100644
--- a/src/views/modules/supplier/components/evaluationTemplate-add.vue
+++ b/src/views/modules/supplier/components/evaluationTemplate-add.vue
@@ -1,16 +1,15 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-06-19 14:59:34
- * @LastEditTime: 2023-07-11 14:22:43
+ * @LastEditTime: 2023-07-21 10:25:23
  * @LastEditors: DY
  * @Description: 
 -->
 <template>
   <div v-if="show">
-    <h1>模板编辑</h1>
     <div class="addDiv">
-      <div style="width: 300px">
-        <el-steps direction="vertical" :active="activeStep" space="70px">
+      <div style="width: 800px">
+        <el-steps :active="activeStep" space="150px">
           <el-step title="定义"></el-step>
           <el-step title="项目"></el-step>
           <el-step title="排序"></el-step>
@@ -55,13 +54,13 @@
             </el-form-item>
           </el-form>
           <el-row :gutter="5">
-            <el-col :span="18">
+            <el-col :span="16">
               <el-table
                 ref="multipleTable"
                 :data="tableData"
                 tooltip-effect="dark"
                 style="width: 80%; min-height: 26vh; overflow-y: auto"
-                @selection-change="handleSelectionChange">
+                @select="handleSelectionChange">
                 <el-table-column prop="title" label="标题" width="120" />
                 <el-table-column prop="projectTypeName" label="类型" width="120" />
                 <el-table-column prop="requirement" label="要求" />
@@ -69,7 +68,7 @@
                 <el-table-column type="selection" label="全选" width="55" />
               </el-table>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <div style="margin-top: -30px">
                 <p style="font-size: 18px">已选</p>
                 <div class="chooseDiv">
@@ -79,7 +78,7 @@
                   </div>
                 </div>
               </div>
-            </el-col>
+            </el-col> -->
           </el-row>
         </div>
         <div v-if="visibleList[2]">
@@ -98,8 +97,8 @@
                   </div>
                   <draggable v-show="element.dragVisible" v-model="element.list" group="title" animation="1000" @start="onStart" @end="onEnd2">
                     <transition-group>
-                      <div v-for="item in element.list" :key="item.id" style="margin: 5px 15px; border-bottom: 1px solid grey">
-                        <p>{{ item.title }}</p>
+                      <div v-for="item in element.list" :key="item.projectId" style="margin: 5px 15px; border-bottom: 1px solid grey">
+                        <p>{{ item.projectName }}</p>
                       </div>
                     </transition-group>
                   </draggable>
@@ -119,7 +118,7 @@
               <el-input type="number" style="width: 100px" v-model="item.weight" placeholder="权重"></el-input>
               <div  class="smallDiv">
                 <div v-for="(it, keyValue) in item.list" :key="keyValue" class="contentDiv">
-                  <p style="border: 1px solid grey; width: 80px; text-align: center">{{ it.title }}</p>
+                  <p style="border: 1px solid grey; width: 80px; text-align: center">{{ it.projectName }}</p>
                   <el-input type="number" style="width: 100px" v-model="it.benchmarkScore" placeholder="基准分"></el-input>
                 </div>
               </div>
@@ -149,7 +148,8 @@ import draggable from 'vuedraggable'
 export default {
   components: { draggable },
   props: {
-    show: Boolean
+    show: Boolean,
+    id: String
   },
   data() {
     return {
@@ -157,12 +157,16 @@ export default {
         addtURL: "/supplier/qmsEvaluationTemplate",
         getEvaluationListURL: '/supplier/qmsEvaluationItemList/page',
         getTypeListURL: '/supplier/qmsProjectType/page',
-        saveDataURL: '/supplier/qmsEvaluationTemplateProjectType/saveAll'
+        saveDataURL: '/supplier/qmsEvaluationTemplateProjectType/saveAll',
+        updateDateURL: '/supplier/qmsEvaluationTemplateProjectType/updateAll',
+        getInfoURL: '/supplier/qmsEvaluationTemplate',
+        getChooseTemURL: '/supplier/qmsEvaluationTemplateProjectType/page'
       },
       evaluationTemplateId: '',
       visibleList: [true, false, false, false, false],
       activeStep: 0,
       ruleForm: {
+        id: undefined,
         code: '',
         name: '',
         remark: ''
@@ -180,6 +184,8 @@ export default {
       paramsList: [],
       dragVisible: false,
       unfoldId: '',
+      dataListLoading: false,
+      chooseTemList: [],
       rules: {
         code: [
           { required: true, message: '请输入code', trigger: 'blur' }
@@ -192,15 +198,67 @@ export default {
   },
   mounted() {
     this.ruleForm = {
+      id: undefined,
       code: '',
       name: '',
       remark: ''
     }
-  },
-  mounted() {
     this.getTypeList()
   },
   methods: {
+    init(id) {
+      console.log('nihc', id)
+      this.activeStep = 0
+      this.visibleList = [true, false, false, false, false]
+      this.paramsList = []
+      if (id) {
+        this.ruleForm.id = id
+        this.getInfo(id)
+        this.getChooseList()
+      } else {
+        this.ruleForm = {
+          id: undefined,
+          code: '',
+          name: '',
+          remark: ''
+        }
+      }
+    },
+    getChooseList() {
+      this.$http
+        .get(this.urlOptions.getChooseTemURL, {
+          params: {
+            evaluationTemplateId: this.ruleForm.id,
+            limit: 999,
+            page: 1
+          }
+        })
+        .then(({ data: res }) => {
+          this.dataListLoading = false;
+          if (res.code !== 0) {
+            this.chooseTemList = [];
+            return this.$message.error(res.msg);
+          }
+          this.chooseTemList = res.data.list;
+        })
+        .catch(() => {
+          this.dataListLoading = false;
+        });
+    },
+    getInfo(id) {
+      this.$http
+        .get(`${this.urlOptions.getInfoURL}/${id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.ruleForm = res.data;
+          // if(this.setData){
+          //   this.setDataForm()
+          // }
+        })
+        .catch(() => { });
+    },
     closeModel() {
       this.show = false
       this.$emit('info', false)
@@ -217,22 +275,42 @@ export default {
     },
     finishData() {
       // 保存数据
-      this.$http["post"](this.urlOptions.saveDataURL, this.paramsList)
-      .then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg);
-        }
-        this.$message({
-          message: this.$t("prompt.success"),
-          type: "success",
-          duration: 500
+      console.log('结束打印', this.ruleForm)
+      if (this.paramsList[0].id) {
+        this.$http["put"](`${this.urlOptions.updateDateURL}?id=${this.paramsList[0].id}`, this.paramsList)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.$message({
+            message: this.$t("prompt.success"),
+            type: "success",
+            duration: 500
+          })
+          this.activeStep = 4
+          // this.visibleList[3] = false
+          // this.visibleList[4] = true
+          this.$set(this.visibleList, 3, false)
+          this.$set(this.visibleList, 4, true)
         })
-        this.activeStep = 4
-        // this.visibleList[3] = false
-        // this.visibleList[4] = true
-        this.$set(this.visibleList, 3, false)
-        this.$set(this.visibleList, 4, true)
-      })
+      } else {
+        this.$http["post"](this.urlOptions.saveDataURL, this.paramsList)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.$message({
+            message: this.$t("prompt.success"),
+            type: "success",
+            duration: 500
+          })
+          this.activeStep = 4
+          // this.visibleList[3] = false
+          // this.visibleList[4] = true
+          this.$set(this.visibleList, 3, false)
+          this.$set(this.visibleList, 4, true)
+        })
+      }
     },
     lastStep() {
       console.log('thi', this.activeStep)
@@ -248,10 +326,34 @@ export default {
       console.log('wokjkj11', this.visibleList)
     },
     updateData() {
-      console.log('更新')
+      console.log('更新到步骤四')
+      console.log('观察一下', this.paramsList, this.chooseTemList)
+      this.activeStep ++
       this.$set(this.visibleList, 2, false)
       this.$set(this.visibleList, 3, true)
-      console.log('wokjkj', this.visibleList)
+      this.paramsList.forEach(item => {
+        this.chooseTemList.forEach(choose => {
+          if (item.evaluationTemplateId === choose.evaluationTemplateId) {
+            item.calculationScoreFormula = choose.calculationScoreFormula
+            item.weight = choose.weight
+            item.id = choose.id
+          }
+          if (item.list.length > 0 && choose.list.length > 0) {
+            item.list.forEach(pro => {
+              choose.list.forEach(cho => {
+                if (pro.projectId === cho.projectId) {
+                  pro.benchmarkScore = cho.benchmarkScore
+                  pro.weight = cho.weight
+                  pro.evaluationTemplateTypeId = cho.evaluationTemplateTypeId
+                  pro.id = cho.id
+                  pro.createDate = cho.createDate
+                }
+              })
+            })
+          }
+        })
+      })
+      console.log('观察一下', this.paramsList)
     },
     unfold(item) {
       item.dragVisible = !item.dragVisible
@@ -316,19 +418,30 @@ export default {
         }
         const typeList = Array.from(new Set(temp))
         console.log('aaaaaaa', typeList)
-        for (let key of typeList) {
+        for (let i = 0; i < typeList.length; i ++) {
           let obj = {}
-          obj.projectTypeName = typeList[key]
+          obj.projectTypeName = typeList[i]
           obj.dragVisible = false
-          obj.sort = key
-          obj.list = this.multipleSelection.filter((ele, index) => {
-            if (ele.projectTypeName === typeList[key]) {
+          obj.sort = i
+          obj.calculationScoreFormula = undefined
+          obj.weight = undefined
+          obj.list = []
+          this.multipleSelection.filter((ele, index) => {
+            if (ele.projectTypeName === typeList[i]) {
               obj.projectTypeId = ele.projectTypeId
               obj.evaluationTemplateId = this.evaluationTemplateId
-              ele.evaluationTemplateId = this.evaluationTemplateId
-              ele.projectId = ele.id
-              ele.sort = index
-              return ele
+              // ele.evaluationTemplateId = this.evaluationTemplateId
+              // ele.projectId = ele.id
+              // ele.sort = index
+              const tempList = {
+                evaluationTemplateId: this.evaluationTemplateId,
+                projectId: ele.id,
+                sort: index,
+                projectName: ele.title,
+                benchmarkScore: undefined,
+                weight: undefined
+              }
+              obj.list.push(tempList)
             }
           })
           this.paramsList.push(obj)
@@ -341,21 +454,31 @@ export default {
         this.$set(this.visibleList, 2, true)
       }
     },
-    toggleSelection(rows) {
-      if (rows) {
-        rows.forEach(row => {
-          this.$refs.multipleTable.toggleRowSelection(row);
-        });
-      } else {
-        this.$refs.multipleTable.clearSelection();
-      }
+    toggleSelection() {
+      console.log('打印', this.chooseTemList)
+      console.log('打印22', this.tableData)
+      this.chooseTemList.forEach(item => {
+        if (item.list.length > 0) {
+          item.list.forEach(it => {
+            this.tableData.forEach(data => {
+              if (it.projectId === data.id) {
+                console.log('wokjkj ', data)
+                this.$nextTick(() => {
+                  this.$refs.multipleTable.toggleRowSelection(data, true);
+                  this.multipleSelection.push(data)
+                })
+              }
+            })
+            
+          });
+        }
+      })
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
-      console.log('你好', this.multipleSelection)
+      console.log('你好', val, this.multipleSelection)
     },
     getTypeList() {
-      this.paramsList = []
       this.$http
         .get(this.urlOptions.getTypeListURL, {
           params: {
@@ -408,7 +531,7 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.$http["post"](this.urlOptions.addtURL, this.ruleForm)
+          this.$http[!this.ruleForm.id ? "post" : "put"](this.urlOptions.addtURL, this.ruleForm)
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg);
@@ -424,9 +547,13 @@ export default {
             })
             console.log('新增结果', res.data)
             this.evaluationTemplateId = res.data
+            this.ruleForm.id = res.data
             this.activeStep ++
-            // this.visibleList[0] = false
-            // this.visibleList[1] = true
+            this.getEvaList()
+            setTimeout(() =>{
+              this.toggleSelection()
+            }, 600)
+            // this.toggleSelection()
             this.$set(this.visibleList, 0, false)
             this.$set(this.visibleList, 1, true)
           })
@@ -443,6 +570,7 @@ export default {
 <style scoped>
   .addDiv {
     display: flex;
+    flex-direction: column;
     justify-content: space-between;
     min-height: 20vh;
   }
@@ -463,6 +591,7 @@ export default {
     display: flex;
     justify-content: space-between;
     padding: 10px 40px 0 0;
+    width: 80%;
   }
   .smallDiv {
     display: flex;
@@ -476,7 +605,7 @@ export default {
     flex-direction: row;
     width: 200px;
     justify-content: space-between;
-    margin-left: 20px;
+    margin-left: 10px;
     text-align: center;
   }
 </style>
diff --git a/src/views/modules/supplier/components/first.vue b/src/views/modules/supplier/components/first.vue
index 501cc9f..420064c 100644
--- a/src/views/modules/supplier/components/first.vue
+++ b/src/views/modules/supplier/components/first.vue
@@ -4,33 +4,33 @@
       <el-form-item label="标题" prop="title">
         <el-input v-model="ruleForm.title"></el-input>
       </el-form-item>
-      <el-form-item label="物料" prop="productName">
-        <el-select v-model="ruleForm.productName" filterable clearable placeholder="物料">
+      <el-form-item label="物料" prop="productId">
+        <el-select v-model="ruleForm.productId" filterable clearable placeholder="物料">
           <el-option
             v-for="item in productList"
             :key="item.id"
             :label="item.productName"
-            :value="item.productName">
+            :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="供应商" prop="supplierName">
-        <el-select v-model="ruleForm.supplierName" filterable clearable placeholder="供应商">
+      <el-form-item label="供应商" prop="supplierId">
+        <el-select v-model="ruleForm.supplierId" filterable clearable placeholder="供应商">
           <el-option
             v-for="item in supplierList"
             :key="item.id"
             :label="item.name"
-            :value="item.name">
+            :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="负责人" prop="personLiableName">
-        <el-select v-model="ruleForm.personLiableName" filterable clearable placeholder="供应商">
+      <el-form-item label="负责人" prop="personLiable">
+        <el-select v-model="ruleForm.personLiable" filterable clearable placeholder="供应商">
           <el-option
             v-for="item in userList"
             :key="item.id"
             :label="item.username"
-            :value="item.username">
+            :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -66,6 +66,9 @@
 
 <script>
 export default {
+  // props: {
+  //   project: Object
+  // },
   data() {
     return {
       urlOptions: {
@@ -76,9 +79,9 @@ export default {
       },
       ruleForm: {
         title: '',
-        productName: '',
-        supplierName: '',
-        personLiableName: '',
+        productId: '',
+        supplierId: '',
+        personLiable: '',
         background: '',
         ment: 0,
         timeNodeStart: undefined,
@@ -100,8 +103,7 @@ export default {
       supplierList: [],
       rules: {
         title: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+          { required: true, message: '请输入活动名称', trigger: 'blur' }
         ]
       }
     }
@@ -110,8 +112,16 @@ export default {
     this.getProduct()
     this.getSupplier()
     this.getUser()
+    // if (this.project.id) {
+    //   this.ruleForm = this.project
+    //   console.log('啦啦啦', this.ruleForm)
+    // }
+    // console.log('啦啦111111啦', this.ruleForm)
   },
   methods: {
+    init(item) {
+      this.ruleForm = item
+    },
     getUser() {
       this.$http
         .get(this.urlOptions.getUserURL, {
@@ -173,7 +183,6 @@ export default {
         });
     },
     submitForm(formName) {
-      console.log('啊啊啊啊啊', this.ruleForm)
       if (this.timeSlot) {
         this.ruleForm.timeNodeStart = this.timeSlot[0]
         this.ruleForm.timeNodeEnd = this.timeSlot[1]
@@ -183,7 +192,7 @@ export default {
       }
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.$http["post"](this.urlOptions.addURL, this.ruleForm)
+          this.$http[!this.ruleForm.id ? "post" : "put"](this.urlOptions.addURL, this.ruleForm)
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg);
diff --git a/src/views/modules/supplier/components/second.vue b/src/views/modules/supplier/components/second.vue
new file mode 100644
index 0000000..a5309eb
--- /dev/null
+++ b/src/views/modules/supplier/components/second.vue
@@ -0,0 +1,21 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2023-07-18 16:08:09
+ * @LastEditTime: 2023-07-18 16:09:43
+ * @LastEditors: DY
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    要求清单
+  </el-card>
+</template>
+
+<script>
+export default {
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/modules/supplier/components/third.vue b/src/views/modules/supplier/components/third.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/modules/supplier/qmsEvaluationItemList.vue b/src/views/modules/supplier/qmsEvaluationItemList.vue
index d9bc802..2a16687 100644
--- a/src/views/modules/supplier/qmsEvaluationItemList.vue
+++ b/src/views/modules/supplier/qmsEvaluationItemList.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-07-11 15:20:16
- * @LastEditors: zhp
+ * @LastEditTime: 2023-07-17 15:26:25
+ * @LastEditors: DY
  * @Description: 
 -->
 <template>
@@ -110,8 +110,8 @@ export default {
       formConfig: [
         {
           type: 'input',
-          label: i18n.t('supplier.name'),
-          placeholder: i18n.t('supplier.name'),
+          label: i18n.t('supplier.title'),
+          placeholder: i18n.t('supplier.title'),
           param: 'title'
         },
         {
diff --git a/src/views/modules/supplier/qmsEvaluationPlan.vue b/src/views/modules/supplier/qmsEvaluationPlan.vue
index ac71f53..bb3b00c 100644
--- a/src/views/modules/supplier/qmsEvaluationPlan.vue
+++ b/src/views/modules/supplier/qmsEvaluationPlan.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-06-20 11:16:51
- * @LastEditTime: 2023-07-14 15:53:22
+ * @LastEditTime: 2023-07-14 16:31:39
  * @LastEditors: DY
  * @Description: 评估计划
 -->
@@ -108,7 +108,7 @@
     <div>
       <el-button class="carcleButton" @click="addPlanButon">+</el-button>
     </div>
-    <add-plan v-if="addtModelVisible" @refreshDataList="onSubmit"></add-plan>
+    <add-plan ref="addModel" v-if="addtModelVisible" @refreshDataList="onSubmit"></add-plan>
     <base-dialog dialogTitle="start" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel" @confirm="handleConfirm" :before-close="handleCancel">
       <start-plan ref="addOrUpdate" @refreshDataList="closeSucess"></start-plan>
     </base-dialog>
@@ -180,7 +180,12 @@ export default {
         this.$refs.addOrUpdate.init(val);
       });
     },
-    editPlan(val) {},
+    editPlan(val) {
+      this.addtModelVisible = true
+      this.$nextTick(() => {
+        this.$refs.addModel.init(val);
+      });
+    },
     deletePlan(val) {
       this.$confirm(`确定对[名称=${val.title}]进行删除操作?`, "提示", {
         confirmButtonText: "确定",
diff --git a/src/views/modules/supplier/qmsEvaluationTemplate.vue b/src/views/modules/supplier/qmsEvaluationTemplate.vue
index 9a73226..d3f6cea 100644
--- a/src/views/modules/supplier/qmsEvaluationTemplate.vue
+++ b/src/views/modules/supplier/qmsEvaluationTemplate.vue
@@ -1,39 +1,62 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-06-19 10:38:41
- * @LastEditTime: 2023-06-26 16:05:18
+ * @LastEditTime: 2023-07-20 16:14:02
  * @LastEditors: DY
  * @Description: 评估模板
 -->
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <h1>绩效评估模板</h1>
+    <!-- <h1>绩效评估模板</h1> -->
     <div class="bigDiv">
       <div v-for="(item, index) in dataList" :key="index" class="smallDiv">
-        <p style="font-size: 18px">{{ item.name }}</p>
-        <div style="margin-top: 30px;">
-          <el-row :gutter="20">
-            <el-col :span="20">
-              <span style="font-size: 18px;">综合评估表</span>
-            </el-col>
-            <el-col :span="4">
-              <i class="el-icon-view" @click="seeeValuationList(item.id)"></i>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="4" :offset="20">
-              <i class="el-icon-delete" @click="deleteEvaluation(item.id, item.name)"></i>
-            </el-col>
-          </el-row>
+        <div class="flexDiv">
+          <div style="height: 150px">
+            <p style="font-size: 22px; text-align: center; margin-top: 10%">{{ item.name }}</p>
+            <p style="text-align: center">{{item.remark}}</p>
+          </div>
+          <div>
+            <el-row :gutter="0">
+              <el-col :span="8">
+                <div :class="item.current === 1 ? 'activeCard' : 'normalCard'" @mouseenter="enterDiv(item)" @mouseleave="leaveDiv(item)" @click="seeeValuationList(item.id)">
+                  <svg v-if="item.current" class="icon-svg" aria-hidden="true"><use xlink:href="#icon-look"></use></svg>
+                  <svg v-else class="icon-svg" aria-hidden="true"><use xlink:href="#icon-look1"></use></svg>
+                  <p style="font-size: 14px">预览</p>
+                </div>
+              </el-col>
+              <el-col :span="8">
+                <div :class="item.current === 1 ? 'activeCard' : 'normalCard'" @mouseenter="enterDiv(item)" @mouseleave="leaveDiv(item)" @click="editEvaluation(item)">
+                  <svg v-if="item.current" class="icon-svg" aria-hidden="true"><use xlink:href="#icon-edit0"></use></svg>
+                  <svg v-else class="icon-svg" aria-hidden="true"><use xlink:href="#icon-edit1"></use></svg>
+                  <p style="font-size: 14px">编辑</p>
+                </div>
+              </el-col>
+              <el-col :span="8">
+                <div :class="item.current === 1 ? 'activeDelCard' : 'normalCard'" @mouseenter="enterDiv(item)" @mouseleave="leaveDiv(item)" @click="deleteEvaluation(item.id, item.name)">
+                  <svg v-if="item.current" class="icon-svg" aria-hidden="true"><use xlink:href="#icon-del1"></use></svg>
+                  <svg v-else class="icon-svg" aria-hidden="true"><use xlink:href="#icon-del"></use></svg>
+                  <p style="font-size: 14px">删除</p>
+                </div>
+              </el-col>
+            </el-row>
+          </div>
         </div>
       </div>
+      <div class="smallDiv addDiv" @click="addTemplate">
+        <img src="../../../assets/img/add_new.png" alt="">
+      </div>
     </div>
-    <div>
-      <el-button class="carcleButton" @click="addTemplate">+</el-button>
-    </div>
-    <div v-if="editModelVisible" style="border: 1px solid grey; padding: 10px">
+    <!-- <div v-if="editModelVisible" style="border: 1px solid grey; padding: 10px">
       <evaluation-template-add @refreshDataList="getDataList" :show="editModelVisible" @info="getInfo"></evaluation-template-add>
-    </div>
+    </div> -->
+    <el-dialog
+      title="新增模板"
+      :visible.sync="editModelVisible"
+      :close-on-click-modal="false"
+      width="70%"
+      :before-close="handleClose">
+      <evaluation-template-add ref="addTemplate" @refreshDataList="getDataList" :show="editModelVisible" @info="getInfo"></evaluation-template-add>
+    </el-dialog>
     <el-dialog
       title="预览"
       :visible.sync="dialogVisible"
@@ -81,17 +104,34 @@ export default ({
       },
       tableProps,
       projectsList: [],
+      addOrEditTitle: '新增模板',
+      current: 0,
       addTemplateVisible: false,
       activeStep: 0,
       editModelVisible: false,
       dataListLoading: false,
-      dialogVisible: false
+      dialogVisible: false,
+      templateId: ''
     }
   },
   mounted() {
     this.getDataList()
   },
   methods: {
+    editEvaluation(obj) {
+      console.log('编辑', obj.id)
+      this.templateId = obj.id
+      this.editModelVisible = true
+      this.$nextTick(() => {
+        this.$refs.addTemplate.init(obj.id)
+      });
+    },
+    leaveDiv(obj) {
+      obj.current = 0
+    },
+    enterDiv(obj) {
+      obj.current = 1
+    },
     deleteEvaluation(id, name) {
       this.$confirm(`确定对[名称=${name}]进行删除操作?`, "提示", {
         confirmButtonText: "确定",
@@ -151,6 +191,9 @@ export default ({
     },
      addTemplate() {
       this.editModelVisible = true
+      this.$nextTick(() => {
+        this.$refs.addTemplate.init()
+      });
     },
     getDataList() {
       // this.dataListLoading = true;
@@ -165,7 +208,10 @@ export default ({
             this.listQuery.total = 0;
             return this.$message.error(res.msg);
           }
-          this.dataList = res.data.list;
+          this.dataList = res.data.list.map((item) =>{
+            item.current = 0
+            return item
+          })
           this.listQuery.total = res.data.total;
         })
         .catch(() => {
@@ -177,19 +223,25 @@ export default ({
 </script>
 
 <style scoped>
+  .flexDiv {
+    display: flex;
+    justify-content: space-around;
+    flex-direction: column;
+  }
   .bigDiv {
-    border: 1px solid grey;
-    padding: 20px 5vw;
+    /* border: 1px solid grey; */
+    /* padding: 10px; */
     display: flex;
     justify-content: space-between;
     flex-wrap: wrap;
   }
   .smallDiv {
     border: 1px solid grey;
-    padding: 0px 20px;
-    width: 40%;
-    height: 150px;
-    margin: 10px;
+    /* padding: 0px 20px; */
+    width: 32%;
+    height: 250px;
+    margin: 5px;
+    text-align: center;
   }
   .carcleButton {
     border-radius: 50%;
@@ -198,4 +250,37 @@ export default ({
     margin: 5px;
     background-color: rgb(196, 193, 193);
   }
+  .activeCard {
+    background: linear-gradient(180deg, rgba(255,255,255,0) 0%, rgba(27,151,255,0.19) 100%);
+    height: 100px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    border-radius: 0px 0px 8px 8px;
+    color: #0B58FF;
+  }
+  .addDiv {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .normalCard {
+    height: 100px;
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+    border-radius: 0px 0px 8px 8px;
+  }
+  .activeDelCard {
+    background: linear-gradient(180deg, rgba(255,255,255,0) 0%, rgba(255,27,27,0.19) 100%);
+    height: 100px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    border-radius: 0px 0px 8px 8px;
+    color: #FF2323;
+  }
 </style>
diff --git a/src/views/modules/supplier/qmsSupplierProjectList.vue b/src/views/modules/supplier/qmsSupplierProjectList.vue
index d61ed8d..74dd2bd 100644
--- a/src/views/modules/supplier/qmsSupplierProjectList.vue
+++ b/src/views/modules/supplier/qmsSupplierProjectList.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-06-20 11:16:51
- * @LastEditTime: 2023-07-04 09:53:30
+ * @LastEditTime: 2023-07-21 16:37:22
  * @LastEditors: DY
  * @Description: 项目清单
 -->
@@ -54,10 +54,25 @@
         </el-form-item>
       </el-form>
     </div>
+    <div class="content">
+      <div class="projectCard" v-for="project in tableData" :key="project.id">
+        <div>
+          <p style="font-size: 18px; weight: 600">{{project.title}}</p>
+          <p>{{project.supplierName}}</p>
+          <p>{{project.createDate}}</p>
+        </div>
+        <div class="buttonDiv">
+          <el-row :gutter="0">
+            <el-col :span="12"><div class="bottom" @click="editProject(project)">编辑</div></el-col>
+            <el-col :span="12"><div class="bottom" @click="deletePro(project)">删除</div></el-col>
+          </el-row>
+        </div>
+      </div>
+    </div>
     <div>
       <el-button class="carcleButton" @click="addButon">+</el-button>
     </div>
-    <add-projects v-if="addtModelVisible" @refreshDataList="onSubmit"></add-projects>
+    <add-projects ref="addProjects" v-if="addtModelVisible" @refresh="refreashData"></add-projects>
   </el-card>
 </template>
 
@@ -72,14 +87,15 @@ export default {
         addURL: '/supplier/qmsEvaluationPlan',
         getProductURL: '/basic/qmsProduct/page',
         getSupplierURL: '/supplier/qmsSupplier/page',
-        getPageURL: '/supplier/qmsSupplierProjectList/page'
+        getPageURL: '/supplier/qmsSupplierProjectList/page',
+        deleteURL: '/supplier/qmsSupplierProjectList'
       },
       formInline: {
         limit: 999,
         page: 1,
-        title: '',
-        productId: '',
-        supplierId: '',
+        title: undefined,
+        productId: undefined,
+        supplierId: undefined,
         ment: undefined,
         status: 2,
         startTime: undefined,
@@ -96,11 +112,46 @@ export default {
   mounted() {
     this.getProductList();
     this.getSupplier();
+    this.onSubmit()
   },
   methods: {
+    deletePro(val) {
+      this.$confirm(`确定对[名称=${val.title}]进行删除操作?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$http.delete(this.urlOptions.deleteURL, { data: [val.id] }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+                duration: 1500,
+                onClose: () => {
+                  this.onSubmit();
+                },
+              });
+            } else {
+              this.$message.error(data.msg);
+            }
+          });
+        })
+        .catch(() => { });
+    },
+    refreashData() {
+      this.addtModelVisible = false
+      this.onSubmit()
+    },
     addButon() {
       this.addtModelVisible = true
     },
+    editProject(item) {
+      this.addtModelVisible = true
+      this.$nextTick(() => {
+        this.$refs.addProjects.init(item);
+      });
+    },
     onSubmit() {
       this.formInline.ment = this.formInline.status === 2 ? undefined : this.formInline.status
       if (this.timeSlot) {
@@ -181,4 +232,31 @@ export default {
     margin: 5px;
     background-color: rgb(196, 193, 193);
   }
+  .projectCard {
+    width: 40%;
+    height: 200px;
+    text-align: center;
+    border: 1px solid rgb(240,240,240);
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+  }
+  .content {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    padding: 0 10vw;
+  }
+  .buttonDiv {
+    position: relative;
+    bottom: 0px;
+    margin-top: 30px;
+  }
+  .bottom {
+    border: 1px solid rgb(240,240,240);
+    text-align: center;
+    height: 50px;
+    line-height: 50px;
+    vertical-align: middle;
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/modules/supplier/qmsSupplierRequirementList.vue b/src/views/modules/supplier/qmsSupplierRequirementList.vue
index 6056069..c94425d 100644
--- a/src/views/modules/supplier/qmsSupplierRequirementList.vue
+++ b/src/views/modules/supplier/qmsSupplierRequirementList.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-06-20 11:16:51
- * @LastEditTime: 2023-06-27 14:46:10
+ * @LastEditTime: 2023-07-21 15:18:23
  * @LastEditors: DY
  * @Description: 要求清单
 -->
@@ -12,7 +12,7 @@
         <el-col :span="6">
           <h2>要求分组</h2>
           <div v-for="(item, index) in groupList" :key="index">
-            <el-button style="width: 100px; text-align: left" @click="searchByGroup(item)">{{ item.name }}</el-button>
+            <div :class="item.actived ? 'activedDiv' : 'group'" @click="searchByGroup(item)">{{ item.name }}</div>
           </div>
         </el-col>
         <el-col :span="18">
@@ -28,9 +28,12 @@
           <div class="detailDiv" v-for="(item, index) in dataList" :key="index">
             <p>{{ item.title }}</p>
             <el-row :gutter="20">
-              <el-col :span="4" :offset="20">
+              <el-col :span="4" :offset="16">
                 <i class="el-icon-delete" @click="deleteRequire(item.id, item.title)"></i>
               </el-col>
+              <el-col :span="4">
+                <i class="el-icon-edit" @click="editRequire(item)"></i>
+              </el-col>
             </el-row>
           </div>
         </div>
@@ -106,6 +109,10 @@ export default {
     this.getGroup()
   },
   methods: {
+    editRequire(obj) {
+      this.ruleForm = obj
+      this.addtModelVisible = true
+    },
     deleteRequire(id, name) {
       this.$confirm(`确定对[标题=${name}]进行删除操作?`, "提示", {
         confirmButtonText: "确定",
@@ -133,7 +140,7 @@ export default {
     saveRequirement() {
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
-          this.$http["post"](this.urlOptions.addtURL, this.ruleForm)
+          this.$http[!this.ruleForm.id ? "post" : "put"](this.urlOptions.addtURL, this.ruleForm)
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg);
@@ -158,7 +165,13 @@ export default {
     },
     searchByGroup(group) {
       console.log('查询', group)
-      this.formInline.groupId = group.id
+      // this.formInline.groupId = group.id
+      group.actived = !group.actived
+      if (group.actived === true) {
+        this.formInline.groupId = group.id
+      } else {
+        this.formInline.groupId = undefined
+      }
     },
     getGroup() {
       this.$http
@@ -174,7 +187,10 @@ export default {
             this.groupList = [];
             return this.$message.error(res.msg);
           }
-          this.groupList = res.data.list;
+          this.groupList = res.data.list.map(item => {
+            item.actived = false
+            return item
+          });
         })
         .catch(() => {
           this.dataListLoading = false;
@@ -236,4 +252,17 @@ export default {
     margin: 5px;
     background-color: rgb(196, 193, 193);
   }
+  .group {
+    border: 1px solid rgb(196, 193, 193);
+    height: 50px;
+    line-height: 50px;
+    padding: 0 10px;
+  }
+  .activedDiv {
+    border: 1px solid rgb(196, 193, 193);
+    height: 50px;
+    line-height: 50px;
+    padding: 0 10px;
+    background-color: rgb(196, 193, 193);
+  }
 </style>