Skip to content

P
pda-ui
Commit 68026fcc authored by 何远江's avatar 何远江
Browse files
Options

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

parents de9e1b07 5d38e3df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 267 deletions
src/api/mes/pro/productionSolution.js
View file @ 68026fcc
...@@ -3,7 +3,7 @@ import request from '@/utils/request' ...@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询生产方案列表 // 查询生产方案列表
export function listProductionSolution(query) { export function listProductionSolution(query) {
return request({ return request({
url: '/mes/pro/productionSolution/list', url: 'pro/productionSolution/list',
method: 'get', method: 'get',
params: query params: query
}) })
...@@ -12,7 +12,7 @@ export function listProductionSolution(query) { ...@@ -12,7 +12,7 @@ export function listProductionSolution(query) {
// 查询生产方案详细 // 查询生产方案详细
export function getProductionSolution(productionSolutionId) { export function getProductionSolution(productionSolutionId) {
return request({ return request({
url: '/mes/pro/productionSolution/' + productionSolutionId, url: 'pro/productionSolution/' + productionSolutionId,
method: 'get' method: 'get'
}) })
} }
...@@ -20,7 +20,7 @@ export function getProductionSolution(productionSolutionId) { ...@@ -20,7 +20,7 @@ export function getProductionSolution(productionSolutionId) {
// 新增生产方案 // 新增生产方案
export function addProductionSolution(data) { export function addProductionSolution(data) {
return request({ return request({
url: '/mes/pro/productionSolution', url: 'pro/productionSolution',
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -29,7 +29,7 @@ export function addProductionSolution(data) { ...@@ -29,7 +29,7 @@ export function addProductionSolution(data) {
// 修改生产方案 // 修改生产方案
export function updateProductionSolution(data) { export function updateProductionSolution(data) {
return request({ return request({
url: '/mes/pro/productionSolution', url: 'pro/productionSolution',
method: 'put', method: 'put',
data: data data: data
}) })
...@@ -38,7 +38,7 @@ export function updateProductionSolution(data) { ...@@ -38,7 +38,7 @@ export function updateProductionSolution(data) {
// 删除生产方案 // 删除生产方案
export function delProductionSolution(productionSolutionId) { export function delProductionSolution(productionSolutionId) {
return request({ return request({
url: '/mes/pro/productionSolution/' + productionSolutionId, url: 'pro/productionSolution/' + productionSolutionId,
method: 'delete' method: 'delete'
}) })
} }
src/views/mes/pro/productionSolution/proofingApply.vue
View file @ 68026fcc
...@@ -8,19 +8,19 @@ ...@@ -8,19 +8,19 @@
v-show="showSearch" v-show="showSearch"
label-width="100px" label-width="100px"
> >
<el-form-item label="产品名称" prop="itemName"> <el-form-item label="生产方案名称" prop="productionSolutionName">
<el-input <el-input
v-model="queryParams.itemName" v-model="queryParams.itemName"
placeholder="请输入产品名称" placeholder="请输入方案名称"
clearable clearable
@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="usageName">
<el-select <el-select
v-model="queryParams.prototypeRequestStatus" v-model="queryParams.prototypeRequestStatus"
clearable clearable
placeholder="请选择单据状态" placeholder="请输入生产用途"
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
...@@ -71,9 +71,9 @@ ...@@ -71,9 +71,9 @@
@click="handleAdd" @click="handleAdd"
v-hasPermi="['mes:pro:prototypeRequest:add']" v-hasPermi="['mes:pro:prototypeRequest:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
plain plain
...@@ -83,9 +83,9 @@ ...@@ -83,9 +83,9 @@
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['mes:pro:prototypeRequest:edit']" v-hasPermi="['mes:pro:prototypeRequest:edit']"
>修改</el-button >修改</el-button
> >
</el-col> </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
plain plain
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
v-hasPermi="['mes:pro:prototypeRequest:remove']" v-hasPermi="['mes:pro:prototypeRequest:remove']"
>删除</el-button >删除</el-button
> >
</el-col> </el-col> -->
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
plain plain
...@@ -107,83 +107,41 @@ ...@@ -107,83 +107,41 @@
v-hasPermi="['mes:pro:prototypeRequest:export']" v-hasPermi="['mes:pro:prototypeRequest:export']"
>导出</el-button >导出</el-button
> >
</el-col> </el-col> -->
<right-toolbar <!-- <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
</el-row> </el-row> -->
<el-table <el-table v-loading="loading" :data="productionSolutionList" row-key="productionSolutionId" default-expand-all >
v-loading="loading" <el-table-column label="生产方案编码" prop="productionSolutionCode">
:data="prototypeRequestList"
row-key="prototypeRequestId"
default-expand-all
>
<el-table-column label="样品编码" width="180" prop="prototypeRequestCode">
<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:productionSolutionCode:query']"
>{{ scope.row.prototypeRequestCode }}</el-button >{{ scope.row.productionSolutionCode }}</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="产品方案名称" align="center" prop="productionSolutionName" :show-overflow-tooltip="true"
label="产品名称"
width="120"
align="center"
prop="itemName"
:show-overflow-tooltip="true"
/> />
<el-table-column label="工艺路线名称" align="center" prop="routeName"> <el-table-column label="生产用途" align="center" prop="usageName" />
</el-table-column> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column <!-- <el-table-column label="备注" align="center" prop="usageName" width="180"/> -->
label="计划完成日期"
align="center"
prop="plannedFinishDate"
width="180" <!-- <el-table-column
>
<template slot-scope="scope">
<span>{{
parseTime(scope.row.plannedFinishDate, "{y}-{m}-{d}")
}}</span>
</template>
</el-table-column>
<el-table-column
label="版面需求时间"
align="center"
prop="plannedLayoutDate"
width="180"
>
<template slot-scope="scope">
<span>{{
parseTime(scope.row.plannedLayoutDate, "{y}-{m}-{d}")
}}</span>
</template>
</el-table-column>
<el-table-column
label="申请单状态"
align="center"
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="remark" />
<el-table-column
label="操作" label="操作"
width="200px" width="200px"
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> /> -->
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
...@@ -192,8 +150,8 @@ ...@@ -192,8 +150,8 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:edit']" v-hasPermi="['mes:pro:prototypeRequest: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"
...@@ -201,16 +159,16 @@ ...@@ -201,16 +159,16 @@
@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"
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:prototypeRequest:remove']"
>删除</el-button >删除</el-button
> > -->
<el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
...@@ -218,9 +176,9 @@ ...@@ -218,9 +176,9 @@
@click="generatea(scope.row)" @click="generatea(scope.row)"
v-hasPermi="['mes:pro:prototypeRequest:edit']" v-hasPermi="['mes:pro:prototypeRequest:edit']"
>生成制作单</el-button >生成制作单</el-button
> > -->
</template> <!-- </template> -->
</el-table-column> <!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
...@@ -230,17 +188,23 @@ ...@@ -230,17 +188,23 @@
@pagination="getList" @pagination="getList"
/> />
</div> </div>
</template> </template>
<script> <script>
import { import {
listPrototypeRequest, // listPrototypeRequest,
getPrototypeRequest, // getPrototypeRequest,
delPrototypeRequest, // delPrototypeRequest,
addPrototypeRequest, // addPrototypeRequest,
updatePrototypeRequest, // updatePrototypeRequest,
dofinish, // dofinish,
} from "@/api/mes/pro/prototypeRequest"; listProductionSolution,
getProductionSolution,
addProductionSolution,
updateProductionSolution,
delProductionSolution,
} from "@/api/mes/pro/productionSolution";
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";
...@@ -289,8 +253,17 @@ export default { ...@@ -289,8 +253,17 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
itemName: null, // 可以查简称与英文名 productionSolutionId: null, // 可以查简称与英文名
prototypeRequestStatus: null, productionSolutionCode: null,
productionSolutionName: null,
itemId: null,
routeId: null,
usageId: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
}, },
options: [ options: [
// { value: null, label: "全部订单" }, // { value: null, label: "全部订单" },
...@@ -319,8 +292,8 @@ export default { ...@@ -319,8 +292,8 @@ export default {
/** 查询生产工单列表 */ /** 查询生产工单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listPrototypeRequest(this.queryParams).then((response) => { listProductionSolution(this.queryParams).then((response) => {
this.prototypeRequestList = response.rows; this.productionSolutionList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
...@@ -333,23 +306,12 @@ export default { ...@@ -333,23 +306,12 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
prototypeRequestId: null, productionSolutionId: null,
prototypeRequestCode: null, productionSolutionCode: null,
productionSolutionName: null,
itemId: null, itemId: null,
itemName: null,
routeId: null, routeId: null,
routeName: null, usageId: null,
abbreviation: null,
enName: null,
num: null,
type: null,
modality: null,
surfaceTreatment: null,
ngReason: null,
plannedFinishDate: null,
plannedLayoutDate: null,
prototypeRequestStatus: null,
testStandard: null,
remark: null, remark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
...@@ -390,9 +352,9 @@ export default { ...@@ -390,9 +352,9 @@ export default {
// 查询明细按钮操作 // 查询明细按钮操作
handleView(row) { handleView(row) {
this.reset(); this.reset();
const prototypeRequestId = row.prototypeRequestId || this.ids; const productionSolutionId = row.productionSolutionId || this.ids;
this.$router.push( this.$router.push(
"/mes/proofing/info?prototypeRequestId=" + prototypeRequestId "/mes/pro/productionSolution/info?productionSolutionId=" + productionSolutionId
); );
// getprototypeRequest(prototypeRequestId).then((response) => { // getprototypeRequest(prototypeRequestId).then((response) => {
// this.form = response.data; // this.form = response.data;
......
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @ 68026fcc
...@@ -36,7 +36,14 @@ ...@@ -36,7 +36,14 @@
<el-col :md="8" :xs="12"> <el-col :md="8" :xs="12">
<el-form-item label="申请单编码" prop="prototypeRequestCode"> <el-form-item label="申请单编码" prop="prototypeRequestCode">
<el-input disabled v-model="form.prototypeRequestCode"></el-input> <el-input
v-model="form.prototypeRequestCode"
readonly
disabled
:placeholder="mode=='edit' ? '':'请输入申请单编码'"
>
</el-input>
</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">
...@@ -45,7 +52,7 @@ ...@@ -45,7 +52,7 @@
v-model="form.itemName" v-model="form.itemName"
readonly readonly
disabled disabled
placeholder="请选择产品" :placeholder="mode=='edit' ? '':'请选择产品'"
/> />
<!-- <el-button <!-- <el-button
slot="append" slot="append"
...@@ -64,7 +71,7 @@ ...@@ -64,7 +71,7 @@
v-model="form.routeName" v-model="form.routeName"
readonly readonly
disabled disabled
placeholder="请选择工艺路线" :placeholder="mode=='edit' ? '':'请选择工艺路线'"
/> />
<!-- <el-button <!-- <el-button
slot="append" slot="append"
......
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