Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/child/AuthorityJob.vue

@@ -39,7 +39,7 @@
                             <div>
                                 <el-checkbox @change='checkchange(scope.row.id,op.id)'  v-if=" scope.row.opList.indexOf(op.id) != -1" :value="scope.row.selList.indexOf(op.id) != -1" >
                                 </el-checkbox >
-                                <el-checkbox  v-else :disabled="true" >
+                                <el-checkbox  v-else :disabled="true"  :value="false" >
                                 </el-checkbox>
                             </div>
                         </template>
@@ -228,6 +228,7 @@ export default {
             this.$axios.post(this.PathUrl + '/api/System/SaveJobAuth', {
                 "Jpid": this.valueposition,
                 "Savejobs": savejob,
+                "modulId":this.value == '' ? '13':this.value,
             }, {
                 headers: {
                     'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6IkZ1dHVyZSIsImV4cCI6MTY3OTU0MjgwNSwiaXNzIjoiT0FTeXN0ZW0uY29tIiwiYXVkIjoiT0FTeXN0ZW0uY29tIn0.iy5SUInq1p3yjZultRPyzCa2ekLeepSdMLxvPwXY6MI',

src/components/child/AuthorityUser.vue

@@ -43,7 +43,7 @@
                                     v-if="scope.row.opList.indexOf(op.id) != -1"
                                     :value="scope.row.selList.indexOf(op.id) != -1">
                                 </el-checkbox>
-                                <el-checkbox v-else :disabled="true">
+                                <el-checkbox v-else :disabled="true" :value="false">
                                 </el-checkbox>
                             </div>
                         </template>
@@ -243,6 +243,7 @@ export default {
             this.$axios.post(this.PathUrl + '/api/System/SaveUserAuth', {
                 "uid": this.Valueuesr,
                 "Savejobs": savejob,
+                "Modulid":this.value == '' ? '13':this.value,
             }, {
                 headers: {
                     'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6IkZ1dHVyZSIsImV4cCI6MTY3OTU0MjgwNSwiaXNzIjoiT0FTeXN0ZW0uY29tIiwiYXVkIjoiT0FTeXN0ZW0uY29tIn0.iy5SUInq1p3yjZultRPyzCa2ekLeepSdMLxvPwXY6MI',