Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -13,7 +13,7 @@
         <div class="ls-mask-content" ref='contentRef' :style="{'height': contentHeight + 'px'}">
           <component :is="editItem" ref='childRef' @loading='loadingFn' :key="key" :formData='formData' />
         </div>
-        <div class="ls-mask-footer">
+        <div class="ls-mask-footer" v-if='btnShow'>
           <el-button type="primary" @click="onConfirm">{{confirmText}}</el-button>
           <el-button @click="onCancel">{{cancelText}}</el-button>
         </div>
@@ -26,6 +26,7 @@ export default {
   name: 'index',
   data () {
     return {
+      btnShow:false,
       title: '提示',
       cancelText: '取消',
       confirmText: '确认',

@@ -76,10 +76,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="权利设定方式：" prop="qlsdfs"> 
-              <el-select disabled v-model="ruleForm.qlsdfs" filterable clearable placeholder="请选择权利设定方式">
-                <el-option v-for="item in qlsdfsOption" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
+              <el-input disabled v-model="ruleForm.qlsdfsmc"></el-input>            
             </el-form-item>
           </el-col>
         </el-row>
@@ -189,8 +186,6 @@ export default {
   data () {
     return {
       disabled: true,
-      tdytOption: [],
-      qlsdfsOption: [],
       czrOptions: [],
       ruleForm: {
         ywh: "",