Browse Source

Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

5 years ago
parent
commit
9cb004a9a4
1 changed files with 12 additions and 3 deletions
  1. 12 3
      ys_vue/src/views/base/allocation.vue

+ 12 - 3
ys_vue/src/views/base/allocation.vue

@@ -141,7 +141,7 @@
                         v-model="newAllocation.belongCompanyId"
                         filterable
                         clearable
-                        placeholder="请选择"
+                        placeholder="请选择所属公司"
                         style="width: 202px"
                     >
                         <el-option
@@ -157,7 +157,7 @@
                         v-model.number="newAllocation.useLife"
                         type="age"
                         autocomplete="off"
-                        placeholder="请填写"
+                        placeholder="请填写使用年限"
                     ></el-input>
                 </el-form-item>
                 <el-form-item label="代理商" prop="agent">
@@ -176,7 +176,16 @@
 
         <!-- 启用弹窗 -->
         <el-dialog title="启用" :visible.sync="operateDialogVisible" width="100" center>
-            <span>确定启用设备吗</span>
+            <el-form
+                label-width="100px"
+                :rules="formRules"
+                :inline="true"
+                class="demo-form-inline"
+            >
+                <el-form-item label="某个参数">
+                    <el-input autocomplete="off" placeholder="填了也不会发生什么"></el-input>
+                </el-form-item>
+            </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="operateDialogVisible = false">取消</el-button>
                 <el-button type="primary" @click="enable">启用</el-button>