From 59d09b8da92418443da664230a34438544656af0 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, 10 Nov 2023 15:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/crowd/XmTaskCrowdMng.vue    | 22 ++++---------------
 src/views/xm/core/wiki/archive/WikiList.vue   |  7 +++---
 .../xm/core/wiki/archive/WikiMenuEdit.vue     |  3 +--
 src/views/xm/core/xmMenu/XmMenuEdit.vue       | 10 ++++-----
 src/views/xm/core/xmProduct/XmProductEdit.vue | 21 ++++++++----------
 src/views/xm/core/xmProject/XmProjectEdit.vue |  6 ++---
 src/views/xm/core/xmTask/XmTaskEdit.vue       | 13 ++++++++---
 7 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
index bc79de76..a3296b9d 100644
--- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue
+++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
@@ -248,15 +248,8 @@
                 type="taskState"
                 width="100"
               >
-								<template slot-scope="scope">
-									<div class="cell-text">
-										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterTaskStateDicts(scope.row.taskState)" :key="index">{{item.name}}</el-button>
-									</div>
-									<span class="cell-bar">
-										 <el-select  v-model="scope.row.taskState" placeholder="任务状态"  style="display:block;"  @change="editXmTaskSomeFields(scope.row,'taskState',$event)">
-												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.taskState" :key="index"></el-option>
-										 </el-select>
-									</span>
+								<template slot-scope="scope"> 
+                  <mdp-select show-style="tag" item-code="taskState" v-model="scope.row.taskState" @change="editXmTaskSomeFields(scope.row,'taskState',$event)"/>
 								</template>
               </el-table-column>
 
@@ -265,15 +258,8 @@
                 type="level"
                 width="100"
               >
-								<template slot-scope="scope">
-									<div class="cell-text">
-										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterPriorityDicts(scope.row.level)" :key="index">{{item.name}}</el-button>
-									</div>
-									<span class="cell-bar">
-										 <el-select  v-model="scope.row.level" placeholder="优先级"  style="display:block;"  @change="editXmTaskSomeFields(scope.row,'level',$event)">
-												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.priority" :key="index"></el-option>
-										 </el-select>
-									</span>
+								<template slot-scope="scope"> 
+                  <mdp-select show-style="tag" item-code="priority" v-model="scope.row.level" @change="editXmTaskSomeFields(scope.row,'level',$event)"/>
 								</template>
               </el-table-column>
               <el-table-column
diff --git a/src/views/xm/core/wiki/archive/WikiList.vue b/src/views/xm/core/wiki/archive/WikiList.vue
index 6f7c86c2..57fecf01 100644
--- a/src/views/xm/core/wiki/archive/WikiList.vue
+++ b/src/views/xm/core/wiki/archive/WikiList.vue
@@ -78,7 +78,7 @@
 							<el-table-column type="index" width="40"></el-table-column>
 							<el-table-column prop="archiveType" label="主题" width="100">
 								<template slot-scope="scope">
-								 <el-tag v-for="(item,index) in formatDictsWithClass(dicts,'categoryType',scope.row.archiveType)" :key="index" :type="item.className">{{item.name}}</el-tag>
+ 									<mdp-select show-style="tag" item-code="categoryType" v-model="scope.row.archiveType" :disabled="true"/>
 								</template>
 							</el-table-column>
 							<el-table-column prop="archiveTitle" label="标题" min-width="150" show-overflow-tooltip>
@@ -89,8 +89,8 @@
 							<el-table-column prop="authorName" label="作者" min-width="80" show-overflow-tooltip></el-table-column> 
 							<el-table-column prop="status" label="状态" min-width="80" show-overflow-tooltip>
 								<template slot-scope="scope">
-									<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'archiveStatus',scope.row.status)" :key="index" :type="item.className">{{item.name}}</el-tag>
-								</template>
+									<mdp-select show-style="tag" item-code="archiveStatus" v-model="scope.row.status" :disabled="true"/> 
+ 								</template>
 							</el-table-column>
 							<!-- <el-table-column prop="categoryId" label="分类" min-width="80" show-overflow-tooltip :formatter="formatterCategoryid"></el-table-column> -->
 							<el-table-column prop="tagNames" label="标签" min-width="80" show-overflow-tooltip></el-table-column> 
