列表新增字段

src/views/list/PackageList.vue

@@ -10,7 +10,12 @@
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
-              <a-form-item label="订单状态">
+              <a-form-item label="唛头">
+                <a-input v-model="queryParam.storage_id" placeholder="请输入唛头"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="8" :sm="24">
+              <a-form-item label="报备状态">
                 <!-- 5拆包中 10 未付款  20待发货  29已发货  30已完成 -->
                 <a-select v-model="queryParam.status" placeholder="请选择" default-value="0">
                   <a-select-option value="0">全部</a-select-option>
@@ -71,8 +76,8 @@
           <template>
             <a @click="handleSub(record)">详情</a>
             <a-divider v-if="record && (record.order_status === 5 || record.order_status === 20 || record.order_status === 29)" type="vertical" />
-            <a  @click="handleEdit(record)" v-if="record && (record.order_status === 5 || record.order_status === 20 || record.order_status === 29)">
-              {{record.order_status === 5 ? '打包完成' : (record.order_status === 20 ? '已发货':(record.order_status === 29 ? '完成':''))}}</a>
+            <a @click="handleEdit(record)" v-if="record && (record.order_status === 5 || record.order_status === 20 || record.order_status === 29)">
+              {{ record.order_status === 5 ? '打包完成' : (record.order_status === 20 ? '已发货':(record.order_status === 29 ? '完成':'')) }}</a>
           </template>
         </span>
       </s-table>
@@ -119,13 +124,17 @@ import detailForm from './modules/detailForm'
 
 const columns = [
   {
-    title: '订单id',
+    title: 'ID',
     dataIndex: 'id'
   },
   {
     title: '物流单号',
     dataIndex: 'tracking_no'
   },
+  {
+    title: '唛头',
+    dataIndex: 'storage_id'
+  },
   {
     title: '物流公司',
     dataIndex: 'express_com_name'
@@ -144,13 +153,9 @@ const columns = [
   //   scopedSlots: { customRender: 'status' }
   // },
   {
-    title: '订单状态',
+    title: '包裹状态',
     dataIndex: 'report_status_text'
   },
-  {
-    title: '订单来源',
-    dataIndex: 'from_text'
-  },
   {
     title: '类目',
     dataIndex: 'item_names'
@@ -160,8 +165,8 @@ const columns = [
     dataIndex: 'report_remark'
   },
   {
-    title: '入库时间',
-    dataIndex: 'storage_time',
+    title: '报备时间',
+    dataIndex: 'create_time',
     sorter: true
   },
   {
@@ -170,13 +175,18 @@ const columns = [
     sorter: true
   },
   {
-    title: '取消时间',
-    dataIndex: 'delete_time'
+    title: '订单来源',
+    dataIndex: 'from_text'
   },
+
   {
-    title: '下单时间',
-    dataIndex: 'create_time',
+    title: '入库时间',
+    dataIndex: 'storage_time',
     sorter: true
+  },
+  {
+    title: '取消时间',
+    dataIndex: 'delete_time'
   }
   // ,
   // {
@@ -391,8 +401,11 @@ export default {
               }
             })
             .catch(error => {
+              this.confirmLoading = false
               console.error('TableList - loadData error:', error)
-            })
+            }).finally(() => {
+              this.confirmLoading = false
+          })
         } else {
           this.confirmLoading = false
         }

src/views/list/TableList.vue

@@ -9,6 +9,21 @@
                 <a-input v-model="queryParam.id" placeholder="请输入"/>
               </a-form-item>
             </a-col>
+            <a-col :md="8" :sm="24">
+              <a-form-item label="申请打包的物流单号">
+                <a-input v-model="queryParam.tracking_no" placeholder="请输入"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="8" :sm="24">
+              <a-form-item label="国际物流单号">
+                <a-input v-model="queryParam.new_tracking_no" placeholder="请输入"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="8" :sm="24">
+              <a-form-item label="唛头">
+                <a-input v-model="queryParam.member_id" placeholder="请输入"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="8" :sm="24">
               <a-form-item label="订单状态">
                 <!-- 5拆包中 10 未付款  20待发货  29已发货  30已完成 -->
@@ -53,13 +68,32 @@
         <span slot="description" slot-scope="text">
           <ellipsis :length="4" tooltip>{{ text }}</ellipsis>
         </span>
+        <span slot="package" slot-scope="text, record">
+          <template>
+            <!-- 假设 text 是你传递的对象或数组 -->
+            <div v-for="(item, index) in record.package" :key="index">
+              {{ item.tracking_no }} （{{ item.item_names }}）
+            </div>
+          </template>
+        </span>
+        <span slot="address" slot-scope="text, record">
+          <template>
+            <!-- 假设 text 是你传递的对象或数组 -->
+            <div v-if="record.address">收件人： {{ record.address.receiver_name }}</div>
+            <div v-if="record.address">手机号： {{ record.address.receiver_phone }}</div>
+            <div v-if="record.address">国家： {{ record.address.receiver_country }}</div>
+            <div v-if="record.address">城市： {{ record.address.receiver_city }}</div>
+            <div v-if="record.address">详情地址： {{ record.address.receive_address }}</div>
+            <div v-if="record.address">邮编： {{ record.address.receiver_zip_code }}</div>
+          </template>
+        </span>
 
         <span slot="action" slot-scope="text, record">
           <template>
             <a @click="handleSub(record)">详情</a>
             <a-divider v-if="record && (record.order_status === 5 || record.order_status === 20 || record.order_status === 29)" type="vertical" />
