报价单新建上传附件调整，左侧导航调整，营销费用类型情况统计新增费用类型筛选

src/HDrpManagement/salerpriceData/modules/salerType.vue

@@ -17,6 +17,17 @@
                 <el-option :label="$t('离职')" value="2"></el-option>
               </el-select>
             </div>
+            <div class="mt-10 inline-16">
+              <label class="search__label">费用类型:</label>
+              <el-select v-model="param.content.where.feestype"   placeholder="请选择费用类型" class="inline-16" size="small" filterable clearable @change="queryModel(param.content.dataid)" @focus="feesTypeData">
+                <el-option
+                    v-for="item in feestypeList"
+                    :key="item.index"
+                    :label="item.value + '-' + item.remarks"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
             <div class="inline-16 mt-10">
               <el-button-group >
                 <el-button size="small" :type="dateType === '全部'?'primary':''" @click="changeTypeDate('全部')">{{$t(`全部`)}}</el-button>
@@ -127,7 +138,8 @@
         isFull:false,
         listqueryid:'',
         pageTotal:0,
-        marginChart:0
+        marginChart:0,
+        feestypeList:[],
       }
     },
     methods:{
@@ -420,7 +432,13 @@
         }
         const res = await this.$api.requested(param)
         this.$refs.departmentSalesperson.personnelList = res.data.hr
-      }
+      },
+      async feesTypeData(){
+        if (this.feestypeList.length == 0){
+          const res = await this.$store.dispatch('optiontypeselect','feestype')
+          this.feestypeList = res.data
+        }
+      },
     },
     created() {
       this.tablecols = this.tool.tabelCol(this.$route.name).salespersonSalesTable.tablecols

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -842,6 +842,7 @@ export default {
       this.ownerid = res.data;
     },
     async uploadSuccess() {
+      console.log('查询列表')
       const res = await this.$api.requested({
         classname: "system.attachment.Attachment",
         method: "queryFileLink",

src/components/newLayout/modules/aside.vue

@@ -15,17 +15,17 @@
       :default-active="activeIndex"
       class="el-menu-vertical-demo">
       <div class="menu_scroll__panel">
-        <el-menu-item :index="String(item.systemid)" v-for="item in systemList" :key="item.index" @click="handelMenuClick(item,'system')" @mouseenter.native="debounce(selectStyle,100)()" @mouseleave.native="outStyle">
-          <p style="text-align:center" v-if="collapse">{{$t(item.systemname.substr(0, 1))}}</p>
-          <span slot="title">{{$t(item.systemname)}}</span>
+        <el-menu-item :index="String(item.systemid)" v-for="item in systemList" :key="item.index" @click="handelMenuClick(item,'system')" @mouseenter.native="debounce(selectStyle,100)()" @mouseleave.native="outStyle" style="display: flex;align-items: center;padding-right: 20px !important;">
+          <p style="text-align:center" v-if="collapse">{{item.systemname.substr(0, 1)}}</p>
+          <span style="white-space: normal;word-break: break-all;line-height: 12px;flex: 1;" slot="title">{{$t(item.systemname)}}</span>
         </el-menu-item>
         <el-divider class="divider"></el-divider>
         <!-- <p v-if="!collapse" style="padding:0 20px;font-size:12px;color:#eeeeee">应用</p> -->
         <!-- <el-divider content-position="left">应用</el-divider> -->
-        <el-menu-item :index="String(index + 10)" v-for="(item,index) in menuApp" :key="index" @click="handelMenuAppClick(item,'app')" @mouseenter.native="debounce(selectStyle,100)()" @mouseleave.native="outStyle">
-          <p class="" style="text-align:center" v-if="collapse">{{$t(item.systemappname.substr(0, 1))}}</p>
-          <span slot="title">{{$t(item.systemappname)}}</span>
-          <i v-if="!collapse" style="float:right;line-height: 40px;" class="el-icon-error menuIconClose" @click.stop="deleteMenuApp(item)"></i>
+        <el-menu-item :index="String(index + 10)" v-for="(item,index) in menuApp" :key="index" @click="handelMenuAppClick(item,'app')" @mouseenter.native="debounce(selectStyle,100)()" @mouseleave.native="outStyle" style="display: flex;align-items: center;padding-right: 20px !important;">
+          <p class="" style="text-align:center" v-if="collapse">{{item.systemappname.substr(0, 1)}}</p>
+            <span style="white-space: normal;word-break: break-all;line-height: 12px;flex: 1;" slot="title">{{$t(item.systemappname)}}</span>
+          <i v-if="!collapse" style="float:right;line-height: 50px;" class="el-icon-error menuIconClose" @click.stop="deleteMenuApp(item)"></i>
         </el-menu-item>
       </div>
       <div>

src/template/upload/index.vue

@@ -1,5 +1,6 @@
 <template>
   <el-upload
+      ref="uploadMy"
       class="upload-demo"
       action="#"
       :on-preview="handlePreview"
@@ -33,8 +34,11 @@ export default {
       count:0,
       file: {},
       filelist: [],
+      oldCount:0
     };
   },
+  mounted() {
+  },
   methods: {
     async handleRemove(file, fileList) {
       this.$emit('uploadGet')
@@ -45,6 +49,7 @@ export default {
           "linksids":[file.linksid]
         }
       })
+      this.oldCount = this.oldCount - 1
       this.$emit('onSuccess',res)
     },
     handleProgress(file,fileList){
@@ -58,7 +63,6 @@ export default {
     },
     handleChange (file, filelist) {
       this.$emit('uploadGet')
-      this.count = 0
       this.filelist = []
       this.filelist = filelist
       var index = file.raw.name.lastIndexOf(".");
@@ -111,10 +115,16 @@ export default {
       }
       const res = await this.$api.requested(param)
       this.count++
-      if (this.count == this.filelist.length) {
-        this.$emit('onSuccess',res)
+      console.log(this.count,'count')
+      console.log(this.filelist.length,'length')
+      if (this.count == this.filelist.length - this.oldCount) {
+        this.oldCount = this.oldCount +  this.count
         this.count = 0
+        console.log(this.count,'count')
         console.log('触发');
+        this.$refs.uploadMy.clearFiles()
+        this.filelist = []
+        this.$emit('onSuccess',res)
       }
       // if (res.code ===  1) {
       //   this.$emit('onSuccess',res)