Browse Source

优化城市选择

master
陈裕财 3 years ago
parent
commit
26f684bb53
  1. 2
      src/components/MdpDateRange/index.vue
  2. 2
      src/main.js
  3. 2
      src/views/xm/core/xmProduct/XmProductEdit.vue
  4. 29
      src/views/xm/core/xmTask/XmTaskEdit.vue
  5. 2
      src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
  6. 2
      src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
  7. 2
      src/views/xm/core/xmTestPlanCase/TestStepResult.vue

2
src/components/MdpDateRange/index.vue

@ -100,7 +100,7 @@ export default {
methods: { methods: {
initData(){ initData(){
debugger;
this.dateRange=[]; this.dateRange=[];
if(this.value instanceof Array){ if(this.value instanceof Array){
this.dateRange=this.value this.dateRange=this.value

2
src/main.js

@ -44,6 +44,8 @@ Vue.component('my-input',MyInput)
Vue.component('mdp-date-x',MdpDateX) Vue.component('mdp-date-x',MdpDateX)
Vue.component('mdp-date-range-x',MdpDateRangeX) Vue.component('mdp-date-range-x',MdpDateRangeX)
Vue.component('mdp-select-user-x',MdpSelectUserX) Vue.component('mdp-select-user-x',MdpSelectUserX)
Vue.use(Element, { Vue.use(Element, {
size: 'small', // set element-ui default size size: 'small', // set element-ui default size
i18n: (key, value) => i18n.t(key, value) i18n: (key, value) => i18n.t(key, value)

2
src/views/xm/core/xmProduct/XmProductEdit.vue

@ -276,7 +276,7 @@ export default {
this.$refs.editForm.validate((valid) => { this.$refs.editForm.validate((valid) => {
if (valid) { if (valid) {
debugger;
var msg=this.selProject&&this.selProject.id?'将自动关联项目【'+(this.selProject.name?this.selProject.name:this.selProject.id)+'】':''; var msg=this.selProject&&this.selProject.id?'将自动关联项目【'+(this.selProject.name?this.selProject.name:this.selProject.id)+'】':'';
this.$confirm('确认提交吗?'+msg, '提示', {}).then(() => { this.$confirm('确认提交吗?'+msg, '提示', {}).then(() => {
this.load.add=true this.load.add=true

29
src/views/xm/core/xmTask/XmTaskEdit.vue

@ -353,8 +353,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="城市名称" prop="cityName" v-if="editForm.crowd==='1'"> <el-form-item label="城市名称" prop="cityName" v-if="editForm.crowd==='1'">
<el-input v-model="editForm.cityName" placeholder="城市名称" @change="editXmTaskSomeFields(editForm,'cityName',$event)"></el-input>
<v-region :value="{province:editForm.provinceId,city:editForm.cityId,area:editForm.areaId,town:''}" @change="editXmTaskSomeFields(editForm,'cityId',$event)"></v-region>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -548,7 +548,8 @@
</section> </section>
</template> </template>
<script>
<script>
import util from '@/common/js/util';// import util from '@/common/js/util';//
import {initDicts,editXmTask,setTaskCreateUser,editXmTaskSomeFields,batchChangeParentTask,listXmTask } from '@/api/xm/core/xmTask'; import {initDicts,editXmTask,setTaskCreateUser,editXmTaskSomeFields,batchChangeParentTask,listXmTask } from '@/api/xm/core/xmTask';
import {addXmRecordVisit } from '@/api/xm/core/xmRecordVisit'; import {addXmRecordVisit } from '@/api/xm/core/xmRecordVisit';
@ -573,7 +574,10 @@
import XmTaskExecuserForTask from '../xmTaskExecuser/XmTaskExecuserForTask.vue'; import XmTaskExecuserForTask from '../xmTaskExecuser/XmTaskExecuserForTask.vue';
import XmPhaseSelect from "./XmPhaseSelect.vue"; import XmPhaseSelect from "./XmPhaseSelect.vue";
import ToPay from "../xmTaskOrder/ToPay.vue"; import ToPay from "../xmTaskOrder/ToPay.vue";
import { initSysDicts } from '../../../../api/xm/core/xmTask';
import { initSysDicts } from '../../../../api/xm/core/xmTask';
import { RegionGroup } from 'v-region'
export default { export default {
name:'xmTaskEdit', name:'xmTaskEdit',
computed: { computed: {
@ -937,6 +941,18 @@
params.shareFee=$event params.shareFee=$event
}else if(fieldName==='supRequires'){ }else if(fieldName==='supRequires'){
params.supRequires=$event.join(",") params.supRequires=$event.join(",")
}else if(fieldName==='cityId'){
if($event.area){
params.provinceId=$event.province.key
params.provinceName=$event.province.value
params.cityId=$event.city.key
params.cityName=$event.city.value
params.areaId=$event.area.key
params.areaName=$event.area.value
}else{
return;
}
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }
@ -1006,13 +1022,14 @@
}, },
getRateColor(rate){ getRateColor(rate){
return "#F56C6C" return "#F56C6C"
}
},
},//end method },//end method
components: { components: {
xmSkillMng, xmSkillMng,
skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit, skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit,
XmRecord,xmQuestionMng,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,MdpSelectUserXm,'xm-task-edit':()=>import("./XmTaskDetail"), XmRecord,xmQuestionMng,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,MdpSelectUserXm,'xm-task-edit':()=>import("./XmTaskDetail"),
'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"),
'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"),
"v-region":RegionGroup ,
// 'xm-task-edit':XmTaskEdit // 'xm-task-edit':XmTaskEdit
}, },
mounted() { mounted() {

2
src/views/xm/core/xmTestPlan/rpt/CompsCard.vue

@ -172,7 +172,7 @@ export default {
this.compCfgList.push(compCfg) this.compCfgList.push(compCfg)
}, },
submitXmPrtConfig(callback){ submitXmPrtConfig(callback){
debugger;
if(this.xmRptConfig==null){ if(this.xmRptConfig==null){
var xmRptConfig={name:this.xmTestPlan.name,bizId:this.xmTestPlan.id,cfg:[]} var xmRptConfig={name:this.xmTestPlan.name,bizId:this.xmTestPlan.id,cfg:[]}
var compCfgList=JSON.parse(JSON.stringify(this.compCfgList)) var compCfgList=JSON.parse(JSON.stringify(this.compCfgList))

2
src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue

@ -212,7 +212,7 @@
this.filters.iteration=null this.filters.iteration=null
}, },
initData(){ initData(){
debugger;
if(this.xmTestPlan){ if(this.xmTestPlan){
this.filters.productId=this.xmTestPlan.productId this.filters.productId=this.xmTestPlan.productId
this.filters.projectId=this.xmTestPlan.projectId this.filters.projectId=this.xmTestPlan.projectId

2
src/views/xm/core/xmTestPlanCase/TestStepResult.vue

@ -126,7 +126,7 @@
getExecStatusIcon(execStatus){ getExecStatusIcon(execStatus){
debugger;
var icons=['el-icon-arrow-up','el-icon-right','el-icon-check','el-icon-minus','el-icon-close']; var icons=['el-icon-arrow-up','el-icon-right','el-icon-check','el-icon-minus','el-icon-close'];
if(!execStatus){ if(!execStatus){
return icons[0] return icons[0]

Loading…
Cancel
Save