Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

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

@@ -18,7 +18,7 @@
         <div slot="clear">历史消息</div>
       </NotificationTab>
     </Notification>
-    <Modal v-model="modal1" :title="msg.title">
+    <Modal v-model="modal1" :title="msg.title" width="1200">
       <p class="content-in">发送时间：{{msg.creationTime}}</p>
       <p class="content-in">{{msg.content}}</p>
       <div slot="footer">

pages/home/msgRecord.vue

@@ -69,6 +69,7 @@ export default {
       action: Api.index,
       easySearch: {
         keys: { op: "title", value: null },
+        receiverId: { op: "Equal", value: this.$store.state.userInfo.userId },
       },
       disabled: false,
       entity: {},
@@ -122,13 +123,13 @@ export default {
           width: 200,
         },
         {
-          title: "发送人",
+          title: "接受人",
           key: "receiverId",
           width: 120,
           type: "user",
         },
         {
-          title: "接受人",
+          title: "发送人",
           key: "senderId",
           width: 120,
           type: "user",
@@ -137,17 +138,8 @@ export default {
           title: "状态",
           key: "messageType",
           width: 120,
-          render: (h, params) => {
-            return h(
-              "div",
-              {
-                style: {
-                  color: "red",
-                },
-              },
-              params.row.messageType == 1 ? "已读" : ""
-            );
-          },
+          code: "message.status",
+         
         },
         {
           title: this.l("action"),

pages/import/process.vue

@@ -76,7 +76,7 @@
         <DataGrid :tool="false" :page="false" :columns="colsIm" :data="dataIm" :height="tdHeightExcel+30" ref="dataImport"></DataGrid>
         <div slot="footer">
             <Button @click="infoModal=false">关闭</Button>
-            <Button type="primary" @click="importOk">确定导入</Button>
+            <Button type="primary" @click="importOk" v-show="imBtn">确定导入</Button>
         </div>
     </Modal>
 </div>
@@ -350,6 +350,7 @@ export default {
             listLength: 0,
             titleInfo: '',
             noDataText: '暂无数据',
+            imBtn: true,
         };
     },
     props: {
@@ -641,6 +642,7 @@ export default {
         //打开导入数据格式化后的窗口
         openInfoModal() {
             if (this.excelData.length > 0 && this.pageType != undefined) {
+                this.imBtn = true;
                 switch (this.pageType) {
                     case 0:
                         this.loadColum(this.columns0);
@@ -657,6 +659,7 @@ export default {
                 ) + "】 模块"
                 this.infoModal = true
             } else {
+                this.imBtn = true;
                 if (this.excelData.length == 0) {
                     this.$Message.error("表【" + this.sheetNames[this.tabVal] + "】没有可导入的数据！")
                 } else if (this.pageType == undefined) {
@@ -711,6 +714,7 @@ export default {
                 Api.importUser(parms).then((res) => {
                     if (res.success) {
                         this.$Message.success("成功批量导入用户管理成功模块 " + tempList.length + " 条数据");
+                        this.imBtn = false;
                         this.cancelExcel();
                     } else {
                         this.$Message.error("批量导入用户管理失败！");