Merge branch 'dev-question-bank-0916' into release

* dev-question-bank-0916:
  前端题库名称长度校验字段修改
  前端题库名称长度校验修改
  面包屑文案修改
  字段为空处理
  学科简介字符长度限制
  学科配置题数校验
  学科配置收费字段调整
  新建项目增加卡类型级联菜单
  学科配置头图尺寸判断
  项目配置和题库配置未选置空
  学科配置开发与联调

# Conflicts:
#	src/utils/fetch.js

src/utils/fetch.js

@@ -54,9 +54,8 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境qgit
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      // config.headers['token'] = '9098AE0A1DCE4F7B86178A9A8A1BFFCC';
-
-      config.headers['token'] = localStorage.getItem('storageToken')
+      config.headers['token'] = '993044B5B767489286106A32032F076C';
+      // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/views/education/edit-cme.vue

@@ -89,8 +89,10 @@
               </el-form-item>
             </el-col>
           </el-row>
+      <el-row>
+        <el-col :span="13">
           <el-form-item label="项目时间：" required>
-            <el-col :span="5">
+            <el-col :span="10">
               <el-form-item prop="projectBegintime">
                 <el-date-picker
                   v-model="formData.projectBegintime"
@@ -121,6 +123,19 @@
               </el-form-item>
             </el-col>
           </el-form-item>
+          </el-col>
+          <el-col :span="10">
+              <el-form-item label="卡类型：" prop="cardType">
+                <el-cascader
+                  size="small"
+                  :options="optionsPro"
+                  v-model="formData.cardType"
+                  :props="{ value: 'goodsType', label: 'goodsTypeName', children: 'cardsList', expandTrigger: 'hover' }"
+                  @change="handleProChange"
+                  placeholder="请选择卡类型"></el-cascader>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="项目简介：" prop="projectIntro">
             <el-col :span="13">
               <el-input
@@ -1392,6 +1407,7 @@ export default {
         cmeType: 1,
         cmeCredit: '',
         examBtnUrl: '',
+        cardType: "",
       },
       checkCredit: 1,
       pickerOptions0: {
@@ -1784,8 +1800,12 @@ export default {
         ],
         examBtnUrl: [
           { required: true, validator: checkExamBtnUrl, trigger: "change" }
-        ]
-      }
+        ],
+        cardType: [
+          { required: true, message: "请选择卡类型", trigger: "change" }
+        ],
+      },
+      optionsPro: [],
     };
   },
   computed: {
@@ -1814,12 +1834,34 @@ export default {
     if (vm.idType == 2) {
       this.activeName = "second";
     }
+
+    this.getGoodsTypeList();
   },
   // 挂载到Dom完成时
   mounted: function() {
     commonUtil.resizeHeight();
   },
   methods: {
+    //获取商品分类
+    getGoodsTypeList() {
+      openLoading(this);
+      this.GET("trade/goods/manager/queryGoodsType").then(res => {
+        closeLoading(this);
+        if (res.code == "000000") {
+          this.optionsPro = this.getProSelect(res.data);
+        }
+      });
+    },
+    getProSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        data[i].cardsList.map(item => {
+          this.$set(item, "goodsType", item.cardType);
+          this.$set(item, "goodsTypeName", item.cardTypeName);
+          this.$set(item, "leaf", true);
+        });
+      }
+      return data;
+    },
     focusFun(ev, parm, index) {
       if (index != undefined) {
         if (parseInt(ev) < 0 || !this.checkIntFun(ev)) {
@@ -2120,6 +2162,8 @@ export default {
         cmeType: this.formData.cmeType,
         cmeCredit: this.formData.cmeCredit,
         examBtnUrl: this.formData.examBtnUrl,
+        goodsType: this.formData.cardType[0],
+        cardType: this.formData.cardType[1],
       };
       let attachmentModel = [
         {

src/views/education/edit-professional-exam.vue

@@ -126,14 +126,21 @@
             </el-col>
             <el-col :span="10">
               <el-form-item label="卡类型：" prop="cardType">
-                <el-select size="small" v-model="formData.cardType" placeholder="请选择卡类型">
+                <!-- <el-select size="small" v-model="formData.cardType" placeholder="请选择卡类型">
                   <el-option
                     v-for="item in cardTypeList"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
                   ></el-option>
-                </el-select>
+                </el-select> -->
+                <el-cascader
+                  size="small"
+                  :options="optionsPro"
+                  v-model="formData.cardType"
+                  :props="{ value: 'goodsType', label: 'goodsTypeName', children: 'cardsList', expandTrigger: 'hover' }"
+                  @change="handleProChange"
+                  placeholder="请选择卡类型"></el-cascader>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1810,7 +1817,8 @@ export default {
         examBtnUrl: [
           { required: true, validator: checkExamBtnUrl, trigger: "change" }
         ]
-      }
+      },
+      optionsPro: [],
     };
   },
   computed: {
@@ -1839,12 +1847,41 @@ export default {
     if (vm.idType == 2) {
       this.activeName = "second";
     }
+
+    this.getGoodsTypeList();
   },
   // 挂载到Dom完成时
   mounted: function() {
     commonUtil.resizeHeight();
   },
   methods: {
+    //获取商品分类
+    getGoodsTypeList() {
+      openLoading(this);
+      this.GET("trade/goods/manager/queryGoodsType").then(res => {
+        closeLoading(this);
+        if (res.code == "000000") {
+          // this.copyLockList = deepCopy(res.data);
+          // let data = res.data;
+          this.optionsPro = this.getProSelect(res.data);
+          
+          // this.optionsPro = res.data;
+        }
+      });
+    },
+    getProSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        data[i].cardsList.map(item => {
+          this.$set(item, "goodsType", item.cardType);
+          this.$set(item, "goodsTypeName", item.cardTypeName);
+          this.$set(item, "leaf", true);
+        });
+      }
+      return data;
+    },
+    handleProChange(value) {
+      console.log("handleProChange() : value = " + value);
+    },
     focusFun(ev, parm, index) {
       if (index != undefined) {
         if (parseInt(ev) < 0 || !this.checkIntFun(ev)) {
@@ -2139,7 +2176,9 @@ export default {
         projectType: this.projectType,
         projectNo: this.formData.projectNo,
         projectLevel: this.formData.projectLevel,
-        cardType: this.formData.cardType,
+        // cardType: this.formData.cardType,
+        goodsType: this.formData.cardType[0],
+        cardType: this.formData.cardType[1],
         projectLeaderId: this.formData.projectLeaderId,
         projectSubject: this.formData.projectSubject,
         mustKnow: this.formData.mustKnow || '',