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

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) {