暂存

src/views/classify_manage/classifyEnlist.vue

@@ -23,7 +23,7 @@
         </el-input>
         </div>
       </div>
-      <div class="tabs-box" :style="authTabsOpt.length>1?'':'border:none'"
+      <!-- <div class="tabs-box" :style="authTabsOpt.length>1?'':'border:none'"
         v-if="authTabsOpt.length">
         <span 
           v-for="item in authTabsOpt" 
@@ -31,10 +31,10 @@
           :class="item.val==aTab?'active':''"
           @click="handleTabChange(item)"
         >{{item.name}}</span>
-      </div>
+      </div> -->
 
+      <!-- v-if="authTabsOpt.length" -->
       <el-table
-        v-if="authTabsOpt.length"
         :data="tableData"
         v-loading="dataLoading"
         row-class-name="tableRowClassName"
@@ -63,6 +63,9 @@
             <span v-else-if="item.prop === 'ClassifyTwo'">{{
               row.ischild ? row.ClassifyName : ""
             }}</span>
+           <span v-else-if="item.prop === 'ClassifyThree'">{{
+              row.ischild ? row.ClassifyName : ""
+            }}</span>
 
             <div v-else-if="item.prop === 'handle'">
               <span 
@@ -107,7 +110,7 @@
           label-position="left"
           hide-required-asterisk
           label-width="80px">
-          <el-form-item prop="type" label="所属模块">
+          <!-- <el-form-item prop="type" label="所属模块">
             <el-select 
               v-model="classifyForm.type"
               placeholder="请选择所属模块"
@@ -119,7 +122,7 @@
             <el-option v-for="item in authTabsOpt" :key="item.val" :label="item.name" :value="item.val"/>
             </el-select>
 
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item prop="classify_name" label="分类名称">
             <el-input 
               type="text" 
@@ -130,7 +133,7 @@
             />
           </el-form-item>
           <el-form-item prop="parent_id" label="上级分类">
-            <el-select 
+            <!-- <el-select 
               v-model="classifyForm.parent_id"
               placeholder="请选择"
               size="small"
@@ -138,7 +141,9 @@
             >
               <el-option label="无" :value="0"/>
               <el-option v-for="item in classifyparentArr" :key="item.ClassifyName" :label="item.ClassifyName" :value="item.Id"/>
-            </el-select>
+            </el-select> -->
+            <el-cascader :options="classifyparentArr" v-model="classifyForm.parent_id" placeholder="请选择"
+            :props="{value:'Id',label:'ClassifyName',children:'Child'}" style="min-width:400px;"></el-cascader>
           </el-form-item>
           <el-form-item label="后台排序" prop="sort">
             <el-input 
