report time

src/views/home/component/dash.vue

@@ -81,7 +81,7 @@
           icon="Upload"
           type="primary"
           text
-          @click="track(row)"
+          @click="report(row)"
         >
           {{ row.is_report === 1 ? '项目已上报' : '项目上报' }}
         </el-button>
@@ -224,6 +224,24 @@
       :select-num="selectList.length === 0 ? page.total : selectList.length"
       @export="exportExcelTotal"
     />
+    <el-dialog v-model="reportShow" width="400px">
+      <div v-if="currentReport">
+        <span class="padding-bottom">
+          上报后该项目情况将更新为正式项目，请确认项目相关信息已经审核完成
+        </span>
+        <el-date-picker
+          v-model="currentReport.report_time"
+          format="YYYY-MM-DD"
+          placeholder="选择上报时间"
+          style="width: 100%"
+          value-format="YYYY-MM-DD"
+        />
+      </div>
+      <div class="flex flex-center full-width flex-justify-end">
+        <el-button @click="reportShow = false">取 消</el-button>
+        <el-button @click="track(currentReport)">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -245,6 +263,9 @@ export default {
   },
   data() {
     return {
+      reportTime: '',
+      currentReport: null,
+      reportShow: false,
       dialogLoading: false,
       disable: false,
       showAdd: false,
@@ -360,6 +381,11 @@ export default {
               return value.substring(0, 10)
             }
           },
+          {
+            label: '上报时间',
+            prop: 'report_time',
+            width: 120,
+          },
           {
             label: '认定时间',
             prop: 'year',
@@ -555,35 +581,42 @@ export default {
         }
       })
     },
+    report(res) {
+      this.currentReport = res
+      this.reportShow = true
+    },
     track(res) {
-      if (res.is_report === 1) {
-        this.$message.error('该项目已经上报')
-        return
+      const data = {
+        id: res.id,
+        is_report: 1,
+        project_stage: res.project_stage === 1 ? 2 : res.project_stage,
+        report_time: res.report_time
       }
-      this.$confirm(
-        res.project_stage === 1
-          ? '上报后该项目情况将更新为正式项目，请确认项目相关信息已经审核完成'
-          : '是否确定进行项目上报',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        const data = {
-          id: res.id,
-          is_report: 1,
-          project_stage: res.project_stage === 1 ? 2 : res.project_stage
+      this.$api.project.proUpdate(data).then(res => {
+        this.reportShow = false
+        if (res.code === 200) {
+          this.onLoad()
+          this.$message.success(res.msg)
+        } else {
+          this.$message.error(res.msg)
         }
-        this.$api.project.proUpdate(data).then(res => {
-          if (res.code === 200) {
-            this.onLoad()
-            this.$message.success(res.msg)
-          } else {
-            this.$message.error(res.msg)
-          }
-        })
       })
+      // // if (res.is_report === 1) {
+      // //   this.$message.error('该项目已经上报')
+      // //   return
+      // // }
+      // this.$confirm(
+      //   res.project_stage === 1
+      //     ? '上报后该项目情况将更新为正式项目，请确认项目相关信息已经审核完成'
+      //     : '是否确定进行项目上报',
+      //   {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }
+      // ).then(() => {
+      //
+      // })
     },
     projectSave() {
       if (this.disable) {