完善

src/views/report/instorecount/InStoreCount.vue

@@ -190,77 +190,42 @@ export default {
           }
         },
         {
-          title: '备件规格',
-          checked: true,
-          width: '150px',
-          dataIndex: 'ggxh'
-        },
-        {
-          title: '编号',
-          dataIndex: 'initNo',
+          title: '备件编码',
+          dataIndex: 'no',
           checked: true,
           width: '150px'
         },
         {
-          title: '备件',
-          dataIndex: 'name',
+          title: '品牌',
           checked: true,
-          width: '150px'
+          width: '150px',
+          dataIndex: 'brand'
         },
         {
-          title: '备件类型',
-          dataIndex: 'typeName',
+          title: '备件名称',
+          dataIndex: 'name',
           checked: true,
           width: '150px'
         },
         {
-          title: '入库总数',
-          checked: true,
-          width: '150px',
-          dataIndex: 'totalNum'
-        },
-        // {
-        //   title: '入库总价',
-        //   dataIndex: 'totalPrice',
-        //   checked: true,
-        //   width: '150px',
-        //   customRender: (text, record, index) => {
-        //     return this.BaseTool.Amount.formatter(text)
-        //   }
-        // },
-        {
-          title: '品牌',
+          title: '备件规格',
           checked: true,
           width: '150px',
-          dataIndex: 'brand'
+          dataIndex: 'ggxh'
         },
         {
-          title: '备件价值',
-          dataIndex: 'initialValue',
+          title: '计量单位',
           checked: true,
           width: '150px',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
-          }
+          dataIndex: 'unit'
         },
         {
+          title: '入库总数',
           checked: true,
           width: '150px',
-          title: '数量',
           dataIndex: 'totalNum'
         },
