个人周报填报页面增加周数字段

kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue

@@ -9,9 +9,9 @@
 
     <!--Breadcrumb-->
     <!--<ol class="breadcrumb">-->
-      <!--<li><a href="#">Home</a></li>-->
+    <!--<li><a href="#">Home</a></li>-->
-      <!--<li><a href="#">Layouts</a></li>-->
+    <!--<li><a href="#">Layouts</a></li>-->
-      <!--<li class="active">Demo</li>-->
+    <!--<li class="active">Demo</li>-->
     <!--</ol>-->
     <!--End breadcrumb-->
 
@@ -21,17 +21,17 @@
         <el-button type="primary" @click="addExpApply" v-if="!isSuper">新增</el-button>
       </div>
       <data-table
-              :totalColumnsData="tableColumnsData"
+        :totalColumnsData="tableColumnsData"
-              :rowsData="tableRowsData"
+        :rowsData="tableRowsData"
-              :showSingleOperation="tableShowSingleOperation"
+        :showSingleOperation="tableShowSingleOperation"
-              :showMultipleOperation="false"
+        :showMultipleOperation="false"
-              :canFolded="true"
+        :canFolded="true"
-              :showPageCtr="true"
+        :showPageCtr="true"
-              :totalPage="tableTotalPage"
+        :totalPage="tableTotalPage"
-              :currentPage="pageNo"
+        :currentPage="pageNo"
-              @selectPage="tableSelectPage"
+        @selectPage="tableSelectPage"
-              @singleEdit="tableSingleEdit"
+        @singleEdit="tableSingleEdit"
-              @singleCheck="tableSingleCheck"
+        @singleCheck="tableSingleCheck"
       >
       </data-table>
     </div>
@@ -40,171 +40,177 @@
 </template>
 
 <script type="text/ecmascript-6">
-  import routerData from '../../../../router.json'
+import routerData from '../../../../router.json'
-  import PageLoading from '../../../components/PageLoading.vue'
+import PageLoading from '../../../components/PageLoading.vue'
-  import DataForm from '../../../components/form/DataForm.vue'
+import DataForm from '../../../components/form/DataForm.vue'
-  import DataTable from '../../../components/DataTable.vue'
+import DataTable from '../../../components/DataTable.vue'
-  import Api from '../../../server/index.js'
+import Api from '../../../server/index.js'
-  import {getItem} from '../../../config/mUtils.js'
+import {getItem} from '../../../config/mUtils.js'
 
