相关修改

manager/src/views/system/user/index.vue

@@ -2,444 +2,174 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col
-        :span="4"
-        :xs="24"
-      >
+      <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
+            style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            node-key="id"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+            @node-click="handleNodeClick" />
         </div>
       </el-col>
       <!--用户数据-->
-      <el-col
-        :span="20"
-        :xs="24"
-      >
-        <el-form
-          :model="queryParams"
-          ref="queryForm"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-        >
-          <el-form-item
-            label="用户名称"
-            prop="userName"
-          >
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
-          <el-form-item
-            label="手机号码"
-            prop="phonenumber"
-          >
-            <el-input
-              v-model="queryParams.phonenumber"
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
-          <el-form-item
-            label="状态"
-            prop="status"
-          >
-            <el-select
-              v-model="queryParams.status"
-              placeholder="用户状态"
-              clearable
-              style="width: 240px"
-            >
-              <el-option
-                v-for="dict in dict.type.sys_normal_disable"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="dateRange"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
+            <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleQuery"
-            >搜索</el-button>
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery"
-            >重置</el-button>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
 
-        <el-row
-          :gutter="10"
-          class="mb8"
-        >
+        <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:user:add']"
-            >新增</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+              v-hasPermi="['system:user:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-refresh"
-              size="mini"
-              @click="handleSync"
-              v-hasPermi="['system:user:add']"
-            >同步</el-button>
+            <el-button type="primary" plain icon="el-icon-refresh" size="mini" @click="handleSync"
+              v-hasPermi="['system:user:add']">同步</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-            >修改</el-button>
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+              v-hasPermi="['system:user:edit']">修改</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-            >删除</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+              v-hasPermi="['system:user:remove']">删除</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >导入</el-button>
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+              v-hasPermi="['system:user:import']">导入</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['system:user:export']"
-            >导出</el-button>
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['system:user:export']">导出</el-button>
           </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
-        <el-table
-          v-loading="loading"
-          :data="userList"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            type="selection"
-            width="50"
-            align="center"
-          />
-          <el-table-column
-            label="用户编号"
-            align="center"
-            key="userId"
-            prop="userId"
-            v-if="columns[0].visible"
-          />
-          <el-table-column
-            label="用户名称"
-            align="center"
-            key="userName"
-            prop="userName"
-            v-if="columns[1].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="用户昵称"
-            align="center"
-            key="nickName"
-            prop="nickName"
-            v-if="columns[2].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="部门"
-            align="center"
-            key="deptName"
-            prop="dept.deptName"
-            v-if="columns[3].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="手机号码"
-            align="center"
-            key="phonenumber"
-            prop="phonenumber"
-            v-if="columns[4].visible"
-            width="120"
-          />
-          <el-table-column
-            label="状态"
-            align="center"
-            key="status"
-            v-if="columns[5].visible"
-          >
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
+            width="120" />
+          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
+              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                @change="handleStatusChange(scope.row)"></el-switch>
             </template>
           </el-table-column>
