Merge branch 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into version_1.0

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

@@ -127,7 +127,7 @@ export default {
       if (status === 0) {
         return '新建'
       } else if (status === 1) {
-        return '侍审批'
+        return '审批中'
       } else if (status === 2) {
         return '侍审批'
       } else if (status === 3) {
@@ -178,7 +178,7 @@ export default {
       dataListSelections: [],
       stateList: [
         {value: '0', label: '新建'},
-        {value: '1', label: '侍审批'},
+        {value: '1', label: '审批中'},
         {value: '2', label: '拒绝'},
         {value: '3', label: '侍提交'},
         {value: '4', label: '审批通过'}

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

@@ -168,7 +168,7 @@ export default {
       if (status === 0) {
         return '新建'
       } else if (status === 1) {
-        return '侍审批'
+        return '审批中'
       } else if (status === 2) {
         return '己审批'
       } else if (status === 3) {
@@ -220,7 +220,7 @@ export default {
       dataListSelections: [],
       stateList: [
         {value: '0', label: '新建'},
-        {value: '1', label: '侍审批'},
+        {value: '1', label: '审批中'},
         {value: '2', label: '拒绝'},
         {value: '3', label: '侍提交'},
         {value: '4', label: '审批通过'}

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

@@ -242,7 +242,7 @@ export default {
         }, 500)
       })
     },
-    uploadDownFile (val) {
+    uploadDownFile (val) {n
       this.uploadVisible = true
       this.$nextTick(() => {
         setTimeout(() => {