Merge branch 'dev' of http://124.71.196.186:8888/hfxc226/abb-antd into dev

src/views/part/info/modules/PartInfoTable.vue

@@ -197,7 +197,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit',
           width: 300,
           customRender: (text, record, index) => {

src/views/report/instorecount/InStoreCount.vue

@@ -214,7 +214,7 @@ export default {
           dataIndex: 'ggxh'
         },
         {
-          title: '计量单位',
+          title: '单位',
           checked: true,
           width: '150px',
           dataIndex: 'unit'
@@ -225,6 +225,12 @@ export default {
           width: '150px',
           dataIndex: 'totalNum'
         },
+        {
+          title: '库位',
+          checked: true,
+          width: '150px',
+          dataIndex: 'storeName'
+        },
 
         {
           title: '当前库存',
@@ -304,6 +310,12 @@ export default {
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.ytMap, text)
           }
+        },
+        {
+          title: '关联设备号',
+          dataIndex: 'sbNo',
+          checked: true,
+          width: '150px'
         }
       ],
       // 下拉框map

src/views/report/outstorecount/OutStoreCount.vue

@@ -215,11 +215,17 @@ export default {
           dataIndex: 'ggxh'
         },
         {
-          title: '计量单位',
+          title: '单位',
           checked: true,
           width: '150px',
           dataIndex: 'unit'
         },
+        {
+          title: '库位',
+          checked: true,
+          width: '150px',
+          dataIndex: 'storeName'
+        },
         {
           title: '出库总数',
           checked: true,
@@ -304,6 +310,12 @@ export default {
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.ytMap, text)
           }
+        },
+        {
+          title: '关联设备号',
+          dataIndex: 'sbNo',
+          checked: true,
+          width: '150px'
         }
       ],
       // 下拉框map

src/views/report/sparepartinfo/SparePartInfo.vue

@@ -114,7 +114,7 @@
       showPagination="auto"
     >
       <span slot="status" slot-scope="text, record">
-        <a @click="handleStore(record)">{{ text||"无" }}</a>
+        <a @click="handleStore(record)">{{ text||"0" }}</a>
       </span>
 
       <span slot="action" slot-scope="record">