-          <el-table-column
-            label="创建时间"
-            align="center"
-            prop="createTime"
-            v-if="columns[6].visible"
-            width="160"
-          >
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            width="160"
-            class-name="small-padding fixed-width"
-          >
-            <template
-              slot-scope="scope"
-              v-if="scope.row.userId !== 1"
-            >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
-              >修改</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-              >删除</el-button>
-              <el-dropdown
-                size="mini"
-                @command="(command) => handleCommand(command, scope.row)"
-                v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
-              >
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-d-arrow-right"
-                >更多</el-button>
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['system:user:remove']">删除</el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item
-                    command="handleResetPwd"
-                    icon="el-icon-key"
-                    v-hasPermi="['system:user:resetPwd']"
-                  >重置密码</el-dropdown-item>
-                  <el-dropdown-item
-                    command="handleAuthRole"
-                    icon="el-icon-circle-check"
-                    v-hasPermi="['system:user:edit']"
-                  >分配角色</el-dropdown-item>
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="600px"
-      append-to-body
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              label="用户昵称"
-              prop="nickName"
-            >
-              <el-input
-                v-model="form.nickName"
-                placeholder="请输入用户昵称"
-                maxlength="30"
-              />
+            <el-form-item label="用户昵称" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              label="归属部门"
-              prop="deptId"
-            >
-              <treeselect
-                v-model="form.deptId"
-                :options="deptOptions"
-                :show-count="true"
-                placeholder="请选择归属部门"
-              />
+            <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              label="手机号码"
-              prop="phonenumber"
-            >
-              <el-input
-                v-model="form.phonenumber"
-                placeholder="请输入手机号码"
-                maxlength="11"
-              />
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              label="邮箱"
-              prop="email"
-            >
-              <el-input
-                v-model="form.email"
-                placeholder="请输入邮箱"
-                maxlength="50"
-              />
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              v-if="form.userId == undefined"
-              label="用户名称"
-              prop="userName"
-            >
-              <el-input
-                v-model="form.userName"
-                placeholder="请输入用户名称"
-                maxlength="30"
-              />
+            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              v-if="form.userId == undefined"
-              label="用户密码"
-              prop="password"
-            >
-              <el-input
-                v-model="form.password"
-                placeholder="请输入用户密码"
-                type="password"
-                maxlength="20"
-                show-password
-              />
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户性别">
-              <el-select
-                v-model="form.sex"
-                placeholder="请选择性别"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_user_sex"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+              <el-select v-model="form.sex" placeholder="请选择性别">
+                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{ dict.label }}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+                  dict.label
+                }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -447,35 +177,17 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="岗位">
-              <el-select
-                v-model="form.postIds"
-                multiple
-                placeholder="请选择岗位"
-              >
-                <el-option
-                  v-for="item in postOptions"
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == 1"
-                ></el-option>
+              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
+                  :disabled="item.status == 1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
-              <el-select
-                v-model="form.roleIds"
-                multiple
-                placeholder="请选择角色"
-              >
-                <el-option
-                  v-for="item in roleOptions"
-                  :key="item.roleId"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :disabled="item.status == 1"
-                ></el-option>
+            <el-form-item label="角色" prop="roleIds">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
+                  :disabled="item.status == 1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -507,76 +219,36 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input
-                v-model="form.remark"
-                type="textarea"
-                placeholder="请输入内容"
-              ></el-input>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div
-        slot="footer"
-        class="dialog-footer"
-      >
-        <el-button
-          type="primary"
-          @click="submitForm"
-        >确 定</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog
-      :title="upload.title"
-      :visible.sync="upload.open"
-      width="400px"
-      append-to-body
-    >
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div
-          class="el-upload__tip text-center"
-          slot="tip"
-        >
-          <div
-            class="el-upload__tip"
-            slot="tip"
-          >
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
             <el-checkbox v-model="upload.updateSupport" />
             是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link
-            type="primary"
-            :underline="false"
-            style="font-size: 12px; vertical-align: baseline"
-            @click="importTemplate"
-          >下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
-      <div
-        slot="footer"
-        class="dialog-footer"
-      >
-        <el-button
-          type="primary"
-          @click="submitFileForm"
-        >确 定</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
@@ -688,6 +360,11 @@ export default {
             message: "用户名称长度必须介于 2 和 20 之间",
             trigger: "blur",
           },