-            <a  @click="handleEdit(record)" v-if="record && (record.order_status === 5 || record.order_status === 20 || record.order_status === 29)">
-              {{record.order_status === 5 ? '打包完成' : (record.order_status === 20 ? '已发货':(record.order_status === 29 ? '完成':''))}}</a>
+            <a @click="handleEdit(record)" v-if="record && (record.order_status === 5 || record.order_status === 20 || record.order_status === 29)">
+              {{ record.order_status === 5 ? '打包完成' : (record.order_status === 20 ? '已发货':(record.order_status === 29 ? '完成':'')) }}</a>
           </template>
         </span>
       </s-table>
@@ -109,15 +143,41 @@ const columns = [
     title: '订单id',
     dataIndex: 'id'
   },
+  {
+    title: '订单号',
+    dataIndex: 'order_sn'
+  },
+  {
+    title: '物流',
+    dataIndex: 'line.name'
+  },
+  {
+    title: '用户打包备注',
+    dataIndex: 'pack_remark'
+  },
+  {
+    title: '唛头',
+    dataIndex: 'member_id'
+  },
   {
     title: '名称',
     dataIndex: 'pack_item_name'
   },
   {
-    title: '订单金额',
-    dataIndex: 'order_amount'
-    // scopedSlots: { customRender: 'description' }
+    title: '申请包裹列表',
+    dataIndex: 'package',
+    scopedSlots: { customRender: 'package' }
   },
+  {
+    title: '收件人信息',
+    dataIndex: 'address',
+    scopedSlots: { customRender: 'address' }
+  },
+ // {
+//    title: '订单金额',
+ //   dataIndex: 'order_amount'
+    // scopedSlots: { customRender: 'description' }
+//  },
   // {
   //   title: '服务调用次数',
   //   dataIndex: 'callNo',
@@ -139,7 +199,7 @@ const columns = [
     dataIndex: 'pay_status_text'
   },
   {
-    title: '下单时间',
+    title: '申请打包时间',
     dataIndex: 'create_time',
     sorter: true
   },

src/views/list/modules/CreateForm.vue

@@ -10,13 +10,16 @@
     <a-spin :spinning="loading">
       <a-form :form="form" v-bind="formLayout">
         <!-- 检查是否有 id 并且大于0，大于0是修改。其他是新增，新增不显示主键ID -->
+        <a-form-item label="唛头">
+          <a-input v-decorator="['storage_id']" placeholder="如果有唛头，请输入唛头"/>
+        </a-form-item>
         <a-form-item label="物流单号">
           <!-- <a-input v-decorator="['tracking_no_list', {rules: [{required: true, min: 5, message: '请输入至少五个字符的规则描述！'}]}]" /> -->
           <a-textarea
-      v-decorator="['tracking_no_list', {rules: [{required: true,  message: '请输入物流单号'}]}]"
-      placeholder="输入一行一个单号"
-      auto-size
-    />
+            v-decorator="['tracking_no_list', {rules: [{required: true, message: '请输入物流单号'}]}]"
+            placeholder="输入一行一个单号"
+            auto-size
+          />
         </a-form-item>
       </a-form>
     </a-spin>
@@ -27,7 +30,7 @@
 import pick from 'lodash.pick'
 
 // 表单字段
-const fields = ['tracking_no_list', 'id']
+const fields = ['tracking_no_list', 'id', 'storage_id']
 
 export default {
   props: {

src/views/list/modules/deliveryForm.vue

@@ -41,21 +41,18 @@
           />
         </a-form-item>
         <!-- 体积重量等字段，仅在 order_status === 5 时显示 -->
-<a-form-item v-if="model && model.order_status === 5" label="重量">
-  <a-input v-decorator="['weight']" placeholder="请输入重量" />
-</a-form-item>
-<a-form-item v-if="model && model.order_status === 5" label="长">
-  <a-input v-decorator="['length']" placeholder="请输入长度" />
-</a-form-item>
-<a-form-item v-if="model && model.order_status === 5" label="宽">
-  <a-input v-decorator="['width']" placeholder="请输入宽度" />
-</a-form-item>
-<a-form-item v-if="model && model.order_status === 5" label="高">
-  <a-input v-decorator="['height']" placeholder="请输入高度" />
-</a-form-item>
-<a-form-item v-if="model && model.order_status === 5" label="订单金额">
-  <a-input v-decorator="['order_amount']" placeholder="请输入订单金额" />
-</a-form-item>
+        <a-form-item v-if="model && model.order_status === 5" label="重量">
+          <a-input v-decorator="['weight']" placeholder="请输入重量" />
+        </a-form-item>
+        <a-form-item v-if="model && model.order_status === 5" label="长">
+          <a-input v-decorator="['length']" placeholder="请输入长度" />
+        </a-form-item>
+        <a-form-item v-if="model && model.order_status === 5" label="宽">
+          <a-input v-decorator="['width']" placeholder="请输入宽度" />
+        </a-form-item>
+        <a-form-item v-if="model && model.order_status === 5" label="高">
+          <a-input v-decorator="['height']" placeholder="请输入高度" />
+        </a-form-item>
       </a-form>
     </a-spin>
   </a-modal>
@@ -65,7 +62,7 @@
 import pick from 'lodash.pick'
 import { imgUpload } from '@/api/manage'
 
-const fields = ['img_url', 'tracking_no', 'logistics_url', 'id', 'weight', 'length', 'width', 'height', 'order_amount']
+const fields = ['img_url', 'tracking_no', 'logistics_url', 'id', 'weight', 'length', 'width', 'height']
 
 export default {
   props: {