Merge branch 'feature/ljm/寄售召回'

src/router/index.js

@@ -37,6 +37,7 @@ const ConsignmentApplicationDetail = resolve => require(['@/views/consignmentMan
 const ConsignmentReplenishment = resolve => require(['@/views/consignmentManagement/consignmentReplenishment.vue'], resolve);
 const ConsignmentReplenishment = resolve => require(['@/views/consignmentManagement/consignmentReplenishment.vue'], resolve);
 const ConsignmentRecall = resolve => require(['@/views/consignmentManagement/consignmentRecall.vue'], resolve);
 const ConsignmentRecall = resolve => require(['@/views/consignmentManagement/consignmentRecall.vue'], resolve);
 const ConsignmentRecallDetail = resolve => require(['@/views/consignmentManagement/consignmentRecallDetail.vue'], resolve);
 const ConsignmentRecallDetail = resolve => require(['@/views/consignmentManagement/consignmentRecallDetail.vue'], resolve);
+const CreateConsignmentRecallOrder = resolve => require(['@/views/consignmentManagement/createConsignmentRecallOrder.vue'], resolve);
 const BatchRecall = resolve => require(['@/views/consignmentManagement/batchRecall.vue'], resolve);
 const BatchRecall = resolve => require(['@/views/consignmentManagement/batchRecall.vue'], resolve);
 const ConsignmentContract = resolve => require(['@/views/consignmentManagement/consignmentContract.vue'], resolve);
 const ConsignmentContract = resolve => require(['@/views/consignmentManagement/consignmentContract.vue'], resolve);
 const InOutStockLog = resolve => require(['@/views/consignmentManagement/inOutStockLog.vue'], resolve);
 const InOutStockLog = resolve => require(['@/views/consignmentManagement/inOutStockLog.vue'], resolve);
@@ -79,6 +80,7 @@ const routes = [
   {path: '/consignmentReplenishment', name: 'consignmentReplenishment', meta: {title: '寄售补货'}, component: ConsignmentReplenishment},
   {path: '/consignmentReplenishment', name: 'consignmentReplenishment', meta: {title: '寄售补货'}, component: ConsignmentReplenishment},
   {path: '/consignmentRecall', name: 'consignmentRecall', meta: {title: '寄售召回'}, component: ConsignmentRecall},
   {path: '/consignmentRecall', name: 'consignmentRecall', meta: {title: '寄售召回'}, component: ConsignmentRecall},
   {path: '/consignmentRecallDetail', name: 'consignmentRecallDetail', meta: {title: '寄售召回单详情'}, component: ConsignmentRecallDetail},
   {path: '/consignmentRecallDetail', name: 'consignmentRecallDetail', meta: {title: '寄售召回单详情'}, component: ConsignmentRecallDetail},
+  {path: '/createConsignmentRecallOrder', name: 'createConsignmentRecallOrder', meta: {title: '生成寄售召回单'}, component: CreateConsignmentRecallOrder},
   {path: '/batchRecall', name: 'batchRecall', meta: {title: '批量召回'}, component: BatchRecall},
   {path: '/batchRecall', name: 'batchRecall', meta: {title: '批量召回'}, component: BatchRecall},
   {path: '/consignmentContract', name: 'consignmentContract', meta: {title: '寄售合同'}, component: ConsignmentContract},
   {path: '/consignmentContract', name: 'consignmentContract', meta: {title: '寄售合同'}, component: ConsignmentContract},
   {path: '/inOutStockLog', name: 'inOutStockLog', meta: {title: '进出库日志'}, component: InOutStockLog},
   {path: '/inOutStockLog', name: 'inOutStockLog', meta: {title: '进出库日志'}, component: InOutStockLog},

src/views/consignmentManagement/consignmentRecall.vue

@@ -12,11 +12,8 @@
         <el-form-item label="状态" prop="status">
         <el-form-item label="状态" prop="status">
           <el-select v-model="formParam.recall_status" placeholder="全部" clearable>
           <el-select v-model="formParam.recall_status" placeholder="全部" clearable>
             <el-option label="全部" value=""></el-option>
             <el-option label="全部" value=""></el-option>
-            <el-option label="待提审" value="0"></el-option>
-            <el-option label="待审核" value="1"></el-option>
-            <el-option label="待退货出库" value="2"></el-option>
-            <el-option label="完成" value="3"></el-option>
-            <el-option label="作废" value="4"></el-option>
+            <el-option label="进行中" value="1"></el-option>
+            <el-option label="出库完成" value="2"></el-option>
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item>
         <el-form-item>
@@ -27,28 +24,29 @@
       <!--操作区-->
       <!--操作区-->
       <div class="operation-area row verCenter bothSide">
       <div class="operation-area row verCenter bothSide">
         <div class="operation-button row verCenter">
         <div class="operation-button row verCenter">
-          <el-button type="primary" @click="$router.push('/batchRecall')">批量召回</el-button>
+          <el-button type="primary" @click="$router.push('/createConsignmentRecallOrder')">生成寄售找回单</el-button>
+          <!--
           <el-button type="primary" @click="popupEvent(1)">提交审核</el-button>
           <el-button type="primary" @click="popupEvent(1)">提交审核</el-button>
           <el-button type="primary" @click="popupEvent(2)">作废</el-button>
           <el-button type="primary" @click="popupEvent(2)">作废</el-button>
           <el-button type="danger" @click="popupEvent(3)"> 收货信息</el-button>
           <el-button type="danger" @click="popupEvent(3)"> 收货信息</el-button>
+          -->
         </div>
         </div>
       </div>
       </div>
       <!--列表区-->
       <!--列表区-->
       <div class="data-box">
       <div class="data-box">
         <el-table :data="list" border max-height="600" @selection-change="handleSelectionChange">
         <el-table :data="list" border max-height="600" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="40" align="center" fixed></el-table-column>
-          <el-table-column prop="msg_sn" label="寄售召回单号" :show-overflow-tooltip="true" align="center">
+          <el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column>
+          <el-table-column prop="msg_sn" label="寄售召回单号" min-width="150" :show-overflow-tooltip="true" align="center">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-link type="primary" :underline="false" @click="$router.push({path: '/consignmentRecallDetail', query: {recall_id: scope.row.recall_id}})" style="font-size: 12px;">{{ scope.row.recall_sn }}</el-link>
               <el-link type="primary" :underline="false" @click="$router.push({path: '/consignmentRecallDetail', query: {recall_id: scope.row.recall_id}})" style="font-size: 12px;">{{ scope.row.recall_sn }}</el-link>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column prop="recall_status_val" label="订单状态" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="order_uname" label="订单人员" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="verify_name" label="审核人" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="verify_time" label="审核时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="verify_remark" label="审核说明" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="create_uname" label="创建人" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="create_time" label="创建时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="recall_status_val" label="状态" min-width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="order_uname" label="对接人" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="stock_out_sn" label="出库单号" width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="stock_out_express_sn" label="出库物流" width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="create_uname" label="创建人" width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="create_time" label="创建时间" width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
         </el-table>
         </el-table>
         <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
         <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
       </div>
       </div>

src/views/consignmentManagement/consignmentRecallDetail.vue

@@ -2,27 +2,31 @@
   <div class="pagex">
   <div class="pagex">
     <div class="section-page">
     <div class="section-page">
       <!-- 详情信息区 -->
       <!-- 详情信息区 -->
-      <el-descriptions :column="4" border style="margin-bottom: 15px; width: 1200px;">
+      <el-descriptions :column="3" border style="margin-bottom: 15px; width: 100%;">
         <el-descriptions-item label="寄售召回单号">
         <el-descriptions-item label="寄售召回单号">
-          <span style="font-weight: bold">{{ detailData.recall_sn }}（{{ detailData.recall_status_val }}）</span>
+          <span style="font-weight: bold">
+            {{ detailData.recall_sn }}{{ detailData.recall_status_val ? `（${detailData.recall_status_val}）` : '' }}
+          </span>
         </el-descriptions-item>
         </el-descriptions-item>
-        <el-descriptions-item label="订单人员：">{{ detailData.order_uname }}</el-descriptions-item>
+        <el-descriptions-item label="供应商名称：">
+          <span style="white-space: nowrap;">{{ detailData.supplier_name }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="创建时间：">{{ detailData.create_time }}</el-descriptions-item>
         <el-descriptions-item label="收货人：">{{ (detailData.supplier_address && detailData.supplier_address.contact) || '-' }}</el-descriptions-item>
         <el-descriptions-item label="收货人：">{{ (detailData.supplier_address && detailData.supplier_address.contact) || '-' }}</el-descriptions-item>
         <el-descriptions-item label="收货人电话：">{{ (detailData.supplier_address && detailData.supplier_address.mobile) || '-' }}</el-descriptions-item>
         <el-descriptions-item label="收货人电话：">{{ (detailData.supplier_address && detailData.supplier_address.mobile) || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="备注：">
+          <div class="remark-content">{{ detailData.delivery_remark || '-' }}</div>
+        </el-descriptions-item>
         <el-descriptions-item label="收货地址：" :span="2">{{ (detailData.supplier_address && detailData.supplier_address.info) || '-' }}</el-descriptions-item>
         <el-descriptions-item label="收货地址：" :span="2">{{ (detailData.supplier_address && detailData.supplier_address.info) || '-' }}</el-descriptions-item>
       </el-descriptions>
       </el-descriptions>
-
       <!--列表区-->
       <!--列表区-->
       <div class="data-box">
       <div class="data-box">
         <el-table :data="list" border max-height="600" @selection-change="handleSelectionChange">
         <el-table :data="list" border max-height="600" @selection-change="handleSelectionChange">
           <el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column>
           <el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column>
-          <el-table-column prop="recall_item_id" label="明细ID" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="sku_id" label="SKUID" width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="sku_id" label="SKUID" width="250" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="goods_name" label="型号" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="goods_name" label="型号" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="brand_name" label="品牌" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="brand_name" label="品牌" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="recall_num" label="申请召回数量" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="stock_out_num" label="退货出库总数" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="date_code" label="批次" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="recall_num" label="召回数量" :show-overflow-tooltip="true" align="center"></el-table-column>
         </el-table>
         </el-table>
         <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
         <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
       </div>
       </div>
@@ -132,6 +136,27 @@ export default {
      */
      */
     handleSelectionChange(val) {
     handleSelectionChange(val) {
       this.multipleSelection = val;
       this.multipleSelection = val;
+    },
+    /**
+     * 添加库存
+     * @param {number} type - 0:添加选中 1:一键添加全部
+     */
+    addInventory(type) {
+      if (!this.multipleSelection.length) {
+        this.$message.warning('请选择数据');
+        return;
+      }
+
+      if (type) {
+        // 一键添加全部库存
+        this.recall_json = this.list;
+      } else {
+        // 添加选中的库存
+        this.recall_json = this.multipleSelection;
+      }
+
+      this.dialogVisible_1 = false; // 关闭弹窗
+      this.$message.success('添加成功');
     }
     }
   },
   },
   components: {
   components: {
@@ -140,5 +165,8 @@ export default {
 };
 };
 </script>
 </script>
 <style scoped>
 <style scoped>
-
+.remark-content {
+  min-width: 200px;
+  word-break: break-all; /* 防止文字溢出 */
+}
 </style>
 </style>
\ No newline at end of file