@@ -542,7 +542,6 @@
 		mounted() { 
 			
 			this.$nextTick(() => {
-				initDicts(this)
 				this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
 				this.getArchives();
 				
diff --git a/src/views/xm/core/wiki/archive/WikiMenuEdit.vue b/src/views/xm/core/wiki/archive/WikiMenuEdit.vue
index ccde4cb2..f80b0dd6 100644
--- a/src/views/xm/core/wiki/archive/WikiMenuEdit.vue
+++ b/src/views/xm/core/wiki/archive/WikiMenuEdit.vue
@@ -144,8 +144,7 @@
 		},
 		mounted() { 
 			  
-			this.$nextTick(() => {
-				initDicts(this);
+			this.$nextTick(() => { 
 				this.initData()   
 			});
 			  
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 03f2b758..da90a003 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -139,7 +139,7 @@
 								</mdp-field>
 							</el-col>
 							<el-col :span="8">
- 										<mdp-date-range label="起止时间" type="daterange" :style-obj="{maxWidth:'100%'}" :auto-default="false"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="editForm" start-key="startTime" end-key="endTime"  @change="editXmMenuSomeFields(editForm,'startTime',editForm)"></mdp-date-range>
+ 										<mdp-date-range show-style="tag" label="起止时间" type="daterange" :style-obj="{maxWidth:'100%'}" :auto-default="false"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="editForm" start-key="startTime" end-key="endTime"  @change="editXmMenuSomeFields(editForm,'startTime',editForm)"></mdp-date-range>
 
  							</el-col>
 						</el-row>
@@ -693,10 +693,10 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
 			CommentArea,
 			XmFuncSelect,
 		},
-		mounted() {
-
-
-
+		mounted() { 
+			this.$mdp.ajaxGetDictOptions('menuStatus').then(res=>{
+				this.dicts['menuStatus']=res.data.options
+			})
 			this.editForm=Object.assign(this.editForm, this.xmMenu);
 			this.editFormBak=Object.assign({},this.editForm)
 			if(this.reload==true){
diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue
index 7d73c2c6..6a0ebb77 100644
--- a/src/views/xm/core/xmProduct/XmProductEdit.vue
+++ b/src/views/xm/core/xmProduct/XmProductEdit.vue
@@ -53,10 +53,9 @@
           <el-col :span="8">
             <el-form-item prop="admUserid" label-width="0px">
               <mdp-select-user show-style="x" size="medium"
-                label=" 产品总控"
-                userid-key="admUserid"
-                username-key="admUsername"
-                v-model="editForm"
+                label=" 产品总控" 
+                v-model="editForm.admUserid"
+                :init-name="editForm.admUsername"
                 @change="editSomeFields(editForm, 'admUserid', $event)"
               ></mdp-select-user>
             </el-form-item>
@@ -64,10 +63,9 @@
           <el-col :span="8">
             <el-form-item prop="pmUserid" label-width="0px">
               <mdp-select-user show-style="x" size="medium"
-                label=" 产品经理"
-                userid-key="pmUserid"
-                username-key="pmUsername"
-                v-model="editForm"
+                label=" 产品经理" 
+                v-model="editForm.pmUserid"
+                :init-name="editForm.pmUsername"
                 @change="editSomeFields(editForm, 'pmUserid', $event)"
               ></mdp-select-user>
             </el-form-item>
@@ -75,10 +73,9 @@
           <el-col :span="8">
             <el-form-item prop="assUserid" label-width="0px">
               <mdp-select-user show-style="x" size="medium"
-                label=" 副经理、助理"
-                userid-key="assUserid"
-                username-key="assUsername"
-                v-model="editForm"
+                label=" 副经理、助理" 
+                v-model="editForm.assUserid"
+                :init-name="editForm.assUsername"
                 @change="editSomeFields(editForm, 'assUserid', $event)"
               ></mdp-select-user>
             </el-form-item>
diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index 7104ff26..5a0330c2 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -38,19 +38,19 @@
 							<el-row class="padding">
 								<el-col :span="8">
 							<el-form-item  prop="admUserid" label-width="0px">
-								<mdp-select-user show-style="x" size="medium" label=" 项目总控" userid-key="admUserid" username-key="admUsername" v-model="editForm" @change="editXmProjectSomeFields(editForm,'admUserid',$event)"></mdp-select-user>
+								<mdp-select-user show-style="x" size="medium" label=" 项目总控" v-model="editForm.admUserid" :init-name="editForm.admUsername" @change="editXmProjectSomeFields(editForm,'admUserid',$event)"></mdp-select-user>
 							</el-form-item>
 								</el-col>
 								<el-col :span="8">
 
 							<el-form-item prop="pmUserid" label-width="0px">
-								<mdp-select-user show-style="x" size="medium" label=" 项目经理" userid-key="pmUserid" username-key="pmUsername" v-model="editForm" @change="editXmProjectSomeFields(editForm,'pmUserid',$event)"></mdp-select-user>
+								<mdp-select-user show-style="x" size="medium" label=" 项目经理" v-model="editForm.pmUserid" :init-name="editForm.pmUsername" @change="editXmProjectSomeFields(editForm,'pmUserid',$event)"></mdp-select-user>
 
 							</el-form-item>
 								</el-col>
 								<el-col :span="8">
 							<el-form-item  prop="assUserid" label-width="0px">
-								<mdp-select-user show-style="x" size="medium" label=" 副经理、助理" userid-key="assUserid" username-key="assUsername" v-model="editForm" @change="editXmProjectSomeFields(editForm,'assUserid',$event)"></mdp-select-user>
+								<mdp-select-user show-style="x" size="medium" label=" 副经理、助理" v-model="editForm.assUserid" :init-name="editForm.pmUsername"  @change="editXmProjectSomeFields(editForm,'assUserid',$event)"></mdp-select-user>
 
 							</el-form-item>
 								</el-col>
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 6e759a2f..33442cd5 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -1072,9 +1072,16 @@
 			"v-region":RegionGroup ,
 			//在下面添加其它组件 'xm-task-edit':XmTaskEdit
 		},
-		mounted() {
-			this.$nextTick(()=>{
-				initDicts(this);
+		mounted() { 
+			this.$mdp.ajaxGetDictOptions('bidStep').then(res=>{
+				this.dicts['bidStep']=res.data.options
+			})
+			
+			this.$mdp.ajaxGetDictOptions('taskState').then(res=>{
+				this.dicts['taskState']=res.data.options
+			})
+			this.$nextTick(()=>{ 
+
 				this.editForm=Object.assign(this.editForm, this.xmTask);
 				this.editFormBak=Object.assign({},this.editForm)
 				this.supRequires=this.editForm.supRequires?this.editForm.supRequires.split(","):[]