Skip to content

M
mes-ui
Commit d4fa9cab authored by chenzj's avatar chenzj
Browse files
Options

领料申请是否补料按钮

parent ecd8b05c
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 337 deletions
src/api/mes/pro/request.js
View file @ d4fa9cab
......@@ -51,3 +51,11 @@ export function delMaterialRequest(materialRequestId) {
method: 'delete'
})
}
// 确认补货按钮
export function confirmMaterialRequest(materialRequestId) {
return request({
url: '/pro/materialRequest/confirm/' + materialRequestId,
method: 'get'
})
}
\ No newline at end of file
src/views/mes/md/product/components/look.vue deleted 100644 → 0
View file @ ecd8b05c
<!--产品外观-->
<template>
<div class="app-container">
<!-- 添加或修改产品外观对话框 -->
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="8">
<el-form-item label="长度cm" prop="length">
<el-input v-model="form.length" type="number" :precision="2" placeholder="请输入长度" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宽度cm" prop="width">
<el-input v-model="form.width" type="number" :precision="2" placeholder="请输入宽度" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="高度cm" prop="height">
<el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="厚度mm" prop="thick">
<el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="成品克重g" prop="weight">
<el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
</el-form-item>
</el-col>
<!--<el-col :span="8">
<el-form-item label="角型" prop="angleType">
<el-select v-model="form.angleType" placeholder="请选择角型">
<el-option
v-for="dict in dict.type.product_shape"
: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="单重(KG)" prop="singleWeight">
<el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item label="圆角" prop="fillet">
<el-radio-group v-model="form.fillet" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否异型" prop="isAllotype">
<el-radio-group v-model="form.isAllotype" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :span="8" label="是否直角" prop="isRightAngle">
<el-radio-group v-model="form.isRightAngle">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row> -->
<el-row>
<el-col :span="8">
<el-form-item label="角度(mm)" prop="angle">
<el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="孔径(mm)" prop="aperture">
<el-input v-model="form.aperture" type="number" :precision="2" placeholder="请输入孔径" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单层厚(丝)" prop="singleLayerThick">
<el-input v-model="form.singleLayerThick" type="number" :precision="2" placeholder="请输入单层厚(单位丝)" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="层数" prop="layerNum">
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="是否防霉" prop="isMould">
<el-radio-group v-model="form.isMould" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否写码" prop="isCoding">
<el-radio-group v-model="form.isCoding" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="系数" prop="coefficient">
<el-input v-model="form.coefficient" placeholder="请输入系数" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="角型" prop="shape">
<el-select v-model="form.shape" placeholder="请选择角型">
<el-option
v-for="dict in dict.type.product_shape"
: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="frontColorName">
<el-input v-model="form.frontColorName" placeholder="请输入正面颜色" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="反面颜色" prop="oppositeColorName">
<el-input v-model="form.oppositeColorName" placeholder="请输入反面颜色" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="8" :sm="12">
<el-form-item label="产品正面">
<ImageUpload
:limit="1"
:value="form.frontImg"
:fileSize="5"
@onUploaded="(url) => (this.form.frontImg = url)"
@onRemoved="() => (this.form.frontImg = '')"
></ImageUpload>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12">
<el-form-item label="产品背面">
<ImageUpload
:limit="1"
:value="form.backImg"
:fileSize="5"
@onUploaded="(url) => (this.form.backImg = url)"
@onRemoved="() => (this.form.backImg = '')"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item label="样品形状大小" prop="shapeSize">
<el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" />
</el-form-item>
</el-col>
</el-row> -->
</el-form>
</div>
</template>
<script>
import {getLook } from "@/api/mes/md/look";
export default {
name: "Look",
dicts: ['sys_yes_no','product_shape'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
itemId: this.itemId
},
// 表单参数
form: {
length: '',
width: '',
height: '',
thick: '',
weight: '',
angleType: '',
isAllotype:'',
isRightAngle:'',
fillet:'',
angle: '',
aperture: '',
singleLayerThick: '',
singleWeight: '',
layerNum: '',
isMould: '',
isCoding: '',
certification: '',
shape: '',
shapeSize: '',
createBy: '',
createTime: '',
updateBy: '',
updateTime: '',
frontColor: [],
oppositeColor: [],
},
// 表单校验
rules: {
}
};
},
props: {
optType: undefined,
itemId: undefined
},
created() {
this.getProductLook();
},
methods: {
//获取基本信息表单数据
async getLookFormData(){
await this.submitForm()
return this.form
},
//回显外观数据
getProductLook(){
getLook(this.itemId).then(res=>{
Object.assign(this.form,res.data)
})
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
itemId: this.itemId,
length: null,
width: null,
height: null,
thick: null,
weight: null,
angleType: null,
isAllotype:null,
isRightAngle:null,
fillet:null,
angle: null,
aperture: null,
singleLayerThick: null,
singleWeight: null,
layerNum: null,
isMould: null,
isCoding: null,
certification: null,
shape: null,
shapeSize: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
frontColor: [],
oppositeColor: [],
};
this.resetForm("form");
},
/** 提交按钮 */
async submitForm() {
return await this.$refs["form"].validate();
},
}
};
</script>
src/views/mes/md/product/index.vue
View file @ d4fa9cab
......@@ -273,9 +273,9 @@
<!-- <el-tab-pane label="客户信息">
<Customer :optType="optType" :itemId="form.itemId"></Customer>
</el-tab-pane>-->
<el-tab-pane label="产品外观" name="Look">
<!-- <el-tab-pane label="产品外观" name="Look">
<Look ref="Look" :optType="optType" :itemId="form.itemId"></Look>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="生产版本" name="ProductionPlan">
<ProductionPlan ref="ProductionPlan" :optType="optType" :itemId="form.itemId"></ProductionPlan>
</el-tab-pane>
......@@ -360,7 +360,7 @@ import {
} from "@/api/mes/md/mdItem";
import BaseInfo from "./components/baseInfo.vue";
import Look from "./components/look.vue";
// import Look from "./components/look.vue";
import ProductionPlan from "./components/productionPlan.vue";
import { listAllUnitmeasure } from "@/api/mes/md/unitmeasure";
import { genCode } from "@/api/system/autocode/rule";
......@@ -375,7 +375,7 @@ export default {
components: {
Treeselect,
BaseInfo,
Look,
// Look,
ProductionPlan,
},
......@@ -610,9 +610,9 @@ export default {
//基本信息保存
const baseInfoData = await this.$refs["BaseInfo"].getBaseInfoData();
baseInfoData.itemId = this.form.itemId;
//产品外观保存
const lookData = await this.$refs["Look"].getLookFormData();
lookData.itemId = this.form.itemId;
// //产品外观保存
// const lookData = await this.$refs["Look"].getLookFormData();
// lookData.itemId = this.form.itemId;
//产品参数配置保存 publishedConf
const publishedConfData = await this.$refs[
......
src/views/mes/pro/request/index.vue
View file @ d4fa9cab
......@@ -46,6 +46,18 @@
>打印
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="confirmUpdate"
v-hasPermi="['pro:materialRequest:edit']"
>确认补料</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="success"
......@@ -333,7 +345,7 @@
</template>
<script>
import { listMaterialRequest, getMaterialRequest, delMaterialRequest, addMaterialRequest, updateMaterialRequest, materialRequestPrintInfo } from "@/api/mes/pro/request";
import {confirmMaterialRequest, listMaterialRequest, getMaterialRequest, delMaterialRequest, addMaterialRequest, updateMaterialRequest, materialRequestPrintInfo } from "@/api/mes/pro/request";
import { genCode } from "@/api/system/autocode/rule";
import BrandSelect from "./components/taskSelect.vue";
import arangeSelect from "./components/arangeSelect.vue";
......@@ -651,6 +663,18 @@ export default {
this.optType = "edit";
});
},
/** 确认补货按钮 */
confirmUpdate(row) {
this.reset();
const materialRequestId = row.materialRequestId || this.ids
confirmMaterialRequest(materialRequestId).then(response => {
this.form = response.data;
this.open = true;
this.title = "确认补料";
this.optType = "edit";
});
},
// 查询明细按钮操作
handleView(row) {
this.reset();
......
src/views/mes/pro/return/index.vue
View file @ d4fa9cab
......@@ -57,6 +57,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="申请单编码" prop="applyNo">
<el-input
v-model="queryParams.applyNo"
placeholder="请输入申请单编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="daterangePurchaseDate"
......@@ -141,14 +149,14 @@
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" width="170" align="center" prop="createTime" />
<el-table-column label="是否合格" align="center" prop="isQualified" width="100">
<!-- <el-table-column label="是否合格" align="center" prop="isQualified" width="100">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_non"
:value="scope.row.isQualified"
/>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
......
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