From c6bbb9a89176c655b59774a2486cfdf5fcdb1102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 28 Feb 2022 21:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mdp/arc/tag/TagMng.vue        | 75 ++++++++++++-------------
 src/views/xm/core/skill/skillMng.vue    | 42 ++++++++++++--
 src/views/xm/core/xmTask/XmTaskAdd.vue  | 43 +++++++-------
 src/views/xm/core/xmTask/XmTaskEdit.vue | 18 +++---
 4 files changed, 103 insertions(+), 75 deletions(-)

diff --git a/src/views/mdp/arc/tag/TagMng.vue b/src/views/mdp/arc/tag/TagMng.vue
index 8f000bfb..a5181830 100644
--- a/src/views/mdp/arc/tag/TagMng.vue
+++ b/src/views/mdp/arc/tag/TagMng.vue
@@ -1,58 +1,58 @@
 <template>
-  <section>
-    <!-- <sticky :className="'sub-navbar draft'" style="margin-left:-20px;margin-right:-20px;"> -->
-    <el-row>
+  <section> 
+    <el-row v-if="editVisible==false"> 
+      <el-col :span="14"> 
+        <el-button @click="getTags" v-loading="sectionLoading" style="">查询</el-button>
+        <el-button type="primary" v-if="jump==true" @click="selectConfirm">确认</el-button>  
+        <el-button type="text"  @click="editVisible=true" icon="el-icon-edit">管理标签</el-button>
+      </el-col> 
+    </el-row> 
+    <el-row v-else>
       <el-col :span="6">
         <el-input style="width:99%;" v-model="needAddTagCategoryNameInputValue" placeholder="标签分类，回车直接添加"
-          @keyup.enter.native="addTagCategorySubmitMethod"></el-input>
-
+          @keyup.enter.native="addTagCategorySubmitMethod"></el-input> 
       </el-col>
       <el-col :span="14">
         <el-checkbox v-if="userInfo.isPlatformAdmin||userInfo.isSuperAdmin" v-model="isPub" true-label='1'
           false-label='0'>公共分类</el-checkbox>
         <el-button @click="getTags" v-loading="sectionLoading" style="">查询</el-button>
-        <el-button type="primary" v-if="jump==true" @click="selectConfirm">确认</el-button>
+        <el-button type="primary"  @click="editVisible=false">确认</el-button>
 
 
-      </el-col>
-      <!-- <el-col :span="4" class="hidden-sm-and-down">
-			 	<el-tooltip content="黄色表示已经有的标签"><span class="addTagSquare"></span></el-tooltip>
-				 <el-tooltip content="白色表示尚未拥有的标签"><span class="closeTagSquare"></span></el-tooltip>
+      </el-col> 
+    </el-row> 
+    <el-row class="page-container border" v-if="editVisible==false">
+
+      <el-row v-for="(item,index) in convertTags" :key="item.categoryId" class="padding">
+        <h3>
+          <div>{{item.categoryName+(item.pubc=='1'?'(公共)':'')}} </div> 
+        </h3> 
+
+        <el-tag :key="valueIndex" v-for="(i,valueIndex) in item.values"   :disable-transitions="false"  
+            :color="i.checked?'':'#ffffff'" :effect="i.checked?'dark':'light'"  @click="clickTagMethod(index,valueIndex)">
+          {{i.tagName +(i.pubTag=='1'?'(公共)':'')}}
+        </el-tag> 
+      </el-row>
+
 
-			</el-col> -->
     </el-row>
-    </sticky>
-    <el-row class="page-container border">
+    <el-row class="page-container border" v-else>
 
-      <el-row v-for="(item,index) in convertTags" :key="item.categoryId">
+      <el-row v-for="(item,index) in convertTags" :key="item.categoryId" class="padding">
         <h3>
           <div>{{item.categoryName+(item.pubc=='1'?'(公共)':'')}}<i class="el-icon-close closeStyle"
               @click.stop="delTagCategoryMethod(item.categoryId,index)"></i></div>
 
-        </h3>
-        <!--el-icon-circle-close-->
+        </h3> 
 
-        <el-tag :key="tagName" v-for="(i,valueIndex) in item.values" closable :disable-transitions="false"
+        <el-tag :key="valueIndex" v-for="(i,valueIndex) in item.values" closable :disable-transitions="false"  
           @close="delTagMethod(i.tagId,index,valueIndex)" :color="i.checked?'':'#ffffff'" :effect="i.checked?'dark':'light'"  @click="clickTagMethod(index,valueIndex)">
           {{i.tagName +(i.pubTag=='1'?'(公共)':'')}}
         </el-tag>
         <el-input class="input-new-tag" v-if="item.showAddButtonVisible" v-model="item.showAddButtonInputValue"
           ref="saveTagInput" size="small" @keyup.enter.native="addTagMethod(index)" @blur="addTagMethod(index)">
         </el-input>
