Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/business/spd/target/AnnualSaleGoal.vue

@@ -137,12 +137,9 @@
           <el-button v-if="scope.row.status == '0' || scope.row.status == '3'" size="mini" type="text"
             @click="handleDelete(scope.row)">删除
           </el-button>
-          <el-button v-if="scope.row.status == '0' && (scope.row.flowId == null || scope.row.flowId == '')" size="mini" type="text"
+          <el-button v-if="scope.row.status == '0' || scope.row.status == '3'" size="mini" type="text"
             @click="handleSubmit(scope.row)">提交
           </el-button>
-          <el-button v-if="(scope.row.status == '0' || scope.row.status == '3') && !(scope.row.flowId == null || scope.row.flowId == '')" size="mini" type="text"
-            @click="handleResubmit(scope.row)">重新提交
-          </el-button>
           <el-button v-if="scope.row.status == '1'" size="mini" type="text" @click="handleReback(scope.row)">收回
           </el-button>
         </template>
@@ -251,7 +248,7 @@
           <el-tabs v-model="activeName">
             <el-tab-pane label="年销售目标填报明细" name="annualSaleGoalDetails">
 
-              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
+              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading" size="mini"
                 :data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="70" align="center" fixed />
                 <el-table-column label="销售组织" align="center" width="180"

src/views/business/spd/target/AnnualSaleGoalMerge.vue

@@ -268,7 +268,7 @@
           </el-row>
           <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
             <el-tab-pane label="年销售目标合并明细" name="annualSaleGoalMergeDetails">
-              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
+              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading" size="mini"
                 :data="annualSaleGoalMergeDetailsList" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="70" align="center" fixed />
                 <el-table-column label="销售组织" align="center" width="180">

src/views/business/spd/target/MonthGoalMerge.vue

@@ -278,7 +278,7 @@
           </el-row>
           <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
             <el-tab-pane label="月销售目标合并明细" name="monthGoalMergeDetails">
-              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
+              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading" size="mini"
                 :data="monthGoalMergeDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="70" align="center" fixed />
                 <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">

src/views/business/spd/target/MonthReturnGoal.vue

@@ -243,7 +243,7 @@
           </el-row>
           <el-tabs v-model="activeName">
             <el-tab-pane label="月回款目标明细" name="monthReturnGoalDetails">
-              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
+              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading" size="mini"
                 :data="monthReturnGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="70" align="center" fixed />
                 <el-table-column label="销售组织" align="center" width="180" :render-header="addRedStar">

src/views/business/spd/target/MonthReturnMerge.vue

@@ -245,7 +245,7 @@
           </el-row>
           <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
             <el-tab-pane label="月回款目标合并明细" name="monthReturnMergeDetails">
-              <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" size="mini"
                 :data="monthReturnMergeDetailsList" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="55" align="center" fixed />
                 <el-table-column label="销售组织" align="center" width="180">

src/views/business/spd/target/MonthSaleGoal.vue

@@ -246,7 +246,7 @@
           </el-row>
           <el-tabs v-model="activeName">
             <el-tab-pane label="月销售目标明细" name="monthSaleGoalDetails">
-              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
+              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading" size="mini"
                 :data="monthSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="70" align="center" fixed />
                 <el-table-column label="销售组织" align="center" width="180" :render-header="addRedStar">

src/views/purchase/apply/add/index.vue

@@ -175,6 +175,7 @@
         this.visible = false;
         this.params = this.$init.params([...TabColumns, ...TableColumns]);
         this.$emit("success");
+        this.delDemandItemList = []
       },
       //
       async onRowAdd(prop, pushParams = {}) {
@@ -224,7 +225,7 @@
               param.priceApplyItems.forEach((item, index) => {
                 item.$index = index
               });
-              let tishi = param.priceApplyItems.filter(item => {return (item.priceDiffer && item.priceDiffer !== 0)})
+              let tishi = param.priceApplyItems.filter(item => {return (item.priceDiffer && item.delFlag == '0' && item.priceDiffer !== 0)})
               // console.log('筛选', tishi)
               let tishiMsg = tishi.map(item => {
                 return `第${item.$index+1}行为价格调整`

src/views/purchase/apply/copy/index.vue

@@ -220,6 +220,7 @@
         this.visible = false;
         this.params = this.$init.params([...TabColumns, ...TableColumns]);
         this.$emit("success");
+        this.delDemandItemList = []
       },
       //
       async onRowAdd(prop, pushParams = {}) {
@@ -270,7 +271,7 @@
               param.priceApplyItems.forEach((item, index) => {
                 item.$index = index
               });
-              let tishi = param.priceApplyItems.filter(item => {return (item.priceDiffer && item.priceDiffer !== 0)})
+              let tishi = param.priceApplyItems.filter(item => {return (item.priceDiffer && item.delFlag == '0' && item.priceDiffer !== 0)})
               console.log('筛选', tishi)
               let tishiMsg = tishi.map(item => {
                 return `第${item.$index+1}行为价格调整`

src/views/purchase/apply/edit/index.vue

@@ -230,6 +230,7 @@
         this.visible = false;
         this.params = this.$init.params([...TabColumns, ...TableColumns]);
         this.$emit("success");
+        this.delDemandItemList = []
       },
       //
       async onRowAdd(prop, pushParams = {}) {
@@ -286,7 +287,7 @@
               let param = JSON.parse(JSON.stringify(this.params))
               // console.log('深拷贝对象',param);
               param.priceApplyItems = list
-              let tishi = param.priceApplyItems.filter(item => {return (item.priceDiffer && item.priceDiffer !== 0)})
+              let tishi = param.priceApplyItems.filter(item => {return (item.priceDiffer && item.delFlag == '0' && item.priceDiffer !== 0)})
               console.log('筛选', tishi)
               let tishiMsg = tishi.map(item => {
                 return `第${item.$index+1}行为价格调整`