报表-生产进度报表-子表采购、委外滚动展示数据 || table中数据较长的字段左对齐展示

src/views/reportForms/pro-progress-report.vue

@@ -160,7 +160,7 @@ export default {
         },
         { title: '业务员', width: 90, fixed: 'left', dataIndex: 'cpersonName', className: 'replacecolor' },
 
-        { title: '计划单号', width: 280, dataIndex: 'planCode', className: 'replacecolor' },
+        { title: '计划单号', width: 280, dataIndex: 'planCode', align: 'left', className: 'replacecolor' },
         {
           title: '成衣加工厂',
           width: 220,
@@ -172,11 +172,19 @@ export default {
           title: '物料名称',
           width: 320,
           dataIndex: 'cinvName',
+          align: 'left',
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        },
+        { title: '款号', width: 160, dataIndex: 'itemNumber', align: 'left', className: 'replacecolor' },
+        {
+          title: '颜色',
+          width: 220,
+          dataIndex: 'color',
+          align: 'left',
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
-        { title: '款号', width: 160, dataIndex: 'itemNumber', className: 'replacecolor' },
-        { title: '颜色', width: 220, dataIndex: 'color', customRender: t => ellipsis(t), className: 'replacecolor' },
         // {
         //   title: '创建时间',
         //   dataIndex: 'createTime',

src/views/reportForms/pro-progress-report/salesOrderDetailsDrawer.vue

@@ -115,7 +115,7 @@
         </div>
       </a-card>
 
-      <!-- 展示 子表 采购 -->
+      <!--采购   :pagination="false"-->
       <a-card :bordered="true" style="margin:10px 0;">
         <div style="marginTop:30px;">
           <h6 class="table-title">采购</h6>
@@ -125,8 +125,7 @@
             :loading="loading"
             :columns="CaiGouColumns"
             :data-source="CaiGouData"
-            :pagination="false"
-            :scroll="{ x: 1500 }"
+            :scroll="{ x: 1500, y: 300 }"
           >
             <!-- 物料编码 -->
             <span slot="cinvCode" slot-scope="text">
@@ -135,7 +134,7 @@
           </a-table>
         </div>
 
-        <!-- 委外 -->
+        <!-- 委外  :pagination="false" -->
         <div style="margin:60px 0;">
           <h6 class="table-title">委外</h6>
           <a-table
@@ -144,8 +143,7 @@
             :loading="loading"
             :columns="weiwaiColumns"
             :data-source="weiwaiData"
-            :pagination="false"
-            :scroll="{ x: 1500 }"
+            :scroll="{ x: 1500, y: 300 }"
           >
             <!-- 物料编码 弹框-->
             <span slot="cinvCode" slot-scope="text">
@@ -275,13 +273,13 @@ export default {
         { title: '供应商', width: 240, dataIndex: 'cvenName', align: 'left', className: 'replacecolor' },
         { title: '单价(本币)', width: 140, dataIndex: 'inatUnitPrice', className: 'replacecolor' },
         { title: '物料名称', width: 260, dataIndex: 'cinvName', align: 'left', className: 'replacecolor' },
-        { title: '计划数量(LRP)', width: 160, dataIndex: 'iquantityLrp', className: 'replacecolor' },
-        { title: '订单数量', width: 180, dataIndex: 'iquantity', className: 'replacecolor' },
-        { title: '累计入库数量', width: 140, dataIndex: 'ireceivedQTY', className: 'replacecolor' },
-        { title: '累计开票数量', width: 140, dataIndex: 'iinvQTY', className: 'replacecolor' },
-        { title: '累计开票金额', width: 140, dataIndex: 'iinvMoney', className: 'replacecolor' },
+        { title: '计划数量(LRP)', width: 120, dataIndex: 'iquantityLrp', className: 'replacecolor' },
+        { title: '订单数量', width: 120, dataIndex: 'iquantity', className: 'replacecolor' },
+        { title: '累计入库数量', width: 120, dataIndex: 'ireceivedQTY', className: 'replacecolor' },
+        { title: '累计开票数量', width: 120, dataIndex: 'iinvQTY', className: 'replacecolor' },
+        { title: '累计开票金额', width: 120, dataIndex: 'iinvMoney', className: 'replacecolor' },
         { title: '下游订单', width: 160, dataIndex: 'csocode', className: 'replacecolor' },
-        { title: '使用数量', width: 140, dataIndex: 'useQTY', className: 'replacecolor' },
+        { title: '使用数量', width: 120, dataIndex: 'useQTY', className: 'replacecolor' },
         { title: '余料', width: 100, dataIndex: 'surplusQty', fixed: 'right', className: 'replacecolor' }
       ],
       CaiGouData: [],
@@ -290,7 +288,7 @@ export default {
       weiwaiColumns: [
         {
           title: '委外订单号',
-          width: 140,
+          width: 220,
           dataIndex: 'ccode',
           fixed: 'left',
           className: 'replacecolor'
@@ -310,20 +308,20 @@ export default {
         { title: '门幅', width: 120, dataIndex: 'cfree4', className: 'replacecolor' },
         { title: '单价(本币)', width: 140, dataIndex: 'inatUnitPrice', className: 'replacecolor' },
         { title: '单价(原币)', width: 140, dataIndex: 'iunitPrice', className: 'replacecolor' },
-        { title: '计划数量(LRP)', width: 160, dataIndex: 'iquantityLrp', className: 'replacecolor' },
-        { title: '订单数量', width: 160, dataIndex: 'iquantity', className: 'replacecolor' },
-        { title: '累计入库数量', width: 140, dataIndex: 'ireceivedQTY', className: 'replacecolor' },
-        { title: '累计开票数量', width: 140, dataIndex: 'iinvQTY', className: 'replacecolor' },
-        { title: '累计开票金额', width: 140, dataIndex: 'iinvMoney', className: 'replacecolor' },
-        { title: '下游订单', width: 160, dataIndex: 'csocode', className: 'replacecolor' },
-        { title: '使用数量', width: 140, dataIndex: 'imaterialSendQty', className: 'replacecolor' },
+        { title: '计划数量(LRP)', width: 120, dataIndex: 'iquantityLrp', className: 'replacecolor' },
+        { title: '订单数量', width: 120, dataIndex: 'iquantity', className: 'replacecolor' },
+        { title: '累计入库数量', width: 120, dataIndex: 'ireceivedQTY', className: 'replacecolor' },
+        { title: '累计开票数量', width: 120, dataIndex: 'iinvQTY', className: 'replacecolor' },
+        { title: '累计开票金额', width: 120, dataIndex: 'iinvMoney', className: 'replacecolor' },
+        { title: '下游订单', width: 180, dataIndex: 'csocode', className: 'replacecolor' },
+        { title: '使用数量', width: 120, dataIndex: 'imaterialSendQty', className: 'replacecolor' },
 
         { title: '余下库存(余料)', width: 140, dataIndex: 'surplusQty', className: 'replacecolor' },
         { title: '子件编号', width: 140, dataIndex: 'cinvCodeZi', className: 'replacecolor' },
-        { title: '子件名称', width: 320, dataIndex: 'cinvNameZi', align: 'left', className: 'replacecolor' },
-        { title: '子件应领数量', width: 140, dataIndex: 'iquantityZi', className: 'replacecolor' },
-        { title: '子件已领数量', width: 140, dataIndex: 'isendQTY', className: 'replacecolor' },
-        { title: '子件总成本', width: 140, dataIndex: 'costZi', className: 'replacecolor' },
+        { title: '子件名称', width: 380, dataIndex: 'cinvNameZi', align: 'left', className: 'replacecolor' },
+        { title: '子件应领数量', width: 120, dataIndex: 'iquantityZi', className: 'replacecolor' },
+        { title: '子件已领数量', width: 120, dataIndex: 'isendQTY', className: 'replacecolor' },
+        { title: '子件总成本', width: 120, dataIndex: 'costZi', className: 'replacecolor' },
         { title: '采购订单号', width: 160, dataIndex: 'purchaseCode', fixed: 'right', className: 'replacecolor' }
       ],
       weiwaiData: [],

src/views/shipment-details/addShipDetDrawer.vue

@@ -348,7 +348,7 @@ export default {
         {
           title: '订单主表ID',
           dataIndex: 'syOrderDataId',
-          width: 80,
+          width: 100,
           className: 'replacecolor'
         },
         {
@@ -451,7 +451,7 @@ export default {
         {
           title: '客户名称',
           dataIndex: 'customerName',
-          width: 120,
+          width: 220,
           className: 'replacecolor'
         },
         {
@@ -791,6 +791,6 @@ export default {
 
 // 子表下拉显示
 /deep/ .ant-card-body {
-  margin-bottom: 10px;
+  margin-bottom: 60px;
 }
 </style>

src/views/shipment-details/editShipDetDrawer.vue

@@ -132,11 +132,11 @@
                 </a-form-model-item>
               </a-col>
 
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="报关单价" prop="customsDeclarationUnitPrice">
-                  <a-input placeholder="请输入报关单价" v-model="editShipDet.customsDeclarationUnitPrice"></a-input>
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="整单合计" prop="wholeOrderTotal">
+                  <a-input placeholder="请输入整单合计" v-model="editShipDet.wholeOrderTotal"></a-input>
                 </a-form-model-item>
-              </a-col> -->
+              </a-col>
 
               <a-col :md="18" :sm="18">
                 <a-form-model-item label="备注" prop="memo">