Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!130

src/pages/details/otherBussStandardDetails/index.vue

@@ -36,7 +36,7 @@
               <p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
               <p><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
               <p>
-                <label style=" margin-right: 139px;"
+                <label style=" margin-right: 156px;"
                         title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
                 >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
               </p>
@@ -2029,7 +2029,11 @@ export default {
               field['tips'] = tips
             }
             if (value && typeof value === 'number') {
-              value = this.$dateFormat(value, 'yyyy-MM-dd')
+              value = this.$moment(value).format('YYYY-MM-DD')
+            }
+            // 时间格式处理
+            if (field.attrType === 'DATE_PICKER' && value) {
+              value = this.$moment(value).format('YYYY-MM-DD')
             }
             field['value'] = value
             if (field.showRegionId === location.value) {

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -433,7 +433,7 @@
                             label="企标编号"
                             prop="standCode"
                             label-width="150px"
-                            class="add-form-item form-item-disabled"
+                            class="add-form-item"
                     >
                         <el-input
                                 v-model="sarBussionessStandEO.standCode"
@@ -1930,12 +1930,14 @@ export default {
           if(checkedData) {
               if(checkedData.length > 0){
                   this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
                   this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
+                  this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
               }else {
                   this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
-                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
                   this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
+                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
+                  this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName
               }
           }
           this.modalShowFlag2 = false
@@ -3401,10 +3403,10 @@ export default {
         this.SarExportSearchEo = item
       }
       // 处理我的收藏和个性化标签传参
-      if (this.selectSarMenu.id === 'wdsc') {
+      if (this.selectSarMenu.id === 'qbwdsc') {
         this.sarBussionessSearch.menuId = undefined
         this.sarBussionessSearch.labelMenuId = undefined
-        this.sarBussionessSearch.collectMenuId = 'wdsc'
+        this.sarBussionessSearch.collectMenuId = 'qbwdsc'
       } else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
         this.sarBussionessSearch.menuId = undefined
         this.sarBussionessSearch.labelMenuId = this.selectSarMenu.id

src/pages/searchCenter/pages/advancedSearch.vue

@@ -1502,8 +1502,10 @@ export default {
       if(checkedData) {
         if(checkedData.length > 0){
           this.standForm.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
+          this.standForm.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
         }else {
           this.standForm.VPPSBMBUSS = checkedData.code
+          this.standForm.VPPSCNBUSS = checkedData.chineseName
         }
       }
       this.modalShowFlag2 = false