+        ], roleIds: [
+          { required: true, message: "用户角色不能为空", trigger: "blur" },
+        ],
+        deptId: [
+          { required: true, message: "用户部门不能为空", trigger: "blur" },
         ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" },
@@ -910,7 +587,7 @@ export default {
             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 分配角色操作 */
     handleAuthRole: function (row) {
@@ -949,7 +626,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -985,8 +662,8 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
-          "</div>",
+        response.msg +
+        "</div>",
         "导入结果",
         { dangerouslyUseHTMLString: true }
       );

website/src/components/ghcgscygl/ghcgsb/ztgh/ghcgDialog.vue

@@ -99,6 +99,9 @@ export default {
     instid: {
       type: String,
     },
+    plantype: {
+      type: String,
+    },
   },
   setup(prop, context) {
     const parent = { ...context };
@@ -256,6 +259,9 @@ export default {
       ghcgDialog.formData.lxr = store.getters.user.nickName;
       ghcgDialog.formData.lxdh = store.getters.user.phonenumber;
       ghcgDialog.formData.instid = prop.instid || "";
+      if (prop.plantype) {
+        ghcgDialog.formData.plantype = prop.plantype + "";
+      }
     });
     return { ...toRefs(ghcgDialog) };
   },

website/src/components/ghcgscygl/ghcgsb/ztgh/sbjdDialog.vue

@@ -55,6 +55,9 @@
                     <span v-if="activity.operatetype === '未上报'">
                       上传人：{{ activity.operateuser }}
                     </span>
+                    <span v-if="activity.operatetype === '通过'">
+                      审批人：{{ activity.operateuser }}
+                    </span>
                     <span v-if="activity.operatetype === '已上报'">
                       上报人：{{ activity.operateuser }}
                     </span>

website/src/views/ghcgscygl/cgsb/Cgsb.vue

@@ -18,7 +18,7 @@
         <Czgh />
       </el-tab-pane>
       <el-tab-pane label="专项规划" name="third">
-        <Zxgh />
+        <Qxjghcg :plantype="5"/>
       </el-tab-pane>
     </el-tabs>
   </div>

website/src/views/ghcgscygl/ghcgsb/xxgh/Czgh/Qxyh.vue

@@ -4,34 +4,18 @@
       <div class="header-left">
         <el-form :inline="true" :model="formInline">
           <el-form-item label="成果包名称:">
-            <el-input
-              v-model="formInline.fileName"
-              type="text"
-            ></el-input>
+            <el-input v-model="formInline.fileName" type="text"></el-input>
           </el-form-item>
           <el-form-item label="行政区:" style="width: 280px">
-            <el-cascader
-              :options="xzoptions"
-              :props="{
-                ...props,
-                checkStrictly: true,
-                expandTrigger: 'hover',
-              }"
-              v-model="formInline.xzqCode"
-              clearable
-              ref="cascader"
-              class="cascader-style"
-              popper-class="popper-cascader"
-              :filterable="true"
-              :show-all-levels="false"
-            ></el-cascader>
+            <el-cascader :options="xzoptions" :props="{
+              ...props,
+              checkStrictly: true,
+              expandTrigger: 'hover',
+            }" v-model="formInline.xzqCode" clearable ref="cascader" class="cascader-style"
+              popper-class="popper-cascader" :filterable="true" :show-all-levels="false"></el-cascader>
           </el-form-item>
-          <el-form-item label="上报状态:">
-            <el-select
-              v-model="formInline.status"
-              placeholder="全部"
-              clearable
-            >
+          <el-form-item label="流程状态:">
+            <el-select v-model="formInline.status" placeholder="全部" clearable>
               <el-option label="" value="">全部</el-option>
               <el-option label="待审" value="10"></el-option>
               <el-option label="未上报" value="11"></el-option>
@@ -39,15 +23,11 @@
               <!-- <el-option label="退回" value="14"></el-option> -->
             </el-select>
           </el-form-item>
-          <el-button type="primary" @click="onSearch" style="margin-left: 20px"
-            >查询</el-button
-          >
+          <el-button type="primary" @click="onSearch" style="margin-left: 20px">查询</el-button>
         </el-form>
       </div>
       <div class="margin-right-20">
-        <el-button type="primary" @click="ghcgscDialog = true"
-          >上传村庄规划成果包</el-button
-        >
+        <el-button type="primary" @click="ghcgscDialog = true">上传村庄规划成果包</el-button>
         <!-- <el-button
           type="primary"
           @click="pushPlus()"
@@ -58,33 +38,12 @@
     </div>
     <div class="table-layout flex-box column height-100-60">
       <div class="table max-width height-100-50">
-        <el-table
-          ref="multipleTable"
-          :data="tableData"
-          style="width: 100%"
-          border
-          fit
-          cell-class-name="cell-item"
-          height="100%"
-          tooltip-effect="dark"
-          @selection-change="handleSelectionChange"
-        >
+        <el-table ref="multipleTable" :data="tableData" style="width: 100%" border fit cell-class-name="cell-item"
+          height="100%" tooltip-effect="dark" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column
-            prop="fileName"
-            label="成果包名称"
-            width="400"
-            align="center"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="fileName" label="成果包名称" width="400" align="center" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="village"
-            label="村庄名称"
-            width="240"
-            align="center"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="village" label="村庄名称" width="240" align="center" show-overflow-tooltip>
           </el-table-column>
           <!-- <el-table-column
             prop="county"
