Skip to content

P
pda-ui
Commit 00032dbb authored by 全洪江's avatar 全洪江
Browse files
Options

调整

parent bccd89cc
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 260 deletions
src/api/mes/pro/request.js deleted 100644 → 0
View file @ bccd89cc
import request from '@/utils/request'
// 查询【请填写功能名称】列表
export function listRequest(query) {
return request({
url: '/md/request/list',
method: 'get',
params: query
})
}
// 查询【请填写功能名称】详细
export function getRequest(productionRequestId) {
return request({
url: '/md/request/' + productionRequestId,
method: 'get'
})
}
// 新增【请填写功能名称】
export function addRequest(data) {
return request({
url: '/md/request',
method: 'post',
data: data
})
}
// 修改【请填写功能名称】
export function updateRequest(data) {
return request({
url: '/md/request',
method: 'put',
data: data
})
}
// 删除【请填写功能名称】
export function delRequest(productionRequestId) {
return request({
url: '/md/request/' + productionRequestId,
method: 'delete'
})
}
src/api/mes/pro/requestBom.js deleted 100644 → 0
View file @ bccd89cc
import request from '@/utils/request'
// 查询【请填写功能名称】列表
export function listBom(query) {
return request({
url: '/md/bom/list',
method: 'get',
params: query
})
}
// 查询【请填写功能名称】详细
export function getBom(bomItemId) {
return request({
url: '/md/bom/' + bomItemId,
method: 'get'
})
}
// 新增【请填写功能名称】
export function addBom(data) {
return request({
url: '/md/bom',
method: 'post',
data: data
})
}
// 修改【请填写功能名称】
export function updateBom(data) {
return request({
url: '/md/bom',
method: 'put',
data: data
})
}
// 删除【请填写功能名称】
export function delBom(bomItemId) {
return request({
url: '/md/bom/' + bomItemId,
method: 'delete'
})
}
src/api/mes/pro/requestProcess.js deleted 100644 → 0
View file @ bccd89cc
import request from '@/utils/request'
// 查询【请填写功能名称】列表
export function listProcess(query) {
return request({
url: '/md/process/list',
method: 'get',
params: query
})
}
// 查询【请填写功能名称】详细
export function getProcess(productionRequestProcessId) {
return request({
url: '/md/process/' + productionRequestProcessId,
method: 'get'
})
}
// 新增【请填写功能名称】
export function addProcess(data) {
return request({
url: '/md/process',
method: 'post',
data: data
})
}
// 修改【请填写功能名称】
export function updateProcess(data) {
return request({
url: '/md/process',
method: 'put',
data: data
})
}
// 删除【请填写功能名称】
export function delProcess(productionRequestProcessId) {
return request({
url: '/md/process/' + productionRequestProcessId,
method: 'delete'
})
}
src/api/mes/pro/requestProcessItem.js deleted 100644 → 0
View file @ bccd89cc
import request from '@/utils/request'
// 查询【请填写功能名称】列表
export function listItem(query) {
return request({
url: '/md/item/list',
method: 'get',
params: query
})
}
// 查询【请填写功能名称】详细
export function getItem(productionRequestProcessItemId) {
return request({
url: '/md/item/' + productionRequestProcessItemId,
method: 'get'
})
}
// 新增【请填写功能名称】
export function addItem(data) {
return request({
url: '/md/item',
method: 'post',
data: data
})
}
// 修改【请填写功能名称】
export function updateItem(data) {
return request({
url: '/md/item',
method: 'put',
data: data
})
}
// 删除【请填写功能名称】
export function delItem(productionRequestProcessItemId) {
return request({
url: '/md/item/' + productionRequestProcessItemId,
method: 'delete'
})
}
src/views/mes/pro/productiorequest/requestApply.vue
View file @ 00032dbb
......@@ -8,17 +8,17 @@
v-show="showSearch"
label-width="100px"
>
<el-form-item label="产品名称" prop="itemName">
<el-form-item label="量产申请编码" prop="productionRequestCode">
<el-input
v-model="queryParams.itemName"
v-model="queryParams.productionRequestCode"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单据状态" prop="prototypeRequestStatus">
<el-form-item label="工艺路线ID" prop="routeId">
<el-select
v-model="queryParams.prototypeRequestStatus"
v-model="queryParams.routeId"
clearable
placeholder="请选择单据状态"
>
......@@ -69,7 +69,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:pro:prototypeRequest:add']"
v-hasPermi="['mes:pro:productiorequest:add']"
>新增</el-button
>
</el-col>
......@@ -81,7 +81,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes:pro:prototypeRequest:edit']"
v-hasPermi="['mes:pro:productiorequest:edit']"
>修改</el-button
>
</el-col>
......@@ -93,7 +93,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:pro:prototypeRequest:remove']"
v-hasPermi="['mes:pro:productiorequest:remove']"
>删除</el-button
>
</el-col>
......@@ -104,7 +104,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes:pro:prototypeRequest:export']"
v-hasPermi="['mes:pro:productiorequest:export']"
>导出</el-button
>
</el-col>
......@@ -117,7 +117,7 @@
<el-table
v-loading="loading"
:data="prototypeRequestList"
row-key="prototypeRequestId"
row-key="productionRequestId"
default-expand-all
>
<el-table-column label="量产申请单编码" width="180" prop="productionRequesCode">
......@@ -126,7 +126,7 @@
size="mini"
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:query']"
v-hasPermi="['mes:pro:productiorequest:query']"
>{{ scope.row.productionRequesCode }}</el-button
>
</template>
......@@ -162,37 +162,52 @@
label="是否要鞋图"
align="center"
prop="isNeedShoeImg"
/>
<el-table-column
label="是否附样品"
align="center"
prop="isNeedPrototype"
/>
<el-table-column label="唯一码产品" align="center" prop="isUniqueCode" />
<el-table-column label="不考虑型体配色" align="center" prop="isConsiderColor" />
<el-table-column label="是否禁用" align="center" prop="isDisabled" />
<!-- <template slot-scope="scope">
> <template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isNeedShoeImg"
/>
</template> -->
<!-- <dict-tag
</template>
</el-table-column>
<el-table-column
label="是否附样品"
align="center"
prop="isNeedPrototype"
><template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isNeedPrototype"
/>
<dict-tag
</template>
</el-table-column>
<el-table-column label="唯一码产品" align="center" prop="isUniqueCode" >
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isConsiderColor"
:value="scope.row.isUniqueCode"
/>
<dict-tag
</template>
</el-table-column>
<el-table-column label="不考虑型体配色" align="center" prop="isConsiderColor" >
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.enableFlag"
:value="scope.row.isConsiderColor"
/>
<dict-tag
</template>
</el-table-column>
<el-table-column label="是否禁用" align="center" prop="isDisabled" >
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isDisabled" -->
:value="scope.row.isDisabled"
/>
</template>
</el-table-column>
<el-table-column
label="操作"
......@@ -207,7 +222,7 @@
icon="el-icon-edit"
v-if="scope.row.prototypeRequestStatus == '0'"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:edit']"
v-hasPermi="['mes:pro:productiorequest:edit']"
>修改</el-button
>
<el-button
......@@ -216,7 +231,7 @@
icon="el-icon-circle-check"
v-if="scope.row.prototypeRequestStatus == '0'"
@click="handleFinish(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:update']"
v-hasPermi="['mes:pro:productiorequest:update']"
>通过</el-button
>
<el-button
......@@ -224,7 +239,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:remove']"
v-hasPermi="['mes:pro:productiorequest:remove']"
>删除</el-button
>
<el-button
......@@ -233,7 +248,7 @@
icon="el-icon-edit"
v-if="scope.row.prototypeRequestStatus == '1'"
@click="generate(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:edit']"
v-hasPermi="['mes:pro:productiorequest:edit']"
>生成制作单</el-button
>
</template>
......@@ -258,6 +273,7 @@ import {
updatePrototypeRequest,
dofinish,
} from "@/api/mes/pro/prototypeRequest";
import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue";
......@@ -307,8 +323,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
itemName: null, // 可以查简称与英文名
prototypeRequestStatus: null,
productionRequestCode: null,
routeId: null,
},
options: [
{ value: 0, label: "审批中" },
......@@ -350,23 +366,20 @@ export default {
// 表单重置
reset() {
this.form = {
prototypeRequestId: null,
prototypeRequestCode: null,
itemId: null,
itemName: null,
productionRequestId: null,
productionRequestCode: null,
routeId: null,
routeName: null,
abbreviation: null,
enName: null,
num: null,
type: null,
modality: null,
surfaceTreatment: null,
ngReason: null,
plannedFinishDate: null,
plannedLayoutDate: null,
prototypeRequestStatus: "0",
testStandard: null,
productId: null,
factoryId: null,
warehouse: null,
sizeGroup: null,
isNeedShoeImg: null,
isNeedPrototype: null,
isUniqueCode: null,
isConsiderColor: null,
isDisabled: null,
shoeImg: null,
prototype: null,
remark: null,
createBy: null,
createTime: null,
......@@ -407,7 +420,7 @@ export default {
// 查询明细按钮操作
handleView(row) {
this.reset();
const prototypeRequestId = row.prototypeRequestId || this.ids;
const productionRequestId = row.productionRequestId || this.ids;
this.$router.push(
"/mes/proofing/info?prototypeRequestId=" + prototypeRequestId
);
......@@ -421,9 +434,9 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const prototypeRequestId = row.prototypeRequestId || this.ids;
const productionRequestId = row.productionRequestId || this.ids;
this.$router.push(
"/mes/proofing/edit?prototypeRequestId=" + prototypeRequestId
"/mes/proofing/edit?productionRequestId=" + productionRequestId
);
// getPrototypeRequest(prototypeRequestId).then((response) => {
// // this.form = response.data;
......@@ -436,9 +449,9 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
this.$modal
.confirm('是否确认删除编号为"' + row.prototypeRequestId + '"的打样单？')
.confirm('是否确认删除编号为"' + row.productionRequestId + '"的打样单？')
.then(function () {
return delPrototypeRequest(row.prototypeRequestId);
return delPrototypeRequest(row.productionRequestId);
})
.then(() => {
this.getList();
......
src/views/mes/pro/productiorequest/requestInfo.vue
View file @ 00032dbb
......@@ -24,10 +24,10 @@
>
<el-row>
<el-col :md="8" :xs="12">
<el-form-item label="申请单编码" prop="prototypeRequestCode">
<el-form-item label="量产申请单编码" prop="productionRequestCode">
<el-input
disabled
v-model="form.prototypeRequestCode"
v-model="form.productionRequestCode"
placeholder="自动生成"
></el-input>
</el-form-item>
......@@ -206,22 +206,17 @@ export default {
bomList: [],
// 表单参数
form: {
prototypeRequestCode: "",
itemId: "",
itemName: "",
unit: "",
productionRequestCode: "",
routeId: "",
routeName: "",
abbreviation: "",
enName: "",
num: "",
type: "",
modality: "",
surfaceTreatment: "",
ngReason: "",
plannedFinishDate: "",
plannedLayoutDate: "",
testStandard: "",
itemId: "",
factoryId: "",
isNeedShoeImg: "",
isNeedPrototype: "",
isUniqueCode: "",
isConsiderColor: "",
isDisabled: "",
shoeImg: "",
prototype: "",
remark: "",
},
rules: {},
......@@ -337,19 +332,16 @@ export default {
resetForm() {
this.form = {
prototypeRequestCode: "",
itemId: "",
itemName: "",
routeId: "",
abbreviation: "",
enName: "",
num: "",
type: "",
modality: "",
surfaceTreatment: "",
ngReason: "",
plannedFinishDate: "",
plannedLayoutDate: "",
testStandard: "",
itemId: "",
factoryId: "",
isNeedShoeImg: "",
isNeedPrototype: "",
isUniqueCode: "",
isConsiderColor: "",
isDisabled: "",
shoeImg: "",
prototype: "",
remark: "",
};
this.$refs["ProogingBomRef"].resetState();
......
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