成本报批修改

src/components/Finance/Cost.vue

@@ -542,6 +542,26 @@
                                                 <br>
                                             </div>
                                         </div>
+                                        <div>
+                                            <div>
+                                                <div v-if="ShowOther.length == 0">
+                                                </div>
+                                                <div v-else>
+                                                    <div style="margin-top: 10px;"></div>
+                                                    <div class="el-popover__title">三公经费-其它：</div>
+                                                    <div v-for="(item, index) in ShowOther" :key="index">
+                                                        {{ item.setDataType }} &nbsp;&nbsp; <span
+                                                            style="color:green;">{{
+                                                                item.subTotal }}</span>元/人
+                                                        <span v-if="item.cost">(<span style="color:green;">{{
+                                                            item.cost }}</span> </span>
+                                                        <span v-if="item.currencyStr">{{
+                                                            item.currencyStr }})</span>
+                                                        <br>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
                                     <el-input size="mini" slot="reference" v-model="scope.row[item.prop]">
                                     </el-input>
@@ -567,6 +587,26 @@
                                                 <br>
                                             </div>
                                         </div>
+                                        <div>
+                                            <div>
+                                                <div v-if="ShowOther.length == 0">
+                                                </div>
+                                                <div v-else>
+                                                    <div style="margin-top: 10px;"></div>
+                                                    <div class="el-popover__title">三公经费-其它：</div>
+                                                    <div v-for="(item, index) in ShowOther" :key="index">
+                                                        {{ item.setDataType }} &nbsp;&nbsp; <span
+                                                            style="color:green;">{{
+                                                                item.subTotal }}</span>元/人
+                                                        <span v-if="item.cost">(<span style="color:green;">{{
+                                                            item.cost }}</span> </span>
+                                                        <span v-if="item.currencyStr">{{
+                                                            item.currencyStr }})</span>
+                                                        <br>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
                                     <el-input size="mini" slot="reference" v-model="scope.row[item.prop]">
                                     </el-input>
@@ -4145,8 +4185,8 @@ export default {
                         }
 
                         const centerBaoPiShow = [
-                            "Meals", "Hotel", "GongZa"
-                        ]
+                            "Meals", "Hotel", "GongZa", "Other"
+                        ];
 
                         for (var i = 0; i < centerBaoPiShow.length; i++) {
                             var val = baoPi.filter(x => {
@@ -6581,6 +6621,17 @@ export default {
             }
             return currStr;
         },
+        ShowOther() {
+            if (this.ShowBaoPi.length > 0) {
+                var result = this.ShowBaoPi.filter(x => x.type == 'Other')[0];
+                if (result) {
+                    return result.content;
+                } else {
+                    return [];
+                }
+            }
+            return [];
+        }
     },
     filters: {
         filter_time(value) {