From 33397e80fcc0117d64b39ba7b480b921e09fd7e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 7 Nov 2023 17:37:07 +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/components/mdp-ui/index.scss              |  7 +-
 .../mdp-ui/mdp-date-range/Index.vue           | 97 ++++++++++---------
 src/components/mdp-ui/mdp-date/Index.vue      | 64 ++++++------
 src/components/mdp-ui/mdp-field/Index.vue     | 74 +++++++-------
 src/views/xm/core/xmTask/XmTaskEdit.vue       |  5 +-
 src/views/xm/rpt/branch/branchRptOverview.vue |  4 +-
 6 files changed, 128 insertions(+), 123 deletions(-)

diff --git a/src/components/mdp-ui/index.scss b/src/components/mdp-ui/index.scss
index 39c4c40a..48201337 100644
--- a/src/components/mdp-ui/index.scss
+++ b/src/components/mdp-ui/index.scss
@@ -99,11 +99,8 @@
   display: inline;
 }
 
-.dashed-circle {
-  width: 40px;
-  height: 40px;
-  border: 2px dashed #000000;
-  border-radius: 40px/40px;
+.dashed-circle { 
+  border: 2px dashed #000000; 
 }
 .field-box:hover .dashed-circle {
   border: 2px dashed #409eff;
diff --git a/src/components/mdp-ui/mdp-date-range/Index.vue b/src/components/mdp-ui/mdp-date-range/Index.vue
index 48b04698..483dd725 100644
--- a/src/components/mdp-ui/mdp-date-range/Index.vue
+++ b/src/components/mdp-ui/mdp-date-range/Index.vue
@@ -1,50 +1,55 @@
 <template> 
-                  <el-date-picker v-if="showStyle=='origin'||showStyle==''||!showStyle" :type="type" :style="styleObj"  v-model="dateRange" :value-format="valueFormat" :format="format" 
-                      unlink-panels 
-                      :range-separator="rangeSepaSrator"
-                      :start-placeholder="startPlaceholder"
-                      :end-placeholder="endPlaceholder"
-                      :default-range="[-30,0]"
-                      @change="onDateRangeChange"
-                      :picker-options="pickerOptions"   
-                      ></el-date-picker>    
-<span v-else :class="showStyle=='x'?{'field-box-x':true}:{'field-box':true}" >  
-							<el-avatar v-if="showAvater!=false" class="field-avater" :class="{'dashed-circle':avaterCpd.isNull,disabled:disabled===true,enabled:disabled!==true}"  :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar> 
-							
-              <span class="field-info"  :class="{disabled:disabled===true,enabled:disabled!==true}">
-                <slot name="field-info" :value="dateRange">
-
-
-                <span v-if="showStyle=='x'">
-                  <span class="field-value" v-if="!avaterCpd.isNull">{{avaterCpd.innerText}} </span> 
-								   <span class="field-value" v-else><span class="label-font-color">无</span></span> 
-                <slot name="label">
-								  <span class="field-label">{{label||'请选择日期'}}</span>
-                  
-                  
-                </slot>
-                  </span>
-                    <span v-else>
-                      <slot name="value" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
-                        <span  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</span> 
-                        <span v-else class="label-font-color">无</span>
-                      </slot> 
-                    </span>
-                </slot>
-							</span>   
-              <span v-if="disabled!==true" class="field-oper"  :class="{disabled:disabled===true,enabled:disabled!==true}">
-                    
-                  <el-date-picker :type="type" :style="styleObj"  v-model="dateRange" :value-format="valueFormat" :format="format" 
-                      unlink-panels 
-                      :range-separator="rangeSepaSrator"
-                      :start-placeholder="startPlaceholder"
-                      :end-placeholder="endPlaceholder"
-                      :default-range="[-30,0]"
-                      @change="onDateRangeChange"
-                      :picker-options="pickerOptions"   
-                      ></el-date-picker>  
-              </span>
-						</span>  
+<span>
+  <span v-if="showStyle=='origin'||showStyle==''||!showStyle">
+    <el-date-picker :type="type" :style="styleObj"  v-model="dateRange" :value-format="valueFormat" :format="format" 
+      unlink-panels 
+      :range-separator="rangeSepaSrator"
+      :start-placeholder="startPlaceholder"
+      :end-placeholder="endPlaceholder"
+      :default-range="[-30,0]"
+      @change="onDateRangeChange"
+      :picker-options="pickerOptions"   
+      ></el-date-picker>    
+  </span>
+  <span v-else :class="showStyle=='x'?{'field-box-x':true}:{'field-box':true}" >  
+    <slot class="field-avater" name="avater">
+      <el-avatar :size="size"  :class="{'dashed-circle':avaterCpd.isNull,disabled:disabled===true,enabled:disabled!==true}"  :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar> 
+    </slot> 
+    <span class="field-info"  :class="{disabled:disabled===true,enabled:disabled!==true}">
+      <slot name="info" :value="dateRange" > 
+        <span v-if="showStyle=='x'">
+          <div class="field-value">
+            <slot name="value"> 
+              <div  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</div> 
+              <div v-else class="label-font-color">无</div>
+            </slot> 
+          </div> 
+          <div class="field-label">
+              <slot name="label">{{label||'请选择日期'}}</slot>
+          </div>  
+        </span>
+        <span v-else class="field-value">
+          <slot name="value" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
+            <div  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</div> 
+            <div v-else class="label-font-color">无</div>
+          </slot> 
+        </span> 
+      </slot>  
+    </span>   
+    <span v-if="disabled!==true" class="field-oper"  :class="{disabled:disabled===true,enabled:disabled!==true}">
+          
+        <el-date-picker :type="type" :style="styleObj"  v-model="dateRange" :value-format="valueFormat" :format="format" 
+            unlink-panels 
+            :range-separator="rangeSepaSrator"
+            :start-placeholder="startPlaceholder"
+            :end-placeholder="endPlaceholder"
+            :default-range="[-30,0]"
+            @change="onDateRangeChange"
+            :picker-options="pickerOptions"   
+            ></el-date-picker>  
+    </span>
+  </span>  
+</span>
 </template>
 
 <script> 
diff --git a/src/components/mdp-ui/mdp-date/Index.vue b/src/components/mdp-ui/mdp-date/Index.vue
index a70bdb6e..537be177 100644
--- a/src/components/mdp-ui/mdp-date/Index.vue
+++ b/src/components/mdp-ui/mdp-date/Index.vue
@@ -2,47 +2,47 @@
 <el-date-picker  v-if="showStyle=='origin'||showStyle==''||!showStyle"  v-model="myVal" :value-format="valueFormat" :format="format"   
 @change="onChange" :type="type"
 :picker-options="pickerOptions"></el-date-picker>
+
 <span v-else :class="showStyle=='x'?{'field-box-x':true}:{'field-box':true}" @click="showSelect">  
   <slot>
-  <slot v-if="showStyle=='x'" name="avater" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}" >
+    <slot v-if="showStyle=='x'" name="avater" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}" >
         <el-avatar   :class="{'field-avater':true,'dashed-circle':avaterCpd.isNull,disabled:disabled===true,enabled:disabled!==true}" :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar>  
     </slot>
