【发运明细】完善

src/views/shipment-details/addShipDetDrawer.vue

@@ -120,14 +120,14 @@
                   <a-input placeholder="请输入中文品名" v-model="addShipDet.chineseName"></a-input>
                 </a-form-model-item>
               </a-col>
-          
+
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="英文品名" prop="englishProductName">
                   <a-input placeholder="请输入英文品名" v-model="addShipDet.englishProductName"></a-input>
                 </a-form-model-item>
-              </a-col> 
+              </a-col>
 
-                 <a-col :md="6" :sm="8">
+              <a-col :md="6" :sm="8">
                 <a-form-model-item label="报关品名" prop="declarationName">
                   <a-input placeholder="请输入报关品名" v-model="addShipDet.declarationName"></a-input>
                 </a-form-model-item>
@@ -139,6 +139,11 @@
                 </a-form-model-item>
               </a-col>
 
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="整单合计" prop="wholeOrderTotal">
+                  <a-input placeholder="整单合计" v-model="addShipDet.wholeOrderTotal"></a-input>
+                </a-form-model-item>
+              </a-col>
               <!-- <a-col :md="6" :sm="8">
                 <a-form-model-item label="报关单价" prop="customsDeclarationUnitPrice">
                   <a-input placeholder="请输入报关单价" v-model="addShipDet.customsDeclarationUnitPrice"></a-input>
@@ -185,7 +190,7 @@
               </template>
 
               <!-- 发货数量 :rules="rules.shipQuantity"-->
-              <template slot="shipQuantity" slot-scope="text, record, index">
+              <template slot="shipmentQuantity" slot-scope="text, record, index">
                 <a-form-model-item prop="shipmentQuantity">
                   <a-input style="width:100%" type="text" v-model="record.shipmentQuantity" />
                 </a-form-model-item>
@@ -209,48 +214,48 @@
                   <a-input style="width:100%" type="text" v-model="record.materialComposition" />
                 </a-form-model-item>
               </template>
-              
+
               <!-- 采购/委外订单号 :rules="rules.purOrSubOrder"-->
               <template slot="purOrSubOrder" slot-scope="text, record, index">
                 <a-form-model-item prop="purOrSubOrder">
                   <a-input style="width:100%" type="text" v-model="record.purOrSubOrder" />
                 </a-form-model-item>
               </template>
-              
-               <!-- 报关单价 :rules="rules.customsDeclarationUnitPrice"-->
+
+              <!-- 报关单价 :rules="rules.customsDeclarationUnitPrice"-->
               <template slot="customsDeclarationUnitPrice" slot-scope="text, record, index">
                 <a-form-model-item prop="customsDeclarationUnitPrice">
                   <a-input style="width:100%" type="text" v-model="record.customsDeclarationUnitPrice" />
                 </a-form-model-item>
               </template>
-               <!-- 套装件数 :rules="rules.numberOfSets"-->
-               <template slot="numberOfSets" slot-scope="text, record, index">
+              <!-- 套装件数 :rules="rules.numberOfSets"-->
+              <template slot="numberOfSets" slot-scope="text, record, index">
                 <a-form-model-item prop="numberOfSets">
                   <a-input style="width:100%" type="text" v-model="record.numberOfSets" />
                 </a-form-model-item>
               </template>
-              
+
               <!-- 工厂单价 :rules="rules.factoryUnitPrice"-->
-               <template slot="factoryUnitPrice" slot-scope="text, record, index">
+              <template slot="factoryUnitPrice" slot-scope="text, record, index">
                 <a-form-model-item prop="factoryUnitPrice">
                   <a-input style="width:100%" type="text" v-model="record.factoryUnitPrice" />
                 </a-form-model-item>
               </template>
-              
-                <!-- 申报要素 :rules="rules.declarationElements"-->
-               <template slot="declarationElements" slot-scope="text, record, index">
+
+              <!-- 申报要素 :rules="rules.declarationElements"-->
+              <template slot="declarationElements" slot-scope="text, record, index">
                 <a-form-model-item prop="declarationElements">
                   <a-input style="width:100%" type="text" v-model="record.declarationElements" />
                 </a-form-model-item>
               </template>
-                <!-- 中文品名 :rules="rules.chineseName"-->
-               <!-- <template slot="chineseName" slot-scope="text, record, index">
+              <!-- 中文品名 :rules="rules.chineseName"-->
+              <!-- <template slot="chineseName" slot-scope="text, record, index">
                 <a-form-model-item prop="chineseName">
                   <a-input style="width:100%" type="text" v-model="record.chineseName" />
                 </a-form-model-item>
               </template> -->
