Просмотр исходного кода

计划管理的计划任务页面、优化弹窗

ZaiZai 2 лет назад
Родитель
Сommit
be4699b9e9

+ 1 - 1
src/components/upload/FormItemUpload.vue

@@ -6,7 +6,7 @@
     </div>
 
     <!--上传-->
-    <HcDialog :loading="uploadDisabled" :show="importModal" saveText="确认上传" title="上传文件" widths="38rem"
+    <HcDialog bgColor="#ffffff" isToBody :loading="uploadDisabled" :show="importModal" saveText="确认上传" title="上传文件" widths="38rem"
               @close="importModalClose" @save="importModalYesClick">
         <el-upload ref="uploadRef" :accept="accept" :action="api + action" :auto-upload="false"
                    :before-upload="beforeUpload" :data="uploadData" :disabled="uploadDisabled"

+ 15 - 1
src/styles/index.scss

@@ -11,7 +11,6 @@ html, body, #app {
 .el-scrollbar.hc-main-scrollbar .el-scrollbar__bar {
     right: -18px;
 }
-
 .el-scrollbar:not(.hc-main-scrollbar) .el-scrollbar__bar {
     right: 0;
 }
@@ -154,3 +153,18 @@ html, body, #app {
         }
     }
 }
+
+.hac-diy-dialog-body {
+    position: relative;
+    height: 100%;
+    .hac-dialog-header {
+        position: relative;
+        display: flex;
+        align-items: center;
+        margin-bottom: 20px;
+    }
+    .hac-dialog-table {
+        position: relative;
+        height: calc(100% - 50px);
+    }
+}

+ 1 - 1
src/views/home/task-details.vue

@@ -69,7 +69,7 @@
             </el-button>
         </template>
 
-        <HcDialog isToBody :loading="groundsLoading" :show="groundsModal" title="请填写驳回理由" widths="600px" @close="closeGroundsClick" @save="saveGroundsClick">
+        <HcDialog bgColor="#ffffff" isToBody :loading="groundsLoading" :show="groundsModal" title="请填写驳回理由" widths="600px" @close="closeGroundsClick" @save="saveGroundsClick">
             <el-form ref="formGroundsRef" :model="formGroundsModel" :rules="formGroundsRules" label-width="0" size="large">
                 <el-form-item prop="grounds">
                     <el-input v-model="formGroundsModel.grounds" :autosize="{ minRows: 6, maxRows: 10 }" placeholder="请输入驳回理由" type="textarea"/>

+ 250 - 0
src/views/program/components/TaskTable.vue

