Revert "发运明细调整"

This reverts commit 232591685145bb23af2d663d19651e2a76af8411.

src/views/shipment-details/addShipDetDrawer.vue

@@ -61,35 +61,35 @@
                 </a-form-model-item>
               </a-col>
 
-              <!-- <a-col :md="6" :sm="8">
+              <a-col :md="6" :sm="8">
                 <a-form-model-item label="pack id" prop="packId">
                   <a-input placeholder="请输入pack id" v-model="addShipDet.packId"></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="distributionPoint">
                   <a-input placeholder="请输入分销点" v-model="addShipDet.distributionPoint"></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="todo">
                   <a-input placeholder="合计" v-model="addShipDet.todo"></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="salesUnitPrice">
                   <a-input placeholder="销售" v-model="addShipDet.salesUnitPrice"></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="purOrSubOrder">
                   <a-input placeholder="请输入采购/委外订单号" v-model="addShipDet.purOrSubOrder"></a-input>
                 </a-form-model-item>
-              </a-col> -->
+              </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="订单类型" prop="orderType">
@@ -97,25 +97,25 @@
                 </a-form-model-item>
               </a-col>
 
-              <!-- <a-col :md="6" :sm="8">
+              <a-col :md="6" :sm="8">
                 <a-form-model-item label="工厂单价" prop="factoryUnitPrice">
                   <a-input placeholder="采购/委外单价" v-model="addShipDet.factoryUnitPrice"></a-input>
                 </a-form-model-item>
-              </a-col> -->
+              </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="HScode" prop="hsCode">
-                  <a-input placeholder="HScode" v-model="addShipDet.hsCode"></a-input>
+                <a-form-model-item label="申报要素" prop="declarationElements">
+                  <a-input placeholder="单证维护" v-model="addShipDet.declarationElements"></a-input>
                 </a-form-model-item>
               </a-col>
 
-              <!-- <a-col :md="6" :sm="8">
+              <a-col :md="6" :sm="8">
                 <a-form-model-item label="套装件数" prop="numberOfSets">
                   <a-input placeholder="存货自定义项" v-model="addShipDet.numberOfSets"></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="chineseName">
                   <a-input placeholder="请输入中文品名" v-model="addShipDet.chineseName"></a-input>
                 </a-form-model-item>
@@ -125,7 +125,7 @@
                 <a-form-model-item label="英文品名" prop="englishName">
                   <a-input placeholder="请输入英文品名" v-model="addShipDet.englishName"></a-input>
                 </a-form-model-item>
-              </a-col> -->
+              </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="成衣工厂" prop="garmentFactory">
@@ -133,11 +133,11 @@
                 </a-form-model-item>
               </a-col>
 
-              <!-- <a-col :md="6" :sm="8">
+              <a-col :md="6" :sm="8">
                 <a-form-model-item label="报关单价" prop="customsDeclarationUnitPrice">
                   <a-input placeholder="请输入报关单价" v-model="addShipDet.customsDeclarationUnitPrice"></a-input>
                 </a-form-model-item>
-              </a-col> -->
+              </a-col>
 
               <!-- U8系统适用 -->
               <a-col :md="12" :sm="12">
@@ -181,7 +181,7 @@
               <!-- 发货数量 :rules="rules.shipQuantity"-->
               <template slot="shipQuantity" slot-scope="text, record, index">
                 <a-form-model-item prop="shipmentQuantity">
-                  <a-input style="width:100%" type="text" v-model="record.shipmentQuantity" />
+                  <a-input style="width:100%" type="text" v-model="record.shipQuantity" />
                 </a-form-model-item>
               </template>
 
@@ -189,7 +189,7 @@
               <!-- isTc ' 是否 tc 功能 0 否 1 是', -->
               <template slot="isTC" slot-scope="text, record, index">
                 <a-form-model-item prop="isTc">
-                  <a-select v-model="record.isTc">
+                  <a-select v-model="record.isTC">
                     <a-select-option value="">请选择</a-select-option>
                     <a-select-option :value="1">是</a-select-option>
                     <a-select-option :value="0">否</a-select-option>
@@ -203,52 +203,6 @@
                   <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"-->
-              <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">
-                <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">
-                <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">
-                <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">
-                <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">
-                <a-form-model-item prop="englishName">
-                  <a-input style="width:100%" type="text" v-model="record.englishName" />
-                </a-form-model-item>
-              </template>
 
               <!-- 操作 -->
               <template slot="operationSlot" slot-scope="text, record, index">
@@ -381,31 +335,8 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '分销点',
-          dataIndex: 'distributionPoint',
-          width: 120,
-          className: 'replacecolor'
-        },
-         {
-          title: '采购/委外订单号',
-          dataIndex: 'purOrSubOrder',
-          scopedSlots: { customRender: 'purOrSubOrder' },
-         // fixed: 'left',
-          width: 180,
-          className: 'replacecolor'
-        },
-         {
-          title: ' 报关单价',
-          dataIndex: 'customsDeclarationUnitPrice',
-          scopedSlots: { customRender: 'customsDeclarationUnitPrice' },
-         // fixed: 'left',
-          width: 180,
-          className: 'replacecolor'
-        },
-       
-        {
-          title: '订单数量',
-          dataIndex: 'orderQuantity',
+          title: '订单数据',
+          dataIndex: 'orderDate',
           width: 120,
           className: 'replacecolor'
         },
