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

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -1235,7 +1235,7 @@ export default {
       if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND' || this.sarAccessInfo.dataSource === 'INLAND_STAND') {
         formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
         formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
-        formData.issueTime = null
+        // formData.issueTime = null
       } /*else if(this.sarAccessInfo.dataSource === 'BUSINESS') {
         // formData.issueTime = formData.issueTime ? formData.issueTime[0] : null
         // formData.issueTime = formData.issueTime ? formData.issueTime[1] : null
@@ -1761,7 +1761,6 @@ export default {
           delete this.sarAccessInfo.lawsNumber
           delete this.sarAccessInfo.standCode
         }
-        console.log('this.sarAccessInfo===' , this.sarAccessInfo)
         StandardsInfoPage(type === 1 ? ({...this.sarAccessInfo, standNumber: this.sarAccessInfo.seniorStandNumber, lawsNumber: this.sarAccessInfo.seniorLawsNumber, standCode: this.sarAccessInfo.seniorStandCode}) : (this.sarAccessInfo)).then(res => {
           // if (type === 1) {
           //   this.sarAccessInfo.standNumber = ''

src/pages/regulatoryRepository/dataCenter/index.vue

@@ -238,7 +238,7 @@
         :styles="styles"
         :close="cancelModel"
     >
-      <div style="margin-left: 3%">
+      <div style="height: 92%;margin-left: 3%">
         <el-form
             ref="attributeEO"
             :model="attributeEO"
@@ -295,7 +295,8 @@
           >
             <el-input
                 type="textarea"
-                :autosize="{ minRows: 1, maxRows: 15}"
+                :autosize="{ minRows: 1, maxRows: 10}"
+                resize="none"
                 style="width: 95%"
                 maxlength="4000"
                 show-word-limit
@@ -325,26 +326,26 @@
             </el-upload>
           </el-form-item>
         </el-form>
-        <div style="float: right">
-          <el-button
-              type="primary"
-              class="common-button-primary"
-              size="mini"
-              icon="el-icon-check"
-              @click="saveInfo"
-              :loading="submitLoading"
-          >提交
-          </el-button
-          >
-          <el-button
-              size="mini"
-              icon="el-icon-close"
-              class="common-button-default"
-              @click="cancelModel"
-          >取消
-          </el-button
-          >
-        </div>
+      </div>
+      <div style="height: 4%;text-align: right;">
+        <el-button
+          type="primary"
+          class="common-button-primary"
+          size="mini"
+          icon="el-icon-check"
+          @click="saveInfo"
+          :loading="submitLoading"
+        >提交
+        </el-button
+        >
+        <el-button
+          size="mini"
+          icon="el-icon-close"
+          class="common-button-default"
+          @click="cancelModel"
+        >取消
+        </el-button
+        >
       </div>
     </el-drawer>
   </div>
@@ -1041,7 +1042,7 @@ export default {
 }
 .upload-demo{
   /deep/.el-upload-list{
-    height: 60vh;
+    height: 42vh;
     overflow-y: auto;
   }
 }

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

@@ -675,10 +675,10 @@
     mounted () {
       this.queryStandAndLaws()
       this.tableHeight = $('.regulatory-repository').height() - 159
-      this.sarProStateTableHeight = $('body').height() - 152
+      this.sarProStateTableHeight = $('body').height() - 162
       window.onresize = () => {
         this.tableHeight = $('.regulatory-repository').height() - 159
-        this.sarProStateTableHeight = $('body').height() - 152
+        this.sarProStateTableHeight = $('body').height() - 162
       }
     }
   }

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -1233,7 +1233,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.standId,
+          id: item.standId ? item.standId : item.id,
           pageType: "INLAND_STAND"
         }
       });