货代 2024-1-13

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -1,57 +1,7 @@
 <template>
     <div>
         <el-tabs v-model="activeName">
-            <el-tab-pane label="货物明细" name="second">
-                <avue-crud :option="optionDetail"
-                           :table-loading="loading"
-                           :data="containersCommodityList"
-                           v-model="Detailform"
-                           id="out-table"
-                           :header-cell-class-name="headerClassName"
-                           ref="crudDetail"
-                           :row-style="{height:'20px'}"
-                           :cell-style="{padding:'0px'}"
-                           @selection-change="handleSelectionChange"
-                           @row-save="rowSaveDetail"
-                           @row-update="addUpdateDetail"
-                           @resetColumn="resetColumnTwo('crudDetail', 'optionDetail', 'optionBackDetail', 309.4)"
-                           @saveColumn="saveColumnTwo('crudDetail', 'optionDetail', 'optionBackDetail', 309.4)" >
-                    <template slot="lineNoHeader" slot-scope="scope">
-                        <el-button type="primary" size="small" icon="el-icon-plus" circle
-                                   :disabled="selectionList.length == 0" @click="DetailAdd"></el-button>
-                    </template>
-                    <template slot-scope="scope" slot="menuLeft">
-                        <el-button
-                            type="primary" plain
-                            size="small"
-                            :disabled="pleasereviewType"
-                            @click.stop="containerscommoditySubmitListfun"
-                        >批量保存</el-button>
-                        <el-button
-                            type="danger" plain
-                            size="small"
-                            :disabled="pleasereviewType"
-                            @click.stop="BatchDelete"
-                        >批量删除</el-button>
-                    </template>
-                    <template slot-scope="scope" slot="menu">
-                        <el-button
-                            v-if="!scope.row.$cellEdit"
-                            size="mini"
-                            type="text"
-                            icon="el-icon-edit"
-                            :disabled="pleasereviewType"
-                            @click.stop="editfun(scope.row, scope.index)">
-                            编辑
-                        </el-button>
-                        <el-button type="text" size="small"
-                                   :disabled="pleasereviewType"
-                                   @click="containerscommodityRemovefun(scope.row.id,scope.index)">删除
-                        </el-button>
-                    </template>
-                </avue-crud>
-            </el-tab-pane>
-            <el-tab-pane label="已装箱" name="first">
+            <el-tab-pane label="可装箱" name="second">
                 <div class="tbasTop">
                     <el-table
                         :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
@@ -156,6 +106,56 @@
                     </el-table>
                 </div>
             </el-tab-pane>
+            <el-tab-pane label="货物明细" name="first">
+                <avue-crud :option="optionDetail"
+                           :table-loading="loading"
+                           :data="containersCommodityList"
+                           v-model="Detailform"
+                           id="out-table"
+                           :header-cell-class-name="headerClassName"
+                           ref="crudDetail"
+                           :row-style="{height:'20px'}"
+                           :cell-style="{padding:'0px'}"
+                           @selection-change="handleSelectionChange"
+                           @row-save="rowSaveDetail"
+                           @row-update="addUpdateDetail"
+                           @resetColumn="resetColumnTwo('crudDetail', 'optionDetail', 'optionBackDetail', 309.4)"
+                           @saveColumn="saveColumnTwo('crudDetail', 'optionDetail', 'optionBackDetail', 309.4)" >
+                    <template slot="lineNoHeader" slot-scope="scope">
+                        <el-button type="primary" size="small" icon="el-icon-plus" circle
+                                   :disabled="selectionList.length == 0" @click="DetailAdd"></el-button>
+                    </template>
+                    <template slot-scope="scope" slot="menuLeft">
+                        <el-button
+                            type="primary" plain
+                            size="small"
+                            :disabled="pleasereviewType"
+                            @click.stop="containerscommoditySubmitListfun"
+                        >批量保存</el-button>
+                        <el-button
+                            type="danger" plain
+                            size="small"
+                            :disabled="pleasereviewType"
+                            @click.stop="BatchDelete"
+                        >批量删除</el-button>
+                    </template>
+                    <template slot-scope="scope" slot="menu">
+                        <el-button
+                            v-if="!scope.row.$cellEdit"
+                            size="mini"
+                            type="text"
+                            icon="el-icon-edit"
+                            :disabled="pleasereviewType"
+                            @click.stop="editfun(scope.row, scope.index)">
+                            编辑
+                        </el-button>
+                        <el-button type="text" size="small"
+                                   :disabled="pleasereviewType"
+                                   @click="containerscommodityRemovefun(scope.row.id,scope.index)">删除
+                        </el-button>
+                    </template>
+                </avue-crud>
+            </el-tab-pane>
         </el-tabs>
         <!--<div class="tbasTop">-->
         <!--    <el-table-->

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1773,6 +1773,18 @@
                             }
                         }
                     }
+                    this.$set(row,'amount',Number(row.price?row.price:0) * Number(row.quantity?row.quantity:0))
+                    if (row.curCode == 'CNY') {
+                        this.$set(row,'rmbAmount',row.amount)
+                        this.$set(row,'usdAmount','')
+                        this.$set(row,'rmbAmountNet',row.amount)
+                        this.$set(row,'usdAmountNet','')
+                    }else {
+                        this.$set(row,'usdAmount',row.amount)
+                        this.$set(row,'rmbAmount','')
+                        this.$set(row,'usdAmountNet',row.amount)
+                        this.$set(row,'rmbAmountNet','')
+                    }
                 } else if (name == 'elementsCnName') {
                     if (!value) {
                         this.$set(row,'elementsId','')