@@ -100,115 +59,69 @@
             align="center"
           >
           </el-table-column> -->
-          <el-table-column
-            prop="uploadStatus"
-            label="上传状态"
-            align="center"
-            width="140"
-            style="position: relative"
-          >
+          <el-table-column prop="uploadStatus" label="上传状态" align="center" width="140" style="position: relative">
             <template #default="scope">
               <span>
                 {{ uploadStatus1(scope.row.uploadStatus) }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column
-            width="200"
-            prop="uploadTime"
-            label="上报时间"
-            align="center"
-            show-overflow-tooltip
-          >
+          <el-table-column width="200" prop="uploadTime" label="上传时间" align="center" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="status"
-            label="上报状态"
-            align="center"
-            width="120"
-            style="position: relative"
-          >
+          <el-table-column prop="status" label="流程状态" align="center" width="120" style="position: relative">
             <template #default="scope">
               <span>
                 {{ uploadStatus(scope.row.status) }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            type="flex"
-            justity="space-between"
-            width="max-width"
-          >
+          <el-table-column label="操作" align="center" type="flex" justity="space-between" width="max-width">
             <template #default="scope">
               <div class="max-width">
                 <slot name="xq" :item="scope.row">
-                  <el-button
-                    type="text"
-                    class="caozuo"
-                    @click="detail(scope.row)"
-                    >详情</el-button
-                  >
+                  <el-button type="text" class="caozuo" @click="detail(scope.row)">详情</el-button>
                   <!-- :disabled="
                       uploadStatus1(scope.row.uploadStatus) !== '上传成功'
                     " -->
                 </slot>
                 <slot name="startjqsc" :item="scope.row">
-                    <el-button type="text" class="caozuo" v-if="scope.row.status == '10' && !scope.row.msg"
-                      @click="startscmodel(scope.row)">发起审查</el-button>
-                  </slot>
+                  <el-button type="text" class="caozuo" v-if="scope.row.status == '10' && !scope.row.msg"
+                    @click="startscmodel(scope.row)">发起审查</el-button>
+                </slot>
                 <slot name="bj">
-                  <el-button
-                    type="text"
-                    class="caozuo"
-                    @click="edit(scope.row)"
-                    :disabled="
-                      !(
-                        uploadStatus(scope.row.status) === '未上报' 
-                      )
-                    "
-                    >编辑</el-button
-                  >
+                  <el-button type="text" class="caozuo" @click="edit(scope.row)" :disabled="!(
+                      uploadStatus(scope.row.status) === '未上报'
+                    )
+                    ">编辑</el-button>
                 </slot>
                 <slot name="sbzzzq">
-                  <el-button
-                    type="text"
-                    class="caozuo"
-                    @click="showDialog(scope.row, 1, scope.$index)"
-                    v-if="
-                      (
-                        uploadStatus1(scope.row.uploadStatus) === '上传成功' &&
-                        uploadStatus(scope.row.status) === '未上报'
-                      )
-                    "
-                    >上报至市
+                  <el-button type="text" class="caozuo" @click="showDialog(scope.row, 1, scope.$index)" v-if="
+                    (
+                      uploadStatus1(scope.row.uploadStatus) === '上传成功' &&
+                      uploadStatus(scope.row.status) === '未上报'
+                    )
+                  ">上报至市
                   </el-button>
                 </slot>
                 <slot name="xz">
-                  <el-button
-                    type="text"
-                    class="caozuo"
-                    @click="downLoadCgFile(scope.$index)"
-                    >下载</el-button
-                  >
+                  <el-button type="text" class="caozuo" @click="downLoadCgFile(scope.$index)">下载</el-button>
                   <!-- :disabled="
                       uploadStatus1(scope.row.uploadStatus) !== '上传成功'
                     " -->
                 </slot>
-                <slot name="sc">
-                  <el-button
-                    type="text"
-                    class="caozuo"
-                    @click="showDialog(scope.row, 2, scope.$index)"
-                    :disabled="
-                      !(
-                        uploadStatus1(scope.row.uploadStatus) === '上报失败' ||
-                        uploadStatus(scope.row.status) === '未上报'
-                      )
-                    "
-                    >删除</el-button
-                  >
+                <slot name="sc" v-if="
+                  $store.getters.roles.indexOf('admin') < 0
+                ">
+                  <el-button type="text" class="caozuo" @click="showDialog(scope.row, 2, scope.$index)" :disabled="!(
+                      uploadStatus1(scope.row.uploadStatus) === '上报失败' ||
+                      uploadStatus(scope.row.status) === '未上报'
+                    )
+                    ">删除</el-button>
+                </slot>
+                <slot name="delete" v-if="
+                  $store.getters.roles.indexOf('admin') > -1
+                ">
+                  <el-button type="text" class="caozuo" @click="showDialog(scope.row, 2, scope.$index)">删除</el-button>
                 </slot>
                 <!-- <slot name="sc">
                   <el-button
