优化

src/views/xm/core/xmProject/XmProjectAdd.vue

@@ -24,7 +24,7 @@
 							</el-form-item>   
 						</el-col>
 						<el-col :span="12">
-							<el-form-item label="紧急程度" prop="priority">   
+							<el-form-item label="优先级" prop="priority">   
 								<el-select v-model="addForm.priority">
 									<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index"></el-option> 
 								</el-select> 
@@ -312,7 +312,7 @@
 				},
 				dicts:{ 
 					projectType:[],
-					urgencyLevel:[],
+					priority:[],
 					priority:[],
 					projectStatus:[], 
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -327,12 +327,9 @@
 					}],
 					xmType: [{
 						required: true, message: '项目类型不可为空', trigger: 'change'
-					}],
-					urgent: [{
-						required: true, message: '紧急程度不可为空', trigger: 'change'
-					}],
+					}], 
 					priority: [{
-						required: true, message: '优先程度不可为空', trigger: 'change'
+						required: true, message: '优先级不可为空', trigger: 'change'
 					}], 
 					admUserid: [{
 						required: true, message: '项目总控不能为空', trigger: 'change'
@@ -518,7 +515,7 @@
 			this.addForm.admUsername=this.userInfo.username
 			this.addForm.assUserid=this.userInfo.userid
 			this.addForm.assUsername=this.userInfo.username
-			initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+			initSimpleDicts('all',['projectType','priority','projectStatus']).then(res=>{
 				this.dicts=res.data.data;
 			})
 			

src/views/xm/core/xmProject/XmProjectEdit.vue

@@ -24,7 +24,7 @@
 									<el-option v-for="(i,index) in dicts['projectType']" :label="i.name" :value="i.id" :key="index"></el-option> 
 								</el-select>   
 								<el-select v-model="editForm.urgent">
-									<el-option v-for="(i,index) in dicts['urgencyLevel']" :label="i.name" :value="i.id" :key="index"></el-option> 
+									<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index"></el-option> 
 								</el-select>    
 								<el-select v-model="editForm.priority">
 									<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index"></el-option> 
@@ -387,12 +387,9 @@
 					}],
 					xmType: [{
 						required: true, message: '项目类型不可为空', trigger: 'blur'
-					}],
-					urgent: [{
-						required: true, message: '紧急程度不可为空', trigger: 'blur'
-					}],
+					}], 
 					priority: [{
-						required: true, message: '优先程度不可为空', trigger: 'blur'
+						required: true, message: '优先级不可为空', trigger: 'blur'
 					}],
 					admUserid: [{
 						required: true, message: '项目总控不能为空', trigger: 'change'
@@ -745,7 +742,7 @@
 				 this.dateRanger=[this.editForm.startTime,this.editForm.endTime]
 				
 			
-				initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+				initSimpleDicts('all',['projectType','priority','projectStatus']).then(res=>{
 					this.dicts=res.data.data;
 				})
 			

src/views/xm/core/xmProject/XmProjectMng.vue

@@ -877,7 +877,7 @@
 				this.filters.productName=this.$route.params.productName;
 			}
 			this.$nextTick(() => {    
-				initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+				initSimpleDicts('all',['projectType','priority','projectStatus']).then(res=>{
 					this.dicts=res.data.data;
 				})
                 this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);

src/views/xm/core/xmProject/XmProjectOverview.vue

@@ -755,7 +755,7 @@ export default {
       this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el)
     });
 			
-			initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+			initSimpleDicts('all',['projectType','priority','projectStatus']).then(res=>{
 				this.dicts=res.data.data;
 			})
     this.drawAllBar();

src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue

@@ -15,13 +15,8 @@
 					 	 <el-radio-group v-model="addForm.xmType">
 							<el-radio v-for="(i,index) in dicts['projectType']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 						</el-radio-group>  
-					</el-form-item> 
-					<el-form-item label="紧急程度" prop="urgent">
-					 	 <el-radio-group v-model="addForm.urgent">
-							<el-radio v-for="(i,index) in dicts['urgencyLevel']" :label="i.id" :key="index">{{i.name}}</el-radio> 
-						</el-radio-group>   
 					</el-form-item>  
