Skip to content

M
mes-ui
Commit bccd89cc authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

打样最终版1

parent 6cfa0a8e
Show whitespace changes
Inline Side-by-side
Showing with 290 additions and 465 deletions
src/views/mes/pro/prototypeMake/prototypeMakeApply.vue
View file @ bccd89cc
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="单据状态" prop="prototypeRequestStatus"> <el-form-item label="单据状态" prop="prototypeMakeStatus">
<el-select <el-select
v-model="queryParams.prototypeRequestStatus" v-model="queryParams.prototypeMakeStatus"
clearable clearable
placeholder="请选择单据状态" placeholder="请选择单据状态"
> >
...@@ -31,23 +31,7 @@ ...@@ -31,23 +31,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item>
<!-- <el-form-item label="样品名称" prop="abbreviation">
<el-input
v-model="queryParams.itemName"
placeholder="请输入样品名称"
clearable
@keyup.enter.native="handleQuery"
/> -->
<!-- <el-date-picker
clearable
v-model="queryParams.abbreviation"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择申请日期"
>
</el-date-picker>-->
<!-- </el-form-item> -->
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
...@@ -70,7 +54,7 @@ ...@@ -70,7 +54,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['mes:pro:prototypeRequest:add']" v-hasPermi="['mes:pro:prototypeMake:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
...@@ -82,7 +66,7 @@ ...@@ -82,7 +66,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['mes:pro:prototypeRequest:edit']" v-hasPermi="['mes:pro:prototypeMake:edit']"
>修改</el-button >修改</el-button
> >
</el-col> </el-col>
...@@ -94,7 +78,7 @@ ...@@ -94,7 +78,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:pro:prototypeRequest:remove']" v-hasPermi="['mes:pro:prototypeMake:remove']"
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
...@@ -105,7 +89,7 @@ ...@@ -105,7 +89,7 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['mes:pro:prototypeRequest:export']" v-hasPermi="['mes:pro:prototypeMake:export']"
>导出</el-button >导出</el-button
> >
</el-col> </el-col>
...@@ -117,18 +101,18 @@ ...@@ -117,18 +101,18 @@
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="prototypeRequestList" :data="prototypeMakeList"
row-key="prototypeMakeId" row-key="prototypeMakeId"
default-expand-all default-expand-all
> >
<el-table-column label="样品编码" width="180" prop="prototypeRequestCode"> <el-table-column label="样品编码" width="180" prop="prototypeMakeCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:query']" v-hasPermi="['mes:pro:prototypeMake:query']"
>{{ scope.row.prototypeRequestCode }}</el-button >{{ scope.row.prototypeMakeCode }}</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
...@@ -149,7 +133,12 @@ ...@@ -149,7 +133,12 @@
align="center" align="center"
prop="enName" prop="enName"
/> />
<el-table-column label="网版目数" width="120" align="center" prop="screenItem" /> <el-table-column
label="网版目数"
width="120"
align="center"
prop="screenItem"
/>
<el-table-column <el-table-column
label="啤版目数" label="啤版目数"
width="200" width="200"
...@@ -157,21 +146,76 @@ ...@@ -157,21 +146,76 @@
prop="pibanItem" prop="pibanItem"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="模切版目数" width="120" align="center" prop="diecuttingItem" /> <el-table-column
<el-table-column label="标准色号" width="120" align="center" prop="standardColor" /> label="模切版目数"
<el-table-column label="NG原因" width="120" align="center" prop="ngReason" /> width="120"
align="center"
prop="diecuttingItem"
/>
<el-table-column
label="标准色号"
width="120"
align="center"
prop="standardColor"
/>
<el-table-column
label="NG原因"
width="120"
align="center"
prop="ngReason"
/>
<el-table-column label="模数" width="120" align="center" prop="module" /> <el-table-column label="模数" width="120" align="center" prop="module" />
<el-table-column label="列" width="120" align="center" prop="col" /> <el-table-column label="列" width="120" align="center" prop="col" />
<el-table-column label="行" width="120" align="center" prop="row" /> <el-table-column label="行" width="120" align="center" prop="row" />
<el-table-column label="搭板数" width="120" align="center" prop="buttstrapNum" /> <el-table-column
<el-table-column label="列双刀位" width="120" align="center" prop="coldoubleCutspacing" /> label="搭板数"
<el-table-column label="行双刀位" width="120" align="center" prop="rowdoubleCutspacing" /> width="120"
<el-table-column label="派工倍数" width="120" align="center" prop="sendworkMultiple" /> align="center"
<el-table-column label="印张长度" width="120" align="center" prop="printingPaperlenth" /> prop="buttstrapNum"
<el-table-column label="印张宽度" width="120" align="center" prop="printPaperwidth" /> />
<el-table-column label="印刷正面颜色" width="120" align="center" prop="front_color_id" /> <el-table-column
<el-table-column label="印刷反面颜色" width="120" align="center" prop="opposite_color_id" /> label="列双刀位"
<!-- <el-table-column width="120"
align="center"
prop="coldoubleCutspacing"
/>
<el-table-column
label="行双刀位"
width="120"
align="center"
prop="rowdoubleCutspacing"
/>
<el-table-column
label="派工倍数"
width="120"
align="center"
prop="sendworkMultiple"
/>
<el-table-column
label="印张长度"
width="120"
align="center"
prop="printingPaperlenth"
/>
<el-table-column
label="印张宽度"
width="120"
align="center"
prop="printPaperwidth"
/>
<el-table-column
label="印刷正面颜色"
width="120"
align="center"
prop="front_color_id"
/>
<el-table-column
label="印刷反面颜色"
width="120"
align="center"
prop="opposite_color_id"
/>
<el-table-column
label="分配方式" label="分配方式"
align="center" align="center"
prop="modality" prop="modality"
...@@ -207,12 +251,7 @@ ...@@ -207,12 +251,7 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="测试标准" align="center" prop="testStandard" />
label="申请单状态"
align="center"
prop="prototypeRequestStatus"
/>
<el-table-column label="测试标准" align="center" prop="testStandard" /> -->
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column <el-table-column
label="操作" label="操作"
...@@ -225,18 +264,18 @@ ...@@ -225,18 +264,18 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.prototypeRequestStatus == '审批中'" v-if="scope.row.prototypeMakeStatus == '打样中'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:edit']" v-hasPermi="['mes:pro:prototypeMake:edit']"
>修改</el-button >修改</el-button
> >
<!-- <el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-circle-check" icon="el-icon-circle-check"
v-if="scope.row.prototypeRequestStatus == '审批中'" v-if="scope.row.prototypeMakeStatus == '审批中'"
@click="handleFinish(scope.row)" @click="handleFinish(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:update']" v-hasPermi="['mes:pro:prototypeMake:update']"
>完成</el-button >完成</el-button
> --> > -->
<el-button <el-button
...@@ -244,7 +283,7 @@ ...@@ -244,7 +283,7 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:remove']" v-hasPermi="['mes:pro:prototypeMake:remove']"
>删除</el-button >删除</el-button
> >
</template> </template>
...@@ -257,306 +296,31 @@ ...@@ -257,306 +296,31 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改生产工单对话框 -->
<!-- <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="工单编号" prop="prototypeRequestCode">
<el-input
v-model="form.prototypeRequestCode"
placeholder="请输入工单编号"
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch
v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)"
v-if="optType != 'view' && form.status == 'PREPARE'"
>
</el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工单名称" prop="prototypeRequestName">
<el-input
v-model="form.prototypeRequestName"
placeholder="请输入工单名称"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="来源类型" prop="orderSource">
<el-radio-group
v-model="form.orderSource"
disabled
v-if="optType == 'view'"
>
<el-radio
v-for="dict in dict.type.mes_prototypeRequest_sourcetype"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
<el-radio-group v-model="form.orderSource" v-else>
<el-radio
v-for="dict in dict.type.mes_prototypeRequest_sourcetype"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" v-if="form.orderSource == 'ORDER'">
<el-form-item label="订单编号" prop="sourceCode">
<el-input
v-model="form.sourceCode"
placeholder="请输入订单编号"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据状态" prop="status">
<el-select
v-model="form.status"
disabled
placeholder="请选择单据状态"
>
<el-option
v-for="dict in dict.type.mes_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="工单类型" prop="prototypeRequestType">
<el-select
v-model="form.prototypeRequestType"
placeholder="请选择类型"
>
<el-option
v-for="dict in dict.type.mes_prototypeRequest_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品编号" prop="productCode">
<el-input v-model="form.productCode" placeholder="请选择产品">
<el-button
slot="append"
@click="handleSelectProduct"
icon="el-icon-search"
></el-button>
</el-input>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected">
</ItemSelect>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品名称" prop="productName">
<el-input
v-model="form.productName"
placeholder="请选择产品"
disabled
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="规格型号" prop="productSpc">
<el-input
v-model="form.productSpc"
placeholder="请选择产品"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单位" prop="unitOfMeasure">
<el-input
v-model="form.unitOfMeasure"
placeholder="请选择产品"
disabled
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="工单数量" prop="quantity">
<el-input-number
:min="1"
v-model="form.quantity"
placeholder="请输入生产数量"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="需求日期" prop="requestDate">
<el-date-picker
clearable
v-model="form.requestDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择需求日期"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次号" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.orderSource == 'ORDER'">
<el-col :span="12">
<el-form-item label="客户编码" prop="clientCode">
<el-input v-model="form.clientCode" placeholder="请选择客户">
<el-button
slot="append"
@click="handleSelectClient"
icon="el-icon-search"
></el-button>
</el-input>
<ClientSelect ref="clientSelect" @onSelected="onClientSelected">
</ClientSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户名称" prop="clientName">
<el-input
v-model="form.clientName"
readonly="readonly"
placeholder="请输入客户名称"
/>
</el-form-item>
</el-col>
<el-col></el-col>
</el-row>
<el-row
v-if="
form.prototypeRequestType == 'OUTSOURCE' ||
form.prototypeRequestType == 'PURCHASE'
"
>
<el-col :span="12">
<el-form-item label="供应商编码" prop="vendorCode">
<el-input v-model="form.vendorCode" placeholder="请选择供应商">
<el-button
slot="append"
@click="handleSelectVendor"
icon="el-icon-search"
></el-button>
</el-input>
<VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商名称" prop="vendorName">
<el-input
v-model="form.vendorName"
readonly="readonly"
placeholder="请选择供应商"
/>
</el-form-item>
</el-col>
<el-col></el-col>
</el-row>
<el-row>
<el-col></el-col>
<el-col></el-col>
<el-col></el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" v-if="form.prototypeMakeId != null">
<el-tab-pane label="BOM组成">
<prototypeRequestbom ref="bomlist" :optType="optType" :prototypeRequest="form" @handleAddSub="handleSubAdd" ></prototypeRequestbom>
</el-tab-pane>
<el-tab-pane label="物料需求">
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button
type="primary"
@click="cancel"
v-if="optType == 'view' || form.status != 'PREPARE'"
>返回</el-button
>
<el-button
type="primary"
@click="submitForm"
v-if="form.status == 'PREPARE' && optType != 'view'"
>保 存</el-button
>
<el-button
type="success"
@click="handleConfirm"
v-if="
form.status == 'PREPARE' &&
optType != 'view' &&
form.prototypeMakeId != null
"
>确 认</el-button
>
<el-button @click="cancel">取 消</el-button>
</div></el-dialog> -->
</div> </div>
</template> </template>
<script> <script>
import { import {
listPrototypeRequest, listPrototypeMake,
getPrototypeRequest, getPrototypeMake,
delPrototypeRequest, delPrototypeMake,
addPrototypeRequest, addPrototypeMake,
updatePrototypeRequest, updatePrototypeMake,
} from "@/api/mes/pro/prototypeRequest"; } from "@/api/mes/pro/prototypeMake";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue"; import ClientSelect from "@/components/clientSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue"; import VendorSelect from "@/components/vendorSelect/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";
// 新增js // 新增js
import { listPrototypeMake, getPrototypeMake, delPrototypeMake, addPrototypeMake, updatePrototypeMake } from "@/api/mes/pro/prototypeMake"; // import { listPrototypeMake, getPrototypeMake, delPrototypeMake, addPrototypeMake, updatePrototypeMake } from "@/api/mes/pro/prototypeMake";
export default { export default {
name: "PrototypeRequest", name: "PrototypeMake",
dicts: [ dicts: [
"mes_order_status", "mes_pm_status",
"mes_prototypeRequest_sourcetype", "mes_prototypeMake_sourcetype",
"mes_prototypeRequest_type", "mes_prototypeMake_type",
], ],
components: { components: {
Treeselect, Treeselect,
...@@ -582,9 +346,9 @@ export default { ...@@ -582,9 +346,9 @@ export default {
// 非多个禁用 // 非多个禁用
multiple: true, multiple: true,
// 生产工单表格数据 // 生产工单表格数据
prototypeRequestList: [], prototypeMakeList: [],
// 生产工单树选项 // 生产工单树选项
prototypeRequestOptions: [], prototypeMakeOptions: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
...@@ -593,23 +357,21 @@ export default { ...@@ -593,23 +357,21 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
itemName: null,// 可以查简称与英文名 itemName: null, // 可以查简称与英文名
prototypeRequestStatus: null, prototypeMakeStatus: null,
}, },
options: [ options: [
{ value: "审批中", label: "审批中" }, { value: "2", label: "打样中" },
{ value: "待制作", label: "待制作" }, { value: "3", label: "待质检" },
{ value: "打样中", label: "打样中" }, { value: "4", label: "待确认" },
{ value: "待质检", label: "待质检" }, { value: "5", label: "已完成" },
{ value: "待确认", label: "待确认" },
{ value: "已完成", label: "已完成" },
], ],
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
// prototypeRequestCode: [ // prototypeMakeCode: [
// { required: true, message: "工单编码不能为空", trigger: "blur" } // { required: true, message: "工单编码不能为空", trigger: "blur" }
// ], // ],
}, },
...@@ -622,8 +384,8 @@ export default { ...@@ -622,8 +384,8 @@ export default {
/** 查询生产工单列表 */ /** 查询生产工单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listPrototypeRequest(this.queryParams).then((response) => { listPrototypeMake(this.queryParams).then((response) => {
this.prototypeRequestList = response.rows; this.prototypeMakeList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
...@@ -636,32 +398,34 @@ export default { ...@@ -636,32 +398,34 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
prototypeMakeId: null, prototypeMakeId: null,
prototypeMakeCode: null, prototypeMakeCode: null,
prototypeMakeId: null, prototypeRequestId: null,
routeId: null, routeId: null,
itemId: null, routeName: null,
screenItem: null, itemId: null,
pibanItem: null, itemName: null,
diecuttingItem: null, screenItem: null,
standardColor: null, pibanItem: null,
module: null, diecuttingItem: null,
col: null, standardColor: null,
row: null, module: null,
buttstrapNum: null, col: null,
coldoubleCutspacing: null, row: null,
rowdoubleCutspacing: null, buttstrapNum: null,
sendworkMultiple: null, coldoubleCutspacing: null,
printingPaperlenth: null, rowdoubleCutspacing: null,
printPaperwidth: null, sendworkMultiple: null,
frontColorId: null, printingPaperlenth: null,
oppositeColorId: null, printPaperwidth: null,
ngReason: null, frontColorId: null,
remark: null, oppositeColorId: null,
createBy: null, ngReason: null,
createTime: null, remark: null,
updateBy: null, createBy: null,
updateTime: null createTime: null,
updateBy: null,
updateTime: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -678,44 +442,25 @@ updateTime: null ...@@ -678,44 +442,25 @@ updateTime: null
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd(row) { handleAdd(row) {
// 跳转到申请单界面 // 跳转到申请单界面
this.$router.push("/mes/proofing/apply"); this.$router.push("/mes/pro/prototypeMake/apply");
return; return;
// this.reset();
// this.getTreeselect();
// if (row != null && row.prototypeMakeId) {
// this.form.parentId = row.prototypeMakeId;
// this.form.orderSource = row.orderSource;
// this.form.sourceCode = row.sourceCode;
// this.form.clientId = row.clientId;
// this.form.clientCode = row.clientCode;
// this.form.clientName = row.clientName;
// } else {
// this.form.parentId = 0;
// }
// this.open = true;
}, },
// 查询明细按钮操作 // 查询明细按钮操作
handleView(row) { handleView(row) {
this.reset(); this.reset();
const prototypeMakeId = row.prototypeMakeId || this.ids; const prototypeMakeId = row.prototypeMakeId || this.ids;
this.$router.push( this.$router.push(
"/mes/proofing/info?prototypeMakeId="+prototypeMakeId "/mes/pro/prototypeMake/info?prototypeMakeId=" + prototypeMakeId
); );
// getprototypeRequest(prototypeMakeId).then((response) => {
// this.form = response.data;
// this.open = true;
// this.title = "查看工单信息";
// this.optType = "view";
// });
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const prototypeMakeId = row.prototypeMakeId || this.ids; const prototypeMakeId = row.prototypeMakeId || this.ids;
this.$router.push( this.$router.push(
"/mes/proofing/edit?prototypeMakeId="+prototypeMakeId "/mes/pro/prototypeMake/edit?prototypeMakeId=" + prototypeMakeId
); );
// getPrototypeRequest(prototypeMakeId).then((response) => { // getPrototypeMake(prototypeMakeId).then((response) => {
// // this.form = response.data; // // this.form = response.data;
// // this.open = true; // // this.open = true;
// // this.title = "修改生产工单"; // // this.title = "修改生产工单";
...@@ -728,14 +473,14 @@ updateTime: null ...@@ -728,14 +473,14 @@ updateTime: null
// this.$refs["form"].validate(valid => { // this.$refs["form"].validate(valid => {
// if (valid) { // if (valid) {
// if (this.form.prototypeMakeId != null) { // if (this.form.prototypeMakeId != null) {
// updateprototypeRequest(this.form).then(response => { // updateprototypeMake(this.form).then(response => {
// this.$modal.msgSuccess("修改成功"); // this.$modal.msgSuccess("修改成功");
// //this.open = false; // //this.open = false;
// this.$refs["bomlist"].getList(); // this.$refs["bomlist"].getList();
// this.getList(); // this.getList();
// }); // });
// } else { // } else {
// addprototypeRequest(this.form).then(response => { // addprototypeMake(this.form).then(response => {
// this.$modal.msgSuccess("新增成功"); // this.$modal.msgSuccess("新增成功");
// //this.open = false; // //this.open = false;
// this.form.prototypeMakeId = response.data; // this.form.prototypeMakeId = response.data;
...@@ -748,9 +493,11 @@ updateTime: null ...@@ -748,9 +493,11 @@ updateTime: null
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal this.$modal
.confirm('是否确认删除编号为"' + row.prototypeMakeId + '"的打样制作单？') .confirm(
'是否确认删除编号为"' + row.prototypeMakeId + '"的打样制作单？'
)
.then(function () { .then(function () {
return delPrototypeRequest(row.prototypeMakeId); return delPrototypeMake(row.prototypeMakeId);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
...@@ -768,21 +515,13 @@ updateTime: null ...@@ -768,21 +515,13 @@ updateTime: null
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download( this.download(
"mes/pro/prototypeRequest/export", "mes/pro/prototypeMake/export",
{ {
...this.queryParams, ...this.queryParams,
}, },
`打样申请单_${new Date().getTime()}.xlsx` `打样申请单_${new Date().getTime()}.xlsx`
); );
}, },
// // 审批通过
// handleConfirm(){
// let that = this;
// this.$modal.confirm('是确认完成工单编制？【确认后将不能更改】').then(function(){
// that.form.status = '待制作';
// that.submitForm();
// });
// },
// // 审批 // // 审批
// handleFinish(row){ // handleFinish(row){
// const prototypeMakeIds = row.prototypeMakeId || this.ids; // const prototypeMakeIds = row.prototypeMakeId || this.ids;
...@@ -793,47 +532,6 @@ updateTime: null ...@@ -793,47 +532,6 @@ updateTime: null
// this.$modal.msgSuccess("更改成功"); // this.$modal.msgSuccess("更改成功");
// }).catch(() => {}); // }).catch(() => {});
// }, // },
// //物料选择弹出框
// onItemSelected(obj) {
// if (obj != undefined && obj != null) {
// this.form.productId = obj.itemId;
// this.form.productCode = obj.itemCode;
// this.form.productName = obj.itemName;
// this.form.productSpc = obj.specification;
// this.form.unitOfMeasure = obj.unitOfMeasure;
// }
// },
// //客户选择弹出框
// onClientSelected(obj) {
// if (obj != undefined && obj != null) {
// this.form.clientId = obj.clientId;
// this.form.clientCode = obj.clientCode;
// this.form.clientName = obj.clientName;
// }
// },
// //供应商选择
// handleSelectVendor() {
// this.$refs.vendorSelect.showFlag = true;
// },
// //供应商选择弹出框
// onVendorSelected(obj) {
// debugger;
// if (obj != undefined && obj != null) {
// this.form.vendorId = obj.vendorId;
// this.form.vendorCode = obj.vendorCode;
// this.form.vendorName = obj.vendorName;
// }
// },
// //自动生成编码
// handleAutoGenChange(autoGenFlag) {
// if (autoGenFlag) {
// genCode("WORKORDER_CODE").then((response) => {
// this.form.prototypeRequestCode = response;
// });
// } else {
// this.form.prototypeRequestCode = null;
// }
// },
}, },
}; };
</script> </script>
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @ bccd89cc
...@@ -38,15 +38,16 @@ ...@@ -38,15 +38,16 @@
<el-input <el-input
v-model="form.itemName" v-model="form.itemName"
readonly readonly
disabled
placeholder="请选择产品" placeholder="请选择产品"
> />
<el-button <!-- <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['ItemSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12" style="height: 50.5px"> <el-col :md="8" :xs="12" style="height: 50.5px">
...@@ -54,9 +55,10 @@ ...@@ -54,9 +55,10 @@
<el-input <el-input
v-model="form.routeName" v-model="form.routeName"
readonly readonly
disabled
placeholder="请选择工艺路线" placeholder="请选择工艺路线"
> />
<el-button <!-- <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['RoutesProcessSelectRef'].showFlag = true" @click="$refs['RoutesProcessSelectRef'].showFlag = true"
...@@ -65,7 +67,7 @@ ...@@ -65,7 +67,7 @@
<RoutesProcessSelect <RoutesProcessSelect
ref="RoutesProcessSelectRef" ref="RoutesProcessSelectRef"
@onSelected="onRoutesProcessSelect" @onSelected="onRoutesProcessSelect"
/> /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -75,6 +77,7 @@ ...@@ -75,6 +77,7 @@
<el-input <el-input
v-model="form.abbreviation" v-model="form.abbreviation"
placeholder="请输入简称" placeholder="请输入简称"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -83,12 +86,17 @@ ...@@ -83,12 +86,17 @@
<el-input <el-input
v-model="form.enName" v-model="form.enName"
placeholder="请输入样品英文名称" placeholder="请输入样品英文名称"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="8" :xs="12">
<el-form-item label="样品数量" prop="num"> <el-form-item label="样品数量" prop="num">
<el-input v-model="form.num" placeholder="请输入样品数量"> <el-input
v-model="form.num"
placeholder="请输入样品数量"
disabled
>
<template slot="suffix">{{ form.unit }}</template> <template slot="suffix">{{ form.unit }}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -98,6 +106,7 @@ ...@@ -98,6 +106,7 @@
<el-input <el-input
v-model="form.type" v-model="form.type"
placeholder="请选择打样形式" placeholder="请选择打样形式"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -106,6 +115,7 @@ ...@@ -106,6 +115,7 @@
<el-input <el-input
v-model="form.modality" v-model="form.modality"
placeholder="请选择分配方式" placeholder="请选择分配方式"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -114,6 +124,7 @@ ...@@ -114,6 +124,7 @@
<el-input <el-input
v-model="form.surfaceTreatment" v-model="form.surfaceTreatment"
placeholder="请输入表面处理" placeholder="请输入表面处理"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -122,6 +133,7 @@ ...@@ -122,6 +133,7 @@
<el-input <el-input
v-model="form.ngReason" v-model="form.ngReason"
placeholder="请输入NG原因" placeholder="请输入NG原因"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -131,6 +143,7 @@ ...@@ -131,6 +143,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="form.plannedFinishDate" v-model="form.plannedFinishDate"
placeholder="请输入计划完成日期" placeholder="请输入计划完成日期"
disabled
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -140,6 +153,7 @@ ...@@ -140,6 +153,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="form.plannedLayoutDate" v-model="form.plannedLayoutDate"
placeholder="请输入版面需求时间" placeholder="请输入版面需求时间"
disabled
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -148,12 +162,121 @@ ...@@ -148,12 +162,121 @@
<el-input <el-input
v-model="form.testStandard" v-model="form.testStandard"
placeholder="测试标准" placeholder="测试标准"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12">
<el-form-item label="网版目数" prop="screenItem">
<el-input
v-model="form.screenItem"
placeholder="请输入网版目数"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="啤版目数" prop="pibanItem">
<el-input v-model="form.pibanItem" placeholder="请输入啤版目数" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="模切版目数" prop="diecuttingItem">
<el-input
v-model="form.diecuttingItem"
placeholder="请输入模切版目数"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="标准色号" prop="standardColor">
<el-input
v-model="form.standardColor"
placeholder="请输入标准色号"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="模数" prop="module">
<el-input v-model="form.module" placeholder="请输入模数" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="列" prop="col">
<el-input v-model="form.col" placeholder="请输入列" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="行" prop="row">
<el-input v-model="form.row" placeholder="请输入行" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="搭板数" prop="buttstrapNum">
<el-input
v-model="form.buttstrapNum"
placeholder="请输入搭板数"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="列双刀位" prop="coldoubleCutspacing">
<el-input
v-model="form.coldoubleCutspacing"
placeholder="请输入列双刀位"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="行双刀位" prop="rowdoubleCutspacing">
<el-input
v-model="form.rowdoubleCutspacing"
placeholder="请输入行双刀位"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="派工倍数" prop="sendworkMultiple">
<el-input
v-model="form.sendworkMultiple"
placeholder="请输入派工倍数"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="印张长度" prop="printingPaperlenth">
<el-input
v-model="form.printingPaperlenth"
placeholder="请输入印张长度"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="印张宽度" prop="printPaperwidth">
<el-input
v-model="form.printPaperwidth"
placeholder="请输入印张宽度"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="印刷正面颜色" prop="frontColorId">
<el-input
v-model="form.frontColorId"
placeholder="请输入印刷正面颜色"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="印刷反面颜色" prop="oppositeColorId">
<el-input
v-model="form.oppositeColorId"
placeholder="请输入印刷反面颜色"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :md="8" :xs="12"> <el-col :md="8" :xs="12" span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input
type="textarea" type="textarea"
......
src/views/mes/proofing/proofingApply.vue
View file @ bccd89cc
...@@ -322,6 +322,7 @@ export default { ...@@ -322,6 +322,7 @@ export default {
prototypeRequestStatus: null, prototypeRequestStatus: null,
}, },
options: [ options: [
// { value: null, label: "全部订单" },
{ value: 0, label: "审批中" }, { value: 0, label: "审批中" },
{ value: 1, label: "待制作" }, { value: 1, label: "待制作" },
{ value: 2, label: "打样中" }, { value: 2, label: "打样中" },
...@@ -376,7 +377,7 @@ export default { ...@@ -376,7 +377,7 @@ export default {
ngReason: null, ngReason: null,
plannedFinishDate: null, plannedFinishDate: null,
plannedLayoutDate: null, plannedLayoutDate: null,
prototypeRequestStatus: "0", prototypeRequestStatus: null,
testStandard: null, testStandard: null,
remark: null, remark: null,
createBy: null, createBy: null,
...@@ -477,7 +478,7 @@ export default { ...@@ -477,7 +478,7 @@ export default {
// 审批 // 审批
handleFinish(row) { handleFinish(row) {
row.prototypeRequestStatus = 1 row.prototypeRequestStatus = 1;
this.$modal this.$modal
.confirm("确认通过样品申请单？一旦完成，此工单将无法继续修改") .confirm("确认通过样品申请单？一旦完成，此工单将无法继续修改")
.then(function () { .then(function () {
...@@ -493,7 +494,10 @@ export default { ...@@ -493,7 +494,10 @@ export default {
// 生成制作单 // 生成制作单
generate(row) { generate(row) {
// 跳转到制作单界面 // 跳转到制作单界面
this.$router.push("/mes/proofing/apply"); const prototypeRequestId = row.prototypeRequestId || this.ids;
this.$router.push(
"/mes/pro/prototypeMake/apply?prototypeRequestId=" + prototypeRequestId
);
return; return;
}, },
}; };
......
src/views/mes/proofing/proofingInfo.vue
View file @ bccd89cc
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :md="8" :xs="12"> <el-col :md="24" :xs="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input
type="textarea" type="textarea"
......
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