@@ -225,35 +138,18 @@
         </el-table>
       </div>
       <div class="flex-box footer height-50 flex-box align-center box-sizing">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="formInline.page"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="formInline.limit"
-          background
-          :pager-count="5"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="formInline.total"
-        >
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+          :current-page="formInline.page" :page-sizes="[10, 20, 50, 100]" :page-size="formInline.limit" background
+          :pager-count="5" layout="total, sizes, prev, pager, next, jumper" :total="formInline.total">
         </el-pagination>
       </div>
     </div>
-    <el-dialog
-      v-model="editDialogVisible"
-      :title="dialogTitle"
-      width="30%"
-      :before-close="handleClose"
-      :align-center="true"
-      style="white-space: initial"
-    >
+    <el-dialog v-model="editDialogVisible" :title="dialogTitle" width="30%" :before-close="handleClose"
+      :align-center="true" style="white-space: initial">
       <span>{{ dialogMessage1 + name + dialogMessage2 }}</span>
       <template #footer>
         <span class="dialog-footer">
-          <el-button
-            @click="editDialogVisible = false"
-            style="margin-right: 20px"
-          >
+          <el-button @click="editDialogVisible = false" style="margin-right: 20px">
             取消
           </el-button>
           <el-button type="primary" @click="editQsStatus()"> 确定 </el-button>
@@ -283,23 +179,11 @@
         > -->
       </div>
     </el-dialog>
-    <XqDialog
-      v-model:ckxqDialog="ckxqDialog"
-      v-model:cgDetail="activeCg"
-    ></XqDialog>
-    <CzghcgDialog
-      v-if="ghcgscDialog"
-      v-model:ghcgscDialog="ghcgscDialog"
-      @refresh="changeForm"
-      @getlist="getlist"
-    ></CzghcgDialog>
-    <CzghbjDialog
-      v-if="ghcgbjDialog"
-      v-model:ghcgbjDialog="ghcgbjDialog"
-      @refresh="changeForm"
-      @getlist="getlist"
-      v-model:cgb="activeCgb"
-    ></CzghbjDialog>
+    <XqDialog v-model:ckxqDialog="ckxqDialog" v-model:cgDetail="activeCg"></XqDialog>
+    <CzghcgDialog v-if="ghcgscDialog" v-model:ghcgscDialog="ghcgscDialog" @refresh="changeForm" @getlist="getlist">
+    </CzghcgDialog>
+    <CzghbjDialog v-if="ghcgbjDialog" v-model:ghcgbjDialog="ghcgbjDialog" @refresh="changeForm" @getlist="getlist"
+      v-model:cgb="activeCgb"></CzghbjDialog>
   </div>
 </template>
 
@@ -419,7 +303,13 @@ export default {
               qxyh.getlist();
               ElMessage.success("成功上报至市");
             } else {
-              ElMessage.error(res.message);
+              // ElMessage.error(res.message);
+              this.$message({
+                type: "error",
+                message: res.message,
+                showClose: true,
+                duration: 0,
+              });
             }
           });
           // 删除
@@ -473,7 +363,7 @@ export default {
       },
       // 上报状态
       uploadStatus(status) {
-        let arr = ["待审","未上报", "已上报"];
+        let arr = ["待审", "未上报", "已上报"];
         return arr[status - 10];
       },
       // 上传状态
