Merge branch 'lvtianfang' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-pc

src/api/tcZz/netManage/gzdt.js

@@ -42,3 +42,23 @@ export function delGzdt(id) {
     method: 'delete'
   })
 }
+// 工作动态批量启用禁用
+export function updateIsStatus(query) {
+  return request({
+    url: '/tcZz/netManage/gzdt/isStatus',
+    method: 'get',
+    params: query
+  })
+}
+
+// 通用导入
+export function importExcel(data) {
+  return request({
+    url: '/tcZz/netManage/gzdt/common/importExcel',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}

src/components/FileUpload/index.vue

@@ -50,12 +50,12 @@ export default {
     // 数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 50,
     },
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 20,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {

src/views/tcZz/netManage/gzdt/index.vue

@@ -137,6 +137,18 @@
             @click="handleDelete"
             v-hasPermi="['tcZz/netManage:gzdt:remove']"
         >删除</el-button>
+        <el-upload
+          class='upload-demo'
+          ref="upload"
+          action="1"
+          :limit="1"
+          accept=".xlsx, .xls"
+          :show-file-list="false"
+          :file-list="fileList"
+          :http-request="exportFile"
+        >
+          <el-button type="info" size="mini">导入</el-button>
+        </el-upload>
       <el-button
         type="warning"
         size="mini"
@@ -283,7 +295,8 @@
 </template>
 
 <script>
-  import { listGzdt, getGzdt, delGzdt, addGzdt, updateGzdt, exportGzdt } from "@/api/tcZz/netManage/gzdt";
+  import { listGzdt, getGzdt, delGzdt, addGzdt, updateGzdt, exportGzdt, updateIsStatus, importExcel } from "@/api/tcZz/netManage/gzdt";
+  import { Loading } from "element-ui";
   export default {
     name: "Gzdt",
     //注释字典
@@ -353,7 +366,8 @@
         // 表单校验
         rules: {
         },
-        fileNameS:[]
+        fileNameS:[],
+        fileList:[]
       };
     },
     created() {
@@ -543,8 +557,38 @@
           }, '工作动态_'+ new Date().getTime() +'.xlsx')
           this.exportLoading = false;
         }).catch(() => {});
-      }
+      },
+      /** 导入按钮操作 */
+      exportFile(e) {
+        let downloadLoadingInstance = Loading.service({
+          text: "正在导入数据，请稍候",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)",
+        });
+        let a = new FormData();
+        a.append("file", e.file);
+        importExcel(a)
+          .then((res) => {
+            downloadLoadingInstance.close();
+            this.$model.msgSuccess("导入成功");
+            this.getList();
+            this.$refs.upload.clearFiles();
+          })
+          .catch(() => {
+            downloadLoadingInstance.close();
+            this.$model.msgError("导入失败");
+          });
+      },
     }
   }
 
 </script>
+<style lang="scss" scope>
+.layui-table-tool {
+  display:flex;
+
+  .upload-demo {
+    margin: 0 10px;
+  }
+}
+</style>

src/views/tcZz/netManage/jbsjndfltj/index.vue

@@ -12,21 +12,21 @@
                     />
                   </el-form-item> -->
                   <el-form-item label="类型" prop="type">
-                    <!-- <el-input
+                    <el-input
                         v-model="queryParams.type"
                         placeholder="请输入类型"
                         clearable
                         size="small"
                         @keyup.enter.native="handleQuery"
-                    /> -->
+                    />
-                    <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
+                    <!-- <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
                       <el-option
                           v-for="dict in dict.type.tc_jbsjtype"
                           :key="dict.value"
                           :label="dict.label"
                           :value="dict.value"
                       />
-                    </el-select>
+                    </el-select> -->
                   </el-form-item>
                   <el-form-item label="数量" prop="count">
                     <el-input
@@ -129,9 +129,9 @@
       <el-table-column type="selection" width="55" align="center" />
               <!-- <el-table-column label="序号" align="center" prop="id" /> -->
               <el-table-column label="类型" align="center" prop="type">
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                   <dict-tag :options="dict.type.tc_jbsjtype" :value="scope.row.type"/>
-                </template>
+                </template> -->
               </el-table-column>
               <el-table-column label="数量" align="center" prop="count" />
               <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
@@ -173,14 +173,21 @@
      <div slot="title" class="dialog-title">{{ title }}</div>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto" class="dialog-from">
                         <el-form-item label="类型" prop="type">
-                          <el-select v-model="form.type" placeholder="请选择类型">
+                          <el-input
+                            v-model="form.type"
+                            placeholder="请输入类型"
+                            clearable
+                            size="small"
+                            @keyup.enter.native="handleQuery"
+                          />
+                          <!-- <el-select v-model="form.type" placeholder="请选择类型">
                             <el-option
                                 v-for="dict in dict.type.tc_jbsjtype"
                                 :key="dict.value"
                                 :label="dict.label"
                                 :value="parseInt(dict.value)"
                             ></el-option>
-                          </el-select>
+                          </el-select> -->
                         </el-form-item>
                         <el-form-item label="数量" prop="count">
                           <el-input v-model="form.count" placeholder="请输入数量" />
@@ -207,7 +214,7 @@
      <div slot="title" class="dialog-title">{{ infoTitle }}</div>
 
         <el-descriptions title="举报事件年度分类统计"  :column="2" border labelClassName="desLable">
-                      <el-descriptions-item label="类型">{{ selectDictLabel(dict.type.tc_jbsjtype,form.type) }}</el-descriptions-item>
+                      <el-descriptions-item label="类型">{{ form.type }}</el-descriptions-item>
 
                       <el-descriptions-item label="数量">{{ form.count }}</el-descriptions-item>
 
@@ -224,7 +231,6 @@
   export default {
     name: "Jbsjndfltj",
     //注释字典
-    dicts: ['tc_jbsjtype'],
     data() {
       return {
         tableHeigth: 0,