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

src/components/course/shift-form.vue

@@ -210,7 +210,6 @@ export default {
                     }
                 })
             })
-            console.log(this.colorlist)
         },
         //新增修改班次
         Editshift(obj) {
@@ -225,7 +224,6 @@ export default {
                         break
                     }
                 }
-                console.log(Color)
                 this.shiftOption = {
                     Id:0,
                     Name:'',

src/components/studyAbroad/studyAbroad-form.vue

@@ -9,9 +9,9 @@
         <div class="row wrap">
           <q-input filled stack-label maxlength="300" :dense="false" v-model="objOption.Name" ref="Name"
             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="SupplierId" :options="supplierList" label="供应商" :dense="false" :rules="[val => !!val || '请选择供应商']"
-            class="col-6 q-pb-lg" emit-value map-options />
+          <q-select filled stack-label option-value="Id" @filter="filterSupper" use-input option-label="Name"
+            v-model="objOption.SupplierId" ref="SupplierId" :options="supplierList" label="供应商" :dense="false"
+            :rules="[val => !!val || '请选择供应商']" class="col-6 q-pb-lg" emit-value map-options />
         </div>
         <div class="row wrap">
           <div class="col-6">
@@ -22,16 +22,16 @@
               style="margin-left:10px;color:#2961FE;text-decoration:none;" :href="objOption.SupplierContract">查看合同</a>
           </div>
           <div class="col-6" v-if="Type==1">
-            <q-select filled stack-label option-value="ID" @input="getCountry(objOption.StudyCountryId)" option-label="Name" v-model="objOption.StudyCountryId"
-              ref="StudyCountryId" :options="CountryList" label="留学国家" :dense="false" class="col-6 q-pb-lg" emit-value
-              map-options />
+            <q-select filled stack-label option-value="ID" @input="getCountry()" clearable option-label="Name"
+              v-model="objOption.StudyCountryId" ref="StudyCountryId" :options="CountryList" label="留学国家" :dense="false"
+              class="col-6 q-pb-lg" emit-value map-options />
           </div>
         </div>
         <div class="row wrap" v-if="Type==1">
           <div class="col-6">
-            <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.ProductType"
-              ref="ProductType" :options="productList" label="产品类型" :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value
-              map-options />
+            <q-select filled stack-label option-value="Id" option-label="Name" clearable v-model="objOption.ProductType"
+              ref="ProductType" :options="productList" label="产品类型" :dense="false" class="col-6 q-pb-lg q-pr-lg"
+              emit-value map-options />
           </div>
           <div class="col-6">
 
@@ -115,11 +115,12 @@
           ImgCover: '', //封面图
           ProductType: '', //产品类型
           StudyFeature: "", //课程特色
-          StudyCountryId:"",//留学国家
+          StudyCountryId: "", //留学国家
         },
         optionTitle: "",
         saveLoading: false,
         supplierList: [], //供应商下拉数据
+        allSupplierList: [],
         uploadMultple: true,
         productList: [], //产品类型
         fileObj: {
@@ -127,11 +128,11 @@
           FileUrl: ''
         },
         SchoolList: [], //校区列表
-        CountryList:[],//国家列表
-        TypeMsg:{
-          Name:"",
-          Type:1,
-          CountryId:0
+        CountryList: [], //国家列表
+        TypeMsg: {
+          Name: "",
+          Type: 1,
+          CountryId: 0
         }
       }
     },
@@ -152,8 +153,8 @@
     }),
     created() {
       this.getSchool();
-      // this.getProductList();
       this.getCountryList()
+      this.getProductList();
     },
     mounted() {
       this.getStudyAbroadList();
@@ -164,7 +165,7 @@
       getCountryList() {
         queryCountryList({}).then(res => {
           if (res.Code == 1) {
-            this.CountryList=res.Data;
+            this.CountryList = res.Data;
           }
         });
       },
@@ -177,13 +178,13 @@
         this.objOption.Remark = obj;
       },
       //选择国家
