Merge remote-tracking branch 'origin/master'

10 months ago · c21f1f13b5
4 changed files with 2441 additions and 70 deletions
--- a/src/api/part/bomSearch3.js
+++ b/src/api/part/bomSearch3.js
@ -1,26 +1,62 @@
 import { createAPI } from "@/utils/httpRequest.js";

-/**
- * bom列表查询
- * @param data
- * @returns {*}
- */
+// bom列表查询
 export const bomSearchHeader = data => createAPI(`/part/bomSearch3/bomSearchHeader`,'post',data)

-/**
- * 查询bom替代树形
- * @param data
- * @returns {*}
- */
+// 查询bom替代树形
 export const getAlternativeTree = data => createAPI(`/part/bomSearch3/getAlternativeTree`,'post',data)

-/**
- * 查询子物料
- * @param data
- * @returns {*}
- */
+// 查询子物料
 export const getComponentPartList = data => createAPI(`/part/bomSearch3/getComponentPartList`,'post',data)

+// 新增数据到临时表
+export const saveCopyBomInfo = data => createAPI(`/part/bomSearch3/saveCopyBomInfo`,'post',data)
+
+// 查询树形
+export const queryCopyTempBomTree = data => createAPI(`/part/bomSearch3/queryCopyTempBomTree`,'post',data)
+
+// 查BOM
+export const queryCopyTempBom = data => createAPI(`/part/bomSearch3/queryCopyTempBom`,'post',data)
+
+// 查Routing
+export const queryCopyTempRouting = data => createAPI(`/part/bomSearch3/queryCopyTempRouting`,'post',data)
+
+export const queryCopyTempRoutingVersion = data => createAPI(`/part/bomSearch3/queryCopyTempRoutingVersion`,'post',data)
+
+export const queryCopyTempRoutingAlternative = data => createAPI(`/part/bomSearch3/queryCopyTempRoutingAlternative`,'post',data)
+
+export const changeCopyTempRoutingChange = data => createAPI(`/part/bomSearch3/changeCopyTempRoutingChange`,'post',data)
+
+export const queryCopyTempBomTreeLevel = data => createAPI(`/part/bomSearch3/queryCopyTempBomTreeLevel`,'post',data)
+
+export const handleQueryCopyTempBomAlternative = data => createAPI(`/part/bomSearch3/handleQueryCopyTempBomAlternative`,'post',data)
+
+export const changeCopyTempBomTree = data => createAPI(`/part/bomSearch3/changeCopyTempBomTree`,'post',data)
+
+export const changePart = data => createAPI(`/part/bomSearch3/changePart`,'post',data)
+
+export const getTempComponentLineSequence = data => createAPI(`/part/bomSearch3/getTempComponentLineSequence`,'post',data)
+
+export const saveTempBomComponent = data => createAPI(`/part/bomSearch3/saveTempBomComponent`,'post',data)
+
+export const updateTempBomComponent = data => createAPI(`/part/bomSearch3/updateTempBomComponent`,'post',data)
+
+export const deleteTempBomComponent = data => createAPI(`/part/bomSearch3/deleteTempBomComponent`,'post',data)
+
+export const queryTempMaxOperationNo = data => createAPI(`/part/bomSearch3/queryTempMaxOperationNo`,'post',data)
+
+export const saveTempRoutingComponent = data => createAPI(`/part/bomSearch3/saveTempRoutingComponent`,'post',data)
+
+export const updateTempRoutingComponent = data => createAPI(`/part/bomSearch3/updateTempRoutingComponent`,'post',data)
+
+export const deleteTempRoutingComponent = data => createAPI(`/part/bomSearch3/deleteTempRoutingComponent`,'post',data)
+
+export const queryCopyTempItemValue = data => createAPI(`/part/bomSearch3/queryCopyTempItemValue`,'post',data)
+
+export const commitTempItemValue = data => createAPI(`/part/bomSearch3/commitTempItemValue`,'post',data)
+
+export const saveCopyResult = data => createAPI(`/part/bomSearch3/saveCopyResult`,'post',data)
+



--- a/src/views/modules/part/agentInformation.vue
+++ b/src/views/modules/part/agentInformation.vue
@ -585,7 +585,6 @@ export default {
            })
          }
        })
-      }).catch(() => {
      })
    },

--- a/src/views/modules/part/bomSearch3.vue
+++ b/src/views/modules/part/bomSearch3.vue
@ -28,7 +28,7 @@
        <el-input v-model="searchData.engChgLevel" style="width: 70px"></el-input>
      </el-form-item>
      <el-form-item :label="' '">
-        <el-button v-if="!authSearch" :loading="queryLoading" @click="getDataList()">查询</el-button>
+        <el-button v-if="!authSearch" @click="getDataList()">查询</el-button>
        <download-excel
          :fields="fields()"
          :data="exportData"
@ -54,6 +54,7 @@
      ref="bomHeaderTable"
      @row-click="headerClickRow"
      @current-change="changeCurrentRow"
+      v-loading="queryLoading"
      style="width: 100%">
      <el-table-column
        v-for="(item,index) in columnList" :key="index"
@ -70,6 +71,16 @@
          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
        </template>
      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="80"
+        label="操作">
+        <template slot-scope="scope">
+          <el-link style="cursor: pointer" v-loading="queryLoading" @click="copyBomModal(scope.row)">BOM复制</el-link>
+        </template>
+      </el-table-column>
    </el-table>

    <!-- 分页插件 -->
