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

src/components/CustomFormComponents/DatePickerGroup.vue

@@ -144,7 +144,7 @@ export default {
   },
   watch: {
     value (val) {
-      this.tagList = val !== '' && val !== null ? val.split(',') : []
+      this.tagList = val !== '' && val !== null && val !== undefined? val.split(',') : []
       // 把日期的时分秒去掉
       this.tagList=this.tagList.map((item)=>item.substring(0,10))
     },

src/pages/details/otherStandardDetails/index.vue

@@ -266,10 +266,9 @@
                     <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
                         sarStandardsInfoEO.issueTime || '-'
                       }}</span></p>
-<!--                    <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
+                    <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{
-<!--                        standMap[sarStandardsInfoEO.standNature] || '-'-->
+                        standMap[sarStandardsInfoEO.standNature] || '-'
-<!--                      }}</span></p>-->
+                      }}</span></p>
-
                     <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
                         style=" margin-right: 150px;">标准体系</label><span>{{
                         sarStandardsInfoEO.standSystem || '-'

src/pages/localTool/standardWarning.vue

@@ -184,15 +184,15 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
+                 <!-- <el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
-                  <template slot-scope="scope">
+                    <template slot-scope="scope">
-                    <el-button
+                      <el-button
-                        size="mini"
+                          size="mini"
-                        type="danger"
+                          type="danger"
-                        @click="cancelWarning(scope.$index, scope.row)">取消预警
+                          @click="cancelWarning(scope.$index, scope.row)">取消预警
-                    </el-button>
+                      </el-button>
-                  </template>
+                    </template>
-                </el-table-column>
+                  </el-table-column>-->
               </el-table>
               <pagination
                   style="position: static;"

src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue

@@ -4,7 +4,7 @@
   <el-form-item
     :label="config.attrName"
     :prop="config.attrField"
-    label-width="150px"
+    label-width="180px"
     class="add-form-item"
     :class="{'form-item-disabled': disabled}"
   >
@@ -12,7 +12,7 @@
       v-show="false"
       :value="value"
       :placeholder="placeholder"
-      clearable
+      :disabled="disabled"
     ></el-input>
     <div class="date-picker-group">
       <template v-for="(tag, index) in tagList">
@@ -20,7 +20,7 @@
           <div class="tag-wrap" v-if="tagAnimateList.includes(tag)" :key="index">
             <el-tag
               size="small"
-              closable
+              :closable="!disabled"
               @close="handleRemoveTag(index)">{{ tag }}</el-tag>
           </div>
         </transition>
@@ -122,7 +122,7 @@ export default {
   },
   watch: {
     value (val) {
-      this.tagList = val !== '' && val !== null ? val.split(',') : []
+      this.tagList = val !== '' && val !== null && val !== undefined ? val.split(',') : []
     },
     tagList: {
       handler (val) {