完善

src/views/check/checkstandard/modules/BaseForm.vue

@@ -459,6 +459,9 @@ export default {
   methods: {
     base (record, sbId) {
       this.visible = true
+      queryUser({}).then(res => {
+        this.userList = res.data
+      })
       // 如果是空标识添加
       if (this.BaseTool.Object.isBlank(record)) {
         this.modalTitle = '添加'
@@ -478,9 +481,7 @@ export default {
         this.modalTitle = '复制'
       }
       const { form: { setFieldsValue } } = this
-      queryUser({}).then(res => {
-        this.userList = res.data
-      })
+
       // 日期处理
       this.$nextTick(() => {
         setFieldsValue(Object.assign(pick(record, [

src/views/check/checkstandard/modules/DetailSbCheck.vue

@@ -9,8 +9,9 @@
     </a-row>
     <title-divider title="型号信息" width="90px"></title-divider>
     <detail-list title="" :col="3">
+      <detail-list-item term="设备新号">{{ model.no }}</detail-list-item>
+      <detail-list-item term="设备旧号">{{ model.zbh }}</detail-list-item>
       <detail-list-item term="型号">{{ model.model }}</detail-list-item>
-      <detail-list-item term="名称型号">{{ model.nameModel }}</detail-list-item>
       <detail-list-item term="设备名称">{{ model.name }}</detail-list-item>
     </detail-list>
     <title-divider title="保养信息" width="90px"></title-divider>
@@ -80,6 +81,7 @@ export default {
         'id': null,
         'modelId': null,
         'no': null,
+        'zbh': null,
         'name': null,
         'nameModel': null,
         'unit': null,

src/views/sb/info/SbInfo.vue

@@ -212,14 +212,14 @@ export default {
             return record.typeName
           }
         },
-        {
+     /*   {
           title: '自定义类型',
           checked: true,
           dataIndex: 'useType',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.useTypeMap, text)
           }
-        },
+        },*/
         {
           title: '设备等级',
           checked: true,
@@ -265,7 +265,7 @@ export default {
           key: 'action',
           checked: true,
           align: 'center',
-          // fixed: 'right',
+          width: 200,
           scopedSlots: { customRender: 'action' }
         }
       ],

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

@@ -9,7 +9,7 @@
       </a-col>
     </a-row>
 
-    <title-divider title="型号信息" width="90px"></title-divider>
+    <title-divider title="基本信息" width="90px"></title-divider>
     <a-form :form="form">
       <a-form-item v-show="false" >
         <a-input v-decorator="['id']" type="hidden"/>
@@ -19,37 +19,22 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="设备类型"
+            label="设备（新号）"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-tree-select
-              style="width: 100%"
-              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-              :treeData="sbTypeTreeData"
-              :treeNodeFilterProp="'title'"
-              :showSearch="true"
-              v-decorator="['typeId', {rules: [{required: true, message: '设备类型不能为空'}]}]"
-              placeholder="请选择"
-            >
-            </a-tree-select>
+            <a-input
+              v-decorator="['no', {rules: [{required: true, message: '不能为空'}]}]" />
           </a-form-item>
         </a-col>
-
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="自定义类型"
+            label="设备（旧号）"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['useType', {rules: [{required: true, message: '自定义类型不能为空'}]}]" placeholder="请选择">
-              <a-select-option
-                v-for="(label,value) in useTypeMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
+            <a-input
+              v-decorator="['zbh', {rules: [{required: false, message: '不能为空'}]}]" />
           </a-form-item>
         </a-col>
       </a-row>
@@ -66,7 +51,7 @@
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="设备型号"
+            label="型号"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -112,106 +97,156 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="生产商"
+            label="设备类型"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-input
-              style="width: 70%"
-              disabled
-              v-decorator="['producerName', {rules: [{required: true, message: '生产商不能为空'}]}]" />
-            <a-button style="width: 30%" type="primary" @click="handleProducerSelect">选择</a-button>
+            <a-tree-select
+              style="width: 100%"
+              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+              :treeData="sbTypeTreeData"
+              :treeNodeFilterProp="'title'"
+              :showSearch="true"
+              v-decorator="['typeId', {rules: [{required: true, message: '设备类型不能为空'}]}]"
+              placeholder="请选择"
+            >
+            </a-tree-select>
           </a-form-item>
+        </a-col>
+
+        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="生产商"
+            label="自定义类型"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['useType', {rules: [{required: true, message: '自定义类型不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in useTypeMap"
+                :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
+            label="资产"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
-            v-show="false"
           >
             <a-input
-              v-decorator="['producerId', {rules: [{required: true, message: '生产商不能为空'}]}]" />
+              v-decorator="['financingNo']" />
+          </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 v-decorator="['status', {rules: [{required: true, message: '状态不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in statusMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
           </a-form-item>
         </a-col>
       </a-row>
-      <title-divider title="基本信息" width="90px"></title-divider>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="设备（新号）"
+            label="大小/尺寸"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['no', {rules: [{required: false, message: '设备编号不能为空'}]}]" />
+              v-decorator="['zz']" />
           </a-form-item>
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="设备（旧号）"
+            label="系列号"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['zbh', {rules: [{required: false, message: '设备（旧号）不能为空'}]}]" />
+              v-decorator="['zzh']" />
           </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="父设备"
+            label="房间"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              disabled
-              style="width: 80%"
-              v-decorator="['parentSbName']"/>
-            <a-button type="primary" style="width: 20%" @click="handleSbSelect">选择</a-button>
+              v-decorator="['cph']" />
           </a-form-item>
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="是否子设备"
+            label="生产商"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['isChild']" placeholder="请选择">
-              <a-select-option value="1">子设备</a-select-option>
-              <a-select-option value="2">父设备</a-select-option>
-              <a-select-option value="3">普通设备</a-select-option>
-            </a-select>
+            <a-input
+              style="width: 70%"
+              disabled
+              v-decorator="['producerName', {rules: [{required: true, message: '生产商不能为空'}]}]" />
+            <a-button style="width: 30%" type="primary" @click="handleProducerSelect">选择</a-button>
+          </a-form-item>
+          <a-form-item
+            label="生产商"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+            v-show="false"
+          >
+            <a-input
+              v-decorator="['producerId', {rules: [{required: true, message: '生产商不能为空'}]}]" />
           </a-form-item>
         </a-col>
       </a-row>
+      <title-divider title="基本信息" width="90px"></title-divider>
+
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="资产"
+            label="父设备"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['financingNo', {rules: [{required: true, message: '固定资产编号不能为空'}]}]" />
+              disabled
+              style="width: 80%"
+              v-decorator="['parentSbName']"/>
+            <a-button type="primary" style="width: 20%" @click="handleSbSelect">选择</a-button>
           </a-form-item>
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="状态"
+            label="是否子设备"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['status', {rules: [{required: true, message: '状态不能为空'}]}]" placeholder="请选择">
-              <a-select-option
-                v-for="(label,value) in statusMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
+            <a-select v-decorator="['isChild']" placeholder="请选择">
+              <a-select-option value="1">子设备</a-select-option>
+              <a-select-option value="2">父设备</a-select-option>
+              <a-select-option value="3">普通设备</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
@@ -775,6 +810,9 @@ export default {
           this.userList = res.data
         })
       }
+      queryUser({ }).then(res => {
+        this.userList = res.data
+      })
     },
     handleSbModelSelect () {
       const modal = this.$refs.sbModelSelectModal