完善

src/views/repair/application-form/modules/BaseForm.vue

@@ -27,14 +27,15 @@
               v-decorator="['sbName', {rules: [{required: true, message: '设备名称不能为空'}]}]" />
             <a-button style="width: 30%" type="primary" @click="handleSbSelect">选择</a-button>
           </a-form-item>
+        </row-item>
+        <row-item>
           <a-form-item
             label="使用位置"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              disabled
-              v-decorator="['cph']" />
+              v-decorator="['sbCph', {rules: [{required: true, message: '设备使用位置不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <!--<row-item>
@@ -330,6 +331,7 @@ export default {
         setFieldsValue(Object.assign(pick(record, [
           'id',
           'sbId',
+          'sbCph',
           'partId',
           'repairUserId',
           'no',
@@ -389,7 +391,7 @@ export default {
       }
     },
     handleSbSelect () {
-      this.$refs.sbInfoSelectModal.base({}, { filter: -1, status: 2 })
+      this.$refs.sbInfoSelectModal.base({}, {})
     },
     handleSbSelectd (keys, rows) {
       const [ key ] = keys
@@ -400,7 +402,7 @@ export default {
         setFieldsValue(Object.assign({
           'sbId': key,
           'sbName': row.name,
-          'cph': row.cph
+          'sbCph': row.cph
         }))
       })
     },

src/views/sb/info/MeasureSbInfo.vue

@@ -267,6 +267,7 @@ export default {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+
         {
           title: '设备原值',
           dataIndex: 'initialValue',
@@ -352,7 +353,7 @@ export default {
           ...this.queryParam,
           dataScope: {
             sortBy: 'desc',
-            sortName: 'update_time'
+            sortName: 'no'
           }
         }
         return getSbInfoPage(Object.assign(parameter, this.queryParam))

src/views/sb/info/SbInfo.vue

@@ -242,18 +242,18 @@ export default {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
-        {
-          title: '设备名称',
-          checked: true,
-          width: 200,
-          dataIndex: 'name'
-        },
         {
           title: '设备编号',
           dataIndex: 'no',
           width: 120,
           checked: true
         },
+        {
+          title: '设备名称',
+          checked: true,
+          width: 200,
+          dataIndex: 'name'
+        },
         {
           title: '设备旧号',
           dataIndex: 'zbh',
@@ -278,6 +278,69 @@ export default {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+        {
+          title: '规格型号',
+          dataIndex: 'model',
+          width: 120,
+          checked: true
+        },
+        {
+          title: '自定义类型',
+          checked: true,
+          dataIndex: 'useType',
+          width: 120,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.useTypeMap, text)
+          }
+        },
+
+        {
+          title: '生产商',
+          dataIndex: 'producerName',
+          width: 120,
+          checked: true
+        },
+
+        {
+          title: '大小尺寸',
+          dataIndex: 'zz',
+          width: 120,
+          checked: true
+        },
+
+        {
+          title: '系列号(出厂编号)',
+          dataIndex: 'zzh',
+          width: 120,
+          checked: true
+        },
+
+        {
+          title: '是否显示',
+          dataIndex: 'isShow',
+          width: 120,
+          checked: true,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.isShowMap, text)
+          }
+        },
+
+        {
+          title: '是否子设备',
+          dataIndex: 'isChild',
+          width: 120,
+          checked: true,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.isChildMap, text)
+          }
+        },
+
+        {
+          title: '资产编号1',
+          dataIndex: 'financingNo',
+          width: 120,
+          checked: true
+        },
         {
           title: '设备原值',
           dataIndex: 'initialValue',
@@ -322,14 +385,12 @@ export default {
           title: '检定有效期',
           dataIndex: 'nextCheckDate',
           width: 150,
-          fixed: 'right',
           checked: true
         },
         {
           title: '检定截止',
           dataIndex: 'restDay',
           width: 100,
-          fixed: 'right',
           checked: true,
           customRender: (text, record, index) => {
             if (record.nextCheckDate == null) {
@@ -364,7 +425,7 @@ export default {
           ...this.queryParam,
           dataScope: {
             sortBy: 'desc',
-            sortName: 'update_time'
+            sortName: 'no'
           }
         }
         return getSbInfoPage(Object.assign(parameter, this.queryParam))

src/views/sb/info/SbInfoStandard.vue

@@ -268,12 +268,75 @@ export default {
           }
         },
         {
-          title: '保养标准',
+          title: '保养标准数目',
           dataIndex: 'standardNum',
           fixed: 'right',
           width: 120,
           checked: true
         },
+        {
+          title: '规格型号',
+          dataIndex: 'model',
+          width: 120,
+          checked: true
+        },
+        {
+          title: '自定义类型',
+          checked: true,
+          dataIndex: 'useType',
+          width: 120,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.useTypeMap, text)
+          }
+        },
+
+        {
+          title: '生产商',
+          dataIndex: 'producerName',
+          width: 120,
+          checked: true
+        },
+
+        {
+          title: '大小尺寸',
+          dataIndex: 'zz',
+          width: 120,
+          checked: true
+        },
+
+        {
+          title: '系列号(出厂编号)',
+          dataIndex: 'zzh',
+          width: 120,
+          checked: true
+        },
+
+        {
+          title: '是否显示',
+          dataIndex: 'isShow',
+          width: 120,
+          checked: true,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.isShowMap, text)
+          }
+        },
+
+        {
+          title: '是否子设备',
+          dataIndex: 'isChild',
+          width: 120,
+          checked: true,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.isChildMap, text)
+          }
+        },
+
+        {
+          title: '资产编号1',
+          dataIndex: 'financingNo',
+          width: 120,
+          checked: true
+        },
         {
           title: '状态',
           checked: true,
@@ -298,6 +361,8 @@ export default {
           ...parameter,
           ...this.queryParam,
           dataScope: {
+            sortBy: 'desc',
+            sortName: 'no'
           }
         }
         return getSbInfoPageStandard(Object.assign(parameter, this.queryParam))

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

@@ -1063,6 +1063,7 @@ export default {
           'financingNoFive',
           'name',
           'model',
+          'cph',
           'positionId',
           'producerName',
           'useArea',

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

@@ -182,7 +182,7 @@ export default {
           ...this.extraQueryParam,
           dataScope: {
             sortBy: 'desc',
-            sortName: 'update_time'
+            sortName: 'no'
           }
         }
         return getSbInfoPage(Object.assign(parameter, this.queryParam))