Merge remote-tracking branch 'origin/develop' into develop

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -173,6 +173,7 @@
                   style="width: 100%"
                   border
                   :height="sarProStateTableHeight"
+                  :default-sort = "{prop: 'specificItem', order: 'ascending'}"
                   :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
             <el-table-column
@@ -200,6 +201,7 @@
             </el-table-column>
             <el-table-column
                     prop="specificItem"
+                    sortable
                     label="具体章条">
             </el-table-column>
             <el-table-column
@@ -208,12 +210,13 @@
                     label="解读内容">
               <el-table-column
                       show-overflow-tooltip
+                      v-if="itemType"
                       prop="coreTechnicalRequirement"
                       label="核心技术要求(简述、请勿抄写标准)">
               </el-table-column>
               <el-table-column
                       show-overflow-tooltip
-                      v-if="sarProject.position === '1'"
+                      v-if="sarProject.position === '1' && !itemType"
                       prop="comparedWithPrevious"
                       label="相对于上一版本变化点">
               </el-table-column>
@@ -258,6 +261,8 @@
     name: "technologyInvolveProject",
     data () {
       return {
+        itemType: false,
+        interpretationTime: '',
         riskDegreeModal: false,
         editData: {},
         riskDegree: '',
@@ -392,6 +397,7 @@
       }, // 外层清空条件查询
       handleProjectCompliance (row) {
         this.standId = row.standId
+        this.interpretationTime = row.interpretationTime
         this.querySarProStateZero()
       },
       querySarProStateZeroBtn(){
@@ -405,6 +411,7 @@
         form.standId = this.standId
         form.current = this.sarProStateTotalPage
         form.size = this.sarProStatePageSize
+        form.interpretationTime = this.interpretationTime
         this.$http.get('sarStandardComplianceAssessResult/interpretation', form, {
           _this: this,
           loading: 'loading'
@@ -412,6 +419,11 @@
           if (res.ok) {
             this.sarProStateListDatas = res.data.records
             this.sarProStateTotal = res.data.total
+            if (res.data.records[0].coreTechnicalRequirement) {
+              this.itemType = true
+            } else {
+              this.itemType = false
+            }
           }
         })
         this.showSarProStateModal = true