单证 - 预装箱单 部分接口

src/api/document/advance-packingList.js

@@ -1,18 +1,19 @@
-/** 单证 -- 预装箱单 预装箱单 - 成衣 **/
+/** 单证 --预装箱单 - 成衣 **/
 import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
 
 // 分页列表查询
 const getadPaList = params => getAction('/spapl/syPreAssembledPackingList/list', params)
 
 // 新增
-const addShipmentList = params => postAction('/spapl/syPreAssembledPackingList/add', params)
-
+// const addShipmentList = params => postAction('/spapl/syPreAssembledPackingList/add', params)
 
 // 详情
-const itemByMainId = params => getAction('/spapl/syPreAssembledPackingList/querySyPreAssembledPackingListItemByMainId', params)
+const itemByMainId = params => getAction('/spapl/syPreAssembledPackingList/queryById', params)
 
+//编辑
+const editById = params => postAction('/spapl/syPreAssembledPackingList/edit', params)
 
 //  删除
 const deleteAdPaList = params => deleteAction('/spapl/syPreAssembledPackingList/delete', params)
 
-export { getadPaList, deleteAdPaList,itemByMainId }
+export { getadPaList, deleteAdPaList, itemByMainId, editById }

src/views/advance-packingList/adPaList-clothes.vue

@@ -78,7 +78,7 @@
 
         <!-- 单据状态 -->
         <span slot="statusSlot" slot-scope="text, record">
-          <a-tag color="orange" v-if="record.status == '0'">已保存</a-tag>
+          <a-tag color="orange" v-if="record.status == '0'">未提交</a-tag>
           <a-tag color="green" v-if="record.status == '1'">已提交</a-tag>
         </span>
 
@@ -171,10 +171,14 @@
 
     <!-- 抽屉 -->
     <div>
+      <!--     :fatherList="getadPaListClothes" -->
       <detailsAdpacking-drawer ref="detailsAdpackingDrawer" @ok="modalFormOk"></detailsAdpacking-drawer>
 
-      <addAdpacking-drawer ref="addAdpackingDrawer" :father="aa" @ok="modalFormOk"></addAdpacking-drawer>
+      <!--  :fatherList="getadPaListClothes" -->
 
+      <addAdpacking-drawer ref="addAdpackingDrawer" @ok="modalFormOk"></addAdpacking-drawer>
+
+      <!--       :fatherList="getadPaListClothes" -->
       <editAdpacking-drawer ref="editAdpackingDrawer" @ok="modalFormOk"></editAdpacking-drawer>
     </div>
   </div>
@@ -188,7 +192,7 @@ import addAdpackingDrawer from '@views/advance-packingList/addAdpackingDrawer.vu
 import detailsAdpackingDrawer from '@views/advance-packingList/detailsAdpackingDrawer.vue'
 import editAdpackingDrawer from '@views/advance-packingList/editAdpackingDrawer.vue'
 
