Browse Source

三公费用修改

liuhj 1 day ago
parent
commit
2049cbc1e7

+ 9 - 0
src/components/OP/AffairsBackward.vue

@@ -18,6 +18,15 @@
                     <el-input v-model="scope.row.remark" placeholder="请输入内容"></el-input>
                 </template>
             </el-table-column>
+             <el-table-column prop="remark" label="操作" width="150">
+                <template slot-scope="scope">
+                    <el-button size="mini" @click="scope.row.remark='121212'" type="primary">插入行↑</el-button>
+                    <br />
+                    <el-button style="margin: 10px 0;" size="mini" type="danger">删 除</el-button>
+                    <br />
+                    <el-button size="mini" type="primary">插入行↓</el-button>
+                </template>
+            </el-table-column>
         </el-table>
     </div>
 </template>

+ 2 - 1
src/components/OP/EntryDetails.vue

@@ -167,7 +167,7 @@
                                 v-model="TotalExpenses.Firstclass"></el-input-number>
                             <span>元/人;</span>
                         </div>
-                        <span v-if="airDataArr.length<=0" class="redzhu">(机票数据未录入)</span>
+                        <span v-if="airDataArr.length<1" class="redzhu">(机票数据未录入)</span>
                         <div v-else>
                             <span class="redzhu">有多条机票费用数据请自行选择!!</span>&nbsp;&nbsp;
                             <el-select style="width:400px" @change="Fillin" size="mini" v-model="airDataArrvalue" placeholder="请选择">
@@ -833,6 +833,7 @@ export default {
                         // that.TotalExpenses.EconomyClass = res.data.data.airData[0].jjcCurrentRate;
                         // that.TotalExpenses.BusinessClass = res.data.data.airData[0].gwcCurrentRate;
                         // that.TotalExpenses.Firstclass = res.data.data.airData[0].tdcCurrentRate;
+                        that.airDataArr=res.data.data.airData;
                         that.DomesticFees.visafees = res.data.data.visaData.feeTotal;
                         that.DomesticFees.visafeesDescription = res.data.data.visaData.remark;
                     } else {

+ 40 - 2
src/components/OP/GroupProgress.vue

@@ -1,5 +1,32 @@
 <template>
     <div class="group-progress">
+        <div class="progress-hade">
+            <el-form style="display: flex;justify-content: space-between;align-items: center;" :inline="true" :model="formInline" class="demo-form-inline">
+                <el-form-item>
+                    <el-select v-model="formInline.Status" placeholder="团组名称" style="width: 250px;">
+                        <el-option v-for="(item, index) in AuditStatus" :key="index" :label="item.title"
+                            :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+                <div>
+                    <el-form-item label="团队名称:">
+                        {{ formInline.name }}
+                    </el-form-item>
+                    <el-form-item label="客户:">
+                        {{ formInline.clientName }}
+                    </el-form-item>
+                    <el-form-item label="出访国家:">
+                        {{ formInline.CountriesVisited }}
+                    </el-form-item>
+                    <el-form-item label="起止日期:">
+                        {{ formInline.StartTime }}
+                    </el-form-item>
+                    <el-form-item label="天数/人数:">
+                        {{ formInline.Days }}天 / {{ formInline.Number }}人
+                    </el-form-item>
+                </div>
+            </el-form>    
+        </div>
         <el-collapse v-model="activeNames" @change="handleChange">
             <el-collapse-item name="1">
                 <template #title>
@@ -156,6 +183,7 @@
                 </div>
             </el-collapse-item>
         </el-collapse>
+        
     </div>
 </template>
 <script>
@@ -298,8 +326,18 @@ export default {
                     time: '',
                 }
             ],
-            visible: false
-
+            visible: false,
+            diid:'',
+            AuditStatus:[],
+            formInline: {
+                name: '美国团',
+                clientName: '张三',
+                CountriesVisited: '美国',
+                StartTime: '2023-10-01至2023-10-10',
+                Days: 10,
+                Number: 8,
+                Status: '',
+            },
         }
     },
     methods: {