@@ -200,72 +205,76 @@ export default {
   computed:{
       //添加分类是否展示
       isAddClassifyBtnShow(){
-          if(this.aTab===0&&this.authTabsOpt.length){
-              return this.permissionBtn.checkPermissionBtn(
-                  this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpAddClassify
-                )
-          }
-          if(this.aTab===1&&this.authTabsOpt.length){
-            return this.permissionBtn.checkPermissionBtn(
-                  this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsAddClassify
-                )
-          }
-        return false
+        return true
+        //   if(this.aTab===0&&this.authTabsOpt.length){
+        //       return this.permissionBtn.checkPermissionBtn(
+        //           this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpAddClassify
+        //         )
+        //   }
+        //   if(this.aTab===1&&this.authTabsOpt.length){
+        //     return this.permissionBtn.checkPermissionBtn(
+        //           this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsAddClassify
+        //         )
+        //   }
+        // return false
       },
       //编辑是否展示
       isEditBtnShow(){
-        if(this.aTab===0){
-                return this.permissionBtn.checkPermissionBtn(
-                    this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpEdit
-                )
-            }else{
-            return this.permissionBtn.checkPermissionBtn(
-                    this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsEdit
-                )
-            }
+        return true
+        // if(this.aTab===0){
+        //         return this.permissionBtn.checkPermissionBtn(
+        //             this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpEdit
+        //         )
+        //     }else{
+        //     return this.permissionBtn.checkPermissionBtn(
+        //             this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsEdit
+        //         )
+        //     }
       },
       //删除是否展示
       isDeleteBtnShow(){
-        if(this.aTab===0){
-                return this.permissionBtn.checkPermissionBtn(
-                    this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpDel
-                )
-            }else{
-            return this.permissionBtn.checkPermissionBtn(
-                    this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsDel
-                )
-            }
+        return true
+        // if(this.aTab===0){
+        //         return this.permissionBtn.checkPermissionBtn(
+        //             this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpDel
+        //         )
+        //     }else{
+        //     return this.permissionBtn.checkPermissionBtn(
+        //             this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsDel
+        //         )
+        //     }
       },
       //权限设置是否展示
       isAuthSetBtnShow(){
-        if(this.aTab===0){
-                return this.permissionBtn.checkPermissionBtn(
-                    this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpAuthSetting
-                )
-            }else{
-            return this.permissionBtn.checkPermissionBtn(
-                    this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsAuthSetting
-                )
-            }
+        return true
+        // if(this.aTab===0){
+        //         return this.permissionBtn.checkPermissionBtn(
+        //             this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpAuthSetting
+        //         )
+        //     }else{
+        //     return this.permissionBtn.checkPermissionBtn(
+        //             this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsAuthSetting
+        //         )
+        //     }
       },
       //英文研报、线上路演选项卡
-      authTabsOpt(){
-        const isShowTabRoadshow = this.permissionBtn.checkPermissionBtn(
-            this.permissionBtn.enClassifyBtn.classifyList_enClassify_roadshow
-        )
-        const isShowTabReport = this.permissionBtn.checkPermissionBtn(
-            this.permissionBtn.enClassifyBtn.classifyList_enClassify_report
-        )
-        //没时间写更好的写法了，有空再优化
-        let authTabs = []
-        if(isShowTabReport){
-            authTabs.push(this.tabsOpt[0])
-        }
-        if(isShowTabRoadshow){
-            authTabs.push(this.tabsOpt[1])
-        }
-        return authTabs
-      },
+      // authTabsOpt(){
+      //   const isShowTabRoadshow = this.permissionBtn.checkPermissionBtn(
+      //       this.permissionBtn.enClassifyBtn.classifyList_enClassify_roadshow
+      //   )
+      //   const isShowTabReport = this.permissionBtn.checkPermissionBtn(
+      //       this.permissionBtn.enClassifyBtn.classifyList_enClassify_report
+      //   )
+      //   //没时间写更好的写法了，有空再优化
+      //   let authTabs = []
+      //   if(isShowTabReport){
+      //       authTabs.push(this.tabsOpt[0])
+      //   }
+      //   if(isShowTabRoadshow){
+      //       authTabs.push(this.tabsOpt[1])
+      //   }
+      //   return authTabs
+      // },
       //添加分类时的选项框
   },
   data() {
@@ -287,6 +296,10 @@ export default {
           label: "二级分类",
           prop: "ClassifyTwo",
         },
+        {
+          label: "三级分类",
+          prop: "ClassifyThree",
+        },
         {
           label: "操作",
           prop: "handle",
@@ -312,17 +325,17 @@ export default {
         type: [{ required:true,message:'请选择',trigger:'change'}]
       },
 
-      tabsOpt:[
-        {
-          name:'英文研报',
-          val:0
-        },
-        {
-          name:'线上路演',
-          val:1
-        }
-      ],
-      aTab:0,
+      // tabsOpt:[
+      //   {
+      //     name:'英文研报',
+      //     val:0
+      //   },
+      //   {
+      //     name:'线上路演',
+      //     val:1
+      //   }
+      // ],
+      // aTab:0,
 
       isexpand:false,
 
@@ -362,7 +375,7 @@ export default {
         CurrentIndex: this.page_no,
         PageSize: 15,
         KeyWord: this.searchform.key_word,
-        ClassifyType:this.aTab
+        // ClassifyType:this.aTab
       };
       classifyEnInterface.classifyList(params).then(res => {
         this.dataLoading = false;
@@ -396,7 +409,7 @@ export default {
 
     /* 获取一级分类 */
     getClassifyOne() {
-      classifyEnInterface.classifyOne({ CurrentIndex: 1, PageSize: 9999,ClassifyType:this.classifyForm.type })
+      classifyEnInterface.classifyOne({ CurrentIndex: 1, PageSize: 9999 /**,ClassifyType:this.classifyForm.type */ })
         .then(res => {
           if(res.Ret !== 200) return
 
@@ -463,7 +476,8 @@ export default {
 
       const { Ret,Msg } = classify_id 
         ? await classifyEnInterface.classifyEdit({...params,ClassifyId: classify_id}) 
-        : await classifyEnInterface.classifyAdd({...params,ClassifyType:this.classifyForm.type})
+        : await classifyEnInterface.classifyAdd(params)
+        // : await classifyEnInterface.classifyAdd({...params,ClassifyType:this.classifyForm.type})
 
       if(Ret !== 200) return
       this.$message.success(Msg)
@@ -478,25 +492,25 @@ export default {
     },
 
     //切换分类
-    handleTabChange(item){
-      this.aTab=item.val
-      this.page_no=1
-      this.searchform.key_word=''
-      this.getList()
-    },
+    // handleTabChange(item){
+    //   this.aTab=item.val
+    //   this.page_no=1
+    //   this.searchform.key_word=''
+    //   this.getList()
+    // },
 
     //新增分类时切换分类
-    FormClassifyChange(){
-      this.classifyForm.parent_id=0
-      this.getClassifyOne()
-    }
+    // FormClassifyChange(){
+    //   this.classifyForm.parent_id=0
+    //   this.getClassifyOne()
+    // }
   },
 
   mounted() {
-      if(this.authTabsOpt.length){
-        this.aTab = this.authTabsOpt[0].val
+      // if(this.authTabsOpt.length){
+      //   this.aTab = this.authTabsOpt[0].val
         this.getList();
-      }
+      // }
   },
 };
 </script>
@@ -542,3 +556,9 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+.el-cascader .el-input{
+  width: 100%;
+}
+
+</style>

src/views/report_manage/reportEn/reportlist.vue

@@ -213,61 +213,6 @@
     >
       <div class="send-email-wrap">
         <el-form ref="form" :model="popData" label-width="100px">
-          <el-form-item label="收件人：">
-            <div>
-              <!-- <el-radio v-model="popData.radio" label="1">默认全部</el-radio> -->
-              <el-cascader
-                v-if="popData.show"
-                v-model="popData.varietyVal"
-                :options="popData.varietyOpt"
-                collapse-tags
-                clearable
-                :props="{
-                  multiple:true,
-                  value:'EnPermissionId',
-                  label:'EnPermissionName',
-                  children:'Child'
-                }"
-                placeholder="请选择品种权限"
-              />
-              <el-checkbox v-model="popData.checkUser" style="margin-left:20px">指定人员</el-checkbox>
-            </div>
-            <div v-if="popData.checkUser" class="user-box">
-              <el-select
-                v-model="popData.value"
-                multiple
-                filterable
-                collapse-tags
-                placeholder="请选择客户"
-                value-key="Id"
-              >
-                <el-option
-                  v-for="item in popData.options"
-                  :key="item.Id"
-                  :label="item.Name"
-                  :value="item"
-                  :disabled="item.Enabled===0">
-                  <span>{{item.Name}} &lt;{{item.Email}}&gt;</span>
-                </el-option>
-              </el-select>
-              <div style="margin-top:10px" class="box">
-                <el-tooltip 
-                  effect="dark" 
-                  :content="item.Email" 
-                  placement="top"
-                  v-for="(item,index) in popData.value"
-                  :key="item.Id"
-                  >
-                <el-tag
-                  closable
-                  style="margin:0 10px 10px 0"
-                  @close="handleDelSelectCustom(item,index)">
-                  {{item.Name}}
-                </el-tag>
-                </el-tooltip>
-              </div>
-            </div>
-          </el-form-item>
           <el-form-item label="邮件主题：">
             <div>
               <el-input 
@@ -280,6 +225,100 @@
               ></el-input>
             </div>
           </el-form-item>
+          <el-form-item label="收件人：">
+            <div class="addressee-box">
+              <div class="addressee-cancel-box">
+                <el-cascader
+                  v-if="popData.show"
+                  v-model="popData.varietyVal"
+                  :options="popData.varietyOpt"
+                  collapse-tags
+                  clearable
+                  :props="{
+                    multiple:true,
+                    value:'EnPermissionId',
+                    label:'EnPermissionName',
+                    children:'Child'
+                  }"
+                  placeholder="请选择品种权限"
+                />
+                <el-select
+                  v-model="popData.value"
+                  multiple
+                  filterable
+                  collapse-tags
+                  placeholder="请选择客户"
+                  value-key="Id">
+                  <el-option
+                    v-for="item in popData.options"
+                    :key="item.Id"
+                    :label="item.Name"
+                    :value="item"
+                    :disabled="item.Enabled===0">
+                    <span>{{item.Name}} &lt;{{item.Email}}&gt;</span>
+                  </el-option>
+                </el-select>
+                <div class="user-box-hint">取消发送客户信息：</div>
+                <div class="user-box">
+                  <div style="margin-top:10px" class="box">
+                    <el-tooltip 
+                      effect="dark" 
+                      :content="item.Email" 
+                      placement="top"
+                      v-for="(item,index) in popData.value"
+                      :key="item.Id"
+                      >
+                    <el-tag
+                      closable
+                      style="margin:0 10px 10px 0"
+                      @close="handleDelSelectCustom(item,index)">
+                      {{item.Name}}
+                    </el-tag>
+                    </el-tooltip>
+                  </div>
+                </div>
+              </div>
+              <div class="addressee-append-box">
+                <el-checkbox v-model="popData.checkUser" style="margin-left:20px">指定人员</el-checkbox>
+                <el-select
+                  v-show="popData.checkUser"
+                  v-model="popData.value"
+                  multiple
+                  filterable
+                  collapse-tags
+                  placeholder="请选择人员"
+                  value-key="Id">
+                  <el-option
+                    v-for="item in popData.options"
+                    :key="item.Id"
+                    :label="item.Name"
+                    :value="item"
+                    :disabled="item.Enabled===0">
+                    <span>{{item.Name}} &lt;{{item.Email}}&gt;</span>
+                  </el-option>
+                </el-select>
+                <div class="user-box-hint" v-show="popData.checkUser">指定发送人员信息：</div>
+                <div class="user-box" v-show="popData.checkUser">
+                  <div style="margin-top:10px" class="box">
+                    <el-tooltip 
+                      effect="dark" 
+                      :content="item.Email" 
+                      placement="top"
+                      v-for="(item,index) in popData.value"
+                      :key="item.Id"
+                      >
+                    <el-tag
+                      closable
+                      style="margin:0 10px 10px 0"
+                      @close="handleDelSelectCustom(item,index)">
+                      {{item.Name}}
+                    </el-tag>
+                    </el-tooltip>
+                  </div>
+                </div>
+              </div>
+          </div>
+          </el-form-item>
           <div style="text-align:center;margin-bottom:30px;margin-top:40px">
             <el-button type="primary" plain style="margin-right:10px" @click="popData.show=false">取消</el-button>
             <el-button type="primary" @click="handleConfirmSendEmail">确定</el-button>
@@ -429,7 +468,6 @@ export default {
 
       popData:{
         show:false,
-        radio:'1',
         checkUser:false,//是否选择指定人员
         options: [],
         value: [],
@@ -802,15 +840,30 @@ export default {
   }
 }
 .send-email-wrap{
-  .user-box{
-    border: 1px dashed #DCDFE6;
-    border-radius: 4px;
-    padding: 20px;
-    margin-top: 20px;
-    .box{
-      max-height: 200px;
-      overflow-y: auto;
+  .addressee-box{
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    .addressee-cancel-box,.addressee-append-box{
+      display: flex;
+      flex-direction: column;
+      justify-content: flex-start;
+      width: calc(50% - 12px);
+    }
+    .user-box-hint{
+      color: #999999;
+    }
+    .user-box{
+      border: 1px dashed #DCDFE6;
+      border-radius: 4px;
+      padding: 20px;
+      margin-top: 20px;
+      .box{
+        max-height: 200px;
+        overflow-y: auto;
+      }
     }
   }
+
 }
 </style>