装箱单成衣参照页面修改

src/views/packing-list/packinglist-clothes/referencePrePacklist.vue

@@ -14,128 +14,67 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
-           <a-col :md="6" :sm="8">
-                <a-form-model-item label="订单号" prop="orderNum">
-                  {{clothesAdd.orderNum}}
-                  <!-- <a-input placeholder="请输入订单号" v-model="clothesAdd.orderNum" readOnly></a-input> -->
-                </a-form-model-item>
+            <a-col :md="6" :sm="8">
+                <a-form-item label="客户简称">
+                  <a-input placeholder="请输入客户简称" v-model="queryParam.customerAbbreviation"></a-input>
+                </a-form-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="款号" prop="styleNum">
-                  {{clothesAdd.styleNum}}
-                  <!-- <a-input placeholder="请输入款号" v-model="clothesAdd.styleNum" readOnly></a-input> -->
-                </a-form-model-item>
+               <a-col :md="6" :sm="8">
+               <a-form-item label="预发货日期">
+                 <a-range-picker
+                  :placeholder="['开始时间', '结束时间']"
+                  format="YYYY-MM-DD"
+                  style="width: 100%"
+                  v-model="preDeliveryDate"
+                  @change="onDateChange"
+                />
+               </a-form-item>
               </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-item label="小PO">
+                <a-input placeholder="请输入小PO" v-model="queryParam.smallPo"></a-input>
+              </a-form-item>
+            </a-col>
+            <template v-if="toggleSearchStatus">
+               <!-- <a-col :md="6" :sm="8">
+              <a-form-item label="分销点">
+                <a-input placeholder="请输入分销点" v-model="queryParam.distributionPoint"></a-input>
+              </a-form-item>
+            </a-col> -->
+            <a-col :md="6" :sm="8">
+              <a-form-item label="款号">
+                <a-input placeholder="请输入款号" v-model="queryParam.itemNumber"></a-input>
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :md="6" :sm="8">
+              <a-form-item label="是否被参照">
+                 <a-select v-model="queryParam.isReference" style="width: 200px" placeholder="请选择发货情况" >
+                 <a-select-option value="n">未被参照</a-select-option>
+                 <a-select-option value="y">已被参照</a-select-option>
+               </a-select>
+              </a-form-item>
+            </a-col> -->
+            <a-col :md="6" :sm="8">
+              <a-form-item label="发货情况">
+                 <a-select v-model="queryParam.orderStatus" style="width: 200px" placeholder="请选择发货情况" >
+                 <a-select-option value="n">超发</a-select-option>
+                 <a-select-option value="y">正常</a-select-option>
+               </a-select>
+              </a-form-item>
+            </a-col>
+            </template>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="中文品名" prop="name">
-                  {{clothesAdd.name}}
-                  <!-- <a-input placeholder="请输入中文品名" v-model="clothesAdd.name"></a-input> -->
-                </a-form-model-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="英文品名" prop="englishProductName">
-                  {{clothesAdd.englishProductName}}
-                  <!-- <a-input placeholder="请输入英文品名" v-model="clothesAdd.englishProductName"></a-input> -->
-                </a-form-model-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="尺码范围" prop="sizeRange">
-                  {{clothesAdd.sizeRange}}
-                  <!-- <a-input placeholder="请输入尺码范围" v-model="clothesAdd.sizeRange" readOnly></a-input> -->
-                  <!-- <a-select placeholder="请选择尺码范围">
-                <a-select-option value="">请选择</a-select-option>
-                <a-select-option value="0">客户1</a-select-option>
-                <a-select-option value="1">客户2</a-select-option>
-                <a-select-option value="2">客户3</a-select-option>
-              </a-select> -->
-                </a-form-model-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="客户" prop="customer" :title="clothesAdd.customer">
-                  {{clothesAdd.customer | ellipsis}}
-                  <!-- <a-input placeholder="请输入客户" v-model="clothesAdd.customer" ></a-input> -->
-                </a-form-model-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="集装箱代号" prop="containerCode">
-                  {{clothesAdd.containerCode}}
-                  <!-- <a-input placeholder="请输入集装箱代号" v-model="clothesAdd.containerCode" readOnly></a-input> -->
-                </a-form-model-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="集装箱号" prop="containerNo">
-                  {{clothesAdd.containerNo}}
-                  <!-- <a-input placeholder="请输入集装箱号" v-model="clothesAdd.containerNo" readOnly></a-input> -->
-                </a-form-model-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="备注" prop="note">
-                  {{clothesAdd.note}}
-                </a-form-model-item>
-              </a-col>
-
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="成衣工厂" prop="clothesFactory">
-                  <a-input placeholder="请输入成衣工厂" v-model="clothesAdd.clothesFactory"></a-input>
-                </a-form-model-item>
-              </a-col> -->
-
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="外销发票号" prop="exportInvoiceNo">
-                  {{clothesAdd.exportInvoiceNo}}
-                  <!-- <a-input placeholder="请输入外销发票号" v-model="clothesAdd.exportInvoiceNo"></a-input> -->
-                </a-form-model-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="托书号" prop="bookNum">
-                  {{clothesAdd.shippingOrderNumber}}
-                  <!-- <a-input placeholder="请输入托书号" v-model="clothesAdd.bookNum" readOnly></a-input> -->
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="总箱数" prop="totalBoxes">
-                  {{clothesAdd.totalBoxes}}
-                  <!-- <a-input placeholder="请输入总箱数" v-model="clothesAdd.totalBoxes" readOnly></a-input> -->
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="总毛重" prop="totalGrossWeight">
-                  {{clothesAdd.totalGrossWeight}}
-                  <!-- <a-input placeholder="请输入总毛重" v-model="clothesAdd.totalGrossWeight" readOnly></a-input> -->
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="总净重" prop="totalNetWeight">
-                  {{clothesAdd.totalNetWeight}}
-                  <!-- <a-input placeholder="请输入总净重" v-model="clothesAdd.totalNetWeight" readOnly></a-input> -->
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="总体积" prop="totalVolume">
-                  {{clothesAdd.totalVolume}}
-                  <!-- <a-input placeholder="请输入总体积" v-model="clothesAdd.totalVolume" readOnly></a-input> -->
-                </a-form-model-item>
-              </a-col>
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="总价" prop="totalPrice">
-                  <a-input placeholder="请输入总价" v-model="clothesAdd.totalPrice"></a-input>
-                </a-form-model-item>
-              </a-col> -->
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="总件数" prop="total">
-                  {{clothesAdd.total}}
-                  <!-- <a-input placeholder="请输入总件数" v-model="clothesAdd.total" readOnly></a-input> -->
-                </a-form-model-item>
-              </a-col>
+            <a-col :md="6" :sm="8">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                <a @click="handleToggleSearch" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+                </a>
+              </span>
+            </a-col>
           </a-row>
         </a-form>
       </div>
