Browse Source

成本分配表/成本分配列表-标记B判断规则修改

jingbb 3 months ago
parent
commit
6793b2a405

+ 2 - 2
src/views/cost-allocation-total/costDetailDrawer.vue

@@ -235,7 +235,7 @@
             </a-col>
             <a-col :md="6" :sm="8" class="noprint">
               <a-form-model-item label="" prop="" >
-              <h4 style="color:blue;" v-if="color2<0.8">
+              <h4 style="color:blue;" v-if="color2>=0&&color2<0.8">
                 标记(B)
                 <!-- <span>(计算结果小于O.8 时,该标记是蓝色)</span> -->
               </h4>
@@ -655,7 +655,7 @@ export default {
       this.detailsPlanNum.shortvalue=( this.detailsPlanNum.shortvalue==''|| !this.detailsPlanNum.shortvalue)?'': (this.detailsPlanNum.shortvalue).toFixed(2)//短出货值
       this.color1 = Number(this.detailsPlanNum.rmbExportamount)-Number(this.detailsPlanNum.fabriccostNotincludestax)-Number(this.detailsPlanNum.excipiencostNotincludestax)-Number(this.detailsPlanNum.rmbProcesscost)-Number(this.detailsPlanNum.rmbExpense)
       this.color2 = this.color1/Number(this.detailsPlanNum.usdTotalexportprice)
-      this.color2 = this.color2>0?this.color2:-this.color2
+      // this.color2 = this.color2>0?this.color2:-this.color2
     },
 
     openEnclosure(){

+ 2 - 2
src/views/cost-allocation-total/list.vue

@@ -344,9 +344,9 @@ export default {
       // 标记A
       var A =rmbExportamoun-fabriccostNotincludestax-excipiencostNotincludestax-rmbProcesscost-rmbExpense
       var B = A/usdTotalexportprice
-      B= B>0?B:-B
+      // B= B>0?B:-B
       item.signA = A<0?'red':''
-      item.signB = B<0.8?'blue':''
+      item.signB =(B>=0&&B<0.8)?'blue':''
       this.$forceUpdate()
     },
     cancelSumit(record){

+ 2 - 2
src/views/reportForms/cost-allocation-table.vue

@@ -223,7 +223,7 @@
             </a-col>
             <a-col :md="6" :sm="8" class="noprint">
               <a-form-model-item label="" prop="" >
-              <h4 style="color:blue;" v-if="color2<0.8">
+              <h4 style="color:blue;" v-if="color2>=0&&color2<0.8">
                 标记(B)
                 <!-- <span>(计算结果小于O.8 时,该标记是蓝色)</span> -->
               </h4>
@@ -731,7 +731,7 @@ export default {
       this.detailsPlanNum.shortvalue=( this.detailsPlanNum.shortvalue==''|| !this.detailsPlanNum.shortvalue)?'': (this.detailsPlanNum.shortvalue).toFixed(2)//短出货值
       this.color1 = Number(this.detailsPlanNum.rmbExportamount)-Number(this.detailsPlanNum.fabriccostNotincludestax)-Number(this.detailsPlanNum.excipiencostNotincludestax)-Number(this.detailsPlanNum.rmbProcesscost)-Number(this.detailsPlanNum.rmbExpense)
       this.color2 = this.color1/Number(this.detailsPlanNum.usdTotalexportprice)
-      this.color2 = this.color2>0?this.color2:-this.color2
+      // this.color2 = this.color2>0?this.color2:-this.color2
     },
 
     //计算出运明细合计行