页面提交

dev-scheduling
taozi 4 months ago
parent c7db621da9
commit 93aa57e0a5
  1. 50
      src/views/basicData/jobTransferManagement.vue
  2. 189
      src/views/costManagement/subjectFeeMaintenance.vue
  3. 4
      src/views/costStatistics/index.vue
  4. 114
      src/views/flowManagement/managementOfKeyTasks.vue
  5. 2
      src/views/oem/baseTemplate/index.vue
  6. 6
      src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
  7. 7
      src/views/oem/oemOrderSettlement/components/settlementIn.vue
  8. 2
      src/views/oem/performanceApplication/components/addQuality.vue
  9. 2
      src/views/oem/performanceApplication/index.vue
  10. 2
      src/views/oem/performanceCalculate/components/millMeritsProduce.vue
  11. 2
      src/views/oem/performanceCalculate/components/millMeritsQuality.vue
  12. 2
      src/views/oem/performanceCheck/index.vue
  13. 2
      src/views/oem/performanceReview/index.vue
  14. 19
      src/views/oem/settlementRules/components/plate.vue
  15. 18
      src/views/oem/settlementRules/components/process.vue
  16. 20
      src/views/oem/settlementRules/index.vue
  17. 5
      src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue
  18. 47
      src/views/personnelEfficiencyManagement/salaryManagement/payrollComputation.vue
  19. 22
      src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue

