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

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue

@@ -45,9 +45,19 @@
                     :title="$t('ParentName')">{{$t('ParentName')}}</span>
               </div>
               <a-form-model-item class="itemModel">
-                <a-input class="box-input"
+                <a-select :placeholder="$t('PleaseSelect')+$t('ParentName')"
-                         v-model="formInline.ParentName"
+                          class="box-input"
-                         :placeholder="$t('PleaseEnter')+$t('ParentName')"/>
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="formInline.parentId">
+                  <a-select-option v-for="(item, key) in ParentList"
+                                   :key="item.id"
+                                   :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title="item.title ">
+                           {{ item.title }}
+                     </span>
+                  </a-select-option>
+                </a-select>
               </a-form-model-item>
             </div>
           </a-col>
@@ -68,6 +78,7 @@
         confirmLoading: false,
         formInline: {},
         rules: {},
+        ParentList: [],
         title: '',
         url: {
           add: '/report/lawsMonthlyReportTitleTemplateEO/add',
@@ -79,9 +90,19 @@
 
     },
     methods: {
+      getParent() {
+        getAction('/report/lawsMonthlyReportTitleTemplateEO/oneMenu', {}).then((res) => {
+          if (res.success) {
+            this.ParentList = res.result
+          } else {
+            this.ParentList = []
+          }
+        })
+      },
       add() {
         this.title = this.$t('newlyAdded')
         this.visible = true
+        this.getParent()
         this.$nextTick(() => {
           this.formInline = {}
           this.$refs.ruleForm.clearValidate()
@@ -90,6 +111,7 @@
       edit(row) {
         this.title = this.$t('edit')
         this.visible = true
+        this.getParent()
         this.$nextTick(() => {
           this.formInline = row
           this.$refs.ruleForm.clearValidate()