Merge branch 'lzw' of yinet2020/YinetOASystemWeb into master

src/views/system/duty/duty.vue

@@ -84,11 +84,10 @@
                   <span>{{queryParams.id == '1' ? '上月' : '本月'}}值班</span>
                 </div>
                 <el-table  :data="dqselMonth" border>
-                  <el-table-column
-                    type="index"
-                    align="center"
-                    label="序号" width="50"
-                  >
+                  <el-table-column label="序号" type="index" align="center">
+                    <template slot-scope="scope">
+                      <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+                    </template>
                   </el-table-column>
                   <el-table-column
                     prop="time"

src/views/system/email/detail.vue

@@ -22,7 +22,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-
           <el-form-item label="邮件主题" prop="mailTheme">
             <el-input
               v-model="queryParams.mailTheme"

src/views/system/email/receiptdetails.vue

@@ -1,63 +1,54 @@
 <template>
   <!--收件箱详情 只查不改-->
-    <div class="box">
-      <el-card class="box-card">
+    <div class="app-container">
 <!--        <el-row class="title">-->
 <!--          编号为1的邮件-->
 <!--        </el-row>-->
-        <el-row :gutter="80">
-          <el-col :span="1">
-            <el-tag>发件人</el-tag>
-          </el-col >
-          <el-col :span="22"><span class="hg">{{form.senderName}}</span></el-col>
-        </el-row>
-        <el-row :gutter="80">
-          <el-col :span="1">
-            <el-tag>时 间</el-tag>
-          </el-col >
-          <el-col :span="22"><span class="hg">{{form.readTime}}</span></el-col>
-        </el-row>
-        <el-row :gutter="80">
-          <el-col :span="1">
-            <el-tag>收件人</el-tag>
-          </el-col >
-          <el-col :span="22"><span class="hg">{{form.receiverName}}</span></el-col>
-        </el-row>
-        <el-row :gutter="80">
-          <el-col :span="1">
-            <el-tag>邮件主题</el-tag>
-          </el-col >
-          <el-col :span="22"><span class="hg">{{form.mailTheme}}</span></el-col>
-        </el-row>
-        <el-row :gutter="80">
-          <el-col :span="1">
-            <el-tag>附件</el-tag>
-          </el-col >
-          <el-col :span="22">
-            <span class="hg" v-for="site in fujian">
+      <el-form  ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="发件人" prop="senderName" >
+          <el-input v-model="form.senderName" placeholder="" clearable />
+        </el-form-item>
+        <el-form-item label="接收时间" prop="readTime" >
+          <el-input v-model="form.readTime" placeholder="" clearable />
+        </el-form-item>
+        <el-form-item label="收件人" prop="receiverName" >
+          <el-input v-model="form.receiverName" placeholder="" clearable />
+        </el-form-item>
+        <el-form-item label="收件主题" prop="mailTheme" >
+          <el-input v-model="form.mailTheme" placeholder="" clearable />
+        </el-form-item>
+        <el-form-item label="附件" prop="mailTheme" >
+          <span class="hg" v-for="site in fujian">
             <a class="fujian" :href="devapi + site.path">{{site.name}} </a>
-          </span></el-col>
-        </el-row>
-      </el-card>
-      <el-row>
-        <p class="text">
-          <el-row>
-            <!--{{form}}-->
-            <span v-html="form.mailContent"></span>
-          </el-row>
+          </span>
+        </el-form-item>
+        <el-form-item label="邮件内容" prop="mailContent" style="height: 250px;">
+          <Editor v-model="form.mailContent" />
+        </el-form-item>
+      </el-form>
 
-
-        </p>
-      </el-row>
+<!--        <el-row :gutter="80">-->
+<!--          <el-col :span="1">-->
+<!--            <el-tag>附件</el-tag>-->
+<!--          </el-col >-->
+<!--          <el-col :span="22">-->
+<!--            <span class="hg" v-for="site in fujian">-->
+<!--            <a class="fujian" :href="devapi + site.path">{{site.name}} </a>-->
+<!--          </span></el-col>-->
+<!--        </el-row>-->
 
     </div>
 </template>
 
 <script>
   import { listDetail, getDetail, delDetail, addDetail, updateDetail, exportDetail } from "@/api/system/email/detail";