@ -340,6 +340,11 @@ export default {
width: 200,
hide: true,
addDisabled: true,
type: 'select',
dicData: [
{ label: "班组1", value: "班组1" },
{ label: "班组2", value: "班组2" },
],
rules: [
{
required: true,
@ -420,6 +425,7 @@ export default {
search: true,
hide: true,
width: 200,
type: 'date',
rules: [
{
required: true,
@ -584,23 +590,23 @@ export default {
},
],
},
{
label: "所属班组",
prop: "deptName",
span: 8,
labelWidth: 150,
search: true,
width: 200,
addDisabled: true,
addDisplay: false,
rules: [
{
required: true,
message: "请输入所属班组",
trigger: "click",
},
],
},
// {
// label: "",
// prop: "deptName",
// span: 8,
// labelWidth: 150,
// search: true,
// width: 200,
// addDisabled: true,
// addDisplay: false,
// rules: [
// {
// required: true,
// message: "",
// trigger: "click",
// },
// ],
// },
{
label: "所属岗位",
prop: "station",
@ -624,6 +630,7 @@ export default {
labelWidth: 150,
search: false,
width: 200,
type: 'date',
rules: [
{
required: true,
@ -719,6 +726,7 @@ export default {
labelWidth: 150,
search: false,
width: 200,
type: 'date',
rules: [
{
required: true,
@ -801,6 +809,11 @@ export default {
message: "请输入手机号码",
trigger: "click",
},
{
pattern: /^1[3-9]\d{9}$/,
message: "请输入正确的11位手机号码",
trigger: "blur",
},
],
},
{
@ -859,6 +872,7 @@ export default {
labelWidth: 150,
search: true,
width: 200,
type: 'date',
rules: [
{
required: true,
@ -874,6 +888,7 @@ export default {
labelWidth: 150,
search: false,
width: 200,
type: 'date',
rules: [
{
required: true,
@ -891,6 +906,7 @@ export default {
width: 200,
addDisplay: false,
editDisplay: false,
type: 'date',
rules: [
{
required: true,

@ -1,29 +1,15 @@
<template>
<basic-container>
<!-- 科目费用维护 -->
<avue-crud
:option="option"
:table-loading="loading"
:data="data"
v-model="form"
v-model:page="page"
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete"
>删除</el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
<el-button type="success" icon="el-icon-upload" @click="handleImport">导入</el-button>
<el-button type="warning" icon="el-icon-s-finance" @click="handleCostCalculation">成本计算</el-button>
</template>
<template #menu="scope">
@ -31,13 +17,10 @@
<el-button type="text" @click="maintainRow(scope.row)">维护</el-button>
</template>
</avue-crud>
<el-dialog append-to-body title="新增" v-model="showAdd">
<el-dialog append-to-body title="新增" :model-value="showAdd" @update:model-value="val => showAdd = val">
<el-form ref="addForm" :model="addForm" :rules="addRules">
<el-form-item label="费用科目" prop="expenseAccount">
<el-input
v-model="addForm.expenseAccount"
placeholder="请输入费用科目"
></el-input>
<el-input v-model="addForm.expenseAccount" placeholder="请输入费用科目"></el-input>
</el-form-item>
</el-form>
<template #footer>
@ -48,29 +31,21 @@
</template>
</el-dialog>
<!-- 维护弹窗 -->
<el-dialog append-to-body :title="title" v-model="showMaintain">
<el-form
:inline="true"
:model="maintainForm"
ref="maintainForm"
:rules="maintainRules"
>
<el-dialog append-to-body :title="title" :model-value="showMaintain" @update:model-value="val => showMaintain = val">
<el-form :inline="true" :model="maintainForm" ref="maintainForm" :rules="maintainRules">
<el-form-item label="月份" prop="month">
<el-date-picker v-model="maintainForm.month" type="month" placeholder="选择月份" format="YYYY年MM月"
value-format="YYYY-MM" :disabled="title == '详情'"></el-date-picker>
</el-form-item>
<el-form-item label="费用分配方式" prop="distributeType">
<el-radio-group
v-model="maintainForm.distributeType"
:disabled="title == '详情'"
>
<el-radio-group v-model="maintainForm.distributeType" :disabled="title == '详情'">
<el-radio label="1">按金额</el-radio>
<el-radio label="2">按比例</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="总费用金额" prop="totalCost">
<el-input-number
v-model="maintainForm.totalCost"
controls-position="right"
:min="1"
:disabled="title == '详情'"
></el-input-number>
<el-input-number v-model="maintainForm.totalCost" controls-position="right" :min="1"
:disabled="title == '详情'"></el-input-number>
</el-form-item>
</el-form>
<el-table :data="tableData">
@ -78,41 +53,50 @@
<el-table-column label="作业中心" prop="workCenter"></el-table-column>
<el-table-column label="比例" prop="ratio">
<template #default="scope">
<el-input-number
v-model="scope.row.ratio"
controls-position="right"
:min="1"
:max="100"
:disabled="title == '详情'"
></el-input-number>
<el-input-number v-model="scope.row.ratio" controls-position="right" :min="1" :max="100"
:disabled="title == '详情'"></el-input-number>
</template>
</el-table-column>
<el-table-column label="费用金额(元)" prop="money">
<template #default="scope">
<el-input-number
v-model="scope.row.money"
controls-position="right"
:min="1"
:disabled="title == '详情'"
></el-input-number>
<el-input-number v-model="scope.row.money" controls-position="right" :min="1"
:disabled="title == '详情'"></el-input-number>
</template>
</el-table-column>
</el-table>
<template #footer>
<span class="dialog-footer">
<el-button @click="showMaintain = false"> </el-button>
<el-button v-if="title == '维护'" type="primary" @click="submitMaintain"
> </el-button
>
<el-button v-if="title == '维护'" type="primary" @click="submitMaintain"> </el-button>
</span>
</template>
</el-dialog>
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx"
importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import>
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateName="试验项目模板.xlsx"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog"></basic-import>
<!-- 成本计算月份选择弹窗 -->
<el-dialog append-to-body title="成本计算" :model-value="showCostCalculation" @update:model-value="val => showCostCalculation = val" width="400px">
<el-form ref="costForm" :model="costForm" :rules="costRules">
<el-form-item label="选择月份" prop="month">
<el-date-picker
v-model="costForm.month"
type="month"
placeholder="选择月份"
format="YYYY年MM月"
value-format="YYYY-MM"
style="width: 100%"
></el-date-picker>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="showCostCalculation = false"> </el-button>
<el-button type="primary" @click="submitCostCalculation"> </el-button>
</span>
</template>
</el-dialog>
</basic-container>
</template>
@ -124,7 +108,7 @@ export default {
},
data() {
return {
isShowImport:false,
isShowImport: false,
data: [],
form: {},
distributeType: "",
@ -135,11 +119,20 @@ export default {
addForm: {},
selectionList: [],
showMaintain: false,
showCostCalculation: false,
costForm: {
month: ''
},
costRules: {
month: [{ required: true, message: "请选择月份", trigger: "change" }]
},
calculatedMonths: ['2023-10', '2023-11'], //
addRules: {
expenseAccount: [{ required: true, message: "请输入费用科目", trigger: "blur" }],
},
maintainForm: {},
maintainRules: {
month: [{ required: true, message: "请选择月份", trigger: "change" }],
totalCost: [{ required: true, message: "请输入总费用金额", trigger: "blur" }],
},
page: {
@ -184,7 +177,6 @@ export default {
columnSort: true,
index: false,
showOverflowTooltip: true,
searchLabelPosition: "left",
searchLabelPosition: "left",
searchGutter: 24,
@ -278,7 +270,7 @@ export default {
},
};
},
mounted() {},
mounted() { },
methods: {
//
handleImport() {
@ -298,7 +290,7 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then((res) => {});
}).then((res) => { });
},
//
handleAdd() {
@ -323,17 +315,78 @@ export default {
//
viewRow(row) {
this.title = "详情";
this.maintainForm = row;
this.maintainForm = { ...row, month: row.month || this.getCurrentMonth() };
this.tableData = row.tableData;
this.showMaintain = true;
},
//
maintainRow(row) {
this.title = "维护";
this.maintainForm = row;
this.maintainForm = { ...row, month: row.month || this.getCurrentMonth() };
this.tableData = row.tableData;
this.showMaintain = true;
},
//
getCurrentMonth() {
const now = new Date();
const year = now.getFullYear();
const month = String(now.getMonth() + 1).padStart(2, '0');
return `${year}-${month}`;
},
//
handleCostCalculation() {
this.costForm.month = this.getCurrentMonth();
this.showCostCalculation = true;
},
//
submitCostCalculation() {
this.$refs.costForm.validate((valid) => {
if (valid) {
const selectedMonth = this.costForm.month;
const year = selectedMonth.split('-')[0];
const month = selectedMonth.split('-')[1];
//
if (this.calculatedMonths.includes(selectedMonth)) {
this.$confirm(`${year}${month}月已计算成本,是否重新计算?`, {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.performCostCalculation(selectedMonth);
}).catch(() => {
this.$message({
type: 'info',
message: '已取消成本计算'
});
});
} else {
this.performCostCalculation(selectedMonth);
}
}
});
},
//
performCostCalculation(month) {
// API
this.$message({
type: 'success',
message: `${month}成本计算中,请稍候...`
});
setTimeout(() => {
//
if (!this.calculatedMonths.includes(month)) {
this.calculatedMonths.push(month);
}
this.showCostCalculation = false;
this.$message({
type: 'success',
message: `${month}成本计算完成`
});
}, 2000);
},
onLoad() {
this.data = [
{

@ -37,7 +37,7 @@
@on-load="onLoad"
>
<template #menu-left>
<el-button type="primary">成本计算</el-button>
<el-button type="primary" @click="openCostCalcDialog">成本计算</el-button>
<!-- <el-button type="primary" @click="isLockClick">锁定/解锁</el-button> -->
<el-button type="danger" @click="handleDelete">删除</el-button>
<el-button type="success">导出</el-button>
@ -68,6 +68,7 @@
></avue-crud>
</el-col>
</el-row>
</basic-container>
</template>
@ -311,3 +312,4 @@ export default {
</script>
<style></style>

@ -240,11 +240,11 @@
</el-row>
</el-form>
<div style="margin: 10px 0" v-if="title == '新增' || title == '修改'">
<el-button type="primary" icon="el-icon-plus" @click="insertEvent()"
<el-button type="primary" icon="el-icon-plus" @click="openDialog()"
>插入一行</el-button
>
<el-button plain type="danger" @click="remove">删除选择行</el-button>
<el-button type="primary" @click="handleSave">保存</el-button>
<!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
</div>
<el-table :data="addForm.detailList">
<el-table-column type="selection"></el-table-column>
@ -329,13 +329,20 @@
</el-dialog>
<!-- 审核弹窗 -->
<el-dialog v-model="checkDialog" title="审核" append-to-body>
<el-form ref="checkForm" :model="checkForm" :rules="checkRules">
<el-form ref="checkForm" :model="checkForm" :rules="checkRules" label-width="80px" >
<el-form-item label="审核结果" prop="checkResult">
<el-select placeholder="请选择审核结果" v-model="checkForm.checkResult">
<el-option label="通过" value="1"></el-option>
<el-option label="不通过" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="审核意见" prop="checkOpinion">
<el-input
type="textarea"
placeholder="请输入审核意见"
v-model="checkForm.checkOpinion"
></el-input>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
@ -425,7 +432,7 @@
v-model="executeForm.lastPlan"
></el-input>
</el-form-item>
<el-form-item label="附件" v-if="subTitle == '执行'">
<el-form-item label="附件" v-if="subTitle == '执行' || subTitle == '核查' || subTitle == '核准'">
<el-upload
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
@ -440,6 +447,15 @@
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">不能上传 exe 附件且不超过 20M</div>
</el-upload>
<div v-if="subTitle == '核查' || subTitle == '核准'" class="attachment-list">
<h4>附件下载</h4>
<ul>
<li v-for="(file, index) in existingFiles" :key="index">
<a href="javascript:void(0)" @click="downloadFile(file)">{{ file.name }}</a>
<el-button type="text" size="small" @click="removeExistingFile(index)">删除</el-button>
</li>
</ul>
</div>
</el-form-item>
<el-form-item label="核查人" v-if="subTitle == '执行'">
<el-select v-model="executeForm.userId">
@ -471,6 +487,14 @@
<el-form-item v-if="subTitle == '核准'" label="评语">
<el-input type="textarea" v-model="executeForm.evaluate"></el-input>
</el-form-item>
<el-form-item label="审核意见" prop="checkOpinion" label-width="80px">
<el-input
type="textarea"
placeholder="请输入审核意见"
v-model="checkForm.checkOpinion"
></el-input>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
@ -498,10 +522,12 @@ export default {
checkForm: {},
checkRules: {
checkResult: [{ required: true, message: "请选择审核结果", trigger: "blur" }],
},
executeDialog: false,
executeForm: {},
executeRules: {
executeResult: [{ required: true, message: "请选择执行类型", trigger: "blur" }],
milestoneMemo: [{ required: true, message: "请填写里程碑描述", trigger: "blur" }],
evolve: [{ required: true, message: "请填写里程碑进展", trigger: "blur" }],
@ -509,6 +535,7 @@ export default {
},
data: [],
form: {},
existingFiles: [], //
addForm: {
bsBasicClass: {
bcId: "",
@ -746,6 +773,9 @@ export default {
},
mounted() {},
methods: {
openDialog() {
},
handleAdd() {
this.title = "新增";
this.addForm = {
@ -825,6 +855,11 @@ export default {
this.detailForm = row;
this.executeForm = detail;
this.executeForm.checkResult = "";
//
this.existingFiles = [
{ name: "项目计划书.pdf", url: "#" },
{ name: "进度报告.docx", url: "#" }
];
this.executeDialog = true;
},
//
@ -832,8 +867,35 @@ export default {
this.subTitle = "核准";
this.detailForm = row;
this.executeForm = detail;
//
this.existingFiles = [
{ name: "项目计划书.pdf", url: "#" },
{ name: "进度报告.docx", url: "#" },
{ name: "验收单.xlsx", url: "#" }
];
this.executeDialog = true;
},
//
downloadFile(file) {
//
const link = document.createElement('a');
link.href = file.url;
link.download = file.name;
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
},
//
removeExistingFile(index) {
this.$confirm('确定删除该附件?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.existingFiles.splice(index, 1);
this.$message.success('删除成功');
}).catch(() => {});
},
onLoad() {
this.data = [
{
@ -3501,4 +3563,46 @@ export default {
};
</script>
<style></style>
<style scoped>
.attachment-list {
margin-top: 10px;
padding: 10px;
border: 1px solid #EBEEF5;
border-radius: 4px;
background-color: #FAFAFA;
}
.attachment-list h4 {
margin: 0 0 10px 0;
font-size: 14px;
color: #606266;
}
.attachment-list ul {
margin: 0;
padding: 0;
list-style-type: none;
}
.attachment-list li {
display: flex;
align-items: center;
justify-content: space-between;
padding: 8px 0;
border-bottom: 1px solid #EBEEF5;
}
.attachment-list li:last-child {
border-bottom: none;
}
.attachment-list a {
color: #409EFF;
text-decoration: none;
}
.attachment-list a:hover {
color: #66b1ff;
text-decoration: underline;
}
</style>

@ -91,7 +91,7 @@ export default {
align: 'center',
column: [
{
label: '镀种小类',
label: '工艺能力',
prop: 'plate',
sortable: true,
filter: true,

@ -306,7 +306,7 @@ export default {
},
{
label: '报价单号',
label: '结算单价',
prop: 'workCenterNames',
sortable: true,
filter: true,
@ -326,7 +326,7 @@ export default {
},
{
label: '结算单价',
label: '结算金额',
prop: 'workCenterNames',
sortable: true,
filter: true,
@ -336,7 +336,7 @@ export default {
},
{
label: '结算金额',
label: '报价单号',
prop: 'workCenterNames',
sortable: true,
filter: true,

@ -308,8 +308,9 @@ export default {
width: 120,
},
{
label: '报价单号',
label: '结算单价',
prop: 'workCenterNames',
sortable: true,
filter: true,
@ -329,7 +330,7 @@ export default {
},
{
label: '结算单价',
label: '结算金额',
prop: 'workCenterNames',
sortable: true,
filter: true,
@ -339,7 +340,7 @@ export default {
},
{
label: '结算金额',
label: '报价单号',
prop: 'workCenterNames',
sortable: true,
filter: true,

@ -94,7 +94,7 @@ export default {
align: 'center',
column: [
{
label: '镀种小类',
label: '工艺能力',
prop: 'plate',
sortable: true,
filter: true,

@ -91,7 +91,7 @@ export default {
align: "center",
column: [
{
label: "镀种小类",
label: "工艺能力",
prop: "plate",
sortable: true,
filter: true,

@ -82,7 +82,7 @@ export default {
align: "center",
column: [
{
label: "镀种小类",
label: "工艺能力",
prop: "plate",
sortable: true,
filter: true,

@ -80,7 +80,7 @@ export default {
align: 'center',
column: [
{
label: '镀种小类',
label: '工艺能力',
prop: 'plate',
sortable: true,
filter: true,

@ -75,7 +75,7 @@ export default {
align: 'center',
column: [
{
label: '镀种小类',
label: '工艺能力',
prop: 'plate',
sortable: true,
filter: true,

@ -77,7 +77,7 @@ export default {
align: 'center',
column: [
{
label: '镀种小类',
label: '工艺能力',
prop: 'plate',
sortable: true,
filter: true,

@ -90,8 +90,24 @@ export default {
editBtnIcon: ' ',
align: 'center',
column: [
// {
// label: '-',
// prop: 'workCenterNames',
// sortable: true,
// filter: true,
// span: 24,
// search: false,
// labelWidth:130,
// rules: [
// {
// required: true,
// message: '',
// trigger: 'blur'
// }
// ]
// },
{
label: '镀种描述-报价单',
label: '镀种-描述规则',
prop: 'workCenterNames',
sortable: true,
filter: true,
@ -105,7 +121,6 @@ export default {
trigger: 'blur'
}
]
},
// {
// label: '',

@ -19,12 +19,10 @@
</avue-crud>
<processDialog :showDialog="isOpen" v-if="isOpen" @closeDialog="closeDialog"></processDialog>
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx"
importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import>
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateName="试验项目模板.xlsx"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog"></basic-import>
</div>
</template>
<script>
@ -59,7 +57,7 @@ export default {
delBtn: false,
addBtn: false,
editBtnText: '修改',
viewBtnText: '详情',
labelWidth: 120,
menuWidth: 180,
@ -170,9 +168,9 @@ export default {
},
methods: {
//
handleImport() {
this.isShowImport = true
},
handleImport() {
this.isShowImport = true
},
batchMaintain() {
this.isOpen = true
},

@ -2,15 +2,15 @@
<basic-container>
<el-tabs v-model="activeName" class="demo-tabs" @tab-change="tabPositionChange">
<el-tab-pane label="结算规则维护" name="1"></el-tab-pane>
<el-tab-pane label="镀种规则维护" name="3"></el-tab-pane>
<el-tab-pane label="镀种规则维护" name="3"></el-tab-pane>
<el-tab-pane label="工序规则维护" name="2"></el-tab-pane>
</el-tabs>
<settlement v-if="activeName=='1'"></settlement>
<process v-if="activeName=='2'"></process>
<plate v-if="activeName=='3'"></plate>
<settlement v-if="activeName == '1'"></settlement>
<process v-if="activeName == '2'"></process>
<plate v-if="activeName == '3'"></plate>
</basic-container>
</template>
<script>
@ -18,19 +18,19 @@ import settlement from './components/settlement.vue'
import process from './components/process.vue'
import plate from './components/plate.vue'
export default {
components:{
components: {
settlement,
process,
plate,
},
data() {
return {
activeName: '1',
isOpen:false,
isOpen: false,
}
},
methods:{
methods: {
}
}

@ -18,9 +18,9 @@
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu="scope">
<!-- <template #menu="scope">
<el-button type="text" @click="viewRow(scope.row)">详情</el-button>
</template>
</template> -->
</avue-crud>
<el-dialog title="公示详情" v-model="showExcel" append-to-body width="85%">
<div>
@ -227,6 +227,7 @@ export default {
search: false,
sortable: true,
overHidden: true,
},
{
label: "二月",

@ -61,6 +61,10 @@ export default {
},
query: {},
option: {
// searchCollapse: false,
searchShowBtn:false,
searchDefault: true,
searchExpand: true,
height: "auto",
align: "center",
calcHeight: 32,
@ -106,6 +110,7 @@ export default {
menuAlign: "left",
gridBtn: false,
searchMenuPosition: "right",
column: [
{
label: "选择日期",
@ -295,27 +300,27 @@ export default {
{ label: "上挂", value: "003" },
],
},
{
label: "主工序",
prop: "ppsLeaIds",
type: "select",
search: true,
width: 200,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: "请输入主工序",
trigger: "blur",
},
],
dicData: [
{ label: "上挂", value: "002" },
{ label: "化学镀镍", value: "003" },
{ label: "下挂", value: "004" },
],
},
// {
// label: "",
// prop: "ppsLeaIds",
// type: "select",
// search: true,
// width: 200,
// sortable: true,
// overHidden: true,
// rules: [
// {
// required: true,
// message: "",
// trigger: "blur",
// },
// ],
// dicData: [
// { label: "", value: "002" },
// { label: "", value: "003" },
// { label: "", value: "004" },
// ],
// },
{
label: "定额工时",
prop: "hourQuota",

@ -1,6 +1,7 @@
<template>
<basic-container>
<!-- 薪资维护标准 -->
<!-- 薪资标准维护 -->
<avue-crud
:option="option"
:table-loading="loading"
@ -24,7 +25,11 @@
>删除</el-button
>
</template>
<template #menu-right>
<el-button type="primary" icon="el-icon-upload" @click="handleImport"
>导入
</el-button>
</template>
<template #militaryProducts="scope">
<el-tag v-if="scope.row.militaryProducts == 1" type="success">军品</el-tag>
<el-tag v-if="scope.row.militaryProducts == 2" type="danger">非军品</el-tag>
@ -34,13 +39,24 @@
row.bsProcedureSet && row.bsProcedureSet.ppsName
}}</template>
</avue-crud>
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx"
importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import>
</basic-container>
</template>
<script>
import basicImport from '@/components/basic-import/main.vue'
export default {
components: {
basicImport,
},
data() {
return {
isShowImport:false,
loading: false,
data: [],
form: {},
@ -980,6 +996,10 @@ export default {
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
//
handleImport() {
this.isShowImport = true
},
onLoad() {
this.data = [

Loading…
Cancel
Save