Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

pages/aps/aps/components/edit.vue

@@ -13,17 +13,33 @@
       </Col>
       <Col :span="12">
         <FormItem :label="l('sHOPID')" prop="sHOPID">
-          <Input></Input>
+           <!-- v-model="orderSearchForm.orderCat" -->
+          <Select >
+              <Option value="" class="option-text">请选择</Option>
+              <Option v-for="item in orderCatList"   :value="item" :key="item">{{ item }}</Option>
+          </Select>
         </FormItem>
       </Col>
       <Col :span="12">
         <FormItem :label="l('eQUIPID')" prop="eQUIPID">
-          <Input></Input>
+          <Select >
+              <Option value="" class="option-text">请选择</Option>
+              <Option v-for="item in orderCatList"   :value="item" :key="item">{{ item }}</Option>
+          </Select>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem label="关重资源名称" prop="rUNTIME">
+          <Select >
+              <Option value="" class="option-text">请选择</Option>
+              <Option v-for="item in orderCatList"   :value="item" :key="item">{{ item }}</Option>
+          </Select>
         </FormItem>
       </Col>
       <Col :span="12">
         <FormItem :label="l('rUNTIME')" prop="rUNTIME">
-          <Input></Input>
+           <!-- v-model="value1" -->
+          <InputNumber :max="10" :min="1"></InputNumber>
         </FormItem>
       </Col>
     </Row>
@@ -41,6 +57,9 @@ export default {
     return {
       disabled: false,
       entity: {},
+      orderCatList:[
+
+      ],
       rules: {
         name: [{ required: true, message: '必填', trigger: 'blur' }]
       }