Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs

src/views/expelled/notice/index.vue

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