Merge branch 'xiaoqin' into mergeBranch

src/HManagement/archives_sc/archives_scclass/modules/list.vue

@@ -5,9 +5,10 @@
       <div class="container normal-panel" style="padding-top:0">
         <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 212px)" @rowClick="rowClick">
           <template v-slot:customcol="scope">
-            <div v-if="scope.column.columnname === 'classname'">
-              <p>{{scope.column.data.classname}}</p>
-              <el-input
+            <div v-if="scope.column.columnname === 'classname'" style="display:flex;align-items:center">
+              <p style="margin-right:10px">{{scope.column.data.classname}}</p>
+              <el-tag v-if="scope.column.data.issystem == 1" size="mini">系统</el-tag>
+              <!-- <el-input
                 class="input-new-tag"
                 v-if="scope.column.data.sat_courseware_classid === activeid"
                 v-model="inputValue"
@@ -16,7 +17,7 @@
                 @keyup.enter.native="handleInputConfirm"
                 @blur="handleInputConfirm"
               >
-              </el-input>
+              </el-input> -->
             </div>
             <div v-else-if="scope.column.columnname === 'isenable'">
               <slot name="start" :data="scope"></slot>
@@ -24,9 +25,9 @@
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
           <template v-slot:opreation="scope">
-            <slot name="edit" :data="scope"></slot>
+            <slot name="edit" :data="scope" v-if="scope.data.issystem != 1"></slot>
             <slot name="addChild" :data="scope"></slot>
-            <slot name="del" :data="scope"></slot>
+            <slot name="del" :data="scope" v-if="scope.data.issystem != 1"></slot>
           </template>
         </tableLayout>
       </div>
@@ -46,8 +47,8 @@
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
           <template v-slot:opreation="scope">
-            <slot name="childedit" :data="scope"></slot>
-            <slot name="childdel" :data="scope"></slot>
+            <slot name="childedit" :data="scope" v-if="scope.data.issystem != 1"></slot>
+            <slot name="childdel" :data="scope" v-if="scope.data.issystem != 1"></slot>
           </template>
         </tableLayout>
       </div>
@@ -77,10 +78,11 @@ export default {
         }
       })
       this.list = res.data
+      console.log(this.list);
+
       // 查看当前选中分类
       this.act_index?this.act_index:this.act_index = 0
       this.rowClick(res.data[this.act_index])
-      console.log(this.list);
       
     },
     showInput(val) {
@@ -111,6 +113,8 @@ export default {
     }
   },
   mounted () {
+    console.log('eeeeeeeeeeeeeeeeeeeeeeeeeeeee');
+    
     this.coursewareclass()
   },
   created () {

src/HManagement/archives_sc/index.vue

@@ -125,6 +125,7 @@ export default {
       this.$router.push({path:'/archives_sc_analysis',query:{id:data.sat_coursewareid}})
     },
     async addBtn () {
+      window.sessionStorage.removeItem('newMaterial')
       const res = await this.$api.requested({
         "classname": "webmanage.saletool.courseware.courseware",
         "method": "insertOrUpdate",

src/HManagement/archvies_mag/modules/list.vue

@@ -15,7 +15,7 @@
           @click="queryAttachment(params.content.where.condition = '')"></i> -->
       </div>
     </div>
-    <div ref="ele" id="scroll" style="height:calc(100vh - 255px);overflow-y:scroll" class="container normal-panel">
+    <div ref="ele" id="scroll" style="height:calc(100vh - 300px);overflow-y:scroll" class="container normal-panel">
       <el-row :gutter="10" class="folder-list">
         <el-col :span="2" v-for="folder in list" :key="folder.id">
           <div class="folder-item" :class="folder.ischeck ? 'checked' : ''">
@@ -47,7 +47,7 @@
         <el-empty description="暂无文件,请点击左上角的“上传”按钮添加"></el-empty>
       </div>
     </div>
-    <div style="margin:16px 0;text-align:right">
+    <div style="margin:16px;text-align:right">
       <el-pagination background small @size-change="handleSizeChange" @current-change="handleCurrentChange"
         :current-page="currentPage" :page-size="params.content.pageSize" layout="total, prev, pager, next, jumper"
         :total="total">
@@ -230,4 +230,7 @@ export default {
 .border-bottom {
   border-bottom: 1px solid #f1f2f3;
 }
+::-webkit-scrollbar {
+  display: none;
+}
 </style>

src/HManagement/clueManage/clue_rule/modules/select_agent.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="添加经销商" append-to-body :visible.sync="dialogTableVisible" width="80%">
+    <el-drawer title="添加经销商" append-to-body :visible.sync="dialogTableVisible" size="70%">
       <el-form size="small" inline label-position="right" label-width="50px" :model="search">
         <el-form-item label="搜索">
           <el-input v-model="params.content.where.condition" prefix-icon="el-icon-search" placeholder="编号,经销商名称" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
@@ -30,7 +30,7 @@
         <el-button size="small" @click="dialogTableVisible = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="warning" :disabled="selection.length === 0" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 

src/HManagement/clueManage/clue_rule/modules/select_saler.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="添加业务员" append-to-body :visible.sync="dialogTableVisible" width="80%">
+    <el-drawer title="添加业务员" append-to-body :visible.sync="dialogTableVisible" size="70%">
       <el-form size="small" inline label-position="right" label-width="50px" :model="search">
         <el-form-item label="搜索">
           <el-input v-model="params.content.where.condition" prefix-icon="el-icon-search" placeholder="编号,业务员名称" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
@@ -30,7 +30,7 @@
         <el-button size="small" @click="dialogTableVisible = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="warning" :disabled="selection.length === 0" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 

src/HManagement/submit/list/modules/submit_add.vue

@@ -67,7 +67,6 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
 <!--    <div class="container normal-panel normal-margin">

src/SManagement/archivesmag/index.vue

@@ -152,12 +152,11 @@ export default {
 
 <style scoped>
   .normal-card {
-    box-sizing: border-box;
     -webkit-user-select: none;
     -moz-user-select: none;
     -ms-user-select: none;
     user-select: none;
-    height: 100%;
+    min-height: 100%;
     position: relative;
   }
   .normal-card .el-breadcrumb {
@@ -166,6 +165,7 @@ export default {
   .normal-card .header-panl {
     display: flex;
     justify-content: space-between;
+    height: 32px;
   }
   .normal-card .header-panl .el-dropdown-link {
     display: flex;

src/components/previewImage/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="image-panel">
     <el-image 
+      v-if="image.url"
       ref="preview"
       style="width: 100%;"
       :src="image.url"