From 59bc277980e06ecfd337265e2f2cae37d80db185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 1 Jul 2022 02:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1=E4=BC=97?=
 =?UTF-8?q?=E5=8C=85=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/xm/core/xmTask.js               |  2 +-
 src/views/xm/core/xmTask/XmTaskEdit.vue | 19 ++++++++++++++++++-
 src/views/xm/core/xmTask/XmTaskMng.vue  |  2 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/api/xm/core/xmTask.js b/src/api/xm/core/xmTask.js
index 4015407b..7453f5d3 100644
--- a/src/api/xm/core/xmTask.js
+++ b/src/api/xm/core/xmTask.js
@@ -82,7 +82,7 @@ export const getXmTaskSort = params => { return axios.get(`${base}/xm/core/xmTas
 //初始化页面上的字典
 export const initDicts = (that) => {
     //任务类型字典taskState,交易模式字典tranMode,能力要求字典capaLvl,保障要求字典supRequire,会员权益等级memInterestLvl
-    var itemCodes=['planType','taskType','priority','xmTaskSettleSchemel','taskState','bidStep','tranMode','capaLvl','supRequire','memInterestLvl'];//在此添加要加载的字典 如['sex','grade','lvl']
+    var itemCodes=['planType','taskType','priority','xmTaskSettleSchemel','taskState','bidStep','tranMode','capaLvl','supRequire','memInterestLvl','regionType'];//在此添加要加载的字典 如['sex','grade','lvl']
     if(itemCodes.length>0){
        initSimpleDicts('all',itemCodes).then(res=>{
            Object.assign(that.dicts,res.data.data)
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 0d51663f..612e3419 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -262,6 +262,23 @@
 									</el-select>
 								</el-form-item> 
 							</el-col>
+							
+						</el-row>
+						<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>
+								</el-form-item> 
+							</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>   
+
+								</el-form-item> 
+							</el-col>
+							
 						</el-row>
 					</el-tab-pane>
 					<el-tab-pane label="关注" name="91"> 
@@ -398,7 +415,7 @@
 					id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'3',sortLevel:'0',executorUserid:'',executorUsername:'',
 					preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',taskOut:'0',
 					rate:0,budgetAt:'',budgetWorkload:'',actAt:'',actWorkload:'',taskState:'0',taskClass:'0',toTaskCenter:'0',actStartTime:'',actEndTime:'',taskType:'4',planType:'w2',settleSchemel:'1',ntype:'0',childrenCnt:0,wtype:'',rworkload:0,
-					uniInnerPrice:80,uniOutPrice:100,crowd:'0',oshare:'0',shareFee:0,menuName:'',hot:'0',top:'0',urgent:'0',crmSup:'0',bidStep:'0',capaLvls:'',interestLvls:'0',supRequires:'0',tranMode:'0'
+					uniInnerPrice:80,uniOutPrice:100,crowd:'0',oshare:'0',shareFee:0,menuName:'',hot:'0',top:'0',urgent:'0',crmSup:'0',bidStep:'0',capaLvls:'',interestLvls:'0',supRequires:'0',tranMode:'0',cityId:'',cityName:'',regionType:'0'
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
  				menuVisible:false,
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 76e46884..5bf00039 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1056,6 +1056,7 @@ export default {
         actStartTime: "",
         actEndTime: "",
         uniInnerPrice:80,uniOutPrice:100,
+        cityId:'',cityName:'',regionType:'0'
       },
 
       editFormVisible: false, //编辑界面是否显示
@@ -1093,6 +1094,7 @@ export default {
         actStartTime: "",
         actEndTime: "",
         uniInnerPrice:80,uniOutPrice:100,
+        cityId:'',cityName:'',regionType:'0'
       },
       /**begin 自定义属性请在下面加 请加备注**/
       taskStateList: ["待领取", "已领取执行中", "已完工", "已结算"],