From 074f334d060ec7d33d39cdeaae5ed84a2a2dd3a3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 八月 2023 18:20:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
web_standard/src/components/ext/OperaWInboundExtWindow.vue | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/web_standard/src/components/ext/OperaWInboundExtWindow.vue b/web_standard/src/components/ext/OperaWInboundExtWindow.vue
index c49c986..8c51fc6 100644
--- a/web_standard/src/components/ext/OperaWInboundExtWindow.vue
+++ b/web_standard/src/components/ext/OperaWInboundExtWindow.vue
@@ -101,6 +101,18 @@
</el-select>
</template>
</el-table-column>
+ <el-table-column v-if="winType==2" label="宸ュ簭" min-width="100px">
+ <template slot-scope="{row}">
+ <el-select v-model="row.procedureId" filterable placeholder="璇烽�夋嫨" @select="selectProcedure">
+ <el-option
+ v-for="(item, index) in row.procedureList"
+ :key="index"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
<el-table-column label="鎵规鍙�" min-width="100px">
<template slot-scope="{row}">
<el-input v-model="row.batch" placeholder="璇疯緭鍏ユ壒娆″彿" v-trim/>
@@ -126,8 +138,7 @@
<SelectMaterail
ref="selectMaterail"
@selectData="selectData"
- >
- </SelectMaterail>
+ ></SelectMaterail>
</GlobalWindow>
</template>
@@ -155,6 +166,7 @@
origin: 0,
woutboundInBodyBeanList: []
},
+ winType:0,
disabled: false,
pickerOptions: {},
tempWarehouses: [],
@@ -221,6 +233,7 @@
open (title, type = 0) {
this.title = title
this.visible = true
+ this.winType=type
// 鏂板缓
this.$nextTick(() => {
this.$refs.form.resetFields()
@@ -370,7 +383,7 @@
addMaterial () {
// console.log('澧炲姞鐗╂枡')
// const ids = this.form.woutboundInBodyBeanList.map(e => { return e.materialId }).join(',')
- this.$refs.selectMaterail.open('閫夋嫨鐗╂枡', { ids: '', multiple: true, isPurchase:true })
+ this.$refs.selectMaterail.open('閫夋嫨鐗╂枡', { ids: '', multiple: true, isPurchase:false,queryType:1 })
},
deleteMaterail (row) {
// console.log('鍒犻櫎鐗╂枡')
@@ -384,7 +397,8 @@
code: item.mmodelCode,
name: item.mmodelUnionName,
umodelName: item.umodelName,
-
+ procedureList:item.procedureList,
+ procedureId:null,
locationId: this.whLocation.length ? this.whLocation[0].id : null,
qualityType: this.whLocation.length ? 0 : this.houseProperty,
materialId: item.id,
--
Gitblit v1.9.3