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

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

Browse Source
dev-scheduling
zhangdi 1 month ago
parent 414949c5bf dd21b2bd7f
commit 212ccd15ec
7 changed files with 797 additions and 474 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      src/api/outsourcingManagement/baseTemplate.js
  2. 29
      src/api/outsourcingManagement/performanceApplication.js
  3. 6
      src/views/basicData/platThicknessRelation/index.vue
  4. 247
      src/views/oem/baseTemplate/components/maintenanceDialog.vue
  5. 20
      src/views/oem/baseTemplate/index.vue
  6. 572
      src/views/oem/performanceApplication/components/addQuality.vue
  7. 371
      src/views/oem/performanceApplication/index.vue

26
src/api/outsourcingManagement/baseTemplate.js
Unescape View File

@ -9,3 +9,29 @@ export const getList = params => {
params params
}); });
}; };
// 工艺能力下拉
export const getAbility = params => {
return request({
url: '/api/blade-desk/BA/craftAbility/findList',
method: 'get',
params
});
};
// 外协厂商下拉
export const getOutsourcing = () =>{
return request({
url:'/api/blade-desk/BA/Oem/listForSelect',
method:'get'
})
}
// 批量增删改
export const saveRules = data => {
return request({
url: '/api/blade-desk/mesOemAndAbility/submit-list',
method: 'post',
data
});
};

29
src/api/outsourcingManagement/performanceApplication.js
Unescape View File

@ -0,0 +1,29 @@
// 外协厂家绩效
import request from '@/axios';
// 获取列表
export const getList = params => {
return request({
url: '/api/blade-desk/mesOemMerits/page',
method: 'get',
params
});
};
// 外协绩效申请
export const performanceApply = data => {
return request({
url: '/api/blade-desk/mesOemMerits/submit',
method: 'post',
data
});
};
// 外协绩效申请删除
export const performanceApplyDel = params => {
return request({
url: '/api/blade-desk/mesOemMerits/remove',
method: 'post',
params
});
};

6
src/views/basicData/platThicknessRelation/index.vue
Unescape View File

