Merge branch 'version_1.0' of httt push -u p://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into version_1.0

src/views/common/dingtalklogin.vue

@@ -48,7 +48,7 @@ export default {
       this.dingtalkLogin()
       this.checkDingTalkLogin()
     } else {
-      this.dataForm.verify = '请在钉钉打开'
+      this.dataForm.verify = '验证中'
       console.log(this.$route.query)
       this.req.code = this.$route.query.code
       apiDingtalkJump(this.req).then(res => {

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

@@ -21,7 +21,7 @@
 
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" v-if="auth.approvelCommit === 1 && status !== 5 " @click="commitRecord(2)">通过</el-button>
-      <el-button type="primary" v-if="auth.waitCommit===1 && status !== 5 " @click="commitRecord(3)">侍提交</el-button>
+      <el-button type="primary" v-if="auth.waitCommit===1 && status !== 5 " @click="commitRecord(3)">待提交</el-button>
       <el-button type="primary" v-if="status === 5 && auth.reject == 1" @click="commitRecord(5)">驳回</el-button>
     </span>
   </el-dialog>
@@ -103,6 +103,7 @@ export default {
       }).then(data => {
         if (data && data.code === 0) {
           this.$emit('refreshDataList', this.recordResultId)
+          this.alertInfo('更新成功')
         } else {
           this.alertInfo(data.msg)
         }

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

@@ -77,7 +77,7 @@
 
 
     <div>
-      <el-button type="primary" style="margin-bottom: 10px" @click="submitBt()">批量提交</el-button>
+      <el-button type="primary" style="margin-bottom: 10px" @click="submitBt()" v-if="isHiden">批量提交</el-button>
     </div>
 
     <el-tabs type="border-card" v-model="tabValue" @tab-click="tabChange">
@@ -89,7 +89,7 @@
       <el-table
         :data="dataList"
         border
-        v-loading="dataListLoading" border fit highlight-current-row
+        v-loading="dataListLoading" fit highlight-current-row
         @selection-change="selectionChangeHandle"
         :cell-style="cellStyle"
         style="width: 100%;"     >
@@ -231,7 +231,8 @@ export default {
       addOrUpdateVisible: false,
       recordIdsSelect: [],
       tabValue: '1,2,5',
-      isChangeDepartmentrtment: 0
+      isChangeDepartmentrtment: 0,
+      isHiden: false
     }
   },
   computed: {},
@@ -307,6 +308,11 @@ export default {
       })
     },
     tabChange (row) {
+      if(row.name === '3') {
+        this.isHiden = true
+      } else {
+        this.isHiden = false
+      }
       this.dataForm.status = row.name
       this.getDataList(row.name)
     },

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

@@ -162,12 +162,12 @@ export default {
       wenHuaJiaZhiGuanNum: 2,
       lastResultNum: 2,
       commentNum: 1,
-      checkMonth: '2020-03-21',
-      staffName: '瞿贻晓',
-      department1: '业务中台',
-      department2: '金融业务组',
-      department3: '技术部门',
-      superStaff: '吴林',
+      checkMonth: '',
+      staffName: '',
+      department1: '',
+      department2: '',
+      department3: '',
+      superStaff: '',
       addOrUpdateVisible: false,
       approvalVisible: false,
       uploadVisible: false,