@@ -0,0 +1,250 @@
+<template>
+    <HcCard>
+        <template #header>
+            <div class="w-36">
+                <el-select v-model="searchForm.department" block clearable placeholder="选择部门" size="large">
+                    <el-option label="研发部门" value="1"/>
+                    <el-option label="业务部门" value="2"/>
+                    <el-option label="人事部门" value="3"/>
+                </el-select>
+            </div>
+            <div class="w-36 ml-2">
+                <el-select v-model="searchForm.state" block clearable placeholder="选择计划状态" size="large">
+                    <el-option label="未完成" value="1"/>
+                    <el-option label="已完成" value="2"/>
+                    <el-option label="逾期完成" value="3"/>
+                    <el-option label="逾期未完成" value="4"/>
+                </el-select>
+            </div>
+            <div class="w-36 ml-4">
+                <el-date-picker class="block" v-model="searchForm.startTime" type="month" value-format="YYYY-MM" placeholder="开始日期" clearable size="large"/>
+            </div>
+            <div class="mx-2">~</div>
+            <div class="w-36">
+                <el-date-picker class="block" v-model="searchForm.endTime" type="month" value-format="YYYY-MM" placeholder="结束日期" clearable size="large"/>
+            </div>
+            <div class="ml-4">
+                <el-button size="large" type="primary" @click="searchClick">
+                    <HcIcon name="search-2"/>
+                    <span>搜索</span>
+                </el-button>
+            </div>
+            <div class="ml-2">
+                <el-button size="large" @click="resetClick">
+                    <HcIcon name="close-circle"/>
+                    <span>重置</span>
+                </el-button>
+            </div>
+        </template>
+        <template #extra>
+            <el-button size="large" type="success" hc-btn @click="relevanceClick">
+                <HcIcon name="link" :line="false"/>
+                <span>关联任务</span>
+            </el-button>
+            <el-button size="large" type="primary" hc-btn>
+                <HcIcon name="edit-circle"/>
+                <span>变更状态</span>
+            </el-button>
+        </template>
+        <HcTable :column="tableColumn" :isCheck="isTableKey !== 'all'" :datas="tableData" :loading="tableLoading" @selection-change="tableSelectionChange"/>
+        <template #action>
+            <HcPages :pages="searchForm" @change="pageChange"/>
+        </template>
+
+        <!--关联任务-->
+        <HcDialog bgColor="#ffffff" isToBody isTable isRowFooter :loading="relatedLoading" :show="relatedModal" title="关联任务" widths="62rem">
+            <div class="hac-diy-dialog-body">
+                <div class="hac-dialog-header">
+                    <div class="w-36">
+                        <el-select v-model="searchBudgetForm.department" block clearable placeholder="选择部门" size="large">
+                            <el-option label="研发部门" value="1"/>
+                            <el-option label="业务部门" value="2"/>
+                            <el-option label="人事部门" value="3"/>
+                        </el-select>
+                    </div>
+                    <div class="w-36 ml-2">
+                        <el-select v-model="searchBudgetForm.state" block clearable placeholder="选择计划状态" size="large">
+                            <el-option label="未完成" value="1"/>
+                            <el-option label="已完成" value="2"/>
+                            <el-option label="逾期完成" value="3"/>
+                            <el-option label="逾期未完成" value="4"/>
+                        </el-select>
+                    </div>
+                    <div class="w-36 ml-2">
+                        <el-select v-model="searchBudgetForm.user" block clearable placeholder="选择任务人" size="large">
+                            <el-option label="张三" value="1"/>
+                            <el-option label="李四" value="2"/>
+                        </el-select>
+                    </div>
+                    <div class="ml-4">
+                        <el-button size="large" type="primary">
+                            <HcIcon name="search-2"/>
+                            <span>搜索</span>
+                        </el-button>
+                    </div>
+                    <div class="ml-2">
+                        <el-button size="large">
+                            <HcIcon name="close-circle"/>
+                            <span>重置</span>
+                        </el-button>
+                    </div>
+                </div>
+                <div class="hac-dialog-table">
+                    <HcTable :column="tableBudgetColumn" :datas="tableBudgetData" :loading="tableBudgetLoading">
+                        <template #action="{row,index}">
+                            <el-button plain size="small" type="primary" @click="row.isRelated = true" v-if="!row.isRelated">
+                                <HcIcon name="link" :line="false"/>
+                                <span>关联</span>
+                            </el-button>
+                            <el-button plain size="small" type="danger" @click="row.isRelated = false" v-else>
+                                <HcIcon name="link-unlink-m" :line="false"/>
+                                <span>取消</span>
+                            </el-button>
+                        </template>
+                    </HcTable>
+                </div>
+            </div>
+            <template #leftRowFooter>
+                <el-button size="large" @click="closeRelatedClick">
+                    <HcIcon name="close"/>
+                    <span>取消</span>
+                </el-button>
+                <el-button size="large" type="primary" @click="saveRelatedClick">
+                    <HcIcon name="check"/>
+                    <span>确认关联</span>
+                </el-button>
+            </template>
+            <template #rightRowFooter>
+                <HcPages :pages="searchBudgetForm" @change="pageBudgetChange"/>
+            </template>
+        </HcDialog>
+    </HcCard>
+</template>
+
+<script setup>
+import {ref, nextTick, watch} from "vue";
+import {useRouter} from 'vue-router'
+import {getArrValue} from "js-fast-way"
+
+const router = useRouter()
+
+//参数
+const props = defineProps({
+    tableKey: {
+        type: String,
+        default: ''
+    }
+})
+
+//变量
+const isTableKey = ref(props.tableKey);
+
+//监听
+watch(() => [
+    props.tableKey,
+], ([Key]) => {
+    isTableKey.value = Key
+})
+
+//搜索表单
+const searchForm = ref({
+    department: null, state: null, startTime: null, endTime: null,
+    current: 1, size: 20, total: 0
+})
+
+//搜索
+const searchClick = () => {
+    searchForm.value.current = 1;
+    console.log(searchForm.value)
+    getTableData()
+}
+
+//重置
+const resetClick = () => {
+    searchForm.value = {
+        department: null, state: null, startTime: null, endTime: null,
+        current: 1, size: 20, total: 0
+    }
+}
+
+//分页被点击
+const pageChange = ({current, size}) => {
+    searchForm.value.current = current
+    searchForm.value.size = size
+    getTableData()
+}
+
+//获取数据
+const tableLoading = ref(false)
+const tableColumn = ref([
+    {key: 'name', name: '计划名称'},
+    {key: 'key', name: '状态', width: '120', align: 'center'},
+    {key: 'key1', name: '任务描述'},
+    {key: 'key2', name: '完成指标'},
+    {key: 'key3', name: '完成期限', width: '160', align: 'center'},
+    {key: 'key4', name: '任务人', width: '120', align: 'center'},
+])
+const tableData = ref([
+    {id: 1, name: '【任务描述】申请【任务转移】', key: '未完成', key1: 'xxxxxxxxxx', key2: 'xxxxxxxx', key3: '2022-02-01', key4: '张三'},
+    {id: 2, name: '【任务描述】申请【任务转移】', key: '未完成', key1: 'xxxxxxxxxx', key2: 'xxxxxxxx', key3: '2022-02-01', key4: '张三'},
+    {id: 3, name: '【任务描述】申请【任务转移】', key: '未完成', key1: 'xxxxxxxxxx', key2: 'xxxxxxxx', key3: '2022-02-01', key4: '张三'},
+])
+const getTableData = () => {
+    //const key = isTableKey.value
+}
+
+//表格选择
+const tableRows = ref([])
+const tableSelectionChange = (rows) => {
+    tableRows.value = rows
+}
+
+//关联任务弹窗
+const relatedLoading = ref(false)
+const relatedModal = ref(false)
+
+//关联任务
+const relevanceClick = () => {
+    relatedLoading.value = false
+    relatedModal.value = true
+}
+
+//关联任务分页和搜索
+const searchBudgetForm = ref({current: 1, size: 20, total: 0})
+const pageBudgetChange = ({current, size}) => {
+    searchBudgetForm.value.current = current
+    searchBudgetForm.value.size = size
+}
+
+//关联任务表格
+const tableBudgetLoading = ref(false)
+const tableBudgetColumn = [
+    {key: 'key', name: '任务描述'},
+    {key: 'key1', name: '任务人', width: '120', align: 'center'},
+    {key: 'key2', name: '任务起止日期', width: '220', align: 'center'},
+    {key: 'key3', name: '状态', width: '120', align: 'center'},
+    {key: 'action', name: '操作', width: '90', align: 'center'},
+]
+const tableBudgetData = ref([
+    {id: 1, key: 'xxxxxxxxx', key1: '张三', key2: '2022-07-01~2027-04-12', key3: '未完成'},
+    {id: 2, key: 'xxxxxxxxx', key1: '张三', key2: '2022-07-01~2027-04-12', key3: '未完成'},
+    {id: 3, key: 'xxxxxxxxx', key1: '张三', key2: '2022-07-01~2027-04-12', key3: '未完成'},
+    {id: 4, key: 'xxxxxxxxx', key1: '张三', key2: '2022-07-01~2027-04-12', key3: '未完成'},
+])
+
+//关闭关联任务弹窗
+const closeRelatedClick = () => {
+    relatedLoading.value = false
+    relatedModal.value = false
+}
+
+//提交关联任务弹窗
+const saveRelatedClick = () => {
+    relatedLoading.value = false
+    relatedModal.value = false
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 1 - 1
src/views/program/edit-info.vue

@@ -129,7 +129,7 @@
         </template>
 
         <!--关联预算-->
-        <HcDialog isToBody isTable isRowFooter :loading="relatedLoading" :show="relatedModal" title="关联项目成本预算" widths="62rem">
+        <HcDialog bgColor="#ffffff" isToBody isTable isRowFooter :loading="relatedLoading" :show="relatedModal" title="关联项目成本预算" widths="62rem">
             <HcTable :isIndex="false" :column="tableBudgetColumn" :datas="tableBudgetData" :loading="tableBudgetLoading">
                 <template #action="{row,index}">
                     <el-button plain size="small" type="primary" @click="row.isRelated = true" v-if="!row.isRelated">

+ 33 - 4
src/views/program/task.vue

@@ -1,10 +1,39 @@
 <template>
-    <HcCard>
-        等待开发
-    </HcCard>
+    <HcTabsSimple :cur="tabsKey" :datas="tabsData" @tabClick="tabsClick">
+        <template #tab-user>
+            <TaskTable :tableKey="tabsKey"/>
+        </template>
+        <template #tab-links>
+            <TaskTable :tableKey="tabsKey"/>
+        </template>
+        <template #tab-all>
+            <TaskTable :tableKey="tabsKey"/>
+        </template>
+    </HcTabsSimple>
 </template>
 
 <script setup>
-import {ref} from "vue";
+import {ref, watch} from "vue";
+import TaskTable from "./components/TaskTable.vue";
+
+//选项卡
+const tabsKey = ref('user')
+const tabsData = ref([
+    {icon: 'user', label: '我的计划任务', key: 'user'},
+    {icon: 'links', label: '我关联的计划任务', key: 'links'},
+    {icon: 'todo', label: '查看全部计划任务', key: 'all'},
+])
+
+const tabsClick = (key) => {
+    tabsKey.value = key
+}
 
 </script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 2 - 2
src/views/project/reimburse.vue

@@ -51,7 +51,7 @@
         </template>
 
         <!--报销记录-->
-        <HcDialog isToBody :loading="recordLoading" :show="recordModal" title="报销记录" widths="500px" @close="closeRecordClick" @save="saveRecordClick">
+        <HcDialog bgColor="#ffffff" isToBody :loading="recordLoading" :show="recordModal" title="报销记录" widths="500px" @close="closeRecordClick" @save="saveRecordClick">
             <el-form ref="formRecordRef" :model="formRecordModel" :rules="formRecordRules" label-width="auto" size="large">
                 <el-form-item label="报销类型" prop="key1">
                     <el-select v-model="formRecordModel.key1" block clearable placeholder="报销类型" size="large">
@@ -78,7 +78,7 @@
         </HcDialog>
 
         <!--关联预算-->
-        <HcDialog isToBody isTable isRowFooter :loading="relatedLoading" :show="relatedModal" title="关联预算" widths="62rem">
+        <HcDialog bgColor="#ffffff" isToBody isTable isRowFooter :loading="relatedLoading" :show="relatedModal" title="关联预算" widths="62rem">
             <HcTable :isIndex="false" :column="tableBudgetColumn" :datas="tableBudgetData" :loading="tableBudgetLoading">
                 <template #action="{row,index}">
                     <el-button plain size="small" type="primary" @click="row.isRelated = true" v-if="!row.isRelated">

+ 8 - 8
src/views/system/menu.vue

@@ -36,7 +36,7 @@
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange"></HcPages>
             </template>
-            <HcDialog :show="addModal" :title="modalTitle+'菜单'" @close="addModalClose"  widths="80rem">
+            <HcDialog bgColor="#ffffff" isToBody :show="addModal" :title="modalTitle+'菜单'" @close="addModalClose"  widths="80rem">
                 <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="left"
                              size="large">
                         <el-row :gutter="20">
@@ -68,7 +68,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="上级菜单">
-                                   
+
                                         <el-select v-model="formModel.top" class="m-2" placeholder="请选择" size="large" style="width:100%">
                                             <el-option
                                             v-for="item in topMenuoptions"
@@ -77,8 +77,8 @@
                                             :value="item.value"
                                             />
                                         </el-select>
-                                    
-                                  
+
+
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -99,7 +99,7 @@
                         </el-row>
                  </el-form>
 
-          
+
             <template #footer>
                 <div class="dialog-footer">
                     <el-button size="large" @click="addModal = false">
@@ -115,7 +115,7 @@
         </HcDialog>
          </HcCard>
 
-       
+
 
 
 </template>
@@ -146,7 +146,7 @@ const tableColumn = [
     {key: 'text', name: '排序'},
     {key: 'text', name: '上级菜单'},
     {key: 'action', name: '操作', width: 200}
-   
+
 ]
 const tableData = ref([
     {name: '名称1', text: '文本1', color: 'red'},
@@ -204,4 +204,4 @@ const topMenuoptions=ref([])
 
 <style lang="scss">
 
-</style>
+</style>

+ 16 - 16
src/views/system/organization.vue

@@ -4,12 +4,12 @@
                 <el-button type="primary" @click="editClick"  size="large" v-if="!isShowIcon&&!isedit">
                             <span>编辑组织机构</span>
                  </el-button>
-              
+
                  <el-button type="primary" @click="goback"  size="large" v-if="!isShowIcon&&isedit">
                             <span>返回上一级</span>
                  </el-button>
             </template>
-         
+
             <div class="content-box" v-if="isShowIcon">
                 <HcIcon name="add-box" class="add_icon" @click="addClick"/>
             </div>
@@ -62,14 +62,14 @@
                                 <HcIcon name="vip-crown-2" @click="authorityClick" style="margin-left: 8px;color: purple;"/>
                             </span>
                         </span>
-                  
+
                     </template>
                     </el-tree>
                 </el-scrollbar>
         </div>
             </div>
-          
-            <HcDialog :show="testModal" title="新增机构信息" @close="testModalClose" widths="80rem">
+
+            <HcDialog bgColor="#ffffff" isToBody :show="testModal" title="新增机构信息" @close="testModalClose" widths="80rem">
                 <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="left"
                              size="large">
                         <el-row :gutter="20">
@@ -102,11 +102,11 @@
                                     <el-input v-model="formModel.deptId"  placeholder=""/>
                                 </el-form-item>
                             </el-col>
-                      
+
                         </el-row>
                  </el-form>
             </HcDialog>
-            <HcDialog :show="authorityModal" title="权限配置" @close="authorityModalClose" widths="80rem">
+            <HcDialog bgColor="#ffffff" isToBody :show="authorityModal" title="权限配置" @close="authorityModalClose" widths="80rem">
                 <el-tree
                 :props="props"
                 :load="loadNode"
@@ -116,7 +116,7 @@
             />
             </HcDialog>
         </HcCard>
-    
+
 </template>
 
 <script setup>
@@ -283,10 +283,10 @@ const loadNode = (node, resolve) => {
     console.log(node, command);
   }
   const onNodeClick=(e, data)=>{
-   
+
   }
   const expandChange=()=>{
-    
+
   }
 </script>
 
@@ -341,10 +341,10 @@ const loadNode = (node, resolve) => {
         &.is-leaf {
             color: transparent;
             font-size: 0;
-           
-           
-           
-           
+
+
+
+
         }
     }
     :deep(.el-tree__empty-block) {
@@ -370,14 +370,14 @@ const loadNode = (node, resolve) => {
 .add_icon{
     font-size: 8rem;
     cursor: pointer;
-    
+
 }
 .h-100p{height: 100%;}
 // 树样式
 .tree-box .el-tree-node{
     font-size: 18px;
 }
-.tree-box .el-tree-node .data-custom-tree-node .level-name{  
+.tree-box .el-tree-node .data-custom-tree-node .level-name{
     font-size: 24px;
 }
 

+ 23 - 23
src/views/system/parameter.vue

@@ -7,11 +7,11 @@
                         <div :style="'width:' + leftWidth + 'px;'" class="hc-layout-left-box menu">
                             <div class="hc-menu-header-box">
                                 <div class="text-xl name">预算分类</div>
-                             
+
                                     <el-button _icon hc-btn size="small" type="primary" >
                                         <HcIcon name="add" @click="openpriceEdit(1)"/>
                                     </el-button>
-                                
+
                             </div>
                             <div class="hc-menu-contents-box">
                                 <el-scrollbar>
@@ -21,7 +21,7 @@
                             </div>
                             <!--左右拖动-->
                             <div class="horizontal-drag-line" @mousedown="onmousedown"/>
-                            <HcDialog :show="priceModal" :title="priceTitle" @close="priceModalClose">
+                            <HcDialog bgColor="#ffffff" isToBody :show="priceModal" :title="priceTitle" @close="priceModalClose">
                                 <el-form
                                                 label-position="left"
                                                 label-width="100px"
@@ -54,8 +54,8 @@
                                             <el-button size="small" type="primary" @click="delTask">删除</el-button>
                                         </template>
                                     </HcTable>
-                               
-                                    <HcDialog :show="editTaskModal" :title="taskTitle" @close="testModalClose">
+
+                                    <HcDialog bgColor="#ffffff" isToBody :show="editTaskModal" :title="taskTitle" @close="testModalClose">
                                         <el-form
                                                 label-position="left"
                                                 label-width="100px"
@@ -73,7 +73,7 @@
                                                 </el-form-item>
                                     </el-form>
                                     </HcDialog>
-                            
+
                             </HcCard>
                         </div>
                     </div>
@@ -82,7 +82,7 @@
             <template #tab-tasktype>
                 <HcCard  actionSize="lg" scrollbar>
                                 <template #header>
-                               
+
                                     <div class="ml-3">
                                             任务分类:<HcTooltip keys="tentative_device_approach_menu_add">
                                     <el-button _icon hc-btn size="small" type="primary" @click="openTypeEdit(1)">
@@ -91,7 +91,7 @@
                                 </HcTooltip>
                                     </div>
                                 </template>
-                               
+
                                     <HcTable :column="tasktableColumn" :datas="tasktableData">
                                         <template #action="{row, index}">
                                             <el-button size="small" type="primary" @click="openTypeEdit(2)">编辑</el-button>
@@ -101,7 +101,7 @@
                                     <template #action>
                                         <HcPages :pages="searchForm" @change="pageChange"></HcPages>
                                     </template>
-                                    <HcDialog :show="tasktypeModal" :title="taskTypeTitle" @close="taskTypeModalClose">
+                                    <HcDialog bgColor="#ffffff" isToBody :show="tasktypeModal" :title="taskTypeTitle" @close="taskTypeModalClose">
                                         <el-form
                                                 label-position="left"
                                                 label-width="100px"
@@ -111,7 +111,7 @@
                                                 <el-form-item label="任务类型名称">
                                                 <el-input v-model="formtaskType.name" />
                                                 </el-form-item>
-                                               
+
                                                 <el-form-item label="完成指标">
                                                     <el-select v-model="formtaskType.type" class="m-2" placeholder="请选择" >
                                                         <el-option
@@ -124,7 +124,7 @@
                                                 </el-form-item>
                                     </el-form>
                                     </HcDialog>
-                            
+
                 </HcCard>
             </template>
             <template #tab-indicator>
@@ -133,7 +133,7 @@
             <template #tab-price>
                 <HcCard  actionSize="lg" scrollbar>
                                 <template #header>
-                               
+
                                     <div class="ml-3">
                                             岗位单价:<HcTooltip keys="tentative_device_approach_menu_add">
                                     <el-button _icon hc-btn size="small" type="primary" @click="positionEdit(1)">
@@ -142,7 +142,7 @@
                                 </HcTooltip>
                                     </div>
                                 </template>
-                               
+
                                     <HcTable :column="positiontableColumn" :datas="positiontableData">
                                         <template #action="{row, index}">
                                             <el-button size="small" type="primary" @click="positionEdit(2)">编辑</el-button>
@@ -152,7 +152,7 @@
                                     <template #action>
                                         <HcPages :pages="searchForm" @change="pageChange"></HcPages>
                                     </template>
-                                    <HcDialog :show="positonModal" :title="positonModalTitle" @close="positonModalClose">
+                                    <HcDialog bgColor="#ffffff" isToBody :show="positonModal" :title="positonModalTitle" @close="positonModalClose">
                                         <el-form
                                                 label-position="left"
                                                 label-width="100px"
@@ -162,14 +162,14 @@
                                                 <el-form-item label="岗位类型名称">
                                                 <el-input v-model="formposition.name" />
                                                 </el-form-item>
-                                               
+
                                                 <el-form-item label="日单价">
                                                     <el-input v-model="formposition.price" />
                                                 </el-form-item>
                                     </el-form>
                                     </HcDialog>
 
-                                  
+
                 </HcCard>
             </template>
         </HcTabsSimple>
@@ -182,9 +182,9 @@ import {useAppStore} from "~src/store";
 
 //渲染完成
 onMounted(() => {
-  
+
     setContextMenu()
-   
+
 })
 //类型处理
 const tabsKey = ref('pricetype')
@@ -280,7 +280,7 @@ const setContextMenu = () => {
     let newArr = [];
         newArr.push({icon: 'draft', label: '编辑分类', key: "edit"})
         newArr.push({icon: 'delete-bin', label: '删除分类', key: "del"})
-   
+
     contextMenu.value = newArr
 }
 
@@ -315,7 +315,7 @@ const openpriceEdit=(type)=>{
     }else{
         priceTitle.value='编辑分类'
     }
- 
+
     priceModal.value=true
 }
 const delTask=()=>{
@@ -368,7 +368,7 @@ const openEdit=(type)=>{
     }else{
         taskTitle.value='编辑任务明细'
     }
- 
+
     editTaskModal.value=true
 }
 
@@ -428,9 +428,9 @@ const positionEdit=(type)=>{
     display: flex;
     position: relative;
     height: calc(100vh - 228px);
-   
+
     .hc-layout-left-box {
-     
+
         width: 382px;
         position: relative;
         background: #f1f5f8;

+ 7 - 7
src/views/system/user.vue

@@ -41,14 +41,14 @@
                 <HcPages :pages="searchForm" @change="pageChange"></HcPages>
             </template>
         </HcCard>
-        <HcDialog :show="addModal" :title="modalTitle" @close="addModalClose"  widths="80rem">
+        <HcDialog bgColor="#ffffff" isToBody :show="addModal" :title="modalTitle" @close="addModalClose"  widths="80rem">
             <HcCard title="基础信息">
                  <el-form ref="formUserRef" :model="formUserModel" :rules="formUserRules" label-position="left"
                              size="large" >
                         <el-form-item label="登录账号" prop="account">
                             <el-input v-model="formUserModel.account"  placeholder="" autocomplete="new-password" />
                         </el-form-item>
-                 
+
                         <el-form-item label="密码" prop="newPassword"  >
                             <el-input v-model="formUserModel.newPassword" placeholder="请输入新的密码"  autocomplete="new-password"
                                       show-password type="password"/>
@@ -66,7 +66,7 @@
                             <el-input v-model="formUserModel.real_name" />
                         </el-form-item>
                         <el-form-item prop="phone" label="手机号码">
-                            <el-input v-model="formUserModel.phone" 
+                            <el-input v-model="formUserModel.phone"
                                         placeholder="请输入绑定手机"/>
                         </el-form-item>
                         <el-form-item label="身份证号">
@@ -81,7 +81,7 @@
                                 :value="item.value"
                                 />
                             </el-select>
-                            
+
                             <el-select v-model="value" class="m-2" placeholder="选择岗位" size="large">
                                 <el-option
                                 v-for="item in options"
@@ -154,7 +154,7 @@ const searchClick=()=>{
 
 }
 const keyUpEvent=()=>{
-    
+
 }
 const tableColumn = [
     {key: 'name', name: '用户名称'},
@@ -242,12 +242,12 @@ const formUserRules = {
         },
         trigger: "blur"
     },
-    
+
 }
 const stateoptions=ref([
     {label: '启用', value: '1'},
     {label: '停用', value: '2'},
-   
+
 ])
 const cancelClick=()=>{
     window?.$messageBox?.alert('您确定要注销[xxx] 的账户信息吗? 一旦注销数据将彻底清除,请谨慎操作?', '注销提醒', {