Merge branch 'product' of 39.98.128.195:zhouyx/mes-ui into product

components/page/dataGrid.vue

@@ -42,6 +42,7 @@
       :height="tableHeight"
       :draggable="draggable"
       :size="size"
+      :row-key="rowKey"
       ref="table"
       class="tableCommon"
       @on-expand="expand"
@@ -235,6 +236,9 @@ export default {
     span: {
       type: Number,
       default: 24
+    },
+    rowKey:{
+      type:[String,Number]
     }
   },
   created() {

layouts/basic-layout/header-user/index.vue

@@ -7,6 +7,7 @@
       @on-click="handleClick"
     >
       <Avatar size="small" :src="info.avatar" v-if="info.avatar" />
+      <Avatar size="small" style="background-color: #87d068" v-else-if="!info.avatar"  icon="ios-person" />
       <span class="i-layout-header-user-name" v-if="!isMobile">{{ info.name }}</span>
       <DropdownMenu slot="list">
         <i-link to="/basicData/userManagent/userInfo">
@@ -35,7 +36,7 @@ import { mapState, mapActions } from "vuex";
 export default {
   name: "iHeaderUser",
   computed: {
-    ...mapState("admin/user", ["info"]),
+    ...mapState("admin/user", ["info"]),    
     ...mapState("admin/layout", ["isMobile", "logoutConfirm"])
   },
   methods: {

pages/aps/dispatch/dispatch.less

@@ -53,26 +53,22 @@
             // padding-right: 0!important;
             .man_body{
                 max-width: 185px;
-                label{
+                .checkUser{
                     border-radius: 24px;
                     width: 100%;
                     height: 50px;
                     line-height: 47px;
-                    span.ivu-checkbox{
-                        .ivu-checkbox-inner{
-                            margin-top: -42px!important;
-                        }
-                    }
                     span{
-                        // overflow: hidden; 
-                        // text-overflow: ellipsis; 
-                        // -o-text-overflow: ellipsis;
-                        // white-space:nowrap;
-                        // display: inline-block;
                         height: 50px;
                     }
                     .svg_name{
-                        width: 50px;
+                        overflow: hidden; 
+                        text-overflow: ellipsis; 
+                        -o-text-overflow: ellipsis;
+                        white-space:nowrap;
+                        display: block;
+                        float: right;
+                        width: 82%;
                     }
                     .svg{
                         width: 70px;

pages/aps/dispatch/index.vue

@@ -99,12 +99,14 @@
               <!-- {{peploeId}} @on-change="setpepoleid" @on-change="setpepoleids"-->
               <Row :gutter="15">
                 <Col span="8" class="dispatch_card02" v-for="(item,index) in listMan" :key="index">
-                  <CheckboxGroup class="man_body">
-                    <Checkbox v-model="item.checked" border  class>
-                      <span class="svg_name">{{item.userName}}</span>
-                      <span class="svg">{{item.id}}</span>
-                    </Checkbox>
-                  </CheckboxGroup>
+                  <!-- <Tooltip :content="item.userName"> -->
+                    <CheckboxGroup class="man_body">
+                      <Checkbox v-model="item.checked" border  class='checkUser'>
+                        <span class="svg_name" :title='item.userName'>{{item.userName}}</span>
+                        <!-- <span class="svg">{{item.id}}</span> -->
+                      </Checkbox>
+                    </CheckboxGroup>
+                  <!-- </Tooltip> -->
                 </Col>
               </Row>
             </div>

pages/basicData/userManagent/userInfo.vue

@@ -4,7 +4,8 @@
       <p slot="title">个人头像</p>
       <div style="height:415px;">
         <p style="text-align:center;padding-top:100px;">
-          <Avatar :src="avatorPath" size="150" />
+          <Avatar :src="avatorPath" size="150"  v-if="avatorPath" />
+          <Avatar size="150" style="background-color: #87d068" v-else-if="!avatorPath"  icon="ios-person" />
         </p>
         <p style="text-align:center;padding:10px;">
           <Button @click="openModalAvatar">修改头像</Button>

pages/crm/statistical/costomer/approval.vue

@@ -31,7 +31,7 @@ export default {
         { key: 'schemaName', title: '类别', align: 'center' },
         { key: 'currentNodeName', title: '环节', align: 'center' },
         { key: 'nextNodeName', title: '下一环节', align: 'center' },
-        { key: 'creationTime', title: '创建时间', align: 'center' },
+        { key: 'creationTime', title: '创建时间', align: 'center',width:'190' },
         {
           key: 'id',
           title: '操作',

pages/crm/statistical/index.vue

@@ -5,7 +5,8 @@
     <div class="statistical_box">
         <div class="statistical_top">
             <div class="user_img fl">
-                <Avatar :src="avatorPath" size="90" />
+                <Avatar :src="avatorPath" size="90" v-if="avatorPath" />
+                <Avatar size="90" style="background-color: #87d068" v-else-if="!avatorPath"  icon="ios-person" />
             </div>
             <div class="user_info fl">
                 <h3 class="mb10">您好，{{userData.userName}}，欢迎登录MES系统 !</h3>

pages/order/monitoring/record.vue

 <template>
   <div class="record">
-    <DataGrid :columns="columns" ref="grid" :action="action" :tool="false"></DataGrid>
+    <DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="820"></DataGrid>
     <Modal v-model="detailModal" title="详情" width="800">
       <Detail :eid="curId" />
     </Modal>

pages/order/monitoring/speed.vue

 <template>
   <div class="record">
-    <Table :columns="columns" :data="result" border></Table>
+    <DataGrid :columns="columns" :data="result" border :tool='false' :height="820"></DataGrid>
   </div>
 </template>
 <script>
@@ -97,9 +97,8 @@ export default {
 
         {
           key: "status",
-          type: "user",
-          title: this.l("status"),
-          code: "plan.order.status",
+          title: '工单状态',
+          code: "taskList.status",
           align: "center"
         }
       ]

pages/qc/dataTrace/index.vue

@@ -17,7 +17,7 @@
     <div class="tableBox mb10" :style="{height:tbHeight}">
       <div class="table">
         <div v-if="listTask.length==0" class="wu_data">暂无数据</div>
-        <Row :gutter="16">
+        <Row :gutter="16" :style="{width:rowWidth}">
           <Col span="6" v-for="(item,index) in listTask" :key="index">
             <Card class="card">
               <h3 slot="title">
@@ -264,6 +264,7 @@ export default {
         total: 0, //总数
         conditions: []
       },
+      rowWidth:'',
       showPagesize: [20, 50, 100],
       showModel: false,
       list: [],
@@ -381,6 +382,9 @@ export default {
         .then(res => {
           this.listTask = res.result.items;
           this.search.total = res.result.totalCount;
+          if(this.listTask.length<4){
+            this.rowWidth = "100%"
+          }
         });
     },
     searchModel() {