suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口联调

Browse Source
dev-scheduling
jinna 3 months ago
parent 799fe89486
commit 502fca325f
15 changed files with 374 additions and 136 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/api/orderManagement/moldPlan.js
  2. 25
      src/api/productionManagement/addRequirements.js
  3. 16
      src/api/productionManagement/assayedContent.js
  4. 18
      src/api/productionManagement/coatingMaterial.js
  5. 74
      src/views/orderManagement/components/mold/addMoldDailog.vue
  6. 18
      src/views/orderManagement/components/mold/detailsInfoDialog.vue
  7. 19
      src/views/orderManagement/components/mold/moldAddOneDialog.vue
  8. 2
      src/views/orderManagement/components/mold/moldRecord.vue
  9. 21
      src/views/orderManagement/components/mold/moldRequire.vue
  10. 65
      src/views/productionManagement/components/addQuantity.vue
  11. 56
      src/views/productionManagement/components/coatingAddDialog.vue
  12. 95
      src/views/productionManagement/components/coatingMater/assayedContent.vue
  13. 88
      src/views/productionManagement/components/coatingMater/assayedContentDialog.vue
  14. 3
      src/views/productionManagement/components/coatingMater/materialRequirements.vue
  15. 6
      src/views/productionManagement/components/materialDetail.vue

4
src/api/orderManagement/moldPlan.js
Unescape View File

@ -97,4 +97,6 @@ export const getApplyList = (params) => {
method: 'get',
params
});
};
};

25
src/api/productionManagement/addRequirements.js
Unescape View File

@ -40,4 +40,29 @@ export const getOrderMoldPlanCaDeatils = (params) => {
});
};
// 查询化验含量列表接口
export const getTestValueList = (params) => {
return request({
url: '/blade-desk/order/assayContent/detailListNoUsed',
method: 'get',
params,
});
};
// 查询镀层需求列表接口
export const getAddRequireList = (params) => {
return request({
url: '/blade-desk/order/plateGoodsRecord/listNoFinished',
method: 'get',
params,
});
};
// 作业中心下拉
export const getWorkCenter = () =>{
return request({
url:'/api/blade-desk/BA/WorkCenter/listForSelect',
method:'get'
})
}

16
src/api/productionManagement/assayedContent.js
Unescape View File

@ -26,4 +26,20 @@ export const getassayContentDeatils = (params) => {
});
};
// 作业中心下拉接口
export const getWorkCenter = () =>{
return request({
url:'/api/blade-desk/BA/WorkCenter/listForSelect',
method:'get'
})
}
export const getTank = (params) =>{
return request({
url:'/api/blade-desk/BA/WorkTank/listForSelect',
method:'get',
params
})
}

18
src/api/productionManagement/coatingMaterial.js
Unescape View File

@ -67,4 +67,20 @@ export const getListlistNoFinished = (current, size, params) => {
size,
},
});
};
};
// 需求填报新增列表接口
export const getAddRequireList = params => {
return request({
url: '/blade-desk/order/yieldOrder/pageMaterialApply',
method: 'get',
params
});
};
export const getWorkCenter = () =>{
return request({
url:'/api/blade-desk/BA/WorkCenter/listForSelect',
method:'get'
})
}

74
src/views/orderManagement/components/mold/addMoldDailog.vue
Unescape View File

