Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

quasar.conf.js

@@ -48,14 +48,10 @@ module.exports = function (ctx) {
 
       env: ctx.dev ? {
         API: 'http://localhost:5001/api',
-        // API: 'http://192.168.20.24:8300/api',
         // API: 'http://192.168.10.46:8300/api',
-
-        // API: 'http://192.168.20.17:8017/api',
-        
         // API: 'https://eduapi.oytour.com/api',
-        API_ZC: 'http://192.168.20.9:8087/api',
-        API_SK: 'ws:192.168.20.214:'
+        API_ZC: 'http://192.168.10.17:8087/api',
+        API_SK: 'ws:192.168.10.214:'
       } : {
         API: 'https://eduapi.oytour.com/api',
         API_ZC: 'http://propertyedu.oytour.com/api',

src/api/common/common.js

@@ -115,8 +115,8 @@ export function UploadViittoBlobFile(path, file, callback) {
   uploadLoadding.show({
     message: '正在上传文件,请稍后...'
   })
-  let viewFileUrl = 'http://192.168.20.214:8130';
-  let vtUploadUrl = "http://192.168.20.214:8120/upload/UploadBlob";
+  let viewFileUrl = 'http://192.168.10.214:8130';
+  let vtUploadUrl = "http://192.168.10.214:8120/upload/UploadBlob";
   let locationName = window.location.hostname;
   if (locationName.indexOf('testerp.oytour') !== -1) {
     vtUploadUrl = "http://upload.oytour.com/upload/UploadBlob";

src/components/global/notify.vue

@@ -257,8 +257,7 @@ import {url_jump_zc} from "../../utils/url"
             Time: "1天前"
           },
         ],
-        imgCov: 'http://192.168.20.214:8130/Upload/studentIcon/20201201044129361.png',
-
+        imgCov: 'http://192.168.10.214:8130/Upload/studentIcon/20201201044129361.png',
         //通知请求参数
         noticeMsg: {
           pageIndex: 1,

src/components/studyAbroad/newstudyAbroadprice-form.vue

@@ -457,7 +457,6 @@
      
       //初始化表单
       initObj() {
-          console.log(this.saveObj)
         if (this.saveObj && this.saveObj.Id > 0) {
           queryStudyAbroadInfo({
             Id: this.saveObj.Id,

src/pages/studyAbroad/employment.vue

@@ -12,6 +12,16 @@
             map-options @input="resetSearch">
           </q-select>
         </div>
+        <div class="col-3">
+          <q-select class="q-pb-lg q-pr-lg" filled stack-label clearable option-value="Id" option-label="Name"
+            v-model="msg.ProductType" :options="productList" label="产品类型" :dense="false" emit-value map-options
+            @input="resetSearch" />
+        </div>
+        <div class="col-3">
+          <q-select class="q-pb-lg q-pr-lg" filled stack-label clearable option-value="ID" option-label="Name"
+            v-model="msg.StudyCountryId" :options="CountryList" label="就业国家" :dense="false" emit-value map-options
+            @input="resetSearch" />
+        </div>
       </div>
     </div>
     <div class="page-content">
@@ -31,7 +41,7 @@
               <q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand"
                 :icon="props.row.expand ? 'remove' : 'add'" />
             </q-td>
-            
+
             <q-td key="ProductTypeName" :props="props" style="width:100px;">
               {{props.row.ProductTypeName}}
             </q-td>
@@ -68,8 +78,6 @@
             <q-td key="SellPrice" :props="props">
               {{props.row.SellPrice}}
             </q-td>
-
-
             <q-td key="B2CRatio" :props="props">
               {{props.row.B2CRatio}}%
             </q-td>
@@ -79,7 +87,7 @@
             <q-td key="B2BRebateRatio" :props="props">
               {{props.row.B2BRebateRatio}}{{props.row.CommissionReType==1?'%':''}}
             </q-td>
-             <q-td key="B2BReNewRatio" :props="props">
+            <q-td key="B2BReNewRatio" :props="props">
               {{props.row.B2BReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
             </q-td>
             <q-td key="SchoolRebateRatio" :props="props">
@@ -97,7 +105,7 @@
             <q-td key="InnerRecommendRatio" :props="props">
               {{props.row.InnerRecommendRatio}}{{props.row.CommissionReType==1?'%':''}}
             </q-td>
-   
+
             <q-td key="InnerRecommendReNewRatio" :props="props">
               {{props.row.InnerRecommendReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
             </q-td>
@@ -195,7 +203,7 @@
                 <div class="remark-font">暂无佣金信息</div>
               </div>
             </q-td> -->
-            
+
             <q-td key="Id" style="width:200px;">
               <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
                 @click="EditStudy(props.row)" />
@@ -275,10 +283,14 @@
     queryStudyAbroadPage,
     saveSaleState,
     querySaleStateList,
-    deleteStudyAbroad
+    deleteStudyAbroad,
+    queryStudyAbroadProductType
   } from '../../api/studyabroad/index'
+  import {
+    queryCountryList
+  } from '../../api/common/common'
   import studyAbroadForm from '../../components/studyAbroad/studyAbroad-form'
-    // import studyAbroadpriceForm from '../../components/studyAbroad/studyAbroadprice-form'
+  // import studyAbroadpriceForm from '../../components/studyAbroad/studyAbroadprice-form'
   import studyAbroadpriceForm from '../../components/studyAbroad/newstudyAbroadprice-form'
   import studyproauditinfoForm from '../../components/studyAbroad/studyproauditinfo-form'
   import {
@@ -302,7 +314,9 @@
           rowsPerPage: 10,
           Name: "",
           IsQPrice: 1,
-          SaleState: "" //销售状态
+          SaleState: "", //销售状态
+          ProductType: "", //产品类型
+          StudyCountryId: "", //国家编号
         },
         dataList: [],
         loading: true,
@@ -311,7 +325,7 @@
             label: '备注',
             field: 'Remark',
             align: 'left'
-          }, 
+          },
           {
             name: 'ProductTypeName',
             label: '类型',
@@ -324,7 +338,7 @@
             field: 'Name',
             align: 'left'
           },
-           {
+          {
             name: 'SaleStateName',
             label: '销售状态',
             field: 'SaleStateName',
@@ -355,7 +369,7 @@
           //   align: 'left',
           //   field: row => row.SuggestPrice.toFixed(2)
           // },
-      
+
           {
             name: 'SellPrice',
             label: '实际卖价',
@@ -363,7 +377,7 @@
             align: 'left',
             field: row => row.SellPrice.toFixed(2)
           },
-           {
+          {
             name: "B2CRatio",
             required: true,
             label: "直客优惠",
@@ -475,7 +489,7 @@
           //   align: "left",
           //   field: row => row.PreferentialList
           // },
-        
+
           {
             name: 'Id',
             label: '操作',
@@ -495,6 +509,8 @@
         isShowStudyPrice: false, //是否显示价格设置
         saleDownList: [], //销售状态下拉
         isShowInfo: false, //是否显示审核信息
+        productList: [], //产品类型列表
+        CountryList: [], //国家列表
       }
     },
     computed: mapState({
@@ -530,11 +546,27 @@
     },
     created() {
       this.getSaleStateList();
+      this.getCountryList();
+      this.getProductType();
       if (!this.isHaveViewSupplierAction) {
         this.visibleColumns.splice(this.visibleColumns.length - 1, 1);
       }
     },
     methods: {
+      //获取国家列表
+      getCountryList() {
+        queryCountryList({}).then(res => {
+          if (res.Code == 1) {
+            this.CountryList = res.Data;
+          }
+        });
+      },
+      //获取产品类型列表
+      getProductType() {
+        queryStudyAbroadProductType({}).then(res => {
+          this.productList = res.Data;
+        });
+      },
       //删除留学就业产品
       removeStudy(item, status) {
         let delMsg = {

src/utils/erpindex.js

@@ -80,11 +80,11 @@ export default {
     },
       //域名管理对象
       Vue.prototype.domainManager = function () {
-        // let domainUrl = 'http://192.168.20.24';
+ 
         let domainUrl = 'http://192.168.10.65:8083';
         let viewFileUrl = 'http://192.168.10.214:8120';
         let mallUrl = "http://192.168.10.65:8088";
-        // let vtUploadUrl = "http://192.168.20.214:8120";
+ 
         let vtUploadUrl = "http://upload.oytour.com";
         let vtViewUrl = "http://192.168.10.214:8130";
         let locationName = window.location.hostname;

src/utils/url.js

 export let url_jump_zc = "http://zcedu.oytour.com/"
 
-// export let UploadUrl = "http://192.168.20.214:8120"//上传文件到本地服务器
+ 
 export let UploadUrl = "http://uploadfile.oytour.com"
-// export let ViittoFileUrl="http://192.168.20.214:8120"//文件站点
+ 
 export let ViittoFileUrl = "http://staticfile.oytour.com"