提交修改

src/api/api_result.js

@@ -54,3 +54,8 @@ export const deleteFile = params => {
 export const downZip = params => {
   return http({url: '/lz_management/file/downZip?ids=' + params, method: 'get'})
 }
+
+// 获取侧边菜单栏
+export const deleteRecord = params => {
+  return http({url: '/lz_management/user/lzresultrecord/deleteRecord', method: 'get', params})
+}

src/views/modules/result/record/lzresultrecord.vue

@@ -92,7 +92,7 @@
         label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id,3)">详情</el-button>
-          <el-button type="text" size="small" v-if="scope.row.id===0" @click="deleteHandle(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" v-if="scope.row.status===0" @click="deleteHandle(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -113,7 +113,7 @@
 <script>
 
 import AddOrUpdate from './lzresultrecord-add-or-update'
-import {apiGetResultRecordList, departmentQuery} from '@/api/api_result'
+import {apiGetResultRecordList, departmentQuery, deleteRecord} from '@/api/api_result'
 import {getDataForMonth} from '@/utils'
 
 export default {
@@ -129,7 +129,7 @@ export default {
       } else if (status === 1) {
         return '侍审批'
       } else if (status === 2) {
-        return '拒绝'
+        return '侍审批'
       } else if (status === 3) {
         return '侍提交'
       } else if (status === 4) {
@@ -307,22 +307,19 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$http({
+        deleteRecord({
-          url: this.$http.adornUrl('/user/lzresultrecord/delete'),
+          'ids': ids.join(',')
-          method: 'post',
+        }).then(data => {
-          data: this.$http.adornData(ids, false)
-        }).then(({data}) => {
           if (data && data.code === 0) {
+            this.getDataList()
             this.$message({
-              message: '操作成功',
+              message: data.msg,
               type: 'success',
               duration: 1500,
               onClose: () => {
                 this.getDataList()
               }
             })
-          } else {
-            this.$message.error(data.msg)
           }
         })
       })

src/views/modules/result/record/lzresultrecordapp.vue

@@ -81,8 +81,8 @@
     </div>
 
     <el-tabs type="border-card" v-model="tabValue" @tab-click="tabChange">
-      <el-tab-pane label="审批中" name="0"></el-tab-pane>
+      <el-tab-pane label="审批中" name="1,2,5"></el-tab-pane>
-      <el-tab-pane label="全部" name="1"></el-tab-pane>
+      <el-tab-pane label="全部" name=""></el-tab-pane>
       <el-tab-pane label="侍提交" name="3"></el-tab-pane>
       <el-tab-pane label="审批通过" name="4"></el-tab-pane>
 
@@ -104,7 +104,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="statusStr" header-align="center" align="center" label="状态">
+        <el-table-column  header-align="center" align="center" label="状态">
           <template slot-scope="scope">
             <div class="conatnt-name">
               <span>{{ scope.row.status | getStatusStr }}</span>
@@ -209,7 +209,8 @@ export default {
         value: [],
         department1: '',
         department2: '',
-        department3: ''
+        department3: '',
+        status: '1,2,5'
       },
       dataList: [],
       pageIndex: 1,
@@ -228,7 +229,8 @@ export default {
       departmentList2: [],
       departmentList3: [],
       addOrUpdateVisible: false,
-      recordIdsSelect: []
+      recordIdsSelect: [],
+      tabValue: '1,2,5'
     }
   },
   computed: {},
@@ -302,22 +304,17 @@ export default {
       })
     },
     tabChange (row) {
-      let status = row.name
+      this.dataForm.status = row.name
-      if (row.name === '0') {
+      this.getDataList(row.name)
-        status = 1
-      } else if (row.name === '1') {
-        status = ''
-      }
-      this.getDataList(status)
     },
     // 获取数据列表
-    getDataList (status = this.dataForm.status) {
+    getDataList () {
       apiGetResultRecordList({
         'page': this.pageIndex,
         'limit': this.pageSize,
         'monthBeginDate': this.dataForm.beginDate,
         'monthEndDate': this.dataForm.endDate,
-        'status': status,
+        'statusStr': this.dataForm.status,
         'department1': this.dataForm.department1,
         'department2': this.dataForm.department2,
         'department3': this.dataForm.department3,

src/views/modules/result/record/recorddetail-add-or-update.vue

@@ -141,7 +141,7 @@ export default {
         id: 0,
         target: '',
         keyResult: '',
-        checkWeight: '',
+        checkWeight: 0.15,
         checkResult: '',
         superScore: '',
         acquireScore: '',

src/views/modules/result/record/upload-add-or-update.vue

@@ -57,7 +57,7 @@
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary"  v-if="status === 1 ">确定</el-button>
+      <el-button type="primary" @click="submit"  v-if="status === 1 ">确定</el-button>
       <el-button type="primary" @click="dowLoadZip" v-if="status === 2 " >下载</el-button>
     </span>
   </el-dialog>
@@ -178,6 +178,10 @@ export default {
     downloadTemplate (id) {
       window.open('/lz_management/file/downFile?id=' + id)
     },
+    submit () {
+      this.visible = false
+      this.$emit('refreshDataList')
+    },
     handleSuccess (res, fileList, response) {
       this.getDataList()
     },