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

src/components/ConferenceModule/Supplierinfo.vue

@@ -151,6 +151,7 @@ export default {
     border-radius: 10px;
     height: 100%;
     min-height: 840px;
+    
 }
 .supplierinfo-screen{
     display: flex;

src/components/Resource/AskData.vue

@@ -6,32 +6,31 @@
                     <div>请示数据库</div>
                 </div>
                 <div style="display: flex;">
-                    <div style="width: 60%;display: flex;">
-                        <div style="width: 25%;">
+                    <div style="width: 60%;display: flex;flex-wrap: wrap;">
+                        <div style="width:200px;margin-right: 10px;">
                             <el-input clearable placeholder="国家" v-model="Country">
                             </el-input>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 200px;margin-right: 10px;">
                             <el-input clearable placeholder="地区" v-model="Area">
                             </el-input>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 200px;margin-right: 10px;">
                             <el-input clearable placeholder="领域" v-model="Field">
                             </el-input>
                         </div>
-                        <div style="width: 25%;">
-                            <el-button type="primary" style="margin-left: 10px;" @click="QueryAskData">查询</el-button>
+                        <div style="width: 200px;margin-right: 10px;">
+                            <el-button type="primary"  @click="QueryAskData">查询</el-button>
                         </div>
                     </div>
-                    <div style="width: 40%;">
+                    <div style="width: 40%;text-align: right;">
                         <el-select v-model="DiId" placeholder="团组选择" clearable filterable>
                             <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
                                 :value="item.id">
                             </el-option>
                         </el-select>
-                        <el-button type="primary" style="margin-left: 10px;">省外办请示</el-button>
-                        <el-button type="primary" style="margin-left: 10px;">市外办请示</el-button>
-                        ||
+                        <el-button type="primary" @click="AskDataProvinceFAOPFile" style="margin-left: 10px;">省外办请示</el-button>
+                        <el-button type="primary" @click="AskDataCityFAOPFile" style="margin-left: 10px;">市外办请示</el-button>
                         <router-link :to="{ path: '/home/OpAskData' }">
                             <el-button type="primary" style="margin-left: 10px;">新增</el-button>
                         </router-link>
@@ -99,7 +98,7 @@ export default {
             Area: "",
             Field: "",
             delegationInfoList: [],
-
+            dataIdItem:[]
         }
     },
     methods: {
@@ -129,7 +128,6 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    debugger
                     that.delegationInfoList = res.data.data.delegationInfo;
                     that.DiId = that.delegationInfoList[0].id;
                     that.tableDatas = res.data.data.askDatd;
@@ -199,7 +197,58 @@ export default {
             });
         },
         handleSelectionChange(val) {
-            console.log(val)
+            this.dataIdItem=[];
+            for(let i=0;i<val.length;i++){
+                this.dataIdItem.push(val[i].id)
+            }
+        },
+        //省外办请示
+        AskDataProvinceFAOPFile() {
+            var url = "/api/Resource/AskDataProvinceFAOPFile"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    dataIdItem:that.dataIdItem,
+                    diId:that.DiId,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    window.open(res.data.data.url);
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error("错误！请联系休息部");
+            });
+        },
+        //市外办请示
+        AskDataCityFAOPFile() {
+            var url = "/api/Resource/AskDataCityFAOPFile"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    dataIdItem:that.dataIdItem,
+                    diId:that.DiId,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    window.open(res.data.data.url);
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error("错误！请联系休息部");
+            });
         },
     },