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

src/components/Resource/VisitSchedule.vue

@@ -9,17 +9,32 @@
                     </el-select>
                 </el-form-item>
             </el-form>
-            <div>
-                <el-button size="small" @click="SaveApprovalJourney" type="primary">保存</el-button>
-                <el-button size="small" @click="DeleteApprovalJourney" type="primary">删除</el-button>
-                <el-button size="small" @click="CreateApprovalJourney" type="primary">导入机票信息</el-button>
-                <el-button size="small" @click="ExportApprovalJourneyWord" type="primary">导出word</el-button>
+            <div style="display: flex;gap: 5px;">
+                <div style="flex: 1">
+                    <el-select filterable v-model="blackCodeId" placeholder="请选择黑屏代码">
+                        <el-option v-for="(item, index) in blackCodeList" :key="index" :label="item.title"
+                            :value="item.id"></el-option>
+                    </el-select>
+                </div>
+                <div>
+                    <el-button style="margin-left: 0px;" @click="CreateApprovalJourney"
+                        type="primary">导入机票信息</el-button>
+                    <el-button style="margin-left: 0px;" @click="SaveApprovalJourney" type="primary">保存</el-button>
+                    <el-button style="margin-left: 0px;" @click="DeleteApprovalJourney" type="primary">删除</el-button>
+                    <el-select style="width: auto;" filterable v-model="fileIndex" placeholder="请选择文件类型">
+                        <el-option v-for="(item, index) in fileTempList" :key="index" :label="item.fileName"
+                            :value="item.index"></el-option>
+                    </el-select>
+                    <el-button @click="ExportApprovalJourneyWord" type="primary">导出word</el-button>
+                </div>
             </div>
         </div>
         <div class="VisitSchedule-content">
             <div class="VisitSchedule-content-title">出访行程</div>
             <div class="VisitSchedule-content-info">
-                团组名:{{ groupInfo.teamName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;团组号:{{ groupInfo.tourCode }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;出访日期:{{ groupInfo.visitStartDate + '~' + groupInfo.visitEndDate }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ groupInfo.visitDays + '天/' + groupInfo.visitPNumber + '人' }}
+                团组名:{{ groupInfo.teamName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;团组号:{{ groupInfo.tourCode
+                }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;出访日期:{{ groupInfo.visitStartDate + '~' + groupInfo.visitEndDate
+                }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ groupInfo.visitDays + '天/' + groupInfo.visitPNumber + '人' }}
             </div>
             <div class="VisitSchedule-content-table">
                 <div v-for="(item, index) in tablearr" :key="index" class="VisitSchedule-content-ul">
@@ -27,8 +42,8 @@
                     <div v-for="(items, index) in item.chiList" :key="index" class="VisitSchedule-content-li">
                         <div class="VisitSchedule-content-time">
                             <el-time-picker is-range format='HH:mm' value-format='HH:mm' v-model="items.timeInterval"
-                                :default-value="value1" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
-                                placeholder="选择时间范围">
+                                :default-value="value1" range-separator="至" start-placeholder="开始时间"
+                                end-placeholder="结束时间" placeholder="选择时间范围">
                             </el-time-picker>
                         </div>
                         <div class="VisitSchedule-content-remark">
@@ -54,6 +69,10 @@ export default {
             ss: [0, 0],
             groupInfo: {},
             fullscreenLoading: false,
+            blackCodeId: '',
+            blackCodeList: [],
+            fileTempList: [],
+            fileIndex: 1,
         }
     },
     methods: {
@@ -62,6 +81,8 @@ export default {
             this.groupInfo = {};
             this.tablearr = [];
             this.fullscreenLoading = true;
+            this.blackCodeId = '';
+            this.blackCodeList = [];
 
             var url = "/api/Groups/ApprovalJourneyInit"
             var that = this
@@ -91,6 +112,8 @@ export default {
                     }
                     that.groupInfo = res.data.data.groupInfo;
                     that.fullscreenLoading = false;
+                    that.blackCodeList = res.data.data.blackCodeList;
+                    that.fileTempList = res.data.data.fileTempList;
                 } else {
                     that.$message({
                         message: res.data.msg,
@@ -169,6 +192,16 @@ export default {
         },
         //报批行程导入机票信息
         CreateApprovalJourney() {
+
+            if (!this.blackCodeId) {
+                this.$message({
+                    message: '请选择黑屏代码',
+                    duration: 1000,
+                    type: "error"
+                });
+                return;
+            }
+
             var url = "/api/Groups/CreateApprovalJourney"
             var that = this
             this.$axios({
@@ -179,7 +212,8 @@ export default {
                 },
                 data: {
                     diid: that.diid,
-                    userid: that.userId
+                    userid: that.userId,
+                    BlackCodeId: that.blackCodeId
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
@@ -188,6 +222,13 @@ export default {
                         type: 'success'
                     });
                     that.tablearr = res.data.data;
+                    for (let i = 0; i < that.tablearr.length; i++) {
+                        for (let a = 0; a < that.tablearr[i].chiList.length; a++) {
+                            if (that.tablearr[i].chiList[a].timeInterval.length == 1) {
+                                that.tablearr[i].chiList[a].timeInterval = that.value1;
+                            }
+                        }
+                    }
                 } else {
                     that.$message({
                         message: res.data.msg,
@@ -201,6 +242,16 @@ export default {
         },
         //报批行程导出
         ExportApprovalJourneyWord() {
+
+            if (!this.fileIndex) {
+                this.$message({
+                    message: '请选择文件类型',
+                    duration: 1000,
+                    type: "error"
+                });
+                return;
+            }
+
             var url = "/api/Groups/ExportApprovalJourneyWord"
             var that = this
             this.$axios({
@@ -211,6 +262,7 @@ export default {
                 },
                 data: {
                     diid: that.diid,
+                    fileIndex: this.fileIndex
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {