diff --git a/package.json b/package.json index a35204ad..631a3deb 100644 --- a/package.json +++ b/package.json @@ -65,10 +65,11 @@ "qs": "^6.11.2", "steady-xml": "^0.1.0", "url": "^0.11.3", + "v-region": "^3.0.0", "video.js": "^7.21.5", "vue": "3.4.20", "vue-dompurify-html": "^4.1.4", - "vue-i18n": "9.9.1", + "vue-i18n": "9.9.1", "vue-router": "^4.3.0", "vue-types": "^5.1.1", "vue3-tree-org": "^4.2.2", diff --git a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue index 499c618e..9cd8f356 100644 --- a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue +++ b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue @@ -114,7 +114,7 @@ import util from '@/components/mdp-ui/js/util';//全局公共库 import draggable from "vuedraggable"; import { editXmTaskSomeFields, addTask, delXmTask } from "@/api/xm/core/xmTask"; -import XmTaskEdit from "./XmTaskEdit"; //修改界面 +import XmTaskEdit from './XmTaskEdit.vue'; //修改界面 import XmPhaseSelect from "../xmTask/XmPhaseSelect.vue"; import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; @@ -425,7 +425,7 @@ export default { this.taskState[toTaskStateIndex].number = this.taskState[toTaskStateIndex].number + 1; task.taskState = params.taskState; - this.$set(this.xmTasks, taskIndex, task); + //this.$set(this.xmTasks, taskIndex, task); } else { this.$notify({ position: "bottom-left", @@ -475,7 +475,7 @@ export default { }, afterEditSubmit(task) { let taskIndex = this.xmTasks.findIndex((d) => d.id === task.id); - this.$set(this.xmTasks, taskIndex, task); + //this.$set(this.xmTasks, taskIndex, task); }, onEditSomeFields(params) { @@ -483,7 +483,7 @@ export default { let taskIndex = this.xmTasks.findIndex((d) => d.id === id); var task = this.xmTasks[taskIndex] Object.assign(task, params) - this.$set(this.xmTasks, taskIndex, task); + //this.$set(this.xmTasks, taskIndex, task); }, getTaskStateIndex(taskState) { return this.taskState.findIndex((i) => i.status == taskState); @@ -512,7 +512,7 @@ export default { var tips = res.tips; if (tips.isOk) { //this.$emit("submit", res.data); // @submit="afterAddSubmit" - this.xmTasks.push(res.data); + //this.xmTasks.push(res.data); } this.$notify({ position: "bottom-left", @@ -564,7 +564,7 @@ export default { var tips = res.tips; if (tips.isOk) { var index = this.xmTasks.findIndex(k => k.id == row.id) - this.xmTasks.splice(index, 1) + //this.xmTasks.splice(index, 1) } this.$notify({ showClose: true, diff --git a/src/views/xm/core/xmTask/XmTaskAgileKanbanUser.vue b/src/views/xm/core/xmTask/XmTaskAgileKanbanUser.vue index 788564c2..eb978bad 100644 --- a/src/views/xm/core/xmTask/XmTaskAgileKanbanUser.vue +++ b/src/views/xm/core/xmTask/XmTaskAgileKanbanUser.vue @@ -195,7 +195,7 @@ import util from '@/components/mdp-ui/js/util';//全局公共库 import draggable from "vuedraggable"; import { editXmTaskSomeFields, addTask,delXmTask } from "@/api/xm/core/xmTask"; -import XmTaskEdit from "./XmTaskEdit"; //修改界面 +import XmTaskEdit from './XmTaskEdit.vue'; //修改界面 import XmPhaseSelect from "../xmTask/XmPhaseSelect.vue"; import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; @@ -506,7 +506,7 @@ export default { this.taskState[toTaskStateIndex].number = this.taskState[toTaskStateIndex].number + 1; task.taskState = params.taskState; - this.$set(this.xmTasks, taskIndex, task); + //this.$set(this.xmTasks, taskIndex, task); } else { this.$notify({ position: "bottom-left", @@ -556,7 +556,7 @@ export default { }, afterEditSubmit(task) { let taskIndex = this.xmTasks.findIndex((d) => d.id === task.id); - this.$set(this.xmTasks, taskIndex, task); + //this.$set(this.xmTasks, taskIndex, task); }, onEditSomeFields(params){ @@ -564,7 +564,7 @@ export default { let taskIndex = this.xmTasks.findIndex((d) => d.id === id); var task=this.xmTasks[taskIndex] Object.assign(task,params ) - this.$set(this.xmTasks, taskIndex, task); + //this.$set(this.xmTasks, taskIndex, task); }, getTaskStateIndex(taskState) { return this.taskState.findIndex((i) => i.status == taskState); @@ -593,7 +593,7 @@ export default { var tips = res.tips; if (tips.isOk) { //this.$emit("submit", res.data); // @submit="afterAddSubmit" - this.xmTasks.push(res.data); + //this.xmTasks.push(res.data); } this.$notify({ position: "bottom-left", @@ -645,7 +645,7 @@ export default { var tips = res.tips; if (tips.isOk) { var index=this.xmTasks.findIndex(k=>k.id==row.id) - this.xmTasks.splice(index,1) + //this.xmTasks.splice(index,1) } this.$notify({ showClose: true, @@ -678,7 +678,7 @@ export default { width: 100%; } .el-table { - /deep/ .el-table__row { + .el-table__row { background: #f6f6f6; .menu-name { background: #fff !important; diff --git a/src/views/xm/core/xmTask/XmTaskAgileKanbanWeek.vue b/src/views/xm/core/xmTask/XmTaskAgileKanbanWeek.vue index 4a9609f4..a4c22b00 100644 --- a/src/views/xm/core/xmTask/XmTaskAgileKanbanWeek.vue +++ b/src/views/xm/core/xmTask/XmTaskAgileKanbanWeek.vue @@ -190,7 +190,7 @@ import util from '@/components/mdp-ui/js/util';//全局公共库 import draggable from "vuedraggable"; import { editXmTaskSomeFields, addTask,delXmTask } from "@/api/xm/core/xmTask"; -import XmTaskEdit from "./XmTaskEdit"; //修改界面 +import XmTaskEdit from './XmTaskEdit.vue'; //修改界面 import XmPhaseSelect from "../xmTask/XmPhaseSelect.vue"; import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; @@ -688,7 +688,7 @@ export default { width: 100%; } .el-table { - /deep/ .el-table__row { + .el-table__row { background: #f6f6f6; .menu-name { background: #fff !important; diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index ebae1cf7..4f39ccd0 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -174,7 +174,7 @@ - 去管理竞标人 + @@ -294,15 +294,15 @@ - 元/h + 元/h - 元/h + 元/h - 元 + @@ -437,7 +437,7 @@ - 元 + 一般建议为任务佣金的1%-5% @@ -583,9 +583,7 @@ import { useUserStore } from '@/store/modules/user'; import {sn} from '@/components/mdp-ui/js/sequence'; import xmMenuSelect from '../xmMenu/XmMenuSelect.vue'; - import XmTaskList from '../xmTask/XmTaskList.vue'; - import XmExecuserMng from '../xmTaskExecuser/XmTaskExecuserForTask.vue'; - import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail.vue'; + import XmTaskList from '../xmTask/XmTaskList.vue'; import XmRecord from '../xmRecord/XmRecord.vue' import XmSubWorkItem from '@/views/xm/core/xmTaskWorkItem/XmSubWorkItem.vue'; @@ -934,8 +932,7 @@ import { useUserStore } from '@/store/modules/user'; }, editXmTaskSomeFields(row,fieldName,$event){ - - var that=this; + var func=(params)=>{ editXmTaskSomeFields(params).then(res=>{ var tips = res.tips; @@ -1130,10 +1127,9 @@ import { useUserStore } from '@/store/modules/user'; } } },//end method - components: { xmMenuSelect,XmTaskList,XmExecuserMng,XmMenuRichDetail,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit, - XmRecord,xmQuestionMng,XmTaskExecuserForTask,XmPhaseSelect,ToPay,'xm-task-edit':()=>import("./XmTaskDetail"), - 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"),TaskMng,ProcinstMng, - "v-region":RegionGroup , + components: { xmMenuSelect,XmTaskList,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit, + XmRecord,xmQuestionMng,XmTaskExecuserForTask,XmPhaseSelect,ToPay,'xm-task-edit':()=>import("./XmTaskDetail.vue"), + 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord.vue"),TaskMng,ProcinstMng //在下面添加其它组件 'xm-task-edit':XmTaskEdit }, mounted() { diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue index 2289cf4e..9e3e5569 100644 --- a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue +++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue @@ -210,7 +210,7 @@ import { import { addXmTaskSbill, editXmTaskSbill } from "@/api/xm/core/xmTaskSbill"; import { mapState } from 'pinia' import { useUserStore } from '@/store/modules/user' -//import SelectXmProject from "./SelectXmProject"; +//import SelectXmProject from './SelectXmProject.vue'; import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'; import XmTaskSbillDetailMng from '@/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue'; diff --git a/src/views/xm/core/xmWorkload/WorkloadSetDayListMy.vue b/src/views/xm/core/xmWorkload/WorkloadSetDayListMy.vue index ed19b140..46b30b9f 100644 --- a/src/views/xm/core/xmWorkload/WorkloadSetDayListMy.vue +++ b/src/views/xm/core/xmWorkload/WorkloadSetDayListMy.vue @@ -6,7 +6,7 @@