whj 1 年之前
父節點
當前提交
950d952a5c
共有 4 個文件被更改,包括 431 次插入13 次删除
  1. 15 0
      src/api/sb/info.js
  2. 17 0
      src/api/sb/modelbom.js
  3. 39 13
      src/views/sb/modelbom/modules/Detail.vue
  4. 360 0
      src/views/sb/modelbom/modules/SbInfoSelectModal.vue

+ 15 - 0
src/api/sb/info.js

@@ -16,6 +16,21 @@ export function getSbInfoPage (parameter) {
     }
   })
 }
+/**
+ * page func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function getSbInfoSyncPage (parameter) {
+  return axios({
+    url: '/sb/infos/get/synchronous/sb?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 /**
  * page func
  * parameter: { }

+ 17 - 0
src/api/sb/modelbom.js

@@ -269,3 +269,20 @@ export function getSbTreeInfo (parameter) {
     }
   })
 }
+/**
+ * add batch func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function addSyncBoms (parameter) {
+  return axios({
+    url: '/sb/model-spare-boms/synchronous/add',
+    method: 'POST',
+    headers: {
+      'Accept': 'application/json',
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    data: parameter
+  })
+}

+ 39 - 13
src/views/sb/modelbom/modules/Detail.vue

@@ -21,7 +21,7 @@
     </detail-list>
     <title-divider title="BOM信息" width="90px" v-show="visibleOther"></title-divider>
     <div class="table-operator" style="margin-bottom: 8px;" v-show="visibleOther">
-<!--      <a-button type="primary" @click="handleAdd">
+      <!--      <a-button type="primary" @click="handleAdd">
         <a-icon type="plus"/>
         单条添加
       </a-button>-->
@@ -29,7 +29,7 @@
         <a-icon type="plus"/>
         批量添加
       </a-button>
-<!--      <a-button style="margin-left:8px;" type="primary" @click="handleAddSpareInfo">
+      <!--      <a-button style="margin-left:8px;" type="primary" @click="handleAddSpareInfo">
         <a-icon type="plus"/>
         添加备件
       </a-button>-->
@@ -39,6 +39,7 @@
         <a-icon type="upload"/>
         导入
       </a-button>
+      <a-button style="margin-left: 8px" type="primary" @click="handleSync">设备同步</a-button>
     </div>
     <a-table
       :data-source="data"
@@ -48,7 +49,7 @@
       rowKey="id">
       <span slot="action" slot-scope="record">
         <template>
-<!--          <a v-if="$auth('sb-infos-edit')" @click="handleEdit(record)">修改</a>-->
+          <!--          <a v-if="$auth('sb-infos-edit')" @click="handleEdit(record)">修改</a>-->
           <a-divider type="vertical" />
           <a-popconfirm v-if="$auth('sb-infos-del')" title="是否要删除该条数据?" @confirm="batchDelete(record.id)">
             <a>删除</a>
@@ -61,17 +62,19 @@
     <import-form-add ref="importModal" @ok="handleOk"></import-form-add>
     <spare-part-info-select-modal :type="'checkbox'" ref="spareSelectModal" @selected="handleSpareSelected"/>
     <spare-store-select-modal ref="spareStoreSelectModal" @selected="handleSpareStoreSelected"/>
+    <SbInfoSelectModal ref="sbInfoSelectModal" :type="'checkbox'" @selected="handleSbStoreSelected"/>
   </a-card>
 </template>
 
 <script>
 import DetailList from '@/components/tools/DetailList'
-import { addSbModelBomBatch, selectSpareInfoListByModelId, deleteSbModelBoms, exportSbModelBom } from '@/api/sb/modelbom'
+import { addSbModelBomBatch, selectSpareInfoListByModelId, deleteSbModelBoms, exportSbModelBom, addSyncBoms } from '@/api/sb/modelbom'
 import SparePartInfoSelectModal from '@/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModal'
 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 SbInfoSelectModal from './SbInfoSelectModal.vue'
 const DetailListItem = DetailList.Item
 
 export default {
@@ -83,7 +86,8 @@ export default {
     SparePartInfoSelectModal,
     ImportFormAdd,
     SpareBaseForm,
-    SpareStoreSelectModal
+    SpareStoreSelectModal,
+    SbInfoSelectModal
   },
   data () {
     return {
@@ -106,12 +110,14 @@ export default {
       levelMap: {},
       unitMap: {},
       periodTypeMap: {},
+      spareIds: [],
+      sparePartInfoList: [],
       // 表头
       columns: [
-        /*{
+        /* {
           title: '备件编号',
           dataIndex: 'spareId'
-        },*/
+        }, */
         {
           title: '备件名称',
           dataIndex: 'spareName'
@@ -120,15 +126,15 @@ export default {
           title: '备件编码',
           dataIndex: 'no'
         },
-        /*{
+        /* {
           title: '自编号',
           dataIndex: 'zbh'
-        },*/
+        }, */
         {
           title: '规格型号',
           dataIndex: 'ggxh'
         },