-      getCountry(CountryId){
+      getCountry() {
         this.objOption.ProductType = '';
-        this.getProductList(CountryId);
+        this.getProductList();
       },
       //获取产品类型列表
-      getProductList(CountryId) {
-        this.TypeMsg.CountryId = CountryId;
+      getProductList() {
+        this.TypeMsg.CountryId = this.objOption.StudyCountryId;
         GetStudyabroadTypeList(this.TypeMsg).then(res => {
           if (res.Code == 1) {
             this.productList = res.Data
@@ -229,8 +230,8 @@
                 this.objOption.ImgCover = tempObj.ImgCover;
                 this.objOption.ProductType = tempObj.ProductType;
                 this.objOption.StudyFeature = tempObj.StudyFeature;
-                this.objOption.StudyCountryId=tempObj.StudyCountryId;
-                if(this.objOption.StudyCountryId){
+                this.objOption.StudyCountryId = tempObj.StudyCountryId;
+                if (this.objOption.StudyCountryId) {
                   this.getProductList(this.objOption.StudyCountryId);
                 }
               }
@@ -246,7 +247,7 @@
           this.objOption.School_Id = -1;
           this.objOption.ProductType = '';
           this.objOption.StudyFeature = "";
-          this.objOption.StudyCountryId="";
+          this.objOption.StudyCountryId = "";
         }
       },
       //关闭弹窗
@@ -287,6 +288,7 @@
         querySupplierList({}).then(res => {
           if (res.Code == 1) {
             this.supplierList = res.Data;
+            this.allSupplierList = res.Data;
             let obj = {
               Id: 0,
               Name: '请选择'
@@ -295,6 +297,13 @@
           }
         })
       },
+      filterSupper(val, update) {
+        update(() => {
+          this.supplierList = this.allSupplierList.filter(
+            v => v.Name.indexOf(val) > -1
+          );
+        });
+      },
       //上传附件
       UploadAttachment(files) {
         UploadSelfFile('Attachment', files.file, res => {

src/components/studyAbroad/studyproauditinfo-form.vue

@@ -329,7 +329,7 @@
               </span>
             </div>
           </div>
-          <div class="row" style="margin-bottom:10px;">
+          <div class="row" style="margin-bottom:100px;">
             <div class="col-6">
               <span class="auditName">{{saveObj.ManagerName}}</span>
               <span class="studyPass" v-if="saveObj.ManagerStatus==0" style="background-color:#1273bc;">待审核</span>

src/components/system/stuReceiveChannel-form.vue

@@ -64,11 +64,18 @@
         if (this.row?.Id??0 > 0) {
           this.msg.Id = this.row.Id;
           this.msg.Name = this.row.Name;
+          if(this.row.StaticType){
+            let SaArray = this.row.StaticType.split(',');
+            SaArray.forEach(item => {  
+              this.msg.StaticTypeList.push(+item);  
+            });  
+          }
           this.optionTitle = "修改收客渠道"
         } else {
           this.optionTitle = "新增收客渠道"
           this.msg.Id = 0;
           this.msg.Name = '';
+          this.msg.StaticTypeList = [];
         }
       },
       //关闭弹窗

src/components/system/type-form.vue

@@ -123,7 +123,7 @@
         this.typeMsg.CountryId = CountryId;
         GetStudyabroadTypeList(this.typeMsg).then(res => {
           if (res.Code == 1) {
-            console.log(res);
+
           }
         });
       },

src/pages/financial/financalDocument/addFinancialDocuments.vue

@@ -2102,7 +2102,6 @@
       }
       if(this.$route.query.iscopy){
         this.iscopy = this.$route.query.iscopy//复制的值
-        console.log(this.iscopy)
       }
       let userInfo = this.getLocalStorage();
       this.department = userInfo.DeptName;

src/pages/financial/financalDocument/addReceivablesDocuments.vue

@@ -1870,7 +1870,6 @@
     mounted() {
       if(this.$route.query.iscopy){
         this.iscopy = this.$route.query.iscopy//复制的值
-        console.log(this.iscopy)
       }
       let userInfo = this.getLocalStorage();
       this.department = userInfo.DeptName;

src/pages/studyAbroad/studyabroad.vue

@@ -3,8 +3,8 @@
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
-          <q-input @input="resetSearch" clearable filled v-model="msg.Name" label="项目名称"
-            @clear="resetSearch" maxlength="20" />
+          <q-input @input="resetSearch" clearable filled v-model="msg.Name" label="项目名称" @clear="resetSearch"
+            maxlength="20" />
         </div>
         <div class="col-3">
           <q-select class="q-pb-lg q-pr-lg" filled stack-label clearable option-value="Id" option-label="Name"
@@ -58,7 +58,7 @@
               </template>
             </q-td>
             <q-td key="SupplierName" :props="props">
-              <div>{{props.row.SupplierName}}</div>
+              <div v-if="isHaveViewSupplierAction">{{props.row.SupplierName}}</div>
               <div>
                 <a :href="props.row.SupplierContract" style="color:#2961FE;text-decoration:none;"
                   v-if="props.row.SupplierContract && isHaveViewContractAction" target="_blank">
@@ -370,7 +370,7 @@
           'Remark', 'Name', 'StudyCountryName', 'SchoolName', 'SuggestPrice', 'SellPrice', "PreferentialList",
           "PreferentialListSellCommission",
           "PreferentialListB2BCommission",
-          "EducationCommission", 'SaleStateName', 'Id', 'SupplierName', 'ProductTypeName'
+          "EducationCommission", 'SaleStateName', 'Id', 'ProductTypeName', 'SupplierName'
         ], //可见列
         PageCount: 0,
         isShowStudy: false, //是否显示留学弹窗
@@ -405,6 +405,7 @@
               return x;
             }
           });
+ 
           return action && action.FunctionCode;
         }
         return false;
@@ -412,14 +413,14 @@
     }),
     mounted() {
       this.getList();
+      if (!this.isHaveViewSupplierAction) {
+        //this.visibleColumns.splice(this.visibleColumns.length - 1, 1);
+      }
     },
     created() {
       this.getSaleStateList();
       this.getCountryList();
       this.getProductType();
-      if (!this.isHaveViewSupplierAction) {
-        this.visibleColumns.splice(this.visibleColumns.length - 1, 1);
-      }
     },
     methods: {
       //获取国家列表