From 305b6da760b7a7c7c21c1dbd0a8c728edb13f8e3 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Wed, 28 Jul 2021 11:30:23 +0800
Subject: [PATCH 1/6] =?UTF-8?q?bug:=20=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=20=E5=8F=96=E6=B6=88=E6=94=B6=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CollectionStandard.vue              | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
index 2c38af157..1724579a5 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
@@ -62,7 +62,7 @@
                 <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
               </div>
               <el-col :span="4">
-                <el-button size="mini" @click="cancelStandard(item.id)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
+                <el-button size="mini" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
               </el-col>
             </el-row>
           </div>
@@ -150,7 +150,7 @@ export default {
       }, e => {})
     },
     //  取消收藏
-    cancelStandard (id) {
+    cancelStandard (item) {
       this.$confirm('确定取消收藏此数据?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -158,16 +158,18 @@ export default {
         confirmButtonClass: 'common-button-primary',
         roundButton: true
       }).then(() => {
-        var json = {}
-        json.userId = this.$store.getters.userInfo.userId
-        json.id = id
-        this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, {
+        // var json = {
+        //   id: item.collectId
+        // }
+        // json.userId = this.$store.getters.userInfo.userId
+        this.$http.put('person/personCollect/updateByUserId',{'id': item.id}, {
           _this: this
         }, res => {
           if (res.ok) {
             this.$message.success('已取消收藏')
             this.contentOpen = false
             this.pageChange(1)
+            this.selectStandard()
           }
         }, e => {
         })

From 25288f61a848a9c2e50029830569f7611de877c1 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 28 Jul 2021 11:39:59 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 190 +++++++++---------
 1 file changed, 95 insertions(+), 95 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index affcc92df..e9904b7a2 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -199,103 +199,9 @@
             </div>
 
           </template>
-            <template
-                    v-for="(child, childIndex) in item.one"
-                    v-if="child.isShowImp === '0' && (item.label !== '关联信息' && (item.label !== '实施日期' && child.attrField !== 'SSRQGJ' && child.attrField !== 'ZCCSSRQGJ' && child.attrField !== 'XCXSSRQGJ' || (childIndex < 6 || item.showAll)) || item.label === '适用范围')"
-            >
-                <div
-                        :key="child.id"
-                        class="modular-item"
-                >
-                    <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
-                    <!--相关流程-->
-                    <template v-if="child.attrField === 'XGLC' && child.value">
-                        <p class="modular-content-p-val">
-                  <span v-for="(item, index) in child.value.split(',')" :key="index">
-                  <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
-                </span>
-                        </p>
-                    </template>
-                    <template
-                            v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
-                    >
-                        <p class="modular-content-p-val" v-if="child.value">
-                  <span v-for="(item, index) in child.value.split(',')" :key="index">
-                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
-                  </span>
-                        </p>
-                        <span class="modular-content-p-val" v-else>-</span>
-                    </template>
-                    <span
-                            v-else-if="child.attrField === 'SVPPS'"
-                            class="modular-content-p-val"
-                            :title="child.tips || '-'"
-                    >
-                {{ !child.value || child.value === 'null' ? '-' : child.value }}
-              </span>
-                    <span
-                            v-else-if="child.attrType !== 'FILE'"
-                            class="modular-content-p-val"
-                            :title="child.value || '-'"
-                    >
-                {{ child.value || '-' }}
-              </span>
-                    <div v-else class="modular-content-p-flies">
-                        <p
-                                class="files-title"
-                                v-for="(file, fileIndex) in child.value"
-                                :key="fileIndex"
-                        >
-                            <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
-                            <!--发布稿、增补件单独设置下载权限-->
-                            <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
-                  || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
-                  || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
-                                <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
-                                <i
-                                        title="下载"
-                                        @click="downloadFile(file.id)"
-                                        class="icon-download"
-                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
-                                />
-                                <i
-                                        title="下载带水印"
-                                        @click="downloadFileByWater(file.id, file.fileSuffix)"
-                                        class="icon-download2"
-                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
-                                />
-                                <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
-                            </template>
-                            <template v-else>
-                                <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
-                                <i
-                                        title="下载"
-                                        @click="downloadFile(file.id)"
-                                        class="icon-download"
-                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
-                                />
-                                <i
-                                        title="下载带水印"
-                                        @click="downloadFileByWater(file.id, file.fileSuffix)"
-                                        class="icon-download2"
-                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
-                                />
-                                <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
-                            </template>
-                        </p>
-                        <!--                <el-button-->
-                        <!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
-                        <!--                  @click="showItemsModel(child.attrField)"-->
-                        <!--                  class="decomposition-btn"-->
-                        <!--                  icon="icon-separate"-->
-                        <!--                >标准分解单</el-button>-->
-                    </div>
-                </div>
-
-            </template>
           <template
             v-for="(child, childIndex) in item.child"
-            v-if="child.isShowImp === '0' && item.label !== '实施日期' && item.label !== '适用范围'"
+            v-if="child.isShowImp === '0' && item.label === '关联信息'"
           >
             <div
               :key="child.id"
@@ -387,6 +293,100 @@
             </div>
 
           </template>
+            <template
+                    v-for="(child, childIndex) in item.one"
+                    v-if="child.isShowImp === '0' && item.label !== '关联信息' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
+            >
+                <div
+                        :key="child.id"
+                        class="modular-item"
+                >
+                    <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                    <!--相关流程-->
+                    <template v-if="child.attrField === 'XGLC' && child.value">
+                        <p class="modular-content-p-val">
+                  <span v-for="(item, index) in child.value.split(',')" :key="index">
+                  <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
+                </span>
+                        </p>
+                    </template>
+                    <template
+                            v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
+                    >
+                        <p class="modular-content-p-val" v-if="child.value">
+                  <span v-for="(item, index) in child.value.split(',')" :key="index">
+                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
+                  </span>
+                        </p>
+                        <span class="modular-content-p-val" v-else>-</span>
+                    </template>
+                    <span
+                            v-else-if="child.attrField === 'SVPPS'"
+                            class="modular-content-p-val"
+                            :title="child.tips || '-'"
+                    >
+                {{ !child.value || child.value === 'null' ? '-' : child.value }}
+              </span>
+                    <span
+                            v-else-if="child.attrType !== 'FILE'"
+                            class="modular-content-p-val"
+                            :title="child.value || '-'"
+                    >
+                {{ child.value || '-' }}
+              </span>
+                    <div v-else class="modular-content-p-flies">
+                        <p
+                                class="files-title"
+                                v-for="(file, fileIndex) in child.value"
+                                :key="fileIndex"
+                        >
+                            <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
+                            <!--发布稿、增补件单独设置下载权限-->
+                            <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
+                  || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
+                  || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
+                                <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
+                                <i
+                                        title="下载"
+                                        @click="downloadFile(file.id)"
+                                        class="icon-download"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+                                />
+                                <i
+                                        title="下载带水印"
+                                        @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                        class="icon-download2"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+                                />
+                                <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
+                            </template>
+                            <template v-else>
+                                <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
+                                <i
+                                        title="下载"
+                                        @click="downloadFile(file.id)"
+                                        class="icon-download"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+                                />
+                                <i
+                                        title="下载带水印"
+                                        @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                        class="icon-download2"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+                                />
+                                <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
+                            </template>
+                        </p>
+                        <!--                <el-button-->
+                        <!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+                        <!--                  @click="showItemsModel(child.attrField)"-->
+                        <!--                  class="decomposition-btn"-->
+                        <!--                  icon="icon-separate"-->
+                        <!--                >标准分解单</el-button>-->
+                    </div>
+                </div>
+
+            </template>
           <div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6">
             <div class="wrap" @click="handleToggleShowAll(item)">
               <span>{{ item.showAll ? '收起' : '更多' }}</span>

From 2c5a02d2141ec3f88b73940fba45bc43dedc0a23 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Wed, 28 Jul 2021 14:19:01 +0800
Subject: [PATCH 3/6] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E5=9B=BD=E5=A4=96?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=AD=97=E6=AE=B5=E6=94=B9=E6=88=90=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue       |  9 ++++++---
 .../foreignStandardsAndRegulations/index.vue        | 13 ++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index a4a42d0cf..9d429cdf4 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -995,7 +995,8 @@
         <tree-select-new
                 width = "500"
                 :lazy=true
-                :multiple=false
+                :multiple=true
+                :check-Strictly="false"
                 :modalShowFlag="modalShowFlag2"
                 :drawerTitle="drawerTitle"
                 :url="url"
@@ -1005,7 +1006,8 @@
         <tree-select-new
                 width = "500"
                 :lazy=true
-                :multiple=false
+                :multiple=true
+                :check-Strictly="false"
                 :modalShowFlag="modalShowFlag3"
                 :drawerTitle="drawerTitle"
                 :url="url"
@@ -1015,7 +1017,8 @@
         <tree-select-new
                 width = "500"
                 :lazy=true
-                :multiple=false
+                :multiple=true
+                :check-Strictly="false"
                 :modalShowFlag="modalShowFlag4"
                 :drawerTitle="drawerTitle"
                 :url="url"
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index d406fb59f..006ff7faf 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1254,7 +1254,8 @@
       <tree-select-new
               width = "500"
               :lazy=true
-              :multiple=false
+              :multiple=true
+              :check-Strictly="false"
               :modalShowFlag="modalShowFlag2"
               :drawerTitle="drawerTitle"
               :url="url"
@@ -1264,7 +1265,8 @@
       <tree-select-new
               width = "500"
               :lazy=true
-              :multiple=false
+              :multiple=true
+              :check-Strictly="false"
               :modalShowFlag="modalShowFlag3"
               :drawerTitle="drawerTitle"
               :url="url"
@@ -1274,7 +1276,8 @@
       <tree-select-new
               width = "500"
               :lazy=true
-              :multiple=false
+              :multiple=true
+              :check-Strictly="false"
               :modalShowFlag="modalShowFlag4"
               :drawerTitle="drawerTitle"
               :url="url"
@@ -4316,13 +4319,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  /deep/ .icon-tree {
+  /deep/.icon-tree {
     margin:0  5px 0 10px;
     position:relative;
     background:url('~@/assets/images/shangqi/img/tree-add.png');
     background-size:100% 100%;
   }
-  /deep/ .expanded{
+  /deep/.expanded{
     background:url('~@/assets/images/shangqi/img/tree-sub.png');
     background-size:100% 100%;
   }

From 92f11f7f23fe71b1daada11976600542bfa58821 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Wed, 28 Jul 2021 14:46:57 +0800
Subject: [PATCH 4/6] =?UTF-8?q?bug=EF=BC=9A=20=20=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84--=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E6=8A=8A=E6=97=A5=E6=9C=9F=E7=9A=84?=
 =?UTF-8?q?=E6=82=AC=E6=B5=AE=E7=AA=97=E6=8F=90=E7=A4=BA=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=90=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index e9904b7a2..b7bc135d9 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -139,7 +139,6 @@
               <span
                   v-else-if="child.attrType === 'DATE_PICKER'"
                   class="modular-content-p-val"
-                  :title="child.value || '-'"
               >
                 {{ child.value ? child.value.substring(0,10) : '-' }}
               </span>

From 8e6b027c1017d585a17de2cc59b85f00ad0257e1 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Wed, 28 Jul 2021 14:58:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?bug=EF=BC=9A=20=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E5=B8=A6=E5=85=A5?=
 =?UTF-8?q?=E4=B8=80=E6=9D=A1=E6=A0=87=E5=87=86=EF=BC=8C=E9=87=87=E6=A0=87?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=A6=E3=80=81=E9=87=87=E6=A0=87=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=B2=A1=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 7 +++++--
 src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 5 +++--
 src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 5 +++--
 src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 5 +++--
 src/pages/processCenter/pages/creatProcess/bzrk/step5.vue | 5 +++--
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index a752a4237..58162d07b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -678,8 +678,8 @@
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.cbcd" placeholder="请选择采标程度">
-                                        <el-option label="采标程度1" value="1"></el-option>
-                                        <el-option label="采标程度2" value="2"></el-option>
+                                        <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+
                                     </el-select>
                                 </el-form-item>
                                 <!--                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -1400,6 +1400,7 @@
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
+                cbcdOptions: [], // 采标程度
                 wssmrOptions: [], // 我司署名人
                 sycpxOptions: [], // 适用产品线
                 zrbmOptions: [], // 责任部门
@@ -1583,6 +1584,7 @@
                             console.log(bringData)
                             const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                             this.form = JSON.parse(JSON.stringify(json))
+                          console.log(json,'AAAAAAA')
                             this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
                             this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
                             this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
@@ -2190,6 +2192,7 @@
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.qcdwOption = res.data.QCDW // 体系类别
                 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+                this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
                 this.setMap(this.standStateOptions)
             })
             this.busVsFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 8119b4907..7abdff57a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -452,8 +452,7 @@
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
-                                        <el-option label="采标程度1" value="1"></el-option>
-                                        <el-option label="采标程度2" value="2"></el-option>
+                                      <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
@@ -819,6 +818,7 @@
                 standSystemOptions: [], // 标准体系
                 applyArcticOptions: [], // 适用车型
                 gkglbmOptions: [], // 归口管理部门
+              cbcdOptions: [], // 采标程度
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
@@ -1069,6 +1069,7 @@
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.txlbOptions = res.data.TXLBCLASS // 体系类别
                 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+              this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
                 this.key++
             })
             this.busVsFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 195c686e1..3e9ed0aff 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -445,8 +445,7 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
                   <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
-                    <el-option label="采标程度1" value="1"></el-option>
-                    <el-option label="采标程度2" value="2"></el-option>
+                    <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                   </el-select>
                 </el-form-item>
 <!--                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -793,6 +792,7 @@ export default {
       standSystemOptions: [], // 标准体系
       applyArcticOptions: [], // 适用车型
       gkglbmOptions: [], // 归口管理部门
+      cbcdOptions: [], // 采标程度
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
@@ -1053,6 +1053,7 @@ export default {
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
       this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+      this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
       this.key++
     })
     this.busVsFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 72d26af15..8863bb43e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -663,8 +663,7 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
                   <el-select v-model="form.cbcd" placeholder="请选择采标程度">
-                    <el-option label="采标程度1" value="1"></el-option>
-                    <el-option label="采标程度2" value="2"></el-option>
+                    <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
@@ -1224,6 +1223,7 @@ export default {
       applyArcticOptions: [], // 适用车型
       categoryOptions: [], // 能源类型
       gkglbmOptions: [], // 归口管理部门
+      cbcdOptions: [], // 采标程度
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
       wssmrOptions: [], // 我司署名人
@@ -1750,6 +1750,7 @@ export default {
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
       this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+      this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
       this.treeStatus = true
       this.key++
     })
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index cd985bbda..2d414fb44 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -463,8 +463,7 @@
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
-                                        <el-option label="采标程度1" value="1"></el-option>
-                                        <el-option label="采标程度2" value="2"></el-option>
+                                      <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                                     </el-select>
                                 </el-form-item>
 <!--                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -782,6 +781,7 @@
                 applyArcticOptions: [], // 适用车型
                 categoryOptions: [], // 能源类型
                  gkglbmOptions: [], // 归口管理部门
+                cbcdOptions: [], // 采标程度
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
                 sycpxOptions: [], // 适用产品线
@@ -977,6 +977,7 @@
                 this.txlbOptions = res.data.TXLBCLASS // 体系类别
                 this.qcdwOption = res.data.QCDW // 体系类别
                 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+                this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
             })
         }
     }

