Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/CommodityMan/goodsListEdit.vue

@@ -1065,6 +1065,8 @@
           <el-radio @change="YfSelect1" style="padding-bottom:10px" class="yfradio" :label="1">
             教育表单
           </el-radio>
+          <el-radio @change="YfSelect1" v-for="(option, key) in customFormList" :key="key" :label="option.Id" class="yfradio" style="padding-bottom:10px">{{ option.FormName }}</el-radio>
+
         </el-radio-group>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -1126,6 +1128,7 @@
       return {
         input:'',
         ComTreeList: [],
+        customFormList:[],
         thisType: 0,
         tableData: [],
         SpecificationList: [],
@@ -1357,12 +1360,14 @@
     },
     mounted() {
       this.$refs.ue.loadUe();
+      this.getCustomFormList();
       if (this.$route.query.GoodsId) {
         this.GoodsId = this.$route.query.GoodsId;
         this.getData();
       } else {
         this.getTree();
       }
+     
       if (this.currentUserInfo.IsOpenSchool == 0) {
         this.isShowPlat = false
       } else {
@@ -1470,6 +1475,25 @@
           }
         });
       },
+
+      getCustomFormList() {
+        let msg = {
+          FormType:0,
+          FormName:"",
+        };
+        this.apipost("/api/CustomForm/GetCustomFormList", msg, res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+           this.customFormList=res.data.data;
+           
+          console.log("getCustomFormList", this.customFormList);
+          }
+          // var newList= { Id:'1', FormName:'教育表单'}
+          // this.customFormList.unshift(newList)
+          // var newList= { Id:'0', FormName:'默认商城'}
+          // this.customFormList.unshift(newList)
+        });
+      },
       TbaleSelectionChange3(val) {
         this.xxList = val;
       },
@@ -2008,13 +2032,21 @@
         this.AreaList = data;
       },
       YfSelect1(val) {
+        console.log("formId",val);
         this.addMsg.FormsId = val;
         if (this.addMsg.FormsId == 0) {
           this.addMsg.FormsName = '默认商城'
         } else if (this.addMsg.FormsId == 1) {
           this.addMsg.FormsName = '教育表单'
-
         }
+        else if (this.addMsg.FormsId > 1) {
+                this.customFormList.forEach(item => {
+                if( this.addMsg.FormsId==item.Id){
+                  this.addMsg.FormsName = item.FormName
+                }
+              });
+              
+              }
         this.$forceUpdate()
 
       },
@@ -2201,6 +2233,15 @@
                 this.addMsg.FormsName = '默认商城'
               } else if (this.addMsg.FormsId == 1) {
                 this.addMsg.FormsName = '教育表单'
+              }
+              else if (this.addMsg.FormsId > 1) {
+                this.customFormList.forEach(item => {
+                  console.log("item",item);
+                if(this.val1==item.Id){
+                  this.addMsg.FormsName = item.FormName
+                }
+              });
+              
               }
               this.memberList2 = this.addMsg.MemberPriceTreeList;
               this.thisType = 1;