scorpio 2 years ago
parent
commit
75cb45f60b
2 changed files with 16 additions and 8 deletions
  1. 1 1
      src/layout/left.vue
  2. 15 7
      src/views/home/component/dash.vue

+ 1 - 1
src/layout/left.vue

@@ -7,7 +7,7 @@
     </div>
     <div>
       <div
-        class="flex flex-center flex-col bold font-18 item-bg padding-bottom full-width"
+        class="flex flex-center flex-col bold font-16 item-bg padding-bottom full-width"
       >
         <div
           v-for="(item, index) in data"

+ 15 - 7
src/views/home/component/dash.vue

@@ -35,12 +35,14 @@
           class="ml-20 mt-20"
           icon="Plus"
           title="新增"
+          v-if="dataType === 'project'"
           @click="showAdd = true"
         />
         <base-button
           class="ml-20 mt-20"
           icon="el-icon-upload"
           title="数据导入"
+          v-if="dataType === 'project'"
           @click="diaType = 0"
         />
         <base-button
@@ -85,7 +87,11 @@
     >
       <template #menu="{ row }">
         <el-button
-          v-if="user.info.viewStage !== 1 && dataType === 'asset'"
+          v-if="
+            user.info.viewStage !== 1 &&
+            dataType === 'asset' &&
+            row.project_stage !== 7
+          "
           icon="Upload"
           type="primary"
           text
@@ -129,7 +135,7 @@
           type="primary"
           icon="el-icon-folder-remove"
           @click="projectCancel(row)"
-          v-if="row.project_stage !== 7"
+          v-if="row.project_stage !== 7 && row.can_update"
           >退库
         </el-button>
       </template>
@@ -295,14 +301,12 @@
       :select-num="selectList.length === 0 ? page.total : selectList.length"
       @export="exportExcelTotal"
     />
-    <el-dialog v-model="reportShow" width="400px">
+    <el-dialog v-model="reportShow" width="500px" title="请选择上报时间">
       <div v-if="currentReport">
-        <span class="padding-bottom">
-          上报后该项目情况将更新为正式项目,请确认项目相关信息已经审核完成
-        </span>
         <el-date-picker
           v-model="currentReport.report_time"
           format="YYYY-MM-DD"
+          class="mb-20"
           placeholder="选择上报时间"
           style="width: 100%"
           value-format="YYYY-MM-DD"
@@ -643,6 +647,7 @@ export default {
       this.page.size = pageSize
     },
     refreshChange() {
+      this.getNumList()
       this.onLoad()
     },
     treeLoad(tree, treeNode, resolve) {
@@ -694,6 +699,10 @@ export default {
       })
     },
     report(res) {
+      if (res.is_report === 1) {
+        this.$message.error('该项目已经上报')
+        return
+      }
       this.currentReport = res
       this.reportShow = true
     },
@@ -805,7 +814,6 @@ export default {
       const data = {
         id: res.id,
         is_report: 1,
-        project_stage: res.project_stage === 1 ? 2 : res.project_stage,
         report_time: res.report_time
       }
       this.$api.project.proUpdate(data).then(res => {