@ -30,6 +30,7 @@
v-model="scope.row.partCode"
:filterable="true"
allow-create
:disabled="scope.row.disabled"
@change="partCodeChange(scope.row.partCode, scope.$index)"
>
<el-option
@ -58,6 +59,7 @@
<el-select
v-model="scope.row.moCode"
:filterable="true"
:disabled="scope.row.disabled"
allow-create
@change="frockChange(scope.row.moCode, scope.$index)"
>
@ -103,8 +105,8 @@
<el-form-item :prop="`moldPlan[${scope.$index}].planType`" :rules="formRules.planType">
<el-select v-model="scope.row.planType" :filterable="true" allow-create>
<!-- ，，2、仓库 -->
<el-option label="热表/烧结" value="1" />
<el-option label="仓库" value="2" />
<el-option label="热表/烧结" :value="12001" />
<el-option label="仓库" :value="12002" />
</el-select>
</el-form-item>
</template>
@ -122,7 +124,7 @@
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择"
style="width: 80%"
style="width: 90%"
/>
</el-form-item>
</template>
@ -200,6 +202,10 @@ export default {
type: Boolean,
default: false,
},
list:{
type: Array,
default: () => []
}
},
data() {
return {
@ -219,41 +225,47 @@ export default {
moldPlan: [],
},
formRules: {
// moldPlan: [
// {
// required: true,
// message: '请至少添加一行数据',
// trigger: 'submit',
// type: 'array',
// },
// {
// validator: (rule, value, callback) => {
// if (value.length === 0) {
// callback(new Error('请至少添加一行数据'));
// } else {
// callback();
// }
// },
// trigger: 'submit',
// },
// ],
// partCode: [{ required: true, message: '请选择零件编码', trigger: ['change', 'submit'] }],
moldPlan: [
{
required: true,
message: '请至少添加一行数据',
trigger: 'submit',
type: 'array',
},
{
validator: (rule, value, callback) => {
if (value.length === 0) {
callback(new Error('请至少添加一行数据'));
} else {
callback();
}
},
trigger: 'submit',
},
],
partCode: [{ required: true, message: '请选择零件编码', trigger: ['change', 'submit'] }],
// moCode: [{ required: true, message: '请选择工装号', trigger: ['change', 'submit'] }],
// quantity: [
// { required: true, message: '请输入数量', trigger: ['change', 'submit'] },
// { type: 'number', min: 1, message: '数量不能小于1', trigger: ['change', 'submit'] },
// ],
// planType: [{ required: true, message: '请选择计划类型', trigger: ['change', 'submit'] }],
// needDate: [{ required: true, message: '请选择需求日期', trigger: ['change', 'submit'] }],
// quaLevel: [{ required: true, message: '请输入生产标识', trigger: ['blur', 'submit'] }],
// keeper: [{ required: true, message: '请选择保管员', trigger: ['change', 'submit'] }],
quantity: [
{ required: true, message: '请输入数量', trigger: ['change', 'submit'] },
{ type: 'number', min: 1, message: '数量不能小于1', trigger: ['change', 'submit'] },
],
planType: [{ required: true, message: '请选择计划类型', trigger: ['change', 'submit'] }],
needDate: [{ required: true, message: '请选择需求日期', trigger: ['change', 'submit'] }],
quaLevel: [{ required: true, message: '请输入生产标识', trigger: ['blur', 'submit'] }],
keeper: [{ required: true, message: '请选择保管员', trigger: ['change', 'submit'] }],
},
};
},
mounted() {
this.openShow = this.showDialog;
if (this.moldAddMore && this.form.moldPlan.length === 0) {
if (this.moldAddMore && this.form.moldPlan.length === 0 && this.list.length === 0) {
this.addTable();
}else{
let list = JSON.parse(JSON.stringify(this.list))
list.map(item =>{
item.disabled = true
})
this.form.moldPlan = list
}
this.getPart();
this.getQuaLevel()

18
src/views/orderManagement/components/mold/detailsInfoDialog.vue
Unescape View File

@ -8,13 +8,13 @@
fullscreen
>
<el-descriptions class="margin-top" :column="4" border title="需求信息">
<el-descriptions-item label="需求编号">9999</el-descriptions-item>
<el-descriptions-item label="工装编号">{{ form.moCode }}</el-descriptions-item>
<el-descriptions-item label="工装名称">{{ form.moName}}</el-descriptions-item>
<el-descriptions-item label="关联订单数">9999</el-descriptions-item>
<el-descriptions-item label="需求编号">{{}}</el-descriptions-item>
<el-descriptions-item label="工装编号">{{ form.moCode || "-" }}</el-descriptions-item>
<el-descriptions-item label="工装名称">{{ form.moName || "-" }}</el-descriptions-item>
<el-descriptions-item label="关联订单数">{{form.linkOrderIds || "-"}}</el-descriptions-item>
<el-descriptions-item label="订单需求量">{{ form.quantity || "-" }}</el-descriptions-item>
<el-descriptions-item label="库存数量">9999</el-descriptions-item>
<el-descriptions-item label="占用数量">9999</el-descriptions-item>
<el-descriptions-item label="库存数量">{{ form.stockNum || "-" }}</el-descriptions-item>
<el-descriptions-item label="占用数量">{{ form.occupyNum || "-" }}</el-descriptions-item>
</el-descriptions>
<el-descriptions class="margin-top" :column="4" border title="工装占用信息"></el-descriptions>
<el-table :data="tableData" style="width: 100%">
@ -88,8 +88,10 @@ export default {
mounted() {
this.openShow = this.showDialog;
getOrderMoldPlanCaDeatils({ id: this.id }).then(res => {
if (res.code == 200) {
this.form = { ...res.data };
if (res.data.code == 200) {
console.log(res.data.data);
this.form = res.data.data;
// this.form = { ...res.data };
}
});
},

19
src/views/orderManagement/components/mold/moldAddOneDialog.vue
Unescape View File

@ -58,7 +58,10 @@
</el-col>
<el-col :span="12">
<el-form-item label="生产标识:" prop="quaLevels">
<el-input v-model="form.quaLevels" style="width: 80%" />
<el-select v-model="form.quaLevel" style="width: 80%">
<el-option v-for="item in prodIdentList" :key="item.id" :label="item.name" :value="item.name"></el-option>
</el-select>
<!-- <el-input v-model="form.quaLevels" style="width: 80%" /> -->
</el-form-item>
</el-col>
<el-col :span="12">
@ -91,7 +94,7 @@
</el-dialog>
</template>
<script>
import { getOrderMoldPlanCaDeatils,update } from '@/api/orderManagement/moldPlan';
import { getOrderMoldPlanCaDeatils,update,getProdIdentList } from '@/api/orderManagement/moldPlan';
export default {
props: {
showDialog: {
@ -108,6 +111,7 @@ export default {
openShow: false,
form: {},
tableData: [],
prodIdentList:[],
rules: {
quaLevel: [{ required: true, message: '请输入数量', trigger: 'blur' }],
moCodes: [{ required: true, message: '请选择计划类型', trigger: 'change' }],
@ -119,12 +123,19 @@ export default {
mounted() {
this.openShow = this.showDialog;
getOrderMoldPlanCaDeatils({ id: this.id }).then(res => {
if (res.code == 200) {
this.form = { ...res.data };
if (res.data.code == 200) {
// this.form = { ...res.data.data };
this.form = res.data.data
}
});
this.getProdIdent()
},
methods: {
getProdIdent(){
getProdIdentList().then(res => {
this.prodIdentList = res.data.data;
});
},
closeDialog() {
this.openShow = false;
this.$emit('closeDialog');

2
src/views/orderManagement/components/mold/moldRecord.vue
Unescape View File

@ -219,7 +219,7 @@ export default {
},
{
label: '建立人员',
prop: 'createMan',
prop: 'createUserName',
search: false,
sortable: true,
span: 12,

21
src/views/orderManagement/components/mold/moldRequire.vue
Unescape View File

@ -16,7 +16,7 @@
@on-load="onLoad"
>
<template #menu-left>
<el-button type="primary" @click="moldAddFn(null, true)">新增</el-button>
<el-button type="primary" @click="moldAddFn(null, true)">批量模具申报</el-button>
<!-- <el-button type="primary" @click="moldAddFn(null,true)">模具申报</el-button> -->
<el-button type="primary" @click="closeNeed()">关闭需求</el-button>
</template>
@ -53,6 +53,7 @@
:showDialog="addOpen"
@closeDialog="closeDialog"
:moldAddMore="moldAddMore"
:list="selectionList"
>
</addMoldDailog>
<!-- 详情 -->
@ -85,6 +86,7 @@ export default {
data() {
return {
Id: null,
moldId:null,
departments: [],
materials: [],
activeName: 'first',
@ -218,7 +220,7 @@ export default {
},
{
label: '库存量',
prop: 'partName',
prop: 'stockNum',
search: false,
sortable: true,
span: 12,
@ -227,7 +229,7 @@ export default {
},
{
label: '占用量',
prop: 'prodIdent',
prop: 'occupyNum',
search: false,
sortable: true,
span: 12,
@ -236,7 +238,7 @@ export default {
},
{
label: '关联订单',
prop: 'useDept',
prop: 'linkOrderIds',
search: false,
sortable: true,
span: 12,
@ -293,16 +295,23 @@ export default {
},
// 新增
moldAddFn(row, flag) {
// if(this.selectionList.length == 0) {
// this.$message.error('请至少选择一条数据！');
// return;
// }
this.addOpen = true;
this.moldAddMore = flag;
},
// 模具申报
moldAddOneFn(row) {
this.Id = row.id;
this.moldAddOneOpen = true;
this.moldId = row.id;
this.moldAddMore = false
this.selectionList = [{...row}]
this.addOpen = true;
},
// 详情
detailsFn(row) {
this.Id = row.id;
this.detailsOpen = true;
},
// 关闭弹框

65
src/views/productionManagement/components/addQuantity.vue
Unescape View File

@ -3,26 +3,26 @@
<el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="90">
<el-row>
<el-col :span="6">
<el-form-item label="作业中心" prop="zuoyezhongxin">
<el-select v-model="ruleForm.zuoyezhongxin" placeholder="请选择" @change="workChange">
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value" />
<el-form-item label="作业中心" prop="wcId">
<el-select v-model="ruleForm.wcId" placeholder="请选择" @change="workChange">
<el-option v-for="item in options" :key="item.id" :label="item.wcName"
:value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" prop="zuoyezhongxin">
<el-radio-group v-model="radio">
<el-form-item label="" prop="dayRange">
<el-radio-group v-model="ruleForm.dayRange">
<el-radio :value="3">3天</el-radio>
<el-radio :value="6">7天</el-radio>
<el-radio :value="9">30天</el-radio>
<el-radio :value="7">7天</el-radio>
<el-radio :value="30">30天</el-radio>
<el-radio :value=" '' ">全部</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" style="float: right;">
<el-form-item label="" prop="zuoyezhongxin">
<el-button type="primary">查询</el-button>
<el-form-item label="" prop="">
<el-button @click="handleSearch" type="primary">查询</el-button>
</el-form-item>
</el-col>
@ -32,7 +32,7 @@
<el-descriptions class="margin-top" :column="4" border title="添加量"></el-descriptions>
<el-table :data="materialNeedsData" style="width: 50%;">
<el-table-column type="index" width="70" label="序号"></el-table-column>
<el-table-column label="作业槽" prop="zuoyecao" align="center"></el-table-column>
<el-table-column label="作业槽" prop="slotName" align="center"></el-table-column>
<el-table-column label="测量值" prop="testVal" align="center"></el-table-column>
<el-table-column label="添加量" prop="addValue" align="center" width="150">
<template #default="scope">
@ -75,7 +75,7 @@
</template>
<script>
import {getTestValueList,getWorkCenter,getAddRequireList} from "@/api/productionManagement/addRequirements"
export default {
props: {
addQuantity: {
@ -89,36 +89,45 @@ export default {
addForm: {},
tableData: [],
ruleForm: {
huayanshijian: '',
zuoyezhongxin: ''
dayRange: '',
wcId: ''
},
rules: {
huayanshijian: [
wcId: [
{ required: true, message: '请选择', trigger: 'blur' },
],
zuoyezhongxin: [
dayRange: [
{ required: true, message: '请选择', trigger: 'blur' },
]
},
materialNeedsData: [
],
options: [
{
label: '作业中心一',
value: '1'
},
{
label: '作业中心二',
value: '2'
},
]
options: []
}
},
mounted() {
},
this.getWorkCenter();
},
methods: {
getWorkCenter(){
getWorkCenter().then(res => {
this.options = res.data.data
})
},
async handleSearch(){
console.log('rule------------',this.ruleForm)
let params = {
workCenterId:this.ruleForm.wcId,
dayRange:this.ruleForm.dayRange
}
const res1 = await getTestValueList(params)
const res2 = await getAddRequireList(this.ruleForm)
this.materialNeedsData = res1.data.data
console.log('res1------------',res1)
console.log('res2------------',res2)
},
getSummaries (param){
const { columns, data } = param;
const sums = [];

56
src/views/productionManagement/components/coatingAddDialog.vue
Unescape View File

@ -9,13 +9,13 @@
fullscreen
>
<el-form :inline="true" v-model="submitForm">
<el-form-item label="银钾系数" prop="coefficient" v-if="searchForm.goodsType == 6">
<el-form-item label="银钾系数" prop="coefficient" v-if="searchForm.materalType == 2">
<el-input placeholder="请输入银钾系数" v-model="submitForm.coefficient"></el-input>
</el-form-item>
<el-form-item :label="labelValue + '需求量'" prop="" v-if="searchForm.goodsType == 3">
<el-form-item :label="labelValue + '需求量'" prop="" v-if="searchForm.materalType == 1">
<el-input placeholder="请输入需求量" v-model="submitForm.goodsQuantity"></el-input>
</el-form-item>
<el-form-item label="银钾需求量" prop="saveBoardVal" v-if="searchForm.goodsType == 6">
<el-form-item label="银钾需求量" prop="saveBoardVal" v-if="searchForm.materalType == 2">
<el-input placeholder="请输入银钾需求量" v-model="submitForm.saveBoardVal"></el-input>
</el-form-item>
<!-- <el-form-item>
@ -30,18 +30,18 @@
<el-form :inline="true" v-model="searchForm" label-width="90px">
<el-form-item label="作业中心" prop="wcId">
<el-select style="width: 182px" v-model="searchForm.wcId" placeholder="请选择作业中心">
<el-option label="作业中心一" value="1"></el-option>
<el-option label="作业中心二" value="2"></el-option>
<el-option v-for="item in workList" :key="item.id" :label="item.wcName" :value="item.id"></el-option>
<!-- <el-option label="作业中心二" value="2"></el-option> -->
</el-select>
</el-form-item>
<el-form-item label="物料类型" prop="goodsType">
<el-radio-group v-model="searchForm.goodsType" @input="changeType">
<el-radio :label="3">金钾</el-radio>
<el-radio :label="6">银钾</el-radio>
<el-form-item label="物料类型" prop="materalType">
<el-radio-group v-model="searchForm.materalType" @input="changeType">
<el-radio :label="1">金钾</el-radio>
<el-radio :label="2">银钾</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
<el-checkbox v-model="searchForm.checked">允许使用半月以上的数据</el-checkbox>
<el-checkbox v-model="searchForm.overHalfMon">允许使用半月以上的数据</el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSearch" :loading="loading">查 询</el-button>
@ -110,7 +110,7 @@
</template>
<script>
import { getListlistNoFinished } from '@/api/productionManagement/coatingMaterial';
import { getListlistNoFinished,getAddRequireList,getWorkCenter } from '@/api/productionManagement/coatingMaterial';
export default {
props: {
showDialog: {
@ -123,20 +123,28 @@ export default {
loading: false,
submitForm: {},
searchForm: {
goodsType: 3,
materalType: 1,
},
labelValue: '金钾',
tableData: [],
totalNum: null,
selectionList: [],
workList:[]
};
},
mounted() {},
mounted() {
this.getWorkCenterList()
},
methods: {
getWorkCenterList() {
getWorkCenter().then((res) => {
this.workList = res.data.data
})
},
// 切换金钾/银钾类型
changeType(val) {
console.log('val-------------');
if (val.target.value == 3) {
if (val.target.value == 1) {
this.labelValue = '金钾';
} else {
this.labelValue = '银钾';
@ -146,14 +154,20 @@ export default {
async onSearch() {
this.loading = true;
try {
const params = { ...this.submitForm, ...this.query };
const res = await getListlistNoFinished(1, 1000, params);
if (res && res.code === 200) {
this.data = res.data?.data?.records || [];
this.$refs?.multipleTable?.clearSelection();
} else {
console.warn('查询失败:', '未知错误');
// const params = { ...this.submitForm, ...this.query };
console.log('params', this.searchForm);
let params = {
...this.searchForm,
overHalfMon:this.searchForm.overHalfMon ? 1 : 0
}
const res = await getAddRequireList( params);
console.log('res', res);
// if (res && res.code === 200) {
// this.data = res.data?.data?.records || [];
// this.$refs?.multipleTable?.clearSelection();
// } else {
// console.warn('查询失败:', '未知错误');
// }
} finally {
this.loading = false;
}

95
src/views/productionManagement/components/coatingMater/assayedContent.vue
Unescape View File

@ -102,7 +102,93 @@ export default {
gridBtn: false,
searchMenuPosition: 'right',
align: 'center',
column: [],
column: [
{
label: '作业中心',
prop: 'wcId',
span: 24,
type: 'select',
overflow: true,
search: true,
headerAlign: 'center',
align: 'center',
searchLabelWidth: 80,
rules: [
{
required: true,
message: '请输入作业中心',
trigger: 'blur',
},
],
dicUrl: '/blade-desk/BA/WorkCenter/listForSelect',
props: {
label: 'wcName',
value: 'id',
},
},
{
label: '化验人',
prop: 'assayManName',
span: 24,
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
searchLabelWidth: 80,
rules: [
{
required: true,
message: '请输入化验人',
trigger: 'blur',
},
],
},
{
label: '化验时间',
prop: 'assayTime',
span: 24,
type: 'datetime',
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
searchLabelWidth: 80,
rules: [
{
required: true,
message: '请输入化验时间',
trigger: 'blur',
},
],
},
{
label: '状态',
prop: 'status',
span: 24,
overflow: true,
search: true,
type: 'select',
headerAlign: 'center',
align: 'center',
searchLabelWidth: 50,
rules: [
{
required: true,
message: '请输入状态',
trigger: 'blur',
},
],
dicData: [
// { label: '待审核', value: '1' },
// { label: '审核不通过', value: '2' },
// { label: '已关闭', value: '3' },
// { label: '审核通过', value: '4' },
{ label: '已使用', value: 10001 },
{ label: '未使用', value: 10000 },
{ label: '已过期', value: 10002 },
]
},
],
},
approveRules: {
approveREsult: [{ required: true, message: '请选择审批结果', trigger: 'blur' }],
@ -118,7 +204,7 @@ export default {
};
},
mounted() {
this.option.column = coatingColumnData[this.tabPosition];
// this.option.column = coatingColumnData[this.tabPosition];
},
methods: {
searchReset() {
@ -164,12 +250,15 @@ export default {
this.isAddOpen = true;
},
// 关闭弹窗
closeDialog() {
closeDialog(val) {
this.showDialog = false;
this.materialDialog = false;
this.addQuantity = false;
this.addDialog = false;
this.isAddOpen = false;
if(val){
this.onLoad()
}
},
addQuantityClick() {
if (this.selectionList.length == 0) {

88
src/views/productionManagement/components/coatingMater/assayedContentDialog.vue
Unescape View File

@ -10,27 +10,26 @@
<el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="90">
<el-row>
<el-col :span="12">
<el-form-item label="作业中心" prop="zuoyezhongxin">
<el-select v-model="ruleForm.zuoyezhongxin" placeholder="请选择" @change="handelchange">
<el-form-item label="作业中心" prop="wcId">
<el-select v-model="ruleForm.wcId" placeholder="请选择" @change="changeWork">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.wcName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="化验时间" prop="huayanshijian">
<el-form-item label="化验时间" prop="assayTime">
<!-- 修复日期选择器v-model绑定错误 -->
<el-date-picker
v-model="ruleForm.huayanshijian"
v-model="ruleForm.assayTime"
type="date"
placeholder="请选择"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
@change="handelchange"
/>
</el-form-item>
</el-col>
@ -38,7 +37,7 @@
<el-table :data="ruleForm.tableData" style="width: 100%">
<el-table-column type="index" label="序号" width="180" />
<el-table-column prop="slot" label="作业槽" width="180" />
<el-table-column prop="slotName" label="作业槽" width="180" />
<el-table-column prop="testVal" label="测量值">
<template #header>
<span><i style="color: red">*</i>测量值</span>
@ -46,7 +45,6 @@
<template #default="scope">
<!-- 将输入框放入form-item内部，避免校验时的更新冲突 -->
<el-form-item
:prop="'tableData.' + scope.$index + '.testVal'"
:rules="[{ required: true, message: '请输入测量值', trigger: ['blur', 'change'] }]"
>
@ -54,6 +52,7 @@
v-model="scope.row.testVal"
controls-position="right"
@change="handleChange"
style="margin-top:18px;"
/>
</el-form-item>
</template>
@ -71,7 +70,7 @@
</template>
<script>
import { add } from '@/api/productionManagement/assayedContent';
import { add,getWorkCenter,getTank } from '@/api/productionManagement/assayedContent';
export default {
props: {
showDialog: {
@ -83,41 +82,74 @@ export default {
return {
openShow: false,
ruleForm: {
huayanshijian: '',
zuoyezhongxin: '',
tableData: [
{ testVal: null, slot: '#16' },
{ testVal: null, slot: '#15' },
],
assayTime: '',
wcId: '',
tableData: [],
},
rules: {
huayanshijian: [{ required: true, message: '请选择化验时间', trigger: ['change', 'blur'] }],
zuoyezhongxin: [{ required: true, message: '请选择作业中心', trigger: ['change', 'blur'] }],
assayTime: [{ required: true, message: '请选择化验时间', trigger: ['change', 'blur'] }],
wcId: [{ required: true, message: '请选择作业中心', trigger: ['change', 'blur'] }],
},
options: [
{ label: '作业中心一1', value: '1' },
{ label: '作业中心二', value: '2' },
],
options: [],
};
},
mounted() {
this.openShow = this.showDialog;
this.ruleForm.tableData = []
this.getWorkCenterList()
},
methods: {
// 获取作业中心
getWorkCenterList(){
getWorkCenter().then(res =>{
this.options = res.data.data
})
},
changeWork(value){
getTank({ workstationId: value }).then(res =>{
res.data.data.map(item =>{
this.ruleForm.tableData.push({
slot:item.workTankCode,
slotName:item.name,
testVal:""
})
})
})
},
//查询表格
handelchange(){
console.log(this.ruleForm,22222)
},
closeDialog() {
closeDialog(val) {
this.openShow = false;
this.$emit('closeDialog');
this.$emit('closeDialog',val);
},
async submit() {
this.$refs.ruleFormRef.validate(valid => {
if (valid) {
const res= add()
console.log('提交数据:', this.ruleForm);
// 提交逻辑
let params = {
assayContent:{
wcId:this.ruleForm.wcId,
assayTime:this.ruleForm.assayTime
},
detailList:this.ruleForm.tableData
}
console.log('params---------------',params)
add(params).then(res =>{
if(res.data.code == 200){
this.$message.success('新增成功')
this.closeDialog(true)
}
}).catch(err=>{
this.closeDialog()
})
// if(this.ruleForm.tableData.length == 0){
// this.$message.error('请至少添加数据');
// }
// const res= add()
// console.log('提交数据:', this.ruleForm);
// // 提交逻辑
}
});
},

3
src/views/productionManagement/components/coatingMater/materialRequirements.vue
Unescape View File

@ -22,7 +22,7 @@
<el-button type="primary" @click="handleApprove">批量审核</el-button>
</template>
<template #menu-right>
<el-button type="warning" @click="pendingReviewFn()" :loading="loading">待审核</el-button>
<el-button type="warning" @click="pendingReviewFn()" >待审核</el-button>
</template>
<template #menu="{ row }">
<el-button type="text" @click="handleView(row)">详情</el-button>
@ -64,6 +64,7 @@ import {
confirmBatch,
closeBatchs,
removeByIds,
getOrderMoldPlanCaDeatils
} from '@/api/productionManagement/coatingMaterial';
import coatingAddDialog from '../coatingAddDialog.vue';
import coatingColumnData from '../../js/coatingColumnData';

6
src/views/productionManagement/components/materialDetail.vue
Unescape View File

@ -302,9 +302,9 @@ export default {
// ];
try {
const ref = await getOrderMoldPlanCaDeatils({ id: this.id });
if (res.code == 200) {
this.detailForm = res.data.detailForm;
this.tableData = res.data.list;
if (res.data.code == 200) {
this.detailForm = res.data.data.detailForm;
this.tableData = res.data.data.list;
}
} catch (err) {console.log(err)}
},

Write Preview
Loading…
Cancel
Save