2 Commits cf457bb14e ... 53c56d4774

Auteur SHA1 Bericht Datum
  liuhj 53c56d4774 Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system 2 weken geleden
  liuhj c895dbfaf3 小修改费用审核 2 weken geleden

+ 11 - 0
src/components/Finance/ConferenceCost.vue

@@ -30,6 +30,15 @@
                     <el-input size="small" placeholder="请输入内容" v-model="conferenceAffairsCost.city" clearable>
                     </el-input>
                 </div>
+                <div class="conferencecost-header-left-item">
+                    <label style="width:35px;">规模: </label>
+                    <el-select size="small" v-model="scaleid" filterable
+                        placeholder="请选择">
+                        <el-option v-for="item in scaleidarr" :key="item.id" :label="item.teamName"
+                            :value="item.id">
+                        </el-option>
+                    </el-select>
+                </div>
             </div>
             <div class="conferencecost-header-right">
                 <el-button v-if="control.isGM && userId != 21" size="small" type="primary"
@@ -280,6 +289,8 @@ export default {
             lioms: 0,
             danwei: '',
             danweiId: 0,
+            scaleid:'',//规模
+            scaleidarr:[],//规模数组
             conferenceAffairsCost: {
                 city: '',//服务地区
                 diid: '',//团组Id

+ 3 - 3
src/components/Finance/FeesPage.vue

@@ -102,12 +102,12 @@
                 </el-table-column>
                 <el-table-column prop="auditOperatorName" label="审核人" width="80" >
                 </el-table-column>
-                <el-table-column prop="overBudget" label="超预算比例" show-overflow-tooltip width="120">
-                </el-table-column>
+                <!-- <el-table-column prop="overBudget" label="超预算比例" show-overflow-tooltip width="120">
+                </el-table-column> -->
                 <el-table-column prop="payType" label="支付方式" width="80" >
                 </el-table-column>
                 <el-table-column prop="cardType" label="卡类型" width="80" >
-                    <template slot-scope="scope">
+                    <template slot-scope="scope">z
                         {{scope.row.payType!="刷卡"?'-':scope.row.cardType}}
                     </template>
                 </el-table-column>

+ 1 - 1
src/components/expenseMobileinfo.vue

@@ -41,7 +41,7 @@
                         <div class="ex-card-balance">剩余尾款:{{items.balance}}</div>
                         <div class="ex-card-applicant">申请人:{{items.operatorName}}</div>
                         <div class="ex-card-auditor">审核人:{{items.auditOperatorName}}</div>
-                        <div class="ex-card-budget">超预算比例:{{items.overBudget}}</div>
+                        <!-- <div class="ex-card-budget">超预算比例:{{items.overBudget}}</div> -->
                         <div class="ex-card-paymethod">支付方式:{{items.payType}}</div>
                         <div class="ex-card-cardtype">卡类型:{{items.cardType}}</div>
                         <div class="ex-card-btn">