产品以及产品类别和上传文件组件

src/assets/css/main.scss

@@ -72,25 +72,25 @@
     // width: 100%;
     padding-bottom:10px;
     // overflow-x: auto !important;
-    // .el-table__body-wrapper{
-    //   max-height: calc(100% - 75px);
-    //   overflow: auto;
-    //   padding-bottom: 10px;
-    // }
+    .el-table__body-wrapper{
+      // max-height: calc(100% - 75px);
+      // overflow: auto;
+      padding-bottom: 10px;
+    }
   }
   .el-table th{
     background: var(--bg) !important;
     color: var(--color);
   }
-  .el-table tr td{
-    border-bottom: 1px solid rgba(124,124,124) !important;
-  }
-  .el-table tr td:first-child{
-    border-right: 1px solid rgba(124,124,124) !important;
-    border-left: 1px solid rgba(124,124,124) !important;
-  }
-  .el-table tr td:last-child{
-    border-right: 1px solid rgba(124,124,124) !important;
-    border-left: 1px solid rgba(124,124,124) !important;
-  }
+  // .el-table tr td{
+  //   border-bottom: 1px solid rgba(124,124,124) !important;
+  // }
+  // .el-table tr td:first-child{
+  //   border-right: 1px solid rgba(124,124,124) !important;
+  //   border-left: 1px solid rgba(124,124,124) !important;
+  // }
+  // .el-table tr td:last-child{
+  //   border-right: 1px solid rgba(124,124,124) !important;
+  //   border-left: 1px solid rgba(124,124,124) !important;
+  // }
   

src/utils/model/date/index.vue