-  export default {
+export default {
-    beforeRouteEnter (to, from, next) {
+  beforeRouteEnter (to, from, next) {
-      next(function (vm) {
+    next(function (vm) {
-        global.getMenuIndex(vm);
+      global.getMenuIndex(vm)
+    })
+  },
+  data () {
+    return {
+      expandRight: false,
+      //table单选操作
+      tableShowSingleOperation: {
+        show: true,
+        showEdit: true,
+        showDelete: true,
+        showCheck: true
+      },
+      //分页
+      pageNo: 1,
+      pageSize: 10,
+      tableTotalPage: 1,
+      tableColumnsData: [],
+      tableRowsData: [],
+      isSuper: false
+    }
+  },
+  created () {
+    this.initTableColumns()
+    this.init()
+  },
+  methods: {
+    addExpApply () {
+      this.$router.push({name: 'AddClaimApply'})
+    },
+    init () {
+      let userId = getItem('userId')
+      if (userId === '0') {
+        this.isSuper = true
+      }
+      let projectWeeklyFindReq = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize
+      }
+      Api.ProjectManagements.getWeekly(projectWeeklyFindReq).then(result => {
+        this.tableRowsData = []
+        this.pageLoading = false
+        console.log('周报填报列表', result)
+        if (result.status === 0) {
+          let dataList = result.data.ls
+          for (let i = 0; i < dataList.length; i++) {
+            this.tableRowsData.push({
+              id: dataList[i].id,
+              projectNo: dataList[i].projectNo,
+              projectName: dataList[i].projectName,
+              userName: dataList[i].userName,
+              workload: dataList[i].workload,
+              thisWeek: dataList[i].thisWeek,
+              nextWeek: dataList[i].nextWeek,
+              week: dataList[i].week
+            })
+            // this.pageNo=result.data.pages
+            this.tableTotalPage = result.data.total
+          }
+          console.log('tableRowsData', this.tableRowsData)
+        }
+      })
+      // Api.FinanceManagement.getReimburseList(this.pageNo, this.pageSize).then(result => {
+      //   this.pageLoading = false;
+      //   this.tableRowsData = [];
+      //   if (result.status === 0) {
+      //     this.isEdit = result.data.isEdit;
+      //     this.tableTotalPage = result.data.total
+      //     let dataList = result.data.ls;
+      //     for (let i=0; i<dataList.length; i++) {
+      //       let deptName = '';
+      //       for (let j=0; j<dataList[i].userInfo.dept.length; j++) {
+      //         deptName += dataList[i].userInfo.dept[j].orgName;
+      //         if (j < dataList[i].userInfo.dept.length - 1) {
+      //           deptName += '>';
+      //         }
+      //       }
+      //       this.tableRowsData.push({
+      //         status: dataList[i].status,
+      //         id: dataList[i].id,
+      //         userInfoName: dataList[i].userInfo.userInfoName,
+      //         category: '报销',
+      //         deptName: deptName
+      //       })
+      //     }
+      //   } else {
+      //     this.$message.error(`${result.msg}`);
+      //   }
+      // })
+    },
+    //初始化tableColumns
+    initTableColumns () {
+      this.tableColumnsData = [
+        {
+          label: '项目编号',
+          prop: 'projectNo',
+          show: true
+        },
+        {
+          label: '项目名称',
+          prop: 'projectName',
+          show: true
+        },
+        {
+          label: '员工姓名',
+          prop: 'userName',
+          show: true
+        },
+        {
+          label: '工作量(人日)',
+          prop: 'workload',
+          show: true
+        },
+        {
+          label: '周数',
+          prop: 'week',
+          show: true
+        },
+        {
+          label: '本周进展',
+          prop: 'thisWeek',
+          show: true
+        },
+        {
+          label: '下周计划',
+          prop: 'nextWeek',
+          show: true
+        }
+      ]
+    },
+    tableSelectPage (param) {
+      this.pageNo = param
+      this.init()
+    },
+    tableSingleCheck (index) {
+      this.$router.push({
+        name: 'ExpenseClaimApplyEdit',
+        params: {id: this.tableRowsData[index].id}
       })
     },
-    data (){
+    tableSingleEdit (index) {
-      return {
+      this.$router.push({
-        expandRight: false,
+        name: 'ExpenseClaimApplyEdit',
-        //table单选操作
+        params: {id: this.tableRowsData[index].id}
-        tableShowSingleOperation: {
+      })
-          show: true,
-          showEdit: true,
-          showDelete: true,
-          showCheck: true
-        },
-        //分页
-        pageNo: 1,
-        pageSize: 10,
-        tableTotalPage: 1,
-        tableColumnsData: [],
-        tableRowsData: [],
-        isSuper: false
-      }
-    },
-    created () {
-      this.initTableColumns();
-      this.init();
-    },
-    methods: {
-      addExpApply () {
-        this.$router.push({name: 'AddClaimApply'})
-      },
-      init () {
-        let userId = getItem('userId');
-        if (userId === '0') {
-          this.isSuper = true;
-        }
-        let projectWeeklyFindReq={
-          pageNo:this.pageNo,
-          pageSize:this.pageSize
-        }
-        Api.ProjectManagements.getWeekly(projectWeeklyFindReq).then(result=>{
-          this.tableRowsData = [];
-          this.pageLoading = false;
-          console.log("周报填报列表",result)
-          if (result.status === 0) {
-            let dataList = result.data.ls;
-            for (let i=0; i<dataList.length; i++) {
-              this.tableRowsData.push({
-                id: dataList[i].id,
-                projectNo: dataList[i].projectNo,
-                projectName: dataList[i].projectName,
-                userName: dataList[i].userName,
-                workload: dataList[i].workload,
-                thisWeek: dataList[i].thisWeek,
-                nextWeek: dataList[i].nextWeek
-              })
-              // this.pageNo=result.data.pages
-              this.tableTotalPage=result.data.total
-            }
-            console.log("tableRowsData",this.tableRowsData)
-          }
-        })
-        // Api.FinanceManagement.getReimburseList(this.pageNo, this.pageSize).then(result => {
-        //   this.pageLoading = false;
-        //   this.tableRowsData = [];
-        //   if (result.status === 0) {
-        //     this.isEdit = result.data.isEdit;
-        //     this.tableTotalPage = result.data.total
-        //     let dataList = result.data.ls;
-        //     for (let i=0; i<dataList.length; i++) {
-        //       let deptName = '';
-        //       for (let j=0; j<dataList[i].userInfo.dept.length; j++) {
-        //         deptName += dataList[i].userInfo.dept[j].orgName;
-        //         if (j < dataList[i].userInfo.dept.length - 1) {
-        //           deptName += '>';
-        //         }
-        //       }
-        //       this.tableRowsData.push({
-        //         status: dataList[i].status,
-        //         id: dataList[i].id,
-        //         userInfoName: dataList[i].userInfo.userInfoName,
-        //         category: '报销',
-        //         deptName: deptName
-        //       })
-        //     }
-        //   } else {
-        //     this.$message.error(`${result.msg}`);
-        //   }
-        // })
-      },
-      //初始化tableColumns
-      initTableColumns () {
-        this.tableColumnsData = [
-          {
-            label: '项目编号',
-            prop: 'projectNo',
-            show: true
-          },
-          {
-            label: '项目名称',
-            prop: 'projectName',
-            show: true
-          },
-          {
-            label: '员工姓名',
-            prop: 'userName',
-            show: true
-          },
-          {
-            label: '工作量(人日)',
-            prop: 'workload',
-            show: true
-          },
-          {
-            label: '本周进展',
-            prop: 'thisWeek',
-            show: true
-          },
-          {
-            label: '下周计划',
-            prop: 'nextWeek',
-            show: true
-          }
-        ];
-      },
-      tableSelectPage (param){
-        this.pageNo = param;
-        this.init();
-      },
-      tableSingleCheck (index){
-        this.$router.push({
-          name: "ExpenseClaimApplyEdit",
-          params: {id: this.tableRowsData[index].id}
-        })
-      },
-      tableSingleEdit (index) {
-        this.$router.push({
-          name: "ExpenseClaimApplyEdit",
-          params: {id: this.tableRowsData[index].id}
-        })
-      }
-    },
-    components: {
-      PageLoading, DataTable, DataForm
     }
+  },
+  components: {
+    PageLoading, DataTable, DataForm
   }
+}
 </script>
 
 <style scoped lang="less" rel="stylesheet/less">
-  .expand-right {
+.expand-right {
-    @media (min-width: 768px) {
+  @media (min-width: 768px) {
-      padding-left: 0 !important;
+    padding-left: 0 !important;
-    }
   }
+}
 
-  .page-content {
+.page-content {
-    padding: 15px;
+  padding: 15px;
-  }
+}
 </style>

kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyAdd.vue

@@ -107,6 +107,14 @@
               >
               </el-input>
             </el-form-item>
+            <el-form-item label="周数" prop="week">
+              <el-input
+                class="form-input"
+                placeholder="请输入内容"
+                v-model="formModel.week"
+              >
+              </el-input>
+            </el-form-item>
             <el-form-item label="本周进展" prop="thisWeek">
               <el-input
                 class="form-input"
@@ -154,6 +162,7 @@ export default {
   },
   data () {
     return {
+      week: '',
       ext: {},
       thisWeek: '',
       nextWeek: '',
@@ -316,6 +325,7 @@ export default {
                 thisWeek: this.formModel.thisWeek,
                 nextWeek: this.formModel.nextWeek,
                 workload: this.formModel.workload,
+                week: this.formModel.week,
                 deptId: this.formModel.deptId
               },
               ext: {

kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue

@@ -107,6 +107,14 @@
               >
               </el-input>
             </el-form-item>
+            <el-form-item label="周数" prop="week">
+              <el-input
+                class="form-input"
+                placeholder="请输入内容"
+                v-model="formModel.week"
+              >
+              </el-input>
+            </el-form-item>
             <el-form-item label="本周进展" prop="thisWeek">
               <el-input
                 class="form-input"
@@ -155,6 +163,7 @@ export default {
   },
   data () {
     return {
+      week:'',
       ext: {},
       thisWeek: '',
       nextWeek: '',
@@ -478,7 +487,7 @@ export default {
           Api.ProjectManagements.addWeekly(data.projectWeeklyAddReq).then(result => {
             this.isSave = true
             if (result.status === 0) {
-              this.$message.info(result.data)
+              this.$message.success(result.data)
               this.$router.push({name: 'WeeklyClaimApply'})
             } else {
               this.$message.error(result.data)