Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

dev-scheduling
zhangdi 3 months ago
commit b75afdb602
  1. 45
      src/api/orderManagement/exceptionOrder.js
  2. 34
      src/api/orderManagement/moldPlan.js
  3. 8
      src/api/productionManagement/addRequirements.js
  4. 8
      src/api/productionManagement/assayedContent.js
  5. 10
      src/api/productionManagement/coatingMaterial.js
  6. 2
      src/views/basicData/components/addEditDialog.vue
  7. 24
      src/views/inboundOutboundManagement/binTransfer/components/addEditDialog.vue
  8. 1286
      src/views/orderManagement/components/exception/dataMissing.vue
  9. 1234
      src/views/orderManagement/components/exception/deliveryDate.vue
  10. 1265
      src/views/orderManagement/components/exception/processMissing.vue
  11. 1261
      src/views/orderManagement/components/exception/resourceMissing.vue
  12. 70
      src/views/orderManagement/components/mold/addMoldDailog.vue
  13. 33
      src/views/orderManagement/components/mold/moldRecord.vue
  14. 19
      src/views/orderManagement/components/mold/moldRequire.vue
  15. 68
      src/views/orderManagement/components/priorityDialog.vue
  16. 87
      src/views/orderManagement/components/sinTerYieIdDialog.vue
  17. 59
      src/views/orderManagement/planYieIdOrder.vue
  18. 36
      src/views/orderManagement/sinTerYieIdOrder.vue
  19. 238
      src/views/productionManagement/components/coatingMater/addRequirements.vue
  20. 54
      src/views/productionManagement/components/coatingMater/assayedContent.vue
  21. 187
      src/views/productionManagement/components/coatingMater/materialRequirements.vue

@ -1,14 +1,10 @@
import request from '@/axios';
//列表接口
export const getList = (current, size, params) => {
export const getList = (params) => {
return request({
url: '/blade-desk/order/yieldOrder/pageException',
method: 'get',
params: {
...params,
current,
size,
},
params
});
};
@ -17,23 +13,42 @@ export const closeBatchs = ids => {
return request({
url: '/blade-desk/order/yieldOrder/closeBatch',
method: 'post',
data: ids,
params: ids,
});
};
//批量合格校验
export const confirmBatch = ids => {
// 修改
export const updateData = data => {
return request({
url: '/blade-desk/order/yieldOrder/confirmBatch',
url: '/blade-desk/order/yieldOrder/update',
method: 'post',
data: ids,
data
});
};
//批量合格校验
export const edit = ids => {
// export const confirmBatch = ids => {
// return request({
// url: '/blade-desk/order/yieldOrder/confirmBatch',
// method: 'post',
// params: ids,
// });
// };
// //批量合格校验
// export const edit = ids => {
// return request({
// url: '/blade-desk/order/yieldOrder/update',
// method: 'post',
// data: ids,
// });
// };
// 合规校验
export const verificationData = (params) =>{
return request({
url: '/blade-desk/order/yieldOrder/update',
url: '/blade-desk/order/yieldOrder/dataVerify',
method: 'post',
data: ids,
params
});
};
}

@ -63,4 +63,38 @@ export const getListpageNearlyMonth = (current, size, params) => {
size,
},
});
};
// 零件下拉
export const getPartList = () =>{
return request({
url:'/api/blade-desk/dsPart/getPartList',
method:'get'
})
}
// 获取生产标识下拉
export const getProdIdentList = () => {
return request({
url: '/api/blade-desk/BA/ProdMark/listForSelect',
method: 'get',
});
};
// 根据角色别名查询用户
export const getUserByRoleAlias = (params) => {
return request({
url: '/api/blade-system/user/list-all-by-role-alias',
method: 'get',
params,
});
};
// 获取申报记录列表
export const getApplyList = (params) => {
return request({
url: '/api/blade-desk/order/moldPlan/pageApply',
method: 'get',
params
});
};

@ -1,14 +1,10 @@
import request from '@/axios';
//列表接口
export const getList = (current, size, params) => {
export const getList = (params) => {
return request({
url: '/blade-desk/order/plateGoodsApply/page',
method: 'get',
params: {
...params,
current,
size,
},
params
});
};
//新增

@ -1,14 +1,10 @@
import request from '@/axios';
//列表接口
export const getList = (current, size, params) => {
export const getList = (params) => {
return request({
url: '/blade-desk/order/assayContent/page',
method: 'get',
params: {
...params,
current,
size,
},
params
});
};
//新增

@ -1,14 +1,10 @@
import request from '@/axios';
//列表接口
export const getList = (current, size, params) => {
//镀层物料需求申报列表接口
export const getList = (params) => {
return request({
url: '/blade-desk/order/plateGoodsRecord/page',
method: 'get',
params: {
...params,
current,
size,
},
params,
});
};
//新增

@ -263,6 +263,8 @@ export default {
this.$message.success('保存成功');
this.closeDialog(true);
}
}).catch(err =>{
this.closeDialog();
})
})
},

