修改个人信息弹框

monkeyhouyi
1 parent d8af3866
Showing 11 changed files with 90 additions and 75 deletions
src/components/InfoForm/index.vue
src/utils/request.js
src/views/DisposalSuggestions/Form.vue
src/views/DisposalSuggestions/index.vue
src/views/baseComapnyInfo/index.vue
src/views/baseInspectionReport/index.vue
src/views/baseListHazardousSamples/index.vue
src/views/baseSpecialAction/index.vue
src/views/baseSpecialhandle/index.vue
src/views/baseSystemInfo/index.vue
src/views/homePage/components/Header.vue
@@ -324,22 +324,22 @@ export default {
         systemClass: {
           required: true,
           message: "请输入系统分类",
-          trigger: "change",
+          trigger: "blur",
         },
         systemType: {
           required: true,
           message: "请输入系统类型",
-          trigger: "change",
+          trigger: "blur",
         },
         companyId: {
           required: true,
           message: "请输入主体企业",
-          trigger: "change",
+          trigger: "blur",
         },
         areaId: {
           required: true,
           message: "请输入所属区县",
-          trigger: "change",
+          trigger: "blur",
         },
         pincipalPhone: {
           pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -11,7 +11,7 @@ axios.defaults.headers[&#39;Content-Type&#39;] = &#39;application/json;charset=utf-8&#39;
 const service = axios.create({
     // axios中请求配置有baseURL选项，表示请求URL公共部分
-    baseURL: process.env.VUE_APP_BASE_API + '/api',
+    baseURL: '/api',
     withCredentials: false,
     // 超时
     // timeout: define.timeout
@@ -261,7 +261,11 @@ export default {
     dataFormSubmit() {
       this.$refs["suggestionForm"].validate(async (valid) => {
         if (valid) {
-          let res = await disposalSuggestions(this.suggestionForm);
+          let obj = {
+            ...this.suggestionForm,
+            id: this.dataForm.id,
+          };
+          let res = await disposalSuggestions(obj);
           this.$message({
             message: res.msg,
             type: "success",
@@ -37,7 +37,7 @@
            </el-row>
            <div class="NCC-common-layout-main NCC-flex-main">
                <NCC-table v-loading="listLoading" :data="list">
-                   <el-table-column show-overflow-tooltip prop="platformName" label="系统名称" align="left" />
+                   <el-table-column show-overflow-tooltip prop="platformNameStr" label="系统名称" align="left" />
                    <el-table-column show-overflow-tooltip label="系统类型" prop="platformType" align="left">
                            <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
                    </el-table-column>
@@ -45,27 +45,11 @@
               </el-col>
             </el-form>
             <div class="NCC-common-search-box-right">
-              <el-button
-                type="primary"
-                icon="el-icon-download"
-                size="mini"
-                @click="exportData()"
-                >导出</el-button
-              >
+              <el-button type="success" icon="el-icon-plus" @click="addOrUpdateHandle()" size="mini" >新增</el-button>
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button>
             </div>
           </el-row>
           <div class="NCC-common-layout-main NCC-flex-main">
-            <div class="NCC-common-head">
-              <div>
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus"
-                  @click="addOrUpdateHandle()"
-                  size="mini"
-                  >新增</el-button
-                >
-              </div>
-            </div>
             <NCC-table v-loading="listLoading" :data="list">
               <el-table-column prop="id" label="主键" align="left" />
               <el-table-column
@@ -36,7 +36,7 @@
 			</el-row>
 			<div class="NCC-common-layout-main NCC-flex-main">
                 <NCC-table v-loading="listLoading" :data="list">
-					<el-table-column show-overflow-tooltip prop="platformName" label="系统名称" align="left" />
+					<el-table-column show-overflow-tooltip prop="platformNameStr" label="系统名称" align="left" />
 					<el-table-column show-overflow-tooltip label="系统类型" prop="platformType" align="left">
 							<template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
 					</el-table-column>
@@ -19,14 +19,14 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col> -->
-              <el-col :span="6">
+              <!-- <el-col :span="6">
                 <el-form-item label="">
                   <el-input v-model="query.content" placeholder="请输入具体内容" />
                 </el-form-item>
-              </el-col>
-              <el-col :span="4">
+              </el-col> -->
+              <el-col :span="5">
                 <el-form-item label="">
-                  <el-select v-model="query.harmfulInformationTypes" placeholder="请选择有害类型" clearable>
+                  <el-select v-model="query.source" placeholder="请选择来源" clearable>
                     <el-option
                       v-for="(item, index) in levelOptions"
                       :key="index"
@@ -36,7 +36,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="5">
                 <el-form-item label="">
                   <el-select
                     v-model="query.company"
@@ -52,11 +52,11 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="5">
                 <el-form-item label="">
                   <el-select
                     v-model="query.websitePlatform"
-                    placeholder="请选择系统"
+                    placeholder="请选择网站平台"
                     clearable
                   >
                     <el-option
@@ -82,13 +82,13 @@
             <NCC-table v-loading="listLoading" :data="list">
               <!-- <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/> -->
               <el-table-column prop="inputTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip/>
-              <el-table-column label="运营主体" prop="websitePlatformStr" align="left" show-overflow-tooltip />
+              <el-table-column label="运营主体" prop="companyStr" align="left" show-overflow-tooltip />
               <el-table-column label="网站平台" prop="websitePlatformStr" align="left" show-overflow-tooltip />
-              <el-table-column label="来源" prop="harmfulInformationTypes" align="left" show-overflow-tooltip />
-              <el-table-column label="问题类型" prop="websitePlatformStr" align="left" show-overflow-tooltip />
-              <el-table-column label="问题内容" prop="websitePlatformStr" align="left" show-overflow-tooltip />
-              <el-table-column label="违法原因" prop="websitePlatformStr" align="left" show-overflow-tooltip />
-              <el-table-column label="处罚内容" prop="content" align="left" show-overflow-tooltip/>
+              <el-table-column label="来源" prop="source" align="left" show-overflow-tooltip />
+              <el-table-column label="问题类型" prop="questionType" align="left" show-overflow-tooltip />
+              <el-table-column label="问题内容" prop="questionContent" align="left" show-overflow-tooltip />
+              <el-table-column label="违法原因" prop="illegalReasons" align="left" show-overflow-tooltip />
+              <el-table-column label="处罚内容" prop="punishmentContent" align="left" show-overflow-tooltip/>
               <!-- <el-table-column prop="creatorUserId" label="创建用户" show-overflow-tooltip align="left"/> -->
               <!-- <el-table-column prop="creatorTime" label="创建时间" align="left" show-overflow-tooltip :formatter="ncc.tableDateFormat"/> -->
               <!-- <el-table-column prop="lastModifyUserId" label="修改用户" align="left" show-overflow-tooltip/> -->
@@ -57,7 +57,7 @@
               <el-table-column label="操作" fixed="right" width="150">
                 <template slot-scope="scope">
                   <el-button type="text" @click="addOrUpdateHandle(scope.row)">修改</el-button>
-                  <el-button type="text" @click="toDetail(scope.row)" v-if="scope.row.state == '已发布并部署'">处理情况</el-button>
+                  <el-button type="text" @click="toDetail(scope.row)" v-if="scope.row.state == '已发布并部署' && isSHILevel">处理情况</el-button>
                 </template>
               </el-table-column>
             </NCC-table>
@@ -39,9 +39,9 @@
                   <el-tag :type="scope.row.state == '已填写' ? 'success' : 'warning'">{{ scope.row.state }}</el-tag>
                 </template>
               </el-table-column>
-              <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip>
+              <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip width="200">
                 <template slot-scope="scope">
-                    <el-tag v-if="scope.row.deadline" :type="ncc.timeDeadLine(scope.row.deadline)">{{ ncc.tableDateFormat(scope.row, 'deadline', scope.row.deadline) }}</el-tag>
+                    <el-tag v-if="scope.row.deadline" :type="ncc.timeDeadLine(scope.row.deadline)">{{ncc.stateDeadLine(scope.row.deadline)}}{{ ncc.tableDateFormat(scope.row, 'deadline', scope.row.deadline) }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="操作" fixed="right" width="130">
@@ -78,10 +78,8 @@
               </el-col>
             </el-form>
             <div class="NCC-common-search-box-right">
-              <el-button type="success" icon="el-icon-upload2" size="mini"
-                >导入</el-button
-              >
-              <el-button type="primary" icon="el-icon-download" size="mini" @click="toExport">导出</el-button>
+              <!-- <el-button type="success" icon="el-icon-upload2" size="mini">导入</el-button> -->
+              <!-- <el-button type="primary" icon="el-icon-download" size="mini" @click="toExport">导出</el-button> -->
             </div>
           </el-row>
           <div class="NCC-common-layout-main NCC-flex-main">
@@ -122,33 +120,13 @@
               <el-table-column label="操作" width="250">
                 <!-- 查看，修改，归属地变更，上报 -->
                 <template slot-scope="scope">
-                  <infoForm
-                    class="btn_dialog"
-                    type="edit"
-                    :systemId="scope.row.Id"
-                    @reInit="search"
-                  >
+                  <infoForm class="btn_dialog" type="edit" :systemId="scope.row.Id" @reInit="search">
                     <el-button size="mini" type="text">修改</el-button>
                   </infoForm>
                   <el-button size="mini" type="text" @click="toDetail(scope.row)">查看</el-button>
-                  <el-button
-                    size="mini"
-                    type="text"
-                    @click="toChangeArea(scope.row)"
-                    >归属地变更</el-button
-                  >
-                  <el-button
-                    size="mini"
-                    type="text"
-                    @click="toInspection(scope.row)"
-                    >上报</el-button
-                  >
-                  <!-- <el-button
-                    size="mini"
-                    type="text"
-                    @click="toChangeRecord(scope.row)"
-                    >整改清单</el-button
-                  > -->
+                  <el-button size="mini" type="text" @click="toChangeArea(scope.row)" >归属地变更</el-button>
+                  <el-button size="mini" type="text" @click="toInspection(scope.row)" >上报</el-button>
+                  <!-- <el-button type="text" style="color: red;" @click="delNew(scope.row)">删除</el-button> -->
                 </template>
               </el-table-column>
             </NCC-table>
@@ -413,9 +391,27 @@ export default {
       });
     },
     toExport() {
-      this.ExportBoxVisible = true;
-      this.$nextTick(() => {
-        this.$refs.ExportBox.init(this.columnList);
+      let _query = {
+        ...this.query,
+      };
+      let query = {};
+      for (let key in _query) {
+        if (Array.isArray(_query[key])) {
+          query[key] = _query[key].join();
+        } else {
+          query[key] = _query[key];
+        }
+      }
+      request({
+        url: `/Extend/basesysteminfo/Actions/Export`,
+        method: "POST",
+        data: query,
+      }).then((res) => {
+        const url = process.env.VUE_APP_BASE_API + res.data.url;
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = res.data.name;
+        link.click();
       });
     },
     download(data) {
@@ -431,6 +427,24 @@ export default {
         this.ExportBoxVisible = false;
       });
     },
+
+    delNew(row) {
+      this.$confirm('此操作将永久删除该系统, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        let res = await request({
+          url: `/Extend/basesysteminfo/${row.Id}`,
+          method: "DELETE",
+        });
+        this.$message({
+          message: res.msg,
+          type: 'success'
+        });
+        this.initList();
+      });
+    },
   },
 };
 </script>
@@ -13,7 +13,7 @@
           {{ userInfo.userName }}（{{ userInfo.organizeName }}）
         </div>
         <el-dropdown-menu slot="dropdown" router>
-          <el-dropdown-item>修改信息</el-dropdown-item>
+          <el-dropdown-item command="toUserInfo">修改信息</el-dropdown-item>
           <passwordForm>
             <el-dropdown-item>修改密码</el-dropdown-item>
           </passwordForm>
@@ -21,16 +21,20 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
+    <UserInfoPage ref="UserInfoPage" v-if="visbleUserInfo" @refresh="() => this.visbleUserInfo = false"/>
   </header>
 </template>
 <script>
+import UserInfoPage from './UserInfoPage.vue'
 export default {
   name: "Header",
+  components: {UserInfoPage},
   data() {
     return {
       userInfo: this.$store.state.user.userInfo,
-      avatar: this.$store.state.user.avatar,
+      avatar: process.env.VUE_APP_BASE_API + this.$store.state.user.avatar,
+      visbleUserInfo: false,
     };
   },
   mounted() {},
@@ -39,6 +43,12 @@ export default {
       await this.$store.dispatch("LogOut");
       this.$router.push({ path: "/login" });
     },
+    toUserInfo() {
+      this.visbleUserInfo = true;
+      this.$nextTick(() => {
+        this.$refs.UserInfoPage.init();
+      });
+    },
     handleCommand(command) {
       switch (command) {
         case "logout":
@@ -53,6 +63,9 @@ export default {
             .catch(() => {});
           break;
+        case "toUserInfo":
+          this.toUserInfo();
+          break;
         default:
           break;