fix: 空派结算重货标识及附加费

src/views/kongPai/components/DetailIconme.vue

@@ -187,7 +187,7 @@
             </vxe-column>
             <vxe-column field="Fee" title="费项附加费总额" :min-width="100" :edit-render="{ autofocus: '.vxe-input--inner' }">
               <template #edit="{ row }">
-                <vxe-input v-model="row.Fee" type="text" placeholder="请填入计费值" />
+                <vxe-input v-model="row.Fee" type="number" placeholder="请填入计费值" />
               </template>
             </vxe-column>
             <vxe-column field="Remark" title="备注" :min-width="90" :edit-render="{ autofocus: '.vxe-input--inner' }">
@@ -240,7 +240,8 @@
             </el-table-column>
             <el-table-column prop="CustomerConfirmTotalSurcharges" label="附加费总额">
               <template slot-scope="scope">
-                <div v-if="scope.row.CustomerConfirmTotalSurcharges >= 0">
+                <!-- v-if="scope.row.CustomerConfirmTotalSurcharges >= 0" -->
+                <div>
                   {{ scope.row.CustomerConfirmTotalSurcharges }}
                 </div>
               </template>

src/views/kongPai/settlement.vue

@@ -175,6 +175,20 @@
           @checkbox-all="handleSelectionChange"
           @edit-actived="editActived"
         >
+          <template #default_CustomerOrderNo="{ row }">
+            <div class="customerOrderNo-warp">
+              {{ row.CustomerOrderNo }}
+              <el-tag
+
+                size="mini"
+                type="danger"
+                v-for="item in row.CargoTypeNames"
+                :key="item"
+              >
+                {{ item }}
+              </el-tag>
+            </div>
+          </template>
           <template #edit_SettlementSplitWeightRate="scope">
             <!-- <el-input v-model="scope.row.SettlementSplitWeightRate" v-decimal-bubble-input class="define-input" /> -->
             <el-input-number v-model="scope.row.SettlementSplitWeightRate" :controls="false" :min="0" style="width: 100%;" class="define-input define-number-input"></el-input-number>
@@ -209,7 +223,7 @@
             {{ formatFBAOtherFee(row.FBAOtherFeeId_1) }}
           </template>
           <template #edit_FBAOtherFeeId_1="scope">
-            <vxe-select v-model="scope.row.FBAOtherFeeId_1" @change="changeFBAOtherFee(scope,'1')">
+            <vxe-select v-model="scope.row.FBAOtherFeeId_1" filterable @change="changeFBAOtherFee(scope,'1')">
               <vxe-option v-for="item in FBAOtherFee" :key="item.Id" :value="item.Id" :label="item.Name" />
             </vxe-select>
           </template>
@@ -222,7 +236,7 @@
             {{ formatFBAOtherFee(row.FBAOtherFeeId_2) }}
           </template>
           <template #edit_FBAOtherFeeId_2="scope">
-            <vxe-select v-model="scope.row.FBAOtherFeeId_2" @change="changeFBAOtherFee(scope,'2')">
+            <vxe-select v-model="scope.row.FBAOtherFeeId_2" filterable @change="changeFBAOtherFee(scope,'2')">
               <vxe-option v-for="item in FBAOtherFee" :key="item.Id" :value="item.Id" :label="item.Name" />
             </vxe-select>
           </template>
@@ -235,7 +249,7 @@
             {{ formatFBAOtherFee(row.FBAOtherFeeId_3) }}
           </template>
           <template #edit_FBAOtherFeeId_3="scope">
-            <vxe-select v-model="scope.row.FBAOtherFeeId_3" @change="changeFBAOtherFee(scope,'3')">
+            <vxe-select v-model="scope.row.FBAOtherFeeId_3" filterable @change="changeFBAOtherFee(scope,'3')">
               <vxe-option v-for="item in FBAOtherFee" :key="item.Id" :value="item.Id" :label="item.Name" />
             </vxe-select>
           </template>
@@ -243,6 +257,19 @@
             <el-input-number style="width: 100%;" v-model="scope.row.Fee_3" class="define-input" :controls="false" @blur="surchargeTotal(scope)"></el-input-number>
             <!-- <el-input v-model="scope.row.Fee_3" v-decimal-input class="define-input" @blur="surchargeTotal(scope)" /> -->
           </template>
