Merge branch 'master' of http://git.cc-lotus.info/Free-cysci/common

dict/index.js

@@ -16,3 +16,10 @@ export const progressType = [
   { label: '进行中', value: '1' },
   { label: '已结束', value: '2' },
 ];
+
+export const policyType = ['研发补贴', '奖励兑现'];
+export const policyStatus = [
+  { label: '待处理', value: '0' },
+  { label: '已通过', value: '1' },
+  { label: '已拒绝', value: '2' },
+];

src/components/frame/form.vue

@@ -21,10 +21,6 @@
           <el-form-item v-if="display(item)" :key="'form-field-' + index" :label="getField('label', item)" :prop="item.model" :required="item.required">
             <template v-if="!item.custom">
               <template v-if="item.type !== 'text'">
-                <template v-if="item.type === 'editor'">
-                  <wang-editor v-model="form[item.model]" :url="item.url"></wang-editor>
-                  <!-- <el-input clearable v-model="form[item.model]" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }"></el-input> -->
-                </template>
                 <el-tooltip class="item" effect="dark" :content="item.tip" placement="top-start" :disabled="!item.tip">
                   <template v-if="item.type === `date` || item.type === `datetime`">
                     <el-date-picker
@@ -69,6 +65,9 @@
                   <template v-else-if="item.type === 'textarea'">
                     <el-input clearable v-model="form[item.model]" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }"></el-input>
                   </template>
+                  <template v-else-if="item.type === 'editor'">
+                    <wang-editor v-model="form[item.model]" :url="item.url" :value="form[item.model]"></wang-editor>
+                  </template>
                   <template v-else>
                     <el-input
                       clearable

src/components/frame/wang-editor.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
     <div ref="editor" style="text-align:left"></div>
-    <el-button type="" @click="toClick">test</el-button>
   </div>
 </template>
 <script>
@@ -78,8 +77,12 @@ export default {
     getContent: function() {
       return this.editorContent;
     },
-    toClick() {
-      console.log(this.editor);
+  },
+  watch: {
+    value: {
+      handler(val) {
+        this.editor.txt.html(val);
+      },
     },
   },
 };