Commit 8c8d376c authored by 张海景's avatar 张海景

update:修改工序加上弹窗选择

parent 305dd83b
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- 添加或修改生产BOM对话框 --> <!-- 选择打印模版对话框 -->
<el-dialog title="选择打印模版" :visible.sync="visible" width="960px" append-to-body> <el-dialog title="选择打印模版" :visible.sync="visible" width="960px" append-to-body>
<templatePrint ref="templatePrintRef" v-if="visible" type="single" reportType='package_label' :operation="false"></templatePrint> <templatePrint ref="templatePrintRef" v-if="visible" type="single" reportType='package_label' :operation="false"></templatePrint>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
......
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="工序编码" prop="processCode"> <el-form-item label="工序编码" prop="processCode">
<el-input <el-input
v-model="queryParams.processCode" v-model="queryParams.processCode"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row v-if="operation" :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
...@@ -77,8 +77,17 @@ ...@@ -77,8 +77,17 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange" highlight-current-row
<el-table-column type="selection" width="55" align="center" /> @current-change="handleCurrentChange">
<el-table-column type="selection" v-if="type === 'multiple'" width="55" align="center" />
<el-table-column width="55" v-else align="center">
<template v-slot="scope">
<!-- 可以手动的修改label的值,从而控制选择哪一项 -->
<el-radio class="radio" v-model="selectedItemId" :label="scope.row.processCode"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column label="工序编码" align="center" prop="processCode" > <el-table-column label="工序编码" align="center" prop="processCode" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -95,7 +104,7 @@ ...@@ -95,7 +104,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" v-if="operation" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -198,6 +207,16 @@ export default { ...@@ -198,6 +207,16 @@ export default {
name: "Process", name: "Process",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],
components: {Processcontent}, components: {Processcontent},
props: {
type: {
type: String,
default: 'multiple'
},
operation: {
type: Boolean,
default: true
}
},
data() { data() {
return { return {
//自动生成编码 //自动生成编码
...@@ -242,7 +261,9 @@ export default { ...@@ -242,7 +261,9 @@ export default {
enableFlag: [ enableFlag: [
{ required: true, message: "是否启用不能为空", trigger: "blur" } { required: true, message: "是否启用不能为空", trigger: "blur" }
], ],
} },
selectedItemId: null,
currentData: {}
}; };
}, },
created() { created() {
...@@ -290,6 +311,10 @@ export default { ...@@ -290,6 +311,10 @@ export default {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
handleCurrentChange(row) {
this.currentData = row
this.selectedItemId = row.processCode
},
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.processId) this.ids = selection.map(item => item.processId)
......
...@@ -147,7 +147,9 @@ ...@@ -147,7 +147,9 @@
<treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true" @select="onItemTypeSelected" placeholder="请选择所属分类" /> <treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true" @select="onItemTypeSelected" placeholder="请选择所属分类" />
</el-form-item> </el-form-item>
<el-form-item label="工序名称" prop="processName"> <el-form-item label="工序名称" prop="processName">
<el-input v-model="form.processName" placeholder="请输入工序名称" /> <el-input v-model="form.processName" placeholder="请输入工序名称" >
<el-button slot="append" @click="visible = true" icon="el-icon-search"></el-button>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="最大数量" prop="maxNum"> <el-form-item label="最大数量" prop="maxNum">
<el-input v-model="form.maxNum" placeholder="请输入最大数量" /> <el-input v-model="form.maxNum" placeholder="请输入最大数量" />
...@@ -202,6 +204,15 @@ ...@@ -202,6 +204,15 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 选择工序对话框 -->
<el-dialog title="选择工序" :visible.sync="visible" width="1200px" append-to-body>
<processList ref="processListRef" v-if="visible" type="single" :operation="false"></processList>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSubmitProcess">确 定</el-button>
<el-button @click="visible = false">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -211,13 +222,15 @@ import { treeselect } from "@/api/mes/md/itemtype"; ...@@ -211,13 +222,15 @@ import { treeselect } from "@/api/mes/md/itemtype";
import TemplateSelect from "@/components/qctemplateSelect/single.vue"; import TemplateSelect from "@/components/qctemplateSelect/single.vue";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import processList from '@/views/mes/pro/process/index'
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
export default { export default {
name: "TemplateProcess", name: "TemplateProcess",
components: { components: {
Treeselect, Treeselect,
TemplateSelect TemplateSelect,
processList
}, },
data() { data() {
return { return {
...@@ -279,7 +292,8 @@ export default { ...@@ -279,7 +292,8 @@ export default {
], processName: [ ], processName: [
{ required: true, message: "工序名称不能为空", trigger: "blur" } { required: true, message: "工序名称不能为空", trigger: "blur" }
], ],
} },
visible: false
}; };
}, },
created() { created() {
...@@ -296,6 +310,14 @@ export default { ...@@ -296,6 +310,14 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
handleSubmitProcess() {
if (!this.$refs.processListRef.selectedItemId) {
this.$message.warning('请选择工序')
return
}
this.form.processName = this.$refs.processListRef.currentData.processName
this.visible = false
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment