装箱单面辅料详情页调整

src/views/packing-list/fabric-list.vue

@@ -318,7 +318,7 @@ export default {
                exportInvoiceNo:data.exportInvoiceNo,
                shippingOrderNumber:data.shippingOrderNumber,
                remarks:data.remarks,
-                plumbumNo:data.plumbumNo,
+               plumbumNo:data.plumbumNo,
 
              }
              if(record.documentNo.substr(0, 2) == "FL"){  

src/views/packing-list/packinglist-fabrics/addFabricDrawer.vue

@@ -83,6 +83,11 @@
                   <a-input placeholder="请输入托书号" v-model="addFabric.shippingOrderNumber"></a-input>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="备注" prop="remarks">
+                  <a-input placeholder="请输入备注" v-model="addFabric.remarks"></a-input>
+                </a-form-model-item>
+              </a-col>
 
            
             </a-row>
@@ -116,6 +121,12 @@
                 <a-divider type="vertical"/> 
                 <a href="javascript:void(0);" @click="copy(record)">复制</a>
               </span>
+                <!-- 备注 -->
+              <template slot="remarks2" slot-scope="text, record, index">
+                <a-form-model-item prop="remarks2">
+                  <a-input style="width:100%" type="text" v-model="record.remarks2" />
+                </a-form-model-item>
+              </template>
               
               <!-- 缸号 -->
                <template slot="dyelotNumber" slot-scope="text, record, index">
@@ -259,7 +270,8 @@
                 <a-form-model-item prop="actualDeclaredQuantity">
                   <a-input style="width:100%" type="text" v-model="record.actualDeclaredQuantity" @change="actualDeclaredQuantityChange(record)"/>
                 </a-form-model-item>
-              </template>
+              </template> 
+            
 
             </a-table>
           </a-form-model>
@@ -553,8 +565,8 @@ export default {
           title: '备注(U8)',
           dataIndex: 'remarks2',
           width: 160,
-          fixed: 'right',
-          customRender: t => ellipsis(t),
+          // fixed: 'right',
+          scopedSlots: { customRender: 'remarks2' },          
           className: 'replacecolor'
         },
 

src/views/packing-list/packinglist-fabrics/detailsFabricDrawer.vue

@@ -1,71 +1,74 @@
 <template>
   <!-- 新增面料 装箱单  -->
   <div id="addFabricDrawer">
-    <a-drawer title="新增面料" width="89%" placement="right" :closable="true" :visible="visible" @close="handleCancel">
+    <a-drawer title="详情" width="89%" placement="right" :closable="true" :visible="visible" @close="handleCancel">
       <!-- 主表信息 填写-->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
-          <a-form-model layout="inline" ref="form" :model="addFabric" :rules="validatorRules">
+           <a-form-model layout="inline" ref="form" :model="addFabric" :rules="validatorRules">
             <a-row :gutter="24">
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="单号" prop="oddNum">
-                {{ addFabric.documentNo}}
+                  {{addFabric.documentNo}}
+                  <!-- <a-input placeholder="自动生成" v-model="addFabric.documentNo"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="集装箱号" prop="styleNum">
-                  {{addFabric.containerNumber}}
-                </a-form-model-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="装柜日期" prop="loadingDate">
-                 {{addFabric.latestDateOfShipment}}
-                </a-form-model-item>
-              </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="成衣工厂" prop="clothesFactory">
-                  {{addFabric.garmentFactory}}
+                <a-form-model-item label="集装箱号" prop="containerNumber">
+                 {{addFabric.containerNumber}}
+                  <!-- <a-input placeholder="请输入集装箱号" v-model="addFabric.containerNumber"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="发票号" prop="invoiceNum">
-                 {{addFabric.invoiceNo}}
+                 <a-col :md="6" :sm="8">
+                <a-form-model-item label="铅分号" prop="plumbumNo">
+                  {{addFabric.plumbumNo}}
+                  <!-- <a-input placeholder="请输入铅分号" v-model="addFabric.plumbumNo"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="制单人" prop="preparedBy">
-                  {{addFabric.preparedBy}}
+                <a-form-model-item label="装柜日期" prop="latestDateOfShipment">
+                  {{addFabric.latestDateOfShipment}}
+                  <!-- <a-date-picker
+                    placeholder="请选择装柜日期"
+                    :format="dateFormat"
+                    style="width: 100%"
+                    v-model="addFabric.latestDateOfShipment"
+                  /> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="制单日期" prop="preparedDate">
-                 {{addFabric.preparedDate}}
+                <a-form-model-item label="成衣工厂" prop="garmentFactory">
+                  {{addFabric.garmentFactory}}
+                  <!-- <a-input placeholder="勾选数据自动生成" v-model="addFabric.garmentFactory"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="外销发票号" prop="exportInvoiceNo">
-                 {{addFabric.exportInvoiceNo}}
+                  {{addFabric.exportInvoiceNo}}
+                  <!-- <a-input placeholder="请输入外销发票号" v-model="addFabric.exportInvoiceNo"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="托书号" prop="bookNum">
+                <a-form-model-item label="托书号" prop="shippingOrderNumber">
                   {{addFabric.shippingOrderNumber}}
+                  <!-- <a-input placeholder="请输入托书号" v-model="addFabric.shippingOrderNumber"></a-input> -->
                 </a-form-model-item>
               </a-col>
-
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="备注" prop="note">
+                <a-form-model-item label="备注" prop="remarks">
                   {{addFabric.remarks}}
+                  <!-- <a-input placeholder="请输入备注" v-model="addFabric.remarks"></a-input> -->
                 </a-form-model-item>
               </a-col>
+
+           
             </a-row>
           </a-form-model>
         </div>
@@ -149,6 +152,7 @@ export default {
         {
           title: '缸号/Batch no.',
           dataIndex: 'dyelotNumber',
+          // scopedSlots: { customRender: 'dyelotNumber' },
           width: 120,
           className: 'replacecolor'
         },
@@ -182,6 +186,7 @@ export default {
         {
           title: '成分/Composition',
           dataIndex: 'composition',
+          // scopedSlots: { customRender: 'composition' },
           width: 150,
           className: 'replacecolor'
         },
@@ -189,23 +194,27 @@ export default {
         {
           title: '门幅/Width',
           dataIndex: 'width',
+          // scopedSlots: { customRender: 'width' },
           width: 140,
           className: 'replacecolor'
         },
         {
           title: '匹数/Rolls',
           dataIndex: 'rolls',
+          // scopedSlots: { customRender: 'rolls' },
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '毛重/GW/kg',
           dataIndex: 'grossWeight',
+          // scopedSlots: { customRender: 'grossWeight' },
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '净重/NW/kg',
+          // scopedSlots: { customRender: 'netWeight' },
           dataIndex: 'netWeight',
           width: 120,
           className: 'replacecolor'
@@ -214,12 +223,14 @@ export default {
         {
           title: '染后重',
           dataIndex: 'afterHeavy',
+          // scopedSlots: { customRender: 'afterHeavy' },
           width: 90,
           className: 'replacecolor'
         },
         {
           title: '拷布重',
           dataIndex: 'kaoClothWeight',
+          // scopedSlots: { customRender: 'kaoClothWeight' },
           width: 120,
           className: 'replacecolor'
         },
@@ -265,17 +276,20 @@ export default {
         {
           title: '供应商(印厂)',
           dataIndex: 'supplierPrintingPlant',
+          // scopedSlots: { customRender: 'supplierPrintingPlant' },
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '包装方式',
           dataIndex: 'mannerOfPacking ',
+          // scopedSlots: { customRender: 'mannerOfPacking' },
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '处理方式',
+          // scopedSlots: { customRender: 'treatmentMethod' },
           dataIndex: 'treatmentMethod',
           width: 120,
           className: 'replacecolor'
@@ -283,42 +297,32 @@ export default {
         {
           title: '是否手册纱',
           dataIndex: 'manualYarnFlag',
+          // scopedSlots: { customRender: 'manualYarnFlag' },
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '手册纱单价',
           dataIndex: 'manualYarnUnitPrice',
+          // scopedSlots: { customRender: 'manualYarnUnitPrice' },
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '手册纱占比%',
           dataIndex: 'manualYarnProportion',
+          // scopedSlots: { customRender: 'manualYarnProportion' },
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '柜号',
           dataIndex: 'containerNumber',
+          // scopedSlots: { customRender: 'containerNumber' },
           width: 120,
           className: 'replacecolor'
         },
 
-        // {
-        //   title: '备注',
-        //   dataIndex: 'memo',
-        //   width: 160,
-        //   customRender: t => ellipsis(t),
-        //   className: 'replacecolor'
-        // },
-        // {
-        //   title: '入库数量',
-        //   dataIndex: 'inventoryQuantity',
-        //   scopedSlots: { customRender: 'inventoryQuantity' },
-        //   width: 120,
-        //   className: 'replacecolor'
-        // },
         {
           title: '规格型号',
           dataIndex: 'specificationAndModel',
@@ -328,6 +332,7 @@ export default {
         {
           title: '实际报关数量',
           dataIndex: 'actualDeclaredQuantity',
+          // scopedSlots: { customRender: 'actualDeclaredQuantity' },
           width: 120,
           className: 'replacecolor'
         },
@@ -347,8 +352,8 @@ export default {
           title: '备注(U8)',
           dataIndex: 'remarks2',
           width: 160,
-          fixed: 'right',
-           customRender: t => ellipsis(t),
+          // fixed: 'right',
+          // scopedSlots: { customRender: 'remarks2' },          
           className: 'replacecolor'
         },
       ],