|
@@ -1,6 +1,6 @@
|
|
<template>
|
|
<template>
|
|
<div class="app-container">
|
|
<div class="app-container">
|
|
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
|
+ <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="100px">
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
<el-form-item label="编码" prop="code">
|
|
<el-form-item label="编码" prop="code">
|
|
@@ -34,7 +34,7 @@
|
|
</el-row>
|
|
</el-row>
|
|
|
|
|
|
</el-form>
|
|
</el-form>
|
|
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
+ <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="100px">
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
<el-form-item label="年度" prop="annual">
|
|
<el-form-item label="年度" prop="annual">
|
|
@@ -107,7 +107,7 @@
|
|
</el-row>
|
|
</el-row>
|
|
|
|
|
|
<el-table v-loading="loading" :data="annualSaleGoalList" @selection-change="handleSelectionChange"
|
|
<el-table v-loading="loading" :data="annualSaleGoalList" @selection-change="handleSelectionChange"
|
|
- @row-dblclick="useDoubleClick" v-horizontal-scroll>
|
|
+ @row-dblclick="useDoubleClick" v-horizontal-scroll max-height="560">
|
|
<el-table-column label="编码" align="center" prop="code" width="180" />
|
|
<el-table-column label="编码" align="center" prop="code" width="180" />
|
|
<el-table-column label="目标名称" align="center" prop="goalName" width="240" />
|
|
<el-table-column label="目标名称" align="center" prop="goalName" width="240" />
|
|
<el-table-column label="单据日期" align="center" prop="documentDate" width="180">
|
|
<el-table-column label="单据日期" align="center" prop="documentDate" width="180">
|
|
@@ -151,7 +151,7 @@
|
|
|
|
|
|
<el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
|
|
<el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
|
|
v-horizontal-scroll disabled>
|
|
v-horizontal-scroll disabled>
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="openStatus == 'see'">
|
|
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="openStatus == 'see'" size="mini">
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
<el-form-item label="编码" prop="code">
|
|
<el-form-item label="编码" prop="code">
|
|
@@ -247,7 +247,7 @@
|
|
</el-row>
|
|
</el-row>
|
|
<el-tabs v-model="activeName">
|
|
<el-tabs v-model="activeName">
|
|
<el-tab-pane label="年销售目标填报明细" name="annualSaleGoalDetails">
|
|
<el-tab-pane label="年销售目标填报明细" name="annualSaleGoalDetails">
|
|
- <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
|
|
+ <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
|
|
:data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
|
|
:data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
|
|
<el-table-column label="序号" type="index" width="70" align="center" fixed />
|
|
<el-table-column label="序号" type="index" width="70" align="center" fixed />
|
|
<el-table-column label="销售组织" align="center" width="180"
|
|
<el-table-column label="销售组织" align="center" width="180"
|
|
@@ -884,8 +884,8 @@
|
|
},
|
|
},
|
|
/** 提交按钮 */
|
|
/** 提交按钮 */
|
|
submitForm() {
|
|
submitForm() {
|
|
- if (!this.justiceDetailsList()) {
|
|
+ if (this.justiceDetailsList()) {
|
|
- return this.$message.error('子表有必填字段没有赋值')
|
|
+ return this.$message.error('子表有必填字段未填,或者目标值为0')
|
|
}
|
|
}
|
|
for (let i = 0; i < this.annualSaleGoalDetailsList.length; i++) {
|
|
for (let i = 0; i < this.annualSaleGoalDetailsList.length; i++) {
|
|
for (let j = i + 1; j < this.annualSaleGoalDetailsList.length; j++) {
|
|
for (let j = i + 1; j < this.annualSaleGoalDetailsList.length; j++) {
|
|
@@ -1040,18 +1040,26 @@
|
|
},
|
|
},
|
|
// 判断子表的字段是否都填了
|
|
// 判断子表的字段是否都填了
|
|
justiceDetailsList() {
|
|
justiceDetailsList() {
|
|
|
|
+ let isFlag = [];
|
|
const arr = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
|
|
const arr = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
|
|
for (const element of arr) {
|
|
for (const element of arr) {
|
|
const flag1 = (element.saleZone !== null) && (element.saleOrg !== null) && (element.custom !== null) && (
|
|
const flag1 = (element.saleZone !== null) && (element.saleOrg !== null) && (element.custom !== null) && (
|
|
- element.creator !== null) && (element.materialCode !== null) && (element.material !== null)
|
|
+ element.creator !== null) && (element.materialCode !== null) && (element.material !== null) &&
|
|
|
|
+ (element.goalValue !== 0)
|
|
const flag2 = (element.saleOrg !== undefined) && (element.saleZone !== undefined) && (element.custom !==
|
|
const flag2 = (element.saleOrg !== undefined) && (element.saleZone !== undefined) && (element.custom !==
|
|
undefined) && (element.creator !== undefined) && (element.materialCode != undefined) && (element
|
|
undefined) && (element.creator !== undefined) && (element.materialCode != undefined) && (element
|
|
.material !== undefined)
|
|
.material !== undefined)
|
|
if (flag1 && flag2) {
|
|
if (flag1 && flag2) {
|
|
- return true
|
|
+ isFlag.push(true);
|
|
|
|
+ } else {
|
|
|
|
+ isFlag.push(false);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ for (const flag of isFlag) {
|
|
|
|
+ if (!flag) {
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- return false
|
|
|
|
},
|
|
},
|
|
handleCommand(command) {
|
|
handleCommand(command) {
|
|
// 执行对应的功能
|
|
// 执行对应的功能
|