From 26f684bb5334f6997da6e5bb9defe3c348fcc4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 11 Aug 2022 12:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9F=8E=E5=B8=82=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MdpDateRange/index.vue         |  2 +-
 src/main.js                                   |  2 ++
 src/views/xm/core/xmProduct/XmProductEdit.vue |  2 +-
 src/views/xm/core/xmTask/XmTaskEdit.vue       | 29 +++++++++++++++----
 .../xm/core/xmTestPlan/rpt/CompsCard.vue      |  2 +-
 .../xmTestPlan/rpt/biz/questionAgeDist.vue    |  2 +-
 .../xm/core/xmTestPlanCase/TestStepResult.vue |  2 +-
 7 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/components/MdpDateRange/index.vue b/src/components/MdpDateRange/index.vue
index cb17ef9d..c6c96ec2 100644
--- a/src/components/MdpDateRange/index.vue
+++ b/src/components/MdpDateRange/index.vue
@@ -100,7 +100,7 @@ export default {
   methods: { 
       
       initData(){
-        debugger;
+        
           this.dateRange=[];
           if(this.value instanceof Array){
               this.dateRange=this.value
diff --git a/src/main.js b/src/main.js
index c70a26c3..d4a781e1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -44,6 +44,8 @@ Vue.component('my-input',MyInput)
 Vue.component('mdp-date-x',MdpDateX)
 Vue.component('mdp-date-range-x',MdpDateRangeX)
 Vue.component('mdp-select-user-x',MdpSelectUserX)
+ 
+
 Vue.use(Element, {
   size: 'small', // set element-ui default size
   i18n: (key, value) => i18n.t(key, value)
diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue
index 977e4ab3..28fe4f7a 100644
--- a/src/views/xm/core/xmProduct/XmProductEdit.vue
+++ b/src/views/xm/core/xmProduct/XmProductEdit.vue
@@ -276,7 +276,7 @@ export default {
 				
 				this.$refs.editForm.validate((valid) => {
 					if (valid) {
-            debugger;
+            
 						var msg=this.selProject&&this.selProject.id?'将自动关联项目【'+(this.selProject.name?this.selProject.name:this.selProject.id)+'】':'';
 						this.$confirm('确认提交吗？'+msg, '提示', {}).then(() => { 
 							this.load.add=true
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index a1f29878..756a21bc 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -353,8 +353,8 @@
 							</el-col>
 							<el-col :span="12"> 
 								<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-col>
 							
@@ -548,7 +548,8 @@
 	</section>
 </template>
 
-<script>
+<script> 
+
 	import util from '@/common/js/util';//全局公共库 
 	import {initDicts,editXmTask,setTaskCreateUser,editXmTaskSomeFields,batchChangeParentTask,listXmTask } from '@/api/xm/core/xmTask';
 	import {addXmRecordVisit } from '@/api/xm/core/xmRecordVisit';
@@ -573,7 +574,10 @@
 	import XmTaskExecuserForTask from '../xmTaskExecuser/XmTaskExecuserForTask.vue';
 	import XmPhaseSelect from "./XmPhaseSelect.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 { 
 		name:'xmTaskEdit',
 		computed: {
@@ -937,6 +941,18 @@
 					params.shareFee=$event
 				}else if(fieldName==='supRequires'){
 					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{
 					params[fieldName]=$event
 				}
@@ -1006,13 +1022,14 @@
 			},
 			getRateColor(rate){
 				return "#F56C6C"
-			}
+			}, 
 		},//end method
 		components: { 
  			xmSkillMng,
 			skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit,
 			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
 		},
 		mounted() { 
diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
index 3864a06f..2f096336 100644
--- a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
@@ -172,7 +172,7 @@ export default {
                 this.compCfgList.push(compCfg) 
         },
         submitXmPrtConfig(callback){
-            debugger;
+            
             if(this.xmRptConfig==null){
                 var xmRptConfig={name:this.xmTestPlan.name,bizId:this.xmTestPlan.id,cfg:[]}
                 var compCfgList=JSON.parse(JSON.stringify(this.compCfgList))
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
index 4246a13d..ffe12485 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
@@ -212,7 +212,7 @@
 				this.filters.iteration=null
 			},
 			initData(){
-				debugger;
+				
 				if(this.xmTestPlan){
 					this.filters.productId=this.xmTestPlan.productId
 					this.filters.projectId=this.xmTestPlan.projectId
diff --git a/src/views/xm/core/xmTestPlanCase/TestStepResult.vue b/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
index 28c5f122..f7a3d211 100644
--- a/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
+++ b/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
@@ -126,7 +126,7 @@
 			
 
 			getExecStatusIcon(execStatus){
-				debugger;
+				
 				var icons=['el-icon-arrow-up','el-icon-right','el-icon-check','el-icon-minus','el-icon-close'];
 				if(!execStatus){
 					return icons[0]