xiongchao 3 年之前
父節點
當前提交
f4eb2edc48

+ 12 - 6
src/views/sb/info/MeasureSbInfo.vue

@@ -226,14 +226,14 @@ export default {
           }
         },
         {
-          title: '设备名称',
-          checked: true,
-          width: 200,
-          dataIndex: 'name'
+          title: '设备新号',
+          dataIndex: 'no',
+          width: 120,
+          checked: true
         },
         {
-          title: '设备号',
-          dataIndex: 'no',
+          title: '设备号',
+          dataIndex: 'zbh',
           width: 120,
           checked: true
         },
@@ -243,6 +243,12 @@ export default {
           width: 150,
           checked: true
         },
+        {
+          title: '设备名称',
+          checked: true,
+          width: 200,
+          dataIndex: 'name'
+        },
         {
           title: '设备类型',
           checked: true,

+ 3 - 3
src/views/sb/info/ParentSbInfo.vue

@@ -202,14 +202,14 @@ export default {
           dataIndex: 'name'
         },
         {
-          title: '设备号',
+          title: '设备号',
           dataIndex: 'no',
           width: 100,
           checked: true
         },
         {
-          title: '设备号',
-          dataIndex: 'no',
+          title: '设备号',
+          dataIndex: 'zbh',
           width: 120,
           checked: true
         },

+ 6 - 0
src/views/sb/info/SbInfo.vue

@@ -249,6 +249,12 @@ export default {
           width: 120,
           checked: true
         },
+        {
+          title: '设备旧号',
+          dataIndex: 'zbh',
+          width: 120,
+          checked: true
+        },
         {
           title: '设备类型',
           checked: true,

+ 1 - 1
src/views/sb/info/modules/BaseForm.vue

@@ -256,7 +256,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="isShow" v-decorator="['isChild', {initialValue:0, rules: [{required: true, message: '是否显示不能为空'}]}]" placeholder="请选择">
+            <a-select @change="isShow=!isShow" v-decorator="['isChild', {initialValue:0, rules: [{required: true, message: '是否显示不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in isShowMap"
                 :key="value"