@@ -204,6 +204,12 @@ export default {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+        {
+          title: '库位',
+          width: '150px',
+          checked: true,
+          dataIndex: 'storeName'
+        },
 
         {
           title: '当前库存',
@@ -243,7 +249,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit',
           width: '150px',
           checked: true,
@@ -269,6 +275,12 @@ export default {
             return this.BaseTool.Object.getField(this.ytMap, text)
           }
         },
+        {
+          title: '关联设备号',
+          width: '150px',
+          checked: true,
+          dataIndex: 'sbNo'
+        },
         {
           title: '备注',
           width: '150px',

src/views/report/sparepartinfo/modules/SparePartInfoSelectModal.vue

@@ -144,7 +144,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.unitMap, text)

src/views/sb/info/SbInfoForPartInfo.vue

@@ -223,7 +223,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit',
           width: 200,
           customRender: (text, record, index) => {

src/views/sb/info/SbInfoTree.vue

@@ -312,7 +312,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit',
           customRender: (text, record, index) => {
             return BaseTool.Object.getField(this.unitMap, text)

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

@@ -261,7 +261,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit',
           width: 200,
           customRender: (text, record, index) => {

src/views/sb/model/SbModel.vue

@@ -164,7 +164,7 @@ export default {
         },
 
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit'
         },
         {

src/views/sb/model/modules/SbModelSelectModal.vue

@@ -156,7 +156,7 @@ export default {
           dataIndex: 'value'
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit',
           width: 200,
           customRender: (text, record, index) => {

src/views/sb/modelbom/SbModelBom.vue

@@ -170,7 +170,7 @@ export default {
         },
 
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit',
           customRender: (text, record, index) => {
             return BaseTool.Object.getField(this.unitMap, text)
@@ -277,7 +277,7 @@ export default {
     handleEdit (record) {
       selectSpareInfoListByModelId({ id: record.id }).then(res => {
         const modal = this.$refs.baseModal
-        const data = {data:res.data,modelId:record.id}
+        const data = { data: res.data, modelId: record.id }
         modal.base(data)
       })
     },
@@ -324,7 +324,7 @@ export default {
     onExpand (expandedKeys) {
       this.expandedKeys = expandedKeys
       this.autoExpandParent = false
-    },
+    }
 
   }
 }

src/views/sb/modelbom/modules/SbModelBomSelectModal.vue

@@ -98,7 +98,7 @@ export default {
       visible: false,
       // 查询参数
       queryParam: {
-        keyword:null
+        keyword: null
       },
       extraQueryParam: {
       },
@@ -152,7 +152,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit',
           width: 200,
           customRender: (text, record, index) => {

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

@@ -88,7 +88,7 @@
       <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"
           >

src/views/sqarepartmanage/sparepartinfo/SparePartInfo.vue

@@ -264,11 +264,17 @@ export default {
         },
 
         {
-          title: '计量单位',
+          title: '单位',
           width: '150px',
           checked: true,
           dataIndex: 'unit'
         },
+        {
+          title: '库位',
+          width: '150px',
+          checked: true,
+          dataIndex: 'storeName'
+        },
         {
           title: '当前库存',
           width: '150px',
@@ -333,6 +339,12 @@ export default {
             return this.BaseTool.Object.getField(this.ytMap, text)
           }
         },
+        {
+          title: '关联设备号',
+          dataIndex: 'sbNo',
+          checked: true,
+          width: '150px'
+        },
         {
           title: '备注',
           checked: true,

src/views/sqarepartmanage/sparepartinfo/SparePartInfoSbModel.vue

@@ -199,7 +199,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.unitMap, text)

src/views/sqarepartmanage/sparepartinfo/SpareStoreTotal.vue

@@ -220,11 +220,17 @@ export default {
         },
 
         {
-          title: '计量单位',
+          title: '单位',
           width: '150px',
           checked: true,
           dataIndex: 'unit'
         },
+        {
+          title: '库位',
+          width: '150px',
+          checked: true,
+          dataIndex: 'storeName'
+        },
         {
           title: '当前库存',
           width: '150px',
@@ -289,6 +295,12 @@ export default {
             return this.BaseTool.Object.getField(this.ytMap, text)
           }
         },
+        {
+          title: '关联设备号',
+          checked: true,
+          width: '150px',
+          dataIndex: 'sbNo'
+        },
         {
           title: '备注',
           checked: true,

src/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModal.vue

@@ -177,7 +177,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit'
         },
         {

src/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModalForAdjust.vue

@@ -98,7 +98,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit'
         }
       ]
@@ -136,7 +136,7 @@ export default {
         this.confirmLoading = false
         this.visible = false
       }
-    },
+    }
   }
 }
 </script>

src/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModalSbInfo.vue

@@ -156,7 +156,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           dataIndex: 'unit'
         },
         {

src/views/store/fastoutstore/FastOutStore.vue

@@ -109,7 +109,7 @@
           showPagination="auto"
         >
           <span slot="status" slot-scope="text, record">
-            <a @click="handleStore(record)">{{ text||"无" }}</a>
+            <a @click="handleStore(record)">{{ text||"0" }}</a>
           </span>
           <span slot="num" slot-scope="record">
             <template>
@@ -199,7 +199,7 @@ export default {
           dataIndex: 'brand'
         },
         {
-          title: '计量单位',
+          title: '单位',
           checked: true,
           width: '150px',
           dataIndex: 'unit'

src/views/store/instoreform/InStoreForm.vue

@@ -240,7 +240,7 @@ export default {
           dataIndex: 'ggxh'
         },
         {
-          title: '计量单位',
+          title: '单位',
           checked: true,
           width: '150px',
           dataIndex: 'unit'
@@ -257,6 +257,12 @@ export default {
           width: '150px',
           dataIndex: 'createdTime'
         },
+        {
+          title: '库位',
+          checked: true,
+          width: '150px',
+          dataIndex: 'storeName'
+        },
         {
           title: '当前库存',
           dataIndex: 'currentStock',
@@ -306,7 +312,7 @@ export default {
           checked: true,
           width: '150px',
           title: '数量',
-          dataIndex: 'outNum'
+          dataIndex: 'inNum'
         },
         {
           title: '生产商',
@@ -326,6 +332,12 @@ export default {
             return this.BaseTool.Object.getField(this.ytMap, text)
           }
         },
+        {
+          title: '关联设备号',
+          checked: true,
+          width: '150px',
+          dataIndex: 'sbNo'
+        },
         {
           title: '备注',
           checked: true,
@@ -339,15 +351,15 @@ export default {
           width: '150px',
           scopedSlots: { customRender: 'status' }
         },
-        {
-          title: '仓库名称',
-          dataIndex: 'storeId',
-          checked: true,
-          width: '150px',
-          customRender: (text, record, index) => {
-            return record.storeName
-          }
-        },
+        // {
+        //   title: '仓库名称',
+        //   dataIndex: 'storeId',
+        //   checked: true,
+        //   width: '150px',
+        //   customRender: (text, record, index) => {
+        //     return record.storeName
+        //   }
+        // },
         {
           title: '操作',
           fixed: 'right',

src/views/store/outstoreform/OutStoreForm.vue

@@ -237,7 +237,7 @@ export default {
           dataIndex: 'ggxh'
         },
         {
-          title: '计量单位',
+          title: '单位',
           checked: true,
           width: '150px',
           dataIndex: 'unit'
@@ -254,6 +254,12 @@ export default {
           width: '150px',
           dataIndex: 'createdTime'
         },
+        {
+          title: '库位',
+          dataIndex: 'storeName',
+          checked: true,
+          width: '100px'
+        },
         {
           title: '当前库存',
           dataIndex: 'currentStock',
@@ -323,6 +329,12 @@ export default {
             return this.BaseTool.Object.getField(this.ytMap, text)
           }
         },
+        {
+          title: '关联设备号',
+          checked: true,
+          width: '150px',
+          dataIndex: 'sbNo'
+        },
         {
           title: '备注',
           checked: true,
@@ -336,15 +348,6 @@ export default {
           width: '150px',
           scopedSlots: { customRender: 'status' }
         },
-        {
-          title: '仓库名称',
-          dataIndex: 'storeId',
-          checked: true,
-          width: '150px',
-          customRender: (text, record, index) => {
-            return record.storeName
-          }
-        },
         {
           title: '操作',
           checked: true,

src/views/store/sparestore/SpareStore.vue

@@ -258,7 +258,7 @@ export default {
           }
         },
         {
-          title: '计量单位',
+          title: '单位',
           checked: true,
           width: '150px',
           dataIndex: 'unit'

src/views/store/sparestore/SpareStoreTotal.vue

@@ -142,7 +142,7 @@ export default {
           dataIndex: 'ggxh'
         },
         {
-          title: '计量单位',
+          title: '单位',
           checked: true,
           dataIndex: 'unit'
         },