-                <!-- 英文品名 :rules="rules.englishName"-->
-               <!-- <template slot="englishName" slot-scope="text, record, index">
+              <!-- 英文品名 :rules="rules.englishName"-->
+              <!-- <template slot="englishName" slot-scope="text, record, index">
                 <a-form-model-item prop="englishName">
                   <a-input style="width:100%" type="text" v-model="record.englishName" />
                 </a-form-model-item>
@@ -345,6 +350,7 @@ export default {
           width: 180,
           className: 'replacecolor'
         },
+
         // {
         //   title: '创建时间',
         //   dataIndex: 'createTime',
@@ -369,7 +375,7 @@ export default {
 
         {
           title: '客户订单',
-          dataIndex: 'customerOrderNumber',
+          dataIndex: 'customerOrder',
           width: 120,
 
           className: 'replacecolor'
@@ -392,23 +398,23 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-         {
+        {
           title: '采购/委外订单号',
           dataIndex: 'purOrSubOrder',
           scopedSlots: { customRender: 'purOrSubOrder' },
-         // fixed: 'left',
+          // fixed: 'left',
           width: 180,
           className: 'replacecolor'
         },
-         {
+        {
           title: ' 报关单价',
           dataIndex: 'customsDeclarationUnitPrice',
           scopedSlots: { customRender: 'customsDeclarationUnitPrice' },
-         // fixed: 'left',
+          // fixed: 'left',
           width: 180,
           className: 'replacecolor'
         },
-       
+
         {
           title: '订单数量',
           dataIndex: 'orderQuantity',
@@ -424,13 +430,13 @@ export default {
 
         {
           title: '发货数量',
-          dataIndex: 'shipQuantity',
-          scopedSlots: { customRender: 'shipQuantity' },
+          dataIndex: 'shipmentQuantity',
+          scopedSlots: { customRender: 'shipmentQuantity' },
           width: 120,
           className: 'replacecolor'
         },
-        
-         {
+
+        {
           title: '套装件数',
           dataIndex: 'numberOfSets',
           scopedSlots: { customRender: 'numberOfSets' },
@@ -477,12 +483,11 @@ export default {
           className: 'replacecolor'
         },
         // {
-        //   title: '数量（合计）',
+        //   title: '整单（合计）',
         //   dataIndex: 'wholeOrderTotal',
         //   width: 120,
         //   className: 'replacecolor'
         // },
-
         {
           title: '销售部门',
           dataIndex: 'salesDepartment',
@@ -581,7 +586,7 @@ export default {
         //   scopedSlots: { customRender: 'chineseName' },
         //   className: 'replacecolor'
         // },
-        
+
         // {
         //   title: '英文品名',
         //   dataIndex: 'englishName',
@@ -603,6 +608,18 @@ export default {
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
+        {
+          title: '订单子表ID',
+          dataIndex: 'syOrderDataItemId',
+          width: 80,
+          className: 'replacecolor'
+        },
+        {
+          title: '订单主表ID',
+          dataIndex: 'syOrderDataId',
+          width: 80,
+          className: 'replacecolor'
+        },
         {
           title: '操作',
           dataIndex: 'operation',
@@ -636,11 +653,12 @@ export default {
   methods: {
     getSon(val) {
       console.log('勾选订单数据', val)
-     for(var i in val) {
-       val[i]['orderQuantity'] = val[i].quantity;
-       val[i]['orderRemainingQuantity'] = val[i].surplusNum;
-       val[i]['salesUnitPrice'] = val[i].unitPriceIncludingTax;
-     }
+      for (var i in val) {
+        val[i]['orderQuantity'] = val[i].quantity
+        val[i]['orderRemainingQuantity'] = val[i].surplusNum
+        val[i]['salesUnitPrice'] = val[i].unitPriceIncludingTax
+        val[i]['customerOrder'] = val[i].customerOrderNumber
+      }
       this.msgFormSon = val
       this.syShippingDetailsItemList = this.msgFormSon
       console.log('新增页 子表信息', this.syShippingDetailsItemList)
@@ -665,17 +683,17 @@ export default {
       // newObj.todo = this.addShipDet.todo //数量（合计）
       // newObj.salesUnitPrice = this.addShipDet.salesUnitPrice
       // newObj.purOrSubOrder = this.addShipDet.purOrSubOrder
-       newObj.orderType = this.addShipDet.orderType
+      newObj.orderType = this.addShipDet.orderType
       // newObj.factoryUnitPrice = this.addShipDet.factoryUnitPrice
       // newObj.declarationElements = this.addShipDet.declarationElements
       // newObj.numberOfSets = this.addShipDet.numberOfSets
-       newObj.chineseName = this.addShipDet.chineseName
-       newObj.englishProductName = this.addShipDet.englishProductName
-       newObj.garmentFactory = this.addShipDet.garmentFactory
-       newObj.hsCode = this.addShipDet.hsCode
-       newObj.declarationName = this.addShipDet.declarationName
+      newObj.chineseName = this.addShipDet.chineseName
+      newObj.englishProductName = this.addShipDet.englishProductName
+      newObj.garmentFactory = this.addShipDet.garmentFactory
+      newObj.hsCode = this.addShipDet.hsCode
+      newObj.declarationName = this.addShipDet.declarationName
       // newObj.customsDeclarationUnitPrice = this.addShipDet.customsDeclarationUnitPrice
-
+      newObj.wholeOrderTotal = this.addShipDet.wholeOrderTotal
       newObj.memo = this.addShipDet.memo // U8系统适用
       newObj.syShippingDetailsItemList = this.syShippingDetailsItemList // 子表信息赋值
 
@@ -784,10 +802,9 @@ export default {
 /deep/ .ant-table-tbody {
   text-align: center;
 }
-/deep/ th.replacecolor {
-  // background-color: #ccc;
-  display: none;
-}
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
 
 // 抽屉里的card样式
 /deep/ .ant-drawer-content {

src/views/shipment-details/editShipDetDrawer.vue

@@ -1,20 +1,14 @@
 <template>
   <!-- 编辑发运明细 -->
   <div id="editShipDetDrawer">
-    <a-drawer
-      title="编辑"
-      width="89%"
-      placement="right"
-      :closable="true"
-      :visible="visible"
-      @close="handleCancel">
+    <a-drawer title="编辑" width="89%" placement="right" :closable="true" :visible="visible" @close="handleCancel">
       <!-- 主表信息 编辑 :rules="validatorRules"-->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
-          <a-form-model layout="inline" ref="form" :model="editShipDet" >
+          <a-form-model layout="inline" ref="form" :model="editShipDet">
             <!-- 主表信息 填写-->
             <a-row :gutter="24">
-               <a-col :md="6" :sm="8">
+              <a-col :md="6" :sm="8">
                 <!-- required必填项 disabled 禁用  -->
                 <a-form-model-item label="单据号" prop="documentNo">
                   <a-input placeholder="请输入单据号" v-model="editShipDet.documentNo"></a-input>
@@ -119,14 +113,14 @@
                   <a-input placeholder="请输入中文品名" v-model="editShipDet.chineseName"></a-input>
                 </a-form-model-item>
               </a-col>
-          
+
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="英文品名" prop="englishProductName">
                   <a-input placeholder="请输入英文品名" v-model="editShipDet.englishProductName"></a-input>
                 </a-form-model-item>
-              </a-col> 
+              </a-col>
 
-                 <a-col :md="6" :sm="8">
+              <a-col :md="6" :sm="8">
                 <a-form-model-item label="报关品名" prop="declarationName">
                   <a-input placeholder="请输入报关品名" v-model="editShipDet.declarationName"></a-input>
                 </a-form-model-item>
@@ -163,7 +157,7 @@
 
         <!-- 子表  :model="form" :rules="validatorRules"-->
         <a-spin :spinning="confirmLoading">
-          <a-form-model ref="formRef" >
+          <a-form-model ref="formRef">
             <a-table
               v-if="syShippingDetailsItemList"
               bordered
@@ -207,48 +201,48 @@
                   <a-input style="width:100%" type="text" v-model="record.materialComposition" />
                 </a-form-model-item>
               </template>
-              
+
               <!-- 采购/委外订单号 :rules="rules.purOrSubOrder"-->
               <template slot="purOrSubOrder" slot-scope="text, record, index">
                 <a-form-model-item prop="purOrSubOrder">
                   <a-input style="width:100%" type="text" v-model="record.purOrSubOrder" />
                 </a-form-model-item>
               </template>
-              
-               <!-- 报关单价 :rules="rules.customsDeclarationUnitPrice"-->
+
+              <!-- 报关单价 :rules="rules.customsDeclarationUnitPrice"-->
               <template slot="customsDeclarationUnitPrice" slot-scope="text, record, index">
                 <a-form-model-item prop="customsDeclarationUnitPrice">
                   <a-input style="width:100%" type="text" v-model="record.customsDeclarationUnitPrice" />
                 </a-form-model-item>
               </template>
-               <!-- 套装件数 :rules="rules.numberOfSets"-->
-               <template slot="numberOfSets" slot-scope="text, record, index">
+              <!-- 套装件数 :rules="rules.numberOfSets"-->
+              <template slot="numberOfSets" slot-scope="text, record, index">
                 <a-form-model-item prop="numberOfSets">
                   <a-input style="width:100%" type="text" v-model="record.numberOfSets" />
                 </a-form-model-item>
               </template>
-              
+
               <!-- 工厂单价 :rules="rules.factoryUnitPrice"-->
-               <template slot="factoryUnitPrice" slot-scope="text, record, index">
+              <template slot="factoryUnitPrice" slot-scope="text, record, index">
                 <a-form-model-item prop="factoryUnitPrice">
                   <a-input style="width:100%" type="text" v-model="record.factoryUnitPrice" />
                 </a-form-model-item>
               </template>
-              
-                <!-- 申报要素 :rules="rules.declarationElements"-->
-               <template slot="declarationElements" slot-scope="text, record, index">
+
+              <!-- 申报要素 :rules="rules.declarationElements"-->
+              <template slot="declarationElements" slot-scope="text, record, index">
                 <a-form-model-item prop="declarationElements">
                   <a-input style="width:100%" type="text" v-model="record.declarationElements" />
                 </a-form-model-item>
               </template>
-                <!-- 中文品名 :rules="rules.chineseName"-->
-               <!-- <template slot="chineseName" slot-scope="text, record, index">
+              <!-- 中文品名 :rules="rules.chineseName"-->
+              <!-- <template slot="chineseName" slot-scope="text, record, index">
                 <a-form-model-item prop="chineseName">
                   <a-input style="width:100%" type="text" v-model="record.chineseName" />
                 </a-form-model-item>
               </template> -->
-                <!-- 英文品名 :rules="rules.englishName"-->
-               <!-- <template slot="englishName" slot-scope="text, record, index">
+              <!-- 英文品名 :rules="rules.englishName"-->
+              <!-- <template slot="englishName" slot-scope="text, record, index">
                 <a-form-model-item prop="englishName">
                   <a-input style="width:100%" type="text" v-model="record.englishName" />
                 </a-form-model-item>
@@ -310,7 +304,7 @@ export default {
     return {
       id: '',
       // 表头
-       columns: [
+      columns: [
         {
           title: '账套',
           dataIndex: 'account',
@@ -380,23 +374,23 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-         {
+        {
           title: '采购/委外订单号',
           dataIndex: 'purOrSubOrder',
           scopedSlots: { customRender: 'purOrSubOrder' },
-         // fixed: 'left',
+          // fixed: 'left',
           width: 180,
           className: 'replacecolor'
         },
-         {
+        {
           title: ' 报关单价',
           dataIndex: 'customsDeclarationUnitPrice',
           scopedSlots: { customRender: 'customsDeclarationUnitPrice' },
-         // fixed: 'left',
+          // fixed: 'left',
           width: 180,
           className: 'replacecolor'
         },
-       
+
         {
           title: '订单数量',
           dataIndex: 'orderQuantity',
@@ -417,8 +411,8 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-        
-         {
+
+        {
           title: '套装件数',
           dataIndex: 'numberOfSets',
           scopedSlots: { customRender: 'numberOfSets' },
@@ -465,7 +459,7 @@ export default {
           className: 'replacecolor'
         },
         // {
-        //   title: '数量（合计）',
+        //   title: '整单（合计）',
         //   dataIndex: 'wholeOrderTotal',
         //   width: 120,
         //   className: 'replacecolor'
@@ -569,7 +563,7 @@ export default {
         //   scopedSlots: { customRender: 'chineseName' },
         //   className: 'replacecolor'
         // },
-        
+
         // {
         //   title: '英文品名',
         //   dataIndex: 'englishName',

src/views/shipment-details/referOrderDataModal.vue

@@ -316,6 +316,28 @@ export default {
           dataIndex: 'orderChangeDescription',
           width: 220,
           customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        },
+        {
+          title: '订单主表ID',
+          dataIndex: 'syOrderDataId',
+          width: 120,
+          //  colSpan:0,     //隐藏表头
+          //     customRender: (value, row, index) => {
+          //         let obj = {
+          //             children: value,
+          //             attrs: {},
+          //         };
+          //         obj.attrs.colSpan = 0;
+          //         return obj;
+          //     },
+          className: 'replacecolor1'
+        },
+        {
+          title: '订单子表ID',
+          dataIndex: 'syOrderDataItemId',
+          width: 120,
+
           className: 'replacecolor'
         }
       ],
@@ -439,7 +461,7 @@ export default {
 /deep/ .ant-table-tbody {
   text-align: center;
 }
-// th.replacecolor {
-// background-color:  #ccc;
+// /deep/ th.replacecolor1 {
+// display: none;
 // }
 </style>