@@ -615,16 +505,20 @@ export default {
     flex-wrap: nowrap;
     height: 60px;
   }
+
   .header-left {
     margin-left: 20px;
   }
+
   :deep(.el-form-item) {
     margin-bottom: 0;
   }
+
   .footer {
     width: 100%;
     padding: 10px;
   }
+
   :deep(.height-100-60) {
     height: 81.3vh;
     /* height: calc(100% - 60px); */
@@ -639,10 +533,12 @@ export default {
     height: inherit;
   }
 }
+
 .search-btn {
   position: absolute;
   right: -40px;
 }
+
 .margin-item {
   margin-bottom: 20px !important;
 }

website/src/views/ghcgscygl/ghcgsb/xxgh/Xxgh/Qxyh.vue

@@ -358,7 +358,12 @@ export default {
               qxyh.getlist();
               ElMessage.success("成功上报至市");
             }else{
-              ElMessage.error(res.message);         
+              this.$message({
+                type: "error",
+                message: res.message,
+                showClose: true,
+                duration: 0,
+              });      
             }
           });
           // 删除

website/src/views/ghcgscygl/ghcgsb/xxgh/Xxgh/Zxgh.vue

@@ -68,22 +68,22 @@
         >
           <el-table-column type="selection" width="40"></el-table-column>
           <el-table-column
-            prop="xmName"
+            prop="fileName"
             label="项目名称"
             width="270"
             align="center"
           >
           </el-table-column>
           <el-table-column
-            prop="ghType"
-            label="规划类型"
+            prop="xzqName"
+            label="行政区名称"
             width="170"
             align="center"
           >
           </el-table-column>
           <el-table-column
-            prop="ghjb"
-            label="规划级别"
+            prop="xzqCode"
+            label="行政区代码"
             align="center"
             width="230"
             style="position: relative"
@@ -382,7 +382,12 @@ export default {
               qxyh.getlist();
               ElMessage.success("成功上报至市");
             } else {
-              ElMessage.error(res.message);
+              this.$message({
+                type: "error",
+                message: res.message,
+                showClose: true,
+                duration: 0,
+              });
             }
           });
           // 删除
@@ -505,10 +510,10 @@ export default {
       },
       // 获取列表数据
       getlist() {
-        // Getlist(qxyh.formInline).then((res) => {
-        //   qxyh.tableData = res.data;
-        //   qxyh.formInline.total = res.recordstotal;
-        // });
+        Getlist(qxyh.formInline).then((res) => {
+          qxyh.tableData = res.data;
+          qxyh.formInline.total = res.recordstotal;
+        });
       },
     });
     onMounted(() => {

website/src/views/ghcgscygl/ghcgsb/ztgh/Qxjghcg/Qxyh.vue

@@ -33,7 +33,7 @@
           <el-button type="primary" @click="changeForm" style="margin-left: 20px">查询</el-button>
         </el-form>
       </div>
-      <div class="margin-right-20" v-if="$store.getters.roles.indexOf('shiji') === -1">
+      <div class="margin-right-20">
         <el-button type="primary" @click="ghcgscDialog = true">规划成果上传</el-button>
       </div>
     </div>
@@ -51,17 +51,17 @@
           </el-table-column>
           <el-table-column prop="xzqmc" label="行政区" align="center">
           </el-table-column>
-          <el-table-column v-if="$store.getters.roles.indexOf('shiji') === -1" prop="fileupload" label="上传状态"
+          <!-- <el-table-column prop="fileupload" label="上传状态"
             align="center">
             <template #default="scope">
-              <el-tag v-if="
+              <el-tag type="success" v-if="
                 scope.row.fileupload === '0' || scope.row.fileupload === '9'
-              ">正在上传</el-tag>
+              ">上传成功</el-tag>
               <el-tag v-if="scope.row.fileupload === '1'" type="success">上传成功</el-tag>
               <el-tag @click="errorLogOpen(scope.row)" v-if="scope.row.fileupload === '2'" type="danger">上传失败</el-tag>
             </template>
-          </el-table-column>
-          <el-table-column prop="uploadtime" label="上报时间" align="center">
+          </el-table-column> -->
+          <el-table-column prop="uploadtime" label="上传时间" align="center">
           </el-table-column>
           <el-table-column prop="uploadstatus" label="上报状态" align="center">
             <template #default="scope">
@@ -118,15 +118,12 @@
                     $store.getters.roles.indexOf('common') > -1 ||
                     $store.getters.roles.indexOf('manager')
                   " type="text" class="caozuo" @click="retractCg(scope.row)" :disabled="!(
-                        uploadStatus(scope.row.uploadstatus) === '已上报' &&
-                        scope.row.sczt === '4'
-                      )
-                      ">撤回</el-button>
+                    uploadStatus(scope.row.uploadstatus) === '已上报' &&
+                    scope.row.sczt === '4'
+                  )
+                    ">撤回</el-button>
                 </slot>
-                <slot name="sbjd" v-if="
-                  $store.getters.roles.indexOf('common') > -1 ||
-                  $store.getters.roles.indexOf('manager') > -1
-                ">
+                <slot name="sbjd">
                   <el-button type="text" class="caozuo" @click="progressCg(scope.row)">上报进度</el-button>
                 </slot>
                 <slot name="xz">
@@ -138,11 +135,16 @@
                   $store.getters.roles.indexOf('manager') > -1
                 ">
                   <el-button type="text" class="caozuo" @click="showDialog(scope.row, 2)" :disabled="(
-                      scope.row.fileid &&
-                      scope.row.sczt === '2' || scope.row.sczt === '1'
-                    )
+                    scope.row.fileid &&
+                    scope.row.sczt === '2' || scope.row.sczt === '1'
+                  )
                     ">删除</el-button>
                 </slot>
