2022.4.11章鱼哥

fhKeeper/formulahousekeeper/octopus/src/routes.js

@@ -6,28 +6,17 @@ import Register from './views/Register.vue'
 import NotFound from './views/404.vue'
 import Home from './views/Home.vue'
 
-// new router
-// 今日桌面
-import desktop from './views/desktop'
-import desktopDetail from './views/desktop/detail.vue'
-import unusual from './views/desktop/unusual.vue'
 
-// 工作报告
-import statistics from './views/workReport/statistics.vue'
+
 import daily from './views/workReport/daily.vue'
-import review from './views/workReport/list.vue'
+
 import reviewImport from './views/workReport/list_import.vue'
-import timer from './views/workReport/timer.vue'
-import reviewProfession from './views/workReport/list_profession.vue'
-import reviewDepartment from './views/workReport/list_department.vue'
+
 // 项目管理
 import list from './views/project/list.vue'
-import cost from './views/project/cost.vue'
-import proDetail from './views/project/detail.vue'
-import depDetail from './views/project/detailDep.vue'
-import task from './views/task/list.vue'
+
 import projectInside from  './views/project/projectInside.vue'
-import info from './views/project/info.vue'
+
 import projectGantt from './views/project/project_gantt.vue'
 
 // 团队管理
@@ -35,38 +24,24 @@ import team from './views/team/index.vue'
 
 // 系统设置
 import timetype from './views/settings/timetype.vue';
-import role from './views/role/role';
 
-import finance from './views/project/finance';
+
+
 import Market from './views/market/list';
 import PdfView from './views/pdf/pdfview';
 
-// 费用报销
-import expense from './views/expense/expense';
+
 //客户管理
 import customer from './views/customer/list';
 //专业管理
 import profession from './views/profession/list';
-//企业报表
-import corpReport from './views/corpreport/list';
 
-//审批流程
-import workflow from './views/workflow/report';
 // 权限管理
 // import jurisdiction from './views/jurisdiction/jurisdiction'
 
 //简易工时统计表
 import simpleReport from './views/simplereport/list';
 
-// 任务管理
-import tasks from './views/task/list';
-
-// 请假
-import leave from './views/leave/list';
-import customData from './views/project/custom_data';
-
-// 出差
-import awayOffice from './views/awayOffice/awayOffice';
 
 // 研究中心
 // import research from './views/research/list';
