添加字段

src/field/document/shipmentDetail.md

@@ -22,7 +22,8 @@ englishProductName '英文品名',
 state 单据状态    （0 保存，1 提交）
 pushState 推送状态    （0 默认未推送   1 要推送，2 推送失败）
 syShippingDetailsItemList 发运明细子表集合;
- 
+ distributionPoint 分销点，
+ packId  pack_id
 #### 发运明细子表字段
 
 id '主键 id',

src/views/shipment-details/addShipDetDrawer.vue

@@ -127,14 +127,18 @@
               </template>
 
               <!-- 操作 -->
-              <span slot="operationSlot" slot-scope="text, record,index">
-                <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record.index)">
+              <template slot="operationSlot" slot-scope="text, record, index">
+                <a-popconfirm
+                  v-if="syShippingDetailsItemList.length"
+                  title="确定删除吗?"
+                  @confirm="handleDelete(record)">
                   <a href="javascript:void(0);" style="color:red;">删除</a>
                 </a-popconfirm>
 
                 <a-divider type="vertical" />
+
                 <a @click="copy(record)">复制</a>
-              </span>
+              </template>
             </a-table>
           </a-form-model>
         </a-spin>
@@ -519,8 +523,8 @@ export default {
     },
     // --------------------------------------
     // 操作 删除
-    handleDelete(index) {
-      console.log('index', index)
+    handleDelete(record) {
+      console.log('record', record)
       console.log('删除该项订单数据', record.orderNumber)
       return this.syShippingDetailsItemList.splice(record)
     },

src/views/shipment-details/referOrderDataModal.vue

@@ -127,7 +127,18 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-
+        {
+          title: 'packId',
+          dataIndex: 'packId',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '分销点',
+          dataIndex: 'distributionPoint ',
+          width: 120,
+          className: 'replacecolor'
+        },
         {
           title: '存货名称',
           dataIndex: 'inventoryName',

src/views/shipment-details/shipmentList.vue

@@ -161,7 +161,7 @@
             </a-menu>
 
             <!-- 推送成功 且 已提交 -->
-            <a-menu slot="overlay" v-if="record.state == '1' && record.pushState == '1'">
+            <a-menu slot="overlay" v-if="record.pushState == '1' && record.state == '1'">
               <a-menu-item>
                 <a @click="details(record)">详情</a>
               </a-menu-item>