scorpio 2 年 前
コミット
c442c61b2e

+ 0 - 1
src/api/store/index.js

@@ -1,5 +1,4 @@
 import fetch from '../fetch.js'
-import params from '@/api/params/index.js'
 
 export default {
   /**

+ 1 - 1
src/views/home/component/dash.vue

@@ -165,7 +165,7 @@
       <template #plan_storage_time-header="{ column }">
         <div class="flex flex-center">
           <div class="mr-5">{{ (column || {}).label }}</div>
-          <el-tooltip content="红色为计划开工时间,蓝色为实际开工时间">
+          <el-tooltip content="红色为计划入库时间,蓝色为实际入库时间">
             <el-icon>
               <InfoFilled />
             </el-icon>

+ 0 - 14
src/views/home/component/owner_serach.vue

@@ -214,9 +214,7 @@ export default {
         amount: '',
         isImportant: '', // 是否省重点
         isFocusStart: '', // 是否集中开工
-        deptIds: '', // 机构id,多选
         type: true,
-        projectYear: '',
         reportType: ''
       },
       totalAmount: [
@@ -285,7 +283,6 @@ export default {
   created() {
     this.reportTypes = confing.reportTypes
     this.getTypeList()
-    this.form.projectYear = new Date().getFullYear()
   },
   methods: {
     getTypeList() {
@@ -350,13 +347,11 @@ export default {
       this.form.amount = ''
       this.form.isFocusStart = ''
       this.form.isImportant = ''
-      this.form.deptIds = ''
       this.form.type = false
       this.form.planCommencementTime = ''
       this.form.startTime = ''
       this.form.planStorageTime = ''
       this.form.storageTime = ''
-      this.form.projectYear = ''
       this.form.reportType = ''
       this.time1 = null
       this.time2 = null
@@ -389,15 +384,6 @@ export default {
     changeChecked(index) {
       this.deptList[index].checked = !this.deptList[index].checked
     },
-    orgCheck() {
-      const checked = this.deptList.filter(sub => sub.checked)
-      this.form.deptIds = checked.map(sub => sub.id).join(',')
-      const tmp = checked.map(e => e.deptName)
-      if (tmp.length > 0) {
-        this.deptName = tmp[0]
-      }
-      this.showOrg = false
-    },
     orgRefresh() {
       this.deptList = this.deptList.map(sub => {
         sub.checked = false

+ 4 - 1
src/views/invest/components/complete.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="flex flex-justify-start flex-col">
-    <span class="font-16 bold full-width text-left">项目投资完成情况总览</span>
+    <div class="full-width flex flex-center flex-justify-between mb-10">
+      <span class="font-16 bold">项目投资完成情况总览</span>
+      <span class="font-16 bold">共计:{{ data.length }} 个项目</span>
+    </div>
     <div class="full-width flex-justify-end flex">
       <el-select
         v-model="month"

+ 16 - 19
src/views/store/index.vue

@@ -6,12 +6,7 @@
         placeholder="快速搜索"
         prefix-icon="Search"
       ></el-input>
-      <el-button
-        type="primary"
-        class="ml-20"
-        @click="$router.push('/store/detail')"
-        >搜 索
-      </el-button>
+      <el-button type="primary" class="ml-20" @click="onLoad">搜 索 </el-button>
     </div>
 
     <div class="flex flex-justify-start flex-align-start content">
@@ -128,19 +123,21 @@ export default {
   },
   methods: {
     onLoad() {
-      this.$api.store.list(this.page).then(res => {
-        if (res.code === 200) {
-          this.data = res.data.records.map(ele => {
-            const project = ele.project
-            delete project.id
-            delete ele.project
-            ele.isup = ele.isUp
-            ele.hasfile = ele.hasFile
-            return Object.assign(ele, project)
-          })
-          this.page.total = res.data.total
-        }
-      })
+      this.$api.store
+        .list(Object.assign(this.page, { projectName: this.keyword }))
+        .then(res => {
+          if (res.code === 200) {
+            this.data = res.data.records.map(ele => {
+              const project = ele.project
+              delete project.id
+              delete ele.project
+              ele.isup = ele.isUp
+              ele.hasfile = ele.hasFile
+              return Object.assign(ele, project)
+            })
+            this.page.total = res.data.total
+          }
+        })
     },
     rowDel(row) {
       this.$confirm('确定删除选择的项目?', {