Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/lang/en/business/study/studyFormPre.js

@@ -1,6 +1,7 @@
 export default {
  jcsz:'Setup',
  bdsj:'Preset Design',
+ xzbd:'Create',
  zc:'暂存',
  next:'Next',
  save:'Save',

src/lang/zh/business/study/studyFormPre.js

@@ -1,6 +1,7 @@
 export default {
  jcsz:'基础设置',
  bdsj:'表单设计',
+ xzbd:'新增表单',
  zc:'暂存',
  next:'下一步',
  save:'保存',

src/views/business/comps/select/SelectTemplate.vue

@@ -25,6 +25,10 @@ export default {
       type: Boolean,
       default: false
     },
+    needPre: {
+      type: Number,
+      default: 0
+    },
   },
   watch: {
     value: {
@@ -53,7 +57,7 @@ export default {
   methods: {
     showSelectTemplate(){
       if(!this.readOnly){
-        this.$refs.selectTemplateDialog.show()
+        this.$refs.selectTemplateDialog.show({needPre:this.needPre})
       }
     },
     handleChange(obj) {

src/views/business/comps/select/SelectTemplateDialog.vue

@@ -72,7 +72,8 @@ export default {
     handleRadioClick(row) {
       this.selectedId = row.id
     },
-    show() {
+    show(val) {
+      this.searchForm=_.merge({}, this.searchForm, val)
       this.selectedId=null
       this.search()
     },
@@ -102,7 +103,8 @@ export default {
     },
     handleSelect() {
       let that = this
-      let _index = _.findIndex(this.list, function (item) { return item.id = that.selectedId })
+      let _index = _.findIndex(this.list, function (item) { return item.id == that.selectedId })
+      debugger
       this.$emit('callback', this.list[_index]);
       this.open = false
     }

src/views/business/study/comp/jhbd/Bj.vue

@@ -63,7 +63,7 @@ G