0828+1

src/components/Finance/royaltypg.vue

@@ -32,11 +32,11 @@
                             :picker-options="pickerOptions">
                             </el-date-picker>
                         </el-form-item>
-                        <!-- <div style="margin-left: 10px;"> -->
+                        <div style="margin-left: 10px;">
                             <el-button style="margin-left: 10px;" @click="ComputeRoyalties" type="primary">查 询</el-button>
                             <el-button @click="derivelist" type="primary">导出提成列表</el-button>
                             <el-button @click="RoyaltyConfirmByFin" type="primary">发送通知给国交同事进行提成确认</el-button>
-                        <!-- </div> -->
+                        </div>
                     </div>
                 </el-form>
             </div>
@@ -400,7 +400,7 @@ export default {
 }
 .royaltypg-hand-search{
     display: flex;
-
+    flex-wrap: wrap;
 }
 .royaltypg-hand-search .el-form-item{
     margin-bottom: 0;

src/components/OP/RoyaltyRecogn.vue

@@ -10,17 +10,18 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="部门">
-                            <el-select disabled @change="depchange" v-model="depvalue" placeholder="请选择部门">
+                            <el-select style="width:120px" disabled @change="depchange" v-model="depvalue" placeholder="请选择部门">
                               <el-option v-for="(item,index) in depOption" :key="index" :label="item.depName" :value="item.depId"></el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="人员">
-                            <el-select disabled filterable v-model="uservalue" placeholder="请选择人员">
+                            <el-select style="width:120px" disabled filterable v-model="uservalue" placeholder="请选择人员">
                                 <el-option v-for="(item,index) in userOption" :key="index" :label="item.cnName" :value="item.id"></el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="日期">
                             <el-date-picker
+                            style="width:250px"
                             v-model="value2"
                             type="daterange"
                             align="right"
@@ -31,6 +32,16 @@
                             :picker-options="pickerOptions">
                             </el-date-picker>
                         </el-form-item>
+                        <el-form-item label-width="80px" label="是否确认">
+                            <el-select style="width:120px" filterable v-model="countersign" placeholder="请选择人员">
+                                <el-option v-for="(item,index) in countersignarr" :key="index" :label="item.lable" :value="item.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label-width="80px" label="是否发放">
+                            <el-select style="width:120px" filterable v-model="grant" placeholder="请选择人员">
+                                <el-option v-for="(item,index) in grantarr" :key="index" :label="item.lable" :value="item.value"></el-option>
+                            </el-select>
+                        </el-form-item>
                         <div style="margin-left: 10px;">
                             <el-button @click="ComputeRoyalties" type="primary">查 询</el-button>
                             <!-- <el-button @click="derivelist" type="primary">导出提成列表</el-button> -->
@@ -179,7 +190,37 @@ export default {
             userOption:[],
             tableData: [],
             numpices:0,
-            multipleSelection: []
+            multipleSelection: [],
+            countersign:-1,
+            countersignarr:[
+                {
+                    lable:'全部',
+                    value:-1
+                },
+                {
+                    lable:'未确认',
+                    value:0
+                },
+                {
+                    lable:'已确认',
+                    value:1
+                },
+            ],
+            grant:-1,
+            grantarr:[
+                {
+                    lable:'全部',
+                    value:-1
+                },
+                {
+                    lable:'未发放',
+                    value:0
+                },
+                {
+                    lable:'已发放',
+                    value:1
+                },
+            ],
         }
     },
     methods:{
@@ -354,12 +395,14 @@ export default {
                 data:{
                     userId:that.uservalue,
                     startDate:that.getdate(this.value2[0]),
-                    endDate:that.getdate(this.value2[1])
+                    endDate:that.getdate(this.value2[1]),
+                    confirm:that.countersign,
+                    send:that.grant
                 }
             }).then(function (res) {
                 if(res.data.code==200){
-                    that.tableData=res.data.data;
-                    that.numpices=res.data.data.totalPrice;
+                    that.tableData=res.data.data.list;
+                    that.numpices=res.data.data.costPrice;
                 }else{
                     that.$message({
                         message: res.data.msg,
@@ -430,7 +473,7 @@ export default {
 }
 .royaltypg-hand-search{
     display: flex;
-
+    flex-wrap: wrap;
 }
 .royaltypg-hand-search .el-form-item{
     margin-bottom: 0;