小修改

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

@@ -49,6 +49,14 @@
         :scroll="{ x: 1500 }"
         @change="handleTableChange"
       >
+        <!-- 状态 -->
+        <!-- slot-scope="text, record" -->
+        <span slot="state">
+          <!-- v-if="record.isRelease == '0'" -->
+          <a-tag color="#f50">审核通过</a-tag>
+          <!-- <a-tag color="#87d068" v-else>已发布</a-tag> -->
+        </span>
+
         <!-- 操作 -->
         <span slot="operationSlot" slot-scope="text, record">
           <a href="javascript:void(0);" @click="detail(record)">详情</a>
@@ -135,6 +143,13 @@ export default {
           className: 'replacecolor',
           scopedSlots: { customRender: 'note' }
         },
+        {
+          title: '状态',
+          width: 120,
+          dataIndex: 'state',
+          className: 'replacecolor',
+          scopedSlots: { customRender: 'state' }
+        },
         {
           title: '操作',
           dataIndex: 'operation',

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

@@ -14,20 +14,20 @@
             bordered
             :pagination="false"
           >
-            <!-- 面料-转入数量 弹框-->
+            <!-- 面料 -转入数量 弹框-->
             <span slot="fabricTransferQuantity" slot-scope="text">
               <a>{{ text }}</a>
             </span>
 
-            <!-- 面料-余下数量 弹框-->
+            <!-- 余下数量-->
             <span slot="fabricRemainingQuantity" slot-scope="text">
               <a>{{ text }}</a>
             </span>
           </a-table>
         </div>
 
-        <!-- tabs 辅料 -->
-        <div style="margin:40px 0">
+        <!-- tabs 辅料   :scroll="{ x: 1500 }"-->
+        <div style="margin:30px 0">
           <h6 class="table-title">辅料</h6>
           <a-table
             rowKey="id"
@@ -36,7 +36,6 @@
             :data-source="ingredientsData"
             bordered
             :pagination="false"
-            :scroll="{ x: 1500 }"
           >
             <!--辅料-转入数量 弹框-->
             <span slot="ingredientsTransferQuantity" slot-scope="text">
@@ -49,7 +48,7 @@
           </a-table>
         </div>
 
-        <!-- tabs 发运明细 -->
+        <!-- tabs 发运明细   :scroll="{ x: 1500 }"-->
         <div>
           <h6 class="table-title">发运明细</h6>
           <a-table
@@ -59,13 +58,12 @@
             :data-source="shipDetailsData"
             bordered
             :pagination="false"
-            :scroll="{ x: 1500 }"
           >
           </a-table>
         </div>
 
         <!-- tabs 合计 信息 -->
-        <div style="margin:40px 0">
+        <div style="marginTop:30px;">
           <h6 class="table-title">合计信息</h6>
           <div style="border: 1px solid #e8e8e8;padding: 20px 20px 0 20px;">
             <a-row :gutter="24">
@@ -129,7 +127,6 @@
             </a-row>
           </div>
         </div>
-
       </a-tab-pane>
 
       <!-- 加工单位 2 -->
@@ -141,13 +138,18 @@
           <a-table
             rowKey="id"
             :loading="loading"
-            :columns="fabricColumns"
-            :data-source="fabricData"
+            :columns="twofabricColumns"
+            :data-source="twofabricData"
             bordered
             :pagination="false"
           >
             <!-- 转入数量 弹框-->
-            <span slot="fabricTransferQuantity" slot-scope="text">
+            <span slot="twofabricTransferQuantity" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+
+            <!-- 余下数量 弹框-->
+            <span slot="twofabricRemainingQuantity" slot-scope="text">
               <a>{{ text }}</a>
             </span>
           </a-table>
@@ -160,13 +162,17 @@
           <a-table
             rowKey="id"
             :loading="loading"
-            :columns="ingredientsColumns"
-            :data-source="ingredientsData"
+            :columns="twoingredientsColumns"
+            :data-source="twoingredientsData"
             bordered
             :pagination="false"
           >
-            <!-- 转入数量 弹框-->
-            <span slot="TransferQuantity" slot-scope="text">
+            <!--辅料-转入数量 弹框-->
+            <span slot="twoingredientsTransferQuantity" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+            <!--辅料-余下数量 弹框-->
+            <span slot="twoingredientsRemainingQuantity" slot-scope="text">
               <a>{{ text }}</a>
             </span>
           </a-table>
@@ -175,29 +181,103 @@
         <!-- tabs 发运明细 -->
         <div>
           <h6 class="table-title">发运明细</h6>
-
           <a-table
             rowKey="id"
             :loading="loading"
-            :columns="shipDetailsColumns"
-            :data-source="shipDetailsData"
+            :columns="twoshipDetailsColumns"
+            :data-source="twoshipDetailsData"
             bordered
             :pagination="false"
           >
-            <!-- 转入数量 弹框-->
-            <span slot="fabricTransferQuantity" slot-scope="text">
-              <a>{{ text }}</a>
-            </span>
           </a-table>
         </div>
 
-        <!-- tabs 合计信息 -->
-        <div style="margin:40px 0">
-          <h6 class="table-title">发运明细</h6>
-          <p>此处是主表信息的表单回显 方式</p>
+        <!-- tabs 合计 信息 -->
+        <div style="marginTop:30px;">
+          <h6 class="table-title">合计信息</h6>
+          <div style="border: 1px solid #e8e8e8;padding: 20px 20px 0 20px;">
+            <a-row :gutter="24">
+              <div class="table-page-search-wrapper">
+                <a-form layout="inline">
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出货数量合计">
+                      <a-input v-model="totalInfo.shipmentQuantity"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="辅料金额合计">
+                      <a-input v-model="totalInfo.accessoriesAmount"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="辅料不含税金额合计">
+                      <a-input v-model="totalInfo.accessoriesExcludTax"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出运美元外销总价">
+                      <a-input v-model="totalInfo.exportPriceUSD"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出运加工费">
+                      <a-input v-model="totalInfo.shipProcesFees"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="面料不含税金额合计">
+                      <a-input v-model="totalInfo.fabricExcludTax"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出运人民币外销金额">
+                      <a-input v-model="totalInfo.exportedAmountRMB"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="合计金额">
+                      <a-input v-model="totalInfo.amountTotal"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="面料金额合计">
+                      <a-input v-model="totalInfo.fabricAmount"></a-input>
+                    </a-form-item>
+                  </a-col>
+                </a-form>
+              </div>
+            </a-row>
+          </div>
         </div>
       </a-tab-pane>
     </a-tabs>
+
+    <!-- tabs 弹框 -->
+    <div>
+      <!-- 面料 转入数量 -->
+      <fabricTransferQuantity-modal ref="fabricTransferQuantityModal" :father="aa"></fabricTransferQuantity-modal>
+      <!-- 面料 余下数量 -->
+      <fabricRemainingQuantity-modal ref="fabricRemainingQuantityModal" :father="bb"></fabricRemainingQuantity-modal>
+
+      <!-- 辅料 转入数量 -->
+      <ingredientsTransferQuantity-modal
+        ref="ingredientsTransferQuantityModal"
+        :father="cc"
+      ></ingredientsTransferQuantity-modal>
+      <!-- 辅料 余下数量 -->
+      <ingredientsRemainingQuantity-modal
+        ref="ingredientsRemainingQuantityModal"
+        :father="bb"
+      ></ingredientsRemainingQuantity-modal>
+    </div>
   </div>
 </template>
 
@@ -205,15 +285,29 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
+
+import fabricTransferQuantityModal from '@views/reportForms/cost-allocation-table/fabricTransferQuantityModal.vue'
+import fabricRemainingQuantityModal from '@views/reportForms/cost-allocation-table/fabricRemainingQuantityModal.vue'
+import ingredientsTransferQuantityModal from '@views/reportForms/cost-allocation-table/ingredientsTransferQuantityModal.vue'
+import ingredientsRemainingQuantityModal from '@views/reportForms/cost-allocation-table/ingredientsRemainingQuantityModal.vue'
+
 export default {
-  name: 'Tabs', // 成本分配统计表  中tabs 部分
+  name: 'Tabs', //  成本分配详情 中tabs 部分
   mixins: [JeecgListMixin],
-  components: { JEllipsis, moment },
+  components: {
+    JEllipsis,
+    moment,
+    fabricTransferQuantityModal, // 面料 转入数量
+    fabricRemainingQuantityModal, //  余下数量
+    ingredientsTransferQuantityModal, // 辅料 转入数量
+    ingredientsRemainingQuantityModal // 余下数量
+  },
   data() {
+    // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
     return {
       description: '成本分配统计表',
       totalInfo: {}, // tabs 中合计信息
-      // 面料 表头
+      // one 面料 表头
       fabricColumns: [
         /*
           text     序号一列默认显示的数据
@@ -278,7 +372,7 @@ export default {
         { fabricTransferQuantity: '8987', fabricRemainingQuantity: '67', loss: '1.17%' },
         { fabricTransferQuantity: '6752', fabricRemainingQuantity: '37', loss: '1.17%' }
       ],
-      // 辅料 表头
+      // one 辅料 表头
       ingredientsColumns: [
         {
           title: '序号',
@@ -289,7 +383,7 @@ export default {
           customRender: (text, record, index) => `${index + 1}`,
           className: 'replacecolor'
         },
-        { title: '货物名称', width: 160, dataIndex: 'goodsName', fixed: 'left', className: 'replacecolor' },
+        { title: '货物名称', width: 170, dataIndex: 'goodsName', fixed: 'left', className: 'replacecolor' },
         {
           title: '转入数量',
           dataIndex: 'ingredientsTransferQuantity',
@@ -315,7 +409,7 @@ export default {
         {
           title: '余下数量',
           dataIndex: 'ingredientsRemainingQuantity',
-          width: 100,
+          width: 140,
           className: 'replacecolor',
           customCell: this.ingredientsRemainingQuantityCustomCell,
           scopedSlots: { customRender: 'ingredientsRemainingQuantity' }
@@ -329,13 +423,13 @@ export default {
         {
           title: '人民币金额',
           dataIndex: 'RMBAmount',
-          width: 120,
+          width: 160,
           className: 'replacecolor'
         },
         {
           title: '美元金额',
           dataIndex: 'USDAmount',
-          width: 120,
+          width: 160,
           className: 'replacecolor'
         },
         {
@@ -366,7 +460,7 @@ export default {
       ingredientsData: [
         { ingredientsTransferQuantity: '7899', transferCost: '12536', ingredientsRemainingQuantity: '6698' }
       ],
-      // 发运明细 表头
+      // one 发运明细 表头
       shipDetailsColumns: [
         {
           title: '序号',
@@ -381,7 +475,7 @@ export default {
         {
           title: '出运日期',
           dataIndex: 'outData',
-          width: 120,
+          width: 130,
           className: 'replacecolor',
           customCell: this.ingredientsTransferQuantityCustomCell,
           scopedSlots: { customRender: 'ingredientsTransferQuantity' }
@@ -393,7 +487,7 @@ export default {
           className: 'replacecolor'
         },
 
-        { title: '订单号', dataIndex: 'orderNum', width: 120, className: 'replacecolor' },
+        { title: '订单号', dataIndex: 'orderNum', width: 160, className: 'replacecolor' },
         {
           title: '产品款号',
           dataIndex: 'poStyleNum',
@@ -403,7 +497,7 @@ export default {
         {
           title: '出货数量',
           dataIndex: 'shipQuantity',
-          width: 100,
+          width: 120,
           className: 'replacecolor',
           customCell: this.ingredientsRemainingQuantityCustomCell,
           scopedSlots: { customRender: 'ingredientsRemainingQuantity' }
@@ -446,7 +540,255 @@ export default {
         }
       ],
       shipDetailsData: [{ invoiceNum: '19TW-PRU-138S', outData: '2019-10-16', exchangeRate: '7.1338' }],
+      // two 面料 表头
+      twofabricColumns: [
+        {
+          title: '序号',
+          width: 90,
+          dataIndex: 'index',
+          key: 'index',
+          customRender: (text, record, index) => `${index + 1}`,
+          className: 'replacecolor'
+        },
+        { title: '面料', width: 160, dataIndex: 'fabric', className: 'replacecolor' },
+        {
+          title: '单位成本',
+          dataIndex: 'unitCost',
+          width: 120,
+          className: 'replacecolor'
+        },
+        { title: '存货名称', width: 160, dataIndex: 'inventoryName', className: 'replacecolor' },
+
+        {
+          title: '转入数量',
+          dataIndex: 'twofabricTransferQuantity',
+          width: 120,
+          className: 'replacecolor',
+          customCell: this.twoFabricTransferQuantityCustomCell,
+          scopedSlots: { customRender: 'twofabricTransferQuantity' }
+        },
+        { title: '转入成本', width: 160, dataIndex: 'transferCost', className: 'replacecolor' },
+
+        { title: '单耗/件', dataIndex: 'unitConsumption', width: 120, className: 'replacecolor' },
+        { title: '使用数量', dataIndex: 'usageQuantity', width: 120, className: 'replacecolor' },
+        { title: '计划数量', dataIndex: 'planQuantity', width: 120, className: 'replacecolor' },
+        {
+          title: '购入数量',
+          dataIndex: 'purchaseQuantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '余下数量',
+          dataIndex: 'twofabricRemainingQuantity',
+          width: 100,
+          className: 'replacecolor',
+          customCell: this.twofabricRemainingQuantityCustomCell,
+          scopedSlots: { customRender: 'twofabricRemainingQuantity' }
+        },
+        {
+          title: '损耗',
+          dataIndex: 'loss',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '余下数量的成本',
+          dataIndex: 'remainingQuantityCost',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      twofabricData: [
+        {
+          fabric: '裤绳',
+          inventoryName: 'XXSS',
+          twofabricTransferQuantity: '8987',
+          twofabricRemainingQuantity: '67',
+          loss: '1.17%'
+        },
+        {
+          fabric: '裤绳',
+          inventoryName: 'XXSS',
+          twofabricTransferQuantity: '6752',
+          twofabricRemainingQuantity: '37',
+          loss: '1.17%'
+        }
+      ],
+      // two 辅料 表头
+      twoingredientsColumns: [
+        {
+          title: '序号',
+          width: 90,
+          dataIndex: 'index',
+          key: 'index',
+          fixed: 'left',
+          customRender: (text, record, index) => `${index + 1}`,
+          className: 'replacecolor'
+        },
+        { title: '辅料', width: 170, dataIndex: 'ingredients', fixed: 'left', className: 'replacecolor' },
+        {
+          title: '转入数量',
+          dataIndex: 'twoingredientsTransferQuantity',
+          width: 120,
+          className: 'replacecolor',
+          customCell: this.twoingredientsTransferQuantityCustomCell,
+          scopedSlots: { customRender: 'twoingredientsTransferQuantity' }
+        },
+        {
+          title: '转入成本',
+          dataIndex: 'transferCost',
+          width: 120,
+          className: 'replacecolor'
+        },
 
+        { title: '使用数量', dataIndex: 'usageQuantity', width: 120, className: 'replacecolor' },
+        {
+          title: '购入数量',
+          dataIndex: 'purchaseQuantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '余下数量',
+          dataIndex: 'twoingredientsRemainingQuantity',
+          width: 140,
+          className: 'replacecolor',
+          customCell: this.twoingredientsRemainingQuantityCustomCell,
+          scopedSlots: { customRender: 'twoingredientsRemainingQuantity' }
+        },
+        {
+          title: '损耗',
+          dataIndex: 'loss',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '人民币金额',
+          dataIndex: 'RMBAmount',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '美元金额',
+          dataIndex: 'USDAmount',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '不含税金额',
+          dataIndex: 'priceExcludingTax',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '转出率',
+          dataIndex: 'transferOutRate',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '进项税转出',
+          dataIndex: 'inputTaxTransferOut',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '用量',
+          dataIndex: 'dosage',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      twoingredientsData: [
+        {
+          twoingredientsTransferQuantity: '7899',
+          transferCost: '12536',
+          twoingredientsRemainingQuantity: '6698'
+        }
+      ],
+      // two 发运明细 表头
+      twoshipDetailsColumns: [
+        {
+          title: '序号',
+          width: 90,
+          dataIndex: 'index',
+          key: 'index',
+          fixed: 'left',
+          customRender: (text, record, index) => `${index + 1}`,
+          className: 'replacecolor'
+        },
+        { title: '发票号码', width: 180, dataIndex: 'invoiceNum', fixed: 'left', className: 'replacecolor' },
+        {
+          title: '出运日期',
+          dataIndex: 'outData',
+          width: 130,
+          className: 'replacecolor',
+          customCell: this.ingredientsTransferQuantityCustomCell,
+          scopedSlots: { customRender: 'ingredientsTransferQuantity' }
+        },
+        {
+          title: '汇率',
+          dataIndex: 'exchangeRate',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        { title: '订单号', dataIndex: 'orderNum', width: 160, className: 'replacecolor' },
+        {
+          title: '产品款号',
+          dataIndex: 'poStyleNum',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '出货数量',
+          dataIndex: 'shipQuantity',
+          width: 120,
+          className: 'replacecolor',
+          customCell: this.ingredientsRemainingQuantityCustomCell,
+          scopedSlots: { customRender: 'ingredientsRemainingQuantity' }
+        },
+        {
+          title: '外销单价',
+          dataIndex: 'loss',
+          width: 120,
+          className: 'exportUnitPrice'
+        },
+        {
+          title: '外销总价',
+          dataIndex: 'exportPrice',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '人民币金额',
+          dataIndex: 'RMBAmount',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '加工单价（人民币）',
+          dataIndex: 'procesUnitPriceRMB',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '加工单价（美元）',
+          dataIndex: 'procesUnitPriceUSD',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '加工费',
+          dataIndex: 'processCost',
+          width: 160,
+          className: 'replacecolor'
+        }
+      ],
+      twoshipDetailsData: [
+        { invoiceNum: '19TW-PRU-138S', outData: '2019-11-16', exchangeRate: '7.1338', RMBAmount: '160689.83' }
+      ]
     }
   },
   created() {
@@ -457,15 +799,98 @@ export default {
     tabsCallback(key) {
       console.log(key)
     },
-    // 面料-转入数量 弹框
-    fabricTransferQuantityCustomCell() {},
-    // 面料-余下数量 弹框
-    fabricRemainingQuantityCustomCell() {},
+    // --------------------------------------------------------
+    // 面料 -转入数量 弹框
+    fabricTransferQuantityCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            console.log('点击单元格-面料-转入数量')
+            this.$refs.fabricTransferQuantityModal.fabricTransferQuantityModVis = true
+          }
+        }
+      }
+    },
+    // 面料 -余下数量 弹框
+    fabricRemainingQuantityCustomCell() {
+      return {
+        on: {
+          click: event => {
+            console.log('点击单元格-面料-余下数量')
+            this.$refs.fabricRemainingQuantityModal.fabricRemainingQuantityModVis = true
+          }
+        }
+      }
+    },
 
     // 辅料-转入数量 弹框
-    ingredientsTransferQuantityCustomCell() {},
+    ingredientsTransferQuantityCustomCell() {
+      return {
+        on: {
+          click: event => {
+            console.log('点击单元格-辅料-转入数量')
+            this.$refs.ingredientsTransferQuantityModal.ingredientsTransferQuantityModVis = true
+          }
+        }
+      }
+    },
     // 辅料-余下数量 弹框
-    ingredientsRemainingQuantityCustomCell() {},
+    ingredientsRemainingQuantityCustomCell() {
+      return {
+        on: {
+          click: event => {
+            console.log('点击单元格-辅料-余下数量')
+            this.$refs.ingredientsRemainingQuantityModal.ingredientsRemainingQuantityModVis = true
+          }
+        }
+      }
+    },
+    // ---------------------------
+    //  加工单位2 面料 -转入数量 弹框
+    twoFabricTransferQuantityCustomCell() {
+      return {
+        on: {
+          click: event => {
+            console.log('点击单元格-加工单位2 面料-转入数量')
+            this.$refs.fabricTransferQuantityModal.fabricTransferQuantityModVis = true
+          }
+        }
+      }
+    },
+
+    //  加工单位2 面料 -余下数量 弹框
+    twofabricRemainingQuantityCustomCell() {
+      return {
+        on: {
+          click: event => {
+            console.log('点击单元格-辅料-余下数量')
+            this.$refs.fabricRemainingQuantityModal.fabricRemainingQuantityModVis = true
+          }
+        }
+      }
+    },
+    // 加工单位2 辅料-转入数量 弹框
+    twoingredientsTransferQuantityCustomCell() {
+      return {
+        on: {
+          click: event => {
+            console.log('点击单元格-辅料-转入数量')
+            this.$refs.ingredientsTransferQuantityModal.ingredientsTransferQuantityModVis = true
+          }
+        }
+      }
+    },
+    // 加工单位2 辅料-余下数量 弹框
+    twoingredientsRemainingQuantityCustomCell() {
+      return {
+        on: {
+          click: event => {
+            console.log('点击单元格-辅料-余下数量')
+            this.$refs.ingredientsRemainingQuantityModal.ingredientsRemainingQuantityModVis = true
+          }
+        }
+      }
+    },
 
     // 事故单 单号 弹框
     accidentListCustomCell(record) {
@@ -477,7 +902,12 @@ export default {
           }
         }
       }
-    }
+    },
+
+    // -弹框接收父组件方法---------------------------------------
+    aa() {},
+    bb() {},
+    cc() {}
   }
 }
 </script>
@@ -498,15 +928,11 @@ export default {
 //   background-color: #ccc;
 // }
 
-//小标签
+//tbas内 小标签
 .table-title {
   font-weight: 700;
 }
 
-// 合计信息  盒子
-.totalBox {
-}
-
 /deep/ .ant-tabs-nav .ant-tabs-tab-active {
   font-size: 18px;
 }

src/views/reportForms/fabric-loss-table.vue

@@ -627,7 +627,7 @@ export default {
         { title: ' 支出本币金额', dataIndex: 'disbursedLocalMoney', width: 120, className: 'replacecolor' },
         { title: '支出原币金额', dataIndex: 'disbursedOriginalMoney', width: 120, className: 'replacecolor' },
         { title: '发票号', dataIndex: 'invoiceNum', width: 120, className: 'replacecolor' },
-        { title: '制单人preparedBy', width: 120, className: 'replacecolor' }
+        { title: '制单人', dataIndex: 'preparedBy', width: 120, className: 'replacecolor' }
       ],
       costPayData: [{}],
 

src/views/shipment-details/shipmentList.vue

@@ -92,7 +92,7 @@
       <a-row>
         <a-table
           bordered
-          rowKey="id"
+          :row-key="record => record.id"
           :columns="shipmentListColumns"
           :data-source="shipmentListData"
           :loading="loading"
@@ -468,7 +468,6 @@ export default {
     // this.getShipmentList() // 发运明细列表
   },
   methods: {
-
     // --------------------------------------
     // 开始时间
     startTimeChange() {},