-					<el-form-item label="优先程度" prop="priority">
+					<el-form-item label="优先级" prop="priority">
 					 	 <el-radio-group v-model="addForm.priority">
 							<el-radio v-for="(i,index) in dicts['priority']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 						</el-radio-group> 
@@ -265,7 +260,7 @@
 				},
 				dicts:{ 
 					projectType:[],
-					urgencyLevel:[],
+					priority:[],
 					priority:[],
 					projectStatus:[], 
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -280,12 +275,9 @@
 					}],
 					xmType: [{
 						required: true, message: '项目类型不可为空', trigger: 'blur'
-					}],
-					urgent: [{
-						required: true, message: '紧急程度不可为空', trigger: 'blur'
-					}],
+					}], 
 					priority: [{
-						required: true, message: '优先程度不可为空', trigger: 'blur'
+						required: true, message: '优先级不可为空', trigger: 'blur'
 					}], 
 				},
 				//编辑界面数据  XmProjectTemplate xm_project
@@ -406,14 +398,14 @@
 		},
 		mounted() { 
 			this.addForm.id=sn();  
-				initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+				initSimpleDicts('all',['projectType','priority','projectStatus']).then(res=>{
 					this.dicts['projectType']=res.data.data.projectType
-					this.dicts['urgencyLevel']=res.data.data.urgencyLevel
+					this.dicts['priority']=res.data.data.priority
 					this.dicts['priority']=res.data.data.priority
 					this.dicts['projectStatus']=res.data.data.projectStatus
 
 					this.addForm.xmType=this.dicts['projectType'][0].id
-					this.addForm.urgent=this.dicts['urgencyLevel'][0].id
+					this.addForm.urgent=this.dicts['priority'][0].id
 					this.addForm.priority=this.dicts['priority'][0].id
 				})
 			

src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue

@@ -21,13 +21,8 @@
 							<el-radio-group v-model="editForm.xmType">
 								<el-radio v-for="(i,index) in dicts['projectType']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 							</el-radio-group>  
-						</el-form-item> 
-						<el-form-item label="紧急程度" prop="urgent">
-							<el-radio-group v-model="editForm.urgent">
-								<el-radio v-for="(i,index) in dicts['urgencyLevel']" :label="i.id" :key="index">{{i.name}}</el-radio> 
-							</el-radio-group>   
 						</el-form-item>  
-						<el-form-item label="优先程度" prop="priority">
+						<el-form-item label="优先级" prop="priority">
 							<el-radio-group v-model="editForm.priority">
 								<el-radio v-for="(i,index) in dicts['priority']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 							</el-radio-group> 
@@ -274,7 +269,7 @@
 				},
 				dicts:{ 
 					projectType:[],
-					urgencyLevel:[],
+					priority:[],
 					priority:[],
 					projectStatus:[], 
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -289,12 +284,9 @@
 					}],
 					xmType: [{
 						required: true, message: '项目类型不可为空', trigger: 'blur'
-					}],
-					urgent: [{
-						required: true, message: '紧急程度不可为空', trigger: 'blur'
-					}],
+					}], 
 					priority: [{
-						required: true, message: '优先程度不可为空', trigger: 'blur'
+						required: true, message: '优先级不可为空', trigger: 'blur'
 					}], 
 				},
 				//编辑界面数据  XmProjectTemplate xm_project
