From 6df94112d19edb864743cbd5f07f018d10a4502e Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Thu, 14 Jul 2022 18:10:44 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056513=20=E9=97=AE?=
 =?UTF-8?q?=E7=AD=94=E5=BA=93-=E5=88=86=E9=A1=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20=E5=8F=82=E7=85=A7=E6=9C=9F=E6=9C=9B?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulatoryRepository/standQA/index.vue    | 73 ++++---------------
 1 file changed, 14 insertions(+), 59 deletions(-)

diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index 71f9b323c..fca85967f 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -68,12 +68,11 @@
     </el-table>
     <!--分页-->
     <pagination
-      v-show="this.tableLoading === false"
       style="position: relative;"
       :page="questionSerach.page"
-      :total="tableTotal"
-      @pageChange="handleSelectPageChange"
-      @pageSizeChange="handleSelectPageSizeChange"></pagination>
+      :total="questionSerach.total"
+      @pageChange="pageChangeFun"
+      @pageSizeChange="pageSizeChangeFun"></pagination>
   </div>
   <!--提问弹窗  -->
   <el-dialog
@@ -632,6 +631,7 @@ export default {
         problemDescription: '',  //关键词/问题描述
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
+        total: 0
       },
       answerList: [],
       answerListDrawer: false,
@@ -900,26 +900,6 @@ export default {
     standTypeChange(){
       this.questionForm.classification = this.standType
     },
-    handleClick(){
-      this.ansSearch()
-    },
-    sourceClick(){
-      this.questionSerach.classification = this.activeName
-      this.questionSerach.standardEncdoing = ''
-      this.standSearch()
-    },
-    questionClick(){
-      sessionStorage.setItem('queId', this.activeQue)
-       this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
-         id: this.activeQue,
-         state: 'yes'
-       },{
-         _this: this
-       }, res => {
-         this.answerList = res.data
-       }, e => {
-       })
-    },
     //提问按钮
     queBtn(){
       this.fileList = []
@@ -963,9 +943,18 @@ export default {
         problemDescription: '',  //关键词/问题描述
         page:1,
         pageSize:this.$store.getters.userInfo.configContent,
+        total: 0
       }
       this.searchBtn()
     },
+    pageChangeFun(page) {
+      this.questionSerach.page = page
+      this.searchBtn()
+    },
+    pageSizeChangeFun(pageSize) {
+      this.questionSerach.pageSize = pageSize
+      this.searchBtn()
+    },
     searchBtn(){
       this.questionSerach.questioner = ''
       this.tableLoading = true
@@ -975,44 +964,10 @@ export default {
         _this: this
       }, res => {
         this.tableData = res.data.records
-        this.tableTotal = res.total
+        this.questionSerach.total = res.data.total
         this.tableLoading = false
       })
     },