+          <!-- 4 -->
+          <template #default_FBAOtherFeeId_4="{row}">
+            {{ formatFBAOtherFee(row.FBAOtherFeeId_4) }}
+          </template>
+          <template #edit_FBAOtherFeeId_4="scope">
+            <vxe-select v-model="scope.row.FBAOtherFeeId_4" filterable @change="changeFBAOtherFee(scope,'4')">
+              <vxe-option v-for="item in FBAOtherFee" :key="item.Id" :value="item.Id" :label="item.Name" />
+            </vxe-select>
+          </template>
+          <template #edit_Fee_4="scope">
+            <el-input-number style="width: 100%;" v-model="scope.row.Fee_4" class="define-input" :controls="false" @blur="surchargeTotal(scope)"></el-input-number>
+            <!-- <el-input v-model="scope.row.Fee_4" v-decimal-input class="define-input" @blur="surchargeTotal(scope)" /> -->
+          </template>
           <!--  -->
           <template #actions="{ row, rowIndex }">
             <template v-if="$refs.gridTableRef.isActiveByRow(row)">
@@ -508,7 +535,7 @@ export default {
         columns: [
           { type: 'checkbox', width: 45, fixed: "left" },
           { field: 'ReceiveTimeStr', title: '收货日期', minWidth: 90, fixed: "left" },
-          { field: 'CustomerOrderNo', title: '客户单号', minWidth: 130, fixed: "left" },
+          { field: 'CustomerOrderNo', title: '客户单号', minWidth: 130, fixed: "left", slots: { default: 'default_CustomerOrderNo' } },
           { field: 'PublicName', title: '渠道', minWidth: 120, fixed: "left" },
           { field: 'ReceiverZipCode', title: '收件邮编', minWidth: 95, fixed: "left" },
           { field: 'SystemNo', title: '行运易单号', minWidth: 150 },
@@ -625,6 +652,28 @@ export default {
               name: '$input'
             }
           },
+          {
+            field: 'FBAOtherFeeId_4',
+            title: '附加费项4',
+            width: 120,
+            editRender: {},
+            slots: { default: 'default_FBAOtherFeeId_4', edit: 'edit_FBAOtherFeeId_4' }
+          },
+          {
+            field: 'Fee_4',
+            title: '附加费4金额',
+            width: 120,
+            slots: { edit: 'edit_Fee_4' },
+            editRender: { autofocus: '.define-input .el-input__inner' }
+          },
+          {
+            field: 'Remark_4',
+            title: '附加费4备注',
+            width: 120,
+            editRender: {
+              name: '$input'
+            }
+          },
           // ---编辑
           { field: 'SettlementConfirmTotalSurcharges', title: '附加费总额', width: 90, fixed: 'right' },
           { field: 'SettlementConfirmTotal', title: '结算总额', width: 90, fixed: 'right' },
@@ -705,9 +754,14 @@ export default {
       this.serachLadding = true
       _getSettlementConfirmList(this.pagerDto)
         .then((response) => {
+          const cargoTypes = ['1:200', '1:300']
           // this.sData = response.Result
           const ResultArr = response.Result || []
-          this.gridTableOptions.data = ResultArr
+          this.gridTableOptions.data = ResultArr.map(item => {
+            item.CargoTypeNames = []
+            if (item.GoodsNamesArry) item.CargoTypeNames =  item.GoodsNamesArry.filter(names => cargoTypes.includes(names))
+            return item
+          })
           this.insertTableData(ResultArr)
           this.pagerDto.total = response.TotalCount
           this.serachLadding = false
@@ -739,7 +793,7 @@ export default {
       const findFee = this.FBAOtherFee.find(
         (item) => item.Id === scope.row[`FBAOtherFeeId_${type}`]
       )
-      this.$set(scope.row, `Fee_${type}`, findFee.Fee)
+      // this.$set(scope.row, `Fee_${type}`, findFee.Fee)
       this.$set(scope.row, `CustomerRemark_${type}`, findFee.CustomerRemark)
       this.$set(scope.row, `Remark_${type}`, findFee.Remark)
       this.$set(scope.row, `SysncJS_${type}`, findFee.SysncJS)
@@ -1290,4 +1344,10 @@ export default {
 .define-number-input .el-input__inner {
   text-align: left !important;
 }
+.customerOrderNo-warp .el-tag {
+  margin-right: 2px;
+}
+.customerOrderNo-warp .el-tag:last-child {
+  margin-right: 0;
+}
 </style>