-<span class="field-info"  :class="{disabled:disabled===true,enabled:disabled!==true}"> 
-  <slot name="info">
-    <span v-if="showStyle=='x'">
-    <span class="field-value">
-      <slot name="value" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
-        <span  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</span> 
-        <span v-else class="label-font-color">无</span>
-      </slot> 
+    <span class="field-info"  :class="{disabled:disabled===true,enabled:disabled!==true}"> 
+      <slot name="info">
+        <span v-if="showStyle=='x'">
+          <div class="field-value">
+            <slot name="value" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
+              <div  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</div> 
+              <div v-else class="label-font-color">无</div>
+            </slot> 
+          </div>  
+            <div class="field-label" >
+              <slot name="label"> {{label}}</slot> 
+            </div>   
+        </span>
+        <span v-else>
+          <slot name="value" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
+            <div  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</div> 
+            <div v-else class="label-font-color">无</div>
+          </slot> 
+        </span>
+      </slot>
     </span>  
-      <span class="field-label" >
-        <slot name="label"> {{label}}</slot> 
-      </span>   
-    </span>
-      <span v-else>
-        <slot name="value" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
-          <span  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</span> 
-          <span v-else class="label-font-color">无</span>
-        </slot> 
-      </span>
+    <span class="field-oper" ref="operRef"  :class="{disabled:disabled===true,enabled:disabled!==true}"> 
+          <slot name="oper"   :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
+            <el-date-picker    v-model="myVal" :value-format="valueFormat" :format="format"  :type="type"
+            @change="onChange"
+            :picker-options="pickerOptions"></el-date-picker>
+          </slot>  
+    </span>   
   </slot>
