From b8fcbd45959c8093957c7eb28477bd71b5c587a4 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 12 May 2023 14:13:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86-?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7/=E5=90=8D=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index 3216d1dd3..f759deef8 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -55,7 +55,7 @@
                 align="center">
               <template slot-scope="scope">
                 <a class="table-jump"
-                   @click="handlePreview(scope.row)">{{ scope.row.showNumber }}</a>
+                   @click="handlePreview(scope.row)">{{ scope.row.standNumSplit }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -66,7 +66,7 @@
                 align="center">
               <template slot-scope="scope">
                 <a class="table-jump"
-                   @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+                   @click="handlePreview(scope.row)">{{ scope.row.standNameSplit }}</a>
               </template>
             </el-table-column>
             <el-table-column

From 23af33c6a59a469de3be43b5e3cf25ab42f6171c Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 12 May 2023 14:51:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0-?=
 =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C-?=
 =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=8F=B7=E5=8E=BB=E6=8E=89=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/technologyInvolveProject.vue                | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
index 08ec3fda4..909e20986 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
@@ -183,7 +183,6 @@
             >
             </el-table-column>
             <el-table-column
-              sortable="custom"
               show-overflow-tooltip
               prop="specificItem"
               width="90"
@@ -343,7 +342,7 @@
               standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
             }}</span>
         </div>
-      
+
         <div class="see-drawer-div">
           <label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label>
           <span class="see-drawer-val" style="font-size: 12px"
@@ -380,15 +379,15 @@
           <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious">
             {{ standShowItemEO.comparedWithPrevious }}</span>
         </div>
-      
+
         <div class="see-drawer-div">
           <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
           <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
               {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}
           </span>
-      
+
         </div>
-      
+
         <div class="see-drawer-div">
           <label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
           <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
@@ -408,7 +407,7 @@
         <!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
         <!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
         <!--        </div>-->
-      
+
         <!--        <div class="see-drawer-div">-->
         <!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
         <!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->

From 65297257b8730420f94e3d71a526ceff8b52f30e Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 12 May 2023 15:41:47 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0-?=
 =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C-?=
 =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=8F=B7=20=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/technologyInvolveProject.vue        | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
index 909e20986..efcaab1eb 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
@@ -175,7 +175,8 @@
             border
             :height="sarProStateTableHeight"
             :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"
+            @sort-change="sortChange">
             <el-table-column
               type="selection"
               fixed="left"
@@ -183,6 +184,7 @@
             >
             </el-table-column>
             <el-table-column
+              sortable="custom"
               show-overflow-tooltip
               prop="specificItem"
               width="90"
@@ -470,6 +472,20 @@
       }
     },
     methods: {
+      sortChange({ column, prop, order }){
+        if(order === "descending"){
+          // 降序
+          this.querySarProStateZero('desc')
+        }
+        if(order === 'ascending'){
+          // 升序
+          this.querySarProStateZero('asc')
+        }
+        if(order === null){
+          // 不排序
+          this.querySarProStateZero()
+        }
+      },
       // ...
       handleCommand(command) {
         switch (command[1]) {
@@ -628,13 +644,14 @@
         this.querySarProStateZero()
       },
       // 查看项目符合性
-      querySarProStateZero () {
+      querySarProStateZero (order) {
         var form = this.sarProStateEO
         form.position = this.sarProject.position
         form.standId = this.standId
         form.current = this.sarProStateTotalPage
         form.size = this.sarProStatePageSize
         // form.interpretationTime = this.interpretationTime
+        form.order = order
         form.prcNum = this.prcNum
         this.$http.get('sarStandardComplianceAssessResult/interpretation', form, {
           _this: this,

From 31852db4117d48af97caa60db8b054c4903a4276 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 12 May 2023 16:53:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E-=E4=BC=81=E6=A0=87=E7=B1=BB=E5=88=AB=E4=B8=8E?=
 =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdlx/step1.vue              | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index 46c7974ab..51b560990 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -614,11 +614,12 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
-      res.data.BUSSSTANDCLASS.forEach(item => {
-        if(!item.label.indexOf('Q/FT')){
-          this.standSortOptions.push(item)   //企标类别
-        }
-      })
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+      // res.data.BUSSSTANDCLASS.forEach(item => {
+      //   if(!item.label.indexOf('Q/FT')){
+      //     this.standSortOptions.push(item)   //企标类别
+      //   }
+      // })
     })
   },
   methods: {