完善

src/views/sb/modelbom/SbModelBom.vue

@@ -16,13 +16,24 @@
           <div class="table-page-search-wrapper" >
             <a-form layout="inline">
               <a-row :gutter="48">
-                <a-col :md="8" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="关键字">
                     <a-input v-model.trim="queryParam.keyword" placeholder="请输入名称/编码"/>
                   </a-form-item>
                 </a-col>
-
-                <a-col :md="8 || 24" :sm="24">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="车间位置">
+                    <a-select v-model="queryParam.positionId" placeholder="请选择">
+                      <a-select-option
+                        v-for="({id,name}) in sbPositionData"
+                        :key="id"
+                        :label="name"
+                        :value="id">{{ name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6 || 24" :sm="24">
                   <span class="table-page-search-submitButtons">
                     <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
                     <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
@@ -92,6 +103,7 @@ import PreviewModal from '@/views/preview/PreviewModal'
 import { getSbInfoPage, deleteSbInfos, fetchSbInfo, exportSbInfo } from '@/api/sb/info'
 import { selectSpareInfoListByModelId } from '@/api/sb/modelbom'
 import { fetchSbTypeTree } from '@/api/sb/type'
+import { querySbPosition } from '@/api/sb/position'
 
 import BaseTool from '../../../utils/tool'
 
@@ -117,6 +129,7 @@ export default {
       treeData: [],
       expandedKeys: [],
       selectedKeys: [],
+      sbPositionData: [],
       unitMap: {},
       sourceTypeMap: {},
       visible: true,
@@ -233,6 +246,9 @@ export default {
     fetchSbTypeTree().then(res => {
       this.treeData = res.data
     })
+    querySbPosition().then(res => {
+      this.sbPositionData = res.data
+    })
   },
   methods: {
     tableOption () {

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

@@ -10,12 +10,12 @@
     <title-divider title="型号信息" width="90px" v-show="visibleOther"></title-divider>
     <detail-list title="" :col="3" v-show="visibleOther">
       <detail-list-item term="型号">{{ model.model }}</detail-list-item>
-      <detail-list-item term="名称型号">{{ model.nameModel }}</detail-list-item>
+      <detail-list-item term="设备位号">{{ model.positionNo }}</detail-list-item>
       <detail-list-item term="设备名称">{{ model.name }}</detail-list-item>
       <detail-list-item term="设备类型">{{ model.typeName }}</detail-list-item>
       <detail-list-item term="自定义类型">{{ BaseTool.Object.getField(useTypeMap,model.useType) }}</detail-list-item>
       <detail-list-item term="设备等级">{{ BaseTool.Object.getField(levelMap,model.level) }}</detail-list-item>
-      <detail-list-item term="生产商">{{ model.producerName }}</detail-list-item>
+      <detail-list-item term="生产商">{{ model.producerId }}</detail-list-item>
       <detail-list-item term="计量单位">{{ model.unit }}</detail-list-item>
       <detail-list-item term="设备原值">{{ BaseTool.Amount.formatter(model.value) }}</detail-list-item>
     </detail-list>
@@ -71,7 +71,7 @@ import SparePartInfoSelectModal from '@/views/sqarepartmanage/sparepartinfo/modu
 import BaseForm from './BaseForm'
 import ImportFormAdd from './ImportFormAdd'
 import SpareBaseForm from '@/views/sqarepartmanage/sparepartinfo/modules/BaseForm'
-import SpareStoreSelectModal from '@/views/store/sparestore/modules/SpareStoreSelectModalYY'
+import SpareStoreSelectModal from '@/views/store/sparestore/modules/SpareStoreSelectModalYY.vue'
 const DetailListItem = DetailList.Item
 
 export default {

src/views/store/sparestore/modules/SpareStoreSelectModalYY.vue

@@ -297,7 +297,7 @@ export default {
       console.log(record)
       this.modalTitle = '选择信息'
       this.queryParam = queryParam
-      this.queryParam.tokenType = record.tokenType ? record.tokenType : 1
+      this.queryParam.tokenType = record && record.tokenType ? record.tokenType : 1
       if (queryParam.isSpecial !== undefined) {
         this.isSpecial = queryParam.isSpecial
         this.record = record