Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

pages/resourceManagement/productionResources/set.vue

@@ -39,7 +39,8 @@
       </Col>
       <Col :span="12">
         <FormItem label="能力值" prop="capabilityValue">
-          <Input v-model="formItem.capabilityValue" placeholder="请输入能力值"></Input>
+          <!-- <Input v-model="formItem.capabilityValue" placeholder="请输入能力值"></Input> -->
+          <InputNumber v-model="formItem.capabilityValue" :max="100" :min="1"></InputNumber>
         </FormItem>
       </Col>
     </Row>
@@ -61,7 +62,7 @@ export default {
       formItem: {
         equip_name: "",
         equip_id: "",
-        isimportant: 1,
+        isimportant: "1",
         capabilityValue: ""
       },
       formItem1: {
@@ -113,11 +114,16 @@ export default {
         this.formItem.equip_name = r.result.title;
         this.formItem.equip_id = r.result.code;
         this.formItem.capabilityValue = r.result.capabilityValue;
-        this.formItem.isimportant = r.result.isimportant || "1";
+        
         this.formItem1.calendarwork_pk = r.result.calKey;
         this.formItem2.calendarovertime_pk = r.result.holidayKey;
         this.formItem1.equip_pk = r.result.id;
         this.formItem2.equip_pk = r.result.id;
+        if(r.result.isimportant){
+          this.formItem.isimportant = r.result.isimportant+"";
+        }else{
+          this.formItem.isimportant = "1";
+        }
       });
     },
     handleSubmit() {