-        <el-button v-else class="button-new-tag" size="small" @click="showAddButtonMethod(index)">+ 标签</el-button>
-
-
-        <!-- <el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;">
-					<div :class="v.checked?'checkCopyButton':''" v-for="(v,valueIndex) in item.values" :key="valueIndex"
-					 @click="clickTagMethod(index,valueIndex)">{{v.tagName +(v.pubTag=='1'?'(公共)':'')}}
-						<i class="el-icon-close closeStyle" @click.stop="delTagMethod(v.tagId,index,valueIndex)"></i>
-					</div>
-					<div class="input-tag" v-if="item.showAddButtonVisible">
-						<el-input style="200px;" v-model="item.showAddButtonInputValue" placeholder="请输入标签,回车即可" @keyup.enter.native="addTagMethod(index)" autofocus></el-input>
-
-          			</div>
-					<div v-else class="add" @click="showAddButtonMethod(index)"><i class="el-icon-circle-plus-outline" style="font-size:35px;"></i></div>
-				</el-col> -->
+        <el-button v-else class="button-new-tag" size="small" @click="showAddButtonMethod(index)">+ 标签</el-button> 
       </el-row>
 
 
@@ -62,9 +62,7 @@
 
 <script>
   import util from '@/common/js/util'; //全局公共库
-  import Sticky from '@/components/Sticky' // 粘性header组件
-  //import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-  import {
+   import {
     listTag,
     delTag,
     batchDelTag,
@@ -170,7 +168,8 @@
           isPub: '',
         },
         /**begin 自定义属性请在下面加 请加备注**/
-        isPub: '0'
+        isPub: '0',
+        editVisible:false,
         /**end 自定义属性请在上面加 请加备注**/
       }
     }, //end data
@@ -604,11 +603,7 @@
       /**end 自定义函数请在上面加**/
 
     }, //end methods