-import { getadPaList, itemByMainId } from '@api/document/advance-packingList.js'
+import { getadPaList } from '@api/document/advance-packingList.js'
 
 export default {
   productName: 'AdPaListClothes', // 预装线单-成衣
@@ -196,7 +200,7 @@ export default {
   components: { JEllipsis, moment, addAdpackingDrawer, detailsAdpackingDrawer, editAdpackingDrawer },
 
   data() {
-    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     return {
       loading: false, // 表格加载
       id: '',
@@ -209,6 +213,13 @@ export default {
           fixed: 'left',
           className: 'replacecolor'
         },
+        {
+          title: '订单号',
+          dataIndex: 'orderNumber',
+          width: 120,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
         {
           title: '客户(简称)',
           dataIndex: 'customer',
@@ -253,7 +264,7 @@ export default {
         },
         {
           title: '采购/委外订单号',
-          dataIndex: 'purchaseAboardOrderNum',
+          dataIndex: 'spurOrSubOrder',
           width: 220,
           className: 'replacecolor'
         },
@@ -265,13 +276,13 @@ export default {
         },
         {
           title: '工厂单价',
-          dataIndex: 'aa',
+          dataIndex: 'factoryUnitPrice',
           width: 100,
           className: 'replacecolor'
         },
         {
           title: '数量(按合并规则累计)',
-          dataIndex: 'bb',
+          dataIndex: 'totalQuantity',
           width: 200,
           className: 'replacecolor'
         },
@@ -348,7 +359,7 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '备注(原因)',
+          title: '原因',
           dataIndex: 'memo',
           width: 220,
           fixed: 'right',
@@ -366,14 +377,12 @@ export default {
       ],
       adPaListClothesData: [],
 
-      // 查询条件
       queryParam: {
         // pageNo: '',
         // orderNumber: '',
         // itemNumber: '',
         // productName: '' // 品名
       },
-      // 分页
       pagination: {
         // total: '',
         // current: 0,
@@ -404,6 +413,24 @@ export default {
       })
     },
 
+    //  编辑
+    edit(record) {
+      console.log('编辑', record)
+      this.$refs.editAdpackingDrawer.visible = true
+      // this.$refs.detailsAdpackingDrawer.visible = true
+      this.$refs.editAdpackingDrawer.record = record //接口参数
+      console.log('bbbbb')
+      this.$refs.editAdpackingDrawer.getEditInfo()
+      console.log('cc')
+    },
+    //  详情
+    details(record) {
+      console.log('点击的record', record)
+      this.$refs.detailsAdpackingDrawer.visible = true
+      this.$refs.detailsAdpackingDrawer.record = record //接口参数
+      this.$refs.detailsAdpackingDrawer.getDetailsById()
+    },
+
     // 新增
     addAdpacking() {
       console.log('新增预装箱单')
@@ -436,20 +463,6 @@ export default {
       // })
     },
 
-    //  详情
-    details(record) {
-      console.log('点击的record', record)
-      this.$refs.detailsAdpackingDrawer.visible = true
-      itemByMainId({ id: record.id }).then(res => {
-        if (res.success) {
-          // console.log('点击的对象', res.result)
-          // 把通过id查询到的对象，赋值给子组件
-          this.$refs.detailsAdpackingDrawer.detailsAdpacking = record
-          this.$refs.detailsAdpackingDrawer.data = res.result.adPaListClothesData
-        }
-      })
-    },
-
     //  删除
     handleDelete(record) {
       console.log('点击删除项id:', record.id)
@@ -463,7 +476,7 @@ export default {
     },
 
     searchQuery() {
-      this.queryParam.pageNo = '' //页码恢复
+      this.queryParam.pageNo = ''
       this.getadPaListClothes()
     },
 
@@ -477,12 +490,6 @@ export default {
     //  提交
     submit() {},
 
-    //  编辑
-    edit(record) {
-      console.log('编辑')
-      this.$refs.editAdpackingDrawer.visible = true
-    },
-
     // 选中行
     onSelectChange(keys, rows) {
       this.selectedRowKeys = keys
@@ -517,8 +524,7 @@ export default {
         })
       }
     }
-  },
-
+  }
 }
 </script>
 <style lang="less" scoped>

src/views/advance-packingList/addAdpackingDrawer.vue

@@ -16,20 +16,20 @@
           <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">
-                  <a-input placeholder="请输入订单号" v-model="addAdpacking.orderNum"></a-input>
+                <a-form-model-item label="订单号" prop="orderNumber">
+                  <a-input placeholder="请输入订单号" v-model="addAdpacking.orderNumber"></a-input>
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="款号" prop="itemNumber">
-                  <a-input placeholder="请输入款号" v-model="addAdpacking.itemNumber"></a-input>
+                <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="productName">
-                  <a-input placeholder="请输入品名" v-model="addAdpacking.productName"></a-input>
+                <a-form-model-item label="品名" prop="name">
+                  <a-input placeholder="请输入品名" v-model="addAdpacking.name"></a-input>
                 </a-form-model-item>
               </a-col>
 
@@ -90,8 +90,8 @@
             <a-table
               bordered
               rowKey="id"
-              :columns="addAdvancePackingColumns"
-              :data-source="addAdvancePackingData"
+              :columns="columns"
+              :data-source="data"
               :loading="loading"
               :pagination="false"
               :scroll="{ x: 1500 }"
@@ -223,10 +223,10 @@ export default {
 
     return {
       // 表头
-      addAdvancePackingColumns: [
+      columns: [
         {
           title: '账套',
-          dataIndex: 'accountSet',
+          dataIndex: 'acSetNo',
           width: 120,
           fixed: 'left',
           className: 'replacecolor'
@@ -260,7 +260,7 @@ export default {
 
         {
           title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
-          dataIndex: 'itemNoSoon',
+          dataIndex: 'itemCode',
           width: 340,
           className: 'replacecolor'
         },
@@ -315,37 +315,35 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '启始箱号',
-          dataIndex: ' inceptionBoxNo.',
+          title: '起始箱号',
+          dataIndex: ' startingBoxNumber.',
           width: 120,
           className: 'replacecolor'
         },
 
         {
           title: '结束箱号',
-          dataIndex: 'endBoxNo.',
+          dataIndex: 'endCaseNumber.',
           width: 140,
-          scopedSlots: { customRender: 'endBoxNo' },
           className: 'replacecolor'
         },
 
         {
           title: '颜色(中英文)',
-          dataIndex: 'color',
+          dataIndex: 'colour',
           width: 140,
           customRender: t => ellipsis(t),
-          scopedSlots: { customRender: 'color' },
           className: 'replacecolor'
         },
         {
           title: '配码--根据U8订单来显示',
-          dataIndex: 'configCode',
+          dataIndex: 'withCode',
           width: 140,
           className: 'replacecolor'
         },
         {
           title: '件数/箱',
-          dataIndex: 'packagesBox',
+          dataIndex: 'piecesBox',
           width: 90,
           className: 'replacecolor'
         },
@@ -353,20 +351,18 @@ export default {
           title: '箱数',
           dataIndex: 'boxNumber',
           width: 140,
-          scopedSlots: { customRender: 'boxNumber' },
           className: 'replacecolor'
         },
 
         {
           title: '总件数',
-          dataIndex: 'totalPackagesNum',
+          dataIndex: 'total',
           width: 140,
-          scopedSlots: { customRender: 'totalPackagesNum' },
           className: 'replacecolor'
         },
         {
           title: '净重/箱',
-          dataIndex: 'suttle',
+          dataIndex: 'netWeight',
           width: 90,
           className: 'replacecolor'
         },
@@ -374,13 +370,12 @@ export default {
           title: '总净重',
           dataIndex: 'totalNetWeight',
           width: 140,
-          scopedSlots: { customRender: 'totalNetWeight' },
           className: 'replacecolor'
         },
 
         {
           title: '毛重/箱',
-          dataIndex: 'roughWeight',
+          dataIndex: 'grossWeight',
           width: 120,
           className: 'replacecolor'
         },
@@ -388,29 +383,25 @@ export default {
           title: '总毛重',
           dataIndex: 'totalGrossWeight',
           width: 140,
-          scopedSlots: { customRender: 'totalGrossWeight' },
           className: 'replacecolor'
         },
         {
           title: '外箱长度',
-          dataIndex: 'boxLength',
+          dataIndex: 'outerBoxLength',
           width: 120,
-          //  scopedSlots: { customRender: 'boxLength' },
           className: 'replacecolor'
         },
 
         {
           title: '外箱宽度',
-          dataIndex: 'boxWidth',
+          dataIndex: 'outerBoxWidth',
           width: 140,
-          scopedSlots: { customRender: 'boxWidth' },
           className: 'replacecolor'
         },
         {
           title: '外箱高度',
-          dataIndex: 'boxHeight',
+          dataIndex: 'outerBoxHeight',
           width: 140,
-          scopedSlots: { customRender: 'boxHeight' },
           className: 'replacecolor'
         },
 
@@ -418,56 +409,44 @@ export default {
           title: '总体积',
           dataIndex: 'totalVolume',
           width: 140,
-          scopedSlots: { customRender: 'totalVolume' },
           className: 'replacecolor'
         },
         {
           title: '净净重',
-          dataIndex: 'netNetWeight',
+          dataIndex: 'netWeightToo',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '单价',
-          dataIndex: 'price',
+          dataIndex: 'unitPrice',
           width: 120,
-
           className: 'replacecolor'
         },
         {
           title: '总价',
           dataIndex: 'totalPrice',
           width: 120,
-
           className: 'replacecolor'
         },
         {
           title: '备注(U8)',
-          dataIndex: 'memo',
+          dataIndex: 'u8Remarks',
           width: 140,
           fixed: 'right',
           customRender: t => ellipsis(t),
           className: 'replacecolor'
-        },
-
-        {
-          title: '操作',
-          dataIndex: 'operation',
-          scopedSlots: { customRender: 'operationSlot' },
-          width: 160,
-          fixed: 'right',
-          className: 'replacecolor'
         }
       ],
 
-      addAdvancePackingData: [],
+      data: [{}, {}, {}, {}, {}],
       loading: false, // 表格加载
       visible: false,
       // 待确定还有哪些必填信息
       // validatorRules: {
-      //   orderNum: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
-      //   itemNumber: [{ required: true, message: '款号不能为空', trigger: 'blur' }],
-      //   productName: [{ required: true, message: '品名不能为空', trigger: 'blur' }]
+      //   orderNumber: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
+      //   styleNum: [{ required: true, message: '款号不能为空', trigger: 'blur' }],
+      //   name: [{ required: true, message: '品名不能为空', trigger: 'blur' }]
       // },
       addAdpacking: {},
       confirmLoading: false
@@ -497,14 +476,13 @@ export default {
     // 増行
     handleAddColumn() {
       console.log('増行')
-
       const addrow = {
-        accountSet: '',
+        acSetNo: '',
         garmentFactory: '',
         hod: '',
         styleNo: '',
         poNo: '',
-        itemNoSoon: '',
+        itemCode: '',
         distributionPoint: '',
         prepackSku: '',
         s: '',
@@ -513,29 +491,29 @@ export default {
         xl: '',
         xxl: '',
         xxxl: '',
-        inceptionBoxNo: '',
-        endBoxNo: '',
-        color: '',
-        configCode: '',
-        packagesBox: '',
+        startingBoxNumber: '',
+        endCaseNumber: '',
+        colour: '',
+        withCode: '',
+        piecesBox: '',
         boxNumber: '',
-        totalPackagesNum: '',
-        suttle: '',
+        total: '',
+        netWeight: '',
         totalNetWeight: '',
+
         roughWeight: '',
         totalGrossWeight: '',
-        boxLength: '',
-        boxWidth: '',
-        boxHeight: '',
+        outerBoxLength: '',
+        outerBoxWidth: '',
+        outerBoxHeight: '',
         totalVolume: '',
-        netNetWeight: '',
-        price: '',
+        netWeightToo: '',
+        unitPrice: '',
         totalPrice: '',
-        memo: '',
+        u8Remarks: '',
         operation: ''
       }
-
-      this.addAdvancePackingData.push(addrow)
+      this.data.push(addrow)
     },
     // ----------------------------------------
     //  操作按钮 删除

src/views/advance-packingList/detailsAdpackingDrawer.vue

@@ -1,107 +1,105 @@
 <template>
-  <!-- 详情 预装箱单 回显信息，有文本框-->
-  <div id="detailsAdpackingDrawer">
-    <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">
-            <a-row :gutter="24">
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="订单号" prop="orderNum">
-                  {{ detailsAdpacking.orderNum }}
-                </a-form-model-item>
-              </a-col>
+  <!-- 详情 预装箱单-成衣 单证-->
+  <a-drawer title="详情" width="89%" placement="right" :closable="true" :visible="visible" @close="onClose">
+    <!-- 主表信息 展示 -->
+    <a-card :bordered="true">
+      <div class="table-page-search-wrapper">
+        <a-form-model layout="inline" ref="form">
+          <a-row :gutter="24">
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="订单号" prop="orderNumber">
+                {{ detailsAdpacking.orderNumber }}
+              </a-form-model-item>
+            </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="款号" prop="styleNum">
-                  {{ detailsAdpacking.itemNumber }}
-                </a-form-model-item>
-              </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="款号" prop="styleNum">
+                {{ detailsAdpacking.itemNumber }}
+              </a-form-model-item>
+            </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="品名" prop="name">
-                  {{ detailsAdpacking.productName }}
-                </a-form-model-item>
-              </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="品名" prop="name">
+                {{ detailsAdpacking.productName }}
+              </a-form-model-item>
+            </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="尺码范围" prop="sizeRange">
-                  {{ detailsAdpacking.sizeRange }}
-                </a-form-model-item>
-              </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="尺码范围" prop="sizeRange">
+                {{ detailsAdpacking.sizeRange }}
+              </a-form-model-item>
+            </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="客户" prop="customer">
-                  {{ detailsAdpacking.customer }}
-                </a-form-model-item>
-              </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="客户" prop="customer">
+                {{ detailsAdpacking.customer }}
+              </a-form-model-item>
+            </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="集装箱代号" prop="containerCode">
-                  {{ detailsAdpacking.containerCode }}
-                </a-form-model-item>
-              </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="集装箱代号" prop="containerCode">
+                {{ detailsAdpacking.containerCode }}
+              </a-form-model-item>
+            </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="集装箱号" prop="containerNumber">
-                  {{ detailsAdpacking.containerNumber }}
-                </a-form-model-item>
-              </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="集装箱号" prop="containerNumber">
+                {{ detailsAdpacking.containerNumber }}
+              </a-form-model-item>
+            </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="备注" prop="aa">
-                  {{ detailsAdpacking.aa }}
-                </a-form-model-item>
-              </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="备注" prop="memo">
+                {{ detailsAdpacking.memo }}
+              </a-form-model-item>
+            </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="成衣工厂" prop="garmentFactory">
-                  {{ detailsAdpacking.garmentFactory }}
-                </a-form-model-item>
-              </a-col>
-            </a-row>
-          </a-form-model>
-        </div>
-      </a-card>
-      <!-- 子表 ipagination-->
-      <a-card :bordered="true" style="margin:10px 0">
-        <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-card>
-    </a-drawer>
-  </div>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="成衣工厂" prop="garmentFactory">
+                {{ detailsAdpacking.garmentFactory }}
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
+    </a-card>
+    <!-- 子表 ipagination-->
+    <a-card :bordered="true" style="margin:10px 0">
+      <a-table
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :data-source="data"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{ x: 1500 }"
+        @change="handleTableChange"
+      >
+      </a-table>
+    </a-card>
+  </a-drawer>
 </template>
 
 <script>
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
+import moment from 'moment'
+
+import { itemByMainId } from '@api/document/advance-packingList.js'
 
 export default {
   name: 'DetailsAdpackingDrawer', // 详情
   mixins: [JeecgListMixin],
-  components: { JEllipsis },
+  components: { JEllipsis, moment },
   data() {
     let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     return {
+      detailsAdpacking: {}, //主表信息
       // 表头
       columns: [
         {
           title: '账套',
-          dataIndex: 'accountSet',
+          dataIndex: 'acSetNo',
           width: 120,
           fixed: 'left',
           className: 'replacecolor'
@@ -135,13 +133,13 @@ export default {
 
         {
           title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
-          dataIndex: 'itemNoSoon',
+          dataIndex: 'itemCode',
           width: 340,
           className: 'replacecolor'
         },
         {
           title: '分销点/DC/LABEL',
-          dataIndex: 'dcLabel',
+          dataIndex: 'distributionPoint',
           width: 180,
           className: 'replacecolor'
         },
@@ -190,35 +188,35 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '启始箱号',
-          dataIndex: ' inceptionBoxNo.',
+          title: '起始箱号',
+          dataIndex: ' startingBoxNumber.',
           width: 120,
           className: 'replacecolor'
         },
 
         {
           title: '结束箱号',
-          dataIndex: 'endBoxNo.',
+          dataIndex: 'endCaseNumber.',
           width: 140,
           className: 'replacecolor'
         },
 
         {
           title: '颜色(中英文)',
-          dataIndex: 'colorChUsa',
+          dataIndex: 'colour',
           width: 140,
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
         {
           title: '配码--根据U8订单来显示',
-          dataIndex: 'configCode',
+          dataIndex: 'withCode',
           width: 140,
           className: 'replacecolor'
         },
         {
           title: '件数/箱',
-          dataIndex: 'packagesBox',
+          dataIndex: 'piecesBox',
           width: 90,
           className: 'replacecolor'
         },
@@ -231,13 +229,13 @@ export default {
 
         {
           title: '总件数',
-          dataIndex: 'totalPackagesNum',
+          dataIndex: 'total',
           width: 140,
           className: 'replacecolor'
         },
         {
           title: '净重/箱',
-          dataIndex: 'suttle',
+          dataIndex: 'netWeight',
           width: 90,
           className: 'replacecolor'
         },
@@ -250,7 +248,7 @@ export default {
 
         {
           title: '毛重/箱',
-          dataIndex: 'roughWeight',
+          dataIndex: 'grossWeight',
           width: 120,
           className: 'replacecolor'
         },
@@ -262,20 +260,20 @@ export default {
         },
         {
           title: '外箱长度',
-          dataIndex: 'boxLength',
+          dataIndex: 'outerBoxLength',
           width: 120,
           className: 'replacecolor'
         },
 
         {
           title: '外箱宽度',
-          dataIndex: 'boxWidth',
+          dataIndex: 'outerBoxWidth',
           width: 140,
           className: 'replacecolor'
         },
         {
           title: '外箱高度',
-          dataIndex: 'boxHeight',
+          dataIndex: 'outerBoxHeight',
           width: 140,
           className: 'replacecolor'
         },
@@ -288,13 +286,13 @@ export default {
         },
         {
           title: '净净重',
-          dataIndex: 'netNetWeight',
+          dataIndex: 'netWeightToo',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '单价',
-          dataIndex: 'price',
+          dataIndex: 'unitPrice',
           width: 120,
           className: 'replacecolor'
         },
@@ -306,39 +304,55 @@ export default {
         },
         {
           title: '备注(U8)',
-          dataIndex: 'memo',
+          dataIndex: 'u8Remarks',
           width: 140,
           fixed: 'right',
+          customRender: t => ellipsis(t),
           className: 'replacecolor'
         }
       ],
-
       data: [], //子表信息
+
       loading: false, // 表格加载
+      pagination: {
+        pageNo: ''
+        // total: '',
+        // current: '',
+        // pageSize: ''
+      },
+
       visible: false,
-      detailsAdpacking: {}, //主表信息
-      confirmLoading: false
+      dateFormat: 'YYYY-MM-DD',
+      record: {} //点击的对象
     }
   },
-  created() {},
+  created() {
+    this.getDetailsById()
+  },
   methods: {
-    // 抽屉 取消
-    handleCancel() {
-      console.log('点击抽屉取消')
-      this.close()
+    // 回显数据
+    getDetailsById() {
+      console.log('详情', this.record.id)
+      this.$nextTick(() => {
+        itemByMainId({ id: this.record.id }).then(res => {
+          if (res.code == 0) {
+            console.log('点击的对象', res.result)
+            this.detailsAdpacking = res.result //主表信息
+            this.data = res.result.syPreAssembledPackingListItemList //子表信息
+          }
+        })
+      })
     },
-
-    // -------------------------------------
-    close() {
-      this.$emit('close')
-      this.visible = false
-      // this.$refs.form.resetFields()
+    handleTableChange(pagination, filters, sorter) {
+      this.pagination.pageNo = pagination.current
+      this.getDetailsById()
     },
-    aa() {},
-    modalFormOk() {}
+    onClose() {
+      this.visible = false
+    }
   },
-  computed: {},
-  mounted() {}
+
+  modalFormOk() {}
 }
 </script>
 <style lang="less" scoped>

src/views/advance-packingList/editAdpackingDrawer.vue

@@ -1,33 +1,33 @@
 <template>
   <!-- 编辑 预装箱单 回显信息，有文本框-->
-  <div id="editAdvancePacking">
-    <a-drawer title="编辑" width="89%" placement="right" :closable="true" :visible="visible" @close="handleCancel">
+  <div id="editAdpackingDrawer">
+    <a-drawer title="编辑" width="89%" placement="right" :closable="true" :visible="visible" @close="onClose">
       <!-- 主表信息 填写 :rules="validatorRules" -->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
-          <a-form-model layout="inline" ref="form" :model="addAdpacking">
+          <a-form-model layout="inline" ref="form" :model="editAdpacking">
             <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 label="订单号" prop="orderNumber">
+                  <a-input placeholder="请输入订单号" v-model="editAdpacking.orderNumber"></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-input placeholder="请输入款号" v-model="editAdpacking.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-input placeholder="请输入品名" v-model="editAdpacking.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-input placeholder="请输入尺码范围" v-model="editAdpacking.sizeRange"></a-input>
                   <!-- <a-select placeholder="请选择尺码范围">
                 <a-select-option value="">请选择</a-select-option>
                 <a-select-option value="0">客户1</a-select-option>
@@ -39,31 +39,31 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="客户" prop="customer">
-                  <a-input placeholder="请输入客户" v-model="addAdpacking.customer"></a-input>
+                  <a-input placeholder="请输入客户" v-model="editAdpacking.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-input placeholder="请输入集装箱代号" v-model="editAdpacking.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 label="集装箱号" prop="containerNumber">
+                  <a-input placeholder="请输入集装箱号" v-model="editAdpacking.containerNumber"></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 label="备注" prop="memo">
+                  <a-input placeholder="请输入备注" v-model="editAdpacking.memo"></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-input placeholder="请输入成衣工厂" v-model="editAdpacking.clothesFactory"></a-input>
                 </a-form-model-item>
               </a-col>
             </a-row>
@@ -79,92 +79,92 @@
         </div>
 
         <!-- 子表 :rules="validatorRules"-->
-        <a-spin :spinning="confirmLoading">
-          <a-form-model ref="formRef">
-            <a-table
-              bordered
-              rowKey="id"
-              :columns="columns"
-              :data-source="data"
-              :loading="loading"
-              :pagination="ipagination"
-              :scroll="{ x: 1500 }"
-              @change="handleTableChange"
-            >
-              <!-- 结束箱号 输入框 required :rules="rules.styleNum"-->
-              <template slot="endBoxNo" slot-scope="text, record, index">
-                <a-form-model-item prop="endBoxNo">
-                  <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">
-                  <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">
-                  <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">
-                  <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">
-                  <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">
-                  <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">
-                  <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">
-                  <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">
-                  <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>
+        <!-- <a-spin :spinning="confirmLoading"> -->
+        <!-- <a-form-model ref="formRef"> -->
+        <a-table
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :data-source="data"
+          :loading="loading"
+          :pagination="ipagination"
+          :scroll="{ x: 1500 }"
+          @change="handleTableChange"
+        >
+          <!-- 结束箱号 输入框 required :rules="rules.styleNum"-->
+          <template slot="endBoxNo" slot-scope="text, record, index">
+            <a-form-model-item prop="endBoxNo">
+              <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">
+              <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="boxNumber">
+              <a-input style="width:100%" type="text" v-model="record.boxNumber" />
+            </a-form-model-item>
+          </template>
+
+          <!-- 总件数 -->
+          <template slot="totalPackagesNum" slot-scope="text, record, index">
+            <a-form-model-item prop="totalPackagesNum">
+              <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">
+              <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">
+              <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">
+              <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">
+              <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">
+              <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> -->
       </a-card>
       <!-- 页面底部提交取消 -->
       <div
@@ -183,8 +183,8 @@
         <a-popconfirm title="确定放弃编辑？" @confirm="handleCancel" okText="确定" cancelText="取消">
           <a-button :style="{ marginRight: '8px' }">取消</a-button>
         </a-popconfirm>
-        <a-button type="primary" @click="submitEdit">
-          提交
+        <a-button type="primary" @click="saveEdit">
+          保存
         </a-button>
       </div>
     </a-drawer>
@@ -201,28 +201,32 @@
 <script>
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
+
 import ReferShipmentDetailsModal from '@views/advance-packingList/referShipmentDetailsModal.vue'
 
+import { itemByMainId, editById } from '@api/document/advance-packingList.js'
+
 export default {
-  name: 'EditAdvancePacking', // 编辑预装箱单
+  name: 'EditAdpackingDrawer', // 编辑 预装箱单
   mixins: [JeecgListMixin],
   components: { ReferShipmentDetailsModal, JEllipsis }, // 参照发运明细弹框
   data() {
     let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
 
     return {
+      editAdpacking: {}, // 主表编辑预装箱单-成衣
       // 表头
       columns: [
         {
           title: '账套',
-          dataIndex: 'accountSet',
+          dataIndex: 'acSetNo',
           width: 120,
           fixed: 'left',
           className: 'replacecolor'
         },
         {
           title: '成衣工厂',
-          dataIndex: 'clothesFactory',
+          dataIndex: 'garmentFactory',
           width: 120,
           fixed: 'left',
           className: 'replacecolor'
@@ -249,13 +253,13 @@ export default {
 
         {
           title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
-          dataIndex: 'itemNoSoon',
+          dataIndex: 'itemCode',
           width: 340,
           className: 'replacecolor'
         },
         {
           title: '分销点/DC/LABEL',
-          dataIndex: 'dcLabel',
+          dataIndex: 'distributionPoint',
           width: 180,
           className: 'replacecolor'
         },
@@ -304,102 +308,93 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '启始箱号',
-          dataIndex: ' inceptionBoxNo.',
+          title: '起始箱号',
+          dataIndex: ' startingBoxNumber.',
           width: 120,
           className: 'replacecolor'
         },
 
         {
           title: '结束箱号',
-          dataIndex: 'endBoxNo.',
+          dataIndex: 'endCaseNumber.',
           width: 140,
-          scopedSlots: { customRender: 'endBoxNo' },
           className: 'replacecolor'
         },
 
         {
           title: '颜色(中英文)',
-          dataIndex: 'colorChUsa',
+          dataIndex: 'colour',
           width: 140,
           customRender: t => ellipsis(t),
-          scopedSlots: { customRender: 'colorChUsa' },
           className: 'replacecolor'
         },
         {
           title: '配码--根据U8订单来显示',
-          dataIndex: 'configCode',
+          dataIndex: 'withCode',
           width: 140,
           className: 'replacecolor'
         },
         {
           title: '件数/箱',
-          dataIndex: 'packagesBox',
+          dataIndex: 'piecesBox',
           width: 90,
           className: 'replacecolor'
         },
         {
           title: '箱数',
-          dataIndex: 'boxes',
+          dataIndex: 'boxNumber',
           width: 140,
-          scopedSlots: { customRender: 'boxes' },
           className: 'replacecolor'
         },
 
         {
           title: '总件数',
-          dataIndex: 'totalPackagesNum',
+          dataIndex: 'total',
           width: 140,
-          scopedSlots: { customRender: 'totalPackagesNum' },
           className: 'replacecolor'
         },
         {
           title: '净重/箱',
-          dataIndex: 'suttle',
+          dataIndex: 'netWeight',
           width: 90,
           className: 'replacecolor'
         },
         {
           title: '总净重',
-          dataIndex: 'totalSuttle',
+          dataIndex: 'totalNetWeight',
           width: 140,
-          scopedSlots: { customRender: 'totalSuttle' },
           className: 'replacecolor'
         },
 
         {
           title: '毛重/箱',
-          dataIndex: 'roughWeight',
+          dataIndex: 'grossWeight',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '总毛重',
-          dataIndex: 'totalRoughWeigh',
+          dataIndex: 'totalGrossWeight',
           width: 140,
-          scopedSlots: { customRender: 'totalRoughWeigh' },
           className: 'replacecolor'
         },
         {
           title: '外箱长度',
-          dataIndex: 'boxLength',
+          dataIndex: 'outerBoxLength',
           width: 120,
-          //  scopedSlots: { customRender: 'boxLength' },
           className: 'replacecolor'
         },
 
         {
           title: '外箱宽度',
-          dataIndex: 'boxWidth',
+          dataIndex: 'outerBoxWidth',
           width: 140,
-          scopedSlots: { customRender: 'boxWidth' },
           className: 'replacecolor'
         },
         {
           title: '外箱高度',
-          dataIndex: 'boxHeight',
+          dataIndex: 'outerBoxHeight',
           width: 140,
-          scopedSlots: { customRender: 'boxHeight' },
           className: 'replacecolor'
         },
 
@@ -407,63 +402,87 @@ export default {
           title: '总体积',
           dataIndex: 'totalVolume',
           width: 140,
-          scopedSlots: { customRender: 'totalVolume' },
           className: 'replacecolor'
         },
         {
           title: '净净重',
-          dataIndex: 'netNetWeight',
+          dataIndex: 'netWeightToo',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '单价',
-          dataIndex: 'price',
+          dataIndex: 'unitPrice',
           width: 120,
-
           className: 'replacecolor'
         },
         {
           title: '总价',
-          dataIndex: 'totalPrices',
+          dataIndex: 'totalPrice',
           width: 120,
-
           className: 'replacecolor'
         },
         {
           title: '备注(U8)',
-          dataIndex: 'note',
+          dataIndex: 'u8Remarks',
           width: 140,
           fixed: 'right',
           customRender: t => ellipsis(t),
           className: 'replacecolor'
-        },
-
-        {
-          title: '操作',
-          dataIndex: 'operation',
-          scopedSlots: { customRender: 'operationSlot' },
-          width: 160,
-          fixed: 'right',
-          className: 'replacecolor'
         }
       ],
-
-      data: [{}, {}, {}, {}, {}],
+      data: [], //子表信息
       loading: false, // 表格加载
       visible: false,
       // validatorRules: {
-      //   orderNum: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
+      //   orderNumber: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
       //   styleNum: [{ required: true, message: '款号不能为空', trigger: 'blur' }],
       //   name: [{ required: true, message: '品名不能为空', trigger: 'blur' }]
       //   // 待确定还有哪些必填信息
       // },
-      addAdpacking: {},
-      confirmLoading: false
+
+      // confirmLoading: false,
+      dateFormat: 'YYYY-MM-DD',
+      record: {}
+    }
+  },
+
+  // 接收父组件查询方法
+  props: {
+    fatherList: {
+      type: Function,
+      default: null
     }
   },
-  created() {},
+  created() {
+    this.getEditInfo()
+  },
   methods: {
+    getEditInfo() {
+      this.$nextTick(() => {
+        itemByMainId({ id: this.record.id }).then(res => {
+          if (res.code == 0) {
+            console.log('点击的对象', res.result)
+            this.editAdpacking = res.result //主表信息
+            this.data = res.result.syPreAssembledPackingListItemList //子表信息
+          }
+        })
+      })
+    },
+
+    //  保存
+    saveEdit() {
+      console.log('保存编辑、刷新预装箱单-成衣')
+      // const that = this
+      // // 触发表单验证
+      // this.$refs.form.validate(valid => {
+      //   if (valid) {
+      //     that.confirmLoading = true
+      //   }
+      // })
+      this.close()
+      // this.getShipmentList() // 刷新 预装箱单-成衣列表
+    },
     // 参照发运明细
     referShipmentDetails() {
       console.log('打开发运明细')
@@ -472,15 +491,14 @@ export default {
     // 増行
     handleAddColumn() {
       console.log('増行')
-
       const addrow = {
-        accountSet: '',
-        clothesFactory: '',
+        acSetNo: '',
+        garmentFactory: '',
         hod: '',
         styleNo: '',
         poNo: '',
-        itemNoSoon: '',
-        dcLabel: '',
+        itemCode: '',
+        distributionPoint: '',
         prepackSku: '',
         s: '',
         m: '',
@@ -488,60 +506,42 @@ export default {
         xl: '',
         xxl: '',
         xxxl: '',
-        inceptionBoxNo: '',
-        endBoxNo: '',
-        colorChUsa: '',
-        configCode: '',
-        packagesBox: '',
-        boxes: '',
-        totalPackagesNum: '',
-        suttle: '',
-        totalSuttle: '',
+        startingBoxNumber: '',
+        endCaseNumber: '',
+        colour: '',
+        withCode: '',
+        piecesBox: '',
+        boxNumber: '',
+        total: '',
+        netWeight: '',
+        totalNetWeight: '',
+
         roughWeight: '',
-        totalRoughWeigh: '',
-        boxLength: '',
-        boxWidth: '',
-        boxHeight: '',
+        totalGrossWeight: '',
+        outerBoxLength: '',
+        outerBoxWidth: '',
+        outerBoxHeight: '',
         totalVolume: '',
-        netNetWeight: '',
-        price: '',
-        totalPrices: '',
-        note: '',
+        netWeightToo: '',
+        unitPrice: '',
+        totalPrice: '',
+        u8Remarks: '',
         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')
+    onClose() {
       this.visible = false
-      this.$refs.form.resetFields()
+    },
+    handleCancel() {
+      console.log('where')
     },
     aa() {},
     modalFormOk() {}

src/views/order/orderDetailDrawer.vue

@@ -150,7 +150,6 @@
       </a-table>
     </a-card>
   </a-drawer>
-
 </template>
 
 <script>
@@ -161,16 +160,13 @@ import moment from 'moment'
 import { orderByNum } from '@api/document/order'
 
 export default {
-  name: 'OrderList',
+  name: 'OrderDetailDrawer',
   mixins: [JeecgListMixin],
   components: { JEllipsis, moment },
   data() {
-    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     return {
-      description: '订单数据详情 抽屉',
-      visible: false, // 抽屉
-
-      // 表头
+      orderDetail: [], // 主表信息
       childColumns: [
         { title: '款号', width: 100, dataIndex: 'itemNumber', fixed: 'left', className: 'replacecolor' },
         {
@@ -218,16 +214,16 @@ export default {
         },
         { title: '行关闭人', width: 100, dataIndex: 'bankClosedBy', className: 'replacecolor' }
       ],
-      orderDetail: [], // 主表信息
       childData: [], // 子表数据
+
       loading: false, // 表格加载
-      // 分页
       pagination: {
         pageNo: ''
         // total: '',
         // current: '',
         // pageSize: ''
       },
+      visible: false, // 抽屉
       dateFormat: 'YYYY-MM-DD',
       record: {} //点击的订单对象
     }
@@ -247,7 +243,7 @@ export default {
             this.childData = res.result.records
             this.pagination = {
               total: res.result.total,
-               current: res.result.current,
+              current: res.result.current,
               pageSize: res.result.size
             }
           }
@@ -255,18 +251,15 @@ export default {
       })
     },
 
-    // 回显主表信息 正常应该通过id查询
     onClose() {
-      // 关闭抽屉
       this.visible = false
     },
-    // 分页变化时触发
+
     handleTableChange(pagination, filters, sorter) {
-      // console.log('分页器信息', pagination)
       this.pagination.pageNo = pagination.current
       this.getOrderChild()
     }
-  },
+  }
 }
 </script>
 <style lang="less" scoped>

src/views/order/orderList.vue

@@ -88,6 +88,7 @@
         </a-table>
       </div>
     </a-card>
+    
     <!-- 订单数据明细 抽屉 -->
     <orderDetail-drawer ref="orderDetailDrawer" :fatherList="getOrderList" @ok="modalFormOk"></orderDetail-drawer>
   </div>
@@ -185,7 +186,6 @@ export default {
       orderListData: [], // 主表信息
       loading: false, // 表格加载
 
-      // 查询条件
       queryParam: {
         orderNumber: '',
         orderDate: '',
@@ -194,7 +194,7 @@ export default {
         dilivery: '',
         pageNo: '' // 初始页
       },
-      // 分页
+
       pagination: {
         // total: '',
         // current: 0,

src/views/reportForms/order-statistics/external-statistics.vue

@@ -112,13 +112,13 @@ export default {
         {
           title: '部门',
           width: 140,
-          dataIndex: 'department',
+          dataIndex: 'cDepName',
           className: 'replacecolor'
         },
         {
           title: '供应商分类',
           width: 120,
-          dataIndex: 'supplierType',
+          dataIndex: 'cCusCode',
           className: 'replacecolor'
           // customRender: function(text) {
           //   if (text == '1') {
@@ -138,26 +138,26 @@ export default {
         {
           title: '供应商',
           width: 140,
-          dataIndex: 'supplier',
+          dataIndex: 'cVenAbbName',
           className: 'replacecolor'
         },
         {
           title: '计划到货月份',
           width: 120,
-          dataIndex: 'planDeliveryMonth',
+          dataIndex: 'yearMonth',
           customRender: text => {
             return moment(text).format('YYYY-MM')
           },
           className: 'replacecolor'
         },
-        { title: '含税单价', width: 120, dataIndex: 'priceInTax', className: 'replacecolor' },
+        { title: '含税单价', width: 120, dataIndex: 'iNatUnitPrice', className: 'replacecolor' },
         {
           title: '实际数量',
           width: 120,
-          dataIndex: 'realQuantity',
+          dataIndex: 'iQuantity',
           className: 'replacecolor'
         },
-        { title: '本币金额', width: 150, dataIndex: 'localMoney', className: 'replacecolor' }
+        { title: '本币金额', width: 150, dataIndex: 'iNatMoney', className: 'replacecolor' }
       ],
       externalStatisticsData: [],
       loading: false, // 表格加载

src/views/reportForms/order-statistics/interior-statistics.vue

@@ -111,14 +111,13 @@ export default {
         {
           title: '部门',
           width: 140,
-          dataIndex: 'department',
-          // fixed: 'left',
+          dataIndex: 'cDepName',
           className: 'replacecolor'
         },
         {
           title: '供应商分类',
           width: 120,
-          dataIndex: 'supplierType',
+          dataIndex: 'cCusCode',
           className: 'replacecolor'
           // customRender: function(text) {
           //   if (text == '1') {
@@ -138,28 +137,28 @@ export default {
         {
           title: '供应商',
           width: 140,
-          dataIndex: 'supplier',
+          dataIndex: 'cVenAbbName',
           className: 'replacecolor'
         },
-
         {
           title: '计划到货月份',
           width: 120,
-          dataIndex: 'planDeliveryMonth',
+          dataIndex: 'yearMonth',
           customRender: text => {
             return moment(text).format('YYYY-MM')
           },
           className: 'replacecolor'
         },
-        { title: '含税单价', width: 120, dataIndex: 'priceInTax', className: 'replacecolor' },
+        { title: '含税单价', width: 120, dataIndex: 'iNatUnitPrice', className: 'replacecolor' },
         {
           title: '实际数量',
           width: 120,
-          dataIndex: 'realQuantity',
+          dataIndex: 'iQuantity',
           className: 'replacecolor'
         },
-        { title: '本币金额', width: 150, dataIndex: 'LocalMoney', className: 'replacecolor' }
+        { title: '本币金额', width: 150, dataIndex: 'iNatMoney', className: 'replacecolor' }
       ],
+
       interiorData: [
         {
           department: '业务八部',

src/views/shipment-details/editShipDetDrawer.vue

@@ -650,7 +650,6 @@ export default {
       default: null
     }
   },
-  created() {},
 
   methods: {
     getSon(val) {

src/views/shipment-details/shipmentList.vue

@@ -246,7 +246,6 @@ export default {
     return {
       loading: false, // 表格加载
       id: '',
-      // 表头
       shipmentListColumns: [
         {
           title: '单据号',
@@ -460,7 +459,7 @@ export default {
         refer: '',
         pageNo: '' // 点击的页数
       },
-      // 分页
+
       pagination: {
         // total: '',
         // current: 0,
@@ -497,7 +496,6 @@ export default {
 
     //  申报要素
     declareElements(record) {
-      // console.log('点击申报要素hsCode', record.hsCode)
       this.$refs.declareElementsModal.declareElementsModVis = true
       queryDeclarationElements({ hsCode: record.hsCode, id: record.id }).then(res => {
         if (res.success) {