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

src/components/Finance/Overspend.vue

@@ -60,9 +60,9 @@
                     </el-table-column>
                     <el-table-column prop="priceDt" label="产生日期" width="100">
                     </el-table-column>
-                    <el-table-column prop="isAuditGMStr" label="主管退费确认" width="120">
+                    <el-table-column prop="supervisorConfirmStr" label="OP主管退费确认" width="100">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.priceName.indexOf('退餐费(地接导入)') == -1">
+                            <span v-if="!priceNameExists.some(element => scope.row.priceName.includes(element))">
                                 ——
                             </span>
                             <span v-else>
@@ -70,9 +70,19 @@
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="isAuditGMStr" label="经理退费确认" width="120">
+                    <el-table-column prop="sYsupervisorConfirmStr" label="商邀主管退费确认" width="100">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.priceName.indexOf('退餐费(地接导入)') == -1">
+                            <span v-if="!priceNameExists.some(element => scope.row.priceName.includes(element))">
+                                ——
+                            </span>
+                            <span v-else>
+                                {{ scope.row.sYsupervisorConfirmStr }}
+                            </span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="managerConfirmStr" label="经理退费确认" width="100">
+                        <template slot-scope="scope">
+                            <span v-if="!priceNameExists.some(element => scope.row.priceName.includes(element))">
                                 ——
                             </span>
                             <span v-else>
@@ -82,6 +92,20 @@
                     </el-table-column>
                     <el-table-column prop="isAuditGMStr" label="是否审核" width="100">
                     </el-table-column>
+                    <el-table-column prop="remark" label="备注" width="100">
+                        <template slot-scope="scope">
+                            <el-popover v-if="scope.row.remark != ''" placement="top" width="500" trigger="hover">
+                                {{ scope.row.remark.split('[TuT]')[0] }}
+                                <span style="color: red"> {{ scope.row.remark.split('[TuT]')[0].length > 1 ?
+                                    scope.row.remark.split('[TuT]')[1] : ''
+                                    }} </span>
+                                <span
+                                    style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden;cursor: pointer;color: #48a2ff;"
+                                    slot="reference">查看</span>
+                            </el-popover>
+                            <span v-else>{{ scope.row.remark | filter_emptyAcquiesce }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="address" label="操作">
                         <template slot-scope="scope">
                             <el-button @click.native.prevent="revisionbtn(scope.$index, scope.row, tableData)"
@@ -92,16 +116,21 @@
                                 @click.native.prevent="deleteRow(scope.$index, scope.row, tableData)" size="small">
                                 删 除
                             </el-button>
-                            <div v-if="scope.row.priceName.indexOf('退餐费(地接导入)') != -1">
+                            <div v-if="priceNameExists.some(element => scope.row.priceName.includes(element))">
                                 <br />
                                 <el-button v-show="existsUser() == 2"
                                     @click.native.prevent="changeStatus(2, scope.row.id)" type="primary" size="small">
-                                    主管退费确认
+                                    OP主管退费确认
+                                </el-button>
+                                <el-button v-show="existsUser() == 3"
+                                    @click.native.prevent="changeStatus(3, scope.row.id)" type="primary" size="small">
+                                    商邀主管退费确认
                                 </el-button>
                                 <el-button v-show="existsUser() == 1"
                                     @click.native.prevent="changeStatus(1, scope.row.id)" type="primary" size="small">
                                     经理退费确认
                                 </el-button>
+
                             </div>
                         </template>
                     </el-table-column>
@@ -133,6 +162,10 @@ export default {
             tableData: [],
             options: [],
             headtitle: {},
+            priceNameExists: [
+                '退餐费(地接导入)',
+                '车超时费用(地接导入)'
+            ]
         }
     },
     methods: {
@@ -391,16 +424,19 @@ export default {
         },
         existsUser() {
             var userid = this.userId;
-            // 王鸽和朱琳是主管确认那个按钮 刘淇是经理确认按钮
+            // 王鸽商邀主管  朱琳OP主管  刘淇经理
             var jinli = [330];
-            var zhuguan = [149, 334];
-            zhuguan.push(235);
+            var zhuguan = [334];
+            var syzhuguan = [149];
+            jinli.push(235);
             var biaoshi = -1;
             if (userid) {
                 if (jinli.indexOf(userid) != -1) {
                     biaoshi = 1;
                 } else if (zhuguan.indexOf(userid) != -1) {
                     biaoshi = 2;
+                } else if (syzhuguan.indexOf(userid) != -1) {
+                    biaoshi = 3;
                 }
             }
             return biaoshi;
@@ -444,7 +480,14 @@ export default {
         this.PostPageLinkCTable();
         //调用获取超支列表
         this.PostGroupExtraCost_Search();
-    }
+    },
+    filters: {
+        //空默认值
+        filter_emptyAcquiesce(value) {
+            let fhz = value == "" ? "--" : value
+            return fhz
+        },
+    },
 }
 </script>
 <style>