@ -113,6 +113,12 @@ export default {
{ {
label: "质量等级", label: "质量等级",
prop: "levelNum", prop: "levelNum",
type:"select",
dicUrl:"/api/blade-scheduling/qualityGrade/getGrades",
props:{
label:"qualityGrade",
value:"qualityGrade"
},
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,

247
src/views/oem/baseTemplate/components/maintenanceDialog.vue
Unescape View File

@ -1,52 +1,75 @@
<template> <template>
<el-dialog title="批量维护" append-to-body :modelValue="openShow" width="50%" @close="closeDialog" fullscreen> <el-dialog title="批量维护" append-to-body :modelValue="openShow" width="50%" @close="closeDialog(false)" fullscreen>
<div style="margin-bottom: 12px;"> <div style="margin-bottom: 12px;">
<el-button type="primary" @click="addTable">插入一行</el-button> <el-button type="primary" @click="addTable">插入一行</el-button>
<el-button type="danger" @click="delTable">删除</el-button> <el-button type="danger" @click="handleDelete">删除选择行</el-button>
</div> </div>
<el-table :data="tableData" style="width: 100%"> <!-- 单个 Form 包裹整个表格 -->
<el-table-column type="selection" width="55" /> <el-form
<el-table-column type="index" width="80" label="序号" align="center"> ref="tableForm"
</el-table-column> :model="form"
<el-table-column prop="shuliang" label="镀种小类" align="center" > :rules="formRules"
<template #default="scope"> label-width="0px"
<!-- <el-input v-model="scope.row.shuliang" size="small" controls-position="right" >
@change="handleChange" /> --> <!-- 全局错误提示 -->
<el-select v-model="scope.row.changjia" multiple placeholder="请选择" style="width: 50%;" collapse-tags > <div v-if="formError" class="error-message" style="color: #f56c6c; margin-bottom: 10px;">
<el-option label="镀金" :value="1" value-key="value" /> {{ formError }}
<el-option label="镀铬" :value="2" value-key="value" /> </div>
</el-select> <el-table :data="form.tableData" @select="selectChange" style="width: 100%">
</template> <el-table-column type="selection" width="55" />
</el-table-column> <!-- <el-table-column type="index" width="80" label="序号" align="center">
<el-table-column prop="shuliang" label="厂家" align="center" > </el-table-column> -->
<template #default="scope"> <el-table-column prop="caId" label="工艺能力" align="center" >
<el-select v-model="scope.row.changjia" multiple placeholder="请选择" style="width: 50%;" collapse-tags > <template #header>
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item" value-key="value" /> <span><i style="color: red">*</i>工艺能力</span>
</el-select> </template>
<div style="margin: 12px 0 12px 0;" v-for="tag in scope.row.changjia"> <template #default="scope">
<el-tag :key="tag.name" closable :type="tag.type" @close="changeChangjia(tag,scope.$index)"> <!-- <el-input v-model="scope.row.shuliang" size="small" controls-position="right"
{{ tag.label }}({{ tag.value }}) @change="handleChange" /> -->
</el-tag> <el-form-item :prop="`tableData[${scope.$index}].caId`" :rules="formRules.caId">
</div> <el-select v-model="scope.row.caId" placeholder="请选择" style="margin:0 auto;margin-top:15px;" >
</template> <el-option v-for="item in abilityList" :key="item.id" :label="item.caName" :value="item.id" value-key="value" />
</el-table-column> <!-- <el-option label="镀铬" :value="2" value-key="value" /> -->
<el-table-column fixed="right" label="操作" width="100" align="left"> </el-select>
<template #default="scope"> </el-form-item>
<el-button type="text" size="small" </template>
@click.prevent="delTable(scope.row, scope.$index)">删除</el-button> </el-table-column>
</template> <el-table-column prop="ocId" label="厂家" align="center" >
</el-table-column> <template #header>
</el-table> <span><i style="color: red">*</i>厂家</span>
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].ocId`" :rules="formRules.ocId">
<el-select v-model="scope.row.ocId" placeholder="请选择" style="margin:0 auto;margin-top:15px;" >
<el-option v-for="item in outOptions" :key="item.id" :label="item.ocName" :value="item.id" value-key="value" />
</el-select>
</el-form-item>
<!-- <div style="margin: 12px 0 12px 0;" v-for="tag in scope.row.ocId">
<el-tag :key="tag.name" closable :type="tag.type" @close="changeChangjia(tag,scope.$index)">
{{ tag.label }}({{ tag.value }})
</el-tag>
</div> -->
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="100" align="left">
<template #default="scope">
<el-button type="text" size="small"
@click.prevent="delTable(scope.row, scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="closeDialog">取 消</el-button> <el-button @click="closeDialog(true)">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button> <el-button type="primary" @click="submit">确 定</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import {getAbility,getOutsourcing,saveRules} from "@/api/outsourcingManagement/baseTemplate"
export default { export default {
props: { props: {
showDialog: { showDialog: {
@ -61,61 +84,131 @@ export default {
data() { data() {
return { return {
openShow: false, openShow: false,
tableData: [], form:{
options: [ tableData: [],
{ },
label: '厂家一', formRules:{
value: '1' tableData: [
}, {
{ required: true,
label: '厂家2', message: '请至少添加一行数据',
value: '2' trigger: 'submit',
}, type: 'array' // 明确类型为数组
{ },
label: '厂家3', {
value: '3' validator: (rule, value, callback) => {
}, if (value.length === 0) {
{ callback(new Error('请至少添加一行数据'));
label: '厂家4', } else {
value: '4' callback();
}, }
{ },
label: '厂家5', trigger: 'submit'
value: '5' }
}, ],
{ // 数组中每一项的 wcId 字段校验
label: '厂家6', ocId: [
value: '6' { required: true, message: '请选择厂家', trigger: ['change', 'submit'] }
}, ],
] caId: [
{ required: true, message: '请选择工艺能力', trigger: ['change', 'submit'] }
],
},
abilityList:[],
outOptions: [],
formError:'',
deleteArr:[],
} }
}, },
mounted() { async mounted() {
let abilityRes = await getAbility()
this.abilityList = abilityRes.data.data
let outRes = await getOutsourcing()
this.outOptions = outRes.data.data
this.form.tableData = this.list
this.form.tableData.map(item =>{
item.caId = item.caId && item.caId + '',
item._select = false
})
console.log('table-------------',this.form.tableData)
this.openShow = this.showDialog this.openShow = this.showDialog
this.tableData = this.list
}, },
methods: { methods: {
closeDialog() { closeDialog(val) {
this.openShow = false this.openShow = false
this.$emit('closeDialog'); this.$emit('closeDialog',val);
}, },
addTable() { addTable() {
this.tableData.push({ this.form.tableData.push({
code: '3', _select:false,
No: '3', caId: '',
number: '3', ocId: '',
shuliang: '',
shuliang: 0,
changjia: []
}) })
}, },
selectChange(list,row){
row._select = !row._select;
},
delTable(row, index) { delTable(row, index) {
this.tableData.splice(index, 1) this.form.tableData.splice(index, 1)
this.deleteArr.push(row)
},
handleDelete(){
let tmp = this.form.tableData.find(item => item._select)
console.log('tmp',tmp)
if(!tmp){
this.$message.error('请选择要删除的行！')
return
}
let deleteData = this.form.tableData.filter(item => item._select)
this.deleteArr = [...this.deleteArr, ...deleteData]
this.form.tableData = this.form.tableData.filter(item => !item._select)
}, },
changeChangjia(value,index){ changeChangjia(value,index){
console.log(value,index) console.log(value,index)
this.tableData[index].changjia.splice(index, 1) this.form.tableData[index].changjia.splice(index, 1)
},
submit(){
this.formError = '';
// 调用单个 Form 的校验方法
this.$refs.tableForm.validate((isValid, invalidFields) => {
console.log('isValid---------',isValid)
if (!isValid) {
// 校验失败：显示提示并滚动到第一个错误字段
this.formError = '存在未完善的字段，请检查表格中的红色提示';
this.$nextTick(() => {
// 找到第一个错误字段并滚动到视图
const firstError = document.querySelector('.el-form-item.is-error');
if (firstError) {
firstError.scrollIntoView({ behavior: 'smooth', block: 'center' });
}
});
return;
}
// 校验通过：准备提交数据（过滤无用字段）
const submitData = this.form.tableData.map(row => {
const { _select, ...validData } = row; // 剔除选择状态字段
return validData;
});
console.log('submitData',submitData)
console.log('deleteArr',this.deleteArr)
const ids = this.deleteArr
.filter(item => item.id && item.id !== undefined && item.id !== null)
.map(item => item.id);
console.log('ids-----------',ids)
saveRules({
deleteIds:ids.join(','),
oemAndAbilityEntities:submitData
}).then(res =>{
if(res.data.code == 200){
this.$message.success('维护成功');
this.closeDialog(true);
}
})
})
} }
} }
} }

20
src/views/oem/baseTemplate/index.vue
Unescape View File

@ -19,17 +19,17 @@
<el-button type="text" size="mini" @click="approval(scope.row.tbId)">审批</el-button> <el-button type="text" size="mini" @click="approval(scope.row.tbId)">审批</el-button>
</template> </template>
</avue-crud> </avue-crud>
<maintenanceDialog v-if="isOpen" :showDialog="isOpen" @closeDialog="closeDialog" :list="data"> <maintenanceDialog v-if="isOpen" :showDialog="isOpen" @closeDialog="closeDialog" :list="data">
</maintenanceDialog> </maintenanceDialog>
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-oem/oem/baseTemplate/download-template" templateUrl="/blade-desk/mesOemAndAbility/downloadExcelTemplate"
templateName="OEM基础模板.xlsx" templateName="外协绩效模板.xlsx"
importUrl="/blade-oem/oem/baseTemplate/import-excel" importUrl="/blade-desk/mesOemAndAbility/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>
</template> </template>
<script> <script>
import {getList} from "@/api/outsourcingManagement/baseTemplate" import {getList,} from "@/api/outsourcingManagement/baseTemplate"
import maintenanceDialog from './components/maintenanceDialog.vue' import maintenanceDialog from './components/maintenanceDialog.vue'
import basicImport from '@/components/basic-import/main.vue' import basicImport from '@/components/basic-import/main.vue'
export default { export default {
@ -94,7 +94,7 @@ export default {
column: [ column: [
{ {
label: '工艺能力', label: '工艺能力',
prop: 'plate', prop: 'caId',
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
@ -116,7 +116,7 @@ export default {
}, },
{ {
label: '厂家', label: '厂家',
prop: 'ocName', prop: 'oemName',
// bind: 'bsOemCustomer.ocName', // bind: 'bsOemCustomer.ocName',
sortable: true, sortable: true,
filter: true, filter: true,
@ -166,8 +166,12 @@ export default {
approval(row) { approval(row) {
this.isOpen = true this.isOpen = true
}, },
closeDialog() { closeDialog(val) {
this.isOpen = false this.isOpen = false
this.isShowImport = false
if(val){
this.onLoad()
}
}, },
handleDelete() { handleDelete() {
if (this.selectionList.length === 0) { if (this.selectionList.length === 0) {

572
src/views/oem/performanceApplication/components/addQuality.vue
Unescape View File

@ -1,17 +1,19 @@
<template> <template>
<el-dialog title="增加" append-to-body :modelValue="openShow" width="90%" @close="closeDialog" fullscreen> <el-dialog title="申请" append-to-body :modelValue="openShow" width="90%" @close="closeDialog" fullscreen>
<el-form :model="form" label-width="auto" > <el-form ref="form" :model="submitForm" label-width="auto" :rules="rules" >
<el-form-item label="月份" required> <el-form-item label="月份" required prop="date">
<el-date-picker <el-date-picker
v-model="value5" v-model="submitForm.date"
format="YYYY-MM"
value-format="YYYY-MM"
type="month" type="month"
placeholder="请选择" placeholder="请选择"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="margin-bottom: 12px;"> <div style="margin-bottom: 12px;">
<el-button type="danger" @click="addEdit()">删除选择行</el-button> <el-button type="danger" @click="deleteTable">删除选择行</el-button>
<el-button type="primary" @click="addEdit()">保存</el-button> <!-- <el-button type="primary" @click="addEdit()">保存</el-button> -->
</div> </div>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud" <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@ -21,15 +23,17 @@
</template> </template>
</avue-crud> </avue-crud>
<!-- <template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="closeDialog">取 消</el-button> <el-button @click="closeDialog">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button> <el-button type="primary" @click="submit">确 定</el-button>
</span> </span>
</template> --> </template>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import {getList} from "@/api/outsourcingManagement/baseTemplate"
import {performanceApply} from "@/api/outsourcingManagement/performanceApplication"
export default { export default {
props: { props: {
showDialog: { showDialog: {
@ -39,7 +43,14 @@ export default {
}, },
data() { data() {
return { return {
rules:{
date:[ { required: true, message: '请选择月份', trigger: 'blur' }]
},
openShow: false, openShow: false,
loading:false,
submitForm:{
date:'',
},
option: { option: {
height: 'auto', height: 'auto',
page:false, page:false,
@ -95,7 +106,7 @@ export default {
column: [ column: [
{ {
label: '工艺能力', label: '工艺能力',
prop: 'plate', prop: 'caName',
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 24,
@ -104,8 +115,8 @@ export default {
}, },
{ {
label: '厂家代码', label: '厂家代码',
prop: 'bsOemCustomer.ocCode', prop: 'oemCode',
bind: 'bsOemCustomer.ocCode', // bind: 'bsOemCustomer.ocCode',
search: false, search: false,
sortable: true, sortable: true,
filter: true, filter: true,
@ -114,8 +125,8 @@ export default {
}, },
{ {
label: '厂家名称', label: '厂家名称',
prop: 'bsOemCustomer.ocName', prop: 'oemName',
bind: 'bsOemCustomer.ocName', // bind: 'bsOemCustomer.ocName',
search: false, search: false,
sortable: true, sortable: true,
filter: true, filter: true,
@ -144,9 +155,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入实际值', trigger: 'blur' }
] // ]
}, },
] ]
@ -172,9 +183,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入姓名', trigger: 'blur' }
] // ]
}, },
] ]
@ -200,9 +211,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入姓名', trigger: 'blur' }
] // ]
}, },
] ]
@ -228,9 +239,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入姓名', trigger: 'blur' }
] // ]
}, },
] ]
@ -257,9 +268,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入姓名', trigger: 'blur' }
] // ]
}, },
] ]
@ -285,9 +296,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入姓名', trigger: 'blur' }
] // ]
}, },
] ]
@ -313,9 +324,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入姓名', trigger: 'blur' }
] // ]
}, },
] ]
@ -341,9 +352,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入姓名', trigger: 'blur' }
] // ]
}, },
] ]
@ -369,9 +380,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入姓名', trigger: 'blur' }
] // ]
}, },
] ]
@ -397,9 +408,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入姓名', trigger: 'blur' }
] // ]
}, },
] ]
@ -425,9 +436,9 @@ export default {
span: 24, span: 24,
width: 120, width: 120,
cell: true, cell: true,
rules: [ // rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' } // { required: true, message: '请输入姓名', trigger: 'blur' }
] // ]
}, },
] ]
@ -453,217 +464,300 @@ export default {
}, },
] ]
}, },
data:[],
form: { form: {
}, },
page: { page: {
pageSize: 10, pageSize: 9999,
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
selectionList:[]
} }
}, },
mounted() { mounted() {
this.openShow = this.showDialog this.openShow = this.showDialog
}, },
methods: { methods: {
closeDialog() { closeDialog(val) {
this.openShow = false this.openShow = false
this.$emit('closeDialog'); this.$emit('closeDialog',val);
},
selectionChange(list){
this.selectionList = list
},
deleteTable(){
if(this.selectionList.length == 0){
this.$message.error('请选择要删除的行')
return
}
const idsToRemove = new Set(this.selectionList.map(i => i.id));
const resultNum = this.data.filter(i => !idsToRemove.has(i.id));
console.log('resultNum==========',resultNum)
this.data = resultNum
},
submit(){
console.log('111111111111')
this.$refs.form.validate(valid => {
if (valid) {
this.data.map(item =>{
item.ocId = parseInt(item.ocId)
})
let params = {
date:this.submitForm.date,
oemMeritsEntities:this.data
}
console.log('param---------',params)
// performanceApply(params).then(res =>{
// if(res.data.code == 200){
// this.$message.success('申请成功')
// this.closeDialog(true)
// }
// })
}
})
}, },
onLoad() { onLoad() {
this.loading = true this.loading = true
this.data = [ getList({
{ current: this.page.currentPage,
$cellEdit: true, size: this.page.pageSize,
"bsOemCustomer": { ...this.query,
"abbreviation": "L076", }).then((res) => {
"address": "aaa", // if(res.data.data.records.length > 0){
"codeAndName": "L076/L076", const obj = {
"contactMan": "aaa", jhzsTarget: 85,
"contactPhone": "aaa", zdljTarget: 92,
"craftAbility": "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装", qqxTarget: 0,
"curStatus": 0, produceTsTarget: 0,
"curStatusText": "正常供货", djcwTarget: 0,
"email": "aaa", djcwReality: 0,
"keyValue": 21, qualityTsTarget: 0,
"limitType": 0, qualityTsReality: 0,
"ocCode": "L076", qualityMerits: 0,
"ocId": 21, payMerits: 0,
"ocName": "L076", qualityTsNum: 0,
"oemPassword": null, djcwNum: 0,
"partCodeYesOrNo": false, dppmNum: 0,
"qualification": 10, hgxNum: 0,
"qualificationTitle": null, produceTsNum: 0,
"region": "陕西省", qqxNum: 0,
"updateTime": "2023-04-14 18:33:49" zdljNum: 0,
}, jhzsNum: 0,
"createMan": { ajorIssues: 0,
"userId": 541, qqxReality: 0,
"userName": "崔殿龙" growAbility: 0,
}, produceTsReality: 0,
"createTime": "2023-11-10 18:06:40", pcxTarget: 0,
"keyValue": 1, pcxReality:0,
"oaaId": 1, dywTarget: 0,
"plate": "222", dywReality:0,
jhzsTarget: 85, qlwtTarget: 0,
zdljTarget: 92, qlwtReality:0,
qqxTarget: 0, $cellEdit:true
produceTsTarget: 0, };
djcwTarget: 0, // .map(item => {
djcwReality: 0, // ...item,...obj
qualityTsTarget: 0, // })
qualityTsReality: 0, this.data = res.data.data.records.map(item => ({ ...obj, ...item }));
qualityMerits: 0, // }
payMerits: 0, // this.data = res.data.data.records
qualityTsNum: 0, console.log('data===========',this.data)
djcwNum: 0, this.loading = false
dppmNum: 0, })
hgxNum: 0, // this.data = [
produceTsNum: 0, // {
qqxNum: 0, // $cellEdit: true,
zdljNum: 0, // "bsOemCustomer": {
jhzsNum: 0, // "abbreviation": "L076",
ajorIssues: 0, // "address": "aaa",
qqxReality: 0, // "codeAndName": "L076/L076",
growAbility: 0, // "contactMan": "aaa",
produceTsReality: 0, // "contactPhone": "aaa",
pcxTarget: 0, // "craftAbility": "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
pcxReality: 0, // "curStatus": 0,
dywTarget: 0, // "curStatusText": "正常供货",
dywReality: 0, // "email": "aaa",
qlwtTarget: 0, // "keyValue": 21,
qlwtReality: 0 // "limitType": 0,
}, // "ocCode": "L076",
{ // "ocId": 21,
$cellEdit: true, // "ocName": "L076",
"bsOemCustomer": { // "oemPassword": null,
"abbreviation": "L120", // "partCodeYesOrNo": false,
"address": "aaa", // "qualification": 10,
"codeAndName": "L120/L120", // "qualificationTitle": null,
"contactMan": "aaa", // "region": "陕西省",
"contactPhone": "aaa", // "updateTime": "2023-04-14 18:33:49"
"craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、", // },
"curStatus": 0, // "createMan": {
"curStatusText": "正常供货", // "userId": 541,
"email": "aaa", // "userName": "崔殿龙"
"keyValue": 2, // },
"limitType": 0, // "createTime": "2023-11-10 18:06:40",
"ocCode": "L120", // "keyValue": 1,
"ocId": 2, // "oaaId": 1,
"ocName": "L120", // "plate": "222",
"oemPassword": null, // jhzsTarget: 85,
"partCodeYesOrNo": false, // zdljTarget: 92,
"qualification": 0, // qqxTarget: 0,
"qualificationTitle": "民品&普军", // produceTsTarget: 0,
"region": "江苏省", // djcwTarget: 0,
"updateTime": "2023-04-14 18:33:49" // djcwReality: 0,
}, // qualityTsTarget: 0,
"createMan": { // qualityTsReality: 0,
"userId": 541, // qualityMerits: 0,
"userName": "崔殿龙" // payMerits: 0,
}, // qualityTsNum: 0,
"createTime": "2023-11-10 18:06:40", // djcwNum: 0,
"keyValue": 4, // dppmNum: 0,
"oaaId": 4, // hgxNum: 0,
"plate": "222", // produceTsNum: 0,
jhzsTarget: 85, // qqxNum: 0,
zdljTarget: 92, // zdljNum: 0,
qqxTarget: 0, // jhzsNum: 0,
produceTsTarget: 0, // ajorIssues: 0,
djcwTarget: 0, // qqxReality: 0,
djcwReality: 0, // growAbility: 0,
qualityTsTarget: 0, // produceTsReality: 0,
qualityTsReality: 0, // pcxTarget: 0,
qualityMerits: 0, // pcxReality: 0,
payMerits: 0, // dywTarget: 0,
qualityTsNum: 0, // dywReality: 0,
djcwNum: 0, // qlwtTarget: 0,
dppmNum: 0, // qlwtReality: 0
hgxNum: 0, // },
produceTsNum: 0, // {
qqxNum: 0, // $cellEdit: true,
zdljNum: 0, // "bsOemCustomer": {
jhzsNum: 0, // "abbreviation": "L120",
ajorIssues: 0, // "address": "aaa",
qqxReality: 0, // "codeAndName": "L120/L120",
growAbility: 0, // "contactMan": "aaa",
produceTsReality: 0, // "contactPhone": "aaa",
pcxTarget: 0, // "craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、",
pcxReality: 0, // "curStatus": 0,
dywTarget: 0, // "curStatusText": "正常供货",
dywReality: 0, // "email": "aaa",
qlwtTarget: 0, // "keyValue": 2,
qlwtReality: 0 // "limitType": 0,
}, // "ocCode": "L120",
{ // "ocId": 2,
$cellEdit: true, // "ocName": "L120",
"bsOemCustomer": { // "oemPassword": null,
"abbreviation": "L120", // "partCodeYesOrNo": false,
"address": "aaa", // "qualification": 0,
"codeAndName": "L120/L120", // "qualificationTitle": "民品&普军",
"contactMan": "aaa", // "region": "江苏省",
"contactPhone": "aaa", // "updateTime": "2023-04-14 18:33:49"
"craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、", // },
"curStatus": 0, // "createMan": {
"curStatusText": "正常供货", // "userId": 541,
"email": "aaa", // "userName": "崔殿龙"
"keyValue": 2, // },
"limitType": 0, // "createTime": "2023-11-10 18:06:40",
"ocCode": "L120", // "keyValue": 4,
"ocId": 2, // "oaaId": 4,
"ocName": "L120", // "plate": "222",
"oemPassword": null, // jhzsTarget: 85,
"partCodeYesOrNo": false, // zdljTarget: 92,
"qualification": 0, // qqxTarget: 0,
"qualificationTitle": "民品&普军", // produceTsTarget: 0,
"region": "江苏省", // djcwTarget: 0,
"updateTime": "2023-04-14 18:33:49" // djcwReality: 0,
}, // qualityTsTarget: 0,
"createMan": { // qualityTsReality: 0,
"userId": 541, // qualityMerits: 0,
"userName": "崔殿龙" // payMerits: 0,
}, // qualityTsNum: 0,
"createTime": "2023-12-07 09:53:47", // djcwNum: 0,
"keyValue": 41, // dppmNum: 0,
"oaaId": 41, // hgxNum: 0,
"plate": "222", // produceTsNum: 0,
jhzsTarget: 85, // qqxNum: 0,
zdljTarget: 92, // zdljNum: 0,
qqxTarget: 0, // jhzsNum: 0,
produceTsTarget: 0, // ajorIssues: 0,
djcwTarget: 0, // qqxReality: 0,
djcwReality: 0, // growAbility: 0,
qualityTsTarget: 0, // produceTsReality: 0,
qualityTsReality: 0, // pcxTarget: 0,
qualityMerits: 0, // pcxReality: 0,
payMerits: 0, // dywTarget: 0,
qualityTsNum: 0, // dywReality: 0,
djcwNum: 0, // qlwtTarget: 0,
dppmNum: 0, // qlwtReality: 0
hgxNum: 0, // },
produceTsNum: 0, // {
qqxNum: 0, // $cellEdit: true,
zdljNum: 0, // "bsOemCustomer": {
jhzsNum: 0, // "abbreviation": "L120",
ajorIssues: 0, // "address": "aaa",
qqxReality: 0, // "codeAndName": "L120/L120",
growAbility: 0, // "contactMan": "aaa",
produceTsReality: 0, // "contactPhone": "aaa",
pcxTarget: 0, // "craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、",
pcxReality: 0, // "curStatus": 0,
dywTarget: 0, // "curStatusText": "正常供货",
dywReality: 0, // "email": "aaa",
qlwtTarget: 0, // "keyValue": 2,
qlwtReality: 0 // "limitType": 0,
}, // "ocCode": "L120",
// "ocId": 2,
// "ocName": "L120",
// "oemPassword": null,
// "partCodeYesOrNo": false,
// "qualification": 0,
// "qualificationTitle": "民品&普军",
// "region": "江苏省",
// "updateTime": "2023-04-14 18:33:49"
// },
// "createMan": {
// "userId": 541,
// "userName": "崔殿龙"
// },
// "createTime": "2023-12-07 09:53:47",
// "keyValue": 41,
// "oaaId": 41,
// "plate": "222",
// jhzsTarget: 85,
// zdljTarget: 92,
// qqxTarget: 0,
// produceTsTarget: 0,
// djcwTarget: 0,
// djcwReality: 0,
// qualityTsTarget: 0,
// qualityTsReality: 0,
// qualityMerits: 0,
// payMerits: 0,
// qualityTsNum: 0,
// djcwNum: 0,
// dppmNum: 0,
// hgxNum: 0,
// produceTsNum: 0,
// qqxNum: 0,
// zdljNum: 0,
// jhzsNum: 0,
// ajorIssues: 0,
// qqxReality: 0,
// growAbility: 0,
// produceTsReality: 0,
// pcxTarget: 0,
// pcxReality: 0,
// dywTarget: 0,
// dywReality: 0,
// qlwtTarget: 0,
// qlwtReality: 0
// },
] // ]
this.page.total = this.data.length // this.page.total = this.data.length
this.loading = false // this.loading = false
setTimeout(() => { // setTimeout(() => {
this.selectionClear() // this.selectionClear()
}, 500) // }, 500)
} }
} }
} }

371
src/views/oem/performanceApplication/index.vue
Unescape View File

@ -22,7 +22,7 @@
<template #menu-right> </template> <template #menu-right> </template>
<template #menu="scope"> <template #menu="scope">
<!-- <el-button type="text" @click="editClick(scope.row.omId)">更新月份</el-button> --> <!-- <el-button type="text" @click="editClick(scope.row.omId)">更新月份</el-button> -->
<el-button type="text" @click="deleteClick(scope.row.omId)">删除</el-button> <el-button type="text" v-if="scope.row.omStatus < 3" @click="deleteClick(scope.row)">删除</el-button>
</template> </template>
</avue-crud> </avue-crud>
<addQuality <addQuality
@ -34,6 +34,7 @@
</template> </template>
<script> <script>
import addQuality from "./components/addQuality.vue"; import addQuality from "./components/addQuality.vue";
import {getList,performanceApplyDel} from "@/api/outsourcingManagement/performanceApplication"
export default { export default {
components: { components: {
addQuality, addQuality,
@ -41,6 +42,8 @@ export default {
data() { data() {
return { return {
selectionList: [], selectionList: [],
loading:false,
query:{},
option: { option: {
height: "auto", height: "auto",
calcHeight: 32, calcHeight: 32,
@ -66,7 +69,7 @@ export default {
editBtnIcon: " ", editBtnIcon: " ",
viewBtnText: "详情", viewBtnText: "详情",
labelWidth: 120, labelWidth: 120,
menuWidth: 180, menuWidth: 80,
dialogWidth: 640, dialogWidth: 640,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -92,27 +95,43 @@ export default {
column: [ column: [
{ {
label: "工艺能力", label: "工艺能力",
prop: "plate", prop: "caId",
sortable: true, sortable: true,
filter: true, filter: true,
hide:true,
span: 24, span: 24,
search: true, search: true,
width: 130, width: 130,
searchLabelWidth: 80, searchLabelWidth: 80,
type: "select", type: "select",
dicData: [ dicUrl:"/api/blade-desk/BA/craftAbility/findList",
{ props:{
label: "镀金", label: "caName",
}, value:'id'
{ },
label: "镀银", },
}, {
], label: "工艺能力",
prop: "caName",
sortable: true,
filter: true,
span: 24,
search: false,
width: 130,
searchLabelWidth: 80,
// dicData: [
// {
// label: "镀金",
// },
// {
// label: "镀银",
// },
// ],
}, },
{ {
label: "厂家代码", label: "厂家代码",
prop: "bsOemCustomer.ocCode", prop: "oemCode",
bind: "bsOemCustomer.ocCode", // bind: "bsOemCustomer.ocCode",
search: false, search: false,
sortable: true, sortable: true,
filter: true, filter: true,
@ -121,8 +140,8 @@ export default {
}, },
{ {
label: "厂家名称", label: "厂家名称",
prop: "bsOemCustomer.ocName", prop: "oemName",
bind: "bsOemCustomer.ocName", // bind: "bsOemCustomer.ocName",
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
@ -131,7 +150,7 @@ export default {
}, },
{ {
label: "月份", label: "月份",
prop: "updateTime", prop: "monthStr",
search: false, search: false,
sortable: true, sortable: true,
filter: true, filter: true,
@ -139,31 +158,56 @@ export default {
width: 90, width: 90,
}, },
{ {
label: "状态", label:"状态",
prop: "omStatus", prop:"statusList",
type: "select", hide:true,
search: true, search:true,
sortable: true, type:'select',
span: 24, dicData:[
searchLabelWidth: 60,
dicData: [
{ {
value: 1, value:1,
label: "新建", label:"新建"
}, },
{ {
value: 2, value:2,
label: "填写中", label:"填写中"
}, },
{ {
value: 3, value:3,
label: "已评审", label:"已评审"
}, },
{ {
value: 4, value:4,
label: "已审核", label:"已审核"
}, },
], ]
},
{
label: "状态",
prop: "omStatusTitle",
// type: "select",
search: false,
sortable: true,
span: 24,
searchLabelWidth: 60,
// dicData: [
// {
// value: 1,
// label: "新建",
// },
// {
// value: 2,
// label: "填写中",
// },
// {
// value: 3,
// label: "已评审",
// },
// {
// value: 4,
// label: "已审核",
// },
// ],
}, },
{ {
label: "计划准时完成", label: "计划准时完成",
@ -605,26 +649,27 @@ export default {
addEdit() { addEdit() {
this.isOpen = true; this.isOpen = true;
}, },
closeDialog() { closeDialog(val) {
this.isOpen = false; this.isOpen = false;
if(val){
this.onLoad()
}
}, },
deleteClick(omId) { deleteClick(row) {
this.$confirm("是否删除此数据?", "提示", { this.$confirm("是否删除此数据?", "提示", {
confirmButtonText: "确认", confirmButtonText: "确认",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(() => {
performanceApplyDel({
ids:row.id
}).then(res =>{
if(res.data.code == 200){
this.$message.success('删除成功')
this.onLoad()
}
})
}) })
.then(() => {
// this.$ajax.get('oemMerits/deleteByKey/' + omId).then((res) => {
// if (this.$ifAjax(res)) {
// this.$message.success(this.$t('global.deleteOk'));
// this.$refs.myTable.load();
// }
// });
})
.catch(() => {
this.$message.info("已取消");
});
}, },
async editClick(omId) { async editClick(omId) {
this.omId = omId; this.omId = omId;
@ -646,116 +691,142 @@ export default {
type: "warning", type: "warning",
}).then(() => {}); }).then(() => {});
}, },
searchChange(params, done){
this.query = params;
this.page.currentPage = 1
this.onLoad()
done()
},
searchReset(){
this.query = {}
this.onLoad()
},
currentChange(currentPage){
this.page.currentPage = currentPage
},
sizeChange(pageSize){
this.page.pageSize = pageSize
},
// 多选 // 多选
selectionChange(list) { selectionChange(list) {
this.selectionList = list; this.selectionList = list;
}, },
onLoad() { onLoad() {
this.loading = true; this.loading = true;
this.data = [ getList({
{ // statusList:'1',
bsOemCustomer: { current: this.page.currentPage,
abbreviation: "L076", size: this.page.pageSize,
address: "aaa", ...this.query,
codeAndName: "L076/L076", }).then((res) => {
contactMan: "aaa", this.data = res.data.data.records;
contactPhone: "aaa", this.page.total = res.data.data.total;
craftAbility: this.loading = false;
"镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装", })
curStatus: 0, // this.data = [
curStatusText: "正常供货", // {
email: "aaa", // bsOemCustomer: {
keyValue: 21, // abbreviation: "L076",
limitType: 0, // address: "aaa",
ocCode: "L076", // codeAndName: "L076/L076",
ocId: 21, // contactMan: "aaa",
ocName: "L076", // contactPhone: "aaa",
oemPassword: null, // craftAbility:
partCodeYesOrNo: false, // "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
qualification: 10, // curStatus: 0,
qualificationTitle: null, // curStatusText: "正常供货",
region: "陕西省", // email: "aaa",
updateTime: "2023-04-14 18:33:49", // keyValue: 21,
}, // limitType: 0,
createMan: { // ocCode: "L076",
userId: 541, // ocId: 21,
userName: "崔殿龙", // ocName: "L076",
}, // oemPassword: null,
createTime: "2023-11-10 18:06:40", // partCodeYesOrNo: false,
keyValue: 1, // qualification: 10,
oaaId: 1, // qualificationTitle: null,
plate: "222", // region: "陕西省",
}, // updateTime: "2023-04-14 18:33:49",
{ // },
bsOemCustomer: { // createMan: {
abbreviation: "L120", // userId: 541,
address: "aaa", // userName: "崔殿龙",
codeAndName: "L120/L120", // },
contactMan: "aaa", // createTime: "2023-11-10 18:06:40",
contactPhone: "aaa", // keyValue: 1,
craftAbility: "不锈钢涂福斯润滑剂、DL零件包装、", // oaaId: 1,
curStatus: 0, // plate: "222",
curStatusText: "正常供货", // },
email: "aaa", // {
keyValue: 2, // bsOemCustomer: {
limitType: 0, // abbreviation: "L120",
ocCode: "L120", // address: "aaa",
ocId: 2, // codeAndName: "L120/L120",
ocName: "L120", // contactMan: "aaa",
oemPassword: null, // contactPhone: "aaa",
partCodeYesOrNo: false, // craftAbility: "不锈钢涂福斯润滑剂、DL零件包装、",
qualification: 0, // curStatus: 0,
qualificationTitle: "民品&普军", // curStatusText: "正常供货",
region: "江苏省", // email: "aaa",
updateTime: "2023-04-14 18:33:49", // keyValue: 2,
}, // limitType: 0,
createMan: { // ocCode: "L120",
userId: 541, // ocId: 2,
userName: "崔殿龙", // ocName: "L120",
}, // oemPassword: null,
createTime: "2023-11-10 18:06:40", // partCodeYesOrNo: false,
keyValue: 4, // qualification: 0,
oaaId: 4, // qualificationTitle: "民品&普军",
plate: "222", // region: "江苏省",
}, // updateTime: "2023-04-14 18:33:49",
{ // },
bsOemCustomer: { // createMan: {
abbreviation: "L070", // userId: 541,
address: "aaa", // userName: "崔殿龙",
codeAndName: "L070/L070", // },
contactMan: "aaa", // createTime: "2023-11-10 18:06:40",
contactPhone: "aaa", // keyValue: 4,
craftAbility: "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火", // oaaId: 4,
curStatus: 0, // plate: "222",
curStatusText: "正常供货", // },
email: "aaa", // {
keyValue: 5, // bsOemCustomer: {
limitType: 0, // abbreviation: "L070",
ocCode: "L070", // address: "aaa",
ocId: 5, // codeAndName: "L070/L070",
ocName: "L070", // contactMan: "aaa",
oemPassword: null, // contactPhone: "aaa",
partCodeYesOrNo: false, // craftAbility: "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
qualification: 10, // curStatus: 0,
qualificationTitle: null, // curStatusText: "正常供货",
region: "江苏省", // email: "aaa",
updateTime: "2023-04-14 18:33:49", // keyValue: 5,
}, // limitType: 0,
createMan: { // ocCode: "L070",
userId: 541, // ocId: 5,
userName: "崔殿龙", // ocName: "L070",
}, // oemPassword: null,
createTime: "2023-12-06 17:24:48", // partCodeYesOrNo: false,
keyValue: 21, // qualification: 10,
oaaId: 21, // qualificationTitle: null,
plate: "222", // region: "江苏省",
}, // updateTime: "2023-04-14 18:33:49",
]; // },
this.page.total = this.data.length; // createMan: {
this.loading = false; // userId: 541,
setTimeout(() => { // userName: "崔殿龙",
this.selectionClear(); // },
}, 500); // createTime: "2023-12-06 17:24:48",
// keyValue: 21,
// oaaId: 21,
// plate: "222",
// },
// ];
// this.page.total = this.data.length;
// this.loading = false;
// setTimeout(() => {
// this.selectionClear();
// }, 500);
}, },
}, },
}; };

Write Preview
Loading…
Cancel
Save