@@ -0,0 +1,223 @@
+<template>
+  <div class="myDatePicker">
+    <div class="date">
+        <el-date-picker
+            v-if="type"
+            prefix-icon="el-icon-date"
+            v-model="type.time[0]"
+            :type="type.type"
+            :format="type.format"
+            :value-format="type.format"
+            :placeholder="type.placeholder"
+            @change="changeTime"
+            style="width:100%"
+        >
+        </el-date-picker>
+        <template v-if="type && type.range">
+            <div class="font">
+                至
+            </div>
+            <el-date-picker
+                v-if="type"
+                prefix-icon="el-icon-date"
+                v-model="type.time[1]"
+                :type="type.type"
+                :format="type.format"
+                :value-format="type.format"
+                :placeholder="type.placeholder2"
+                @change="changeTime"
+                style="width:100%">
+            </el-date-picker>
+        </template>
+    </div>
+    
+    
+    <div class="icon">
+        <i class="el-icon-setting" @click="open"></i>
+    </div>
+
+    <el-dialog
+        title="设置"
+        :visible.sync="dialogVisible"
+        width="30%"
+        :before-close="handleClose">
+        <div>
+            <el-radio-group v-model="radio">
+                <div v-for="item in typeList" :key="item.value" class="radio">
+                  <el-radio :label="item.value">{{item.label}}</el-radio>  
+                </div>
+            </el-radio-group>
+        </div>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="handleClose">取 消</el-button>
+            <el-button type="primary" @click="submit">确 定</el-button>
+        </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import moment from 'moment'
+export default {
+  components: {},
+  props: {
+    value:{
+        type:[String,Array],
+        default:()=>{
+            return []
+        }
+    }
+  },
+  data() {
+    return {
+        dialogVisible:false,
+        typeList:[
+            {
+                value:'1',
+                label:'查询某年月到某年月的数据',
+                time:[],
+                type:'month',
+                range:true,
+                format:'yyyy-MM',
+                placeholder:'开始日期',
+                placeholder2:'结束日期'
+            },
+            {
+                value:'2',
+                label:'查询某年到某年的数据',
+                time:[],
+                type:'year',
+                range:true,
+                format:'yyyy',
+                placeholder:'开始日期',
+                placeholder2:'结束日期'
+            },
+            {
+                value:'3',
+                operator:'<=',
+                label:'查询某年前所有数据',
+                time:[],
+                type:'year',
+                format:'yyyy',
+                placeholder:'请选择年'
+            },
+            {
+                value:'4',
+                operator:'=',
+                label:'查询某一整年的数据',
+                time:[],
+                type:'year',
+                format:'yyyy',
+                placeholder:'请选择年'
+            },
+        ],
+        type:{
+            value:'3',
+            time:[],
+            type:'year',
+            format:'yyyy',
+            placeholder:'请选择年'
+        },
+        radio:'3',
+    };
+  },
+  watch: {
+    value(val){
+        if(val){
+            this.getValue()
+        }
+    }
+  },
+  computed: {},
+  created() {},
+  mounted() {
+    this.getValue()
+  },
+  methods: {
+    //获取数据
+    getValue(){
+        var val = this.value
+        if(val){
+            if(typeof val == 'object'){
+                this.type.time = val
+            }else{
+                this.type.time = [val]
+                if(this.type.range){
+                    this.type.time[1] = moment().format('yyyy-MM-DD')
+                    this.changeTime()
+                }
+            }
+        }
+        
+    },
+    changeTime(){
+        if(this.type.range){
+            this.$emit('input',this.type.time) 
+            this.$emit('operator','')
+        }else{
+            this.$emit('input',this.type.time[0]) 
+            this.$emit('operator',this.type.operator)
+        }
+        
+    },
+    //打开弹窗
+    open(){
+        this.radio = this.type.value
+        this.dialogVisible = true
+    },
+    //关闭弹窗
+    handleClose(){
+        this.dialogVisible = false
+    },
+    //确定选择
+    submit(){
+        this.type = null
+        this.$nextTick(()=>{
+            this.type = this.typeList.find(item=>{
+                return item.value == this.radio
+            })
+            this.getValue()
+            this.handleClose()
+        })
+        
+    }
+  },
+  
+};
+</script>
+<style lang="scss">
+    .myDatePicker{
+        .el-icon-date{
+            font-size: 22px;
+            color: var(--fontcolor);
+        }
+    }
+</style>
+<style lang="scss" scoped>
+
+.myDatePicker{
+    --fontcolor:#73767d;
+    width: 500px;
+    display: flex;
+    align-items: center;
+    .date{
+        width: 100%;
+        display: flex;
+        align-items: center;
+        .font{
+            padding: 0 5px;
+            color: var(--fontcolor);
+        }
+    }
+    .icon{
+        margin-left: 5px;
+        i{
+            font-size: 26px;
+            color: var(--fontcolor);
+        }
+    }
+    .radio{
+        height: 30px;
+    }
+}
+</style>

src/utils/model/route.vue

@@ -1,16 +1,19 @@
 <template>
   <div>
-    <upload :fileList="tableData"></upload>
+    <upload v-model="time"></upload>
+    <myUpload :multiple="true" accept=".png,.jpg"></myUpload>
+
   </div>
 </template>
 <script>