-</span>  
-<span class="field-oper" ref="operRef"  :class="{disabled:disabled===true,enabled:disabled!==true}"> 
-        <slot name="oper"   :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
-          <el-date-picker    v-model="myVal" :value-format="valueFormat" :format="format"  :type="type"
-          @change="onChange"
-          :picker-options="pickerOptions"></el-date-picker>
-        </slot>  
-</span>  
-
-</slot>
 </span> 
-  </template>
+</template>
   
-  <script>  
+<script>  
   
-  import util  from '@/components/mdp-ui/js/util';//全局公共库
+import util  from '@/components/mdp-ui/js/util';//全局公共库
   
 import {MdpFieldMixin} from "../mixin/MdpFieldMixin.js" 
   export default {
diff --git a/src/components/mdp-ui/mdp-field/Index.vue b/src/components/mdp-ui/mdp-field/Index.vue
index 55b4cb27..505042c5 100644
--- a/src/components/mdp-ui/mdp-field/Index.vue
+++ b/src/components/mdp-ui/mdp-field/Index.vue
@@ -1,40 +1,44 @@
 <template>    
-    
-						<span :class="showStyle=='x'?{'field-box-x':true}:{'field-box':true}"  @click="showSelect">  
-              <slot>
-                <slot v-if="showStyle=='x'" name="avater" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}" >
-                     <el-avatar  :class="{'field-avater':true,'dashed-circle':avaterCpd.isNull,disabled:disabled===true,enabled:disabled!==true}" :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar>  
-                 </slot>
-              <span class="field-info"  :class="{disabled:disabled===true,enabled:disabled!==true}"> 
-                <slot name="info" v-if="showStyle=='x'" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
-                  <span class="field-value">
-                    <slot name="value" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
-                      <span  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</span> 
-                      <span v-else class="label-font-color">无</span>
-                    </slot> 
-                  </span>  
-                    <span class="field-label" >
-                      <slot name="label"> {{label}}</slot> 
-                    </span>   
-                </slot>
-                <slot name="info" v-else :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
-                    <slot name="value" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
-                      <span  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</span> 
-                      <span v-else class="label-font-color">无</span>
-                    </slot> 
-                </slot>
-							</span>  
-              <span class="field-oper" ref="operRef"  :class="{disabled:disabled===true,enabled:disabled!==true}"> 
-                      <slot name="oper"   :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
-                        <el-input v-model="myVal" :placeholder="placeholder" @change="onChange"></el-input>
-                      </slot>  
-              </span>  
-              
-              </slot>
-						</span> 
-  </template>
+  <span>
+    <span :class="showStyle=='x'?{'field-box-x':true}:{'field-box':true}"  @click="showSelect">  
+      <slot>
+        <slot v-if="showStyle=='x'" class="field-avater" name="avater" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}" >
+          <el-avatar :size="size" :class="{'dashed-circle':avaterCpd.isNull,disabled:disabled===true,enabled:disabled!==true}" :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar>  
+        </slot>
+        <span class="field-info"  :class="{disabled:disabled===true,enabled:disabled!==true}"> 
+          <slot name="info" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
+            <span v-if="showStyle=='x'" >
+              <div class="field-value">
+                <slot name="value" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
+                  <div  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</div> 
+                  <div v-else class="label-font-color">无</div>
+                </slot> 
+              </div>  
+              <div class="field-label" >
+                <slot name="label"> {{label}}</slot> 
+              </div>   
+            </span>
+            <span v-else>
+              <div  class="field-value">
+                <slot name="value" :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
+                  <div  v-if="!avaterCpd.isNull">{{avaterCpd.innerText}}</div> 
+                  <div v-else class="label-font-color">无</div>
+                </slot> 
+              </div>
+            </span>
+          </slot> 
+        </span>  
+        <span class="field-oper" ref="operRef"  :class="{disabled:disabled===true,enabled:disabled!==true}"> 
+          <slot name="oper"   :value="myVal" :field="{label:label,color:color,icon:icon,disabled:disabled,clearable:clearable}">
+            <el-input v-model="myVal" :placeholder="placeholder" @change="onChange"></el-input>
+          </slot>  
+        </span>  
+      </slot>
+    </span> 
+  </span>
+</template>
   