-    components: {
-      // 'mem-member-tag-add': MemMemberTagAdd,
-      // 'mem-member-tag-edit': MemMemberTagEdit,
-      // 'mem-member-mng':MemMemberMng,//User列表
-      'sticky': Sticky
+    components: { 
       //在下面添加其它组件
     },
     mounted() {
diff --git a/src/views/xm/core/skill/skillMng.vue b/src/views/xm/core/skill/skillMng.vue
index a370ac8c..cd8ed0a6 100644
--- a/src/views/xm/core/skill/skillMng.vue
+++ b/src/views/xm/core/skill/skillMng.vue
@@ -1,11 +1,25 @@
 <template>
   <section class="page-container page-full-height padding border">
     <el-row >
-      <el-row>
+      <el-row v-if="editVisible==false">
         <el-col :span="10"> 
           <el-button type="primary" v-if="jump==true" @click="selectConfirm" icon="el-icon-finished">确认选择</el-button>
           <el-button  @click="getAllHrSkill" v-loading="sectionLoading" icon="el-icon-search">刷新标签</el-button>
         </el-col> 
+        <el-col :span="14"> 
+           <el-button type="primary"  @click="editVisible=true" icon="el-icon-edit">维护</el-button> 
+          <el-tooltip content="黄色表示已经有的技能">
+            <span class="addTagSquare"></span>
+          </el-tooltip>
+          <el-tooltip content="白色表示尚未拥有的技能">
+            <span class="closeTagSquare"></span>
+          </el-tooltip>
+        </el-col> 
+      </el-row>
+      <el-row v-else>
+        <el-col :span="10"> 
+          <el-button type="primary"  @click="editVisible=false" icon="el-icon-finished">确认</el-button> 
+        </el-col> 
         <el-col :span="14">
           <el-checkbox 
             v-model="isPub"
@@ -28,8 +42,27 @@
         </el-col> 
       </el-row>
     </el-row>
-    <el-row class="app-container max-height-box">
-      <el-row v-for="(item,index) in convertSkills" :key="item.categoryId">
+    <el-row class="app-container max-height-box" v-if="editVisible==false">
+      <el-row v-for="(item,index) in convertSkills" :key="item.categoryId" class="padding">
+        <h3>
+          <div>
+            {{item.categoryName+(item.pubc=='1'?'(公共)':'')}} 
+          </div>
+        </h3>
+        <el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;">
+          <div
+            :class="v.checked?'checkCopyButton':'copyButton'"
+            v-for="(v,valueIndex) in item.values"
+            :key="valueIndex"
+            @click="clickTagMethod(index,valueIndex)"
+          >
+            {{v.skillName +(v.pubSkill=='1'?'':'')}} 
+          </div>  
+        </el-col>
+      </el-row>
+    </el-row>
+    <el-row class="app-container max-height-box" v-else>
+      <el-row v-for="(item,index) in convertSkills" :key="item.categoryId" class="padding">
         <h3>
           <div>
             {{item.categoryName+(item.pubc=='1'?'(公共)':'')}}
@@ -41,7 +74,7 @@
         </h3>
         <el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;">
           <div
-            :class="v.checked?'checkCopyButton':'copyButton'"
+            :class="'copyButton'"
             v-for="(v,valueIndex) in item.values"
             :key="valueIndex"
             @click="clickTagMethod(index,valueIndex)"
@@ -121,6 +154,7 @@ export default {
       convertSkills: [],
       needAddTagCategoryNameInputValue: "",
       isPub: "0",
+      editVisible:false,
     };
   }, //end data
   methods: {
diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 543f2626..22b1e9f5 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -74,9 +74,8 @@
 						<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="addForm.description" placeholder="任务描述" ></el-input>
 					</el-form-item>
 					</div>
-				</el-card>
-				<div v-if="addForm.ntype!='1'">
- 				<el-card class="box-card" id="planInfoAdd" header="进度计划" shadow="hover">
+				</el-card> 
+ 				<el-card class="box-card" id="planInfoAdd" header="进度计划" shadow="hover" v-if="addForm.ntype!='1'">
 					<el-form-item label="任务负责人">
 						<el-tag  v-if="addForm.createUserid" style="margin-left:10px;border-radius:30px;"  >{{addForm.createUsername}}</el-tag>
 						<el-tag  v-else style="margin-left:10px;border-radius:30px;"  icon="el-icon-right" >未设置</el-tag>
@@ -136,13 +135,13 @@
 						<el-input-number v-model="addForm.budgetCost" :precision="2" :step="1000" :min="0" placeholder="预算金额"></el-input-number>   元
 					</el-form-item>
 					<el-form-item label="实际工作量" prop="actWorkload" shadow="hover">
-						<el-input-number v-model="addForm.actWorkload" :precision="2" :step="8" :min="0" placeholder="实际工作量"></el-input-number>  <el-tag>由后台自动计算，无需填写</el-tag>
+						<el-input-number disabled v-model="addForm.actWorkload" :precision="2" :step="8" :min="0" placeholder="实际工作量"></el-input-number>  <el-tag>由后台自动计算，无需填写</el-tag>
 					</el-form-item>
 					<el-form-item label="实际金额" prop="actCost">
-						<el-input-number v-model="addForm.actCost" :precision="2" :step="1000" :min="0" placeholder="实际金额"></el-input-number>    <el-tag>由后台自动计算，无需填写</el-tag>
+						<el-input-number disabled v-model="addForm.actCost" :precision="2" :step="1000" :min="0" placeholder="实际金额"></el-input-number>    <el-tag>由后台自动计算，无需填写</el-tag>
 					</el-form-item>
 				 </el-card>
- 				<el-card class="box-card" header="结算信息" id="settleInfoAdd" shadow="hover">
+ 				<el-card class="box-card" header="结算信息" id="settleInfoAdd" shadow="hover" v-if="addForm.ntype!='1'">
 					<el-form-item label="是否结算" prop="taskClass">
 						<el-checkbox v-model="addForm.taskClass" true-label="1" false-label="0">是否需要结算</el-checkbox>
 					</el-form-item>
@@ -153,7 +152,7 @@
 					</el-form-item>
 				 </el-card>
 
-				<el-card class="box-card" header="众包" id="taskOutAdd">
+				<el-card class="box-card" header="众包" id="taskOutAdd" v-if="addForm.ntype!='1'">
 					<el-form-item label="众包配置" prop="taskOut">
 						<el-checkbox v-model="addForm.taskOut" @change="onTaskOutChange" true-label="1" false-label="0">外包任务</el-checkbox>
 						<el-checkbox v-model="addForm.toTaskCenter" true-label="1" false-label="0" id="taskOut">发布到互联网任务大厅</el-checkbox>
@@ -170,8 +169,7 @@
 							<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step>
 						</el-steps>
 					</el-form-item>
-				 </el-card>
-				 </div>
+				 </el-card> 
 			</el-form>
 		</el-row>
 		<el-row class="page-bottom padding">
@@ -220,21 +218,24 @@
 		computed: {
 			...mapGetters([
 				'userInfo','roles'
-			]),
+			]), 
 			calcTaskStep(){
 				if(!this.addForm.executorUserid){
 					return 1
-				}else if(this.addForm.exeUsernames.indexOf('执行中')>=0){
-					return 2
-				}else if(this.addForm.exeUsernames.indexOf('已验收')>=0){
-					return 3
-				}else if(this.addForm.exeUsernames.indexOf('已验收')>=0){
-					return 3
-				}else if(this.addForm.exeUsernames.indexOf('已验收')>=0){
-					return 3
-				} if(this.addForm.exeUsernames.indexOf('已结算')>=0){
-					return 4
-				}
+				}else if(this.addForm.exeUsernames) {
+					
+					if(this.addForm.exeUsernames.indexOf('执行中')>=0){
+						return 3
+					}else if(this.addForm.exeUsernames.indexOf('已验收')>=0){
+						return 4
+					}else if(this.addForm.exeUsernames.indexOf('已验收')>=0){
+						return 4
+					}else if(this.addForm.exeUsernames.indexOf('已验收')>=0){
+						return 4
+					} if(this.addForm.exeUsernames.indexOf('已结算')>=0){
+						return 5
+					}
+				} 
 			}
 		},
 		props:['xmTask','visible','xmProject','projectPhase',"parentTask"],
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 3d262e5e..082a1962 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -73,9 +73,8 @@
 						<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="editForm.description" placeholder="任务描述" ></el-input>
 					</el-form-item>  
 					</div>