@@ -191,188 +130,179 @@ export default {
       loading: false, // 表格加载
       // 表头
       advancePackingListColumns: [
-          {
-          title: '账套',
-          key: 'acSetNo',
-          width: 160,
-          // fixed: 'left',
-           type: JVXETypes.normal,
-        },
         {
-          title: '成衣工厂',
-          key: 'garmentFactory',
+          title: '款号',
+          dataIndex: 'itemNumber',
           width: 120,
-          // fixed: 'left',
-           type: JVXETypes.normal,
+          ellipsis: true,
+          fixed: 'left',
+          className: 'replacecolor'
         },
         {
-          title: 'HOD',
-          key: 'hod',
+          title: '客户简称',
+          dataIndex: 'customerAbbreviation',
           width: 120,
-          type: JVXETypes.normal,
+          fixed: 'left',
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
         },
         {
-          title: 'STYLE NO.',
-          key: 'styleNo',
+          title: '预发货日期',
+          dataIndex: 'preDeliveryDate',
           width: 120,
-          type: JVXETypes.normal,
-        },
-        {
-          title: 'PO NO.',
-          key: 'poNo',
-          width: 90,
-           type: JVXETypes.normal,
-        },
-
-        {
-          title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
-          key: 'itemCode',
-          width: 340,
-          type: JVXETypes.normal,
-        },
-         {
-          title: 'PREPACK SKU',
-          key: 'prepackSku',
-          width: 200,
-          type: JVXETypes.normal,
-        },
-        {
-          title: '分销点/DC/LABEL',
-          key: 'distributionPoint',
-          width: 200,
-          type: JVXETypes.normal,
-          insertAfter:true,
+          ellipsis: true,
+          className: 'replacecolor'
         },
         {
-          title: '启始箱号',
-          key: 'startingBoxNumber',
-          type: JVXETypes.normal ,
+          title: '小PO',
+          dataIndex: 'smallPo',
           width: 120,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
         },
-
+        //  {
+        //   title: '创建时间',
+        //   dataIndex: 'createTime',
+        //   align: 'center',
+        //   sorter: true,
+        //   customRender: text => {
+        //     return moment(text).format('YYYY-MM-DD')
+        //   }
+        // },
+        
         {
-          title: '结束箱号',
-          key: 'endCaseNumber',
+          title: '分销点',
+          dataIndex: 'distributionPoint',
           width: 120,
-          type: JVXETypes.normal 
+          ellipsis: true,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
         },
 
+       
+        // {
+        //   title: '客户',
+        //   dataIndex: 'customer',
+        //   width: 250,
+        //   customRender: t => ellipsis(t),
+        //   className: 'replacecolor'
+        // },
         {
-          title: '颜色（中英文）',
-          key: 'colour',
-          width: 140,
-         type: JVXETypes.normal,
+          title: '存货名称',
+          dataIndex: 'inventoryName',
+          width: 150,
+          ellipsis: true,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
         },
         {
-          title: '配码',
-          key: 'withCode',
+          title: '颜色',
+          dataIndex: 'colour',
           width: 120,
-         type: JVXETypes.normal,
+          ellipsis: true,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
         },
         {
-          title: '件数/箱',
-          key: 'piecesBox',
-          width: 120,
-          type: JVXETypes.normal 
+          title: '采购/委外订单号',
+          dataIndex: 'spurOrSubOrder',
+          width: 200,
+          ellipsis: true,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
         },
+
+
+        // {
+        //   title: '工厂单价',
+        //   dataIndex: 'factoryUnitPrice',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
+        
         {
           title: '箱数',
-          key: 'boxNumber',
-          width: 120,
-          type: JVXETypes.normal 
+          dataIndex: 'totalBoxes',
+          width: 90,
+          ellipsis: true,
+          className: 'replacecolor'
         },
         {
-          title: '计划尺码数量',
-          key: 'planSize',
-          width: 240,
-          type: JVXETypes.normal ,
+          title: '数量（按合并规则累计）',
+          dataIndex: 'total',
+          width: 200,
+          className: 'replacecolor'
         },
+        // {
+        //   title: '订单类型',
+        //   dataIndex: 'orderType',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
         {
-          title: '计划装箱数量',
-          key: 'planQuantity',
-          width: 240,
-          type: JVXETypes.normal ,
+          title: '集装箱代号',
+          dataIndex: 'containerCode',
+          width: 120,
+          ellipsis: true,
+          className: 'replacecolor'
         },
+
         {
-          title: '总件数',
-          key: 'total',
-          width: 90,
-          type: JVXETypes.normal,
+          title: '集装箱号',
+          dataIndex: 'containerNumber',
+          width: 120,
+          ellipsis: true,
+          className: 'replacecolor'
         },
-        {
-          title: '净重/箱',
-          key: 'netWeight',
+         {
+          title: '预托书号',
+          dataIndex: 'depositaryReceiptNo',
           width: 120,
-          type: JVXETypes.normal 
+          ellipsis: true,
+          className: 'replacecolor'
         },
         {
           title: '总净重',
-          key: 'totalNetWeight',
+          dataIndex: 'totalNetWeight',
           width: 90,
-          type: JVXETypes.normal,
-        },
-        {
-          title: '毛重/箱',
-          key: 'grossWeight',
-          width: 120,
-          type: JVXETypes.normal 
+          ellipsis: true,
+          className: 'replacecolor'
         },
         {
           title: '总毛重',
-          key: 'totalGrossWeight',
+          dataIndex: 'totalGrossWeight',
           width: 90,
-          type: JVXETypes.normal,
-        },
-        {
-          title: '外箱长度',
-          key: 'outerBoxLength',
-          width: 120,
-         type: JVXETypes.normal 
-        },
-        {
-          title: '外箱宽度',
-          key: 'outerBoxWidth',
-          width: 120,
-          type: JVXETypes.normal 
-        },
-        {
-          title: '外箱高度',
-          key: 'outerBoxHeight',
-          width: 120,
-          type: JVXETypes.normal 
+          ellipsis: true,
+          className: 'replacecolor'
         },
+
         {
           title: '总体积',
-          key: 'totalVolume',
-          width: 120,
-          type: JVXETypes.normal,
-        },
-        {
-          title: '净净重',
-          key: 'netWeightToo',
-          width: 120,
-          type: JVXETypes.normal,
+          dataIndex: 'totalVolume',
+          width: 90,
+          ellipsis: true,
+          className: 'replacecolor'
+        }, 
+         {
+          title: '成衣工厂',
+          dataIndex: 'garmentFactory',
+          width: 90,
+          ellipsis: true,
+          className: 'replacecolor'
         },
-        // {
-        //   title: '单价',
-        //   key: 'unitPrice',
-        //   width: 120,
-        //   type: JVXETypes.normal,
-        // },
+         {
+          title: '备注',
+          dataIndex: 'u8Remarks',
+          width: 150,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        }
         // {
         //   title: '总价',
-        //   key: 'totalPrice',
-        //   width: 120,
-        //   type: JVXETypes.normal,
+        //   dataIndex: 'totalPrice',
+        //   width: 90,
+        //   className: 'replacecolor'
         // },
-        {
-          title: '备注',
-          key: 'remarks',
-          width: 140,
-          customRender: t => ellipsis(t),
-          fixed: 'right',
-          type: JVXETypes.normal,
-        },
       ],
       advancePackingListData: [],
        pagination: {
@@ -490,4 +420,4 @@ export default {
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }
-</style>
+</style>