@ -91,11 +91,11 @@
:remote-method="remoteMethodLocation" -->
<template #default="scope">
<el-form-item
:prop="`tableData[${scope.$index}].newSIId`"
:rules="formRules.newSIId"
:prop="`tableData[${scope.$index}].newSlId`"
:rules="formRules.newSlId"
>
<el-select
v-model="scope.row.newSIId"
v-model="scope.row.newSlId"
placeholder="请选择"
style="width: 100%; margin-top: 15px"
@ -114,10 +114,10 @@
<el-table-column align="center" label="旧库房号">
<template #default="scope">
<el-form-item
:prop="`tableData[${scope.$index}].location`"
:rules="formRules.location"
:prop="`tableData[${scope.$index}].shName`"
:rules="formRules.shName"
>
<el-input style="margin-top: 15px" v-model="scope.row.location" disabled></el-input>
<el-input style="margin-top: 15px" v-model="scope.row.shName" disabled></el-input>
</el-form-item>
</template>
</el-table-column>
@ -125,10 +125,10 @@
<el-table-column align="center" label="旧库位号">
<template #default="scope">
<el-form-item
:prop="`tableData[${scope.$index}].shName`"
:rules="formRules.shName"
:prop="`tableData[${scope.$index}].location`"
:rules="formRules.location"
>
<el-input style="margin-top: 15px" v-model="scope.row.shName" disabled></el-input>
<el-input style="margin-top: 15px" v-model="scope.row.location" disabled></el-input>
</el-form-item>
</template>
</el-table-column>
@ -228,7 +228,7 @@ export default {
newShId:[
{ required: true, message: '请选择新库房号', trigger: ['change', 'submit'] }
],
newSIId:[
newSlId:[
{ required: true, message: '请选择新库位号', trigger: ['change', 'submit'] }
]
},
@ -282,9 +282,11 @@ export default {
this.form.tableData[index].specifications = tmp.specifications
this.form.tableData[index].piNo = tmp.piNo
this.form.tableData[index].quantity = tmp.quantity
this.form.tableData[index].oldSlId = tmp.slId
this.form.tableData[index].oldShId = tmp.shId
},
changeWare(val,index){
this.form.tableData[index].newSIId = ''
this.form.tableData[index].newSlId = ''
this.remoteMethodLocation(val)
},
remoteMethodLocation(val){

@ -35,8 +35,8 @@
<el-option
v-for="(item, index) in partCodeList"
:key="index"
:label="item.label"
:value="item.value"
:label="item.partCode"
:value="item.partCode"
></el-option>
</el-select>
</el-form-item>
@ -83,9 +83,9 @@
<span><i style="color: red">*</i>数量</span>
</template>
<template #default="scope">
<el-form-item :prop="`moldPlan[${scope.$index}].shuliang`" :rules="formRules.shuliang">
<el-form-item :prop="`moldPlan[${scope.$index}].quantity`" :rules="formRules.quantity">
<el-input-number
v-model="scope.row.shuliang"
v-model="scope.row.quantity"
:min="1"
controls-position="right"
style="width: 90%"
@ -134,7 +134,15 @@
</template>
<template #default="scope">
<el-form-item :prop="`moldPlan[${scope.$index}].quaLevel`" :rules="formRules.quaLevel">
<el-input v-model="scope.row.quaLevel" />
<!-- <el-input v-model="scope.row.quaLevel" /> -->
<el-select v-model="scope.row.quaLevel">
<el-option
v-for="(item, index) in quaLevelList"
:key="index"
:label="item.name"
:value="item.name"
></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
@ -146,8 +154,8 @@
<template #default="scope">
<el-form-item :prop="`moldPlan[${scope.$index}].keeper`" :rules="formRules.keeper">
<el-select v-model="scope.row.keeper" :filterable="true" allow-create>
<el-option label="人员一" value="1" />
<el-option label="人员二" value="2" />
<el-option v-for="item in keeperList" :key="item.id" :label="item.realName" :value="item.id" />
<!-- <el-option label="人员二" value="2" /> -->
</el-select>
</el-form-item>
</template>
@ -179,7 +187,7 @@
</template>
<script>
import { add } from '@/api/orderManagement/moldPlan';
import { add,getPartList,getProdIdentList,getUserByRoleAlias } from '@/api/orderManagement/moldPlan';
import { index } from '@/views/plugin/workflow/api/statistics';
export default {
@ -202,13 +210,9 @@ export default {
value: 2,
},
],
partCodeList: [
{ label: '零件一', value: 1 },
{
label: '零件二',
value: 2,
},
],
partCodeList: [],
quaLevelList:[],
keeperList:[],
openShow: false,
formError: '',
form: {
@ -235,7 +239,7 @@ export default {
// ],
// partCode: [{ required: true, message: '', trigger: ['change', 'submit'] }],
// moCode: [{ required: true, message: '', trigger: ['change', 'submit'] }],
// shuliang: [
// quantity: [
// { required: true, message: '', trigger: ['change', 'submit'] },
// { type: 'number', min: 1, message: '1', trigger: ['change', 'submit'] },
// ],
@ -251,6 +255,9 @@ export default {
if (this.moldAddMore && this.form.moldPlan.length === 0) {
this.addTable();
}
this.getPart();
this.getQuaLevel()
this.getUser()
},
watch: {
showDialog(newVal) {
@ -261,9 +268,24 @@ export default {
},
},
methods: {
closeDialog() {
getPart(){
getPartList().then(res =>{
this.partCodeList = res.data.data
})
},
getQuaLevel(){
getProdIdentList().then(res =>{
this.quaLevelList = res.data.data
})
},
getUser(){
getUserByRoleAlias({roleAlias:'保管员'}).then(res =>{
this.keeperList = res.data.data
})
},
closeDialog(val) {
this.openShow = false;
this.$emit('closeDialog');
this.$emit('closeDialog',val);
this.form.moldPlan = [];
this.formError = '';
this.$refs.tableForm?.resetFields();
@ -278,7 +300,7 @@ export default {
partName: '',
moCode: '',
moName: '',
shuliang: 1,
quantity: 1,
planType: '',
needDate: '',
quaLevel: '',
@ -295,7 +317,7 @@ export default {
},
partCodeChange(val, i) {
this.form.moldPlan[i].partName =
this.partCodeList.find(item => item.value === val)?.label || '';
this.partCodeList.find(item => item.partCode === val)?.partName || '';
},
frockChange(val, i) {
//
@ -319,10 +341,10 @@ export default {
return;
} else {
console.log('submitForm after validate', JSON.parse(JSON.stringify(this.form)));
add({moldPlan:this.form.moldPlan[0]}).then(res => {
if (res.code === 200) {
this.$message.success('提交成功');
this.closeDialog();
add(this.form.moldPlan).then(res => {
if (res.data.code === 200) {
this.$message.success('新增成功');
this.closeDialog(true);
}
});
}

@ -28,7 +28,7 @@
</avue-crud>
</template>
<script>
import { getListpageNearlyMonth } from '@/api/orderManagement/moldPlan';
import { getApplyList } from '@/api/orderManagement/moldPlan';
export default {
components: {},
data() {
@ -239,7 +239,7 @@ export default {
},
{
label: '状态',
prop: 'mafStatusTitle',
prop: 'mafStatusName',
search: false,
sortable: true,
span: 12,
@ -457,6 +457,20 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
getApplyList({
current:this.page.currentPage,
size:this.page.pageSize,
...this.query
}).then(res => {
this.data = res.data.data.records;
this.page.total = res.data.data.total
this.selectionClear();
this.loading = false;
});
// this.page.total = res.data.data.total
// this.selectionClear();
// });
// this.data = [
// {
// createMan: {
@ -745,22 +759,9 @@ export default {
// urgentType: '0',
// },
// ];
this.page.total = this.data.length;
// this.page.total = this.data.length;
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// this.data = res.data.data.records;
getListpageNearlyMonth(
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
).then(res => {
this.data = res.data.data.records;
this.page.total = res.data.data.total
this.selectionClear();
});
this.loading = false;
// this.page.total = res.data.data.total
// this.selectionClear();
// });
},
},
mounted() {},

@ -306,10 +306,13 @@ export default {
this.detailsOpen = true;
},
//
closeDialog() {
closeDialog(val) {
this.addOpen = false;
this.detailsOpen = false;
this.moldAddOneOpen = false;
if(val){
this.onLoad()
}
},
inBatchesFn(row) {
this.rowItem = row;
@ -514,6 +517,14 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
this.selectionClear();
this.loading = false;
});
// this.data = [
// {
// id: 1,
@ -640,12 +651,6 @@ export default {
// },
// ];
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
this.selectionClear();
});
this.loading = false;
},
},
mounted() {},

@ -1,10 +1,11 @@
<template>
<el-dialog title="优先级调整" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
<el-form ref="form" :model="form" label-width="120px">
<el-form ref="form" :model="form" :rules="formRules" label-width="120px">
<el-form-item label="当前优先级:">{{ priorityName }}</el-form-item>
<el-form-item label="设置优先级:" prop="priority" required>
<el-select v-model="form.priority" placeholder="请选择" >
<el-option
<el-option v-for="item in priorityList" :key="item.value" :value="item.value" :label="item.label"></el-option>
<!-- <el-option
label="一级"
:value="1">
</el-option>
@ -15,7 +16,7 @@
<el-option
label="三级"
:value="3">
</el-option>
</el-option> -->
</el-select>
</el-form-item>
</el-form>
@ -29,16 +30,20 @@
</el-dialog>
</template>
<script>
import {updatePreference} from '@/api/orderManagement/planYieIdOrder';
export default {
props: {
showDialog: {
type: Boolean,
default: false
},
priorityName:{
type:String,
default:""
// priorityName:{
// type:String,
// default:""
// },
list:{
type:Object,
default:[]
}
},
data() {
@ -46,26 +51,53 @@ export default {
openShow:false,
form:{
priority:''
}
},
formRules:{
priority:[{required:true,message:'请选择优先级',trigger:'blur'}]
},
priorityList:[
{ label:'1级-极高紧急度',value:15001 },
{ label:'2级-高紧急度',value:15002 },
{ label:'3级-中紧急度',value:15003 },
{ label:'4级-低紧急度',value:15004 },
{ label:'5级-正常',value:15005 },
]
}
},
mounted(){
this.openShow = this.showDialog
let list = this.list.map(item => item.priorityApsName)
let uniqueList = [...new Set(list)];
this.priorityName = uniqueList.join(',')
},
methods:{
closeDialog(){
closeDialog(val){
this.openShow = false
this.$emit('closeDialog');
this.$emit('closeDialog',val);
},
submit() {
if (!this.form.priority) {
this.$message.warning('请选择优先级');
return;
}
this.$emit('submitPriority', {
priority: this.form.priority
});
this.closeDialog();
this.$refs.form.validate(valid => {
if(valid){
updatePreference({
ids:this.list.map(item => item.id).join(','),
priority:this.form.priority
}).then(res =>{
if(res.data.code == 200){
this.$message.success('优先级调整成功')
this.closeDialog(true)
}
})
// selectionList
}
})
// if (!this.form.priority) {
// this.$message.warning('');
// return;
// }
// this.$emit('submitPriority', {
// priority: this.form.priority
// });
// this.closeDialog();
}
},

@ -1,24 +1,13 @@
<template>
<el-dialog title="优先级调整" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="当前优先级:">{{ priorityName}}</el-form-item>
<el-form-item label="设置优先级:" prop="value1" required>
<el-select v-model="form.value1" placeholder="请选择" >
<el-option
label="一级"
:value="1">
</el-option>
<el-option
label="二级"
:value="2">
</el-option>
<el-option
label="三级"
:value="3">
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form ref="form" :model="form" :rules="formRules" label-width="120px">
<el-form-item label="当前优先级:">{{ priorityName}}</el-form-item>
<el-form-item label="设置优先级:" prop="priority" required>
<el-select v-model="form.priority" placeholder="请选择" >
<el-option v-for="item in priorityList" :key="item.value" :value="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
@ -29,6 +18,7 @@
</el-dialog>
</template>
<script>
import {updatePreference} from '@/api/orderManagement/planYieIdOrder';
export default {
props: {
showDialog: {
@ -36,8 +26,12 @@ export default {
default: false
},
priorityName:{
type:String
// priorityName:{
// type:String
// },
list:{
type:Object,
default:[]
}
},
data() {
@ -45,26 +39,55 @@ export default {
openShow:false,
form:{
value1:''
}
},
formRules:{
priority:[{required:true,message:'请选择优先级',trigger:'blur'}]
},
priorityList:[
{ label:'1级-极高紧急度',value:15001 },
{ label:'2级-高紧急度',value:15002 },
{ label:'3级-中紧急度',value:15003 },
{ label:'4级-低紧急度',value:15004 },
{ label:'5级-正常',value:15005 },
],
priorityName:''
}
},
mounted(){
this.openShow = this.showDialog
let list = this.list.map(item => item.priorityApsName)
let uniqueList = [...new Set(list)];
this.priorityName = uniqueList.join(',')
},
methods:{
closeDialog(){
closeDialog(val){
this.openShow = false
this.$emit('closeDialog');
this.$emit('closeDialog',val);
},
submit() {
if (!this.form.value1) {
this.$message.warning('请选择优先级');
return;
}
this.$emit('submitPriority', {
priority: this.form.value1
});
this.closeDialog();
this.$refs.form.validate(valid => {
if(valid){
updatePreference({
ids:this.list.map(item => item.id).join(','),
priority:this.form.priority
}).then(res =>{
if(res.data.code == 200){
this.$message.success('优先级调整成功')
this.closeDialog(true)
}
})
// selectionList
}
})
// if (!this.form.value1) {
// this.$message.warning('');
// return;
// }
// this.$emit('submitPriority', {
// priority: this.form.value1
// });
// this.closeDialog();
}
},

@ -78,6 +78,7 @@
@closeDialog="closeDialog"
@submitPriority="handlePrioritySubmit"
:priorityName="priorityName"
:list="selectionList"
></priorityDialog>
<!-- 工艺路线弹窗 -->
<lookProcess
@ -170,7 +171,7 @@ export default {
editBtnText: '修改',
labelWidth: 120,
// searchLabelWidth: 120,
menuWidth: 300,
menuWidth: 160,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
@ -342,20 +343,20 @@ export default {
headerAlign: 'center',
align: 'center',
type: 'select',
dicData: [
{
label: '一级',
value: '1',
},
{
label: '二级',
value: '2',
},
{
label: '三级',
value: '3',
},
],
// dicData: [
// {
// label: '',
// value: '1',
// },
// {
// label: '',
// value: '2',
// },
// {
// label: '',
// value: '3',
// },
// ],
rules: [
{
required: true,
@ -673,11 +674,12 @@ export default {
methods: {
//
priorityFn() {
if (this.selectionList.length === 0 || this.selectionList.length > 1) {
this.$message.warning('请选择一条数据');
if (this.selectionList.length === 0) {
this.$message.error('请至少选择一条数据');
return;
}
this.priorityName = this.selectionList[0]['prodIdent'];
console.log('this.selectionList=============',this.selectionList)
// this.priorityName = this.selectionList[0]['prodIdent'];
this.isPriorityOpen = true;
},
async handlePrioritySubmit(data) {
@ -734,9 +736,14 @@ export default {
batchClose() {
//
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
this.$message.error('请选择至少一条数据');
return;
}
let tmp = this.selectionList.filter(item => item.status === 10015 || item.status === 10021)
if(tmp.length > 0){
this.$message.error('请勿选择状态为【已完工】或【已关闭】的数据');
return
}
this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -745,13 +752,14 @@ export default {
.then(() => {
const ids = this.selectionList.map(item => item.id).join(',');
closeBatchs({ ...{ ids }, ...this.approveForm }).then(res => {
if (res.code === 200) {
this.$message.success('操作成功');
if (res.data.code === 200) {
this.$message.success('关闭成功');
this.onLoad(this.page);
this.approveDialog = false;
this.$refs.crud.toggleSelection();
}
});
this.approveDialog = false;
this.$refs.crud.toggleSelection();
// return remove(row.id);
})
.catch(() => {
@ -766,12 +774,15 @@ export default {
rushFn() {
this.isRushOpen = true;
},
closeDialog() {
closeDialog(val) {
this.isRushOpen = false;
this.isBatchOpen = false;
this.isUpdateOpen = false;
this.isPriorityOpen = false;
this.isOpen = false;
if(val){
this.onLoad(this.page, {});
}
},
inBatchesFn(row) {
this.rowItem = row;

@ -96,6 +96,7 @@
v-if="isPriorityOpen"
@closeDialog="closeDialog"
@submitPriority="handlePrioritySubmit"
:list="selectionList"
></sinTerYieIdDialog>
<!-- 玻璃饼下发弹窗 -->
<el-dialog
@ -213,7 +214,7 @@ export default {
editBtnText: '修改',
labelWidth: 120,
// searchLabelWidth: 120,
menuWidth: 240,
menuWidth: 160,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
@ -379,7 +380,8 @@ export default {
},
{
label: '订单优先级',
prop: 'priorityErp',
prop: 'priorityApsName',
// type: 'select',
search: false,
sortable: true,
width: 150,
@ -393,6 +395,13 @@ export default {
trigger: 'blur',
},
],
// dicData:[
// { label:'1-',value:15001 },
// { label:'2-',value:15002 },
// { label:'3-',value:15003 },
// { label:'4-',value:15004 },
// { label:'5-',value:15005 },
// ]
},
{
label: '订单类型',
@ -752,11 +761,11 @@ export default {
methods: {
//
priorityFn() {
if (this.selectionList.length === 0 || this.selectionList.length > 1) {
this.$message.warning('请选择一条数据');
if (this.selectionList.length === 0) {
this.$message.error('请至少选择一条数据');
return;
}
this.priorityName = this.selectionList[0]['prodIdent'];
// this.priorityName = this.selectionList[0]['prodIdent'];
this.isPriorityOpen = true;
},
async handlePrioritySubmit(data) {
@ -815,6 +824,11 @@ export default {
this.$message.warning('请选择至少一条数据');
return;
}
let tmp = this.selectionList.filter(item => item.status === 10015 || item.status === 10021)
if(tmp.length > 0){
this.$message.error('请勿选择状态为【已完工】或【已关闭】的数据');
return
}
this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -823,12 +837,13 @@ export default {
.then(() => {
const ids = this.selectionList.map(item => item.id).join(',');
closeBatchs({ ...{ ids }, ...this.approveForm }).then(res => {
if (res.code === 200) {
this.$message.success('操作成功');
if (res.data.code === 200) {
this.$message.success('关闭成功');
this.$refs.crud.toggleSelection();
this.onLoad(this.page);
}
});
this.$refs.crud.toggleSelection();
this.onLoad(this.page);
})
.catch(() => {
// this.onLoad(this.page);
@ -1078,7 +1093,8 @@ export default {
try {
const res = await getSinterOrderList({
current:this.page.currentPage,
size:this.page.pageSize
size:this.page.pageSize,
...this.query
})
this.data = res.data.data.records;
this.page.total = res.data.data.total;

@ -219,130 +219,130 @@ export default {
});
},
async onLoad(page, params = {}) {
this.data = [
{
id: 1,
requiredCode: '001',
workCenter: 1,
goodsCode: 'wl_001',
goodsName: '物料名称',
goldPotassium: 20,
silverPotassium: 30,
coefficient: 2,
usageAmount: 20,
goodsDemandResidue: 20,
status: 1,
ordersNumber: 15,
createMan: '张三',
createTime: '2025-10-20 11:20:32',
saveGoldVal: 10,
usedGoldVal: 20,
saveSilverVal: 20,
saveBoardVal: 0,
createUser: '张三',
},
{
id: 2,
requiredCode: '002',
workCenter: 1,
goodsCode: 'wl_002',
goodsName: '物料名称',
goldPotassium: 20,
silverPotassium: 30,
coefficient: 2,
usageAmount: 20,
goodsDemandResidue: 20,
status: 2,
ordersNumber: 15,
createMan: '张三',
createTime: '2025-10-20 11:20:32',
saveGoldVal: 10,
usedGoldVal: 20,
saveSilverVal: 20,
saveBoardVal: 0,
createUser: '张三',
},
{
id: 3,
requiredCode: '002',
workCenter: 1,
goodsCode: 'wl_001',
goodsName: '物料名称',
goldPotassium: 20,
silverPotassium: 30,
coefficient: 2,
usageAmount: 20,
goodsDemandResidue: 20,
status: 3,
ordersNumber: 15,
createMan: '张三',
createTime: '2025-10-20 11:20:32',
saveGoldVal: 10,
usedGoldVal: 20,
saveSilverVal: 20,
saveBoardVal: 0,
createUser: '张三',
},
{
id: 4,
requiredCode: '002',
workCenter: 1,
goodsCode: 'wl_001',
goodsName: '物料名称',
goldPotassium: 20,
silverPotassium: 30,
coefficient: 2,
usageAmount: 20,
goodsDemandResidue: 20,
status: 4,
ordersNumber: 15,
createMan: '张三',
createTime: '2025-10-20 11:20:32',
saveGoldVal: 10,
usedGoldVal: 20,
saveSilverVal: 20,
saveBoardVal: 0,
createUser: '张三',
},
{
id: 5,
requiredCode: '002',
workCenter: 1,
goodsCode: 'wl_001',
goodsName: '物料名称',
goldPotassium: 20,
silverPotassium: 30,
coefficient: 2,
usageAmount: 20,
goodsDemandResidue: 20,
status: 5,
ordersNumber: 15,
createMan: '张三',
createTime: '2025-10-20 11:20:32',
saveGoldVal: 10,
usedGoldVal: 20,
saveSilverVal: 20,
saveBoardVal: 0,
createUser: '张三',
},
];
this.page.total = this.data.length;
try {
this.loading = true;
const res = await getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
);
if (res.code) {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
this.selectionClear();
}
const res = await getList({
current:this.page.currentPage,
size:this.page.pageSize,
...this.query
});
// if (res.code) {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
// this.selectionClear();
this.loading = false;
// }
} catch (err) {
console.log(err);
}
this.loading = false;
// this.data = [
// {
// id: 1,
// requiredCode: '001',
// workCenter: 1,
// goodsCode: 'wl_001',
// goodsName: '',
// goldPotassium: 20,
// silverPotassium: 30,
// coefficient: 2,
// usageAmount: 20,
// goodsDemandResidue: 20,
// status: 1,
// ordersNumber: 15,
// createMan: '',
// createTime: '2025-10-20 11:20:32',
// saveGoldVal: 10,
// usedGoldVal: 20,
// saveSilverVal: 20,
// saveBoardVal: 0,
// createUser: '',
// },
// {
// id: 2,
// requiredCode: '002',
// workCenter: 1,
// goodsCode: 'wl_002',
// goodsName: '',
// goldPotassium: 20,
// silverPotassium: 30,
// coefficient: 2,
// usageAmount: 20,
// goodsDemandResidue: 20,
// status: 2,
// ordersNumber: 15,
// createMan: '',
// createTime: '2025-10-20 11:20:32',
// saveGoldVal: 10,
// usedGoldVal: 20,
// saveSilverVal: 20,
// saveBoardVal: 0,
// createUser: '',
// },
// {
// id: 3,
// requiredCode: '002',
// workCenter: 1,
// goodsCode: 'wl_001',
// goodsName: '',
// goldPotassium: 20,
// silverPotassium: 30,
// coefficient: 2,
// usageAmount: 20,
// goodsDemandResidue: 20,
// status: 3,
// ordersNumber: 15,
// createMan: '',
// createTime: '2025-10-20 11:20:32',
// saveGoldVal: 10,
// usedGoldVal: 20,
// saveSilverVal: 20,
// saveBoardVal: 0,
// createUser: '',
// },
// {
// id: 4,
// requiredCode: '002',
// workCenter: 1,
// goodsCode: 'wl_001',
// goodsName: '',
// goldPotassium: 20,
// silverPotassium: 30,
// coefficient: 2,
// usageAmount: 20,
// goodsDemandResidue: 20,
// status: 4,
// ordersNumber: 15,
// createMan: '',
// createTime: '2025-10-20 11:20:32',
// saveGoldVal: 10,
// usedGoldVal: 20,
// saveSilverVal: 20,
// saveBoardVal: 0,
// createUser: '',
// },
// {
// id: 5,
// requiredCode: '002',
// workCenter: 1,
// goodsCode: 'wl_001',
// goodsName: '',
// goldPotassium: 20,
// silverPotassium: 30,
// coefficient: 2,
// usageAmount: 20,
// goodsDemandResidue: 20,
// status: 5,
// ordersNumber: 15,
// createMan: '',
// createTime: '2025-10-20 11:20:32',
// saveGoldVal: 10,
// usedGoldVal: 20,
// saveSilverVal: 20,
// saveBoardVal: 0,
// createUser: '',
// },
// ];
},
},
};

@ -197,38 +197,38 @@ export default {
});
},
async onLoad(page, params = {}) {
this.data = [
{
id: 1,
requiredCode: '001',
assayer: '张三',
workCenter: '2025-10-20 11:20:32',
status: 4,
},
{
id: 2,
requiredCode: '002',
assayer: '李四',
workCenter: '2025-10-21 11:20:32',
status: 3,
},
];
// this.data = [
// {
// id: 1,
// requiredCode: '001',
// assayer: '',
// workCenter: '2025-10-20 11:20:32',
// status: 4,
// },
// {
// id: 2,
// requiredCode: '002',
// assayer: '',
// workCenter: '2025-10-21 11:20:32',
// status: 3,
// },
// ];
this.loading = true;
try {
const res = await getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
);
if (res.code) {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
this.selectionClear();
}
const res = await getList({
current:this.page.currentPage,
size:this.page.pageSize,
...this.query
});
// if (res.code) {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
// this.selectionClear();
this.loading = false;
// }
} catch (err) {
console.log(err);
}
this.loading = false;
// this.page.total = this.data.length;
},

@ -255,103 +255,104 @@ export default {
},
async onLoad(page, params = {}) {
this.loading = true;
this.data = [
{
id: 1,
requiredCode: '001',
workCenter: 1,
goodsCode: 'wl_001',
goodsName: '物料名称22',
goldPotassium: 20,
silverPotassium: 30,
coefficient: 2,
usageAmount: 20,
goodsDemandResidue: 20,
status: 1,
ordersNumber: 15,
createMan: '张三',
createTime: '2025-10-20 11:20:32',
},
{
id: 2,
requiredCode: '002',
workCenter: 1,
goodsCode: 'wl_001',
goodsName: '物料名称',
goldPotassium: 20,
silverPotassium: 30,
coefficient: 2,
usageAmount: 20,
goodsDemandResidue: 20,
status: 2,
ordersNumber: 15,
createMan: '张三',
createTime: '2025-10-20 11:20:32',
},
{
id: 3,
requiredCode: '002',
workCenter: 1,
goodsCode: 'wl_001',
goodsName: '物料名称',
goldPotassium: 20,
silverPotassium: 30,
coefficient: 2,
usageAmount: 20,
goodsDemandResidue: 20,
status: 3,
ordersNumber: 15,
createMan: '张三',
createTime: '2025-10-20 11:20:32',
},
{
id: 4,
requiredCode: '002',
workCenter: 1,
goodsCode: 'wl_001',
goodsName: '物料名称',
goldPotassium: 20,
silverPotassium: 30,
coefficient: 2,
usageAmount: 20,
goodsDemandResidue: 20,
status: 4,
ordersNumber: 15,
createMan: '张三',
createTime: '2025-10-20 11:20:32',
},
{
id: 5,
requiredCode: '002',
workCenter: 1,
goodsCode: 'wl_001',
goodsName: '物料名称',
goldPotassium: 20,
silverPotassium: 30,
coefficient: 2,
usageAmount: 20,
goodsDemandResidue: 20,
status: 5,
ordersNumber: 15,
createMan: '张三',
createTime: '2025-10-20 11:20:32',
},
];
try {
const res = await getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
);
if (res.code) {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
this.selectionClear();
}
const res = await getList({
current:this.page.currentPage,
size:this.page.pageSize,
...this.query
});
// if (res.code) {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
this.selectionClear();
this.loading = false;
// }
} catch (err) {
console.log(err);
}
this.loading = false;
// this.data = [
// {
// id: 1,
// requiredCode: '001',
// workCenter: 1,
// goodsCode: 'wl_001',
// goodsName: '22',
// goldPotassium: 20,
// silverPotassium: 30,
// coefficient: 2,
// usageAmount: 20,
// goodsDemandResidue: 20,
// status: 1,
// ordersNumber: 15,
// createMan: '',
// createTime: '2025-10-20 11:20:32',
// },
// {
// id: 2,
// requiredCode: '002',
// workCenter: 1,
// goodsCode: 'wl_001',
// goodsName: '',
// goldPotassium: 20,
// silverPotassium: 30,
// coefficient: 2,
// usageAmount: 20,
// goodsDemandResidue: 20,
// status: 2,
// ordersNumber: 15,
// createMan: '',
// createTime: '2025-10-20 11:20:32',
// },
// {
// id: 3,
// requiredCode: '002',
// workCenter: 1,
// goodsCode: 'wl_001',
// goodsName: '',
// goldPotassium: 20,
// silverPotassium: 30,
// coefficient: 2,
// usageAmount: 20,
// goodsDemandResidue: 20,
// status: 3,
// ordersNumber: 15,
// createMan: '',
// createTime: '2025-10-20 11:20:32',
// },
// {
// id: 4,
// requiredCode: '002',
// workCenter: 1,
// goodsCode: 'wl_001',
// goodsName: '',
// goldPotassium: 20,
// silverPotassium: 30,
// coefficient: 2,
// usageAmount: 20,
// goodsDemandResidue: 20,
// status: 4,
// ordersNumber: 15,
// createMan: '',
// createTime: '2025-10-20 11:20:32',
// },
// {
// id: 5,
// requiredCode: '002',
// workCenter: 1,
// goodsCode: 'wl_001',
// goodsName: '',
// goldPotassium: 20,
// silverPotassium: 30,
// coefficient: 2,
// usageAmount: 20,
// goodsDemandResidue: 20,
// status: 5,
// ordersNumber: 15,
// createMan: '',
// createTime: '2025-10-20 11:20:32',
// },
// ];
},
},
};

Loading…
Cancel
Save