设备位号功能

src/views/sb/info/SbInfo.vue

@@ -419,12 +419,12 @@ export default {
           width: 120,
           checked: true
         },
-        {
+        /*{
           title: '大小尺寸',
           dataIndex: 'zz',
           width: 120,
           checked: true
-        },
+        },*/
 
         {
           title: '出厂编号',
@@ -443,7 +443,7 @@ export default {
           }
         }, */
 
-        {
+      /*  {
           title: '是否子设备',
           dataIndex: 'isChild',
           width: 120,
@@ -451,7 +451,7 @@ export default {
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.isChildMap, text)
           }
-        },
+        },*/
         {
           title: '资产编号',
           dataIndex: 'financingNo',

src/views/sb/info/modules/BaseForm.vue

@@ -28,6 +28,38 @@
               v-decorator="['no', {rules: [{required: true, message: '不能为空'}]}]" />
           </a-form-item>
         </a-col>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="父设备"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-input
+                disabled
+                style="width: 60%"
+                v-decorator="['parentSbName']"/>
+              <a-button type="primary" style="width: 20%" @click="handleSbSelect">选择</a-button>
+              <a-button type="default" style="width: 20%" @click="clearParent">清空</a-button>
+            </a-form-item>
+          </a-col>
+<!--          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="是否子设备"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-select @change="childChange" v-decorator="['isChild', { rules: [{required: true, message: '是否子设备不能为空'}]}]" placeholder="请选择">
+                <a-select-option
+                  v-for="(label,value) in isChildMap"
+                  :key="value"
+                  :label="label"
+                  :value="parseInt(value)">{{ label }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>-->
+        </a-row>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="设备位号"
@@ -37,7 +69,7 @@
             <a-input
               v-decorator="['positionNo', {rules: [{required: false, message: '不能为空'}]}]" />
           </a-form-item>
-        </a-col>-->
+        </a-col>
       </a-row>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
@@ -168,7 +200,7 @@
         </a-col>
       </a-row>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-        <a-col :lg="12" :md="24" :sm="24">
+<!--        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="大小/尺寸"
             :labelCol="BaseTool.Constant.labelCol"
@@ -177,7 +209,7 @@
             <a-input
               v-decorator="['zz']" />
           </a-form-item>
-        </a-col>
+        </a-col>-->
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="出厂编号"
@@ -191,16 +223,7 @@
       </a-row>
 
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="检定单位"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['dph', {rules: [{required: true, message: '检定单位不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
+
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="生产商"
@@ -223,39 +246,6 @@
           </a-form-item>
         </a-col>
       </a-row>
-      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="父设备"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              disabled
-              style="width: 60%"
-              v-decorator="['parentSbName']"/>
-            <a-button type="primary" style="width: 20%" @click="handleSbSelect">选择</a-button>
-            <a-button type="default" style="width: 20%" @click="clearParent">清空</a-button>
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="是否子设备"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select @change="childChange" v-decorator="['isChild', { rules: [{required: true, message: '是否子设备不能为空'}]}]" placeholder="请选择">
-              <a-select-option
-                v-for="(label,value) in isChildMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
@@ -817,6 +807,16 @@
           </a-col>
         </a-row>
         <a-row>
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="检定单位"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-input
+                v-decorator="['dph', {rules: [{required: true, message: '检定单位不能为空'}]}]" />
+            </a-form-item>
+          </a-col>
           <a-col :lg="12" :md="24" :sm="24">
             <a-form-item
               label="是否需要检定"