@ -129,6 +140,8 @@

    <!-- chooseList模态框 -->
    <ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>
+
+    <copy-bom-modal ref="copyBomModal" @refreshPageTables="getDataList"></copy-bom-modal>
  </div>
 </template>

@ -137,16 +150,17 @@ import {
  bomSearchHeader, // bom列表查询
  getAlternativeTree, // 查询bom替代树形
  getComponentPartList, // 查询子物料
+  saveCopyBomInfo, // 新增数据到临时表
 } from '@/api/part/bomSearch3.js'
 import {getSiteAndBuByUserName2} from "@/api/qc/qc.js"
 import ChooseList from '@/views/modules/common/Chooselist_eam'
-import dayjs from "dayjs";
+import copyBomModal from "./copy_bom_modal.vue"
 export default {
-  // 组件
  components: {
+    copyBomModal,
    ChooseList
  },
-  // 监听
+
  watch: {
    searchData: {
      deep: true,
@ -155,7 +169,7 @@ export default {
      }
    }
  },
-  // 对象
+
  data () {
    return {
      // 导出
@ -698,23 +712,19 @@ export default {
      this.getDataList()
    }
  },
-  // js
+
  methods: {
+
    // ======== 分页相关方法 ========
-    /**
-     * 每页数
-     * @param val
-     */
+
+    // 每页数
    sizeChangeHandle (val) {
      this.pageSize = val
      this.pageIndex = 1
      this.getDataList()
    },

-    /**
-     * 当前页
-     * @param val
-     */
+    // 当前页
    currentChangeHandle (val) {
      this.pageIndex = val
      this.getDataList()
@ -733,9 +743,8 @@ export default {
    },

    // ======== 列表数据操作方法 ========
-    /**
-     * 获取数据列表
-     */
+
+    // 获取数据列表
    getDataList () {
      this.searchData.limit = this.pageSize
      this.searchData.page = this.pageIndex
@ -761,20 +770,13 @@ export default {
      })
    },

-    /**
-     * 单机选中信息
-     * @param row
-     */
+    // 单机选中信息
    headerClickRow (row) {
      this.$refs.bomHeaderTable.toggleRowSelection(row)
      this.headerCurrentRow = JSON.parse(JSON.stringify(row))
    },

-    /**
-     * 树节点单机事件
-     * @param e
-     * @param node
-     */
+    // 树节点单机事件
    handleNodeClick (e) {
      // 查询替代子物料
      getComponentPartList(e).then(({data}) => {
@ -785,22 +787,39 @@ export default {
        }
      })
    },
+
+    // copyBom
+    copyBomModal (row) {
+      this.queryLoading = true
+      row.createBy = this.$store.state.user.name
+      // 新增数据到临时表
+      saveCopyBomInfo(row).then(({data}) => {
+        if (data && data.code === 0) {
+          this.$nextTick(() => {
+            this.$refs.copyBomModal.init(row)
+          })
+          this.queryLoading = false
+        } else {
+          this.queryLoading = false
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      }).catch(() => {
+        this.queryLoading = false
+      })
+
+    },
+
    // ======== 页签切换相关方法 ========
-    /**
-     * 列表表格选择替换
-     * @param tab
-     * @param event
-     */
+
+    // 列表表格选择替换
    tabClick (tab, event) {
      // 刷新列表数据
      this.refreshCurrentTabTable()
    },

-    /**
-     * 当前值发生变化的时候修改
-     * @param row
-     * @param oldRow
-     */
+    // 当前值发生变化的时候修改
    changeCurrentRow (row, oldRow) {
      // 判断是否是获取焦点的事件
      if (row) {
@ -811,9 +830,7 @@ export default {
      }
    },

-    /**
-     * 刷新页签的table数据
-     */
+    // 刷新页签的table数据
    refreshCurrentTabTable () {
      if (this.activeTable === 'GraphicalStructure') {
        // 获取bom替代树形
@ -821,9 +838,7 @@ export default {
      }
    },

-    /**
-     * 获取bom替代树形
-     */
+    // 获取bom替代树形
    getAlternativeTree () {
      getAlternativeTree(this.headerCurrentRow).then(({data}) => {
        if (data && data.code === 0) {
@ -841,11 +856,8 @@ export default {
    },

    // ======== chooseList相关方法 ========
-    /**
-     * 获取基础数据列表S
-     * @param val
-     * @param type
-     */
+
+    // 获取基础数据列表S
    getBaseList (val, type) {
      this.tagNo = val
      this.$nextTick(() => {
@ -856,10 +868,8 @@ export default {
        this.$refs.baseList.init(val, strVal)
      })
    },
-    /**
-     * 列表方法的回调
-     * @param val
-     */
+
+    // 列表方法的回调
    getBaseData (val) {
      if (this.tagNo === 117) {
        this.componentData.issueToLoc = val.location_id
@ -875,9 +885,8 @@ export default {
    },

    // ======== 导出相关方法 ========
-    /**
-     * 导出excel
-     */
+
+    // 导出excel
    async createExportData () {
      this.searchData.limit = -1
      this.searchData.page = 1
@ -886,8 +895,11 @@ export default {
      })
      return this.resultList
    },
+
    startDownload () {},
+
    finishDownload () {},
+
    fields () {
      let json = '{'
      this.columnList.forEach((item, index) => {
--- a/src/views/modules/part/copy_bom_modal.vue
+++ b/src/views/modules/part/copy_bom_modal.vue