-import upload from './upload/index.vue'
+import upload from './date/index.vue'
 export default {
   components:{
     upload
   },
   data() {
     return {
+      time:'2023',
       isflag: false,
       isMore: false,
       tableData: [
@@ -62,6 +65,11 @@ export default {
       ]
     };
   },
+  watch:{
+    time(val){
+      console.log(val)
+    }
+  },
   methods: {
     load() {
       this.isMore = false;

src/utils/model/upload/index.vue

@@ -28,13 +28,20 @@
           <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         </el-upload>
       </div>
-      <div class="line" v-if="fileList.length>0"></div>
-      <div class="fileList" v-if="fileList.length>0">
+      <div class="line" v-if="fileList.length > 0"></div>
+      <div class="fileList" v-if="fileList.length > 0">
         <ul>
           <li v-for="item in fileList" :key="item.guid">
-            <div><i class="el-icon-document" style="margin-right:10px"></i><span class="name" @click="checkFiles(item)">{{ item.name ?item.name:item.originalName }}</span></div>
-            <div class="type">{{ item.guid?'已上传':'待上传' }}</div>
-            <div class="icon" @click="onRemove(item,fileList)"><i class="el-icon-close"></i></div>
+            <div>
+              <i class="el-icon-document" style="margin-right: 10px"></i
+              ><span class="name" @click="checkFiles(item)">{{
+                item.name ? item.name : item.originalName
+              }}</span>
+            </div>
+            <div class="type">{{ item.guid ? "已上传" : "待上传" }}</div>
+            <div class="icon" @click="onRemove(item, fileList)">
+              <i class="el-icon-close"></i>
+            </div>
           </li>
         </ul>
       </div>
@@ -46,55 +53,57 @@
 export default {
   components: {},
   props: {
-    action:{
-        type:String,
-        default:''
+    action: {
+      type: String,
+      default: "",
     },
-    multiple:{
-        type:Boolean
+    multiple: {
+      type: Boolean,
     },
-    data:{
-        type:Object
+    data: {
+      type: Object,
     },
-    name:{
-        type:String,
-        default:''
+    name: {
+      type: String,
+      default: "",
     },
-    showFileList:{
-        type:Boolean
+    showFileList: {
+      type: Boolean,
     },
-    drag:{
-        type:Boolean,
-        default:true
+    drag: {
+      type: Boolean,
+      default: true,
     },
-    accept:{
-        type:String,
-        default:''
+    accept: {
+      type: String,
+      default: "",
     },
-    listType:{
-        type:String,
-        default:'text'
+    listType: {
+      type: String,
+      default: "text",
     },
-    autoUpload:{
-        type:Boolean,
-        default:false
+    autoUpload: {
+      type: Boolean,
+      default: false,
     },
-    fileList:{
-        type:Array,
-        default:()=>{
-            return []
-        }
+    fileList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
     },
-    disabled:{
-        type:Boolean,
-        default:false
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    limit: {
+      type: Number,
     },
-    limit:{
-        type:Number,
-    }
   },
   data() {
-    return {};
+    return {
+        discontent:[]
+    };
   },
   watch: {},
   computed: {},
@@ -102,30 +111,68 @@ export default {
   mounted() {},
   methods: {
     onPreview(file) {
-        this.$emit('on-preview',file)
+      this.$emit("on-preview", file);
     },
-    onRemove(file,fileList) {
-        this.$emit('on-remove',file,fileList)
+    onRemove(file, fileList) {
+      this.$emit("on-remove", file, fileList);
     },
     onSuccess(response, file, fileList) {
-        this.$emit('on-success',response,file,fileList)
+      this.$emit("on-success", response, file, fileList);
     },
-    onError(err,file,fileList){
-        this.$emit('on-error',err,file,fileList)
+    onError(err, file, fileList) {
+      this.$emit("on-error", err, file, fileList);
     },
-    onProgress(event,file,fileList){
-        this.$emit('on-progress',event,file,fileList)
+    onProgress(event, file, fileList) {
+      this.$emit("on-progress", event, file, fileList);
     },
-    onChange(file,fileList){
-        this.$emit('on-change',file,fileList)
+    onChange(file, fileList) {
+      if (this.accept) {
+        var arr = this.accept.split(/,|，/g);
+        var fileType = file.name.substring(file.name.lastIndexOf("."));
+        var index = arr.findIndex(item=>{
+            return item == fileType
+        })
+        if(index == -1){
+            this.discontent.push(file)
+            return false;
+        }
+      }
+      this.$emit("on-change", file);
+    //   this.$nextTick(()=>{
+    //     if(this.discontent){
+    //         this.discontent = false
+    //         this.$message({
+    //             message: `上传文件只支持${ this.accept.replace(/,|，/g,'，') }等格式!`,
+    //             type: "warning",
+    //         });
+    //     }
+    //   })
+      this.$nextTick(()=>{
+            var b = ''
+            if(this.discontent.length>0){
+                var arr = this.discontent.map(item=>{
+                    return item.name
+                })
+                // this.discontent.forEach(item=>{
+                //     b = b + item.name +'，'
+                // })
+                this.$alert(`您上传的<span style='color:red'>${ arr.join('，') }</span>等文件格式不正确，请上传<span style='color:blue'>${ this.accept.replace(/,|，/g,'，') }</span>等格式文件`, '提示', {
+                    dangerouslyUseHTMLString: true,
+                    confirmButtonText: '确定',
+                    type:'warning',
+                    callback: action => {
+                        this.discontent = []
+                    }
+                });
+                
+            }
+            })
     },
-    onExceed(file,fileList){
-        this.$emit('on-exceed',file,fileList)
+    onExceed(file, fileList) {
+      this.$emit("on-exceed", file, fileList);
     },
     //查看图片
-    checkFiles(file){
-
-    }
+    checkFiles(file) {},
   },
 };
 </script>
@@ -150,14 +197,14 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
-.myUpload{
-    width: calc(100% - 0px);
-    height:180px;
-    padding: 5px;
+.myUpload {
+  width: calc(100% - 0px);
+  height: 180px;
+  padding: 5px;
 }
 .myUpload1 {
-    width: calc(100% - 20px);
-    height: 100%;
+  width: calc(100% - 20px);
+  height: 100%;
   padding: 5px;
   display: flex;
   align-items: center;
@@ -182,32 +229,32 @@ export default {
     ul {
       list-style-type: none;
       padding: 0 10px;
-      li{
+      li {
         line-height: initial;
-        padding:5px 10px;
+        padding: 5px 10px;
         border-radius: 5px;
         display: flex;
         justify-content: space-between;
-        .type{
-            display: block;
-            color: #57a5f7;
+        .type {
+          display: block;
+          color: #57a5f7;
         }
-        .icon{
-            display: none;
+        .icon {
+          display: none;
         }
       }
-      li:hover{
+      li:hover {
         background: #f4f4f4;
-        .name{
-           color: #57a5f7; 
-           cursor: pointer;
+        .name {
+          color: #57a5f7;
+          cursor: pointer;
         }
-        .type{
-            display: none;
+        .type {
+          display: none;
         }
-        .icon{
-            display: block;
-            cursor: pointer;
+        .icon {
+          display: block;
+          cursor: pointer;
         }
       }
     }

src/views/components/dialog/ClientTable.vue

@@ -159,7 +159,9 @@ export default {
     },
     //选择
     getCheck(row) {
-      var index = this.personIds.indexOf(row.id);
+      var index = this.personIds.findIndex(item=>{
+		return item == row.id
+	  })
       if (index == -1) {
         this.personIds.push(row.id);
         this.persons.push(row);

src/views/event/components/index.vue

@@ -118,7 +118,12 @@ export default {
       //总条数
       total: 0,
       //排序
-      sort: [],
+      sort: [
+        {
+          "orderBy": "createTime",
+          "orderType": 1
+        }
+      ],
       //显示栏位
       columnList: null,
       //分组数据

src/views/event/components/view/mergeTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :data="commonData" header-row-class-name="custom-table-header" @expand-change="expandChange"  @sort-change="sortChange">
+    <el-table :data="commonData" border header-row-class-name="custom-table-header" @expand-change="expandChange"  @sort-change="sortChange">
       <el-table-column type="expand">
         <template slot-scope="props">
           <div style="padding: 10px;height: 340px;">
@@ -103,7 +103,12 @@ export default {
       showData: [],
       expandList: [],
 
-      sort:[],
+      sort:[
+        {
+          "orderBy": "createTime",
+          "orderType": 1
+        }
+      ],
     }
   },
   watch: {

src/views/event/components/view/table.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="eventTable height_100" v-DivHeight="getDivHeight" >
-    <el-table :data="tableData" header-row-class-name="custom-table-header" @sort-change="sortChange"   
+    <el-table :data="tableData" border header-row-class-name="custom-table-header" @sort-change="sortChange"   
     v-if="showTable" :maxHeight="tableHeight" v-el-table-infinite-scroll="getList" :infinite-scroll-distance="10" 
     :infinite-scroll-disabled="disabled" >
       <el-table-column label="#" width="60" type="index" align="center">
@@ -55,7 +55,7 @@ export default {
   mixins: [mixins,getTableHeight],
   props: {
     isOperate: {//控制显示
-      type: String,
+      type: [String,Number],
       default: ''
     },
     column: {//显示栏位管理数组
@@ -124,7 +124,12 @@ export default {
         current: 0
       },
       // 排序数组
-      sort: [],
+      sort: [
+        {
+          "orderBy": "createTime",
+          "orderType": 1
+        }
+      ],
       //事件类型及所选
       action:{
         type:'',//1表示删除，2表示其他，3表示新增

src/views/patentMining/index.vue

@@ -71,7 +71,12 @@
           //分组
           group:'',
           //排序
-          sort:{},
+          sort:[
+            {
+              "orderBy": "createTime",
+              "orderType": 1
+            }
+          ],
           //总数
           total:0,
           //检索字段

src/views/product/components/dialog/addEditProduct.vue

@@ -180,6 +180,7 @@ export default {
           this.title = '新增外公司产品'
         }
       }
+      this.productCategoryList=[]
       this.getProductCategory();
       this.dialogVisible = true;
     },

src/views/product/components/index.vue

@@ -111,7 +111,12 @@ export default {
         size:10,
       },
       //排序
-      sort:[],
+      sort:[
+        {
+          "orderBy": "createTime",
+          "orderType": 1
+        }
+      ],
       // 产品类别总数
       total: 0,
       // 产品类别数据

src/views/product/components/view/categoryTable.vue

@@ -1,12 +1,12 @@
 <template>
   <!-- 产品类别表格 -->
   <div class="categoryTable height_100" v-DivHeight="getDivHeight">
-    <el-table :data="tableData" style="width: 100%" header-row-class-name="custom-table-header" row-key="id" v-if="showTable" :maxHeight="tableHeight" :expand-row-keys="expends" @expand-change="handleExpand" @sort-change="sortChange">
+    <el-table :data="tableData" style="width: 100%" border header-row-class-name="custom-table-header" row-key="id" v-if="showTable" :maxHeight="tableHeight" :expand-row-keys="expends" @expand-change="handleExpand" @sort-change="sortChange">
       <el-table-column type="expand">
         <!-- 产品 -->
         <template slot-scope="scope">
           <div style="padding: 10px;height: 340px;">
-            <component :is="componentType" :tableData="scope.row.productData" :queryParams="scope.row.queryParams" :row="scope.row"  v-bind="$attrs" v-on="$listeners"></component>
+            <component :is="componentType" :row="scope.row"  v-bind="$attrs" v-on="$listeners"></component>
           </div>
         </template>
       </el-table-column>
@@ -111,12 +111,10 @@ export default {
       })
       if(index==-1){
         this.expends.push(row.id)
+      }else{
+        this.expends.splice(index,1)
       }
-      row.productData =row.productData || []
-      row.queryParams =row.queryParams || {
-        current:0,
-        size:10
-      }
+
     },
     // 编辑下拉菜单
     handleCommand(val, row) {

src/views/product/components/view/productTable.vue

@@ -1,12 +1,13 @@
 <template>
   <!-- 产品table -->
   <div class="productTable height_100" v-DivHeight="getDivHeight">
-    <el-table :data="tableData" header-row-class-name="custom-table-header" 
+    <el-table :data="data" header-row-class-name="custom-table-header" 
       v-if="showTable" :maxHeight="tableHeight"
       v-el-table-infinite-scroll="getList"
       :infinite-scroll-distance="10"
       :infinite-scroll-disabled="disabled"
-      @sort-change="sortChange">
+      @sort-change="sortChange"
+      border>
       <el-table-column label="#" width="60" type="index" align="center">
         <template slot-scope="scope">
           <span>{{ (scope.$index + 1) }}</span>
@@ -77,7 +78,7 @@ export default {
       default: () => {
         return {
           current:0,
-          size:10
+          size:5
         }
       }
     },
@@ -135,7 +136,12 @@ export default {
       isMore:false,
       isflag:false,
       // 排序数组
-      sort: [],
+      sort: [
+        {
+          "orderBy": "createTime",
+          "orderType": 1
+        }
+      ],
       //事件类型及所选
       action:{
         type:'',//1表示删除，2表示其他，3表示新增
@@ -156,19 +162,20 @@ export default {
       this.disabled = true
     }else{
       this.disabled = false
+      // this.getList()
     }
   },
   methods: {
     //更新数据
     updateData(){
       if(this.action.type == 1){
-        if(this.tableData.length == 1){
+        if(this.data.length == 1){
           return false
         }
-        var startIndex = this.tableData.findIndex(item=>{
+        var startIndex = this.data.findIndex(item=>{
               return item.id == this.action.id
           })
-          this.tableData.splice(startIndex,1)
+          this.data.splice(startIndex,1)
           var str = this.$commonJS.objectToString(this.searchOption) 
           let params = {
             ...this.queryParams,
@@ -183,9 +190,12 @@ export default {
         }
         this.getList2(params,2)
       }else{
+        if(this.handleMessage != this.row.id){
+          return;
+        }
         this.queryParams.current = 0
         this.disabled = false
-        this.tableData.splice(0)
+        this.data.splice(0)
         this.getList()
       }
     },
@@ -196,15 +206,15 @@ export default {
         if (res.code == 200) {
           if(type == 1){
             var startIndex = (params.current-1)*size
-            var endIndex = this.tableData.length
+            var endIndex = this.data.length
             var len = endIndex - startIndex
-            this.tableData.splice(startIndex,len,...res.data.data)
+            this.data.splice(startIndex,len,...res.data.data)
             this.queryParams.total = res.data.total
           }else if(type == 2){
-            var startIndex = this.tableData.findIndex(item=>{
+            var startIndex = this.data.findIndex(item=>{
               return item.id == this.action.id
             })
-            this.tableData.splice(startIndex,1,...res.data.data)
+            this.data.splice(startIndex,1,...res.data.data)
           }
           
         }
@@ -252,7 +262,7 @@ export default {
       this.isFlag = true;
       this.$api.queryProduct(params).then(res => {
         if (res.code == 200) {
-          this.tableData.push(...res.data.data)
+          this.data.push(...res.data.data)
           this.queryParams.total = res.data.total
         }
       }).catch(err => {
@@ -285,14 +295,20 @@ export default {
       }
       this.queryParams.current = 0
       this.disabled = false
-      this.tableData.splice(0)
+      this.data.splice(0)
       this.getList()
     },
   },
 }
 </script>
 
-<style lang="scss" scoped>
-.productTale{
+<style lang="scss">
+.productTable{
+  .custom-table-header > th {
+    background-color: #f8f8f9 !important;
+    color: #515a6e;
+    height: 40px;
+    font-size: 13px;
+  }
 }
 </style>

src/views/project/components/view/table.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="height_100">
     <div>
-      <el-table :data="tableData" style="width: 100%" header-row-class-name="custom-table-header">
+      <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header">
         <el-table-column label="#" width="60" type="index" align="center">
           <template slot-scope="scope">
             <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
@@ -56,7 +56,7 @@ export default {
   mixins:[workspaceOptions],
   props: {
     isOperate: {//控制显示
-      type: String,
+      type: [String,Number],
       default:''
     },
     

src/views/project/index.vue

@@ -135,7 +135,12 @@ export default {
         current: 1,
       },
       //排序
-      sort:{},
+      sort:[
+        {
+          "orderBy": "createTime",
+          "orderType": 1
+        }
+      ],
       //分组
       group:'',
       //字典项

src/views/report/components/index.vue

@@ -116,7 +116,12 @@ export default {
         //分页数量
         pageSize:[10,"全部"],
         //排序字段
-        sort:{},
+        sort:[
+            {
+                "orderBy": "createTime",
+                "orderType": 1
+            }
+        ],
         //分组
         group:'',
         //总数

src/views/report/components/view/table.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div>
-      <el-table :data="tableData" style="width: 100%" header-row-class-name="custom-table-header">
+      <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header">
         <el-table-column label="#" width="60" type="index" align="center">
           <template slot-scope="scope">
             <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
@@ -53,7 +53,7 @@ export default {
   mixins:[mixins],
   props: {
     isOperate: {//控制显示
-      type: String,
+      type: [String,Number],
       default:''
     },