合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!76

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

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 => {
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
-        if(!item.label.indexOf('Q/FT')){
+      // res.data.BUSSSTANDCLASS.forEach(item => {
-          this.standSortOptions.push(item)   //企标类别
+      //   if(!item.label.indexOf('Q/FT')){
-        }
+      //     this.standSortOptions.push(item)   //企标类别
-      })
+      //   }
+      // })
     })
   },
   methods: {

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"
@@ -471,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]) {
@@ -629,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,