Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
3e63cbf9 by 任超
Options

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

2 parents 861da534 f8f608fc
Inline Side-by-side
Showing 2 changed files with 3 additions and 7 deletions
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <div class="ls-mask-content" ref='contentRef' :style="{'height': contentHeight + 'px'}"> 13 <div class="ls-mask-content" ref='contentRef' :style="{'height': contentHeight + 'px'}">
14 <component :is="editItem" ref='childRef' @loading='loadingFn' :key="key" :formData='formData' /> 14 <component :is="editItem" ref='childRef' @loading='loadingFn' :key="key" :formData='formData' />
15 </div> 15 </div>
16 <div class="ls-mask-footer"> 16 <div class="ls-mask-footer" v-if='btnShow'>
17 <el-button type="primary" @click="onConfirm">{{confirmText}}</el-button> 17 <el-button type="primary" @click="onConfirm">{{confirmText}}</el-button>
18 <el-button @click="onCancel">{{cancelText}}</el-button> 18 <el-button @click="onCancel">{{cancelText}}</el-button>
19 </div> 19 </div>
...@@ -26,6 +26,7 @@ export default { ...@@ -26,6 +26,7 @@ export default {
26 name: 'index', 26 name: 'index',
27 data () { 27 data () {
28 return { 28 return {
29 btnShow:false,
29 title: '提示', 30 title: '提示',
30 cancelText: '取消', 31 cancelText: '取消',
31 confirmText: '确认', 32 confirmText: '确认',
......
...@@ -76,10 +76,7 @@ ...@@ -76,10 +76,7 @@
76 </el-col> 76 </el-col>
77 <el-col :span="8"> 77 <el-col :span="8">
78 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利设定方式：" prop="qlsdfs"> 78 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利设定方式：" prop="qlsdfs">
79 <el-select disabled v-model="ruleForm.qlsdfs" filterable clearable placeholder="请选择权利设定方式"> 79 <el-input disabled v-model="ruleForm.qlsdfsmc"></el-input>
80 <el-option v-for="item in qlsdfsOption" :key="item.value" :label="item.label" :value="item.value">
81 </el-option>
82 </el-select>
83 </el-form-item> 80 </el-form-item>
84 </el-col> 81 </el-col>
85 </el-row> 82 </el-row>
...@@ -189,8 +186,6 @@ export default { ...@@ -189,8 +186,6 @@ export default {
189 data () { 186 data () {
190 return { 187 return {
191 disabled: true, 188 disabled: true,
192 tdytOption: [],
193 qlsdfsOption: [],
194 czrOptions: [], 189 czrOptions: [],
195 ruleForm: { 190 ruleForm: {
196 ywh: "", 191 ywh: "",
......