ZF/xm-ui-web
1
0
Fork 0
mirror of https://gitee.com/maimengcloud/xm-ui-web.git synced 2025-12-30 10:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
陈裕财
2024-06-12 11:34:07 +08:00
parent e94443a553
commit c9c9fa699c
11 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -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",

12
src/views/xm/core/xmTask/XmTaskAgileKanban.vue
View File

@@ -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,

14
src/views/xm/core/xmTask/XmTaskAgileKanbanUser.vue
View File

@@ -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;

4
src/views/xm/core/xmTask/XmTaskAgileKanbanWeek.vue
View File

@@ -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;

24
src/views/xm/core/xmTask/XmTaskEdit.vue
View File

@@ -174,7 +174,7 @@
</el-col>
<el-col :span="8" v-if="editForm.ntype=='0'">
<mdp-select-user show-style="x" size="medium" v-if="editForm.crowd=='1'" label="执行人" v-model="editForm.executorUserid">
<el-button #oper @click="activateTabPaneName='42'">去管理竞标人</el-button>
<template #oper><el-button @click="activateTabPaneName='42'">去管理竞标人</el-button></template>
</mdp-select-user>
<mdp-select-user show-style="x" size="medium" v-if="editForm.crowd!='1'" label="执行人" v-model="editForm.executorUserid" @change2="editXmTaskSomeFields(editForm,'executorUserid',$event)"/>
</el-col>
@@ -294,15 +294,15 @@
</el-tab-pane>
<el-tab-pane label="预算金额" name="6">
<el-form-item label="自研工时单价" prop="uniInnerPrice">
<el-input type="number" style="width:150px;" v-model="editForm.uniInnerPrice" :precision="2" :step="10" :min="0" placeholder="自研工时单价" @change="editXmTaskSomeFields(editForm,'uniInnerPrice',$event)"></el-input > 元/h
<el-input type="number" style="width:150px;" v-model="editForm.uniInnerPrice" :precision="2" :step="10" :min="0" placeholder="自研工时单价" @change="editXmTaskSomeFields(editForm,'uniInnerPrice',$event)"/> 元/h
</el-form-item>
<el-form-item label="外包、众包单价" prop="uniOutPrice">
<el-input type="number" style="width:150px;" v-model="editForm.uniOutPrice" :precision="2" :step="10" :min="0" placeholder="外发工时单价" @change="editXmTaskSomeFields(editForm,'uniOutPrice',$event)"></el-input > 元/h
<el-input type="number" style="width:150px;" v-model="editForm.uniOutPrice" :precision="2" :step="10" :min="0" placeholder="外发工时单价" @change="editXmTaskSomeFields(editForm,'uniOutPrice',$event)"/> 元/h
</el-form-item>
<el-form-item label="预估金额" prop="budgetAt">
<el-input type="number" style="width:150px;" v-model="editForm.budgetAt" :precision="2" :step="100" :min="0" placeholder="预算金额" @change="editXmTaskSomeFields(editForm,'budgetAt',$event)"></el-input > 元
<el-input type="number" style="width:150px;" v-model="editForm.budgetAt" :precision="2" :step="100" :min="0" placeholder="预算金额" @change="editXmTaskSomeFields(editForm,'budgetAt',$event)"/> 元
</el-form-item>
</el-tab-pane>
@@ -437,7 +437,7 @@
</el-col>
<el-col :span="18">
<el-form-item label="分享佣金" prop="shareFee" v-if="editForm.oshare==='1' && editForm.taskOut==='1'">
<el-input type="number" style="width:100px;" v-model="editForm.shareFee" :precision="2" :step="2" :min="0" placeholder="分享赚佣金" @change="editXmTaskSomeFields(editForm,'shareFee',$event)"></el-input > 元
<el-input type="number" style="width:100px;" v-model="editForm.shareFee" :precision="2" :step="2" :min="0" placeholder="分享赚佣金" @change="editXmTaskSomeFields(editForm,'shareFee',$event)"/> 元
<font color="blue">一般建议为任务佣金的1%-5%</font>
</el-form-item>
</el-col>
@@ -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() {

2
src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
View File

@@ -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';

2
src/views/xm/core/xmWorkload/WorkloadSetDayListMy.vue
View File

@@ -6,7 +6,7 @@
<script>
import {mapGetters} from "vuex";
import WorkloadSetDayList from "./WorkloadSetDayList";
import WorkloadSetDayList from './WorkloadSetDayList.vue';
export default {
computed: {

2
src/views/xm/core/xmWorkload/WorkloadSetMonthListMy.vue
View File

@@ -6,7 +6,7 @@
<script>
import {mapGetters} from "vuex";
import WorkloadSetMonthList from "./WorkloadSetMonthList";
import WorkloadSetMonthList from './WorkloadSetMonthList.vue';
export default {
computed: {

2
src/views/xm/core/xmWorkload/XmWorkloadInfo.vue
View File

@@ -212,7 +212,7 @@
import { mapState } from 'pinia'
import { useUserStore } from '@/store/modules/user'
import XmProjectSelect from '../components/XmProjectSelect.vue';
import XmTaskSbillSelect from "./XmTaskSbillSelect";
import XmTaskSbillSelect from './XmTaskSbillSelect.vue';
import {editWorkloadToSbill} from "@/api/xm/core/xmWorkload";
import {editXmWorkloadSomeFields} from "../../../../api/xm/core/xmWorkload";

2
src/views/xm/core/xmWorkload/XmWorkloadMng.vue
View File

@@ -246,7 +246,7 @@
import { mapState } from 'pinia'
import { useUserStore } from '@/store/modules/user'
import XmProjectSelect from '../components/XmProjectSelect.vue';
import XmTaskSbillSelect from "./XmTaskSbillSelect";
import XmTaskSbillSelect from './XmTaskSbillSelect.vue';
import {editWorkloadToSbill} from "@/api/xm/core/xmWorkload";
import {editXmWorkloadSomeFields} from "../../../../api/xm/core/xmWorkload";

2
src/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate.vue
View File

@@ -84,7 +84,7 @@
import { mapState } from 'pinia'
import { useUserStore } from '@/store/modules/user'
import XmTaskSbillSelect from "./XmTaskSbillSelect";
import XmTaskSbillSelect from './XmTaskSbillSelect.vue';
export default {
name:'xmWorkloadSimpleListForBizDate',