-        // {
-        //   checked: true,
-        //   width: '150px',
-        //   title: '总价',
-        //   dataIndex: 'totalPrice'
-        // },
-        {
-          title: '计量单位',
-          checked: true,
-          width: '150px',
-          dataIndex: 'unit'
-        },
+
         {
           title: '当前库存',
           dataIndex: 'currentStock',
@@ -289,6 +254,39 @@ export default {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+        {
+          title: '备件类型',
+          dataIndex: 'typeName',
+          checked: true,
+          width: '150px'
+        },
+
+        // {
+        //   title: '入库总价',
+        //   dataIndex: 'totalPrice',
+        //   checked: true,
+        //   width: '150px',
+        //   customRender: (text, record, index) => {
+        //     return this.BaseTool.Amount.formatter(text)
+        //   }
+        // },
+
+        {
+          title: '备件价值',
+          dataIndex: 'initialValue',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        // {
+        //   checked: true,
+        //   width: '150px',
+        //   title: '总价',
+        //   dataIndex: 'totalPrice'
+        // },
+
         {
           title: '生产商',
           checked: true,

src/views/report/outstorecount/OutStoreCount.vue

@@ -191,17 +191,16 @@ export default {
           }
         },
         {
-          width: '150px',
-          title: '备件规格',
+          title: '备件编码',
+          dataIndex: 'no',
           checked: true,
-
-          dataIndex: 'ggxh'
+          width: '150px'
         },
         {
-          width: '150px',
+          title: '品牌',
           checked: true,
-          title: '原厂编号',
-          dataIndex: 'initNo'
+          width: '150px',
+          dataIndex: 'brand'
         },
         {
           title: '备件名称',
@@ -210,44 +209,23 @@ export default {
           width: '150px'
         },
         {
-          title: '备件类型',
-          checked: true,
-          width: '150px',
-          dataIndex: 'typeName'
-        },
-        {
-          title: '出库总数',
-          checked: true,
-          width: '150px',
-          dataIndex: 'totalNum'
-        },
-        {
-          title: '品牌',
+          title: '备件规格',
           checked: true,
           width: '150px',
-          dataIndex: 'brand'
+          dataIndex: 'ggxh'
         },
         {
-          title: '备件价值',
-          dataIndex: 'initialValue',
+          title: '计量单位',
           checked: true,
           width: '150px',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
-          }
+          dataIndex: 'unit'
         },
         {
+          title: '出库总数',
           checked: true,
           width: '150px',
-          title: '数量',
           dataIndex: 'totalNum'
         },
-        {
-          title: '计量单位',
-          checked: true,
-          width: '150px',
-          dataIndex: 'unit'
-        },
         {
           title: '当前库存',
           dataIndex: 'currentStock',
@@ -276,6 +254,39 @@ export default {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+        {
+          title: '备件类型',
+          dataIndex: 'typeName',
+          checked: true,
+          width: '150px'
+        },
+
+        // {
+        //   title: '入库总价',
+        //   dataIndex: 'totalPrice',
+        //   checked: true,
+        //   width: '150px',
+        //   customRender: (text, record, index) => {
+        //     return this.BaseTool.Amount.formatter(text)
+        //   }
+        // },
+
+        {
+          title: '备件价值',
+          dataIndex: 'initialValue',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        // {
+        //   checked: true,
+        //   width: '150px',
+        //   title: '总价',
+        //   dataIndex: 'totalPrice'
+        // },
+
         {
           title: '生产商',
           checked: true,

src/views/sqarepartmanage/sparepartinfo/SparePartInfo.vue

@@ -228,79 +228,70 @@ export default {
       confirmLoading: false,
       // 表头
       columns: [
-        /** {
-          title: '备件ID',
-          dataIndex: 'id'
-         },
         {
-          title: '备件编码',
-          dataIndex: 'no'
-        },**/
-        {
-          title: '备件类别',
-          dataIndex: 'typeId',
+          title: '序号',
+          width: '100px',
+          dataIndex: 'index',
           checked: true,
-          width: '150px',
           customRender: (text, record, index) => {
-            return record.typeName
+            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
         {
           title: '备件编码',
-          dataIndex: 'no',
+          width: '150px',
           checked: true,
-          width: '150px'
+          dataIndex: 'no'
         },
         {
-          title: '备件名称',
-          dataIndex: 'name',
+          title: '品牌',
+          width: '150px',
           checked: true,
-          width: '150px'
+          dataIndex: 'brand'
         },
         {
-          title: '规格型号',
-          checked: true,
+          title: '备件名称',
           width: '150px',
-          dataIndex: 'ggxh'
-        },
-        {
-          title: '品牌',
           checked: true,
-          width: '150px',
-          dataIndex: 'brand'
+          dataIndex: 'name'
         },
+
         {
-          title: '备件价值',
-          dataIndex: 'initialValue',
-          checked: true,
+          title: '规格型号',
           width: '150px',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
-          }
+          checked: true,
+          dataIndex: 'ggxh'
         },
+
         {
           title: '计量单位',
-          checked: true,
           width: '150px',
+          checked: true,
           dataIndex: 'unit'
         },
         {
           title: '当前库存',
-          dataIndex: 'currentStock',
+          width: '150px',
           checked: true,
-          width: '100px',
-          scopedSlots: { customRender: 'status' }
+          dataIndex: 'totalStock',
+          customRender: (text, record, index) => {
+            if (text == null) {
+              return 0
+            } else {
+              return text
+            }
+          }
         },
         {
           title: '最高库存',
+          width: '150px',
           checked: true,
-          width: '100px',
           dataIndex: 'maxStock'
         },
         {
           title: '最低库存',
+          width: '150px',
           checked: true,
-          width: '100px',
           dataIndex: 'minStock'
         },
         {
@@ -312,6 +303,18 @@ export default {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+        {
+          title: '备件价值',
+          width: '150px',
+          checked: true,
+          dataIndex: 'price'
+        },
+        {
+          title: '备件类别',
+          dataIndex: 'typeName',
+          checked: true,
+          width: '150px'
+        },
         {
           title: '生产商',
           checked: true,
@@ -321,27 +324,6 @@ export default {
             return record.producerName
           }
         },
-        // {
-        //   title: '英文名称',
-        //   checked: true,
-        //   width: '150px',
-        //   dataIndex: 'englishName'
-        // },
-        // {
-        //   title: '助记码',
-        //   checked: true,
-        //   width: '150px',
-        //   dataIndex: 'zjm'
-        // },
-        // {
-        //   title: '产地',
-        //   checked: true,
-        //   width: '150px',
-        //   dataIndex: 'cd',
-        //   customRender: (text, record, index) => {
-        //     return this.BaseTool.Object.getField(this.cdMap, text)
-        //   }
-        // },
         {
           title: '用途',
           checked: true,
@@ -357,12 +339,6 @@ export default {
           width: '150px',
           dataIndex: 'remark'
         },
-        // {
-        //   title: '创建日期',
-        //   checked: true,
-        //   width: '200px',
-        //   dataIndex: 'createdTime'
-        // },
         {
           title: '操作',
           checked: true,

src/views/sqarepartmanage/sparepartinfo/SpareStoreTotal.vue

@@ -194,35 +194,31 @@ export default {
           }
         },
         {
-          title: '编号',
+          title: '备件编码',
           width: '150px',
           checked: true,
           dataIndex: 'no'
         },
         {
-          title: '备件名称',
+          title: '品牌',
           width: '150px',
           checked: true,
-          dataIndex: 'name'
+          dataIndex: 'brand'
         },
         {
-          title: '备件类别',
-          dataIndex: 'typeName',
+          title: '备件名称',
+          width: '150px',
           checked: true,
-          width: '150px'
+          dataIndex: 'name'
         },
+
         {
           title: '规格型号',
           width: '150px',
           checked: true,
           dataIndex: 'ggxh'
         },
-        {
-          title: '品牌',
-          width: '150px',
-          checked: true,
-          dataIndex: 'brand'
-        },
+
         {
           title: '计量单位',
           width: '150px',
@@ -230,16 +226,17 @@ export default {
           dataIndex: 'unit'
         },
         {
-          title: '单价',
+          title: '当前库存',
           width: '150px',
           checked: true,
-          dataIndex: 'price'
-        },
-        {
-          title: '最低库存',
-          width: '150px',
-          checked: true,
-          dataIndex: 'minStock'
+          dataIndex: 'totalStock',
+          customRender: (text, record, index) => {
+            if (text == null) {
+              return 0
+            } else {
+              return text
+            }
+          }
         },
         {
           title: '最高库存',
@@ -248,17 +245,10 @@ export default {
           dataIndex: 'maxStock'
         },
         {
-          title: '实际库存',
+          title: '最低库存',
           width: '150px',
           checked: true,
-          dataIndex: 'totalStock',
-          customRender: (text, record, index) => {
-            if (text == null) {
-              return 0
-            } else {
-              return text
-            }
-          }
+          dataIndex: 'minStock'
         },
         {
           title: '等级',
@@ -269,6 +259,18 @@ export default {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+        {
+          title: '备件价值',
+          width: '150px',
+          checked: true,
+          dataIndex: 'price'
+        },
+        {
+          title: '备件类别',
+          dataIndex: 'typeName',
+          checked: true,
+          width: '150px'
+        },
         {
           title: '生产商',
           checked: true,

src/views/store/instoreform/InStoreForm.vue

@@ -215,21 +215,18 @@ export default {
             return this.BaseTool.Object.getField(this.typeMap, text)
           }
         },
-        {
-          title: '备件类别',
-          dataIndex: 'typeId',
-          checked: true,
-          width: '150px',
-          customRender: (text, record, index) => {
-            return record.typeName
-          }
-        },
         {
           title: '备件编码',
           dataIndex: 'no',
           checked: true,
           width: '150px'
         },
+        {
+          title: '品牌',
+          checked: true,
+          width: '150px',
+          dataIndex: 'brand'
+        },
         {
           title: '备件名称',
           dataIndex: 'name',
@@ -243,31 +240,22 @@ export default {
           dataIndex: 'ggxh'
         },
         {
-          title: '品牌',
-          checked: true,
-          width: '150px',
-          dataIndex: 'brand'
-        },
-        {
-          title: '备件价值',
-          dataIndex: 'initialValue',
+          title: '计量单位',
           checked: true,
           width: '150px',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
-          }
+          dataIndex: 'unit'
         },
         {
+          title: '创建人',
           checked: true,
           width: '150px',
-          title: '数量',
-          dataIndex: 'inNum'
+          dataIndex: 'createdUserName'
         },
         {
-          title: '计量单位',
+          title: '创建日期',
           checked: true,
           width: '150px',
-          dataIndex: 'unit'
+          dataIndex: 'createdTime'
         },
         {
           title: '当前库存',
@@ -296,6 +284,30 @@ export default {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+        {
+          title: '备件类别',
+          dataIndex: 'typeId',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return record.typeName
+          }
+        },
+        {
+          title: '备件价值',
+          dataIndex: 'initialValue',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        {
+          checked: true,
+          width: '150px',
+          title: '数量',
+          dataIndex: 'outNum'
+        },
         {
           title: '生产商',
           checked: true,
@@ -322,22 +334,16 @@ export default {
         },
         {
           title: '状态',
-          width: '150px',
-          checked: true,
           dataIndex: 'status',
-          scopedSlots: { customRender: 'status' }
-        },
-        {
           checked: true,
           width: '150px',
-          title: '创建日期',
-          dataIndex: 'createdTime'
+          scopedSlots: { customRender: 'status' }
         },
         {
           title: '仓库名称',
-          width: '150px',
-          checked: true,
           dataIndex: 'storeId',
+          checked: true,
+          width: '150px',
           customRender: (text, record, index) => {
             return record.storeName
           }

src/views/store/outstoreform/OutStoreForm.vue

@@ -211,21 +211,19 @@ export default {
             return this.BaseTool.Object.getField(this.typeMap, text)
           }
         },
-        {
-          title: '备件类别',
-          dataIndex: 'typeId',
-          checked: true,
-          width: '150px',
-          customRender: (text, record, index) => {
-            return record.typeName
-          }
-        },
+
         {
           title: '备件编码',
           dataIndex: 'no',
           checked: true,
           width: '150px'
         },
+        {
+          title: '品牌',
+          checked: true,
+          width: '150px',
+          dataIndex: 'brand'
+        },
         {
           title: '备件名称',
           dataIndex: 'name',
@@ -239,32 +237,22 @@ export default {
           dataIndex: 'ggxh'
         },
         {
-          title: '品牌',
-          checked: true,
-          width: '150px',
-          dataIndex: 'brand'
-        },
-        {
-          title: '备件价值',
-          dataIndex: 'initialValue',
+          title: '计量单位',
           checked: true,
           width: '150px',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
-          }
+          dataIndex: 'unit'
         },
         {
+          title: '创建人',
           checked: true,
           width: '150px',
-          title: '数量',
-          dataIndex: 'outNum'
+          dataIndex: 'createdUserName'
         },
-
         {
-          title: '计量单位',
+          title: '创建日期',
           checked: true,
           width: '150px',
-          dataIndex: 'unit'
+          dataIndex: 'createdTime'
         },
         {
           title: '当前库存',
@@ -293,6 +281,30 @@ export default {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+        {
+          title: '备件类别',
+          dataIndex: 'typeId',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return record.typeName
+          }
+        },
+        {
+          title: '备件价值',
+          dataIndex: 'initialValue',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        {
+          checked: true,
+          width: '150px',
+          title: '数量',
+          dataIndex: 'outNum'
+        },
         {
           title: '生产商',
           checked: true,
@@ -324,12 +336,6 @@ export default {
           width: '150px',
           scopedSlots: { customRender: 'status' }
         },
-        {
-          title: '创建日期',
-          dataIndex: 'createdTime',
-          checked: true,
-          width: '150px'
-        },
         {
           title: '仓库名称',
           dataIndex: 'storeId',