Przeglądaj źródła

【预装箱单-成衣】列表、新增、详情、编辑基础页面

liangyan0105 3 lat temu
rodzic
commit
d5a562bf4a

+ 353 - 0
src/views/advance-packingList/adPaList-clothes.vue

@@ -0,0 +1,353 @@
+<template>
+  <!-- 预装箱单-成衣 -->
+  <a-card :bordered="false">
+    <!-- 查询 -->
+    <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-item label="订单号">
+              <!--  -->
+              <a-input placeholder="请输入订单号" v-model="queryParam.orderNum"></a-input>
+            </a-form-item>
+          </a-col>
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="款号">
+              <a-input placeholder="请输入款号" v-model="queryParam.styleNum"></a-input>
+            </a-form-item>
+          </a-col>
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="品名">
+              <a-input placeholder="请输入品名" v-model="queryParam.name"></a-input>
+            </a-form-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>
+
+    <!-- 操作按钮区域 导出 导入 新增-->
+    <div class="table-operator">
+      <a-button type="primary" icon="download" @click="handleExportXls('预装箱单-成衣')">导出</a-button>
+
+      <a-upload
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+
+      <a-button type="primary" @click="addAdpackingDrawer" icon="plus">新增</a-button>
+    </div>
+
+    <!-- table rowKey="id" -->
+    <div>
+      <a-table
+        bordered
+        :columns="adPaListClothesColumns"
+        :data-source="adPaListClothesData"
+        :loading="loading"
+        :pagination="ipagination"
+        :row-key="record => record.id"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        @change="handleTableChange"
+        :scroll="{ x: 1500 }"
+      >
+        <!-- 推送状态 -->
+        <!-- slot-scope="text, record" -->
+        <span slot="pushStateSlot">
+          <!-- v-if="record.isRelease == '0'" -->
+          <a-tag color="#f50">未推送</a-tag>
+          <!-- <a-tag color="#87d068" v-else>已发布</a-tag> -->
+        </span>
+
+        <!-- 单据状态 -->
+        <span slot="documentStateSlot">
+          <a-tag color="#2db7f5">已保存</a-tag>
+        </span>
+
+        <!-- 操作 -->
+        <span slot="operationSlot" slot-scope="text, record">
+          <a @click="derive(record)" style="color:green;">导出</a>
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item><a @click="submit(record)">提交</a></a-menu-item>
+              <a-menu-item><a @click="details(record)">详情</a></a-menu-item>
+              <a-menu-item><a @click="edit(record)">编辑</a></a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record.id)">
+                  <a href="javascript:void(0);" style="color:red;">删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+              <a-menu-item><a @click="copy(record)">复制</a></a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+      </a-table>
+    </div>
+
+    <!-- 抽屉 -->
+    <div>
+      <addAdpacking-drawer ref="addAdpackingDrawer" :father="aa" @ok="modalFormOk"></addAdpacking-drawer>
+      <detailsAdpacking-drawer ref="detailsAdpackingDrawer" :father="bb" @ok="modalFormOk"></detailsAdpacking-drawer>
+      <editAdpacking-drawer ref="editAdpackingDrawer" :father="cc" @ok="modalFormOk"></editAdpacking-drawer>
+    </div>
+  </a-card>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+import moment from 'moment'
+import addAdpackingDrawer from '@views/advance-packingList/addAdpackingDrawer.vue'
+import detailsAdpackingDrawer from '@views/advance-packingList/detailsAdpackingDrawer.vue'
+import editAdpackingDrawer from '@views/advance-packingList/editAdpackingDrawer.vue'
+
+export default {
+  name: 'AdPaListClothes', // 预装线单-成衣
+  mixins: [JeecgListMixin],
+  components: { JEllipsis, moment, addAdpackingDrawer, detailsAdpackingDrawer, editAdpackingDrawer },
+
+  data() {
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+    return {
+      // 表头
+      adPaListClothesColumns: [
+        {
+          title: '款号',
+          dataIndex: 'styleNum',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: '客户简称',
+          dataIndex: 'customerShortName',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        //         {
+        //   title: '创建时间',
+        //   dataIndex: 'createTime',
+        //   align: 'center',
+        //   sorter: true,
+        //   customRender: text => {
+        //     return moment(text).format('YYYY-MM-DD')
+        //   }
+        // },
+        {
+          title: '预发货日期',
+          dataIndex: 'scheduledShipDate',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '小po',
+          dataIndex: 'smallPo',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '分销点',
+          dataIndex: 'distributionPoint',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '存货名称',
+          dataIndex: 'inventoryName',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '颜色',
+          dataIndex: 'color',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '采购/委外订单号',
+          dataIndex: 'purchaseAboardOrderNum',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '订单类型',
+          dataIndex: 'orderType',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '原因',
+          dataIndex: 'reason',
+          width: 120,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        },
+        {
+          title: '推送状态',
+          dataIndex: 'pushState',
+          width: 90,
+          scopedSlots: { customRender: 'pushStateSlot' },
+          fixed: 'right',
+          className: 'replacecolor'
+        },
+
+        {
+          title: '单据状态',
+          dataIndex: 'documentState',
+          width: 90,
+          scopedSlots: { customRender: 'documentStateSlot' },
+          fixed: 'right',
+          className: 'replacecolor'
+        },
+
+        {
+          title: '操作',
+          dataIndex: 'operation',
+          scopedSlots: { customRender: 'operationSlot' },
+          width: 160,
+          fixed: 'right',
+          className: 'replacecolor'
+        }
+      ],
+      adPaListClothesData: [{}, {}, {}, {}],
+      selectedRowKeys: [], // 勾选航
+      loading: false, // 表格加载
+
+      // 查询条件
+      queryParam: {
+        orderNum: '',
+        styleNum: '',
+        name: '' // 品名
+      },
+      url: {
+        // syncUser: '/act/process/extActProcess/doSyncUser',
+        list: '/sys/user/list',
+        // delete: '/sys/user/delete',
+        // deleteBatch: '/sys/user/deleteBatch',
+        exportXlsUrl: '/sys/user/exportXls', // 导出
+        importExcelUrl: 'sys/user/importExcel' // 导入
+      }
+    }
+  },
+  created() {
+    // this.getAdPaListClothes()
+  },
+  methods: {
+    // 第一行导出
+    handleExportXls() {},
+
+    // 新增 预装箱单
+    addAdpackingDrawer() {
+      console.log('新增预装箱单')
+      this.$refs.addAdpackingDrawer.visible = true
+    },
+
+    // 第二行 查询按钮
+    searchQuery() {
+      // this.getAnnList() // 渲染公告
+    },
+    // 重置
+    searchReset() {
+      // console.log('>>>>重置')
+      this.queryParam = {}
+      // this.getAnnList()
+    },
+
+    // 操作 导出
+    derive() {},
+    // 操作 提交
+    submit() {},
+    // 操作 详情
+    details(record) {
+      console.log('详情')
+      console.log('点击的record', record.id)
+      this.$refs.detailsAdpackingDrawer.visible = true
+    },
+
+    // 操作 编辑
+    edit(record) {
+      console.log('编辑')
+      this.$refs.editAdpackingDrawer.visible = true
+    },
+
+    // 操作 删除
+    handleDelete() {},
+
+    // 选中行
+    onSelectChange(keys, rows) {
+      this.selectedRowKeys = keys
+      this.selectedRows = rows
+    },
+    // --------------------------------------
+    aa() {},
+    bb() {},
+    cc() {}
+    // 分页、排序、筛选变化时触发
+    // handleTableChange(pagination, filters, sorter) {
+    //   // console.log('当前页信息>>>>',pagination)
+    //   this.queryParam.pageNo = pagination.current
+    //   // this.getAnnList()
+    // }
+  },
+  computed: {
+    // 导入
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    },
+    // 选中项
+    rowSelection() {
+      return {
+        onChange: (selectedRowKeys, selectedRows) => {
+          console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+        },
+        getCheckboxProps: record => ({
+          props: {
+            disabled: record.title === 'Disabled User',
+            // Column configuration not to be checked
+            title: record.title
+          }
+        })
+      }
+    }
+  },
+  mounted() {}
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+@import '~@assets/less/overwriter.less';
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
+</style>

+ 569 - 0
src/views/advance-packingList/addAdpackingDrawer.vue

@@ -0,0 +1,569 @@
+<template>
+  <!-- 新增 预装箱单-->
+  <a-card :bordered="false">
+    <a-drawer
+      title="新增预装箱单"
+      width="89%"
+      placement="right"
+      :closable="true"
+      :visible="visible"
+      @close="handleCancel"
+    >
+      <!-- 主表信息 填写 -->
+      <div class="table-page-search-wrapper">
+        <a-form-model layout="inline" ref="form" :model="addAdpacking" :rules="validatorRules">
+          <a-row :gutter="24">
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="订单号" prop="orderNum">
+                <a-input placeholder="请输入订单号" v-model="addAdpacking.orderNum"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="款号" prop="styleNum">
+                <a-input placeholder="请输入款号" v-model="addAdpacking.styleNum"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="品名" prop="name">
+                <a-input placeholder="请输入品名" v-model="addAdpacking.name"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="尺码范围" prop="sizeRange">
+                <a-input placeholder="请输入尺码范围" v-model="addAdpacking.sizeRange"></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">
+                <a-input placeholder="请输入客户" v-model="addAdpacking.customer"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="集装箱代号" prop="containerCode">
+                <a-input placeholder="请输入集装箱代号" v-model="addAdpacking.containerCode"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="集装箱号" prop="containerNo">
+                <a-input placeholder="请输入集装箱号" v-model="addAdpacking.containerNo"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="备注" prop="note">
+                <a-input placeholder="请输入备注" v-model="addAdpacking.note"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="成衣工厂" prop="clothesFactory">
+                <a-input placeholder="请输入成衣工厂" v-model="addAdpacking.clothesFactory"></a-input>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
+
+      <!--操作按钮区域 参照发运明细 増行-->
+      <div class="table-operator">
+        <a-button type="primary" @click="referShipmentDetails" icon="ordered-list">参照发运明细</a-button>
+        <a-button type="primary" @click="handleAddColumn" icon="plus" style="margin-left: 20px">増行</a-button>
+      </div>
+
+      <!-- 子表 ipagination-->
+      <a-spin :spinning="confirmLoading">
+        <a-form-model ref="formRef" :rules="validatorRules">
+          <a-table
+            bordered
+            rowKey="id"
+            :columns="addAdvancePackingColumns"
+            :data-source="addAdvancePackingData"
+            :loading="loading"
+            :pagination="false"
+            :scroll="{ x: 1500 }"
+            @change="handleTableChange"
+          >
+            <!-- 结束箱号 输入框-->
+            <template slot="endBoxNo" slot-scope="text, record, index">
+              <a-form-model-item prop="endBoxNo" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.endBoxNo" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 颜色(中英文) -->
+            <template slot="colorChUsa" slot-scope="text, record, index">
+              <a-form-model-item prop="colorChUsa" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.colorChUsa" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 箱数 -->
+            <template slot="boxes" slot-scope="text, record, index">
+              <a-form-model-item prop="boxes" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.boxes" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 总件数 -->
+            <template slot="totalPackagesNum" slot-scope="text, record, index">
+              <a-form-model-item prop="totalPackagesNum" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.totalPackagesNum" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 总净重 -->
+            <template slot="totalSuttle" slot-scope="text, record, index">
+              <a-form-model-item prop="totalSuttle" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.totalSuttle" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 总毛重 -->
+            <template slot="totalRoughWeigh" slot-scope="text, record, index">
+              <a-form-model-item prop="totalRoughWeigh" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.totalRoughWeigh" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 外箱宽度 -->
+            <template slot="boxWidth" slot-scope="text, record, index">
+              <a-form-model-item prop="boxWidth" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.boxWidth" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 外箱高度 -->
+            <template slot="boxHeight" slot-scope="text, record, index">
+              <a-form-model-item prop="boxHeight" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.boxHeight" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 总体积 -->
+            <template slot="totalVolume" slot-scope="text, record, index">
+              <a-form-model-item prop="totalVolume" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.totalVolume" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 操作 -->
+            <span slot="operationSlot" slot-scope="text, record">
+              <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record.id)">
+                <a href="javascript:void(0);" style="color:red;">删除</a>
+              </a-popconfirm>
+              <a-divider type="vertical" />
+              <a @click="copy(record)">复制</a>
+            </span>
+          </a-table>
+        </a-form-model>
+      </a-spin>
+
+      <!-- 页面底部提交取消 -->
+      <div
+        :style="{
+          position: 'absolute',
+          right: 0,
+          bottom: 0,
+          width: '100%',
+          borderTop: '1px solid #e9e9e9',
+          padding: '10px 16px',
+          background: '#fff',
+          textAlign: 'right',
+          zIndex: 1
+        }"
+      >
+        <a-popconfirm title="确定放弃新增?" @confirm="handleCancel" okText="确定" cancelText="取消">
+          <a-button :style="{ marginRight: '8px' }">取消</a-button>
+        </a-popconfirm>
+        <a-button type="primary" @click="submitAdd">
+          提交
+        </a-button>
+      </div>
+    </a-drawer>
+
+    <!-- 参照发运明细弹框 -->
+    <referShipmentDetails-modal
+      ref="referShipmentDetailsModal"
+      :father="aa"
+      @ok="modalFormOk"
+    ></referShipmentDetails-modal>
+  </a-card>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin' // 分页等
+import JEllipsis from '@/components/jeecg/JEllipsis'
+import ReferShipmentDetailsModal from '@views/advance-packingList/referShipmentDetailsModal.vue'
+
+export default {
+  name: 'AddAdvancePacking', // 新增预装箱单
+  mixins: [JeecgListMixin], // 分页等
+  components: { ReferShipmentDetailsModal, JEllipsis }, // 参照发运明细弹框
+  data() {
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+
+    return {
+      // 表头
+      addAdvancePackingColumns: [
+        {
+          title: '账套',
+          dataIndex: 'accountSet',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: '成衣工厂',
+          dataIndex: 'clothesFactory',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: 'HOD',
+          dataIndex: 'hod',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: 'STYLE NO.',
+          dataIndex: 'styleNo',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'PO NO.',
+          dataIndex: 'poNo',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
+          dataIndex: 'itemNoSoon',
+          width: 340,
+          className: 'replacecolor'
+        },
+        {
+          title: '分销点/DC/LABEL',
+          dataIndex: 'dcLabel',
+          width: 180,
+          className: 'replacecolor'
+        },
+
+        {
+          title: 'PREPACK SKU',
+          dataIndex: 'prepackSku',
+          width: 140,
+          className: 'replacecolor'
+        },
+
+        {
+          title: 'S',
+          dataIndex: 's',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'M',
+          dataIndex: 'm',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'L',
+          dataIndex: 'l',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'XL',
+          dataIndex: 'xl',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'XXL',
+          dataIndex: 'xxl',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '3XL',
+          dataIndex: 'xxxl',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '启始箱号',
+          dataIndex: ' inceptionBoxNo.',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '结束箱号',
+          dataIndex: 'endBoxNo.',
+          width: 140,
+          scopedSlots: { customRender: 'endBoxNo' },
+          className: 'replacecolor'
+        },
+
+        {
+          title: '颜色(中英文)',
+          dataIndex: 'colorChUsa',
+          width: 140,
+          customRender: t => ellipsis(t),
+          scopedSlots: { customRender: 'colorChUsa' },
+          className: 'replacecolor'
+        },
+        {
+          title: '配码--根据U8订单来显示',
+          dataIndex: 'configCode',
+          width: 140,
+          className: 'replacecolor'
+        },
+        {
+          title: '件数/箱',
+          dataIndex: 'packagesBox',
+          width: 90,
+          className: 'replacecolor'
+        },
+        {
+          title: '箱数',
+          dataIndex: 'boxes',
+          width: 140,
+          scopedSlots: { customRender: 'boxes' },
+          className: 'replacecolor'
+        },
+
+        {
+          title: '总件数',
+          dataIndex: 'totalPackagesNum',
+          width: 140,
+          scopedSlots: { customRender: 'totalPackagesNum' },
+          className: 'replacecolor'
+        },
+        {
+          title: '净重/箱',
+          dataIndex: 'suttle',
+          width: 90,
+          className: 'replacecolor'
+        },
+        {
+          title: '总净重',
+          dataIndex: 'totalSuttle',
+          width: 140,
+          scopedSlots: { customRender: 'totalSuttle' },
+          className: 'replacecolor'
+        },
+
+        {
+          title: '毛重/箱',
+          dataIndex: 'roughWeight',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '总毛重',
+          dataIndex: 'totalRoughWeigh',
+          width: 140,
+          scopedSlots: { customRender: 'totalRoughWeigh' },
+          className: 'replacecolor'
+        },
+        {
+          title: '外箱长度',
+          dataIndex: 'boxLength',
+          width: 120,
+          //  scopedSlots: { customRender: 'boxLength' },
+          className: 'replacecolor'
+        },
+
+        {
+          title: '外箱宽度',
+          dataIndex: 'boxWidth',
+          width: 140,
+          scopedSlots: { customRender: 'boxWidth' },
+          className: 'replacecolor'
+        },
+        {
+          title: '外箱高度',
+          dataIndex: 'boxHeight',
+          width: 140,
+          scopedSlots: { customRender: 'boxHeight' },
+          className: 'replacecolor'
+        },
+
+        {
+          title: '总体积',
+          dataIndex: 'totalVolume',
+          width: 140,
+          scopedSlots: { customRender: 'totalVolume' },
+          className: 'replacecolor'
+        },
+        {
+          title: '净净重',
+          dataIndex: 'netNetWeight',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '单价',
+          dataIndex: 'price',
+          width: 120,
+
+          className: 'replacecolor'
+        },
+        {
+          title: '总价',
+          dataIndex: 'totalPrices',
+          width: 120,
+
+          className: 'replacecolor'
+        },
+        {
+          title: '备注(U8)',
+          dataIndex: 'note',
+          width: 140,
+          fixed: 'right',
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        },
+
+        {
+          title: '操作',
+          dataIndex: 'operation',
+          scopedSlots: { customRender: 'operationSlot' },
+          width: 160,
+          fixed: 'right',
+          className: 'replacecolor'
+        }
+      ],
+
+      addAdvancePackingData: [{}, {}, {}, {}, {}],
+      loading: false, // 表格加载
+      visible: false,
+      validatorRules: {
+        orderNum: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
+        styleNum: [{ required: true, message: '款号不能为空', trigger: 'blur' }],
+        name: [{ required: true, message: '品名不能为空', trigger: 'blur' }]
+        // 待确定还有哪些必填信息
+      },
+      addAdpacking: {},
+      confirmLoading: false
+    }
+  },
+  created() {},
+  methods: {
+    // 参照发运明细
+    referShipmentDetails() {
+      console.log('打开参照订单数据')
+      this.$refs.referShipmentDetailsModal.referShipmentDetailsModVis = true
+    },
+    // 増行
+    handleAddColumn() {
+      console.log('増行')
+
+      const addrow = {
+        accountSet: '',
+        clothesFactory: '',
+        hod: '',
+        styleNo: '',
+        poNo: '',
+        itemNoSoon: '',
+        dcLabel: '',
+        prepackSku: '',
+        s: '',
+        m: '',
+        l: '',
+        xl: '',
+        xxl: '',
+        xxxl: '',
+        inceptionBoxNo: '',
+        endBoxNo: '',
+        colorChUsa: '',
+        configCode: '',
+        packagesBox: '',
+        boxes: '',
+        totalPackagesNum: '',
+        suttle: '',
+        totalSuttle: '',
+        roughWeight: '',
+        totalRoughWeigh: '',
+        boxLength: '',
+        boxWidth: '',
+        boxHeight: '',
+        totalVolume: '',
+        netNetWeight: '',
+        price: '',
+        totalPrices: '',
+        note: '',
+        operation: ''
+      }
+
+      this.addAdvancePackingData.push(addrow)
+    },
+    // ----------------------------------------
+    //  操作按钮 删除
+    handleDelete(record) {},
+    // 操作按钮
+    copy(record) {},
+    // ----------------------------------------
+
+    // 抽屉 取消
+    handleCancel() {
+      console.log('点击抽屉取消')
+      this.close()
+    },
+    // 抽屉 提交
+    submitAdd() {
+      console.log('保存新增、刷新预装箱单-成衣')
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          that.confirmLoading = true
+        }
+      })
+      this.close()
+      // this.getShipmentList() // 刷新 预装箱单-成衣列表
+    },
+    // -------------------------------------
+    close() {
+      this.$emit('close')
+      this.visible = false
+      this.$refs.form.resetFields()
+    },
+    aa() {},
+    modalFormOk() {}
+  },
+  computed: {},
+  mounted() {}
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
+</style>

