新增页面

src/components/sale/orderlist.vue

@@ -140,13 +140,14 @@
         </tr>
         <tr>
           <td :colspan="11" style="text-align: left">
-            <div class="row" v-if="item.GuestList.length>0">
+            <div class="row" v-if="item.GuestList&&item.GuestList.length>0">
               学生名单：
               <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
                 style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
             </div>
-            <div v-if="item.GuestList.length>0&&item.ContractList.length==0" class="takeContract" @click="takeContract(item)">领取合同</div>
-            <div v-if="item.ContractList.length>0" class="takeContract">
+            <div v-if="item.GuestList&&item.GuestList.length>0&&item.ContractList&&item.ContractList.length==0"
+              class="takeContract" @click="takeContract(item)">领取合同</div>
+            <div v-if="item.ContractList&&item.ContractList.length>0" class="takeContract">
               查看合同
               <q-popup-proxy>
                 <q-banner>
@@ -169,7 +170,8 @@
                           <span v-if="subItem.Status==4">取消</span>
                         </td>
                         <td>
-                          <q-btn color="accent" v-if="subItem.ContractNo==''" size="sm" class="q-mr-md" @click="takeContractTwo(item,subItem)" label="领取合同" />
+                          <q-btn color="accent" v-if="subItem.ContractNo==''" size="sm" class="q-mr-md"
+                            @click="takeContractTwo(item,subItem)" label="领取合同" />
                         </td>
                       </tr>
                     </table>
@@ -177,12 +179,12 @@
                 </q-banner>
               </q-popup-proxy>
             </div>
-            <div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)">
+            <div class="row" v-if="item.GuestList&&item.GuestList.length>0&&getTkshow(item.GuestList)">
               退课名单：
               <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2"
                 style="color:var(--q-color-negative);margin-right: 5px">{{x.GuestName}} </span>
             </div>
-            <span v-if="item.GuestList.length==0">暂无</span>
+            <span v-if="item.GuestList&&item.GuestList.length==0">暂无</span>
           </td>
         </tr>
         <tr>
@@ -371,17 +373,17 @@
         </tr>
         <tr>
           <td :colspan="11" style="text-align: left">
-            <div class="row" v-if="item.GuestList.length>0">
+            <div class="row" v-if="item.GuestList&&item.GuestList.length>0">
               学生名单：
               <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
                 style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
             </div>
-            <div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)">
+            <div class="row" v-if="item.GuestList&&item.GuestList.length>0&&getTkshow(item.GuestList)">
               退课名单：
               <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2"
                 style="color:var(--q-color-negative);margin-right: 5px">{{x.GuestName}} </span>
             </div>
-            <span v-if="item.GuestList.length==0">暂无</span>
+            <span v-if="item.GuestList&&item.GuestList.length==0">暂无</span>
           </td>
         </tr>
         <tr>
@@ -551,7 +553,6 @@
     <viewquotation-form v-if="isShowviewQuo" :rId="offerId" :isShowCancle="1" @close="closeQuota"
       @success="refreshOrder">
     </viewquotation-form>
-
   </div>
 </template>
 
