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

src/components/Finance/ConferenceCost.vue

@@ -1,6 +1,5 @@
 <template>
     <div class="conferencecost-all" v-loading.fullscreen.lock="conferencecostLoading">
-
         <el-dialog width="650px" title="设置查看权限" class="permissionsbox" :visible.sync="permissionSettingDialog"
             :close-on-click-modal="false">
             <el-checkbox-group v-model="viewUsers">
@@ -15,8 +14,6 @@
                 <el-button size="mini" @click="permissionSettingDialog = false">取消</el-button>
             </div>
         </el-dialog>
-
-
         <div class="conferencecost-header">
             <div class="conferencecost-header-left">
                 <div class="conferencecost-header-left-item">
@@ -200,7 +197,10 @@
                 该会务利润率超过
                 <el-input-number style="width:120px;" :precision="2" size="mini" :controls="false"
                     v-model="liom"></el-input-number>%
-                需要增派几人去现场执行
+                需要增派
+                <el-input-number style="width:120px;"  size="mini" :controls="false"
+                    v-model="lioms"></el-input-number>
+                人去现场执行
             </div>
         </div>
     </div>
@@ -210,8 +210,9 @@ import { debounce } from '../../store/statice'
 export default {
     data() {
         return {
-            a: [],
-            liom: 0,
+            a:[],
+            liom:0,
+            lioms:0,
             danwei: '',
             danweiId: 0,
             conferenceAffairsCost: {
@@ -258,6 +259,7 @@ export default {
             restriction: true,
             rateStatistics: [],
             multipleSelection: [],
+
             conferenceAffairsCostChildids: [],
             conferencecostLoading: false,
             filetype: [],
@@ -269,6 +271,7 @@ export default {
             permissionSettingDialog: false,
             viewUsersarr: [],
             viewUsers: [],
+
         }
     },
     updated() {
@@ -327,62 +330,7 @@ export default {
                 this.conferenceAffairsCostChildids.push(this.multipleSelection[i].id);
             }
         },
-        //获取基础数据
-        // ConferenceAffairsInIt() {
-        //     var url = "/api/Groups/ConferenceAffairsInIt"
-        //     var that = this
-        //     this.$axios({
-        //         method: 'post',
-        //         url: url,
-        //         headers: {
-        //             Authorization: 'Bearer ' + that.token
-        //         },
-        //         data: {
-        //             userId: that.userId,
-        //             groupId: that.conferenceid,
-        //         }
-        //     }).then(function (res) {
-        //         if (res.data.code == 200) {
-        //             that.conferenceidarr = res.data.data.groupList;
-        //             that.conferenceid = that.conferenceidarr[0].id;
-        //             that.options = res.data.data.typeData;
-        //             that.ConferenceAffairsInIts();
-        //         }
-        //         else if (res.data.code == 201) {
-        //             that.$message({
-        //                 type: 'error',
-        //                 message: "暂无权限"
-        //             });
-        //         }
-        //     })
-        // },
-        // //获取数据
-        // ConferenceAffairsInIts() {
-        //     this.conferencecostLoading = true;
-        //     var url = "/api/Groups/ConferenceAffairsInIt"
-        //     var that = this
-        //     this.$axios({
-        //         method: 'post',
-        //         url: url,
-        //         headers: {
-        //             Authorization: 'Bearer ' + that.token
-        //         },
-        //         data: {
-        //             userId: that.userId, //21
-        //             groupId: that.conferenceid,
-        //         }
-        //     }).then(function (res) {
-        //         let AffairsInIt = res.data.data;
-        //         that.options = AffairsInIt.currenyList.teamRates;
-        //         that.tableDatas = AffairsInIt.conferenceAffairsCostChi;
-        //         that.typearr = AffairsInIt.typeData;
-        //         that.units = AffairsInIt.units;
-        //         that.conferenceAffairsCost = AffairsInIt.conferenceAffairsCost;
-        //         that.conferencecostLoading = false;
-        //         that.filetype = res.data.data.fileType;
-        //         that.fileSelect = that.filetype[0].id;
-        //     })
-        // },
+
         //币种切换
         currencychange(val) {
             var obj = this.options.find(function (i) {
@@ -567,7 +515,9 @@ export default {
                     });
                 }
             })
-        }, 1000, true),
+
+        },1000, true),
+       
         //保存api
         ConferenceAffairsSave: debounce(function (isShow) {
             this.conferenceAffairsCost.diid = this.conferenceid;
@@ -605,7 +555,7 @@ export default {
                     });
                 }
             })
-        }, 1000, true),
+        },1000, true),
         //文件下载
         FileDown() {
             var url = "/api/Groups/ConferenceAffairsFileDown"
@@ -676,7 +626,6 @@ export default {
                     this.fileSelect = this.filetype.length > 0 ? this.filetype[0].id : '';
                     this.control.isGM = data.isGM;
                     this.control.isReview = data.isReview;
-                    console.log(this.control, "权限分配----------");
                     this.viewUsersarr = data.userList;
                     this.viewUsers = data.operatorUser;
 
@@ -836,4 +785,5 @@ button {
     /* Element UI 主题色 */
     font-weight: bold;
 }
-</style>
+</style>
+

src/components/statistics/Reportstbale.vue

@@ -31,7 +31,7 @@
                     </div>
                 </div>
                 <div>
-                    <el-select style="width:199px;" @change="PostGroupStatementDetails" size="small" v-model="isAudit" placeholder="请选择">
+                    <el-select style="width:199px" @change="PostGroupStatementDetails" size="small" v-model="isAudit" placeholder="请选择">
                         <el-option
                         v-for="item in isAuditoptions"
                         :key="item.value"