暂存

src/Form/salerPrivatecustomer/add.vue

@@ -7,7 +7,7 @@
         size="35%"
         direction="rtl"
         append-to-body
-        @close="dialogFormVisible = false">
+        @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
@@ -16,7 +16,7 @@
                 <el-input v-model="form.enterprisename" placeholder="请输入客户名称" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" prop="type">
               <el-form-item label="客户类型:" >
                 <el-select v-model="form.type" placeholder="请选择客户类型" style="width: 100%">
                   <el-option
@@ -77,23 +77,23 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="企业地址:" >
+              <el-form-item label="企业地址:" prop="address">
                 <el-input v-model="form.address" placeholder="请输入企业地址" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="企业简称:" >
+              <el-form-item label="企业简称:" prop="abbreviation">
                 <el-input v-model="form.abbreviation" placeholder="请输入企业简称" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="企业税号:" >
+              <el-form-item label="企业税号:" prop="taxno">
                 <el-input v-model="form.taxno" placeholder="请输入企业税号" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="联系方式:" >
+              <el-form-item label="联系方式:" prop="phonenumber">
                 <el-input v-model="form.phonenumber" placeholder="请输入联系方式" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
@@ -184,10 +184,6 @@ export default {
       this.industryList()
     },
     onSubmit(){
-      // if (this.form.parentid === ''){
-      //   this.form.parentid = 0
-      // }
-      console.log(this.form)
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         const res = await this.$api.requested({
@@ -202,6 +198,9 @@ export default {
       })
 
     },
+    onClose () {
+      this.$refs['form'].resetFields();
+    },
     /*客户类型列表*/
     async typeList(){
       const res = await this.$api.requested({
@@ -227,7 +226,7 @@ export default {
     onEnterprise(data){
       this.visibleEnterprise = false
       console.log("企业信息",data)
-      this.form.parentid = data.sys_enterpriseid
+      this.form.parentid = data.sa_customersid
       this.form.superiorenterprisename = data.enterprisename
 
     },

src/HDrpManagement/ProductMag/index.vue

@@ -41,7 +41,6 @@
       <template v-slot:tbList="scope">
         <div>
         <p :style="scope.data.column.data.isonsale === 1?'color:#52c41a':'color:red'" v-if="scope.data.column.columnname === 'isonsale'">
-<!--          {{scope.data.column.data.isonsale === 1?'上架中':'已下架'}}-->
           <el-switch
             v-model="scope.data.column.data.isonsale"
             :active-value='1'

src/HDrpManagement/ProductMag/modules/add.vue

@@ -155,7 +155,7 @@
 </template>
 
 <script>
-import uploadFile from '@/components/upload/test_upload.vue'
+import uploadFile from '@/components/upload/preview_upload.vue'
 import previewImage from '@/components/previewImage/index.vue'
 export default {
   components:{uploadFile,previewImage},
@@ -258,6 +258,7 @@ export default {
             usetype:'default'
           }
           this.$refs['form'].resetFields();
+          
           this.$refs['upload'].toUpload()
          
           this.dialogFormVisible = false
@@ -277,24 +278,6 @@ export default {
     uploadSuccess(res){
       this.$emit('onSuccess')
     },
-    clearCover () {
-      console.log("执行删除")
-      this.form.attinfos = []
-    },
-    // async showImage(){
-    //   const res = await this.$api.requested({
-    //     "classname": "system.attachment.Attachment",
-    //     "method": "queryFileLink",
-    //     "content": {
-    //       "ownertable": "plm_item",
-    //       "ownerid": '10000',
-    //       "usetype":"default"//传空返回有所
-    //     }
-    //   })
-    //   console.log("查询上传结果")
-    //   console.log(res)
-    //   this.form.attinfos = res.data[0]
-    // }
   },
   mounted () {
     

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -4,24 +4,6 @@
     <el-drawer append-to-body title="编辑产品" :visible.sync="dialogFormVisible" size="50%">
       <el-row class="drawer__panel" :gutter="40">
         <el-form label-position="right" label-width="80px" :model="form" :rules="rules" ref="form" size="small">
-          <el-col :span="20">
-            <el-form-item  label="产品图">
-              <div class="flex-align-center" style="flex-wrap:wrap">
-                <uploadFile
-                    style="margin:10px 10px 10px 0;"
-                    ref="upload"
-                    :folderid="folderid"
-                    accept=".JPG,.PNG,.jpg,.png"
-                    btntype="image"
-                    :bindData="{ownertable:'plm_item',ownerid:form.itemid,usetype:'default'}"
-                    @onSuccess="uploadSuccess">
-                </uploadFile>
-                <previewImage style="margin-right: 10px;margin-bottom:10px" v-for="image in form.attinfos" :key="image.index" :image="image"  :deletebtn="true"
-                            @onSuccess="clearCover"></previewImage>
-              </div>
-              <small style="display:block;margin-top:20px" class="info">注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG</small>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="产品编号" prop="itemno">
               <el-input v-model="form.itemno" placeholder="输入产品编号"></el-input>
@@ -143,6 +125,24 @@
               <el-input v-model="form.remarks" type="textarea" placeholder="输入产品备注"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="20">
+            <el-form-item  label="产品图">
+              <div class="flex-align-center" style="flex-wrap:wrap">
+                <uploadFile
+                    style="margin:10px 10px 10px 0;"
+                    ref="upload"
+                    :folderid="folderid"
+                    accept=".JPG,.PNG,.jpg,.png"
+                    btntype="image"
+                    :bindData="{ownertable:'plm_item',ownerid:form.itemid,usetype:'default'}"
+                    @onSuccess="uploadSuccess">
+                </uploadFile>
+                <previewImage style="margin-right: 10px;margin-bottom:10px" v-for="image in form.attinfos" :key="image.index" :image="image"  :deletebtn="true"
+                            @onSuccess="clearCover"></previewImage>
+              </div>
+              <small style="display:block;margin-top:20px" class="info">注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG</small>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       <div class="fixed__btn__panel">

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

@@ -80,6 +80,8 @@ export default {
       // 查看当前选中分类
       this.act_index?this.act_index:this.act_index = 0
       this.rowClick(res.data[this.act_index])
+      console.log(this.list);
+      
     },
     showInput(val) {
       this.activeid = val.sat_courseware_classid

src/HManagement/archives_sc/index.vue

@@ -124,9 +124,23 @@ export default {
       this.$store.dispatch('DrawerShowChange',true)
       this.$router.push({path:'/archives_sc_analysis',query:{id:data.sat_coursewareid}})
     },
-    addBtn () {
+    async addBtn () {
+      const res = await this.$api.requested({
+        "classname": "webmanage.saletool.courseware.courseware",
+        "method": "insertOrUpdate",
+        "content": {
+          "sat_coursewareid": 0,
+          "title": "",
+          "sat_courseware_classid": '9999' + JSON.parse(sessionStorage.getItem('active_account')).userid,
+          "notes": "",
+          "canfiledownload": 1,
+          "begdate":(new Date()).toLocaleDateString(),
+          "enddate":(new Date()).toLocaleDateString(),
+          "tag":[]
+        }
+      })
       this.$store.dispatch('DrawerShowChange',true)
-      this.$router.push({path:'/archives_scadd'})
+      this.$router.push({path:'/archives_scedit',query:{id:res.data.sat_coursewareid}})
     },
     /* 新建的数据批量删除 */
     listData (data) {

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

@@ -45,7 +45,7 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="一级分类" prop="sat_courseware_classid_1">
-                    <el-select style="width:100%;margin-right:16px" size="small" v-model="form.sat_courseware_classid_1" clearable>
+                    <el-select style="width:100%;margin-right:16px" size="small" v-if="options1" v-model="form.sat_courseware_classid_1" clearable>
                       <el-option v-for="item in options1" :key="item.index" :value="item.sat_courseware_classid" :label="item.classname" @click.native="handelSelectClick(item)"></el-option>
                     </el-select>
                   </el-form-item>
@@ -64,7 +64,8 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="封面" prop="cover">
-                    <previewImage v-if="form.cover" style="width:386px" :image="image" @onSuccess="clearCover"></previewImage>
+                    <previewImage v-if="form.cover" style="width:386px" :image="image" :deletebtn="true"
+                      @onSuccess="clearCover"></previewImage>
                     <upload v-else btntype="limage" :folderid="folderid" accept=".JPG,.PNG" :bindData="{ownertable:'SAT_COURSEWARE',ownerid:form.sat_coursewareid,usetype:'cover'}" @onSuccess="onCoverSubmit"></upload>
                     <p class="info">注：建议上传图片大小210*120px像素，大小不超过2M，格式为JPG/PNG</p>
                   </el-form-item>
@@ -167,16 +168,18 @@ export default {
       })
       this.detailData = res.data
       this.form = Object.assign({},this.form,res.data)
+      console.log(this.options1);
+      
       this.options1.forEach(e=>{
         e.sat_courseware_classid === res.data.sat_courseware_classid_1?this.options2 = e.children:''
       })
       this.queryFileLink()
+      
     },
     // 分类查询
     async coursewareclass () {
       const res = await this.$api.requested({
-        "classname": "webmanage.saletool.courseware.coursewareclass",
-        "method": "select",
+        "id":20221102143302,
         "content": {
             "parentid": 0
         }
@@ -189,6 +192,8 @@ export default {
     },
     // 获取附件信息
     async queryFileLink () {
+      console.log('eeeeeeeeeeeeeeeee');
+      
       this.dialogEditVisible = true
       const res = await this.$api.requested({
         "classname": "system.attachment.Attachment",
@@ -199,6 +204,8 @@ export default {
           "usetype":'cover'//传空返回有所
         }
       })
+      console.log(res.data,'eeeeeeeeeeeeeeeeeeeee');
+      
       res.data[0]?this.image = res.data[0]:this.image = {url:''}
     },
     onCoverSubmit (res) {
@@ -244,14 +251,14 @@ export default {
     },
   },
   created () {
+    this.coursewareclass()
     this.tool.checkAuth(this.$route.name,'data_analysis')?'':this.$router.go(-1)
     //详情页禁用操作
     store.state.pageOnlyRead = true
   },
   mounted () {
-    this.coursewareclass()
-    this.selectDetail()
     setTimeout(() => {
+      this.selectDetail()
       this.query_auth()
     },100)
   }

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -8,74 +8,69 @@
       :apiId="{query:20221012164402,del:''}"
       :autoQuery="false"
       :detailPath="{path:'/customerDetail',param:{tabIndex:tabIndex}}">
+      <template v-slot:tempChild="scope">
+        <el-select v-if="scope.data === 'type'" class="inline-16" v-model="selectParam.type" size="mini" placeholder="请选择" @change="selectChange" clearable>
+          <el-option
+              v-for="item in option.typeData"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value">
+          </el-option>
+        </el-select>
+        <el-select v-if="scope.data === 'customergrade'" v-model="selectParam.customergrade" size="mini" placeholder="请选择" @change="selectChange" clearable>
+          <el-option
+              v-for="item in option.gradeData"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value">
+          </el-option>
+        </el-select>
+        <el-select v-if="scope.data === 'industry'" v-model="selectParam.industry" size="mini" placeholder="请选择" @change="selectChange" clearable>
+          <el-option
+              v-for="item in option.industryData"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value">
+          </el-option>
+        </el-select>
+        <el-select v-if="scope.data === 'status'" v-model="selectParam.status" size="mini" placeholder="请选择" @change="selectChange" clearable>
+          <el-option
+              v-for="item in option.status"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value">
+          </el-option>
+        </el-select>
+      </template>
         <template #custom>
-          <!-- <el-divider direction="vertical"></el-divider>
-          <el-dropdown size="medium" @command="handleCommand">
-          <span class="el-dropdown-link">
-            {{editableTabsValue}}<i class="el-icon-arrow-down el-icon--right"></i>
-          </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item v-for="(item,index) in editableTabs" :key="index" :command="item">{{item.title}}</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown> -->
-          <label class="search__label" style="width: 70px">数据分类:</label>
-          <el-select class="inline-16" v-model="value" size="small" placeholder="请选择数据分类" @change="selectChange" clearable>
-            <el-option
-              v-for="item in editableTabs"
-              :key="item.index"
-              :label="item.title"
-              :value="item.name">
-            </el-option>
-          </el-select>
-          <label class="search__label" style="width: 60px">客户类型:</label>
-          <el-select class="inline-16" v-model="selectParam.type" size="small" placeholder="请选择" @change="selectChange" clearable>
-            <el-option
-                v-for="item in option.typeData"
-                :key="item.value"
-                :label="item.value"
-                :value="item.value">
-            </el-option>
-          </el-select>
-          <label class="search__label" style="width: 60px">客户等级:</label>
-          <el-select class="inline-16" v-model="selectParam.customergrade" size="small" placeholder="请选择" @change="selectChange" clearable>
-            <el-option
-                v-for="item in option.gradeData"
-                :key="item.value"
-                :label="item.value"
-                :value="item.value">
-            </el-option>
-          </el-select>
-          <label class="search__label" style="width: 60px">客户行业:</label>
-          <el-select class="inline-16" v-model="selectParam.industry" size="small" placeholder="请选择" @change="selectChange" clearable>
-            <el-option
-                v-for="item in option.industryData"
-                :key="item.value"
-                :label="item.value"
-                :value="item.value">
-            </el-option>
-          </el-select>
-          <label class="search__label" style="width: 60px">客户状态:</label>
-          <el-select class="inline-16" v-model="selectParam.status" size="small" placeholder="请选择" @change="selectChange" clearable>
-            <el-option
-                v-for="item in option.status"
-                :key="item.value"
-                :label="item.value"
-                :value="item.value">
-            </el-option>
-          </el-select>
-          <label class="search__label" style="width: 65px;">创建时间:</label>
-          <el-date-picker
-              style="margin-right: 24px !important;"
-              size="small"
-              @change="selectChange"
-              value-format="yyyy-MM-dd"
-              v-model="dateSelect"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              clearable>
-          </el-date-picker>
+          <div class="flex-align-center">
+            <div>
+              <label class="search__label">范围:</label>
+              <el-select class="inline-16" v-model="value" size="small" placeholder="请选择数据分类" @change="selectChange" clearable>
+                <el-option
+                  v-for="item in editableTabs"
+                  :key="item.index"
+                  :label="item.title"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+            </div>
+            <div>
+            <label class="search__label" >创建时间:</label>
+            <el-date-picker
+                style="margin-right: 24px !important;"
+                size="small"
+                @change="selectChange"
+                value-format="yyyy-MM-dd"
+                v-model="dateSelect"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                clearable>
+            </el-date-picker>
+            </div>
+          </div>
         </template>
         <template v-slot:tbList="scope">
           <div v-if="scope.data.column.columnname === 'isleader'">
@@ -85,11 +80,6 @@
           <div v-else-if="scope.data.column.columnname === 'contact'">
             <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].name:''}}</span>
           </div>
-<!--          <div v-else-if="scope.data.column.columnname === 'grade'">
-            <p v-if="scope.data.column.data.grade === 2">B级</p>
-            <p v-if="scope.data.column.data.grade === 1">A级</p>
-            <p v-if="scope.data.column.data.grade === 3">C级</p>
-          </div>-->
           <div v-else>
             {{scope.data.column.data[[scope.data.column.columnname]]}}
           </div>
@@ -143,7 +133,8 @@ export default {
         customergrade:'',
         industry:'',
         startdate:'',
-        enddate:''
+        enddate:'',
+
       },
       dateSelect:''
     }
@@ -240,7 +231,7 @@ export default {
         this.selectParam.enddate = ''
       }
       this.$refs.list.param.content.type = this.tabIndex
-      this.$refs.list.param.content.where = this.selectParam
+      this.$refs.list.param.content.where = Object.assign({},this.$refs.list.param.content.where,this.selectParam) 
       this.$refs.list.param.content.phonenumber = 1
       this.$refs['list'].listData()
     }

src/components/normal-basic-layout/index.vue

@@ -38,10 +38,16 @@
       <div class="normal-panel flex-align-center" style="padding:0 16px">
         <slot name="tableLeft"></slot>
         <div style="flex:0 1 auto;width: 100%;" v-if="listType === 'table' && refreshTable">
-          <tableTemp ref="table" :layout="tableLayout" :tableName="tableName" :custom="true" :data="list" :fixRightData="fixRightData" :fixLeftData="fixLeftData" @checkboxCallBack="checkboxCallBack">
+          <tableTemp ref="table" :layout="tableLayout" :tableName="tableName" :custom="true" :data="list" :fixRightData="fixRightData" :fixLeftData="fixLeftData" @headerSearch="onHeaderSearch" @checkboxCallBack="checkboxCallBack">
+            
             <template v-slot:customcol="scope">
               <slot :data="scope" name="tbList"></slot>
             </template>
+
+            <template v-slot:temp="scope">
+              <slot name="tempChild" :data="scope.data"></slot>
+            </template>
+            
             <template v-slot:opreation="scope">
               <drawerTemp class="inline-16" v-if="detailPath" :data="scope.data" :detailPath="detailPath" :idName="idName" @onSuccess="listData"></drawerTemp>
               <slot :data="scope" name="tbOpreation"></slot>
@@ -97,7 +103,8 @@ export default {
           "pageNumber": 1,
           "pageSize": 20,
           "where": {
-            "condition": ""
+            "condition": "",
+            "tablefilter":{}
           }
         }
       },
@@ -215,6 +222,11 @@ export default {
 			let _isSame = this.menuApp.some(m=>this.acitveApp.name === m.systemapp)
 			return _isSame
 		},
+    onHeaderSearch (key,val) {
+      this.param.content.pageNumber = 1
+      this.param.content.where.tablefilter[key] = val
+      this.listData()
+    }
   },
   mounted () {
     this.autoQuery === false?'':this.listData()

src/components/normal-basic-layout/modules/table.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table border stripe ref="tables" :row-class-name="tableClassName" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" @row-click="rowClick" height="calc(100vh - 330px)" style="width:100%;" @selection-change="handleSelectionChange" >
+    <el-table border stripe ref="tables" :row-class-name="tableClassName" highlight-current-row :data="data" :header-cell-style="{background:'#fff',color:'#666'}" size="mini" @row-click="rowClick" height="calc(100vh - 330px)" style="width:100%;" @selection-change="handleSelectionChange" >
       <!-- <div slot="empty">
         <el-empty :image="require('../../../assets/empty.svg')" :image-size="250">
         </el-empty>
@@ -11,11 +11,35 @@
         align="center"
         @handleSelectionChange="handleSelectionChange">
       </el-table-column>
-      <el-table-column  v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width ? col.width : 0" :min-width="col.width ? col.width : 0" :fixed="checkFixed(col.columnname)">
-        <template slot-scope="scope">
-          <slot v-if="col.columnname !== 'operation'" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
-          <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+      <el-table-column  v-for="(col) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width ? col.width : 0" :min-width="col.width ? col.width : 0" :fixed="checkFixed(col.columnname)">
+        <template #header>
+          
+          <el-input v-if="col.filter === 1" size="mini" v-model="col.value" @change="inputChange" @keyup.native.enter="headerSearch(col.columnname)" @clear="headerSearch(col.columnname)" clearable/>
+          <!-- <p style="margin-top:5px" class="search-title">{{ col.title }}</p> -->
+          <!-- <div v-else class="flex-align-center flex-between" >
+            <span class="search-title">{{ col.title }}</span>
+            <i class="search-icon el-icon-search" v-if="col.filter === 1" @click="(act_column = col.columnname,show = true)"></i>
+          </div> -->
+          <!-- <el-popover placement="bottom-start" trigger="click"  v-if="col.filter === 1">
+            <div slot="reference" class="search-header flex-align-center">
+                <span class="search-title">{{ col.title }}</span>&nbsp;
+                <el-button size="mini" type="text" icon="el-icon-search"></el-button>
+            </div>
+            <el-input size="mini" v-model="value" :placeholder="'请输入' + col.title" @keyup.native.enter="headerSearch(col.columnname)" @clear="headerSearch(col.columnname)" clearable/>
+          </el-popover> -->
+          <!-- <span v-else class="search-title">{{ col.title }}</span> -->
+          
+        <slot v-if="col.filter === 2" name="temp" :data="col.columnname"></slot>
+          
         </template>
+        <el-table-column :prop="col.columnname" :label="col.title" :width="col.width ? col.width : 0" :min-width="col.width === 0 ? 150 : col.width" :fixed="checkFixed(col.columnname)">
+          <template slot-scope="scope">
+            <slot v-if="col.columnname !== 'operation'" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+            <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+          </template>
+        </el-table-column>
+        
+        
       </el-table-column>
     </el-table>
   </div>
@@ -33,7 +57,10 @@ export default {
   props:['data','tableName','custom','layout','fixRightData','fixLeftData'],
   data () {
     return {
-      list:[]
+      list:[],
+      act_column:'',
+      value:'',
+      show:false
     }
   },
   computed:{
@@ -56,6 +83,13 @@ export default {
       let isLeft = this.fixLeftData.some(item=>item === columnname)
       if (isRight) return 'right'
       if (isLeft) return 'left'
+    },
+    headerSearch (columnname) {
+      this.show = false
+      this.$emit('headerSearch',columnname,this.value)
+    },
+    inputChange (val) {
+      this.value = val
     }
   },
   mounted () {
@@ -64,4 +98,11 @@ export default {
 
 </script>
 <style>
+</style>
+<style scoped>
+.search-icon:hover{
+  font-weight: bold;
+  background: #f1f2f3;
+  cursor: pointer;
+}
 </style>

src/components/previewImage/index.vue

@@ -7,7 +7,7 @@
       :preview-src-list="srcList">
     </el-image>
     <div class="mode flex-align-center flex-around">
-      <i class="el-icon-view" @click="onPreview"></i>
+      <i class="el-icon-zoom-in" @click="onPreview"></i>
       <i v-if="deletebtn" class="el-icon-delete" @click="deleteFileLink"></i>
     </div>
   </div>

src/components/upload/test_upload.vue → src/components/upload/preview_upload.vue

@@ -11,8 +11,9 @@
         action="#"
         list-type="picture-card"
         :on-change="onChange"
-        :before-upload="beforeUpload"
-        :show-file-list="false">
+        :show-file-list="false"
+        :auto-upload="false"
+        multiple>
         <i class="el-icon-plus"></i>
       </el-upload>
     </div>
@@ -39,11 +40,12 @@ export default {
     };
   },
   methods: {
-    onChange (file,fileList) {
-      console.log(file,this.fileList,fileList)
-      this.fileList.push(file)
+    onChange (file,filelist) {
+      this.fileList = filelist
+      this.beforeUpload(file.raw)
     },
     beforeUpload (file) {
+      
       var that = this
 
       var fileReader = new FileReader();
@@ -57,15 +59,22 @@ export default {
       }
     },
     handleRemove (index) {
-      this.fileList = this.fileList.splice(1,index)
-      this.fileLinkList = this.fileLinkList.splice(1,index)
+      this.fileList = this.fileList.filter((e,idx)=>{
+        if (idx !== index) {
+          return e
+        }
+      })
+      this.fileLinkList = this.fileLinkList.filter((e,idx)=>{
+        if (idx !== index) {
+          return e
+        }
+      })
     },
     toUpload () {
-      console.log(this.fileList)
       this.fileList.forEach(file=>{
-        let index = file.raw.name.lastIndexOf(".");
+        let index = file.name.lastIndexOf(".");
         let ext = file.name.substr(index + 1);
-        this.params.content.filename = file.raw.name
+        this.params.content.filename = file.name
         this.params.content.filetype = ext
         this.getUploadUrl(file, ext)
       })

src/store/index.js

@@ -212,6 +212,7 @@ export default new Vuex.Store({
     getModules ({commit}, data) {
       if (data.type === 'system') {
         commit('setActiveApp',{name:data.mod[0].apps[0].systemappname,app:data.mod[0].apps[0],val:''})
+        
         sessionStorage.setItem('active_modules',JSON.stringify(data.mod[0]))
 
         let inactivePath = data.mod[0].apps[0].path

src/style/style.css

@@ -82,7 +82,6 @@ ul{
   background-color: #FA8C16 !important;
 }
 .el-table .el-table__cell{
-  padding:2px 0 !important;
 }
 .el-input-group__append, .el-input-group__prepend{
   background-color: #4F7BFD !important;
@@ -206,7 +205,8 @@ ul{
 }
 .search__label{
   display: inline-block;
-  /* width: 100px; */
+  width: 70px;
+  text-align: right;
   font-size: 14px;
   color:rgb(163, 163, 163) !important;
   margin-right: 10px;

src/utils/tool.js

@@ -39,6 +39,7 @@ export default {
     })
     // 获取当前应用表格数据
     let tablecols = active_modules[0].meta.tables
+
     return tablecols
   },