@@ -236,16 +211,16 @@ export const allRouters = [//组织架构
     //     ]
     // },
     //项目管理
-    {
-        path: '/',
-        component: Home,
-        name: '项目管理',
-        iconCls: 'iconfont firerock-iconxiangmu',
-        leaf: true,
-        children: [
-            { path: '/list', component: list, name: '功能维护' },
-        ]
-    },
+    // {
+    //     path: '/',
+    //     component: Home,
+    //     name: '项目管理',
+    //     iconCls: 'iconfont firerock-iconxiangmu',
+    //     leaf: true,
+    //     children: [
+    //         { path: '/list', component: list, name: '功能维护' },
+    //     ]
+    // },
     
     
     // {

fhKeeper/formulahousekeeper/octopus/src/views/Login.vue

@@ -26,7 +26,7 @@
                     <el-link type="primary" style="margin-right:5px;" @click="dialogVisible=true" :underline="false">
                         使用说明
                     </el-link>
-                    <el-link type="primary" v-if="!isCorpWX" @click="jumpTo" :underline="false">企业注册</el-link>
+                    <!-- <el-link type="primary" v-if="!isCorpWX" @click="jumpTo" :underline="false">企业注册</el-link> -->
                 </div>
             </el-form>
         </div>

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -224,10 +224,16 @@
 
             // 增加人数上限
             ConfirmA(){
+                this.listLoading = true;
                 this.http.post('/company/addMembCount', { companyId:this.dialogData.id , addCount:this.addStaffCountMaxNum },
                 res => {
+                    this.listLoading = false;
                     if (res.code == "ok") {
                         this.editDialogA = false
+                        this.$message({
+                            message: "人数上限修改成功",
+                            type: "success"
+                        })
                         this.getList()
                     } else {
                         this.$message({
@@ -237,6 +243,7 @@
                     }
                 },
                 error => {
+                    this.listLoading = false;
                     this.$message({
                         message: error,
                         type: "error"
@@ -247,10 +254,16 @@
 
             // 修改有效期
             ConfirmB(){
+                this.listLoading = true;
                 this.http.post('/company/setExpDate', { companyId:this.dialogData.id , date:this.expirationNewDate },
                 res => {
+                    this.listLoading = false;
                     if (res.code == "ok") {
                         this.editDialogB = false
+                        this.$message({
+                            message: "有效期修改成功",
+                            type: "success"
+                        })
                         this.getList()
                     } else {
                         this.$message({
@@ -260,6 +273,7 @@
                     }
                 },
                 error => {
+                    this.listLoading = false;
                     this.$message({
                         message: error,
                         type: "error"
@@ -270,23 +284,29 @@
 
             // 修改版本
             ConfirmC(){
+                this.listLoading = true;
                 this.http.post('/company/setPackageList',
-                {
-                    id:this.dialogData.id,
-                    packageWorktime: this.dialogData.packageWorktime ? 1 : 0,
-                    packageProject: this.dialogData.packageProject ? 1 : 0,
-                    packageContract: this.dialogData.packageContract ? 1 : 0,
-                    packageOa: this.dialogData.packageOa ? 1 : 0,
-                    packageEtimecard: this.dialogData.packageEtimecard ? 1 : 0,
-                    packageExpense: this.dialogData.packageExpense ? 1 : 0,
-                    packageCustomer: this.dialogData.packageCustomer ? 1 : 0,
-                    packageEngineering: this.dialogData.packageEngineering ? 1 : 0,
-                    packageSimple: this.dialogData.packageSimple ? 1 : 0,
-                    packageFinance: this.dialogData.packageFinance ? 1 : 0
-                },
+                    {
+                        id:this.dialogData.id,
+                        packageWorktime: this.dialogData.packageWorktime ? 1 : 0,
+                        packageProject: this.dialogData.packageProject ? 1 : 0,
+                        packageContract: this.dialogData.packageContract ? 1 : 0,
+                        packageOa: this.dialogData.packageOa ? 1 : 0,
+                        packageEtimecard: this.dialogData.packageEtimecard ? 1 : 0,
+                        packageExpense: this.dialogData.packageExpense ? 1 : 0,
+                        packageCustomer: this.dialogData.packageCustomer ? 1 : 0,
+                        packageEngineering: this.dialogData.packageEngineering ? 1 : 0,
+                        packageSimple: this.dialogData.packageSimple ? 1 : 0,
+                        packageFinance: this.dialogData.packageFinance ? 1 : 0
+                    },
                 res => {
+                    this.listLoading = false;
                     if (res.code == "ok") {
                         this.editDialogC = false
+                        this.$message({
+                            message: "版本修改成功",
+                            type: "success"
+                        })
                         this.getList()
                     } else {
                         this.$message({
@@ -296,6 +316,7 @@
                     }
                 },
                 error => {
+                    this.listLoading = false;
                     this.$message({
                         message: error,
                         type: "error"
@@ -306,10 +327,16 @@
 
             // 设为已签约
             ConfirmD(){
+                this.listLoading = true;
                 this.http.post('/company/setMeal', { companyId:this.dialogData.id },
                 res => {
+                    this.listLoading = false;
                     if (res.code == "ok") {
                         this.editDialogD = false
+                        this.$message({
+                            message: "签约成功",
+                            type: "success"
+                        })
                         this.getList()
                     } else {
                         this.$message({
@@ -319,6 +346,7 @@
                     }
                 },
                 error => {
+                    this.listLoading = false;
                     this.$message({
                         message: error,
                         type: "error"

fhKeeper/formulahousekeeper/octopus/src/views/workReport/list_import.vue

@@ -4,10 +4,11 @@
         <!-- 列表 -->
             
             <el-table :data="list" style="width: 100%" v-loading="listLoading" :height="tableHeight" highlight-current-row>
-                <el-table-column prop="id" label="序号" min-width="80" align="center"> </el-table-column>
-                <el-table-column prop="indate" label="操作时间" min-width="240" align="center"> </el-table-column>
-                <el-table-column prop="operationContent" label="操作内容" min-width="480" align="left" header-align="center"> </el-table-column>
+                <!-- <el-table-column prop="id" label="序号" min-width="80" align="center"> </el-table-column> -->
                 <el-table-column prop="operatorName" label="操作人员" min-width="160" align="center"> </el-table-column>
+                
+                <el-table-column prop="operationContent" label="操作内容" min-width="480" align="left" header-align="center"> </el-table-column>
+                <el-table-column prop="indate" label="操作时间" min-width="240" align="center"> </el-table-column>
             </el-table>
 
         <!--工具条-->