@@ -709,7 +710,7 @@
       //弹出退课名单
       getTkshow(data) {
         let Tkshow = false;
-        if (data.length > 0) {
+        if (data && data.length > 0) {
           data.forEach(x => {
             if (x.GuestState == 2) {
               Tkshow = true
@@ -768,7 +769,7 @@
                 })
               }
             } else if (type == 2) {
-              if (this.cancelList.length > 0) {
+              if (this.cancelList && this.cancelList.length > 0) {
                 this.cancelList.forEach(x => {
                   data.forEach(j => {
                     if (x.OrderId == j.OrderId) {
@@ -878,7 +879,12 @@
       //财务单据
       chanceType(obj, type) {
         let TCIDARR = []
-        TCIDARR.push(obj.ClassId);
+        //留学就业订单
+        if (obj && obj.OrderType == 2) {
+          TCIDARR.push(obj.SourceId);
+        } else {
+          TCIDARR.push(obj.ClassId);
+        }
         var orderObj = {}
         if (obj.OfferId > 0) {
           orderObj = {
@@ -899,6 +905,11 @@
             TCIDList: TCIDARR
           }
         }
+        //留学就业订单
+        if (obj && obj.OrderType == 2) {
+          //财务单据类型【教育留学】
+          orderObj.OrderSource = 18;
+        }
         this.$router.push({
           path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
           query: {
@@ -928,10 +939,10 @@
         this.isShowMoney = true;
       },
       //领取合同
-      takeContract(item){
+      takeContract(item) {
         let msg = {
-          OrderId:item.OrderId,
-          GuestId:0
+          OrderId: item.OrderId,
+          GuestId: 0
         }
         SetOrderReceiveContract(msg).then(res => {
           if (res.Code == 1) {
@@ -949,10 +960,10 @@
 
         })
       },
-      takeContractTwo(item,subItem){
+      takeContractTwo(item, subItem) {
         let msg = {
-          OrderId:item.OrderId,
-          GuestId:subItem.GuestId
+          OrderId: item.OrderId,
+          GuestId: subItem.GuestId
         }
         SetOrderReceiveContract(msg).then(res => {
           if (res.Code == 1) {
@@ -1186,17 +1197,22 @@
     text-decoration: underline;
     cursor: pointer
   }
-  .takeContract{
+
+  .takeContract {
     cursor: pointer;
-    color:rgb(41, 97, 254);
+    color: rgb(41, 97, 254);
   }
-   .Contract_Table{
-    width:100%;
-    border-collapse:collapse;
+
+  .Contract_Table {
+    width: 100%;
+    border-collapse: collapse;
   }
-  .Contract_Table ,th, td{
-    padding:5px;
-    color:#000;
+
+  .Contract_Table,
+  th,
+  td {
+    padding: 5px;
+    color: #000;
     text-align: center;
   }
 

src/components/studyAbroad/studyAbroad-form.vue

@@ -11,17 +11,16 @@
             class="col-6 q-pr-lg q-pb-lg" label="项目名称" :rules="[val => !!val || '项目名称']" />
           <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.SupplierId" ref="Type"
             :options="supplierList" label="供应商" :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
-          <a v-if="objOption.SupplierContract&&isHaveViewContractAction"
-            style="margin-left:10px;color:#2961FE;text-decoration:none;" :href="objOption.SupplierContract">查看合同</a>
+
         </div>
-        <div class="row wrap" style="display:none;">
-          <div class="col-12">
-            <div style="display:flex;align-items:center;">
-              <a :href="fileObj.FileUrl" style="margin-right:10px;">{{fileObj.FileName}}</a>
-              <el-upload class="upload-demo" action="" :show-file-list="false" :http-request="UploadAttachment"
-                :multiple="uploadMultple">
-                <q-btn color="accent" size="sm" icon="add" label="上传供应商合同" />
-              </el-upload>
+        <div class="row wrap">
+          <div class="col-6">
+            <q-select filled stack-label option-value="SId" option-label="SName" v-model="objOption.School_Id"
+              ref="School_Id" :options="SchoolList" label="所属校区" :dense="false" class="col-6 q-pr-lg q-pr-lg" emit-value
+              map-options />
+            <div class="col-6">
+              <a v-if="objOption.SupplierContract&&isHaveViewContractAction"
+                style="margin-left:10px;color:#2961FE;text-decoration:none;" :href="objOption.SupplierContract">查看合同</a>
             </div>
           </div>
         </div>
@@ -51,6 +50,9 @@
   import {
     UploadSelfFile
   } from '../../api/common/common'
+  import {
+    getSchoolDropdown,
+  } from '../../api/school/index'
   import {
     mapState
   } from "vuex";
@@ -75,6 +77,7 @@
           SupplierId: 0, //供应商编号
           SupplierContract: '', //供应商合同
           Remark: '', //备注
+          School_Id: 0, //所属校区
         },
         optionTitle: "",
         saveLoading: false,
@@ -83,7 +86,8 @@
         fileObj: {
           FileName: '',
           FileUrl: ''
-        }
+        },
+        SchoolList: [], //校区列表
       }
     },
     computed: mapState({
@@ -101,11 +105,27 @@
         return false;
       }
     }),
+    created() {
+      this.getSchool()
+    },
     mounted() {
       this.getStudyAbroadList();
       this.initObj()
     },
     methods: {
+      //获取校区下拉
+      getSchool() {
+        getSchoolDropdown({}).then(res => {
+          if (res.Code == 1) {
+            this.SchoolList = res.Data;
+            var obj = {
+              SName: '请选择',
+              SId: 0
+            }
+            this.SchoolList.unshift(obj);
+          }
+        })
+      },
       //初始化表单
       initObj() {
         if (this.saveObj && this.saveObj.Id > 0) {
@@ -121,6 +141,7 @@
                 this.objOption.SupplierId = tempObj.SupplierId;
                 this.objOption.SupplierContract = tempObj.SupplierContract;
                 this.objOption.Remark = tempObj.Remark;
+                this.objOption.School_Id = tempObj.School_Id;
               }
             }
           })
@@ -131,6 +152,7 @@
           this.objOption.SupplierId = 0;
           this.objOption.SupplierContract = '';
           this.objOption.Remark = '';
+          this.objOption.School_Id = 0;
         }
       },
       //关闭弹窗

src/pages/contractConfirm.vue

@@ -421,7 +421,6 @@
       getList() {
         GetEducationContractInfo(this.gmsg).then(res => {
           if (res.Code == 1) {
-            console.log(res, '梳理');
             this.dataList = res.Data;
           }
         })

src/pages/sale/contractAudit.vue

@@ -208,7 +208,6 @@
           if (res.Code == 1) {
             this.dataList = res.Data.PageData;
             this.pageCount = res.Data.PageCount;
-            console.log(res, '数据');
           }
         })
       },

src/pages/sale/contractEdit.vue

@@ -541,7 +541,6 @@
       getList() {
         GetEducationContractInfo(this.msg).then(res => {
           if (res.Code == 1) {
-            console.log(res, '数据');
             this.dataList = res.Data;
           }
         })

src/pages/sale/contractManage.vue

@@ -264,7 +264,6 @@
           if (res.Code == 1) {
             this.dataList = res.Data.PageData;
             this.pageCount = res.Data.PageCount;
-            console.log(res, '数据');
           }
         })
       },

src/pages/sale/studyjob.vue

@@ -41,7 +41,7 @@
                 <template v-if="x.PriceType==0">
                   {{ 100 - x.PriceMoney }}折
                 </template>
-                <template>
+                <template v-else>
                   {{x.PriceMoney}} 元
                 </template>
                 优惠
@@ -50,7 +50,7 @@
                 双人报名享<template v-if="x.PriceType==0">
                   {{ 100 - x.PriceMoney }}折
                 </template>
-                <template>
+                <template v-else>
                   {{x.PriceMoney}} 元
                 </template>
                 优惠
@@ -59,7 +59,7 @@
                 续费享<template v-if="x.PriceType==0">
                   {{ 100 - x.PriceMoney }}折
                 </template>
-                <template>
+                <template v-else>
                   {{x.PriceMoney}} 元
                 </template>
                 优惠

src/pages/studyAbroad/employment.vue

@@ -44,6 +44,9 @@
                   </a>
                 </div>
               </q-td>
+              <q-td v-if="col.name=='SchoolName'">
+                {{col.value}}
+              </q-td>
               <q-td v-if="col.name=='SuggestPrice'">
                 {{col.value}}
               </q-td>
@@ -172,8 +175,8 @@
                       <q-item-section>
                         <q-item-label>收支明细</q-item-label>
                       </q-item-section>
-                    </q-item> -->
-                  </q-list>
+                    </q-item>
+                  </q-list> -->
                 </q-btn-dropdown>
               </q-td>
             </template>
@@ -256,6 +259,12 @@
             field: 'SupplierName',
             align: 'left'
           },
+          {
+            name: 'SchoolName',
+            label: '所属校区',
+            field: 'SchoolName',
+            align: 'left'
+          },
           {
             name: 'SuggestPrice',
             label: '建议卖价',
@@ -312,7 +321,8 @@
         ],
         //表格可见列
         visibleColumns: [
-          'Remark', 'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
+          'Remark', 'Name', 'SchoolName', 'SuggestPrice', 'SellPrice', "PreferentialList",
+          "PreferentialListSellCommission",
           "PreferentialListB2BCommission",
           "EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
         ], //可见列
@@ -375,6 +385,7 @@
           path: '/studyAbroad/studypayment',
           query: {
             SourceId: item.Id,
+            School_Id:item.School_Id,
             blank: 'y'
           }
         })

src/pages/studyAbroad/studyProAudit.vue

@@ -200,6 +200,12 @@
             label: '供应商',
             field: 'SupplierName',
             align: 'left'
+          },
+           {
+            name: 'SchoolName',
+            label: '所属校区',
+            field: 'SchoolName',
+            align: 'left'
           },
           {
             name: 'SuggestPrice',

src/pages/studyAbroad/studyabroad.vue

@@ -44,6 +44,9 @@
                   </a>
                 </div>
               </q-td>
+              <q-td v-if="col.name=='SchoolName'">
+                {{col.value}}
+              </q-td>
               <q-td v-if="col.name=='SuggestPrice'">
                 {{col.value}}
               </q-td>
@@ -257,6 +260,12 @@
             field: 'SupplierName',
             align: 'left'
           },
+          {
+            name: 'SchoolName',
+            label: '所属校区',
+            field: 'SchoolName',
+            align: 'left'
+          },
           {
             name: 'SuggestPrice',
             label: '建议卖价',
@@ -313,7 +322,8 @@
         ],
         //表格可见列
         visibleColumns: [
-          'Remark', 'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
+          'Remark', 'Name', 'SchoolName', 'SuggestPrice', 'SellPrice', "PreferentialList",
+          "PreferentialListSellCommission",
           "PreferentialListB2BCommission",
           "EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
         ], //可见列
@@ -376,6 +386,7 @@
           path: '/studyAbroad/studypayment',
           query: {
             SourceId: item.Id,
+            School_Id: item.School_Id,
             blank: 'y'
           }
         })

src/pages/studyAbroad/studypayment.vue

@@ -443,16 +443,18 @@
         dataList: [], //数据
         msg: {
           SourceId: 0,
+          School_Id: 0,
         },
       }
     },
     created() {
-      
-    },
-    mounted() {
-      if (this.$route.query.SourceId && this.$route.query.SourceId) {
+if (this.$route.query.SourceId && this.$route.query.SourceId) {
         this.msg.SourceId = this.$route.query.SourceId;
+        this.msg.School_Id = this.$route.query.School_Id;
       }
+    },
+    mounted() {
+      
       this.getData();
     },
     methods: {
@@ -490,10 +492,10 @@
       //跳转到收款单
       goShoukuan(type) {
         let TCIDARR = []
-        TCIDARR.push(this.msg.ClassId)
+        TCIDARR.push(this.msg.SourceId);
         let orderObj = {
           OrderID: 0,
-          OrderSource: 17,
+          OrderSource: 18,
           Obj: {},
           SourceID: 0,
           TCIDList: TCIDARR
@@ -509,7 +511,6 @@
             'tradeWay': '',
           }
         });
-
       }
     }
   }