From 682a05db9dff8fc0ab615d3183953b24679c2166 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 30 五月 2024 13:00:32 +0800
Subject: [PATCH] 1.存货档案 按工序走功能绑定实现
---
src/views/materialManager/inventoryList.vue | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 266 insertions(+), 17 deletions(-)
diff --git a/src/views/materialManager/inventoryList.vue b/src/views/materialManager/inventoryList.vue
index e6ddef1..1324e8b 100644
--- a/src/views/materialManager/inventoryList.vue
+++ b/src/views/materialManager/inventoryList.vue
@@ -64,7 +64,13 @@
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<div style="display: flex">
- <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=8')">瀵煎叆</el-button>
+ <el-button
+ v-waves
+ type="success"
+ icon="el-icon-download"
+ @click="$router.push('./../systemSetting/dataImport?fileCode=8')"
+ >瀵煎叆
+ </el-button>
<el-button v-waves icon="el-icon-refresh-right" @click="syncERP">鍚屾瀛樿揣妗ｆ</el-button>
</div>
</div>
@@ -110,7 +116,13 @@
class="bodySearchReset"
:style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
>
- <el-button v-waves type="primary" icon="el-icon-search" @click="getTMaterielData($refs.treeLeftRef.getCurrentNode())">鏌ヨ</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ icon="el-icon-search"
+ @click="getTMaterielData($refs.treeLeftRef.getCurrentNode())"
+ >鏌ヨ
+ </el-button>
<el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
@@ -226,18 +238,18 @@
>
<template slot-scope="{row}">
+ <!-- <i-->
+ <!-- v-if="row.is_retdproc==='Y'"-->
+ <!-- :style="{color:$store.state.settings.theme}"-->
+ <!-- class="el-icon-share"-->
+ <!-- style="cursor: pointer"-->
+ <!-- @click="routeClick(row)"-->
+ <!-- />-->
+
<i
- v-if="row.is_retdproc==='Y'"
- :style="{color:$store.state.settings.theme}"
+ :style="{color:row.is_retdproc==='Y'?$store.state.settings.theme:`rgb(180 ,181, 185)`,cursor: 'pointer'}"
class="el-icon-share"
- style="cursor: pointer"
- @click="routeClick(row)"
- />
- <i
- v-if="row.is_retdproc==='N'"
- style="color:rgb(180 ,181, 185);cursor: pointer"
- class="el-icon-share"
- @click="routeClick(row)"
+ @click="mesSetting.route?routeClick(row):routeClick2(row)"
/>
</template>
</el-table-column>
@@ -592,7 +604,6 @@
:visible.sync="dialogVisibleRoute"
width="800px"
top="5vh"
-
class="dialogVisibleRoute"
@closed="handleCloseRoute"
@close="handleCloseRoute"
@@ -724,6 +735,120 @@
</span>
</el-dialog>
+ <!-- 鎸夊伐鑹鸿蛋 宸ュ簭瀵硅瘽妗�-->
+ <el-dialog
+ v-el-drag-dialog
+ :close-on-click-modal="false"
+ title="鍏宠仈宸ュ簭"
+ :visible.sync="dialogVisibleStep"
+ width="800px"
+ top="15vh"
+ class="dialogVisibleStep"
+ @closed="handleCloseStep"
+ @close="handleCloseStep"
+ >
+
+ <div style="display: flex;align-items: center">
+ <div style="font-weight: bolder">宸ュ簭閫夋嫨锛�</div>
+ <el-drag-select
+ v-model="stepSelectedValue"
+ style="width:570px;"
+ multiple
+ placeholder="璇烽�夋嫨鐩稿搴斿伐搴�"
+ >
+ <!-- :disabled="!(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"-->
+ <el-option
+ v-for="item in stepSelectArr"
+ :key="item.stepcode"
+ :label="item.stepname"
+ :value="item.stepcode"
+ />
+ </el-drag-select>
+ </div>
+
+ <el-table
+ ref="stepTableDataRef"
+ :data="stepTableData"
+ border
+ :row-class-name="tableRowClassName"
+ height="300"
+ style="width: 100%;margin-top: 15px;"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ row-key="stepcode"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="50"
+ />
+ <el-table-column
+ prop="stepcode"
+ show-tooltip-when-overflow
+ label="宸ュ簭缂栫爜"
+ />
+ <el-table-column
+ prop="stepname"
+ label="宸ュ簭鍚嶇О"
+ show-tooltip-when-overflow
+ />
+ <!-- <el-table-column-->
+ <!-- prop="stepprice"-->
+ <!-- label="鐢熶骇鍗曚环"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <el-input-->
+ <!-- v-model="row.stepprice"-->
+ <!-- placeholder="璇疯緭鍏ュ伐搴忓崟浠�"-->
+ <!-- oninput="value=value.replace(/[^0-9.]/g,'')"-->
+ <!-- style="width: 100%"-->
+ <!-- @click.stop=""-->
+ <!-- />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <!-- <el-tooltip class="item" effect="dark" content="绉诲姩" placement="top">-->
+ <i
+ class="el-icon-rank"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: move"
+ />
+ <!-- </el-tooltip>-->
+ <!-- @click="edit('edit',row)"-->
+
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i
+ class="el-icon-delete"
+ :style="{color:$store.state.settings.theme}"
+ style="margin-left: 15px;"
+ @click="stepDel(row)"
+ />
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="stepDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="stepDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -741,15 +866,17 @@
TMaterielData, TMaterielDelete, TMaterielFileAssociationRoute
} from '@/api/ProductModel'
import arrayToTree from 'array-to-tree'
-import { UnitSerch, WareHouse } from '@/api/GeneralBasicData'
+import { StepData, UnitSerch, WareHouse } from '@/api/GeneralBasicData'
import { SaveSearchMateriel_Info } from '@/api/ErpSyncMes'
import $ from 'jquery'
+import Sortable from 'sortablejs'
+import ElDragSelect from '@/components/DragSelect'
export default {
name: 'RoleList',
directives: { waves, elDragDialog },
components: {
- Pagination
+ Pagination, ElDragSelect
},
data() {
return {
@@ -859,7 +986,36 @@
},
defaultroute_code: '', // 榛樿宸ヨ壓璺嚎閫変腑鍊�
defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
- projectTableData: [] // 璁惧鍒楄〃
+ projectTableData: [], // 宸ュ簭鍒楄〃
+ mesSetting: JSON.parse(localStorage.getItem('mesSetting')),
+
+ // 鎸夊伐搴忚蛋
+ dialogVisibleStep: false,
+ stepTableData: [],
+ sortable: null,
+ stepSelectArr: [], // 宸ュ簭涓嬫媺鏁版嵁
+ stepSelectedValue: [] // 宸ュ簭涓嬫媺閫変腑鍊�
+ }
+ },
+ watch: {
+ 'stepSelectedValue': {
+ // deep: true,
+ handler: function(val) {
+ // do something with the new and old value of stepSelectedValue
+ console.log(val, 1)
+ const arr = JSON.parse(JSON.stringify(this.stepTableData))
+ const arrStepcode = arr.map(i => i.stepcode)
+ this.stepTableData = []
+ val.forEach(i => {
+ this.stepTableData.push(
+ {
+ stepcode: i,
+ stepname: this.stepSelectArr.find(j => j.stepcode === i).stepname
+ // stepprice: arrStepcode.includes(i) ? arr.find(j => j.stepcode === i).stepprice : 0
+ }
+ )
+ })
+ }
}
},
@@ -874,10 +1030,93 @@
this.getSelectApi()
},
methods: {
+ // 宸ヨ壓鐐瑰嚮 ,鎸夊伐搴忚蛋
+ async routeClick2(row) {
+ this.dialogVisibleStep = true
+ this.dialogFormRoute.projectCode = row.partcode
+
+ const res = await TMaterielFileAssociationRoute({ partcode: this.dialogFormRoute.projectCode })
+ if (res.code === '200' && res.data.length > 0) {
+ this.stepSelectedValue = res.data.map(i => i.step_code)
+ }
+
+ // 鎷栧姩琛ㄦ牸
+ this.$nextTick(() => {
+ this.setSort()
+ })
+ },
+
+ stepDialogVisibleCancel() {
+ this.dialogVisibleStep = false
+ },
+
+ async stepDialogVisibleConfirm() {
+ if (this.stepSelectedValue.length === 0) {
+ return this.$message.info('宸ュ簭鑷冲皯瑕佹湁涓�閬擄紒')
+ }
+ const children = []
+ this.stepSelectedValue.forEach((item, index) => {
+ const t = this.stepSelectArr.find(i => i.stepcode === item)
+ children.push({
+ 'code': t.stepcode,
+ 'name': t.stepname,
+ 'seq': index + 1,
+ 'isbott': index === 0 ? 'Y' : 'N',
+ 'isend': index === this.stepSelectedValue.length - 1 ? 'Y' : 'N'
+ })
+ })
+ const data = [
+ {
+ 'partcode': this.dialogFormRoute.projectCode,
+ 'defaultroute_code': '',
+ 'children': children
+ }
+ ]
+ this.$store.state.app.buttonIsDisabled = true
+ const res = await SaveTMaterielFile(data)
+ if (res.code === '200') {
+ this.dialogVisibleStep = false
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+ this.$store.state.app.buttonIsDisabled = false
+ }
+ },
+ // 宸ュ簭鍒犻櫎
+ stepDel(row) {
+ const index = this.stepSelectedValue.findIndex(i => i === row.stepcode)
+ this.stepSelectedValue.splice(index, 1)
+ },
+ handleCloseStep() {
+ this.stepTableData = []
+ this.sortable = null
+ this.stepSelectedValue = []
+ },
+
+ setSort() {
+ const el = this.$refs.stepTableDataRef.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
+ this.sortable = Sortable.create(el, {
+ ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
+ setData: function(dataTransfer) {
+ // to avoid Firefox bug
+ // Detail see : https://github.com/RubaXa/Sortable/issues/1012
+ dataTransfer.setData('Text', '')
+ },
+ onEnd: evt => {
+ const targetRow = this.stepTableData.splice(evt.oldIndex, 1)[0]
+ this.stepTableData.splice(evt.newIndex, 0, targetRow)
+
+ this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+ // for show the changes, you can delete in you code
+ // const tempIndex = this.newList.splice(evt.oldIndex, 1)[0]
+ // this.newList.splice(evt.newIndex, 0, tempIndex)
+ }
+ })
+ },
+
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
},
- // 宸ヨ壓璺嚎鐐瑰嚮
+
/* 鐐瑰嚮鍏宠仈宸ヨ壓璺嚎妯″潡*/
// 宸ヨ壓璺嚎鐐瑰嚮
routeClick(row) {
@@ -1007,6 +1246,10 @@
const { data: res3 } = await WareHouse()
this.idwarehouseArr = res3
+
+ // 鑾峰彇宸ュ簭
+ const { data: res4 } = await StepData()
+ this.stepSelectArr = res4
},
async getTMaterielClassTree() {
@@ -1454,4 +1697,10 @@
margin-top: -3px;
}
+::v-deep .el-select__caret {
+ display: flex !important;
+ justify-content: center !important;
+ align-items: center !important;
+}
+
</style>
--
Gitblit v1.9.3