完善

src/api/sb/modelbom.js

@@ -269,6 +269,21 @@ export function getSbTreeInfo (parameter) {
     }
   })
 }
+/**
+ * page func 设备树
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function getSpareStore (parameter) {
+  return axios({
+    url: '/yongyou/spareStore/page3?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 /**
  * add batch func
  * parameter: { }

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

@@ -66,8 +66,8 @@
 
 <script>
 import DetailList from '@/components/tools/DetailList'
-import { addSbModelBomBatch, selectSpareInfoListByModelId, deleteSbModelBoms, exportSbModelBom } from '@/api/sb/modelbom'
-import SparePartInfoSelectModal from '@/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModal'
+import { addSbModelBomBatch, selectSpareInfoListByModelId, deleteSbModelBoms, exportSbModelBom, getSpareStore } from '@/api/sb/modelbom'
+import SparePartInfoSelectModal from '@/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModal.vue'
 import BaseForm from './BaseForm'
 import ImportFormAdd from './ImportFormAdd'
 import SpareBaseForm from '@/views/sqarepartmanage/sparepartinfo/modules/BaseForm'
@@ -135,10 +135,7 @@ export default {
             return text + this.BaseTool.Table.getMapText(this.periodTypeMap, record.periodType)
           }
         },
-        {
-          title: '数量',
-          dataIndex: 'num'
-        },
+
         {
           title: '更换日期',
           dataIndex: 'checkDate'
@@ -151,6 +148,10 @@ export default {
           title: '助记码',
           dataIndex: 'zjm'
         }, */
+        {
+          title: '数量',
+          dataIndex: 'num'
+        },
         {
           title: '操作',
           key: 'action',
@@ -180,7 +181,19 @@ export default {
       this.model = record
       this.modalTitle = '详情'
       selectSpareInfoListByModelId({ id: record.id }).then(res => {
+        getSpareStore({
+          spareVOS: res.data.map(item => {
+            return {
+              oldOrNew: item.oldOrNew,
+              cInvCode: item.no
+            }
+          }),
+          sbId: record.id
+        }).then(response => {
+          console.log(response)
+        })
         this.data = res.data
+        console.log(this.data)
       })
     },
     handleOk () {
@@ -198,6 +211,12 @@ export default {
     },
     handleSpareSelected (record, keys, rows) {
       const addData = []
+      console.log(record, keys, rows)
+      // getSpareStore({
+      //   spareVOS:{
+      //     oldOrNew:
+      //   }
+      // })
       for (let i = 0; i < rows.length; i++) {
         addData.push({ sbId: this.model.id, modelId: this.model.id, spareId: rows[i].id, spareName: rows[i].name, num: 1, period: 500, periodType: 6 })
       }

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

@@ -48,6 +48,18 @@
                     <a-input v-model.trim="queryParam.ggxh" placeholder="规格型号"/>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6 || 24" :sm="24">
+                  <a-form-item label="厂区">
+                    <a-select v-model="queryParam.tokenType" placeholder="请选择">
+                      <a-select-option
+                        v-for="(label,value) in flagMap"
+                        :key="value"
+                        :label="label"
+                        :value="parseInt(value)">{{ label }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="8 || 24" :sm="24">
                   <span class="table-page-search-submitButtons">
                     <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
@@ -181,6 +193,7 @@ export default {
       // 下拉框map
       tokenType: 1,
       delFlagMap: {},
+      flagMap: {},
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         parameter = {
@@ -217,6 +230,8 @@ export default {
   created () {
     // 下拉框map
     this.delFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.DELFLAG)
+    this.flagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PROJECT_NEW_AND_OLD)
+
     // this.tableOption()
     fetchSpareTypeTree({}).then(res => {
       this.spareTypeTreeData = res.data