页面修改

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -333,7 +333,7 @@
           this.GetList = newList;
         }else{
           this.GetList.forEach(y=>{
-            y.showYes = true
+            y.showYes = false
             newList.push(JSON.parse(JSON.stringify(y)))
           })
         }

src/components/FinancialModule/FProcessManagement.vue

@@ -102,13 +102,24 @@
                     <span>注：财务基本流程包括（收款流程，付款流程，发票流程），如果需要其他的流程，比如退款流程等请在自定义流程下新增流程设置</span>
                 </li>                 -->
 				<li><input type="button" class="normalBtn" value="新增流程" @click="goUrl('addFinancialProcess',0,8)"/>
-                <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex();getTemplateList();"/>
+                <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex()"/>
                 </li>
 			</ul>
 		</div>
         <ul class="_nav clearfix">
             <li class="_active" @click="getTemplateList()">流程列表</li>
             <!-- <li :class="active==1?'_active':''" @click="active=1,msg.TempLateWay=8,getTemplateList()">自定义流程</li> -->
+            <li>
+              <span>是否启用：</span>
+              <el-tooltip :content="msg.Status==1?'启用':'停用'" placement="top">
+                <el-switch
+                @change="resetPageIndex"
+                v-model="msg.Status"
+                active-value="1"
+                inactive-value="2">
+                </el-switch>
+              </el-tooltip>
+            </li>
         </ul>
         <el-form class="_info_box clearfix"  label-width="110px">
                 <el-row>
@@ -284,7 +295,8 @@ export default {
                 pageSize:6,
                 RB_BranchId:-1,
                 Name:'',
-                CostTypeID:0
+                CostTypeID:0,
+                Status:'1'
             }
         }
     },created(){
@@ -419,6 +431,7 @@ export default {
         resetPageIndex() {
             this.msg.pageIndex = 1
             this.currentPage = 1
+            this.getTemplateList()
         },
         goUrl(path,id,isZ,Branch_Id) {
             this.$router.push({ name: path,query:{"id":id,"isZ":isZ,"blank":'y',tab:"修改流程"} })

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -168,8 +168,8 @@
             <td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:250px;">行程</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">酒店</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">车/天</td>
-            <td colspan="2" class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">餐</td>
+            <td colspan="2" class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
           </tr>
           <tr>

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -75,8 +75,8 @@
             <td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:250px;">行程</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">酒店</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">车/天</td>
-            <td colspan="2" class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">餐</td>
+            <td colspan="2" class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
           </tr>
           <tr>

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -110,7 +110,7 @@
         <li>
           <button class="hollowFixedBtn" @click="getList(),resetPageIndex()">查询</button>
           <button class="hollowFixedBtn" @click="goMakeQuo('QuotationNewPrice',0)">新增</button>
-          <button class="hollowFixedBtn" @click="ShowImportOffer()" style="display:none;">导入报价单</button>
+          <button class="hollowFixedBtn" @click="ShowImportOffer()" style="">导入报价单</button>
         </li>
       </ul>
     </div>
@@ -345,89 +345,93 @@
         </table>
       </div>
     </el-dialog>
-
-    <!-- 下载弹窗 -->
+    <!-- 导入报价单弹窗 -->
     <el-dialog custom-class="w600" title="导入报价单" :visible.sync="isShowImportOffer" center>
-      <div class="BilldownLoadCommon">
-        <el-form label-width="80px">
-          <table style="width:580px;" border="0" cellspacing="0" cellpadding="0">
-            <tbody>
-              <tr>
-                <td>
-                  <el-form-item label="出团类型">
-                    <el-select v-model="postConfig.TeamType" @change="postConfig.LineId=0,postConfig.LineteamId=0"
-                      style="width:180px">
-                      <el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </td>
-                <td>
-                  <el-form-item label="线路">
-                    <el-select v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')" style="width:180px"
-                      @change="changeLine()" filterable>
-                      <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
-                      <el-option v-for="item in getLineList" :label='item.LineName' :value='item.LineID'
-                        :key='item.LineID'>
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <el-form-item label="系列">
-                    <el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" style="width:180px"
-                      filterable>
-                      <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
-                      <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </td>
-                <td>
-                  <el-form-item label="出团公司">
-                    <el-select class="multiple_input" v-model="postConfig.OutBranchId" filterable style="width:180px">
-                      <el-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <el-form-item label="出发时间">
-                    <el-date-picker type="date" v-model="postConfig.OutDateTime" value-format="yyyy-MM-dd" placeholder
-                      style="width:180px">
-                    </el-date-picker>
-                  </el-form-item>
-                </td>
-                <td>
-                  <el-form-item label="客户名称">
-                    <el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200"
-                      style="width:180px">
-                    </el-input>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <td colspan="2">
-                  <el-upload class="upload-demo" action="" accept="*.*" :http-request="UploadAttachment"
-                    :show-file-list="true">
-                    <el-button size="small" type="primary">点击上传</el-button>
-                    <div slot="tip" class="el-upload__tip">只能上传.xls/.xlsx文件</div>
-                  </el-upload>
-                </td>
-              </tr>
-            </tbody>
-            <tr height="66">
-              <td colspan="2" style="text-align:center;">
-                <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="ImportOffer()" />
+      <el-form label-width="80px">
+        <table style="width:570px;" border="0" cellspacing="0" cellpadding="0">
+          <tbody>
+            <tr>
+              <td>
+                <el-form-item label="出团类型">
+                  <el-select v-model="postConfig.TeamType" @change="postConfig.LineId=0,postConfig.LineteamId=0"
+                    style="width:180px">
+                    <el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </td>
+              <td>
+                <el-form-item label="线路">
+                  <el-select v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')" style="width:180px"
+                    @change="changeLine()" filterable>
+                    <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                    <el-option v-for="item in getLineList" :label='item.LineName' :value='item.LineID'
+                      :key='item.LineID'>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
               </td>
             </tr>
-          </table>
-        </el-form>
-      </div>
+            <tr>
+              <td>
+                <el-form-item label="系列">
+                  <el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" style="width:180px"
+                    filterable>
+                    <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                    <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </td>
+              <td>
+                <el-form-item label="出团公司">
+                  <el-select class="multiple_input" v-model="postConfig.OutBranchId" filterable style="width:180px">
+                    <el-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <el-form-item label="出发时间">
+                  <el-date-picker type="date" v-model="postConfig.OutDateTime" value-format="yyyy-MM-dd" placeholder
+                    style="width:180px">
+                  </el-date-picker>
+                </el-form-item>
+              </td>
+              <td>
+                <el-form-item label="客户名称">
+                  <el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200"
+                    style="width:180px">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <el-upload class="upload-demo" action="" accept="*.*" :http-request="UploadAttachment"
+                  :show-file-list="true" ref="uploadOffer">
+                  <el-button size="small" type="primary">点击上传</el-button>
+                  <div slot="tip" class="el-upload__tip">只能上传.xls/.xlsx文件</div>
+                </el-upload>
+              </td>
+              <td>
+                <a :href="`${downLoadUrl}`" target="OfferTemplate.xls"
+                  style="color:blue;text-decoration: underline">下载导入模板</a>
+              </td>
+            </tr>
+          </tbody>
+          <tr>
+            <td colspan="2" style="text-align:center;">
+              <el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">保存
+              </el-button>
+              <input type="button" class="normalBtn" value="关闭" @click="isShowImportOffer=false,clearMsg()" />
+            </td>
+          </tr>
+        </table>
+      </el-form>
+
     </el-dialog>
   </div>
 </template>
@@ -496,6 +500,8 @@
           EmployeeId: 0,
         },
         myfile: "",
+        importOfferLoading: false,
+        downLoadUrl: "http://imgfile.oytour.com/static/offerTemplate.xlsx",
       };
     },
     computed: {
@@ -518,7 +524,7 @@
     },
     methods: {
       UploadAttachment(files) {
-        this.myfile = files.file
+        this.myfile = files.file;
       },
       //线路切换
       changeLine() {
@@ -529,7 +535,9 @@
         }
         this.getLineTeamList(this.postConfig.LineId, 1);
       },