+                <slot name="delete" v-if="
+                  $store.getters.roles.indexOf('admin') > -1
+                ">
+                  <el-button type="text" class="caozuo" @click="showDialog(scope.row, 2)">删除</el-button>
+                </slot>
               </div>
             </template>
           </el-table-column>
@@ -196,7 +198,8 @@
         > -->
       </div>
     </el-dialog>
-    <GhcgDialog v-if="ghcgscDialog" v-model:ghcgscDialog="ghcgscDialog" :isCity="false" @refresh="changeForm">
+    <GhcgDialog v-if="ghcgscDialog" v-model:ghcgscDialog="ghcgscDialog" :isCity="false" :plantype="formInline.plantype"
+      @refresh="changeForm">
     </GhcgDialog>
     <ScjgDialog v-model:thyyDialog="thyyDialog" v-model:cgDetail="activeCg" :isCity="false"></ScjgDialog>
     <XqDialog v-model:ckxqDialog="ckxqDialog" v-model:cgDetail="activeCg"></XqDialog>
@@ -377,7 +380,12 @@ export default {
               qxyh.getlist();
               ElMessage.success("成功上报至市");
             } else {
-              ElMessage.error(res.message);
+              this.$message({
+                type: "error",
+                message: res.message,
+                showClose: true,
+                duration: 0,
+              });
             }
           });
           qxyh.editDialogVisible = false;
@@ -499,7 +507,7 @@ export default {
       },
       // 获取列表数据
       getlist() {
-        if(prop.plantype){
+        if (prop.plantype) {
           qxyh.formInline.plantype = prop.plantype
         }
         cgInfoList({ ...qxyh.formInline }).then((res) => {

website/src/views/ghcgscygl/xzpgcgsb/Qxxzpgcg/Qxyh.vue

@@ -452,7 +452,12 @@ export default {
               qxyh.getlist();
               ElMessage.success("成功上报至市");
             } else {
-              ElMessage.error(res.message);
+              this.$message({
+                type: "error",
+                message: res.message,
+                showClose: true,
+                duration: 0,
+              });
             }
           });
           // 删除

website/src/views/ghcgscygl/xzpgcgsb/Syxzpgcg.vue

@@ -450,7 +450,12 @@ export default {
               qxyh.getlist();
               ElMessage.success("成功上报至自治区");
             } else {
-              ElMessage.error(res.message);
+              this.$message({
+                type: "error",
+                message: res.message,
+                showClose: true,
+                duration: 0,
+              });
             }
           });
           // 删除