@@ -423,14 +354,6 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-        
-         {
-          title: '套装件数',
-          dataIndex: 'numberOfSets',
-          scopedSlots: { customRender: 'numberOfSets' },
-          width: 120,
-          className: 'replacecolor'
-        },
         {
           title: '是否TC功能',
           dataIndex: 'isTC',
@@ -470,12 +393,12 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-        // {
-        //   title: '数量（合计）',
-        //   dataIndex: 'wholeOrderTotal',
-        //   width: 120,
-        //   className: 'replacecolor'
-        // },
+        {
+          title: '整单合计',
+          dataIndex: 'wholeOrderTotal',
+          width: 120,
+          className: 'replacecolor'
+        },
 
         {
           title: '销售部门',
@@ -527,19 +450,6 @@ export default {
           className: 'replacecolor'
         },
 
-        {
-          title: '单价(销售)',
-          dataIndex: 'salesUnitPrice',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '工厂单价',
-          dataIndex: 'factoryUnitPrice',
-          width: 120,
-          scopedSlots: { customRender: 'factoryUnitPrice' },
-          className: 'replacecolor'
-        },
         {
           title: '付款条件',
           dataIndex: 'termOfPayment',
@@ -561,28 +471,6 @@ export default {
           className: 'replacecolor'
         },
 
-        {
-          title: '申报要素',
-          dataIndex: 'declarationElements',
-          width: 160,
-          scopedSlots: { customRender: 'declarationElements' },
-          className: 'replacecolor'
-        },
-         {
-          title: '中文品名',
-          dataIndex: 'chineseName',
-          width: 160,
-          scopedSlots: { customRender: 'chineseName' },
-          className: 'replacecolor'
-        },
-        
-        {
-          title: '英文品名',
-          dataIndex: 'englishName',
-          width: 160,
-          scopedSlots: { customRender: 'englishName' },
-          className: 'replacecolor'
-        },
         {
           title: '价格备注',
           dataIndex: 'priceRemarks',
@@ -630,11 +518,6 @@ 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;
-     }
       this.msgFormSon = val
       this.syShippingDetailsItemList = this.msgFormSon
       console.log('新增页 子表信息', this.syShippingDetailsItemList)
@@ -654,20 +537,19 @@ export default {
       newObj.preDeliveryDate = this.addShipDet.preDeliveryDate.format('YYYY-MM-DD') // 预发货日期
       newObj.preCompletionDate = this.addShipDet.preCompletionDate.format('YYYY-MM-DD') // 预完工日期
       // 2022-06-10 增加的字段
-      // newObj.packId = this.addShipDet.packId
-      // newObj.distributionPoint = this.addShipDet.distributionPoint
-      // newObj.todo = this.addShipDet.todo //数量（合计）
-      // newObj.salesUnitPrice = this.addShipDet.salesUnitPrice
-      // newObj.purOrSubOrder = this.addShipDet.purOrSubOrder
-       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.englishName = this.addShipDet.englishName
-       newObj.garmentFactory = this.addShipDet.garmentFactory
-       newObj.hsCode = this.addShipDet.hsCode
-      // newObj.customsDeclarationUnitPrice = this.addShipDet.customsDeclarationUnitPrice
+      newObj.packId = this.addShipDet.packId
+      newObj.distributionPoint = this.addShipDet.distributionPoint
+      newObj.todo = this.addShipDet.todo //数量（合计）
+      newObj.salesUnitPrice = this.addShipDet.salesUnitPrice
+      newObj.purOrSubOrder = this.addShipDet.purOrSubOrder
+      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.englishName = this.addShipDet.englishName
+      newObj.garmentFactory = this.addShipDet.garmentFactory
+      newObj.customsDeclarationUnitPrice = this.addShipDet.customsDeclarationUnitPrice
 
       newObj.memo = this.addShipDet.memo // U8系统适用
       newObj.syShippingDetailsItemList = this.syShippingDetailsItemList // 子表信息赋值
@@ -791,6 +673,6 @@ export default {
 
 // 子表下拉显示
 /deep/ .ant-card-body {
-  margin-bottom: 10px;
+  margin-bottom: 50px;
 }
 </style>

src/views/shipment-details/referOrderDataModal.vue

@@ -170,19 +170,7 @@ export default {
           width: 100,
           className: 'replacecolor'
         },
-        {
-          title: '订单剩余数量',
-          dataIndex: 'surplusNum',
-          width: 100,
-          className: 'replacecolor'
-        },
 
-  {
-          title: '含税单价',
-          dataIndex: 'unitPriceIncludingTax',
-          width: 100,
-          className: 'replacecolor'
-        },
         {
           title: '业务类型',
           dataIndex: 'businessTypeText',