0805lhj

src/components/Finance/royaltypg.vue

@@ -39,6 +39,7 @@
                         </el-form-item> -->
                         <div style="margin-left: 10px;">
                             <el-button @click="ComputeRoyalties" type="primary">查 询</el-button>
+                            <el-button @click="derivelist" type="primary">导出提成列表</el-button>
                         </div>
                     </div>
                 </el-form>
@@ -220,6 +221,43 @@ export default {
                 }
             })
         },
+        //导出
+        derivelist(){
+            if(this.uservalue==""||this.value2.length<=0){
+                this.$message({
+                    message:"请选择查询条件",
+                    type: 'warning'
+                });
+                return
+            }
+            var url = "/api/Financial/ExportRoyaltyExcel"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    userId:that.uservalue,
+                    startDate:that.getdate(this.value2[0]),
+                    endDate:that.getdate(this.value2[1])
+                }
+            }).then(function (res) {
+                if(res.data.code==200){
+                    window.open(res.data.data.url);
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                }else{
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'warning'
+                    });
+                }
+            })
+        },
         //公司切换
         Corporationchange(val){
             this.depOption=[];

src/components/OP/Groupedit.vue

@@ -62,7 +62,7 @@
                     <el-form-item label-width="120px" label="团组名称:" prop="groupname">
                         <el-input el-input v-model="ruleForm.groupname"></el-input>
                     </el-form-item>
-                    <el-form-item label-width="120px" label="合同时间:" prop="contracttime">
+                    <el-form-item label-width="120px" label="合同时间:" :prop="bidbr?'contracttime':''">
                         <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.contracttime"
                             style="width: 100%;"></el-date-picker>
                     </el-form-item>
@@ -78,17 +78,17 @@
                         <el-radio v-model="ruleForm.radioval" label='1'>是</el-radio> -->
                     </el-form-item>
                     <div  class="advance-box">
-                        <el-form-item label-width="120px" label="于出访时间前" prop="occasion">
+                        <el-form-item label-width="120px" label="于出访时间前" :prop="bidbr?'occasion':''">
                             <el-input style="width: 100px;" el-input v-model="ruleForm.occasion"></el-input>
                         </el-form-item>
-                        <el-form-item label-width="98px" label="日支付款项:" prop="payments">
+                        <el-form-item label-width="98px" label="日支付款项:" :prop="bidbr?'payments':''">
                             <el-input el-input v-model="ruleForm.payments"></el-input>
                         </el-form-item>
                         <span style="margin-bottom: 22px;display: inline-block;color: #606266;font-size: 14px;">（预付款,请输入RMB）</span>
                     </div>
                 </div>
                 <div style="display: flex;align-items: center;">
-                    <el-form-item style="width:16%" label-width="120px" label="OP提成等级" prop="opRoyaltyLv">
+                    <el-form-item style="width:16%" label-width="120px" label="OP提成等级" :prop="bidbr?'opRoyaltyLv':''">
                         <el-select @change="commissionlevel" v-model="ruleForm.opRoyaltyLv" placeholder="OP提成等级" clearable filterable
                             style="width: 100%;">
                             <el-option v-for="item in opRoyaltyLvList" :key="item.id" :label="item.name + '元'"
@@ -96,7 +96,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item style="width:50%" label-width="98px" label="等级说明:" prop="opRoyaltyRemark">
+                    <el-form-item style="width:50%" label-width="98px" label="等级说明:" :prop="bidbr?'opRoyaltyRemark':''">
                         <el-select style="width:100%" class="op-type" v-model="ruleForm.opRoyaltyRemark" placeholder="请选择团组类型">
                             <el-option v-for="(item, index) in commissionleve" :key="index" :label="item"
                                 :value="item"></el-option>
@@ -295,6 +295,7 @@ export default {
             restaurants: [],
             restaurantss:[],
             customerunitslist:[],
+            bidbr:true
         };
     },
     methods: {

src/components/Resource/OpOfficialActivities.vue

@@ -211,6 +211,26 @@
                                 v-model="OpOfficialActivitiesDto.attendees"></el-input>
                         </el-form-item>
                     </div>
+                    <div style="width:770px;">
+                        <el-form-item label="邮件截图:" prop="attendees" label-width="160px">
+                            <el-upload 
+                            :file-list="uploadFiles2"
+                            ref="upload2" 
+                            :on-success="upLoadSuccess2" 
+                            :on-error="upLoadError2"
+                            :before-remove="beforeRemove2" 
+                            :on-change="onChange2" :limit="1" 
+                            :on-exceed="exceed2"
+                            :action="uploadURL" 
+                            :headers="headers2" 
+                            :auto-upload="false" 
+                            :on-preview="onPreview2">
+                                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+                                <el-button style="margin-left: 10px;" size="small" type="success"
+                                    @click="submitUpload2">上传</el-button>
+                            </el-upload>
+                        </el-form-item>
+                    </div>
                 </div>
                 <!-- <div>
                     <div>
@@ -257,6 +277,7 @@
                 <el-form-item>
                     <div style="text-align: right;">
                         <el-button type="primary" @click="addBtn">保存</el-button>
+                        <el-button type="primary">确认</el-button>
                         <el-button @click="returnbtn">取消</el-button>
                     </div>
                 </el-form-item>