Skip to content

M
mes-ui
Commit 9cc7d39d authored by 何远江's avatar 何远江
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents 7209943a 26a73405
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 394 deletions
src/api/mes/pro/prototypeRequest.js
View file @ 9cc7d39d
import request from '@/utils/request' import request from "@/utils/request";
// 查询打样申请列表 // 查询打样申请列表
export function listPrototypeRequest(query) { export function listPrototypeRequest(query) {
return request({ return request({
url: '/mes/pro/prototypeRequest/list', url: "/mes/pro/prototypeRequest/list",
method: 'get', method: "get",
params: query params: query,
}) });
} }
// 查询打样申请详细 // 查询打样申请详细
export function getPrototypeRequest(prototypeRequestId) { export function getPrototypeRequest(prototypeRequestId) {
return request({ return request({
url: '/mes/pro/prototypeRequest/' + prototypeRequestId, url: "/mes/pro/prototypeRequest/" + prototypeRequestId,
method: 'get' method: "get",
}) });
} }
// 新增打样申请 // 新增打样申请
export function addPrototypeRequest(data) { export function addPrototypeRequest(data) {
return request({ return request({
url: '/mes/pro/prototypeRequest', url: "/mes/pro/prototypeRequest",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 修改打样申请 // 修改打样申请
export function updatePrototypeRequest(data) { export function updatePrototypeRequest(data) {
return request({ return request({
url: '/mes/pro/prototypeRequest', url: "/mes/pro/prototypeRequest",
method: 'put', method: "put",
data: data data: data,
}) });
} }
// 删除打样申请 // 删除打样申请
export function delPrototypeRequest(prototypeRequestId) { export function delPrototypeRequest(prototypeRequestId) {
return request({ return request({
url: '/mes/pro/prototypeRequest/' + prototypeRequestId, url: "/mes/pro/prototypeRequest/" + prototypeRequestId,
method: 'delete' method: "delete",
}) });
}
// 修改状态
export function dofinish(data) {
return request({
url: "/mes/pro/prototypeRequest/modifyState/",
method: "put",
data: data,
});
} }
src/views/mes/proofing/proofingApply.vue
View file @ 9cc7d39d
...@@ -3,15 +3,14 @@ ...@@ -3,15 +3,14 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
style="with"
size="small" size="small"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="100px" label-width="100px"
> >
<el-form-item label="产品名称" prop="itenName"> <el-form-item label="产品名称" prop="itemName">
<el-input <el-input
v-model="queryParams.itenName" v-model="queryParams.itemName"
placeholder="请输入产品名称" placeholder="请输入产品名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
...@@ -34,12 +33,12 @@ ...@@ -34,12 +33,12 @@
</el-form-item> </el-form-item>
<!-- <el-form-item label="样品名称" prop="abbreviation"> <!-- <el-form-item label="样品名称" prop="abbreviation">
<el-input <el-input
v-model="queryParams.itenName" v-model="queryParams.itemName"
placeholder="请输入样品名称" placeholder="请输入样品名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> --> /> -->
<!-- <el-date-picker <!-- <el-date-picker
clearable clearable
v-model="queryParams.abbreviation" v-model="queryParams.abbreviation"
type="date" type="date"
...@@ -197,7 +196,14 @@ ...@@ -197,7 +196,14 @@
label="申请单状态" label="申请单状态"
align="center" align="center"
prop="prototypeRequestStatus" prop="prototypeRequestStatus"
/> >
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_pr_status"
:value="scope.row.prototypeRequestStatus"
/>
</template>
</el-table-column>
<el-table-column label="测试标准" align="center" prop="testStandard" /> <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
...@@ -211,7 +217,7 @@ ...@@ -211,7 +217,7 @@
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.prototypeRequestStatus == '0'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:edit']" v-hasPermi="['mes:pro:prototypeRequest:edit']"
>修改</el-button >修改</el-button
...@@ -220,10 +226,10 @@ ...@@ -220,10 +226,10 @@
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.prototypeRequestStatus == '0'"
@click="handleFinish(scope.row)" @click="handleFinish(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:update']" v-hasPermi="['mes:pro:prototypeRequest:update']"
>完成</el-button >通过</el-button
> >
<el-button <el-button
size="mini" size="mini"
...@@ -233,6 +239,15 @@ ...@@ -233,6 +239,15 @@
v-hasPermi="['mes:pro:prototypeRequest:remove']" v-hasPermi="['mes:pro:prototypeRequest:remove']"
>删除</el-button >删除</el-button
> >
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.prototypeRequestStatus == '1'"
@click="generate(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:edit']"
>生成制作单</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -243,281 +258,6 @@ ...@@ -243,281 +258,6 @@
: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.prototypeRequestId != 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.prototypeRequestId != null
"
>确 认</el-button
>
<el-button @click="cancel">取 消</el-button>
</div></el-dialog> -->
</div> </div>
</template> </template>
...@@ -528,6 +268,7 @@ import { ...@@ -528,6 +268,7 @@ import {
delPrototypeRequest, delPrototypeRequest,
addPrototypeRequest, addPrototypeRequest,
updatePrototypeRequest, updatePrototypeRequest,
dofinish,
} from "@/api/mes/pro/prototypeRequest"; } from "@/api/mes/pro/prototypeRequest";
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";
...@@ -538,7 +279,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; ...@@ -538,7 +279,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "PrototypeRequest", name: "PrototypeRequest",
dicts: [ dicts: [
"mes_order_status", "mes_pr_status",
"mes_prototypeRequest_sourcetype", "mes_prototypeRequest_sourcetype",
"mes_prototypeRequest_type", "mes_prototypeRequest_type",
], ],
...@@ -577,16 +318,16 @@ export default { ...@@ -577,16 +318,16 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
itemName: null,// 可以查简称与英文名 itemName: null, // 可以查简称与英文名
prototypeRequestStatus: null, prototypeRequestStatus: null,
}, },
options: [ options: [
{ value: "审批中", label: "审批中" }, { value: 0, label: "审批中" },
{ value: "待制作", label: "待制作" }, { value: 1, label: "待制作" },
{ value: "打样中", label: "打样中" }, { value: 2, label: "打样中" },
{ value: "待质检", label: "待质检" }, { value: 3, label: "待质检" },
{ value: "待确认", label: "待确认" }, { value: 4, label: "待确认" },
{ value: "已完成", label: "已完成" }, { value: 5, label: "已完成" },
], ],
// 表单参数 // 表单参数
...@@ -679,7 +420,7 @@ export default { ...@@ -679,7 +420,7 @@ export default {
this.reset(); this.reset();
const prototypeRequestId = row.prototypeRequestId || this.ids; const prototypeRequestId = row.prototypeRequestId || this.ids;
this.$router.push( this.$router.push(
"/mes/proofing/info?prototypeRequestId="+prototypeRequestId "/mes/proofing/info?prototypeRequestId=" + prototypeRequestId
); );
// getprototypeRequest(prototypeRequestId).then((response) => { // getprototypeRequest(prototypeRequestId).then((response) => {
// this.form = response.data; // this.form = response.data;
...@@ -693,7 +434,7 @@ export default { ...@@ -693,7 +434,7 @@ export default {
this.reset(); this.reset();
const prototypeRequestId = row.prototypeRequestId || this.ids; const prototypeRequestId = row.prototypeRequestId || this.ids;
this.$router.push( this.$router.push(
"/mes/proofing/edit?prototypeRequestId="+prototypeRequestId "/mes/proofing/edit?prototypeRequestId=" + prototypeRequestId
); );
// getPrototypeRequest(prototypeRequestId).then((response) => { // getPrototypeRequest(prototypeRequestId).then((response) => {
// // this.form = response.data; // // this.form = response.data;
...@@ -703,28 +444,6 @@ export default { ...@@ -703,28 +444,6 @@ export default {
// // 跳转修改 // // 跳转修改
// }); // });
}, },
// /** 提交按钮 */
// submitForm() {
// this.$refs["form"].validate(valid => {
// if (valid) {
// if (this.form.prototypeRequestId != null) {
// updateprototypeRequest(this.form).then(response => {
// this.$modal.msgSuccess("修改成功");
// //this.open = false;
// this.$refs["bomlist"].getList();
// this.getList();
// });
// } else {
// addprototypeRequest(this.form).then(response => {
// this.$modal.msgSuccess("新增成功");
// //this.open = false;
// this.form.prototypeRequestId = response.data;
// this.getList();
// });
// }
// }
// });
// },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal this.$modal
...@@ -755,65 +474,27 @@ export default { ...@@ -755,65 +474,27 @@ export default {
`打样申请单_${new Date().getTime()}.xlsx` `打样申请单_${new Date().getTime()}.xlsx`
); );
}, },
// // 审批通过
// handleConfirm(){ // 审批
// let that = this; handleFinish(row) {
// this.$modal.confirm('是确认完成工单编制？【确认后将不能更改】').then(function(){ row.prototypeRequestStatus = 1
// that.form.status = '待制作'; this.$modal
// that.submitForm(); .confirm("确认通过样品申请单？一旦完成，此工单将无法继续修改")
// }); .then(function () {
// }, return dofinish(row); //完成申请单审批
// // 审批 })
// handleFinish(row){ .then(() => {
// const prototypeRequestIds = row.prototypeRequestId || this.ids; this.getList();
// this.$modal.confirm('确认完成工单？一旦完成，此工单将无法继续报工').then(function() { this.$modal.msgSuccess("审批成功");
// return dofinish(prototypeRequestIds) //完成工单 })
// }).then(() => { .catch(() => {});
// this.getList(); },
// this.$modal.msgSuccess("更改成功"); },
// }).catch(() => {}); // 生成制作单
// }, generate(row) {
// //物料选择弹出框 // 跳转到制作单界面
// onItemSelected(obj) { this.$router.push("/mes/proofing/apply");
// if (obj != undefined && obj != null) { return;
// 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>
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