From 7dd33233d2ab80361cf5ca4b33b5e77ba32ceebc Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Wed, 28 Jul 2021 15:22:14 +0800
Subject: [PATCH 6/6] =?UTF-8?q?bug:=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B--=E5=9C=88=E4=BD=8F=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=BA=94=E8=AF=A5=E6=98=AF=E6=94=AF=E6=8C=81=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E7=9A=84=E4=B8=94=E7=88=B6=E5=AD=90=E4=B9=8B=E9=97=B4?=
 =?UTF-8?q?=E4=B8=8D=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue   | 6 +++---
 .../domesticStandardsAndRegulations/index.vue               | 6 +++---
 .../foreignStandardsAndRegulations/index.vue                | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 58162d07b..394dfb9b2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -512,7 +512,7 @@
                                             :key="key1"
                                             :lazy=true
                                             :multiple=true
-                                            :check-Strictly="false"
+                                            :check-strictly= true
                                             :modalShowFlag="modalShowFlag2"
                                             :drawerTitle="drawerTitle"
                                             :show-checkBox="showCheckBox"
@@ -528,7 +528,7 @@
                                             :key="key2"
                                             :lazy=true
                                             :multiple=true
-                                            :check-Strictly="false"
+                                            :check-strictly= true
                                             :modalShowFlag="modalShowFlag3"
                                             :drawerTitle="drawerTitle"
                                             :show-checkBox="showCheckBox"