@@ -422,9 +414,9 @@
 		mounted() { 
 			 	this.editForm=Object.assign({},this.selProjectTemplate);
 				
-				initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+				initSimpleDicts('all',['projectType','priority','projectStatus']).then(res=>{
 					this.dicts['projectType']=res.data.data.projectType
-					this.dicts['urgencyLevel']=res.data.data.urgencyLevel
+					this.dicts['priority']=res.data.data.priority
 					this.dicts['priority']=res.data.data.priority
 					this.dicts['projectStatus']=res.data.data.projectStatus 
 				})

src/views/xm/core/xmQuestion/XmQuestionAdd.vue

@@ -36,9 +36,9 @@
 						</el-row>
 						<el-row> 
 								<el-col :span="12">
-									<el-form-item label="紧急程度" prop="priority">
-										<el-select v-model="addForm.priority" placeholder="请选择紧急程度">
-											<el-option v-for="(i,index) in dicts['urgencyLevel']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+									<el-form-item label="优先级" prop="priority">
+										<el-select v-model="addForm.priority" placeholder="请选择优先级">
+											<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
 										</el-select> 
 									</el-form-item>
 									
@@ -199,7 +199,7 @@
 					selProject:null,
 				},
 				dicts:{
-					urgencyLevel:[],
+					priority:[],
 					bugSeverity:[],
 					bugSolution:[],
 					bugStatus:[],
@@ -446,13 +446,13 @@
 			this.addForm.qtype=this.qtype
 			this.setDefaultData();
 			this.initByExec();
-			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','urgencyLevel','bugRepRate']).then(res=>{
+			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate']).then(res=>{
 				if(res.data.tips.isOk){
 					this.dicts['bugSeverity']=res.data.data.bugSeverity
 					this.dicts['bugSolution']=res.data.data.bugSolution
 					this.dicts['bugStatus']=res.data.data.bugStatus
 					this.dicts['bugType']=res.data.data.bugType
-					this.dicts['urgencyLevel']=res.data.data.urgencyLevel
+					this.dicts['priority']=res.data.data.priority
 					this.dicts['bugRepRate']=res.data.data.bugRepRate
 				}
 			});

src/views/xm/core/xmQuestion/XmQuestionEdit.vue

@@ -47,9 +47,9 @@
 						</el-row>
 						<el-row> 
 								<el-col :span="12">
-									<el-form-item label="紧急程度" prop="priority">
-										<el-select v-model="editForm.priority" placeholder="请选择紧急程度">
-											<el-option v-for="(i,index) in dicts['urgencyLevel']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+									<el-form-item label="优先级" prop="priority">
+										<el-select v-model="editForm.priority" placeholder="请选择优先级">
+											<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
 										</el-select> 
 									</el-form-item>
 									
@@ -220,7 +220,7 @@
 		data() {
 			return {
 				dicts:{
-					urgencyLevel:[],
+					priority:[],
 					bugSeverity:[],
 					bugSolution:[],
 					bugStatus:[],
@@ -365,7 +365,7 @@
 				}else if(columnName=='bugSeverity'){
 					key="bugSeverity"
 				}else if(columnName=='priority'){
-					key="urgencyLevel"
+					key="priority"
 				}else{
 					return cellValue
 				}
@@ -458,13 +458,13 @@
 		mounted() {
 			console.log("question_add");
 			this.editForm=Object.assign(this.editForm, this.xmQuestion);
-			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','urgencyLevel','bugRepRate']).then(res=>{
+			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate']).then(res=>{
 				if(res.data.tips.isOk){
 					this.dicts['bugSeverity']=res.data.data.bugSeverity
 					this.dicts['bugSolution']=res.data.data.bugSolution
 					this.dicts['bugStatus']=res.data.data.bugStatus
 					this.dicts['bugType']=res.data.data.bugType
-					this.dicts['urgencyLevel']=res.data.data.urgencyLevel
+					this.dicts['priority']=res.data.data.priority
 					this.dicts['bugRepRate']=res.data.data.bugRepRate
 				}
 			});

src/views/xm/core/xmQuestion/XmQuestionMng.vue

@@ -5,8 +5,8 @@
 					<el-option v-for="(b,index) in dicts['bugStatus']" :value="b.id"  :key="index" :label="b.name">{{b.name}}
 					</el-option>
 				</el-select>
-				<el-select class="hidden-md-and-down" v-model="filters.priority" placeholder="紧急程度"  style="width:120px;"  clearable @change="changePriority">
-					<el-option v-for="(b,index) in dicts['urgencyLevel']" :value="b.id" :key="index" :label="b.name">{{b.name}}
+				<el-select class="hidden-md-and-down" v-model="filters.priority" placeholder="优先级"  style="width:120px;"  clearable @change="changePriority">
+					<el-option v-for="(b,index) in dicts['priority']" :value="b.id" :key="index" :label="b.name">{{b.name}}
 					</el-option>
 				</el-select>
 				<el-select class="hidden-md-and-down" v-model="filters.bugSeverity" placeholder="严重程度"  style="width:120px;" clearable @change="changeBugSeverity">
@@ -71,8 +71,8 @@
 							<el-button v-else    @click="showMenu" type="plian">选需求</el-button>
 						</el-col>
 						<el-col :span="24" class="hidden-lg-and-up" style="padding-top:12px;">
-							<el-select   v-model="filters.priority" placeholder="请选择紧急程度" clearable @change="changePriority">
-								<el-option v-for="(b,index) in dicts['urgencyLevel']" :value="b.id" :key="index" :label="b.name">{{b.name}}
+							<el-select   v-model="filters.priority" placeholder="请选择优先级" clearable @change="changePriority">
+								<el-option v-for="(b,index) in dicts['priority']" :value="b.id" :key="index" :label="b.name">{{b.name}}
 								</el-option>
 							</el-select>
 						</el-col>
@@ -282,7 +282,7 @@
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
 				dicts:{
-					urgencyLevel:[],
+					priority:[],
 					bugSeverity:[],
 					bugSolution:[],
 					bugStatus:[],
@@ -327,7 +327,7 @@
 					{
 						key: 'priority',
 						type: 'dict',
-						name: '紧急程度'
+						name: '优先级'
 					},
 					{
 						key: 'solution',
@@ -648,7 +648,7 @@
 				}else if(columnName=='bugSeverity'){
 					key="bugSeverity"
 				}else if(columnName=='priority'){
-					key="urgencyLevel"
+					key="priority"
 				}else{
 					return cellValue
 				}
@@ -722,7 +722,7 @@
 					} else if(j == 'bugSeverity') {
 						key = "bugSeverity"
 					} else if(j == 'priority') {
-						key = "urgencyLevel"
+						key = "priority"
 					} else {
 						return v[j];
 					}
@@ -955,13 +955,13 @@
 				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmQuestions();
 			});
