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

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

@@ -40,20 +40,20 @@
 </template>
 
 <script type="text/ecmascript-6">
-  import routerData from '../../../../router.json'
-  import PageLoading from '../../../components/PageLoading.vue'
-  import DataForm from '../../../components/form/DataForm.vue'
-  import DataTable from '../../../components/DataTable.vue'
-  import Api from '../../../server/index.js'
-  import {getItem} from '../../../config/mUtils.js'
+import routerData from '../../../../router.json'
+import PageLoading from '../../../components/PageLoading.vue'
+import DataForm from '../../../components/form/DataForm.vue'
+import DataTable from '../../../components/DataTable.vue'
+import Api from '../../../server/index.js'
+import {getItem} from '../../../config/mUtils.js'
 
-  export default {
+export default {
   beforeRouteEnter (to, from, next) {
     next(function (vm) {
-        global.getMenuIndex(vm);
+      global.getMenuIndex(vm)
     })
   },
-    data (){
+  data () {
     return {
       expandRight: false,
       //table单选操作
@@ -73,29 +73,29 @@
     }
   },
   created () {
-      this.initTableColumns();
-      this.init();
+    this.initTableColumns()
+    this.init()
   },
   methods: {
     addExpApply () {
       this.$router.push({name: 'AddClaimApply'})
     },
     init () {
-        let userId = getItem('userId');
+      let userId = getItem('userId')
       if (userId === '0') {
-          this.isSuper = true;
+        this.isSuper = true
       }
-        let projectWeeklyFindReq={
-          pageNo:this.pageNo,
-          pageSize:this.pageSize
+      let projectWeeklyFindReq = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize
       }
-        Api.ProjectManagements.getWeekly(projectWeeklyFindReq).then(result=>{
-          this.tableRowsData = [];
-          this.pageLoading = false;
-          console.log("周报填报列表",result)
+      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++) {
+          let dataList = result.data.ls
+          for (let i = 0; i < dataList.length; i++) {
             this.tableRowsData.push({
               id: dataList[i].id,
               projectNo: dataList[i].projectNo,
@@ -103,12 +103,13 @@
               userName: dataList[i].userName,
               workload: dataList[i].workload,
               thisWeek: dataList[i].thisWeek,
-                nextWeek: dataList[i].nextWeek
+              nextWeek: dataList[i].nextWeek,
+              week: dataList[i].week
             })
             // this.pageNo=result.data.pages
-              this.tableTotalPage=result.data.total
+            this.tableTotalPage = result.data.total
           }
-            console.log("tableRowsData",this.tableRowsData)
+          console.log('tableRowsData', this.tableRowsData)
         }
       })
       // Api.FinanceManagement.getReimburseList(this.pageNo, this.pageSize).then(result => {
@@ -162,6 +163,11 @@
           prop: 'workload',
           show: true
         },
+        {
+          label: '周数',
+          prop: 'week',
+          show: true
+        },
         {
           label: '本周进展',
           prop: 'thisWeek',
@@ -172,21 +178,21 @@
           prop: 'nextWeek',
           show: true
         }
-        ];
+      ]
     },
-      tableSelectPage (param){
-        this.pageNo = param;
-        this.init();
+    tableSelectPage (param) {
+      this.pageNo = param
+      this.init()
     },
-      tableSingleCheck (index){
+    tableSingleCheck (index) {
       this.$router.push({
-          name: "ExpenseClaimApplyEdit",
+        name: 'ExpenseClaimApplyEdit',
         params: {id: this.tableRowsData[index].id}
       })
     },
     tableSingleEdit (index) {
       this.$router.push({
-          name: "ExpenseClaimApplyEdit",
+        name: 'ExpenseClaimApplyEdit',
         params: {id: this.tableRowsData[index].id}
       })
     }
@@ -194,17 +200,17 @@
   components: {
     PageLoading, DataTable, DataForm
   }
-  }
+}
 </script>
 
 <style scoped lang="less" rel="stylesheet/less">
-  .expand-right {
+.expand-right {
   @media (min-width: 768px) {
     padding-left: 0 !important;
   }
-  }
+}
 
-  .page-content {
+.page-content {
   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)