zhuliu 1 gadu atpakaļ
vecāks
revīzija
bbca613b57

+ 2 - 0
src/utils/model/upload/index.vue

@@ -3,6 +3,7 @@
     <div class="myUpload1" v-if="show">
       <div class="myDemo">
         <el-upload
+          ref="uploadRef"
           class="upload-demo"
           action="#"
           :auto-upload="false"
@@ -251,6 +252,7 @@ export default {
         }
       }
       this.$emit("on-change", file);
+      this.$refs.uploadRef.clearFiles()
       //是否立即上传
       if (this.autoUpload) {
         this.uploadFile(file)

+ 3 - 2
src/views/components/dialog/nodeCopy.vue

@@ -110,8 +110,8 @@ export default {
         options: [
             { label: '产品类别', value: '1' },
             { label: '产品', value: '2' },
-            { label: '技术分类', value: '3' },
-            { label: '自定义树', value: '4' },
+            // { label: '技术分类', value: '3' },
+            // { label: '自定义树', value: '4' },
         ],
         loading:true,
         tableData:[],
@@ -188,6 +188,7 @@ export default {
         }
     },
     getData(){
+        this.tableData = []
         switch(this.form.value){
             case '1':
                 this.queryProductCategory()

+ 13 - 6
src/views/components/drawer/Field.vue

@@ -25,7 +25,7 @@
             </el-table-column>
             <el-table-column label="状态" align="center" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span v-if="scope.row.status">{{ statusObj.find(item=>item.value == scope.row.status).label }}</span>
+                <span>{{ getStatus(scope.row.status) }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="createName" label="创建人" align="center" show-overflow-tooltip></el-table-column>
@@ -42,7 +42,7 @@
                   <el-dropdown-menu slot="dropdown" class="text-align_center">
                     <el-dropdown-item @click.native="handleEditOption(scope.row)" v-if="[3, 4, 5, 6].indexOf(scope.row.type) !== -1">选项管理</el-dropdown-item>
                     <el-dropdown-item v-else-if="[3, 4, 5, 6].indexOf(scope.row.type) !== -1" type="primary" size="small" @click.native="handleEditOption(scope.row)">选项查看</el-dropdown-item>
-                    <el-dropdown-item @click.native="handleCopy(scope.row)">复制</el-dropdown-item>
+                    <!-- <el-dropdown-item @click.native="handleCopy(scope.row)">复制</el-dropdown-item> -->
                     <el-dropdown-item class="color-red" @click.native="handleDelete(scope.row)" divided>删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -126,20 +126,20 @@
       </div>
     </el-dialog>
 
-    <!-- <import-field-dialog ref="importFieldDialog" @close="getList" />
-    <copy-field-dialog ref="copyFieldDialog" @close="getList" /> -->
+    <!-- <import-field-dialog ref="importFieldDialog" @close="getList" /> -->
+    <copy-field-dialog ref="copyFieldDialog" @submit="getList" />
   </div>
 </template>
 
 <script>
 // import ImportFieldDialog from "../dialog/ImportField";
-// import CopyFieldDialog from "../dialog/CopyField";
+import CopyFieldDialog from "../dialog/nodeCopy";
 import { findTreeEq } from "@/utils";
 
 export default {
   components: {
     // ImportFieldDialog,
-    // CopyFieldDialog
+    CopyFieldDialog
   },
   data() {
     return {
@@ -208,6 +208,13 @@ export default {
   mounted() {
   },
   methods: {
+    getStatus(value){
+      var obj = this.statusObj.find(item=>item.value == value)
+      if(obj){
+        return obj.label
+      }
+      return '';
+    },
     //不同层级不同背景色
     getBackground(node,data){
       let color = {

+ 1 - 0
src/views/product/components/dialog/classifyNode.vue

@@ -150,6 +150,7 @@ export default {
     handleClose() {
       this.$refs.ruleForm.resetFields()
       this.form = {}
+      this.files = []
       this.dialogVisible = false
     },
   },

+ 2 - 2
src/views/project/components/drawer/form.vue

@@ -112,8 +112,8 @@
               <el-col :span="12">
                 <el-form-item label="处理状态" prop="status">
                   <el-select v-model="ruleForm.status" placeholder="请输入处理状态" class="width_100">
-                    <el-option value="0" label="处理中"></el-option>
-                    <el-option value="1" label="已完成"></el-option>
+                    <el-option :value="0" label="处理中"></el-option>
+                    <el-option :value="1" label="已完成"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>

+ 13 - 2
src/views/project/index.vue

@@ -51,7 +51,7 @@
           </el-main>
           <el-footer class="pagination" v-if="[2].indexOf(isOperate) == -1 && this.queryShowType != '2'">
             <el-pagination backgroundx layout="total,sizes, prev, pager, next, jumper" :current-page.sync="queryParams.current"
-              :page-size.sync="queryParams.size" @current-change="handleCurrentChange" @size-change="handleSizeChange" :total="total">
+              :page-size.sync="queryParams.size" :page-sizes="pageSizes" @current-change="handleCurrentChange" @size-change="handleSizeChange" :total="total">
             </el-pagination>
           </el-footer>
         </el-container>
@@ -115,6 +115,7 @@ export default {
         size: 10,
         current: 1,
       },
+      pageSizes:[10, 20, 30, 40, 50, 100],
       //排序
       sort: [
         {
@@ -256,7 +257,7 @@ export default {
     },
     //获取专利数据库列表/卡片数据
     getList() {
-      this.queryParams.size = this.queryShowType === '0' ? 10 : 12
+     
       var params = this.queryParams
       params = {
         ...this.queryParams,//分页信息
@@ -360,6 +361,16 @@ export default {
         return false
       }
       this.queryParams.current = 1
+      if(type == 1){
+        this.queryParams.size = 12
+        this.pageSizes.splice(1,0,12)
+      }else{
+        this.queryParams.size = 10
+        var index = this.pageSizes.findIndex(item=>item==12)
+        if(index){
+          this.pageSizes.splice(index,1)
+        }
+      }
       this.getList()
       // this.onChange()
     },

+ 2 - 0
src/views/report/components/reportFile/reportFileTable.vue

@@ -186,6 +186,8 @@ export default {
         this.form.fileGuid = guids[0]
       }else{
         this.form.fileGuid = ''
+        this.$message.warning('文件不能为空')
+        return false
       }
       
       this.$refs.form.validate((valid) => {