+      //显示导入报价单弹窗
       ShowImportOffer() {
+        this.clearMsg();
         this.isShowImportOffer = true;
       },
       //情况导入数据
@@ -541,15 +549,24 @@
         this.postConfig.OutDateTime = "";
         this.postConfig.CustomerName = "";
         this.postConfig.EmployeeId = 0;
+        this.myfile = "";
       },
       //导入报价单
       ImportOffer() {
+        if (this.postConfig.OutDateTime == '') {
+          this.Error("请选择出发时间!");
+          return;
+        }
+        if (this.myfile == '') {
+          this.Error("请选择需要上传的文件!");
+          return;
+        }
+        this.importOfferLoading = true;
         let urlObj = this.domainManager();
         var formData = new FormData();
         formData.append("myfile", this.myfile);
         this.postConfig.EmployeeId = this.getLocalStorage().EmployeeId;
         formData.append("msg", JSON.stringify(this.postConfig));
-        // 'Content-Type': 'multipart/form-data'
         this.$http({
           headers: {
             'Content-Type': 'multipart/form-data'
@@ -558,14 +575,20 @@
           url: urlObj.DomainUrl + '/api/file/UploadFile',
           data: formData
         }).then(res => {
-          console.log("ImportOffer", res);
+          this.importOfferLoading = false;
           if (res.status === 200) {
-            this.clearMsg();
-            this.isShowImportOffer = false;
-          } else {
-            this.$message.error('上传失败!');
+            if (res.data && res.data > 0) {
+              this.$refs.uploadOffer.clearFiles();
+              this.clearMsg();
+              this.isShowImportOffer = false;
+              this.getList();
+            } else {
+              this.$message.error('上传失败!');
+            }
           }
-        }).catch(err => {})
+        }).catch(err => {
+          this.importOfferLoading = false;
+        })
       },
       //根据当前员工所在部门获取该部门及子部门员工信息
       getEmployeeList() {