end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
陈裕财 2 years ago
parent
2bd732c3b8
commit
9d65020229
5 changed files with 65 additions and 127 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      src/views/xm/core/xmTask/XmTaskEdit.vue
  2. 48
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
  3. 41
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
  4. 8
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
  5. 18
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue

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

@ -215,16 +215,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="优先级别" prop="level">
<el-select v-model="editForm.level" @change="editXmTaskSomeFields(editForm,'level',$event)">
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
<mdp-select item-code="priority" v-model="editForm.level" @change="editXmTaskSomeFields(editForm,'level',$event)">
</mdp-select>
</el-form-item>
</el-col>
<el-col :span="12" prop="planType">
<el-form-item label="工期类型">
<el-select v-model=" editForm.planType" @change="editXmTaskSomeFields(editForm,'planType',$event)">
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
<mdp-select item-code="planType" v-model=" editForm.planType" @change="editXmTaskSomeFields(editForm,'planType',$event)">
</mdp-select>
</el-form-item>
</el-col>
</el-row>
@ -238,9 +236,8 @@
</el-col>
<el-col :span="12">
<el-form-item :label="editForm.ntype=='0'?'任务类型':'计划类型'" prop="taskType">
<el-select v-model="editForm.taskType" @change="editXmTaskSomeFields(editForm,'taskType',$event)">
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
<mdp-select item-code="taskType" v-model="editForm.taskType" @change="editXmTaskSomeFields(editForm,'taskType',$event)">
</mdp-select>
</el-form-item>
</el-col>
</el-row>
@ -296,9 +293,8 @@
<el-checkbox v-model="editForm.taskClass" true-label="1" false-label="0" @change="editXmTaskSomeFields(editForm,'taskClass',$event)">是否需要结算</el-checkbox>
</el-form-item>
<el-form-item v-if="editForm.taskClass=='1'" label="结算方案" prop="settlSchemel">
<el-select v-model=" editForm.settleSchemel" @change="editXmTaskSomeFields(editForm,'settleSchemel',$event)">
<el-option v-for="i in dicts.xmTaskSettleSchemel" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
<mdp-select item-code="xmTaskSettleSchemel" v-model=" editForm.settleSchemel" @change="editXmTaskSomeFields(editForm,'settleSchemel',$event)">
</mdp-select>
</el-form-item>
</el-tab-pane>
<el-tab-pane label="众包、互联网访问" name="8" v-if="editForm.ntype!='1'">
@ -314,32 +310,28 @@
<el-row>
<el-col :span="12">
<el-form-item label="交易模式" prop="tranMode" v-if="editForm.crowd==='1'">
<el-select v-model="editForm.tranMode" @change="editXmTaskSomeFields(editForm,'tranMode',$event)">
<el-option v-for="(item,index) in dicts['tranMode']" :key="index" :value="item.id" :label="item.name"></el-option>
</el-select>
<mdp-select item-code="tranMode" v-model="editForm.tranMode" @change="editXmTaskSomeFields(editForm,'tranMode',$event)">
</mdp-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最低能力等级" prop="capaLvls" v-if="editForm.crowd==='1'">
<el-select v-model="editForm.capaLvls" @change="editXmTaskSomeFields(editForm,'capaLvls',$event)">
<el-option v-for="(item,index) in dicts['capaLvl']" :key="index" :value="item.id" :label="item.name"></el-option>
</el-select>
<mdp-select item-code="capaLvl" v-model="editForm.capaLvls" @change="editXmTaskSomeFields(editForm,'capaLvls',$event)">
</mdp-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="服务保障" prop="supRequires" v-if="editForm.crowd==='1'">
<el-select v-model="supRequires" @change="editXmTaskSomeFields(editForm,'supRequires',$event)" multiple>
<el-option v-for="(item,index) in dicts['supRequire']" :key="index" :value="item.id" :label="item.name"></el-option>
</el-select>
<mdp-select item-code="supRequire" v-model="supRequires" @change="editXmTaskSomeFields(editForm,'supRequires',$event)" multiple>
</mdp-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最低会员等级" prop="interestLvls" v-if="editForm.crowd==='1'">
<el-select v-model="editForm.interestLvls" @change="editXmTaskSomeFields(editForm,'interestLvls',$event)">
<el-option v-for="(item,index) in dicts['memInterestLvl']" :key="index" :value="item.id" :label="item.name"></el-option>
</el-select>
<mdp-select item-code="memInterestLvl" v-model="editForm.interestLvls" @change="editXmTaskSomeFields(editForm,'interestLvls',$event)">
</mdp-select>
</el-form-item>
</el-col>
@ -347,9 +339,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="地区限制" prop="regionType" v-if="editForm.crowd==='1'">
<el-select v-model="editForm.regionType" @change="editXmTaskSomeFields(editForm,'regionType',$event)" >
<el-option v-for="(item,index) in dicts['regionType']" :key="index" :value="item.id" :label="item.name"></el-option>
</el-select>
<mdp-select item-code="regionType" v-model="editForm.regionType" @change="editXmTaskSomeFields(editForm,'regionType',$event)" >
</mdp-select>
</el-form-item>
</el-col>
<el-col :span="12">
@ -366,7 +357,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="托管资金" prop="estate" v-if="editForm.taskOut==='1'">
<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'estate',editForm.estate)" :key="index" :type="item.className">{{item.name}}</el-tag>
<mdp-select item-code="estate" v-model="editForm.estate" show-style="tag" :disabled="true"/>
<span v-if="editForm.efunds>0 && (editForm.estate=='2'||editForm.estate=='3')">{{editForm.efunds}}元</span>
</el-form-item>
</el-col>
@ -418,7 +409,7 @@
<el-col :span="6">
<el-form-item label="分享赚" prop="oshare" v-if="editForm.taskOut==='1'">
<el-checkbox v-model="editForm.oshare" v-if="editForm.oshare!='2'" true-label="1" false-label="0" id="oshare" @change="editXmTaskSomeFields(editForm,'oshare',$event)">分享赚</el-checkbox>
<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'marketState',editForm.oshare)" :key="index" :type="item.className">{{item.name}}</el-tag>
</el-form-item>
</el-col>
<el-col :span="18">
@ -432,7 +423,6 @@
<el-col :span="6">
<el-form-item label="热门" prop="hot" v-if="editForm.taskOut==='1'">
<el-checkbox v-model="editForm.hot" v-if="editForm.hot!='2'" true-label="1" false-label="0" id="hot" @change="editXmTaskSomeFields(editForm,'hot',$event)">热门</el-checkbox>
<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'marketState',editForm.hot)" :key="index" :type="item.className">{{item.name}}</el-tag>
</el-form-item>
</el-col>
<el-col :span="18">
@ -445,7 +435,6 @@
<el-col :span="6">
<el-form-item label="置顶" prop="top" v-if="editForm.taskOut==='1'">
<el-checkbox v-model="editForm.top" v-if="editForm.top!='2'" true-label="1" false-label="0" id="hot" @change="editXmTaskSomeFields(editForm,'top',$event)">置顶</el-checkbox>
<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'marketState',editForm.top)" :key="index" :type="item.className">{{item.name}}</el-tag>
</el-form-item>
</el-col>
<el-col :span="18">
@ -458,7 +447,7 @@
<el-col :span="6">
<el-form-item label="加急" prop="urgent" v-if="editForm.taskOut==='1'">
<el-checkbox v-model="editForm.urgent" v-if="editForm.urgent!='2'" true-label="1" false-label="0" id="urgent" @change="editXmTaskSomeFields(editForm,'urgent',$event)">加急</el-checkbox>
<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'marketState',editForm.urgent)" :key="index" :type="item.className">{{item.name}}</el-tag>
</el-form-item>
</el-col>
<el-col :span="18">
@ -471,7 +460,7 @@
<el-col :span="6">
<el-form-item label="客服包办" prop="crmSup" v-if="editForm.taskOut==='1'">
<el-checkbox v-model="editForm.crmSup" v-if="editForm.crmSup!='2'" true-label="1" false-label="0" id="hot" @change="editXmTaskSomeFields(editForm,'crmSup',$event)">客服包办</el-checkbox>
<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'marketState',editForm.crmSup)" :key="index" :type="item.className">{{item.name}}</el-tag>
</el-form-item>
</el-col>
<el-col :span="18">