-  <script> 
+<script> 
 
 
 import {MdpFieldMixin} from "../mixin/MdpFieldMixin.js" 
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 07c4fd1a..4ffed811 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -149,7 +149,7 @@
 									<mdp-select-user show-style="x" v-if="editForm.crowd=='1'"  label="执行人" v-model="editForm.executorUserid">
 										<el-button slot="oper" @click="activateTabPaneName='42'">去管理竞标人</el-button>
 									</mdp-select-user>
-									<mdp-select-user v-if="editForm.crowd!='1'" label="执行人" v-model="editForm.executorUserid" @change2="editXmTaskSomeFields(editForm,'executorUserid',$event)"></mdp-select-user>
+									<mdp-select-user show-style="x"  v-if="editForm.crowd!='1'" label="执行人" v-model="editForm.executorUserid" @change2="editXmTaskSomeFields(editForm,'executorUserid',$event)"></mdp-select-user>
  							</el-col>
 
 						</el-row>
@@ -166,8 +166,7 @@
 
 
 							<el-col :span="8">
-										<mdp-date-range
-											:style-obj="{maxWidth:'100%'}"
+										<mdp-date-range show-style="x"
 											v-model="editForm"
 											start-key="startTime"
 											end-key="endTime"
diff --git a/src/views/xm/rpt/branch/branchRptOverview.vue b/src/views/xm/rpt/branch/branchRptOverview.vue
index a99d3767..60b0e474 100644
--- a/src/views/xm/rpt/branch/branchRptOverview.vue
+++ b/src/views/xm/rpt/branch/branchRptOverview.vue
@@ -39,10 +39,10 @@
 			<el-form :model="rawDatas"  label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left">
 				<el-row class="padding">
 					<el-col :span="8">
-						<mdp-select-user label="负责人" v-model="rawDatas.cuserid" :init-name="rawDatas.cusername"></mdp-select-user>
+						<mdp-select-user show-style="x" label="负责人" v-model="rawDatas.cuserid" :init-name="rawDatas.cusername"></mdp-select-user>
 					</el-col>
 					<el-col :span="8">
-						<mdp-select  show-style="x" label="状态" item-code="testPlanStatus" v-model="rawDatas.status"></mdp-select>
+						<mdp-select show-style="x" label="状态" item-code="testPlanStatus" v-model="rawDatas.status"></mdp-select>
 					</el-col>
 
 					<el-col :span="8">