Parcourir la source

Merge branch 'develop' of http://code.dashoo.cn/chengjian/opms_frontend into develop

liuyaqi il y a 2 ans
Parent
commit
f989bb0f48
2 fichiers modifiés avec 13 ajouts et 6 suppressions
  1. 12 5
      src/views/index/index.vue
  2. 1 1
      src/views/proj/business/components/FollowAdd.vue

+ 12 - 5
src/views/index/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: wanglj 471442253@qq.com
  * @Date: 2022-12-13 10:28:33
- * @LastEditors: niezch@dashoo.cn
- * @LastEditTime: 2023-04-03 09:28:45
+ * @LastEditors: wanglj
+ * @LastEditTime: 2023-06-09 16:01:18
  * @Description: file content
  * @FilePath: \opms_frontend\src\views\index\index.vue
 -->
@@ -98,6 +98,12 @@
                 <el-radio-button label="week">周</el-radio-button>
                 <el-radio-button label="month">月</el-radio-button>
               </el-radio-group>
+              <el-select
+                v-show="!editFlag && item.i == 20010 && item.searchType == 'month'"
+                v-model="item.month"
+                style="width: 100px">
+                <el-option v-for="i in 12" :key="i" :label="i" :value="i" />
+              </el-select>
               <el-select
                 v-show="!editFlag && item.i == 20009"
                 v-model="item.searchType"
@@ -461,6 +467,7 @@
                 }
                 // item.id != 20006 && item.id != 20007 ? 'year' : '0'
               })(),
+              month: new Date().getMonth() + 1,
             }
           })
         }
@@ -502,7 +509,7 @@
         } else if (item.i == 20009) {
           this.getTable(item.i, index, item.searchType)
         } else if (item.i == 20010) {
-          this.drawProjectTrans(item.i, index, item.searchType)
+          this.drawProjectTrans(item.i, index, item.searchType, item.month)
         } else if (item.i == 20011) {
           this.drawMoneyAmount(item.i, index, item.searchType)
         } else if (item.i == 20012) {
@@ -640,8 +647,8 @@
         chartBar.setOption(option)
         this.charts[i] = chartBar
       },
-      async drawProjectTrans(id, i, searchType = 'week') {
-        const [err, res] = await to(indexApi.getHomeDataReportData({ id, Params: { searchType } }))
+      async drawProjectTrans(id, i, searchType = 'week', month = new Date().getMonth() + 1) {
+        const [err, res] = await to(indexApi.getHomeDataReportData({ id, Params: { searchType, month } }))
         if (err) return
         const arr = res.data.data || []
         const chartBar = echarts.init(document.getElementById(id))

+ 1 - 1
src/views/proj/business/components/FollowAdd.vue

@@ -49,7 +49,7 @@
           <el-form-item label="下一步跟进计划和目标" prop="furtherPlan">
             <el-input
               v-model="form.furtherPlan"
-              placeholder="请输入下一步工作计划及完成时间"
+              placeholder="请输入下一步跟进计划和目标"
               rows="5"
               show-word-limit
               type="textarea" />