src/views/expelled/notice/index.vue

@@ -20,13 +20,7 @@
       </template>
       <template v-slot:table-top="btns">
         <div style="margin-bottom: 12px;">
-          <el-button
+          <el-button type="primary" @click="visible = true">发起除名告知</el-button>
-            type="primary"
-            @click="() => {
-              visible = true
-              isViewDetail = false
-            }"
-          >发起除名告知</el-button>
         </div>
       </template>
       <template v-slot:ExplusionInfo="scope">
@@ -48,23 +42,11 @@
     >
       <ExpelledList :is-components="true" @confirm-remove="confirmRemove" />
     </el-dialog>
-
-    <!-- <el-dialog
-      title="市场主体拟除名名单库"
-      :visible.sync="openDialog"
-      width="90vw"
-      top="153px"
-      custom-class="dialog-abnormal-list"
-    >
-    <el-form ref="form" :model="form" label-width="80px">
-      <el-form-item></el-form-item>
-    </el-form> -->
-    <!-- </el-dialog> -->
   </div>
 </template>
 
 <script>
-import { expelledNoticeList, expelledNoticeSave } from '@/api/除名公告.js'
+import { listExpelled, saveExpelled } from '@/api/expelled'
 import ExpelledList from '@/views/expelled/list/index.vue'
 export default {
   components: {
@@ -73,7 +55,6 @@ export default {
   data() {
     return {
       visible: false,
-      isViewDetail: false,
       noticeVisible: false,
       expelledDatas: [],
       removeEntBases: '',
@@ -106,7 +87,6 @@ export default {
             show: true,
             handler: (scope, { row }) => {
               this.$refs.EditTable.editReady(row)
-              this.isViewDetail = true
             }
           }
         ]
@@ -148,14 +128,8 @@ export default {
                 })
                   .then(() => {
                     return (() => {
-                      return expelledNoticeSave
+                      return saveExpelled
-                    })()({
+                    })()(formData)
-                      ...formData,
-                      entIds: this.expelledDatas.map((item) => {
-                        return item.id
-                      }),
-                      bizType: '1'
-                    })
                       .then(() => {
                         this.$message.success('保存成功')
                         this.$refs.EditTable.editConfirm(formData)
@@ -174,9 +148,6 @@ export default {
                     }
                   })
               })
-            },
-            show: () => {
-              return !this.isViewDetail
             }
           }
         ]
@@ -197,12 +168,12 @@ export default {
         {
           type: 'input',
           label: '业务号',
-          prop: 'bizNo',
+          prop: 'searchBizNo',
           span: 9,
           showInForm: ({ meta }) => {
             return meta.isSearchForm === true
-          }
+          },
-          // showInTable: false
+          showInTable: false
         },
         {
           type: 'buttons',
@@ -268,16 +239,16 @@ export default {
             return meta.isForm === true
           }
         },
-        // {
+        {
-        //   type: 'input',
+          type: 'input',
-        //   label: '业务号',
+          label: '业务号',
-        //   prop: 'bizNo',
+          prop: 'bizNo',
-        //   required: true,
+          required: true,
-        //   showInForm: ({ meta }) => {
+          showInForm: ({ meta }) => {
-        //     return meta.isForm === true
+            return meta.isForm === true
-        //   },
+          },
-        //   showInTable: true
+          showInTable: true
-        // },
+        },
         {
           type: 'input',
           label: '除名决定的事实',
@@ -341,11 +312,10 @@ export default {
   },
   methods: {
     searchLoader(pageParam, parseSearchFormData, instance) {
-      return expelledNoticeList({
+      return listExpelled({
         size: pageParam.size,
         current: pageParam.current,
         entity: {
-          bizType: '1',
           ...parseSearchFormData
         }
       }).then((data) => {
@@ -363,7 +333,6 @@ export default {
     },
     confirmRemove(datas) {
       this.expelledDatas = datas
-      console.log(this.expelledDatas)
       for (let i = 0; i < datas.length; i++) {
         if (i >= 10) {
           break