成本分配表-字段修改

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

@@ -106,6 +106,11 @@
                 <a href="javascript:void(0)" @click="mainTableExpenseUSD()" >{{ detailsPlanNum.usdExpense }}</a>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="不含税运杂费(￥)" prop="rmbExpense" >
+                {{detailsPlanNum.rmbExpense }}
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="8">
               <a-form-model-item label="事故金额($)" prop="accidentUsdamount" >
                 {{ detailsPlanNum.accidentUsdamount }}
@@ -163,13 +168,18 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="费用支出(￥)" prop="rmbExpense">
+              <a-form-model-item label="运杂费(￥)" prop="rmbExpense">
                 <a href="javascript:void(0)" @click="mainTableExpenseCNY()">{{ detailsPlanNum.rmbExpense }}</a>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="8">
               <a-form-model-item label="运费税额" prop="salesrrdersOriginaltotal">
-                {{  }}
+                {{detailsPlanNum.shuiemoney }}
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="制单人" prop="maker">
+                {{ detailsPlanNum.preparedBy }}
               </a-form-model-item>
             </a-col>
             <!-- <a-col :md="6" :sm="8">
@@ -220,7 +230,11 @@
                 {{ detailsPlanNum.preparedBy }}
               </a-form-model-item>
             </a-col> -->
-
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="备注" prop="UsdfabriccostNotincludestax" >
+                <a-input style="width:100%" type="text" v-model="detailsPlanNum.memo" @blur="changeContainerNumber" />
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="8" class="noprint">
               <a-form-model-item label="" prop="" >
               <h4 style="color:red;" v-if="color1<0">
@@ -245,11 +259,7 @@
               </h4>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="8">
-              <a-form-model-item label="备注" prop="UsdfabriccostNotincludestax" >
-                <a-input style="width:100%" type="text" v-model="detailsPlanNum.memo" @blur="changeContainerNumber" />
-              </a-form-model-item>
-            </a-col>
+            
         </a-form-model>
       </div>
       </a-row>
@@ -557,7 +567,7 @@ export default {
               if(item.exchangeRate=='6.888' && item.outdata!=='合计'){
                  e+=Number(item.processCost)
               }else if(item.outdata!=='合计'){
-                e+=(Number(item.processCost)/1.13).toFixed(2)
+                e+=(Number(item.processCost)/1.13)
               }
             })
             this.$refs.unitTabs.sumInfo.exportPriceUSD = (s/2).toFixed(2)//出运美元外销总价
@@ -583,10 +593,10 @@ export default {
     //调整表头格式
     adjustingHeader(){
       this.detailsPlanNum.outdata = ( this.detailsPlanNum.outdata==''||!this.detailsPlanNum.outdata)?'':moment( this.detailsPlanNum.outdata).format('YYYY-MM-DD')
-      this.detailsPlanNum.planQuantity=( this.detailsPlanNum.planQuantity==''|| !this.detailsPlanNum.planQuantity)?'':Number( this.detailsPlanNum.planQuantity).toFixed(4)//计划数量
+      this.detailsPlanNum.planQuantity=( this.detailsPlanNum.planQuantity==''|| !this.detailsPlanNum.planQuantity)?'':Number( this.detailsPlanNum.planQuantity).toFixed(0)//计划数量
       this.detailsPlanNum.usdTotalexportprice=( this.detailsPlanNum.usdTotalexportprice==''|| !this.detailsPlanNum.usdTotalexportprice)?'':Number( this.detailsPlanNum.usdTotalexportprice).toFixed(2)//美元外销总价
       this.detailsPlanNum.rmbExpense=( this.detailsPlanNum.rmbExpense==''|| !this.detailsPlanNum.rmbExpense)?'':Number( this.detailsPlanNum.rmbExpense).toFixed(2)//人民币费用支出
-      this.detailsPlanNum.actualShipquantity=( this.detailsPlanNum.actualShipquantity==''|| !this.detailsPlanNum.actualShipquantity)?'':Number( this.detailsPlanNum.actualShipquantity).toFixed(4)//实际出库数量
+      this.detailsPlanNum.actualShipquantity=( this.detailsPlanNum.actualShipquantity==''|| !this.detailsPlanNum.actualShipquantity)?'':Number( this.detailsPlanNum.actualShipquantity).toFixed(0)//实际出库数量
       this.detailsPlanNum.rmbExportamount=( this.detailsPlanNum.rmbExportamount==''|| !this.detailsPlanNum.rmbExportamount)?'':Number( this.detailsPlanNum.rmbExportamount).toFixed(2)//人民币外销金额
       this.detailsPlanNum.usdExpense=( this.detailsPlanNum.usdExpense==''|| !this.detailsPlanNum.usdExpense)?'':Number( this.detailsPlanNum.usdExpense).toFixed(2)//美元费用支出
       this.detailsPlanNum.rmbProcesscost=( this.detailsPlanNum.rmbProcesscost==''|| !this.detailsPlanNum.rmbProcesscost)?'':Number( this.detailsPlanNum.rmbProcesscost).toFixed(2)//加工费(人民币)