上报进度相关界面优化

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

@@ -2,10 +2,7 @@
   <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"
@@ -31,10 +28,7 @@
         </div>
       </el-col>
       <!--用户数据-->
-      <el-col
-        :span="20"
-        :xs="24"
-      >
+      <el-col :span="20" :xs="24">
         <el-form
           :model="queryParams"
           ref="queryForm"
@@ -43,10 +37,7 @@
           v-show="showSearch"
           label-width="68px"
         >
-          <el-form-item
-            label="用户名称"
-            prop="userName"
-          >
+          <el-form-item label="用户名称" prop="userName">
             <el-input
               v-model="queryParams.userName"
               placeholder="请输入用户名称"
@@ -55,10 +46,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item
-            label="手机号码"
-            prop="phonenumber"
-          >
+          <el-form-item label="手机号码" prop="phonenumber">
             <el-input
               v-model="queryParams.phonenumber"
               placeholder="请输入手机号码"
@@ -67,10 +55,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item
-            label="状态"
-            prop="status"
-          >
+          <el-form-item label="状态" prop="status">
             <el-select
               v-model="queryParams.status"
               placeholder="用户状态"
@@ -102,19 +87,15 @@
               icon="el-icon-search"
               size="mini"
               @click="handleQuery"
-            >搜索</el-button>
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery"
-            >重置</el-button>
+              >搜索</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"
@@ -123,7 +104,8 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
-            >新增</el-button>
+              >新增</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -134,7 +116,8 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['system:user:edit']"
-            >修改</el-button>
+              >修改</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -145,7 +128,8 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
-            >删除</el-button>
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -155,7 +139,8 @@
               size="mini"
               @click="handleImport"
               v-hasPermi="['system:user:import']"
-            >导入</el-button>
+              >导入</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -165,7 +150,8 @@
               size="mini"
               @click="handleExport"
               v-hasPermi="['system:user:export']"
-            >导出</el-button>
+              >导出</el-button
+            >
           </el-col>
           <right-toolbar
             :showSearch.sync="showSearch"
@@ -179,11 +165,7 @@
           :data="userList"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column
-            type="selection"
-            width="50"
-            align="center"
-          />
+          <el-table-column type="selection" width="50" align="center" />
           <el-table-column
             label="用户编号"
             align="center"
@@ -255,45 +237,44 @@
             width="160"
             class-name="small-padding fixed-width"
           >
-            <template
-              slot-scope="scope"
-              v-if="scope.row.userId !== 1"
-            >
+            <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
+              >
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
-              >删除</el-button>
+                >删除</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-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
+                  >
                   <el-dropdown-item
                     command="handleAuthRole"
                     icon="el-icon-circle-check"
                     v-hasPermi="['system:user:edit']"
-                  >分配角色</el-dropdown-item>
+                    >分配角色</el-dropdown-item
+                  >
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -311,24 +292,11 @@
     </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-form-item label="用户昵称" prop="nickName">
               <el-input
                 v-model="form.nickName"
                 placeholder="请输入用户昵称"
@@ -337,10 +305,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              label="归属部门"
-              prop="deptId"
-            >
+            <el-form-item label="归属部门" prop="deptId">
               <treeselect
                 v-model="form.deptId"
                 :options="deptOptions"
@@ -352,10 +317,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              label="手机号码"
-              prop="phonenumber"
-            >
+            <el-form-item label="手机号码" prop="phonenumber">
               <el-input
                 v-model="form.phonenumber"
                 placeholder="请输入手机号码"
@@ -364,10 +326,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              label="邮箱"
-              prop="email"
-            >
+            <el-form-item label="邮箱" prop="email">
               <el-input
                 v-model="form.email"
                 placeholder="请输入邮箱"
@@ -409,10 +368,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户性别">
-              <el-select
-                v-model="form.sex"
-                placeholder="请选择性别"
-              >
+              <el-select v-model="form.sex" placeholder="请选择性别">
                 <el-option
                   v-for="dict in dict.type.sys_user_sex"
                   :key="dict.value"
@@ -429,7 +385,8 @@
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                >{{ dict.label }}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -453,7 +410,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" prop="roleIds">
               <el-select
                 v-model="form.roleIds"
                 multiple
@@ -506,14 +463,8 @@
           </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>
@@ -539,14 +490,8 @@
       >
         <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>
@@ -556,17 +501,12 @@
             :underline="false"
             style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate"
-          >下载模板</el-link>
+            >下载模板</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>
@@ -678,6 +618,12 @@ export default {
             trigger: "blur",
           },
         ],