-				initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','urgencyLevel']).then(res=>{
+				initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority']).then(res=>{
 					if(res.data.tips.isOk){
 						this.dicts['bugSeverity']=res.data.data.bugSeverity
 						this.dicts['bugSolution']=res.data.data.bugSolution
 						this.dicts['bugStatus']=res.data.data.bugStatus
 						this.dicts['bugType']=res.data.data.bugType
-						this.dicts['urgencyLevel']=res.data.data.urgencyLevel
+						this.dicts['priority']=res.data.data.priority
 					}
 				});
 		}

src/views/xm/core/xmTask/XmTaskAdd.vue

@@ -81,9 +81,9 @@
 						</el-row>
 						<el-row>
 							<el-col :span="12">
-								<el-form-item  label="紧急程度" prop="level">  
+								<el-form-item  label="优先级" prop="level">  
 									<el-select v-model="addForm.level">
-											<el-option v-for="i in dicts.urgencyLevel" :label="i.name" :key="i.id" :value="i.id"></el-option> 
+											<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
 									</el-select>    
 								</el-form-item>  
 							</el-col>
@@ -278,7 +278,7 @@
 			endDate.setTime(beginDate.getTime() + 3600 * 1000 * 24 * 7 * 4);
 			return {
 				dicts:{
-					urgencyLevel:[],
+					priority:[],
 					taskType:[],
 					planType:[],
 					priority:[],
@@ -597,7 +597,7 @@
 		},
 		mounted() { 
  			this.initData();
- 			initSimpleDicts('all',['planType','taskType','urgencyLevel','priority','xmTaskSettleSchemel']).then(res=>{
+ 			initSimpleDicts('all',['planType','taskType','priority','xmTaskSettleSchemel']).then(res=>{
 				this.dicts=res.data.data;
 			})
 			/**在下面写其它函数***/

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

@@ -86,9 +86,9 @@
 						</el-row>
 						<el-row>
 							<el-col :span="12">
-								<el-form-item  label="紧急程度" prop="level">  
+								<el-form-item  label="优先级" prop="level">  
 									<el-select v-model="editForm.level">
-											<el-option v-for="i in dicts.urgencyLevel" :label="i.name" :key="i.id" :value="i.id"></el-option> 
+											<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
 									</el-select>    
 								</el-form-item>  
 							</el-col>
@@ -337,7 +337,7 @@
 			endDate.setTime(beginDate.getTime() + 3600 * 1000 * 24 * 7 * 4);
 			return {
 				dicts:{
-					urgencyLevel:[],
+					priority:[],
 					taskType:[],
 					planType:[],
 					priority:[],
@@ -639,7 +639,7 @@
 			}
 			
 			this.setSkills();
-			initSimpleDicts('all',['planType','taskType','urgencyLevel','priority','xmTaskSettleSchemel']).then(res=>{
+			initSimpleDicts('all',['planType','taskType','priority','xmTaskSettleSchemel']).then(res=>{
 				this.dicts=res.data.data;
 			})
 			/**在下面写其它函数***/

src/views/xm/core/xmTask/XmTaskList.vue

@@ -150,7 +150,6 @@
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
 				dicts:{
-					urgencyLevel:[],
 					taskType:[],
 					planType:[],
 					priority:[],
@@ -527,7 +526,7 @@
 				this.tableHeight = util.calcTableMaxHeight(this.$refs.taskTable.$el); 
 				this.getXmTasks(); 
 			});
-				initSimpleDicts('all',['planType','taskType','urgencyLevel','priority']).then(res=>{
+				initSimpleDicts('all',['planType','taskType','priority','priority']).then(res=>{
 					this.dicts=res.data.data;
 				})		
 		}

src/views/xm/core/xmTask/XmTaskListForMenu.vue

@@ -131,7 +131,6 @@
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
 				dicts:{
-					urgencyLevel:[],
 					taskType:[],
 					planType:[],
 					priority:[],
@@ -409,7 +408,7 @@
 				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmTasks(); 
 			});
-				initSimpleDicts('all',['planType','taskType','urgencyLevel','priority']).then(res=>{
+				initSimpleDicts('all',['planType','taskType','priority','priority']).then(res=>{
 					this.dicts=res.data.data;
 				})		
 		}

src/views/xm/core/xmTask/XmTaskMng.vue

@@ -698,7 +698,7 @@
               <el-tag
                 v-if="editForm.level != '' && editForm.level != null"
                 style="border-radius: 30px"
-                >{{ formateOption("urgencyLevel", editForm.level) }}</el-tag
+                >{{ formateOption("priority", editForm.level) }}</el-tag
               >
               [{{ formateOption("taskType", editForm.taskType) }}]
               <span> {{ editForm.projectName }} </span>
@@ -1247,7 +1247,7 @@ export default {
       load: { list: false, edit: false, del: false, add: false }, //查询中...
       sels: [], //列表选中数据
       dicts: {
-        urgencyLevel: [],
+        priority: [],
         taskType: [],
         planType: [],
         priority: [],
@@ -2569,7 +2569,7 @@ export default {
     this.$nextTick(() => {
       this.getXmTasks();
       this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
-      initSimpleDicts( "all", ["planType","taskType","urgencyLevel","xmTaskSettleSchemel","priority","taskState" ]).then((res) => {
+      initSimpleDicts( "all", ["planType","taskType","priority","xmTaskSettleSchemel","priority","taskState" ]).then((res) => {
         this.dicts = res.data.data;
       });
     });

src/views/xm/core/xmTask/XmTaskMngBatch.vue

@@ -357,8 +357,7 @@ export default {
       },
       load: { list: false, edit: false, del: false, add: false }, //查询中...
       sels: [], //列表选中数据
-      dicts: {
-        urgencyLevel: [],
+      dicts: { 
         taskType: [],
         planType: [],
         priority: [],
@@ -1218,7 +1217,7 @@ export default {
     } 
     this.$nextTick(() => { 
       this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el); 
-      initSimpleDicts( "all",["planType","taskType","urgencyLevel","xmTaskSettleSchemel","priority"]).then((res) => {
+      initSimpleDicts( "all",["planType","taskType","priority","xmTaskSettleSchemel","priority"]).then((res) => {
         this.dicts = res.data.data;
       });
     });