-        /*{
+        /* {
           title: '更换周期',
           dataIndex: 'period',
           customRender: (text, record, index) => {
@@ -150,7 +156,7 @@ export default {
         {
           title: '助记码',
           dataIndex: 'zjm'
-        },*/
+        }, */
         {
           title: '操作',
           key: 'action',
@@ -214,6 +220,8 @@ export default {
     },
     handleSpareStoreSelected (record, keys, rows) {
       const addData = []
+      this.spareIds = [...keys, ...this.spareIds]
+      this.sparePartInfoList = [...rows, ...this.sparePartInfoList]
       for (let i = 0; i < rows.length; i++) {
         addData.push({ spareId: 111111, sbId: this.model.id, modelId: this.model.id, no: rows[i].no, spareName: rows[i].spareName, num: 1, ggxh: rows[i].ggxh })
       }
@@ -225,7 +233,7 @@ export default {
           this.confirmLoading = false
         })
 
-      /*const { data } = this
+      /* const { data } = this
       for (let i = 0; i < rows.length; i++) {
         let find = false
         for (let j = 0; j < data.length; j++) {
@@ -239,7 +247,7 @@ export default {
           selectData.num = 1
           data.push(selectData)
         }
-      }*/
+      } */
     },
     handleAdd () {
       const modal = this.$refs.baseModal
@@ -289,6 +297,24 @@ export default {
       exportSbModelBom(parameter).then(file => {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
+    },
+    handleSync () {
+      console.log(this.sparePartInfoList, this.spareIds)
+      this.$refs.sbInfoSelectModal.base({}, { spareIds: this.spareIds })
+    },
+    handleSbStoreSelected (keys, rows) {
+      console.log(keys, rows)
+      const params = {
+        sbIds: keys,
+        sparePartInfoList: this.sparePartInfoList
+      }
+      addSyncBoms(params)
+        .then((response) => {
+          this.$message.info('同步成功')
+          this.handleOk()
+        }).catch(() => {
+          this.confirmLoading = false
+        })
     }
   }
 }

+ 360 - 0
src/views/sb/modelbom/modules/SbInfoSelectModal.vue

@@ -0,0 +1,360 @@
+<template>
+  <a-modal
+    :title="modalTitle"
+    :width="1300"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    class="ant-modal2"
+    @cancel="handleCancel"
+  >
+    <a-card :bordered="false">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline">
+          <a-row :gutter="48">
+            <a-col :md="8" :sm="24">
+              <a-form-item label="关键字">
+                <a-input v-model.trim="queryParam.keyword" placeholder="请输入名称/编码"/>
+              </a-form-item>
+            </a-col>
+            <!--            <a-col :md="8" :sm="24">
+              <a-form-item label="上层设备类型">
+                <a-tree-select
+                  style="width: 100%"
+                  :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                  :treeData="treeData"
+                  :treeNodeFilterProp="'title'"
+                  :showSearch="true"
+                  v-model="queryParam.parentId"
+                  placeholder="请选择"
+                >
+                </a-tree-select>
+              </a-form-item>
+            </a-col>-->
+            <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" :sm="24">
+              <a-form-item label="设备类型">
+                <a-tree-select
+                  style="width: 100%"
+                  :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                  :treeData="treeData"
+                  :treeNodeFilterProp="'title'"
+                  :showSearch="true"
+                  placeholder="请选择"
+                  @change="handleChange"
+                >
+                </a-tree-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>
+                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+
+      <div class="table-operator" style="margin-bottom: 8px;">
+      </div>
+
+      <s-table
+        ref="table"
+        size="default"
+        rowKey="id"
+        :columns="columns"
+        :data="loadData"
+        :alert="options.alert"
+        :customRow="options.customRow"
+        :rowSelection="options.rowSelection"
+        :scroll="{ x: 1300, y: BaseTool.Constant.scrollY }"
+        showPagination="auto"
+      >
+        <span slot="action" slot-scope="record">
+          <template>
+
+          </template>
+        </span>
+        <span slot="status" slot-scope="text">
+          <badge :status="DictCache.COLOR.SB_INFO_STATUS[text]" :text="statusMap[text]" />
+        </span>
+      </s-table>
+    </a-card>
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">取消</a-button>
+      <a-button :loading="confirmLoading" type="primary" @click="handleSelect()">选择</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import { STable, Ellipsis } from '@/components'
+import { getSbInfoSyncPage, fetchSbInfo, getSbInfoTree } from '@/api/sb/info'
+import { querySbPosition } from '@/api/sb/position'
+import { fetchSbTypeTree } from '@/api/sb/type'
+
+export default {
+  name: 'SbInfoSelectModal',
+  components: {
+    STable,
+    Ellipsis
+  },
+  props: {
+    type: {
+      type: String,
+      default: 'radio'
+    },
+    selectedRowKey: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    selectedRow: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data () {
+    return {
+      confirmLoading: false,
+      mdl: {},
+      modalTitle: null,
+      visible: false,
+      // 查询参数
+      queryParam: {
+      },
+      extraQueryParam: {
+      },
+      depreciationTypeMap: {},
+      levelMap: {},
+      statusMap: {},
+      unitMap: {},
+      useTypeMap: {},
+      sourceTypeMap: {},
+      treeData: [],
+      sbPositionData: [],
+      typeList: [],
+      // 表头
+      columns: [
+        {
+          title: '设备名称',
+          checked: true,
+          dataIndex: 'name'
+        },
+        {
+          title: '设备编号',
+          dataIndex: 'no',
+          checked: true
+        },
+        {
+          title: '设备位号',
+          checked: true,
+          dataIndex: 'positionNo'
+        },
+        {
+          title: '型号',
+          checked: true,
+          dataIndex: 'model'
+        },
+        {
+          title: '设备类型',
+          dataIndex: 'type',
+          checked: true,
+          width: 200,
+          customRender: (text, record, index) => {
+            return record.typeName
+          }
+        },
+        {
+          title: '设备等级',
+          dataIndex: 'level',
+          checked: true,
+          width: 200,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.levelMap, text)
+          }
+        },
+        {
+          title: '状态',
+          dataIndex: 'status',
+          checked: true,
+          width: 200,
+          scopedSlots: { customRender: 'status' }
+        },
+        {
+          title: '备注',
+          dataIndex: 'remark',
+          width: 200
+        },
+        {
+          title: '操作',
+          key: 'action',
+          width: '200px',
+          align: 'center',
+          fixed: 'right',
+          scopedSlots: { width: 200, customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        parameter = {
+          ...parameter,
+          ...this.queryParam,
+          ...this.extraQueryParam,
+          typeList: this.typeList,
+          dataScope: {
+            sortBy: 'asc',
+            sortName: 'no'
+          }
+        }
+        return getSbInfoSyncPage(Object.assign(parameter, this.queryParam))
+          .then(res => {
+            return res.data
+          })
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+
+      options: {
+        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
+        rowSelection: {
+          selectedRowKeys: this.selectedRowKeys,
+          onChange: this.onSelectChange
+        }
+      },
+      optionAlertShow: true,
+      isCreated: false,
+      record: {}
+    }
+  },
+  created () {
+    this.tableOption()
+    this.depreciationTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_DEPRECIATIONTYPE)
+    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_INFO_STATUS)
+    this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_UNIT)
+    this.sourceTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBTYPE_SOURCETYPE)
+    this.useTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_UES_TYPE)
+    querySbPosition().then(res => {
+      this.sbPositionData = res.data
+    })
+    fetchSbTypeTree().then(res => {
+      this.treeData = res.data
+    })
+  },
+  methods: {
+    tableOption () {
+      // this.setTree()
+      if (!this.optionAlertShow) {
+        this.options = {
+          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
+          rowSelection: {
+            selectedRowKeys: this.selectedRowKeys,
+            onChange: this.onSelectChange,
+            type: this.type,
+            getCheckboxProps: record => ({
+              props: {
+                disabled: false,
+                name: record.id
+              }
+            })
+          },
+          customRow: (record) => {
+            return {
+              on: { // 事件
+                click: (event) => { // 点击行
+                  // 选择对象
+                  this.mySelect([record.id], [record])
+                },
+                dblclick: (event) => {
+                  this.mySelect([record.id], [record])
+                  this.handleSelect()
+                }
+              }
+            }
+          }
+        }
+        this.optionAlertShow = true
+      } else {
+        this.options = {
+          alert: false,
+          rowSelection: null
+        }
+        this.optionAlertShow = false
+      }
+    },
+    handleOk () {
+      // this.setTree()
+      this.$refs.table.refresh()
+    },
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    },
+    resetSearchForm () {
+      this.queryParam = {
+      }
+      this.$refs.table.refresh(true)
+    },
+    /**
+     * 设置设备类型树
+     */
+    base (record, queryParam = {}) {
+      this.visible = true
+      this.modalTitle = '选择设备'
+      this.queryParam = queryParam
+      this.record = record
+      if (this.isCreated) {
+        console.log(this.$refs.table)
+        this.$refs.table.clearSelected()
+        this.options.rowSelection.type = this.type
+        this.handleOk()
+      } else {
+        this.tableOption()
+        this.isCreated = true
+      }
+      // this.mySelect(this.selectedRowKeys, this.selectedRows)
+    },
+    handleCancel () {
+      this.visible = false
+      this.confirmLoading = false
+    },
+    handleSelect () {
+      if (this.selectedRowKeys.length === 0) {
+        this.$message.warn('请至少选择一项信息')
+      } else {
+        this.confirmLoading = true
+        this.$emit('selected', this.selectedRowKeys, this.selectedRows)
+        this.confirmLoading = false
+        this.visible = false
+      }
+    },
+    mySelect (selectedRowKeys, selectedRows) {
+      this.$refs.table.updateSelect(selectedRowKeys, selectedRows)
+      this.$refs.table.rowSelection.onChange(selectedRowKeys, selectedRows)
+    },
+    handleChange (value, label, extra) {
+      const data = this.treeData.find(item => item.id === value)
+      if (data && data.children && data.children.length > 0) {
+        this.typeList = data.children.map(item => item.id)
+      } else {
+        this.typeList = [value]
+      }
+    }
+  }
+}
+</script>