+        roleIds: [
+          { required: true, message: "用户角色不能为空", trigger: "blur" },
+        ],
+        deptId: [
+          { required: true, message: "用户部门不能为空", trigger: "blur" },
+        ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" },
         ],

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>
@@ -120,7 +123,7 @@ export default {
         if (count) {
           sbjdDialog.getStatus(props.cgDetail.id);
         }
-      }
+      },
     );
     return { ...toRefs(sbjdDialog) };
   },
@@ -167,4 +170,4 @@ p {
   margin: 0;
   padding: 0;
 }
-</style>
+</style>

website/src/views/ghcgscygl/common.vue

@@ -28,15 +28,13 @@
             ></el-form-item>
             <el-form-item label="规划类型">
               <el-select v-model="formInline.ghlx" placeholder="请选择规划类型">
-                <el-option label="评估成果" value="1"></el-option>
-                <el-option label="规划成果" value="2"></el-option>
-                <el-option label="总体规划" value="3"></el-option>
-                <el-option label="村庄规划" value="9"></el-option>
-                <el-option label="详细规划" value="4"></el-option>
-                <el-option label="专项规划" value="5"></el-option>
-                <el-option label="报批项目" value="6"></el-option>
-                <el-option label="苏木乡镇规划" value="7"></el-option>
-                <el-option label="城市更新" value="8"></el-option>
+                <el-option
+                  v-for="item in plantypeoptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -264,6 +262,48 @@ export default {
         limit: 20,
         total: 0,
       },
+      plantypeoptions: [
+        {
+          label: "评估成果",
+          value: "1",
+        },
+        {
+          label: "规划成果",
+          value: "2",
+        },
+        {
+          label: "总体规划",
+          value: "3",
+        },
+        {
+          label: "详细规划",
+          value: "4",
+        },
+        {
+          label: "专项规划",
+          value: "5",
+        },
+        {
+          label: "报批项目",
+          value: "6",
+        },
+        {
+          label: "苏木乡镇规划",
+          value: "7",
+        },
+        {
+          label: "城市更新",
+          value: "8",
+        },
+        {
+          label: "村庄规划",
+          value: "9",
+        },
+        {
+          label: "xxx",
+          value: "10",
+        },
+      ],
       cascader: ref(null),
       props: {
         multiple: false,

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

@@ -109,6 +109,13 @@
               {{ (formInline.page - 1) * formInline.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
+          <el-table-column prop="plantype" label="规划类型" align="center">
+            <template #default="scope">
+              <span>
+                {{ getPlantype(scope.row.plantype) }}
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column prop="name" label="规划成果名称" align="center">
           </el-table-column>
           <el-table-column prop="year" label="规划成果时间" align="center">
@@ -252,10 +259,7 @@
                     >撤回</el-button
                   >
                 </slot>
-                <slot
-                  name="sbjd"
-                  v-if="$store.getters.roles.indexOf('qixian') > -1"
-                >
+                <slot name="sbjd">
                   <el-button
                     type="text"
                     class="caozuo"
@@ -567,6 +571,13 @@ export default {
       editStatus: "",
       editId: "",
       name: "",
+      getPlantype(plantype) {
+        for (let i = 0; i < qxyh.plantypeoptions.length; i++) {
+          if (qxyh.plantypeoptions[i].value == plantype) {
+            return qxyh.plantypeoptions[i].label;
+          }
+        }
+      },
       // 查看审查结果
       viewSCJG(data) {
         parent.emit("update:showTypeInfo", { type: "scjg", info: data });

website/src/views/ghcgscygl/ghcgsb/ztgh/Sjghcg.vue

@@ -104,6 +104,13 @@
               {{ (formInline.page - 1) * formInline.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
+          <el-table-column prop="plantype" label="规划类型" align="center">
+            <template #default="scope">
+              <span>
+                {{ getPlantype(scope.row.plantype) }}
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column prop="name" label="规划成果名称" align="center">
           </el-table-column>
           <el-table-column prop="year" label="规划成果时间" align="center">
@@ -559,6 +566,13 @@ export default {
       editId: "",
       name: "",
       loading: {},
+      getPlantype(plantype) {
+        for (let i = 0; i < sjghcg.plantypeoptions.length; i++) {
+          if (sjghcg.plantypeoptions[i].value == plantype) {
+            return sjghcg.plantypeoptions[i].label;
+          }
+        }
+      },
       // 查看审查结果
       viewSCJG(data) {
         sjghcg.showTypeInfo = {