48
src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
View File

@ -6,8 +6,8 @@
<!-- <el-form-item label="创建时间" prop="createTime">
<el-date-picker type="date" placeholder="选择日期" v-model="addForm.createTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item> -->
<el-form-item label="执行人姓名" prop="username">
{{addForm.username}}<el-button v-if="execuserAddType!='join'" type="text" @click.native="showSelectUsers">选择执行人</el-button>
<el-form-item label="执行人姓名" prop="bidUserid">
<mdp-select-user v-model="addForm.bidUserid" :init-name="addForm.bidUsername" @change2="(e)=>{addForm.bidUsername=e.username;addForm.bidBranchId=e.branchId}"/>
</el-form-item>
<el-form-item label="报价工期" prop="quoteWeekday">
<div>
@ -54,10 +54,6 @@
</el-form>
</el-row>
<el-drawer title="选择员工" :visible.sync="userSelectVisible" size="60%" append-to-body>
<users-select @confirm="onUserSelected" ref="usersSelect"></users-select>
</el-drawer>
</section>
</template>
@ -74,7 +70,7 @@
'userInfo','roles'
])
},
props:['xmTaskExecuser','visible',"execUserList","xmTask",'execuserAddType'],
props:['xmTaskExecuser','visible',"xmTask",'execuserAddType'],
watch: {
'xmTaskExecuser':function( xmTaskExecuser ) {
this.addForm = xmTaskExecuser;
@ -85,8 +81,9 @@
if(this.execuserAddType!="join"){
this.showSelectUsers();
}else{
this.addForm.userid=this.userInfo.userid
this.addForm.username=this.userInfo.username
this.addForm.bidUserid=this.userInfo.userid
this.addForm.bidUsername=this.userInfo.username
this.addForm.bidBranchId=this.userInfo.branchId
}
//从新打开页面时某些数据需要重新加载，可以在这里添加
}
@ -110,7 +107,7 @@
},
//新增界面数据 xm_task_execuse
addForm: {
createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
createTime:'',id:'',taskId:'',bidUserid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',bidUsername:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
},
userSelectVisible: false,
quoteDateRanger: [
@ -127,17 +124,10 @@
},
//新增提交XmTaskExecuser xm_task_execuser 父组件监听@submit="afterAddSubmit"
addSubmit: function () {
if(!this.addForm.userid){
if(!this.addForm.bidUserid){
this.$notify.error("请选择一个人");
return
}
const tf = this.execUserList.some(i=>{return i.userid == this.addForm.userid;});
const that = this;
if(tf){
this.$notify.error(this.addForm.username+"已在任务中");
return;
}
else{
this.$refs.addForm.validate((valid) => {
if (valid) {
@ -170,23 +160,6 @@
showSelectUsers: function(){
this.userSelectVisible=true;
},
//选择接收人
onUserSelected: function(users) {
if(users.length>1){
this.$notify({position:'bottom-left',showClose:true,message: "只能选择一个人", type:'error' });
return;
}
if(users==null || users.length ==0 ){
this.addForm.userid='';
this.addForm.username="";
return;
}
users.forEach(u => {
this.addForm.userid=u.userid
this.addForm.username=u.username
});
this.userSelectVisible = false;
},
getWeekday(first, last) {
//计算工作日方法：遍历这两个日期区间的每一个日期，获取他的getDay()
@ -230,8 +203,9 @@
if(this.execuserAddType!="join"){
this.showSelectUsers();
}else{
this.addForm.userid=this.userInfo.userid
this.addForm.username=this.userInfo.username
this.addForm.bidUserid=this.userInfo.userid
this.addForm.bidUsername=this.userInfo.username
this.addForm.bidBranchId=this.userInfo.branchId
}
/**在下面写其它函数***/

41
src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
View File

@ -3,25 +3,13 @@
<el-row class="padding border">
<!--编辑界面 XmTaskExecuser xm_task_execuser-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm">
<el-form-item label="执行人姓名" prop="username">
<el-select style="width:100%;" placeholder="选择执行人" v-model="execUser" value-key="userid">
<el-option
v-for="(item,i) in execUserList"
:key="i"
:label="item.username"
:value="item">
</el-option>
</el-select>
<el-form-item label="执行人姓名" prop="bidUserid">
<mdp-select-user v-model="editForm.bidUserid" :init-name="editForm.bidUsername" show-style="tag" @change2="u=>{editForm.bidUsername=u.username;editForm.bidBranchId=u.branchId}"/>
</el-form-item>
<el-form-item label="执行人状态" prop="status">
<el-select :disabled="editForm.status == '2'" style="width:100%;" placeholder="选择状态" v-model="editForm.status">
<el-option
v-for="(item,i) in dicts.projectTaskExecuserStatus"
:key="i"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
<mdp-select item-code="projectTaskExecuserStatus" :disabled="editForm.status == '2'" placeholder="选择状态" v-model="editForm.status">
</mdp-select>
</el-form-item>
<el-form-item label="加入时间" prop="startTime">
<el-date-picker type="datetime" placeholder="选择日期" v-model="editForm.startTime" :clearable="false" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@ -39,14 +27,8 @@
<el-input v-model="editForm.settleHour" type="number" placeholder="结算工时"></el-input>
</el-form-item>
<el-form-item label="结算状态" prop="settleStatus">
<el-select style="width:100%;" placeholder="选择结算状态" v-model="editForm.settleStatus">
<el-option
v-for="(item,i) in dicts.projectTaskSettleStatus"
:key="i"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
<mdp-select show-style="tag" item-code="projectTaskSettleStatus" style="width:100%;" placeholder="选择结算状态" v-model="editForm.settleStatus">
</mdp-select>
</el-form-item>
<el-form-item label="结算时间" prop="settleTime">
<el-date-picker type="datetime" placeholder="选择日期" v-model="editForm.settleTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@ -80,17 +62,12 @@
'userInfo','roles'
])
},
props:['xmTaskExecuser','visible',"execUserList","xmTask"],
props:['xmTaskExecuser','visible',"xmTask"],
watch: {
'xmTaskExecuser':function( xmTaskExecuser ) {
this.editForm = xmTaskExecuser;
},
'visible':function(visible) {
if(visible==true){
this.execUser.userid = this.editForm.userid;
this.execUser.username = this.editForm.username;
//从新打开页面时某些数据需要重新加载，可以在这里添加
}
}
},
data() {
@ -146,8 +123,6 @@
},
mounted() {
this.editForm=Object.assign(this.editForm, this.xmTaskExecuser);
this.execUser.userid = this.editForm.userid;
this.execUser.username = this.editForm.username;
}
}

8
src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
View File

@ -40,9 +40,9 @@
</el-form>
</template>
</el-table-column>
<el-table-column prop="username" label="姓名" min-width="150" >
<el-table-column prop="bidUsername" label="姓名" min-width="150" >
<template slot-scope="scope">
<mdp-select-user show-style="tag" :key="scope.row.id" v-model="scope.row.userid" :init-name="scope.row.username" :disabled="true"></mdp-select-user>
<mdp-select-user show-style="tag" :key="scope.row.id" v-model="scope.row.bidUserid" :init-name="scope.row.bidUsername" :disabled="true"></mdp-select-user>
</template>
</el-table-column>
@ -54,7 +54,7 @@
<el-table-column prop="status" label="状态" width="100" >
<template slot-scope="scope">
<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'projectTaskExecuserStatus',scope.row.status)" :key="index" :type="item.className">{{item.name}}</el-tag>
<mdp-select item-code="projectTaskExecuserStatus" v-model="scope.row.status" :disabled="true" show-style="tag"/>
</template>
</el-table-column>
@ -77,7 +77,7 @@
<el-form :model="quotePriceForm" label-width="100px" ref="quotePriceForm">
<el-form-item label="候选人名称">
<template slot-scope="scope">
<mdp-select-user v-model="quotePriceForm.userid" :init-name="quotePriceForm.username" :disabled="true"></mdp-select-user>
<mdp-select-user v-model="quotePriceForm.bidUserid" :init-name="quotePriceForm.bidUsername" :disabled="true"></mdp-select-user>
</template>
</el-form-item>
<el-form-item label="报价工期" prop="quoteWeekday">

18
src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
View File

@ -20,12 +20,12 @@
<el-table ref="table" height="100px" v-adaptive="{bottomOffset:50}" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column label="序号" type="index" width="60" fixed="left">
</el-table-column>
<el-table-column prop="username" label="用户姓名" width="150" sortable show-overflow-tooltip fixed="left">
<el-table-column prop="bidUsername" label="用户姓名" width="150" sortable show-overflow-tooltip fixed="left">
<template slot-scope="scope">
<mdp-select-user show-style="tag" :key="scope.row.id" v-model="scope.row.userid" :init-name="scope.row.username" :disabled="true"></mdp-select-user>
<mdp-select-user show-style="tag" :key="scope.row.id" v-model="scope.row.bidUserid" :init-name="scope.row.bidUsername" :disabled="true"></mdp-select-user>
</template>
</el-table-column>
<el-table-column prop="execUserBranchId" label="用户归属公司" width="150" sortable show-overflow-tooltip fixed="left">
<el-table-column prop="bidBranchId" label="用户归属公司" width="150" sortable show-overflow-tooltip fixed="left">
</el-table-column>
<el-table-column prop="status" label="候选状态" width="100" sortable fixed="left">
<template slot-scope="scope">
@ -67,7 +67,7 @@
</el-table-column>
<el-table-column prop="taskName" label="任务状态" width="100" sortable show-overflow-tooltip >
<template slot-scope="scope">
<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterTaskStateDicts(scope.row.taskState)" :key="index">{{item.name}}</el-button>
<mdp-select item-code="taskState" v-model="scope.row.taskState" :disabled="true" show-style="tag"/>
</template>
</el-table-column>
<el-table-column prop="projectId" label="项目编号" width="100" sortable show-overflow-tooltip>
@ -100,7 +100,7 @@
<el-drawer append-to-body title="报价" :visible.sync="quotePriceVisible" size="60%" :close-on-click-modal="false">
<el-form :model="quotePriceForm" label-width="100px" ref="quotePriceForm">
<el-form-item label="候选人名称">
<span>{{ quotePriceForm.username }}</span>
<span>{{ quotePriceForm.bidUsername }}</span>
</el-form-item>
<el-form-item label="报价工期" prop="quoteWeekday">
<div>
@ -240,7 +240,7 @@
editFormVisible: false,//编辑界面是否显示
//编辑xmTaskExecuser界面初始化数据
editForm: {
createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
createTime:'',id:'',taskId:'',bidUserid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
},
/**begin 自定义属性请在下面加 请加备注**/
@ -250,7 +250,7 @@
},
settleListVisible:false,
quotePriceForm: {
quoteAmount: '',quoteWorkload: '', skillRemark: '',quoteStartTime:'',quoteEndTime:'',id:'',userid:'',usernane:'',taskId:'',
quoteAmount: '',quoteWorkload: '', skillRemark: '',quoteStartTime:'',quoteEndTime:'',id:'',bidUserid:'',bidUsernane:'',taskId:'',
},
quotePriceVisible:false,
readyAdd: [],
@ -677,12 +677,12 @@
data:{
projectId:projectId,
taskId:taskId,
userid:row.userid,
bidUserid:row.userid,
settleAmount:this.settleForm.settleAmount,
settleWorkload:this.settleForm.settleWorkload,
id:row.id,
branchId:branchId,
username:row.username
bidUsername:row.username
}
},
}

Write Preview
Loading…
Cancel
Save