-    //问题查询
-    queSearch(){
-       this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{
-         standardId: this.activestand,
-         classification: this.activeName,
-         problemDescription: this.questionSerach.problemDescription
-       },{
-         _this: this
-       }, res => {
-         this.questionsList = res.data
-       })
-    },
-    //查询提问标准
-    standSearch2(){
-      let qId = this.$route.query.standId
-      let queNumber = 0
-      this.standList = []
-      this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{
-        _this: this
-      }, res =>{
-        res.data.forEach(item => {
-          if(item.standardId === qId){
-            this.standList.push(item)
-            queNumber++
-          }
-        })
-        if(queNumber === 0){
-          this.standList = res.data
-          this.refreshStandMap()
-        }
-      }, e => {
-
-      })
-    },
     //文件上传前
     beforeUploadTheme(file){
       console.log(file);

From 1882cf0b20c80e62c9b33791a794cdd852209ffc Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Thu, 14 Jul 2022 18:22:34 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056559=20=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E4=B8=AD=E5=BF=83-=E9=99=84=E4=BB=B6=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=97=B6=20=E5=BA=95=E9=83=A8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/dataCenter/index.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue
index 9da6a0b75..6bb1d3db0 100644
--- a/src/pages/regulatoryRepository/dataCenter/index.vue
+++ b/src/pages/regulatoryRepository/dataCenter/index.vue
@@ -1007,4 +1007,10 @@ export default {
   background: url('~@/assets/images/shangqi/img/tree.png');
   background-size: 100% 100%;
 }
+.upload-demo{
+  /deep/.el-upload-list{
+    height: 50vh;
+    overflow-y: auto;
+  }
+}
 </style>

From 67125b660de6eac4c1971c0f9d8fd7707cf87610 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Thu, 14 Jul 2022 18:32:06 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056392=20=E3=80=90?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E3=80=91=E6=B2=A1=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B0=B1=E4=B8=8D=E8=A6=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=B7=E9=80=89=E6=8B=A9=E9=87=87=E6=A0=87=E7=A8=8B=E5=BA=A6?=
 =?UTF-8?q?=E4=BA=86=20=E5=A6=82=E6=9E=9C=E5=A1=AB=E5=86=99=E4=BA=86?=
 =?UTF-8?q?=E5=B0=B1=E5=B8=A6=E5=85=A5=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzrk/step2.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index 233a7d49c..7f060720f 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -364,7 +364,7 @@
               <div class="wrap">{{form.dtbjh}}</div>
             </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-select v-model="form.cbcd" placeholder="" disabled>
                 <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
               </el-select>
             </el-form-item>

From 27d7885cc92b19230a17d0a7940722991c54286c Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Fri, 15 Jul 2022 10:22:50 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056546=20=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E6=95=B0=E6=8D=AE=E8=BF=87=E5=A4=9A=E6=97=B6=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=87=E6=85=A2=20=E7=84=B6=E5=90=8E?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=82=B9=E5=87=BB=20=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=E6=95=B0=E6=8D=AE=E8=A2=AB=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=20=E5=B9=B6=E6=8F=90=E7=A4=BA=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standAutoSplit/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index b53e41680..30782f2dd 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -1048,6 +1048,8 @@ export default {
     batchDelete () {
       if (this.selectedList.length === 0) {
         this.$message.error('请选择要删除的数据')
+      } if(this.selectedList.length > 10){
+        this.$message.error('批量删除仅支持10条以内')
       } else {
         this.$confirm('确认删除选择数据？', '确认删除', {
           confirmButtonText: '确定',

From 86a16b1d9dedfe056b5c3140a0551940bb5d8b55 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Fri, 15 Jul 2022 10:26:10 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056577=20=E3=80=90?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=20=E5=B0=86=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=E6=9C=AA?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E7=9A=84=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzrk/step2.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index 7f060720f..01a5f0c7d 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -283,12 +283,12 @@
             <van-field label="模块结构单元变型号(乘用车)" v-model="form.dybxhcar" readonly  placeholder="请输入模块结构单元变型号"/>
             <van-field label="模块结构单元名称(乘用车)" v-model="form.dymccar" readonly placeholder="请输入模块结构单元名称" />
             <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-              <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
+              <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="" disabled>
                 <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-              <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
+              <el-select v-model="form.qcdw" placeholder="" multiple disabled>
                 <el-option
                   v-for="item in qcdwOptions"
                   placeholder="请选择"
@@ -310,7 +310,7 @@
 <!--              </el-select>-->
 <!--            </el-form-item>-->
             <el-form-item style="display: none" label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
-              <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
+              <el-select v-model="form.syrz" placeholder="" multiple disabled>
                 <el-option
                   v-for="item in applyAuthOptions"
                   placeholder="请选择"
@@ -333,7 +333,7 @@
              </el-form-item>-->
             <van-field v-if="form.standInData === '0'" label="我司署名人" v-model="form.wssmr" readonly  placeholder="请选择我司署名人"/>
             <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
-              <el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
+              <el-select v-model="form.cysd" placeholder="" disabled>
                 <el-option
                   v-for="item in cysdOptions"
                   placeholder="请选择"
@@ -344,7 +344,7 @@
               </el-select>
             </el-form-item>
             <el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
-              <el-select :popper-append-to-body="false" disabled v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
+              <el-select :popper-append-to-body="false" disabled v-model="form.cyzbpm" placeholder="" clearable>
                 <el-option
                   v-for="item in cyzbpmOptions"
                   placeholder="请选择"

From ffe0156cb2790023ca400119599956cdde59baa7 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Fri, 15 Jul 2022 11:04:45 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 8827ed2a8..9b005cca5 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -107,12 +107,12 @@
               //   menuId: 'RAFQ4N4ARF'
               // },
               {
-                title: '国内法规',
+                title: '国内标准',
                 path: '/domesticStandardsAndRegulations',
                 menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
               },
               {
-                title: '海外法规',
+                title: '海外标准',
                 path: '/foreignStandardsAndRegulations',
                 menuId: '18c1e5134ea0cf865e8960b26b81fd8c'
               },

From 03f99f6cf2e174d2cb21560bf2aa87d363e54b46 Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Fri, 15 Jul 2022 13:24:25 +0800
Subject: [PATCH 07/14] =?UTF-8?q?fix:=20=E5=85=B3=E9=97=AD=E6=94=BF?=
 =?UTF-8?q?=E7=AD=96=E7=9B=B8=E5=85=B3=E6=B5=81=E7=A8=8B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue              |  56 +++----
 .../processCenter/pages/newProcess/index.vue  | 150 +++++++++---------
 2 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 9b005cca5..8ec8655e0 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -213,34 +213,34 @@
               // }
             ]
           },
-          {
-            title: '政策法规库',
-            path: '/policyRegulation',
-            'icon-class': 'el-icon-s-management',
-            menuId: 'asdzcfgk',
-            children: [
-              {
-                title: '问题项管控',
-                path: '/problemControl',
-                menuId: '50d7a0c0af4740c486100c257ae6068e'
-              },
-              {
-                title: '国内外政策',
-                path: '/nationalPolicy',
-                menuId: '6557e9c4ce672af71be5807052da126b'
-              },
-              {
-                title: '标准跟踪清单',
-                path: '/standardTrackingList',
-                menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4'
-              },
-              {
-                title: '政策工作组',
-                path: '/policyWorkGroup',
-                menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6'
-              }
-            ]
-          },
+          // {
+          //   title: '政策法规库',
+          //   path: '/policyRegulation',
+          //   'icon-class': 'el-icon-s-management',
+          //   menuId: 'asdzcfgk',
+          //   children: [
+          //     {
+          //       title: '问题项管控',
+          //       path: '/problemControl',
+          //       menuId: '50d7a0c0af4740c486100c257ae6068e'
+          //     },
+          //     {
+          //       title: '国内外政策',
+          //       path: '/nationalPolicy',
+          //       menuId: '6557e9c4ce672af71be5807052da126b'
+          //     },
+          //     {
+          //       title: '标准跟踪清单',
+          //       path: '/standardTrackingList',
+          //       menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4'
+          //     },
+          //     {
+          //       title: '政策工作组',
+          //       path: '/policyWorkGroup',
+          //       menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6'
+          //     }
+          //   ]
+          // },
           {
             title: '工作中心',
             path: '/processCenter',
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index b94996be7..e95cff77b 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -79,21 +79,21 @@
             </div>
           </el-card>
         </div>
-        <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'344c9c97b581400718451e8b8a319382'">
-            <div class="card-box" @click="handleCreateProcess('12')">
-              <div class="card-top">
-                <div class="card-top-left">
-                  <img :src="getImg(Math.floor(Math.random() * 6))">
-                </div>
-                <div class="card-top-right">
-                  <div class="card-top-right-text">政策征求意见流程</div>
-                  <div class="card-top-right-line"></div>
-                </div>
-              </div>
-            </div>
-          </el-card>
-        </div>
+<!--        <div class="process-name">-->
+<!--          <el-card shadow="hover" v-btn-permission="'344c9c97b581400718451e8b8a319382'">-->
+<!--            <div class="card-box" @click="handleCreateProcess('12')">-->
+<!--              <div class="card-top">-->
+<!--                <div class="card-top-left">-->
+<!--                  <img :src="getImg(Math.floor(Math.random() * 6))">-->
+<!--                </div>-->
+<!--                <div class="card-top-right">-->
+<!--                  <div class="card-top-right-text">政策征求意见流程</div>-->
+<!--                  <div class="card-top-right-line"></div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </el-card>-->
+<!--        </div>-->
         <div class="process-name">
           <el-card shadow="hover" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
             <div class="card-box" @click="handleCreateProcess('7')">
@@ -124,21 +124,21 @@
             </div>
           </el-card>
         </div>
-        <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'">
-            <div class="card-box" @click="handleCreateProcess('13')">
-              <div class="card-top">
-                <div class="card-top-left">
-                  <img :src="getImg(Math.floor(Math.random() * 6))">
-                </div>
-                <div class="card-top-right">
-                  <div class="card-top-right-text">重点认证标准/政策合规性项目审查流程</div>
-                  <div class="card-top-right-line"></div>
-                </div>
-              </div>
-            </div>
-          </el-card>
-        </div>
+<!--        <div class="process-name">-->
+<!--          <el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'">-->
+<!--            <div class="card-box" @click="handleCreateProcess('13')">-->
+<!--              <div class="card-top">-->
+<!--                <div class="card-top-left">-->
+<!--                  <img :src="getImg(Math.floor(Math.random() * 6))">-->
+<!--                </div>-->
+<!--                <div class="card-top-right">-->
+<!--                  <div class="card-top-right-text">重点认证标准/政策合规性项目审查流程</div>-->
+<!--                  <div class="card-top-right-line"></div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </el-card>-->
+<!--        </div>-->
         <div class="process-name">
           <el-card shadow="hover" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
             <div class="card-box" @click="handleCreateProcess('11')">
@@ -154,21 +154,21 @@
             </div>
           </el-card>
         </div>
-        <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">
-            <div class="card-box" @click="handleCreateProcess('laws1')">
-              <div class="card-top">
-                <div class="card-top-left">
-                  <img :src="getImg(Math.floor(Math.random() * 6))">
-                </div>
-                <div class="card-top-right">
-                  <div class="card-top-right-text">政策入库流程</div>
-                  <div class="card-top-right-line"></div>
-                </div>
-              </div>
-            </div>
-          </el-card>
-        </div>
+<!--        <div class="process-name">-->
+<!--          <el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">-->
+<!--            <div class="card-box" @click="handleCreateProcess('laws1')">-->
+<!--              <div class="card-top">-->
+<!--                <div class="card-top-left">-->
+<!--                  <img :src="getImg(Math.floor(Math.random() * 6))">-->
+<!--                </div>-->
+<!--                <div class="card-top-right">-->
+<!--                  <div class="card-top-right-text">政策入库流程</div>-->
+<!--                  <div class="card-top-right-line"></div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </el-card>-->
+<!--        </div>-->
         <div class="process-name">
           <el-card shadow="hover" v-btn-permission="'a151f5e2ee44f8df81e201b8696fca31'">
             <div class="card-box" @click="handleCreateProcess('8')">
@@ -285,36 +285,36 @@
     <div>
       <el-divider content-position="left"><h2>标准化活动相关流程</h2></el-divider>
       <div class="process-box">
-        <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'b196ef0253cebd1adfc3a8432a28e377'">
-            <div class="card-box" @click="handleCreateProcess('17')">
-              <div class="card-top">
-                <div class="card-top-left">
-                  <img :src="getImg(Math.floor(Math.random() * 6))">
-                </div>
-                <div class="card-top-right">
-                  <div class="card-top-right-text">政策课题入会流程</div>
-                  <div class="card-top-right-line"></div>
-                </div>
-              </div>
-            </div>
-          </el-card>
-        </div>
-        <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'2f2752bc8a37b87d6eaadae3fcfe61c4'">
-            <div class="card-box" @click="handleCreateProcess('18')">
-              <div class="card-top">
-                <div class="card-top-left">
-                  <img :src="getImg(Math.floor(Math.random() * 6))">
-                </div>
-                <div class="card-top-right">
-                  <div class="card-top-right-text">政策课题参会流程</div>
-                  <div class="card-top-right-line"></div>
-                </div>
-              </div>
-            </div>
-          </el-card>
-        </div>
+<!--        <div class="process-name">-->
+<!--          <el-card shadow="hover" v-btn-permission="'b196ef0253cebd1adfc3a8432a28e377'">-->
+<!--            <div class="card-box" @click="handleCreateProcess('17')">-->
+<!--              <div class="card-top">-->
+<!--                <div class="card-top-left">-->
+<!--                  <img :src="getImg(Math.floor(Math.random() * 6))">-->
+<!--                </div>-->
+<!--                <div class="card-top-right">-->
+<!--                  <div class="card-top-right-text">政策课题入会流程</div>-->
+<!--                  <div class="card-top-right-line"></div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </el-card>-->
+<!--        </div>-->
+<!--        <div class="process-name">-->
+<!--          <el-card shadow="hover" v-btn-permission="'2f2752bc8a37b87d6eaadae3fcfe61c4'">-->
+<!--            <div class="card-box" @click="handleCreateProcess('18')">-->
+<!--              <div class="card-top">-->
+<!--                <div class="card-top-left">-->
+<!--                  <img :src="getImg(Math.floor(Math.random() * 6))">-->
+<!--                </div>-->
+<!--                <div class="card-top-right">-->
+<!--                  <div class="card-top-right-text">政策课题参会流程</div>-->
+<!--                  <div class="card-top-right-line"></div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </el-card>-->
+<!--        </div>-->
         <div class="process-name">
           <el-card shadow="hover" v-btn-permission="'7845345e5fa2b0a93eb0e021bd3486f1'">
             <div class="card-box" @click="handleCreateProcess('20')">

From 8a9d689e1838fe83365f4b6a52f95b068d16a572 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Fri, 15 Jul 2022 13:54:38 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056576=20=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E4=B8=AD=E5=BF=83=20=E6=96=B0=E5=A2=9E=20=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BA=86=20=E4=BD=86=E6=98=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=2056558?=
 =?UTF-8?q?=20=E5=B7=A6=E4=BE=A7=E6=A0=91=E7=8A=B6=E5=9B=BE=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=A0=87=E5=87=86=E6=96=B0=E9=97=BB=EF=BC=8C=E7=84=B6?=
 =?UTF-8?q?=E5=90=8E=E7=82=B9=E5=87=BB=E6=96=B0=E5=A2=9E=EF=BC=8C=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E4=BF=A1=E6=81=AF=E4=BB=A5=E5=8F=8A=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=20=E7=A8=8B=E5=BA=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulatoryRepository/dataCenter/index.vue | 52 +++++++++++++++++--
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue
index 6bb1d3db0..d63b62559 100644
--- a/src/pages/regulatoryRepository/dataCenter/index.vue
+++ b/src/pages/regulatoryRepository/dataCenter/index.vue
@@ -247,6 +247,25 @@
             label-width="130px"
             v-if="showInfoModal"
         >
+          <el-form-item label="所属目录" prop="treeId" class="add-form-item">
+            <el-select ref="treeSelect" class="tree-select" v-model="attributeEO.treeId" value-key="id" placeholder="请选择所属目录">
+              <el-option class="tree-select-option" :value="attributeEO.treeId" :label="attributeEO.treeName">
+                <el-tree
+                  ref="tree"
+                  node-key="id"
+                  class="tree-line"
+                  icon-class="icon-tree"
+                  :indent="0"
+                  :props="props"
+                  :data="treeList"
+                  :default-expanded-keys="['1']"
+                  highlight-current
+                  @node-click="selectTreeClick"
+                  :filter-node-method="filterNode">
+                </el-tree>
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item
               label="类型"
               prop="dataType"
@@ -363,8 +382,13 @@ export default {
         dataTitle: '',
         dataExplain: '',
         attachFileId: '',
+        treeId: '',
+        treeName: ''
       },
       attributeEOFormRules: {
+        treeId: [
+          {required: true, message: '所属目录不能为空', trigger: 'change'},
+        ],
         dataType: [
           {required: true, message: '类型不能为空', trigger: 'change'},
         ],
@@ -462,8 +486,15 @@ export default {
     treeClick(treeNode) {
       this.selectSarMenu = treeNode
       this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
+      this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
+      this.attributeEO.treeName = treeNode.name
       this.searchInfo()
     },
+    selectTreeClick(treeNode) {
+      this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
+      this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
+      this.attributeEO.treeName = treeNode.name
+    },
     // 树节点鼠标移入移出
     mouseenter(data) {
       if (data.name !== '我的收藏') {
@@ -706,7 +737,8 @@ export default {
         dataType: '',
         dataTitle: '',
         attachFileId: '',
-        treeId: this.selectSarMenu.id
+        treeId: this.selectSarMenu ? this.selectSarMenu.id : this.treeList[0].id,
+        treeName: this.selectSarMenu ? this.selectSarMenu.name : this.treeList[0].name
       }
       this.fileList = []
     },
@@ -743,7 +775,7 @@ export default {
     saveInfo() {
       this.submitLoading = true
       this.$refs['attributeEO'].validate((valid) => {
-        if (valid && this.attributeEO.attachFileId !== '') {
+        if (valid) {
           if (this.attributeTitle === '新增'){
             this.$http.postData(
                 'fileMaterialCenter/file-material',
@@ -777,9 +809,7 @@ export default {
                 }
             )
           }
-
-        } else {
-          this.$message.error('附件不能为空')
+        }else{
           this.submitLoading = false
         }
       })
@@ -792,6 +822,8 @@ export default {
           dataType: '',
           dataTitle: '',
           attachFileId: '',
+          treeId: '',
+          treeName: ''
         }
       })
       this.showInfoModal = false
@@ -1013,4 +1045,14 @@ export default {
     overflow-y: auto;
   }
 }
+.tree-select{
+  .el-select-dropdown__item{
+    height: auto;
+    line-height: normal;
+  }
+}
+.tree-select-option{
+  height: auto;
+  padding: 0;
+}
 </style>

From aba7e0e6b1f762caaf50578a50878cd23ed32d5f Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Fri, 15 Jul 2022 14:12:31 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056559=20=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E4=B8=AD=E5=BF=83-=E9=99=84=E4=BB=B6=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=97=B6=20=E5=BA=95=E9=83=A8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/dataCenter/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue
index d63b62559..624b7616d 100644
--- a/src/pages/regulatoryRepository/dataCenter/index.vue
+++ b/src/pages/regulatoryRepository/dataCenter/index.vue
@@ -1041,7 +1041,7 @@ export default {
 }
 .upload-demo{
   /deep/.el-upload-list{
-    height: 50vh;
+    height: 60vh;
     overflow-y: auto;
   }
 }

From c6349bffe5160f8158f4ca93a691a78a7ebfcee3 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Fri, 15 Jul 2022 15:30:04 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056515=20=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E7=AE=A1=E7=90=86-=E5=B7=A5=E4=BD=9C=E7=BB=84-?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E9=80=89=E6=8B=A9=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E7=BB=84=E9=95=BF=E5=92=8C=E7=BB=84=E5=91=98=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=20=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=8E=B0=E5=9C=A8=E6=98=AF=E6=9F=A5=E5=88=B0?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=88=B0=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/workTree/index.vue | 39 ++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/components/workTree/index.vue b/src/components/workTree/index.vue
index 49f16915d..dc1cc9c4d 100644
--- a/src/components/workTree/index.vue
+++ b/src/components/workTree/index.vue
@@ -16,14 +16,15 @@
           <el-input
             v-model="filterText"
             placeholder="请输入姓名"
+            @keyup.enter.native="searchChange"
           ></el-input>
-        </el-form-item> 
+        </el-form-item>
         <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-primary" type="primary" style="margin-top: 14px;" size="medium" @click="changeInput(filterText)">
+            <el-button class="common-button-primary" type="primary" style="margin-top: 14px;" size="medium" @click="searchChange">
               查询
             </el-button>
           </el-form-item>
-      </el-form> 
+      </el-form>
       <el-tree
         v-if="open1 && isVisible2"
         node-key="id"
@@ -57,6 +58,7 @@
         :props="defaultProps"
         @check-change="checkChange2"
         :default-checked-keys="nodeList"
+        :default-expanded-keys="defaultKey"
         highlight-current
         check-strictly
         @check="drawerCheck"
@@ -132,20 +134,39 @@ export default {
     }
   },
   methods: {
-    changeInput:debounce(function (val) {
-      if (val.length) {
+    searchChange(){
+      if (this.filterText.length) {
         this.open1 = false
         this.treeLoading = true
-        this.$http.get('SarInstitution/institution/institutionAndUser', {
-          userName: val
+        this.defaultKey = []
+        this.$http.get('SarInstitution/institution/getNextTwo', {
+          userName: this.filterText
         }, {}, res => {
-          this.treeData1 = res.data
+          this.treeData1 = res
+          this.treeData1.forEach(item => {
+            this.defaultKey.push(item.id)
+          })
           this.treeLoading = false
         })
+
+
+
+
+        // this.$http.get('SarInstitution/institution/institutionAndUser', {
+        //   userName: this.filterText
+        // }, {}, res => {
+        //   this.treeData1 = res.data
+        //   this.treeData1.forEach(item => {
+        //     this.defaultKey.push(item.id)
+        //   })
+        //   console.log(1);
+        //   this.getChildren()
+        //   this.treeLoading = false
+        // })
       } else {
         this.open1 = true
       }
-    }),
+    },
     checkChange2 (row, type, c) {
       if (this.checkBox) {
       } else {

From 981c93638b22586f519be37f2fb365af99a23307 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Fri, 15 Jul 2022 15:58:47 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056274=20=E8=B0=83?=
 =?UTF-8?q?=E7=A0=94=E6=B5=81=E7=A8=8B-=E6=89=B9=E5=87=86=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=9B=B8=E5=85=B3=E9=99=84=E4=BB=B6=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzdy/step9.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 84aa9df3e..4bf35d46c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -462,6 +462,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.fjList = data.fjList || data.form.fjList
                         this.form.title = data.title || data.form.title
                         this.form.processName = data.processName || data.form.processName
                         this.form.date = data.date || data.form.date

From 39aa6a4627c0bdcba751aaaa95d557f77f3411d2 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Fri, 15 Jul 2022 16:11:41 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056404=20=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E6=A0=87=E5=87=86=E9=80=89=E6=8B=A9=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=97=B6=20=E8=8F=9C=E5=8D=95=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E6=97=B6=20=E4=B8=8B=E9=9D=A2=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=BB=99=E9=A1=B6=E6=8E=89=E4=B8=8B=E9=9D=A2=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E6=8A=8A=E4=B8=8B=E9=9D=A2=E6=8C=89=E9=92=AE=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E5=88=B0=E5=BA=95=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/treeSelect/treeSelectModule.vue | 4 ++++
 src/components/treeSelect/treeSelectNew.vue    | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/treeSelect/treeSelectModule.vue b/src/components/treeSelect/treeSelectModule.vue
index 84c382f81..1d27f11e1 100644
--- a/src/components/treeSelect/treeSelectModule.vue
+++ b/src/components/treeSelect/treeSelectModule.vue
@@ -323,4 +323,8 @@
     //  }
     //}
 
+    .common-tree{
+        height: 100%;
+        overflow-y: auto;
+    }
 </style>
diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue
index c4b60cbf4..2cb47f94e 100644
--- a/src/components/treeSelect/treeSelectNew.vue
+++ b/src/components/treeSelect/treeSelectNew.vue
@@ -320,5 +320,8 @@
 //    display: none;
 //  }
 //}
-
+.common-tree{
+    height: 100%;
+    overflow-y: auto;
+}
 </style>

From 731acec81fc5ddbf2b6fddc4b7f5423b1c5dcda1 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Fri, 15 Jul 2022 16:25:43 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056591=20=E8=B0=83?=
 =?UTF-8?q?=E7=A0=94=E6=B5=81=E7=A8=8B(=E8=B0=83=E7=A0=94=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=AE=A1=E6=89=B9)=20=E8=B0=83=E7=A0=94=E5=9B=9E?=
 =?UTF-8?q?=E6=89=A7=E8=BF=87=E9=95=BF=E6=97=B6=20UI=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzdy/step4.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
index 7d0f94a7e..052047fe6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
@@ -100,7 +100,7 @@
                     </ProcessTitle>
                     <div class="prc-content-border">
                         <el-row :gutter="24">
-                            <el-col :span="12">
+                            <el-col :span="24">
                                 <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
                                     <div v-if="form.file" class="fileClass">
                                         <div style="display: flex;align-items: center;">
@@ -125,7 +125,8 @@
                                             v-model="form.dyhz"
                                             style="height: 150px"
                                             type="textarea"
-                                            :autosize="{ minRows: 1, maxRows: 20}"
+                                            :autosize="{ minRows: 1, maxRows: 5}"
+                                            resize='none'
                                             placeholder="请输入调研回执"
                                             clearable
                                     ></el-input>

From 371ae152bb98b1ba6339e7f13feff65e02eaa254 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Fri, 15 Jul 2022 16:28:37 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056598=20=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=20=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B(?=
 =?UTF-8?q?=E6=89=B9=E5=87=86)=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=20?=
 =?UTF-8?q?=E8=B0=83=E7=A0=94=E4=BF=A1=E6=81=AF=20=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E7=BC=BA=E5=B0=91=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzdy/step9.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue
index 691171e79..13e64dd10 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue
@@ -3,7 +3,7 @@
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准调研流程</template>
             <template slot="proNode">批准</template>
-        </ProcessHeaderPhone>  
+        </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
             <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
@@ -85,6 +85,11 @@
                         label="责任人"
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="institutionName"
+                        label="责任部门"
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         label="文件"
                         align="center">