-				</el-card> 
-				<div v-if="editForm.ntype!='1'">
- 				<el-card class="box-card" id="planInfo" header="进度计划" shadow="hover" > 
+				</el-card>  
+ 				<el-card class="box-card" id="planInfo" header="进度计划" shadow="hover" v-if="editForm.ntype!='1'"> 
 					<el-form-item label="任务负责人"> 
 						<el-tag  v-if="editForm.createUserid" style="margin-left:10px;border-radius:30px;"  >{{editForm.createUsername}}</el-tag>
 						<el-tag  v-else style="margin-left:10px;border-radius:30px;"  icon="el-icon-right" >未设置</el-tag>
@@ -140,14 +139,14 @@
 						<el-checkbox v-model="editForm.taskOut" @change="onTaskOutChange" true-label="1" false-label="0">是否为众包任务</el-checkbox> 
 						<el-input-number v-model="editForm.budgetCost" :precision="2" :step="1000" :min="0" placeholder="预算金额"></el-input-number>   元
 					</el-form-item>  
-					<el-form-item label="实际工作量" prop="actWorkload" shadow="hover">
-						<el-input-number v-model="editForm.actWorkload" :precision="2" :step="8" :min="0" placeholder="实际工作量"></el-input-number>  <el-tag>由后台自动计算，无需填写</el-tag>     
+					<el-form-item  label="实际工作量" prop="actWorkload" shadow="hover">
+						<el-input-number disabled v-model="editForm.actWorkload" :precision="2" :step="8" :min="0" placeholder="实际工作量"></el-input-number>  <el-tag>由后台自动计算，无需填写</el-tag>     
 					</el-form-item> 
 					<el-form-item label="实际金额" prop="actCost">
-						<el-input-number v-model="editForm.actCost" :precision="2" :step="1000" :min="0" placeholder="实际金额"></el-input-number>    <el-tag>由后台自动计算，无需填写</el-tag>  
+						<el-input-number disabled v-model="editForm.actCost" :precision="2" :step="1000" :min="0" placeholder="实际金额"></el-input-number>    <el-tag>由后台自动计算，无需填写</el-tag>  
 					</el-form-item>   
 				 </el-card>  
- 				<el-card class="box-card" header="结算信息" id="settleInfo" shadow="hover">   
+ 				<el-card class="box-card" header="结算信息" id="settleInfo" shadow="hover" v-if="editForm.ntype!='1'">   
 					<el-form-item label="是否结算" prop="taskClass">
 						<el-checkbox v-model="editForm.taskClass" true-label="1" false-label="0">是否需要结算</el-checkbox> 
 					</el-form-item>  
@@ -158,7 +157,7 @@
 					</el-form-item>   
 				 </el-card>
 				 
-				<el-card class="box-card" header="众包" id="taskOut">  
+				<el-card class="box-card" header="众包" id="taskOut" v-if="editForm.ntype!='1'">  
 					<el-form-item label="众包配置" prop="taskOut">
 						<el-checkbox v-model="editForm.taskOut" @change="onTaskOutChange" true-label="1" false-label="0">外包任务</el-checkbox> 
 						<el-checkbox v-model="editForm.toTaskCenter" true-label="1" false-label="0" id="taskOut">发布到互联网任务大厅</el-checkbox>  
@@ -175,8 +174,7 @@
 							<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step> 
 						</el-steps>
 					</el-form-item> 
-				 </el-card>  
-				</div>
+				 </el-card>   
 			</el-form>  
 		</el-row>
 		<el-row class="padding">