+ 375 - 0
src/views/advance-packingList/detailsAdpackingDrawer.vue

@@ -0,0 +1,375 @@
+<template>
+  <!-- 详情 预装箱单 回显信息,有文本框-->
+  <a-card :bordered="false">
+    <a-drawer
+      title="详情"
+      width="89%"
+      placement="right"
+      :closable="true"
+      :visible="visible"
+      @close="handleCancel">
+      <!-- 主表信息 展示 -->
+      <div class="table-page-search-wrapper">
+        <a-form-model layout="inline" ref="form" :model="addAdpacking">
+          <a-row :gutter="24">
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="订单号" prop="orderNum">
+                AQ7484
+                <!-- <a-input placeholder="请输入订单号" v-model="addAdpacking.orderNum"></a-input> -->
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="款号" prop="styleNum">
+                HY273764
+                <!-- <a-input placeholder="请输入款号" v-model="addAdpacking.styleNum"></a-input> -->
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="品名" prop="name">
+                品名1
+                <!-- <a-input placeholder="请输入品名" v-model="addAdpacking.name"></a-input> -->
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="尺码范围" prop="sizeRange">
+                S-3XL
+                <!-- <a-input placeholder="请输入尺码范围" v-model="addAdpacking.sizeRange"></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">
+                客户2
+                <!-- <a-input placeholder="请输入客户" v-model="addAdpacking.customer"></a-input> -->
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="集装箱代号" prop="containerCode">
+                HY890
+                <!-- <a-input placeholder="请输入集装箱代号" v-model="addAdpacking.containerCode"></a-input> -->
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="集装箱号" prop="containerNo">
+                HY890765
+                <!-- <a-input placeholder="请输入集装箱号" v-model="addAdpacking.containerNo"></a-input> -->
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="备注" prop="note">
+                备注测试
+                <!-- <a-input placeholder="请输入备注" v-model="addAdpacking.note"></a-input> -->
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="成衣工厂" prop="clothesFactory">
+                成衣工厂32
+                <!-- <a-input placeholder="请输入成衣工厂" v-model="addAdpacking.clothesFactory"></a-input> -->
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
+
+      <!-- 子表 ipagination-->
+      <a-spin :spinning="confirmLoading">
+        <a-form-model ref="formRef">
+          <a-table
+            bordered
+            rowKey="id"
+            :columns="columns"
+            :data-source="data"
+            :loading="loading"
+            :pagination="false"
+            :scroll="{ x: 1500 }"
+            @change="handleTableChange"
+          >
+          </a-table>
+        </a-form-model>
+      </a-spin>
+    </a-drawer>
+  </a-card>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+
+export default {
+  name: 'DetailsAdvancePacking', // 详情
+  mixins: [JeecgListMixin],
+  components: { JEllipsis },
+  data() {
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
+
+    return {
+      // 表头
+      columns: [
+        {
+          title: '账套',
+          dataIndex: 'accountSet',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: '成衣工厂',
+          dataIndex: 'clothesFactory',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: 'HOD',
+          dataIndex: 'hod',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: 'STYLE NO.',
+          dataIndex: 'styleNo',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'PO NO.',
+          dataIndex: 'poNo',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
+          dataIndex: 'itemNoSoon',
+          width: 340,
+          className: 'replacecolor'
+        },
+        {
+          title: '分销点/DC/LABEL',
+          dataIndex: 'dcLabel',
+          width: 180,
+          className: 'replacecolor'
+        },
+
+        {
+          title: 'PREPACK SKU',
+          dataIndex: 'prepackSku',
+          width: 140,
+          className: 'replacecolor'
+        },
+
+        {
+          title: 'S',
+          dataIndex: 's',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'M',
+          dataIndex: 'm',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'L',
+          dataIndex: 'l',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'XL',
+          dataIndex: 'xl',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'XXL',
+          dataIndex: 'xxl',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '3XL',
+          dataIndex: 'xxxl',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '启始箱号',
+          dataIndex: ' inceptionBoxNo.',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '结束箱号',
+          dataIndex: 'endBoxNo.',
+          width: 140,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '颜色(中英文)',
+          dataIndex: 'colorChUsa',
+          width: 140,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        },
+        {
+          title: '配码--根据U8订单来显示',
+          dataIndex: 'configCode',
+          width: 140,
+          className: 'replacecolor'
+        },
+        {
+          title: '件数/箱',
+          dataIndex: 'packagesBox',
+          width: 90,
+          className: 'replacecolor'
+        },
+        {
+          title: '箱数',
+          dataIndex: 'boxes',
+          width: 140,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '总件数',
+          dataIndex: 'totalPackagesNum',
+          width: 140,
+          className: 'replacecolor'
+        },
+        {
+          title: '净重/箱',
+          dataIndex: 'suttle',
+          width: 90,
+          className: 'replacecolor'
+        },
+        {
+          title: '总净重',
+          dataIndex: 'totalSuttle',
+          width: 140,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '毛重/箱',
+          dataIndex: 'roughWeight',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '总毛重',
+          dataIndex: 'totalRoughWeigh',
+          width: 140,
+          className: 'replacecolor'
+        },
+        {
+          title: '外箱长度',
+          dataIndex: 'boxLength',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '外箱宽度',
+          dataIndex: 'boxWidth',
+          width: 140,
+          className: 'replacecolor'
+        },
+        {
+          title: '外箱高度',
+          dataIndex: 'boxHeight',
+          width: 140,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '总体积',
+          dataIndex: 'totalVolume',
+          width: 140,
+          className: 'replacecolor'
+        },
+        {
+          title: '净净重',
+          dataIndex: 'netNetWeight',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '单价',
+          dataIndex: 'price',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '总价',
+          dataIndex: 'totalPrices',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '备注(U8)',
+          dataIndex: 'note',
+          width: 140,
+          fixed: 'right',
+          className: 'replacecolor'
+        }
+      ],
+
+      data: [{}, {}, {}, {}, {}],
+      loading: false, // 表格加载
+      visible: false,
+      addAdpacking: {},
+      confirmLoading: false
+    }
+  },
+  created() {},
+  methods: {
+    // 抽屉 取消
+    handleCancel() {
+      console.log('点击抽屉取消')
+      this.close()
+    },
+
+    // -------------------------------------
+    close() {
+      this.$emit('close')
+      this.visible = false
+      this.$refs.form.resetFields()
+    },
+    aa() {},
+    modalFormOk() {}
+  },
+  computed: {},
+  mounted() {}
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
+</style>

+ 569 - 0
src/views/advance-packingList/editAdpackingDrawer.vue

@@ -0,0 +1,569 @@
+<template>
+  <!-- 编辑 预装箱单 回显信息,有文本框-->
+  <a-card :bordered="false">
+    <a-drawer
+      title="编辑"
+      width="89%"
+      placement="right"
+      :closable="true"
+      :visible="visible"
+      @close="handleCancel"
+    >
+      <!-- 主表信息 填写 -->
+      <div class="table-page-search-wrapper">
+        <a-form-model layout="inline" ref="form" :model="addAdpacking" :rules="validatorRules">
+          <a-row :gutter="24">
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="订单号" prop="orderNum">
+                <a-input placeholder="请输入订单号" v-model="addAdpacking.orderNum"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="款号" prop="styleNum">
+                <a-input placeholder="请输入款号" v-model="addAdpacking.styleNum"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="品名" prop="name">
+                <a-input placeholder="请输入品名" v-model="addAdpacking.name"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="尺码范围" prop="sizeRange">
+                <a-input placeholder="请输入尺码范围" v-model="addAdpacking.sizeRange"></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">
+                <a-input placeholder="请输入客户" v-model="addAdpacking.customer"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="集装箱代号" prop="containerCode">
+                <a-input placeholder="请输入集装箱代号" v-model="addAdpacking.containerCode"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="集装箱号" prop="containerNo">
+                <a-input placeholder="请输入集装箱号" v-model="addAdpacking.containerNo"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="备注" prop="note">
+                <a-input placeholder="请输入备注" v-model="addAdpacking.note"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="成衣工厂" prop="clothesFactory">
+                <a-input placeholder="请输入成衣工厂" v-model="addAdpacking.clothesFactory"></a-input>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
+
+      <!--操作按钮区域 参照发运明细 増行-->
+      <div class="table-operator">
+        <a-button type="primary" @click="referShipmentDetails" icon="ordered-list">参照发运明细</a-button>
+        <a-button type="primary" @click="handleAddColumn" icon="plus" style="margin-left: 20px">増行</a-button>
+      </div>
+
+      <!-- 子表 ipagination-->
+      <a-spin :spinning="confirmLoading">
+        <a-form-model ref="formRef" :rules="validatorRules">
+          <a-table
+            bordered
+            rowKey="id"
+            :columns="columns"
+            :data-source="data"
+            :loading="loading"
+            :pagination="false"
+            :scroll="{ x: 1500 }"
+            @change="handleTableChange"
+          >
+            <!-- 结束箱号 输入框-->
+            <template slot="endBoxNo" slot-scope="text, record, index">
+              <a-form-model-item prop="endBoxNo" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.endBoxNo" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 颜色(中英文) -->
+            <template slot="colorChUsa" slot-scope="text, record, index">
+              <a-form-model-item prop="colorChUsa" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.colorChUsa" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 箱数 -->
+            <template slot="boxes" slot-scope="text, record, index">
+              <a-form-model-item prop="boxes" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.boxes" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 总件数 -->
+            <template slot="totalPackagesNum" slot-scope="text, record, index">
+              <a-form-model-item prop="totalPackagesNum" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.totalPackagesNum" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 总净重 -->
+            <template slot="totalSuttle" slot-scope="text, record, index">
+              <a-form-model-item prop="totalSuttle" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.totalSuttle" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 总毛重 -->
+            <template slot="totalRoughWeigh" slot-scope="text, record, index">
+              <a-form-model-item prop="totalRoughWeigh" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.totalRoughWeigh" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 外箱宽度 -->
+            <template slot="boxWidth" slot-scope="text, record, index">
+              <a-form-model-item prop="boxWidth" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.boxWidth" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 外箱高度 -->
+            <template slot="boxHeight" slot-scope="text, record, index">
+              <a-form-model-item prop="boxHeight" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.boxHeight" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 总体积 -->
+            <template slot="totalVolume" slot-scope="text, record, index">
+              <a-form-model-item prop="totalVolume" :rules="rules.styleNum" required>
+                <a-input style="width:100%" type="text" v-model="record.totalVolume" />
+              </a-form-model-item>
+            </template>
+
+            <!-- 操作 -->
+            <span slot="operationSlot" slot-scope="text, record">
+              <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record.id)">
+                <a href="javascript:void(0);" style="color:red;">删除</a>
+              </a-popconfirm>
+              <a-divider type="vertical" />
+              <a @click="copy(record)">复制</a>
+            </span>
+          </a-table>
+        </a-form-model>
+      </a-spin>
+
+      <!-- 页面底部提交取消 -->
+      <div
+        :style="{
+          position: 'absolute',
+          right: 0,
+          bottom: 0,
+          width: '100%',
+          borderTop: '1px solid #e9e9e9',
+          padding: '10px 16px',
+          background: '#fff',
+          textAlign: 'right',
+          zIndex: 1
+        }"
+      >
+        <a-popconfirm title="确定放弃编辑?" @confirm="handleCancel" okText="确定" cancelText="取消">
+          <a-button :style="{ marginRight: '8px' }">取消</a-button>
+        </a-popconfirm>
+        <a-button type="primary" @click="submitEdit">
+          提交
+        </a-button>
+      </div>
+    </a-drawer>
+
+    <!-- 参照发运明细弹框 -->
+    <referShipmentDetails-modal
+      ref="referShipmentDetailsModal"
+      :father="aa"
+      @ok="modalFormOk"
+    ></referShipmentDetails-modal>
+  </a-card>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+import ReferShipmentDetailsModal from '@views/advance-packingList/referShipmentDetailsModal.vue'
+
+export default {
+  name: 'EditAdvancePacking', // 编辑预装箱单
+  mixins: [JeecgListMixin],
+  components: { ReferShipmentDetailsModal, JEllipsis }, // 参照发运明细弹框
+  data() {
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
+
+    return {
+      // 表头
+      columns: [
+        {
+          title: '账套',
+          dataIndex: 'accountSet',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: '成衣工厂',
+          dataIndex: 'clothesFactory',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: 'HOD',
+          dataIndex: 'hod',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: 'STYLE NO.',
+          dataIndex: 'styleNo',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'PO NO.',
+          dataIndex: 'poNo',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
+          dataIndex: 'itemNoSoon',
+          width: 340,
+          className: 'replacecolor'
+        },
+        {
+          title: '分销点/DC/LABEL',
+          dataIndex: 'dcLabel',
+          width: 180,
+          className: 'replacecolor'
+        },
+
+        {
+          title: 'PREPACK SKU',
+          dataIndex: 'prepackSku',
+          width: 140,
+          className: 'replacecolor'
+        },
+
+        {
+          title: 'S',
+          dataIndex: 's',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'M',
+          dataIndex: 'm',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'L',
+          dataIndex: 'l',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'XL',
+          dataIndex: 'xl',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'XXL',
+          dataIndex: 'xxl',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '3XL',
+          dataIndex: 'xxxl',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '启始箱号',
+          dataIndex: ' inceptionBoxNo.',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '结束箱号',
+          dataIndex: 'endBoxNo.',
+          width: 140,
+          scopedSlots: { customRender: 'endBoxNo' },
+          className: 'replacecolor'
+        },
+
+        {
+          title: '颜色(中英文)',
+          dataIndex: 'colorChUsa',
+          width: 140,
+          customRender: t => ellipsis(t),
+          scopedSlots: { customRender: 'colorChUsa' },
+          className: 'replacecolor'
+        },
+        {
+          title: '配码--根据U8订单来显示',
+          dataIndex: 'configCode',
+          width: 140,
+          className: 'replacecolor'
+        },
+        {
+          title: '件数/箱',
+          dataIndex: 'packagesBox',
+          width: 90,
+          className: 'replacecolor'
+        },
+        {
+          title: '箱数',
+          dataIndex: 'boxes',
+          width: 140,
+          scopedSlots: { customRender: 'boxes' },
+          className: 'replacecolor'
+        },
+
+        {
+          title: '总件数',
+          dataIndex: 'totalPackagesNum',
+          width: 140,
+          scopedSlots: { customRender: 'totalPackagesNum' },
+          className: 'replacecolor'
+        },
+        {
+          title: '净重/箱',
+          dataIndex: 'suttle',
+          width: 90,
+          className: 'replacecolor'
+        },
+        {
+          title: '总净重',
+          dataIndex: 'totalSuttle',
+          width: 140,
+          scopedSlots: { customRender: 'totalSuttle' },
+          className: 'replacecolor'
+        },
+
+        {
+          title: '毛重/箱',
+          dataIndex: 'roughWeight',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '总毛重',
+          dataIndex: 'totalRoughWeigh',
+          width: 140,
+          scopedSlots: { customRender: 'totalRoughWeigh' },
+          className: 'replacecolor'
+        },
+        {
+          title: '外箱长度',
+          dataIndex: 'boxLength',
+          width: 120,
+          //  scopedSlots: { customRender: 'boxLength' },
+          className: 'replacecolor'
+        },
+
+        {
+          title: '外箱宽度',
+          dataIndex: 'boxWidth',
+          width: 140,
+          scopedSlots: { customRender: 'boxWidth' },
+          className: 'replacecolor'
+        },
+        {
+          title: '外箱高度',
+          dataIndex: 'boxHeight',
+          width: 140,
+          scopedSlots: { customRender: 'boxHeight' },
+          className: 'replacecolor'
+        },
+
+        {
+          title: '总体积',
+          dataIndex: 'totalVolume',
+          width: 140,
+          scopedSlots: { customRender: 'totalVolume' },
+          className: 'replacecolor'
+        },
+        {
+          title: '净净重',
+          dataIndex: 'netNetWeight',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '单价',
+          dataIndex: 'price',
+          width: 120,
+
+          className: 'replacecolor'
+        },
+        {
+          title: '总价',
+          dataIndex: 'totalPrices',
+          width: 120,
+
+          className: 'replacecolor'
+        },
+        {
+          title: '备注(U8)',
+          dataIndex: 'note',
+          width: 140,
+          fixed: 'right',
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        },
+
+        {
+          title: '操作',
+          dataIndex: 'operation',
+          scopedSlots: { customRender: 'operationSlot' },
+          width: 160,
+          fixed: 'right',
+          className: 'replacecolor'
+        }
+      ],
+
+      data: [{}, {}, {}, {}, {}],
+      loading: false, // 表格加载
+      visible: false,
+      validatorRules: {
+        orderNum: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
+        styleNum: [{ required: true, message: '款号不能为空', trigger: 'blur' }],
+        name: [{ required: true, message: '品名不能为空', trigger: 'blur' }]
+        // 待确定还有哪些必填信息
+      },
+      addAdpacking: {},
+      confirmLoading: false
+    }
+  },
+  created() {},
+  methods: {
+    // 参照发运明细
+    referShipmentDetails() {
+      console.log('打开参照订单数据')
+      this.$refs.referShipmentDetailsModal.referShipmentDetailsModVis = true
+    },
+    // 増行
+    handleAddColumn() {
+      console.log('増行')
+
+      const addrow = {
+        accountSet: '',
+        clothesFactory: '',
+        hod: '',
+        styleNo: '',
+        poNo: '',
+        itemNoSoon: '',
+        dcLabel: '',
+        prepackSku: '',
+        s: '',
+        m: '',
+        l: '',
+        xl: '',
+        xxl: '',
+        xxxl: '',
+        inceptionBoxNo: '',
+        endBoxNo: '',
+        colorChUsa: '',
+        configCode: '',
+        packagesBox: '',
+        boxes: '',
+        totalPackagesNum: '',
+        suttle: '',
+        totalSuttle: '',
+        roughWeight: '',
+        totalRoughWeigh: '',
+        boxLength: '',
+        boxWidth: '',
+        boxHeight: '',
+        totalVolume: '',
+        netNetWeight: '',
+        price: '',
+        totalPrices: '',
+        note: '',
+        operation: ''
+      }
+
+      this.data.push(addrow)
+    },
+    // ----------------------------------------
+    //  操作按钮 删除
+    handleDelete(record) {},
+    // 操作按钮
+    copy(record) {},
+    // ----------------------------------------
+
+    // 抽屉 取消
+    handleCancel() {
+      console.log('点击抽屉取消')
+      this.close()
+    },
+    // 抽屉 提交
+    submitEdit() {
+      console.log('保存编辑、刷新预装箱单-成衣')
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          that.confirmLoading = true
+        }
+      })
+      this.close()
+      // this.getShipmentList() // 刷新 预装箱单-成衣列表
+    },
+    // -------------------------------------
+    close() {
+      this.$emit('close')
+      this.visible = false
+      this.$refs.form.resetFields()
+    },
+    aa() {},
+    modalFormOk() {}
+  },
+  computed: {},
+  mounted() {}
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
+</style>