+  import Editor from '@/components/Editor';
 
   export default {
     name: 'receiptdetails',
+    components: {
+      Editor
+    },
     data() {
       return {
         // 遮罩层

src/views/system/email/senddetails.vue

@@ -1,65 +1,42 @@
 <template>
   <!--发件箱详情 只查不改-->
-  <div class="box">
+  <div class="app-container">
+    <el-form  ref="form" :model="form" :rules="rules" label-width="80px">
     <input hidden="hidden" id="keys" v-model="mailGuid"></input>
-    <el-card class="box-card">
-<!--      <el-row class="title">-->
-<!--        编号为1的邮件-->
-<!--      </el-row>-->
-      <el-row :gutter="80">
-        <el-col :span="1">
-          <el-tag>发件人</el-tag>
-        </el-col >
-        <el-col :span="22"><span class="hg">{{form.senderName}}</span></el-col>
-      </el-row>
-      <el-row :gutter="80">
-        <el-col :span="1">
-          <el-tag>时 间</el-tag>
-        </el-col >
-        <el-col :span="22"><span class="hg">{{form.createTime | format('yyyy-MM-dd hh:mm:ss')}}</span></el-col>
-      </el-row>
-      <el-row :gutter="80">
-        <el-col :span="1">
-          <el-tag>收件人</el-tag>
-        </el-col >
-        <el-col :span="22"><span class="hg">{{form.receiverName}}</span></el-col>
-      </el-row>
-      <el-row :gutter="80">
-        <el-col :span="1">
-          <el-tag>邮件主题</el-tag>
-        </el-col >
-        <el-col :span="22"><span class="hg">{{form.mailTheme}}</span></el-col>
-      </el-row>
-      <el-row :gutter="80">
-      <el-col :span="1">
-      <el-tag>附件</el-tag>
-      </el-col >
-      <el-col :span="22">
-      <span class="hg" v-for="site in fujian">
-      <a class="fujian" :href="devapi + site.path" target="_blank">{{site.name}} </a>
-      </span></el-col>
-      </el-row>
-    </el-card>
-    <el-row>
-      <p class="text">
-        <el-row>
-          <!--{{form}}-->
-          <span v-html="form.mailContent"></span>
-        </el-row>
-
-
-      </p>
-    </el-row>
-
+      <el-form-item label="发件人" prop="senderName">
+        <el-input v-model="form.senderName" placeholder="" clearable />
+      </el-form-item>
+      <el-form-item label="接收时间" prop="createTime">
+        <el-input v-model="form.createTime" placeholder="" clearable />
+      </el-form-item>
+      <el-form-item label="收件人" prop="createTime">
+        <el-input v-model="form.receiverName" placeholder="" clearable />
+      </el-form-item>
+      <el-form-item label="邮件主题" prop="mailTheme">
+        <el-input v-model="form.mailTheme" placeholder="" clearable />
+      </el-form-item>
+      <el-form-item label="附件" prop="fujian">
+        <span class="hg" v-for="site in fujian">
+      <a class="fujian" :href="devapi + site.path" target="_blank" >{{site.name.length > 0 ? site.name :'无附件'}}</a>
+      </span>
+      </el-form-item>
+      <el-form-item label="邮件内容" prop="mailContent" style="height: 250px;">
+        <Editor v-model="form.mailContent" />
+      </el-form-item>
+    </el-form>
   </div>
 </template>
 
 <script>
   // import { listDetail, getDetail, delDetail, addDetail, updateDetail, exportDetail } from "@/api/system/email/detail";
   import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/system/email/info";
+  import Editor from '@/components/Editor';
 
   export default {
     name: 'senddetails',
+    components: {
+      Editor
+    },
     data() {
       return {
         // 遮罩层

src/views/system/files/column.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :inline="true">
-      <el-form-item label="文档名称">
+      <el-form-item label="部门名称">
         <el-input
           v-model="queryParams.deptName"
           placeholder="请输入文档名称"
@@ -19,13 +19,6 @@
           size="mini"
           @click="handleQuery"
         >搜索</el-button>
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
       </el-form-item>
     </el-form>
 
@@ -36,7 +29,7 @@
       default-expand-all
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column prop="deptName" label="文档名称" width="260" >
+      <el-table-column prop="deptName" label="部门名称" width="260" >
         <template slot-scope="scope" >
         <span>{{ scope.row.deptName }}</span>
       </template>
@@ -55,8 +48,9 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-row v-if="scope.row.parentId != 0">
+          <el-row >
           <el-button
+            v-if="scope.row.children.length == 0 && scope.row.parentId != 0  "
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -66,11 +60,11 @@
             size="mini"
             type="text"
             icon="el-icon-plus"
-            v-if="scope.row.children.length !== 0"
+            v-if="scope.row.children.length !== 0 && scope.row.parentId != 0 && scope.row.parentId!=100"
             @click="handleAdd(scope.row)"
           >新增</el-button>
           <el-button
-            v-if="scope.row.parentId != 0"
+            v-if="scope.row.children.length == 0 && scope.row.parentId != 0  "
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -87,7 +81,7 @@
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
             <el-form-item label="上级" prop="parentId">
-              <treeselect v-model="form.parentId" :options="docmenuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级" />
+              <treeselect v-model="form.parentId" :disabled="false"  :options="docmenuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级" />
             </el-form-item>
           </el-col>
           <el-col :span="12">