Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/components/common/baseSelect.vue

@@ -247,3 +247,4 @@ export default {
   }
 };
 </script>
+

src/views/components/common/cascaderSelect.vue

@@ -25,11 +25,9 @@ export default {
       // this.$emit("change");
       // this.$emit("input", this.selected)
     }
-    console.log(this.selected)
   },
   methods: {
     onChange (value, selectedOptions) {
-      console.log(value, selectedOptions);
       this.selected = value
       if (!!this.selected && this.selected.length == 3) {
         this.$emit("input", this.selected[2])

src/views/report/project/Index.vue

@@ -102,7 +102,8 @@ export default {
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' } },
-        { title: '项目编号', dataIndex: 'projNo', align: 'center' },
+        //{ title: '项目编号', dataIndex: 'projNo', align: 'center' },
+        { title: '申请编号', dataIndex: 'appNo', align: 'center' },
         // { title: '版本号', dataIndex: 'versionNo', align: 'center' },
         // { title: '项目类别', dataIndex: 'projClassName', align: 'center' },
         { title: '开始时间', dataIndex: 'startDate', align: 'center' },

src/views/report/project/components/projectEdit.vue

@@ -716,7 +716,6 @@ export default {
       }
     },
     submit () {
-      console.log(this.formData)
       this.processProjectYearTarget()
       this.$refs.form.validate(valid => {
         if (valid) {