@@ -544,7 +544,7 @@
                                             :key="key3"
                                             :lazy=true
                                             :multiple=true
-                                            :check-Strictly="false"
+                                            :check-strictly= true
                                             :modalShowFlag="modalShowFlag4"
                                             :drawerTitle="drawerTitle"
                                             :url="url"
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 9d429cdf4..22d775b54 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -996,7 +996,7 @@
                 width = "500"
                 :lazy=true
                 :multiple=true
-                :check-Strictly="false"
+                :check-strictly=true
                 :modalShowFlag="modalShowFlag2"
                 :drawerTitle="drawerTitle"
                 :url="url"
@@ -1007,7 +1007,7 @@
                 width = "500"
                 :lazy=true
                 :multiple=true
-                :check-Strictly="false"
+                :check-strictly=true
                 :modalShowFlag="modalShowFlag3"
                 :drawerTitle="drawerTitle"
                 :url="url"
@@ -1018,7 +1018,7 @@
                 width = "500"
                 :lazy=true
                 :multiple=true
-                :check-Strictly="false"
+                :check-strictly=true
                 :modalShowFlag="modalShowFlag4"
                 :drawerTitle="drawerTitle"
                 :url="url"
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 006ff7faf..fe01550be 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1255,7 +1255,7 @@
               width = "500"
               :lazy=true
               :multiple=true
-              :check-Strictly="false"
+              :check-strictly=true
               :modalShowFlag="modalShowFlag2"
               :drawerTitle="drawerTitle"
               :url="url"
@@ -1266,7 +1266,7 @@
               width = "500"
               :lazy=true
               :multiple=true
-              :check-Strictly="false"
+              :check-strictly=true
               :modalShowFlag="modalShowFlag3"
               :drawerTitle="drawerTitle"
               :url="url"
@@ -1277,7 +1277,7 @@
               width = "500"
               :lazy=true
               :multiple=true
-              :check-Strictly="false"
+              :check-strictly=true
               :modalShowFlag="modalShowFlag4"
               :drawerTitle="drawerTitle"
               :url="url"