[update] 外来标准法规

src/components/JMultipleDatePicker.vue

@@ -196,7 +196,7 @@ export default {
 
 // 设置日期面板中选中日期的样式
 .blue {
-  background: #ffd5d3 !important;
+  background: #a1c5ff !important;
 }
 
 // 设置输入框中的文字显示

src/components/customField/Search.vue

@@ -60,9 +60,15 @@
         <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
           <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-range-picker v-model="queryParam[item.dbFieldName]"
-                            :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                            :open="dateCurrentOpen === item.dbFieldName"
-                            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                            @openChange="openChange(item.dbFieldName)"
-                            @change="onChange(item.dbFieldName)"></a-range-picker>
+                            @calendarChange="calendarChange"
+                            format="YYYY-MM-DD" value-format="YYYY-MM-DD">
+              <!--                @change="onChange(item.dbFieldName)"-->
+              <template slot="renderExtraFooter" slot-scope="mode">
+                <a-button @click="confirm(mode, item.dbFieldName)">确定</a-button>
+              </template>
+            </a-range-picker>
           </a-form-item>
         </template>
         <!--  字典单选框  -->
@@ -224,8 +230,15 @@
           <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
             <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-range-picker v-model="queryParam[item.dbFieldName]"
-                              format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                              :open="dateCurrentOpen === item.dbFieldName"
-                              @change="onChange(item.dbFieldName)"></a-range-picker>
+                              @openChange="openChange(item.dbFieldName)"
+                              @calendarChange="calendarChange"
+                              format="YYYY-MM-DD" value-format="YYYY-MM-DD">
+<!--                @change="onChange(item.dbFieldName)"-->
+                <template slot="renderExtraFooter" slot-scope="mode">
+                  <a-button @click="confirm(mode, item.dbFieldName)">确定</a-button>
+                </template>
+              </a-range-picker>
             </a-form-item>
           </template>
           <!--   字典单选  -->
@@ -336,7 +349,8 @@ export default {
       wrapperCol: {
         span: 14
       },
-      optionsData: {} // 用接口获取到的下拉数据
+      optionsData: {}, // 用接口获取到的下拉数据
+      dateCurrentOpen: '' // datePicker当前是哪个字段在打开
     }
   },
   created () {
@@ -423,6 +437,7 @@ export default {
       })
     },
     onChange (item) {
+      console.log('---------onChange')
       if (this.queryParam[item] && this.queryParam[item].length > 0) {
         const startDate = item + '_start'
         const endDate = item + '_end'
@@ -438,6 +453,31 @@ export default {
     filterTreeOption (input, option) {
       const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label
       return text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
+    confirm (mode, item) {
+      if (this.queryParam[item] && this.queryParam[item].length > 0) {
+        const startDate = item + '_start'
+        const endDate = item + '_end'
+        this.queryParam[startDate] = this.queryParam[item][0]
+        this.queryParam[endDate] = this.queryParam[item][1]
+      } else {
+        this.queryParam[item] = []
+      }
+      this.dateCurrentOpen = ''
+    },
+    openChange (dbFieldName) {
+      if (this.dateCurrentOpen === dbFieldName) {
+        // 说明是要关闭，把dateCurrentOpen清空
+        this.dateCurrentOpen = ''
+      } else {
+        // 说明是打开了新的，把dateCurrentOpen设置成新打开的
+        this.dateCurrentOpen = dbFieldName
+      }
+    },
+    calendarChange (value) {
+      if (this.dateCurrentOpen) {
+        this.queryParam[this.dateCurrentOpen] = value
+      }
     }
   }
 }

src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue

@@ -21,7 +21,7 @@
                   :disabled-field-list="disabledField"
                   :open-selected-all-field-list="openSelectedAllFieldList"
                   :exclude-standard-fields="excludeStandardFields"
-                  :flag-by-field="{associated_foreign_standards: StandardSource.FOREIGN.value}"
+                  :flag-by-field="{associated_enterprise_standard: StandardSource.ENTERPRISE.value, associated_standard: StandardSource.FOREIGN.value}"
                   @submitFormData="submitFormData" />
       </a-spin>
     </div>