4444

src/views/components/common/baseSelect.vue

@@ -243,9 +243,6 @@ export default {
   watch: {
     value: {
       handler (value) {
-        if (!!!value)
-          this.selected = ''
-        else
         this.selected = value + ''
         this.$emit("input", this.selected)
       },

src/views/report/task/components/taskCreate.vue

@@ -2,8 +2,14 @@
 <template>
   <div class="app-content" style="height: 76vh;overflow: auto;">
     <a-spin :spinning="loading" style="width: 100%;height: 100%;">
+      <div class="page-card">
+        <a-tabs type="card" hideAdd size="small" @change="callback">
+          <a-tab-pane :key="item.key" :tab="item.title" v-for="(item) in tabsData">
+          </a-tab-pane>
+        </a-tabs>
+      </div>
       <div class="page-content">
-        <task-edit v-model="value" @close="closeWindow" @load="onLoad" ref="taskCreate" />
+        <task-edit v-model="value" @close="closeWindow" @load="onLoad" ref="taskCreate" :tabsData.sync="tabsData" />
       </div>
       <div class="page-footer">
         <a-button type="primary" @click="save">保 存</a-button>
@@ -23,6 +29,17 @@ export default {
   data () {
     return {
       loading: false,
+      tabsData: [
+        { title: '填报信息', key: '0', isShow: true },
+        { title: '项目组主要成员及单位', key: '1', isShow: true },
+        { title: '项目主要实施内容和目标', key: '2', isShow: true },
+        { title: '申请书正文', key: '3', isShow: true },
+        { title: '经费预算及设备明细', key: '4', isShow: true },
+        { title: '项目实施阶段及任务', key: '5', isShow: true },
+        { title: '项目课题设置', key: '6', isShow: true },
+        { title: '绩效目标表', key: '7', isShow: true },
+        { title: '附件信息', key: '8', isShow: true },
+      ],
     }
   },
   props: {
@@ -48,6 +65,13 @@ export default {
     onLoad (value) {
       this.loading = value
     },
+    callback (key) {
+      var index = parseInt(key)
+      this.tabsData.forEach(e => {
+        e.isShow = false
+      })
+      this.tabsData[index].isShow = true;
+    },
   },
 }
 </script>
@@ -60,9 +84,14 @@ export default {
   width: 8px;
   height: 6px;
 }
+.page-card {
+  width: 100%;
+  height: 50px;
+  overflow: auto;
+}
 .page-content {
   width: 100%;
-  height: calc(100% - 40px);
+  height: calc(100% - 90px);
   overflow: auto;
 }
 .page-footer {

src/views/report/task/components/taskInfo.vue

@@ -828,7 +828,6 @@
         </a-col>
       </a-row>
     </div>
-
   </div>
 </template>