+ 330 - 0
src/views/advance-packingList/referShipmentDetailsModal.vue

@@ -0,0 +1,330 @@
+<template>
+  <a-modal
+    title="参照发运明细"
+    v-model="referShipmentDetailsModVis"
+    :confirmLoading="confirmLoading"
+    @ok="onSubmit"
+    @cancel="handleCancel"
+    width="86%"
+    style="top:330px;left:100px;"
+  >
+    <!-- tabel 加载 -->
+    <a-spin :spinning="confirmLoading">
+      <!-- 查询  -->
+      <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-item label="单据号">
+                <a-input placeholder="请输入单据号" v-model="queryParam.orderNum"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="客户">
+                <a-input placeholder="请输入客户" v-model="queryParam.customer"></a-input>
+              </a-form-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>
+
+      <!-- table , y: 300 -->
+      <div>
+        <a-table
+          :columns="referShipmentDetailsColumns"
+          :data-source="referShipmentDetailsData"
+          :loading="loading"
+          :pagination="ipagination"
+          :row-key="record => record.id"
+          :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          @change="handleTableChange"
+          bordered
+          :scroll="{ x: 1500 }"
+        >
+        </a-table>
+      </div>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+import moment from 'moment'
+export default {
+  name: 'ReferShipmentDetailsModal',
+  mixins: [JeecgListMixin],
+  components: { JEllipsis, moment },
+
+  data() {
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+
+    return {
+      selectedRowKeys: [], // 勾选航
+      loading: false, // 表格加载
+      // 表头
+      referShipmentDetailsColumns: [
+        {
+          title: '单据号',
+          dataIndex: 'documentNum',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        {
+          title: '销售订单号',
+          dataIndex: 'saleOrderNo',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+
+        {
+          title: '客户简称',
+          dataIndex: 'customerShortName',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '部门',
+          dataIndex: 'department',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '业务员',
+          dataIndex: 'salesman',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '小po',
+          dataIndex: 'smallPo',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: 'Pack Id',
+          dataIndex: 'packId',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '分销点',
+          dataIndex: 'distributionPoint',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '款号',
+          dataIndex: 'styleNum',
+          width: 120,
+          className: 'replacecolor'
+        },
+        //         {
+        //   title: '创建时间',
+        //   dataIndex: 'createTime',
+        //   align: 'center',
+        //   sorter: true,
+        //   customRender: text => {
+        //     return moment(text).format('YYYY-MM-DD')
+        //   }
+        // },
+        {
+          title: '预发货日期',
+          dataIndex: 'scheduledShipDate',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '计划到货日期',
+          dataIndex: 'plannedArrivalDate',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '存货名称',
+          dataIndex: 'inventoryName',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '数量(合计)',
+          dataIndex: 'quantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '单价(销售)',
+          dataIndex: 'price',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '采购/委外订单号',
+          dataIndex: 'purchaseAboardOrderNum',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '订单类型',
+          dataIndex: 'orderType',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '工厂单价(采购/委外单价)',
+          dataIndex: 'factoryPrice',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '申报要素(单证维护)',
+          dataIndex: 'declareElements',
+          width: 140,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        },
+
+        {
+          title: '套装件数(存货自定义项)',
+          dataIndex: 'suitQuantity',
+          width: 120,
+
+          className: 'replacecolor'
+        },
+        {
+          title: '是否TC功能',
+          dataIndex: 'isTC',
+          width: 90,
+          className: 'replacecolor'
+        },
+        {
+          title: 'HScode',
+          dataIndex: 'HScode',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '中文品名',
+          dataIndex: 'chineseProName',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '英文品名',
+          dataIndex: 'englishProName',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '成衣工厂',
+          dataIndex: 'clothesFactory',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '报关单价',
+          dataIndex: 'declarationPrice',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      referShipmentDetailsData: [{}, {}, {}],
+      confirmLoading: false,
+      referShipmentDetailsModVis: false,
+
+      // 查询条件
+      queryParam: {
+        orderNum: '',
+        customer: ''
+      }
+    }
+  },
+  // 接收父组件 方法
+  props: {
+    father: {
+      type: Function,
+      default: null
+    }
+  },
+  created() {},
+  methods: {
+    // 弹框查询按钮
+    searchQuery() {},
+    // 重置
+    searchReset() {
+      this.queryParam = {}
+      // this.getShipmentList()
+    },
+    // 弹框确定
+    onSubmit() {},
+    close() {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleCancel() {
+      this.close()
+    },
+    // 选中行
+    onSelectChange(keys, rows) {
+      this.selectedRowKeys = keys
+      this.selectedRows = rows
+    }
+    // handleTableChange(pagination, filters, sorter) {
+    //   // console.log('当前页信息>>>>',pagination)
+    //   this.queryParam.pageNo = pagination.current
+    //   this.getAnnList()
+    // }
+  },
+  computed: {
+    // 选中项
+    rowSelection() {
+      return {
+        onChange: (selectedRowKeys, selectedRows) => {
+          console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+        },
+        getCheckboxProps: record => ({
+          props: {
+            disabled: record.title === 'Disabled User',
+            // Column configuration not to be checked
+            title: record.title
+          }
+        })
+      }
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+@import '~@assets/less/overwriter.less';
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
+</style>

+ 6 - 4
src/views/packing-list/packinglist-clothes/clothes-list.vue

@@ -143,10 +143,12 @@
         </span>
       </a-table>
     </div>
-    <!-- 新增 抽屉 -->
-    <clothesAdd-drawer ref="clothesAddDrawer" :father="aa" @ok="modalFormOk"></clothesAdd-drawer>
-    <detailsClothes-drawer ref="detailsClothesDrawer" :father="bb" @ok="modalFormOk"></detailsClothes-drawer>
-    <editClothes-drawer ref="editClothesDrawer" :father="cc" @ok="modalFormOk"></editClothes-drawer>
+    <!-- 抽屉 -->
+    <div>
+      <clothesAdd-drawer ref="clothesAddDrawer" :father="aa" @ok="modalFormOk"></clothesAdd-drawer>
+      <detailsClothes-drawer ref="detailsClothesDrawer" :father="bb" @ok="modalFormOk"></detailsClothes-drawer>
+      <editClothes-drawer ref="editClothesDrawer" :father="cc" @ok="modalFormOk"></editClothes-drawer>
+    </div>
   </a-card>
 </template>
 

+ 3 - 3
src/views/packing-list/packinglist-clothes/clothesAddDrawer.vue

@@ -107,7 +107,6 @@
             @change="handleTableChange"
           >
             <!-- 启始箱号 输入框-->
-
             <template slot="inceptionBoxNo" slot-scope="text, record, index">
               <a-form-model-item prop="inceptionBoxNo" :rules="rules.styleNum" required>
                 <a-input style="width:100%" type="text" v-model="record.inceptionBoxNo" />
@@ -537,7 +536,7 @@ export default {
         }
       })
       this.close()
-      // this.getShipmentList() // 刷新装箱单-成衣列表
+      // this.getShipmentList() // 刷新 装箱单-成衣列表
     },
 
     // -------------------------------------
@@ -547,7 +546,8 @@ export default {
       this.$refs.form.resetFields()
     },
     // - father------------------------------------
-    aa() {}
+    aa() {},
+    modalFormOk() {}
 
     // 分页、排序、筛选变化时触发
     // handleTableChange(pagination, filters, sorter) {

+ 1 - 1
src/views/packing-list/packinglist-clothes/editClothesDrawer.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 编辑成衣 需要回显信息  通过是否有id判断-->
+  <!-- 编辑成衣 回显信息,有文本框  通过是否有id判断-->
   <a-card :bordered="false">
     <a-drawer
       title="编辑"