From 6294795ab5c0656182306dc1cbf0136328e2afae Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 1 Apr 2022 18:21:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=B3=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/List.vue                       |  2 +-
 .../components/List.vue                       |  5 +-
 .../AppDishonestExecutee/components/Add.vue   |  2 +-
 .../AppDishonestExecutee/components/List.vue  | 19 +++---
 .../apps/AppRatepayingInfo/components/Add.vue | 66 ++++++++++++++-----
 .../AppRatepayingInfo/components/List.vue     | 36 ++++++----
 6 files changed, 88 insertions(+), 42 deletions(-)

diff --git a/project/xiushan/apps/AppAdministrativeLicense/components/List.vue b/project/xiushan/apps/AppAdministrativeLicense/components/List.vue
index c5d18c28..26114e53 100644
--- a/project/xiushan/apps/AppAdministrativeLicense/components/List.vue
+++ b/project/xiushan/apps/AppAdministrativeLicense/components/List.vue
@@ -65,7 +65,7 @@ export default {
     export() {},
     getTableData() {
       this.instance.post("/appcreditadminstrativelicense/list", null, {
-        params: {...this.page, ...this.search, status: 1,...this.select}
+        params: {...this.page, ...this.search, ...this.select}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records
diff --git a/project/xiushan/apps/AppAdministrativePenalty/components/List.vue b/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
index 4a41fa66..e7b6aba2 100644
--- a/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
+++ b/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
@@ -8,7 +8,8 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.name" clearable v-throttle="() => {(page.current = 1), getTableData();}"/>
+            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.name" clearable suffix-icon="iconfont iconSearch"
+             @clear="page.current = 1, searchObj.con = '', getTableData()" v-throttle="() => {(page.current = 1), getTableData();}"/>
             <el-button size="small">导入</el-button>
             <el-button size="small">导出</el-button>
           </template>
@@ -62,7 +63,7 @@ export default {
   methods: {
     getTableData() {
       this.instance.post("/appcreditadministrativesanction/list", null, {
-        params: {...this.page, ...this.search, status: 1,...this.select}
+        params: {...this.page, ...this.search, ...this.select}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records
diff --git a/project/xiushan/apps/AppDishonestExecutee/components/Add.vue b/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
index 68152287..c723d8a1 100644
--- a/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
+++ b/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
@@ -29,7 +29,7 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item label="履行情况" prop="executionSituation">
-                  <ai-select v-model="forms.executionSituation" @change="onChange" placeholder="请选择文档类型" :selectList="$dict.getDict('dishonestPersonSituation')"></ai-select>
+                  <ai-select v-model="forms.executionSituation" placeholder="请选择文档类型" :selectList="$dict.getDict('dishonestPersonSituation')"></ai-select>
                 </el-form-item>
               </el-col>
             </el-row>
diff --git a/project/xiushan/apps/AppDishonestExecutee/components/List.vue b/project/xiushan/apps/AppDishonestExecutee/components/List.vue
index 37cadb0a..f62ff5c9 100644
--- a/project/xiushan/apps/AppDishonestExecutee/components/List.vue
+++ b/project/xiushan/apps/AppDishonestExecutee/components/List.vue
@@ -8,7 +8,8 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.name" clearable v-throttle="() => {(page.current = 1), getTableData();}"/>
+            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.name" clearable @clear="page.current = 1, searchObj.name = '',getTableData()" 
+            suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/>
             <el-button size="small">导入</el-button>
             <el-button size="small">导出</el-button>
           </template>
@@ -45,13 +46,13 @@ export default {
   computed: {
     colConfigs() {
       return [
-        { prop: "position", label: '被执行号', align: "center", width: "200px", },
-        { prop: "position", label: '执行时间', align: "center", width: "200px", },
-        { prop: "position", label: '失信被执行主体', align: "center", width: "200px", },
-        { prop: "position", label: '证件号码', align: "center", width: "200px", },
-        { prop: "position", label: '失信事实', align: "center", width: "200px", },
-        { prop: "position", label: '更新时间', align: "center", width: "200px", },
-        { prop: "position", label: '操作人', align: "center", width: "200px", },
+        { prop: "executionCode", label: '被执行号', align: "center", width: "200px", },
+        { prop: "executionTime", label: '执行时间', align: "center", width: "200px", },
+        { prop: "enterpriseName", label: '失信被执行主体', align: "center", width: "200px", },
+        { prop: "unifiedCode", label: '统一信用代码', align: "center", width: "200px", },
+        { prop: "dishonestFact", label: '失信事实', align: "center", width: "200px", },
+        { prop: "createTime", label: '更新时间', align: "center", width: "200px", },
+        { prop: "createUserName", label: '操作人', align: "center", width: "200px", },
         { slot: "options" ,},
       ]
     }
@@ -62,7 +63,7 @@ export default {
   methods: {
     getTableData() {
       this.instance.post("/appcreditdishonestperson/list", null, {
-        params: {...this.page, ...this.search, status: 1,...this.select}
+        params: {...this.page, ...this.search,...this.select}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records
diff --git a/project/xiushan/apps/AppRatepayingInfo/components/Add.vue b/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
index ecb2dfb6..eb1c1d35 100644
--- a/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
+++ b/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
@@ -7,41 +7,41 @@
       <template #content>
         <div class="add-form">
           <ai-bar title="纳税信息"></ai-bar>
-          <el-form ref="rules" :model="forms" :rules="formRules" size="small"  label-width="150px">
+          <el-form ref="forms" :model="forms" :rules="formRules" size="small"  label-width="150px">
             <el-row type="flex">
               <el-col :span="20">
-                <el-form-item label="纳税人名称" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
+                <el-form-item label="纳税人名称" prop="taxpayer">
+                  <el-input v-model="forms.taxpayer" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item label="纳税人识别号" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
+                <el-form-item label="纳税人识别号" prop="taxpayerNumber">
+                  <el-input v-model="forms.taxpayerNumber" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row type="flex">
               <el-col :span="20">
-                <el-form-item label="纳税年份" prop="num">
-                  <el-date-picker v-model="value1" type="date" placeholder="选择日期" style="width:375px">
+                <el-form-item label="纳税年份" prop="taxYear">
+                  <el-date-picker v-model="forms.taxYear" value-format="yyyy" type="year" placeholder="选择日期" style="width:375px">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item label="纳税等级" prop="num">
-                  <ai-select v-model="readType" @change="onChange" placeholder="请选择文档类型" :selectList="$dict.getDict('readType')"></ai-select>
+                <el-form-item label="纳税等级" prop="taxLevel">
+                  <ai-select v-model="forms.taxLevel"  placeholder="请选择文档类型" :selectList="$dict.getDict('taxInfoLevel')"></ai-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row type="flex">
               <el-col :span="20">
-                <el-form-item label="纳税主题" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
+                <el-form-item label="纳税主体" prop="enterpriseName">
+                  <el-input v-model="forms.enterpriseName" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item label="统一信用代码" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
+                <el-form-item label="统一信用代码" prop="unifiedCode">
+                  <el-input v-model="forms.unifiedCode" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -50,7 +50,7 @@
       </template>
       <template slot="footer" class="footer">
         <el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
-        <el-button class="footer-btn" type="primary" @click="onSubmit('0')">保存</el-button>
+        <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
       </template>
     </ai-detail>
   </section>
@@ -68,16 +68,30 @@ export default {
   computed: {
     formRules() {
       return {
-        num: [{required: true,message:"请输入执行编号",trigger: "blur"}]
+        taxpayer: [{required: true,message:"请输入纳税人名称",trigger: "blur"}],
+        taxpayerNumber: [{required: true,message:"请输入纳税人识别号",trigger: "blur"}],
+        taxYear: [{required: true,message:"请输入纳税年份",trigger: "blur"}],
+        taxLevel: [{required: true,message:"请选择纳税等级",trigger: "blur"}],
+        enterpriseName: [{required: true,message:"请输入纳税主体",trigger: "blur"}],
+        unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"}],
       }
     }
   },
   data() {
     return {
-      forms
+      forms: {
+        taxpayer: '',
+        taxpayerNumber: '',
+        taxYear: '',
+        taxLevel: '',
+        enterpriseName: '',
+        unifiedCode: '',
+      },
     }
   },
-  created() {},
+  created() {
+    this.$dict.load('taxInfoLevel')
+  },
   methods: {
     cancel(isRefresh) {
       this.$emit('change', {
@@ -85,6 +99,24 @@ export default {
         isRefresh: !!isRefresh,
       })
     },
+    confirm() {
+      this.$refs.forms.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/appcredittaxinfo/addOrUpdate`, {
+            ...this.forms,
+            id: this.params.id || '',
+            // picture: this.form.picture.length ? this.form.picture[0].url : ''
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('提交成功')
+              setTimeout(() => {
+                this.cancel(true)
+              }, 600)
+            }
+          })
+        }
+      })
+    },
   },
 
 }
diff --git a/project/xiushan/apps/AppRatepayingInfo/components/List.vue b/project/xiushan/apps/AppRatepayingInfo/components/List.vue
index d059bf64..30ea0ac7 100644
--- a/project/xiushan/apps/AppRatepayingInfo/components/List.vue
+++ b/project/xiushan/apps/AppRatepayingInfo/components/List.vue
@@ -8,7 +8,8 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.name" clearable v-throttle="() => {(page.current = 1), getTableData();}"/>
+            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.name" clearable suffix-icon="iconfont iconSearch"
+            @clear="page.current = 1, searchObj.name = '',getTableData()" v-throttle="() => {(page.current = 1), getTableData();}"/>
             <el-button size="small">导入</el-button>
             <el-button size="small">导出</el-button>
           </template>
@@ -18,9 +19,7 @@
           <el-table-column slot="options" label="操作"  align="center">
             <template slot-scope="{ row }">
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
-            </template>
-            <template slot-scope="{ row }">
-              <el-button type="text" @click="delete row.id">删除</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
             </template>
           </el-table-column>
         </ai-table>
@@ -47,21 +46,24 @@ export default {
   computed: {
     colConfigs() {
       return [
-        { prop: "position", label: '纳税人名称', align: "center", width: "200px", },
-        { prop: "position", label: '纳税主体', align: "center", width: "200px", },
-        { prop: "position", label: '纳税人识别号', align: "center", width: "200px", },
-        { prop: "position", label: '年份', align: "center", width: "200px", },
-        { prop: "position", label: '等级', align: "center", width: "200px", },
-        { prop: "position", label: '更新时间', align: "center", width: "200px", },
-        { prop: "position", label: '操作人', align: "center", width: "200px", },
+        { prop: "taxpayer", label: '纳税人名称', align: "center", width: "200px", },
+        { prop: "enterpriseName", label: '纳税主体', align: "center", width: "200px", },
+        { prop: "taxpayerNumber", label: '纳税人识别号', align: "center", width: "200px", },
+        { prop: "taxYear", label: '年份', align: "center", width: "200px", },
+        { prop: "taxLevel", label: '等级', dict: "taxInfoLevel", width: "200px", },
+        { prop: "createTime", label: '更新时间', align: "center", width: "200px", },
+        { prop: "createUserName", label: '操作人', align: "center", width: "200px", },
         { slot: "options" ,},
       ]
     }
   },
+  created() {
+    this.getTableData()
+  },
   methods: {
     getTableData() {
       this.instance.post("/appcredittaxinfo/list", null, {
-        params: {...this.page, ...this.search, status: 1,...this.select}
+        params: {...this.page, ...this.search, ...this.select}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records
@@ -85,6 +87,16 @@ export default {
         }
       })
     },
+    handleDelete(id) {
+      this.$confirm("是否要删除？").then(() => {
+        this.instance.post(`/appcredittaxinfo/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success("删除成功")
+              this.getTableData()
+            }
+          })
+      })
+    },
   }
 }
 </script>