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

pages/resourceManagement/deviceManagementCP/components/newEquipment.vue

 <template>
   <div class="new-equipment">
-    <Modal v-model="modalShow" title="新增设备" width="1000" :mask-closable="false">
+    <Modal v-model="modalShow" :title="title" width="1000" :mask-closable="false">
       <Form :model="formItem" :label-width="100" style="margin:10px;" :rules="ruleValidate">
         <Row :gutter="16">
           <Col span="11">
@@ -55,39 +55,19 @@
               <inputFile ref="refqcFile" v-model="imgName" :parms="qcfileparms" files />
             </FormItem>
           </Col>
-          <!-- <Col span="11" offset="1">
-            <FormItem label="是否关重" prop="isimportant">
-              <Select v-model="isimportant">
-                <Option :value="1">是</Option>
-                <Option :value="2">否</Option>
-              </Select>
+          <Col :span="12">
+            <FormItem label="属性">
+              <Checkbox v-model="property">排产资源</Checkbox>
             </FormItem>
-          </Col> -->
+          </Col>
         </Row>
         <Row :gutter="16">
-          <!-- <Col span="11">
-            <FormItem label="能力系数">
-              <InputNumber
-                :min="0"
-                v-model="formItem.capability_value"
-                size="large"
-                style="width:240px"
-              ></InputNumber>
-            </FormItem>
-          </Col> -->
-          <Col span="11" offset="1">
+          <Col span="12">
             <FormItem label="位置" prop="location">
               <Input v-model="formItem.location" placeholder="请输入位置"></Input>
             </FormItem>
           </Col>
         </Row>
-        <Row :gutter="16">
-          <Col :span="12">
-            <FormItem label="属性">
-              <Checkbox v-model="property">排产资源</Checkbox>
-            </FormItem>
-          </Col>
-        </Row>
       </Form>
       <div slot="footer">
         <!-- class="footers" -->
@@ -133,7 +113,7 @@ export default {
         shop_id: "",
         shop_name: "",
         // isimportant: 2,
-        location: "",
+        location: ""
         // capability_value: 1
       },
       property: true,