noorder 推送

src/api/orderIssure/soIssueNotify.js

@@ -79,5 +79,7 @@ export const checkUserHasUnissueShopOrder = data => createAPI(`/orderIssure/issu
 // 取消下达申请单 - rqrq
 export const cancelIssueNotify = data => createAPI(`/orderIssure/issureNotify/cancelIssueNotify`,'post',data)
 
+// 查询预留标签清单 - rqrq
+export const searchMaterialListDetail = data => createAPI(`/orderIssure/newIssure/searchMaterialListDetail`,'post',data)
 
 

src/views/modules/noOrderIssue/noOrderNotification.vue

@@ -11,6 +11,15 @@
           <el-option label="CLOSED" value="CLOSED"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="推送WCS">
+        <el-select v-model="searchData.pushWcsFlag" placeholder="请选择" clearable style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="未推送" value="未推送"></el-option>
+          <el-option label="部分推送" value="部分推送"></el-option>
+          <el-option label="推送完成" value="推送完成"></el-option>
+          <el-option label="出库完成" value="出库完成"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'申请单日期'">
         <el-date-picker style="width: 120px" v-model="searchData.startDate" type="date" value-format="yyyy-MM-dd"
           placeholder="选择日期">
@@ -40,7 +49,12 @@
         :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="!item.columnHidden">
+            <span v-if="item.columnProp === 'transportFlag'" :style="{color: scope.row[item.columnProp] === 'Y' ? '#67C23A' : '#909399'}">
+              {{ scope.row[item.columnProp] === 'Y' ? '是' : '否' }}
+            </span>
+            <span v-else>{{ scope.row[item.columnProp] }}</span>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
               style="width: 100px; height: 80px" /></span>
         </template>
@@ -56,7 +70,7 @@
             <el-link style="cursor: pointer" @click="closeModal(scope.row)">关闭</el-link>
           </template>
           <!-- rqrq - 添加推送WCS按钮 -->
-          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='推送完成'&&scope.row.status==='ISSUE'" @click="previewInventory(scope.row)" style="margin-left: 10px;">推送WCS</a>
+          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='出库完成'&&scope.row.pushWcsFlag!=='推送完成'&&scope.row.status==='ISSUE'" @click="previewInventory(scope.row)" style="margin-left: 10px;">推送WCS</a>
         </template>
       </el-table-column>
     </el-table>
@@ -120,7 +134,12 @@
             :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <span v-if="item.columnProp === 'pushWmsFlag' || item.columnProp === 'transportFlag'" :style="{color: scope.row[item.columnProp] === 'Y' ? '#67C23A' : '#909399'}">
+                  {{ scope.row[item.columnProp] === 'Y' ? '是' : '否' }}
+                </span>
+                <span v-else>{{scope.row[item.columnProp]}}</span>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                   style="width: 100px; height: 80px" /></span>
             </template>
@@ -160,6 +179,35 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
+      <el-tab-pane label="预留标签清单" name="labelDetail">
+        <el-table
+          :data="dataList7"
+          :height="secondHeight - 68"
+          border
+          v-loading="searchLoading"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList6" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden">
+                <span v-if="item.columnProp === 'outWcsFlag'" :style="{color: scope.row[item.columnProp] === 'Y' ? '#67C23A' : '#909399'}">
+                  {{ scope.row[item.columnProp] === 'Y' ? '是' : '否' }}
+                </span>
+                <span v-else>{{ scope.row[item.columnProp] }}</span>
+              </span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
     </el-tabs>
 
     <!-- rqrq - 推送WCS预览弹窗 -->
@@ -669,7 +717,9 @@ import {
 // rqrq - 导入推送WCS相关API（使用领料申请的通用API）
 import {
   checkIssueNotifyInventory,
-  pushInventoryToWcs
+  pushInventoryToWcs,
+  searchMaterialListDetail, // rqrq - 导入预留标签清单API
+  deleteNotifySOS // rqrq - 导入删除申请订单API
 } from '@/api/orderIssure/soIssueNotify.js'
 import {
   getSiteAndBuByUserName,
@@ -708,6 +758,7 @@ export default {
         orderType: '',
         orderStatus: '',
         orderStatusList: [],
+        pushWcsFlag: '', // rqrq - 新增推送WCS筛选条件
         startDate: '',
         endDate: '',
         page: 1,
@@ -1389,8 +1440,174 @@ export default {
           fixed: false,
           columnWidth: 80,
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '555001Table1PushWmsFlag',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'pushWmsFlag',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '是否推送WCS',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '555001Table1TransportFlag',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'transportFlag',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '立库取出',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '555001Table1AreaDesc',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'areaDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '配送区域',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
       ],
       columnDetailList2:[],
+      // rqrq - 预留标签清单数据和列定义
+      dataList7: [],
+      columnList6: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6ItemNo',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'itemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '订单序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6BomItemNo',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'bomItemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '订单物料行号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6SerialNo',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'serialNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '标签号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6TaskRef',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'taskRef',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '立库任务号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6TaskItem',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'taskItem',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '立库任务行号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6OutWcsFlag',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'outWcsFlag',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '立库取出',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+      ],
       rules: {
         bu: [
           {
@@ -1502,6 +1719,7 @@ export default {
 
     // 获取数据列表
     getDataList() {
+      this.searchData.site = this.$store.state.user.site // rqrq - 设置site
       this.searchData.limit = this.pageSize
       this.searchData.page = this.pageIndex
       this.searchData.orderStatus = this.searchData.orderStatusList.join(',')
@@ -1766,9 +1984,38 @@ export default {
     refreshCurrentTabTable() {
       if (this.activeTable === 'inboundDetail') {
         this.getInboundDetail()
+      } else if (this.activeTable === 'labelDetail') {
+        // rqrq - 查询预留标签清单
+        this.searchMaterialListDetail()
       }
     },
 
+    // rqrq - 查询预留标签清单
+    searchMaterialListDetail() {
+      if (!this.currentRow || !this.currentRow.notifyNo) {
+        this.dataList7 = []
+        return
+      }
+      const queryData = {
+        site: this.currentRow.site || this.$store.state.user.site,
+        notifyNo: this.currentRow.notifyNo
+      }
+      this.searchLoading = true
+      searchMaterialListDetail(queryData)
+        .then(({ data }) => {
+          this.searchLoading = false
+          if (data && data.code === 0) {
+            this.dataList7 = data.rows || []
+          } else {
+            this.dataList7 = []
+          }
+        })
+        .catch(() => {
+          this.searchLoading = false
+          this.dataList7 = []
+        })
+    },
+
     // 查询物料缺陷跟踪
     getInboundDetail() {
       let templateData = {

src/views/modules/orderIssure/searchIssureNotify.vue

@@ -39,20 +39,13 @@
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" style="margin-top: 0px">
-        <el-form-item label="是否领料" >
-          <el-select v-model="searchData.issueFlag" placeholder="请选择" style="width: 120px">
-            <el-option label="全部" value=""></el-option>
-            <el-option label="Y" value="Y"></el-option>
-            <el-option label="N" value="N"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="领料结果" >
-          <el-select v-model="searchData.issueResult" placeholder="请选择" style="width: 120px">
+        <el-form-item label="推送WCS" >
+          <el-select v-model="searchData.pushWcsFlag" placeholder="请选择" style="width: 120px">
             <el-option label="全部" value=""></el-option>
-            <el-option label="部分发料" value="部分发料"></el-option>
-            <el-option label="全部发料" value="全部发料"></el-option>
+            <el-option label="未推送" value="未推送"></el-option>
+            <el-option label="部分推送" value="部分推送"></el-option>
+            <el-option label="推送完成" value="推送完成"></el-option>
+            <el-option label="出库完成" value="出库完成"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="' '">
@@ -108,7 +101,7 @@
         <template slot-scope="scope">
           <a type="text" size="small" v-if="scope.row.status==='ISSUE'" @click="closeNotifyModel(scope.row)">关闭</a>
           <a type="text" size="small" v-if="scope.row.status==='CLOSED'" @click="openNotify(scope.row)">开启</a>
-          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='推送完成'&&scope.row.status==='ISSUE'" @click="previewInventory(scope.row)" style="margin-left: 10px;">推送WCS</a>
+          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='出库完成'&&scope.row.pushWcsFlag!=='推送完成'&&scope.row.status==='ISSUE'" @click="previewInventory(scope.row)" style="margin-left: 10px;">推送WCS</a>
           <!-- rqrq - 取消下达按钮，只在状态为ISSUE且未推送WCS时显示 -->
           <a type="text" size="small" v-if="scope.row.status==='ISSUE'&&scope.row.pushWcsFlag==='未推送'" @click="cancelIssueNotifyHandle(scope.row)" style="margin-left: 10px;">取消下达</a>
 <!--          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='Y'" @click="pushToWcs(scope.row)" style="margin-left: 10px;">推送WCS</a>-->
@@ -154,22 +147,18 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
-            </template>
-          </el-table-column>
-          <!-- 是否推送WCS - rqrq -->
-          <el-table-column
-            prop="pushWmsFlag"
-            label="是否推送WCS"
-            width="120"
-            align="center"
-            header-align="center">
-            <template slot-scope="scope">
-              <span :style="{color: scope.row.pushWmsFlag === 'Y' ? '#67C23A' : '#909399'}">
+              <!-- rqrq - 是否推送WCS特殊显示：Y显示绿色"是"，否则显示灰色"否" -->
+              <span v-if="item.columnProp === 'pushWmsFlag'" :style="{color: scope.row.pushWmsFlag === 'Y' ? '#67C23A' : '#909399'}">
                 {{ scope.row.pushWmsFlag === 'Y' ? '是' : '否' }}
               </span>
+              <!-- rqrq - 立库取出特殊显示：Y显示绿色"是"，否则显示灰色"否" -->
+              <span v-else-if="item.columnProp === 'transportFlag'" :style="{color: scope.row.transportFlag === 'Y' ? '#67C23A' : '#909399'}">
+                {{ scope.row.transportFlag === 'Y' ? '是' : '否' }}
+              </span>
+              <!-- 普通列显示 -->
+              <span v-else-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
           <!-- 操作列 -->
@@ -259,6 +248,31 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
+      <el-tab-pane label="预留标签清单" name="labelDetail">
+        <el-table
+          :data="dataList7"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+          <el-table-column
+            v-for="(item,index) in columnList6" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
     </el-tabs>
 
     <el-dialog title="关闭原因" :close-on-click-modal="false" v-drag :visible.sync="closeModalFlag" width="450px">
@@ -470,6 +484,7 @@
     , cancelIssueNotify
     , getSOSBOMForIssureNew
     , saveMaterialDetail
+    , searchMaterialListDetail
 
   } from "@/api/orderIssure/soIssueNotify.js"
 
@@ -487,6 +502,7 @@
         dataList4: [],
         dataList5: [],
         dataList6: [],
+        dataList7: [], // 预留标签清单数据 - rqrq
         userBuList:[],
         createNotifyFlag: false,
         saveOrderDetailFlag: false,
@@ -504,9 +520,8 @@
           userName: '',
           notifyNo: '',
           status: '',
-          issueFlag: '',
+          pushWcsFlag: '', // rqrq - 推送WCS筛选条件
           loginUserName: this.$store.state.user.name,
-          issueResult: '',
           startDate: this.dayjs().format("YYYY-MM-DD"),
           endDate: this.dayjs().format("YYYY-MM-DD"),
           issueStartDate:this.dayjs().format("YYYY-MM-DD"),
@@ -605,40 +620,6 @@
             status: true,
             fixed: '',
             columnWidth: 120
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701002,
-            serialNumber: '701002Table1IssueFlag',
-            tableId: "701002Table1",
-            tableName: "领料申请主表",
-            columnProp: "issueFlag",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "是否领料",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 60
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701002,
-            serialNumber: '701002Table1IssueResult',
-            tableId: "701002Table1",
-            tableName: "领料申请主表",
-            columnProp: "issueResult",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "领料结果",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
           },{
             userId: this.$store.state.user.name,
             functionId: 701002,
@@ -814,6 +795,57 @@
             status: true,
             fixed: '',
             columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2PushWmsFlag',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "pushWmsFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "是否推送WCS",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2TransportFlag',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "transportFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "立库取出",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2AreaDesc',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "areaDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "配送区域",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
           }
 
         ],
@@ -1097,6 +1129,111 @@
             columnWidth: 80
           },
         ],
+        columnList6:[ // 预留标签清单列配置 - rqrq
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6ItemNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6BOMItemNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "bomItemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单物料行号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6SerialNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "serialNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "标签号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6TaskRef',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "taskRef",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "立库任务号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6TaskItem',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "taskItem",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "立库任务行号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6OutWcsFlag',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "outWcsFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "立库取出",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }
+        ],
 
         // 导出 start
         exportData: [],
@@ -1258,6 +1395,16 @@
               this.dataList6 = [];
             }
           });
+        }else if(this.activeName==='labelDetail'){ // rqrq - 预留标签清单页签
+          searchMaterialListDetail(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList7 = data.rows
+
+            } else {
+              this.dataList7 = [];
+            }
+          });
         }else {
           searchSumNotifyMaterialListNew(queryData).then(({data}) => {
             //区分请求成功和失败的状况

src/views/modules/shipment/shipmentNotification.vue

@@ -11,6 +11,15 @@
           <el-option label="CLOSED" value="CLOSED"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="推送WCS">
+        <el-select v-model="searchData.pushWcsFlag" placeholder="请选择" clearable style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="未推送" value="未推送"></el-option>
+          <el-option label="部分推送" value="部分推送"></el-option>
+          <el-option label="推送完成" value="推送完成"></el-option>
+          <el-option label="出库完成" value="出库完成"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'申请单日期'">
         <el-date-picker style="width: 120px" v-model="searchData.startDate" type="date" value-format="yyyy-MM-dd"
           placeholder="选择日期">
@@ -41,7 +50,12 @@
         :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="!item.columnHidden">
+            <span v-if="item.columnProp === 'transportFlag'" :style="{color: scope.row[item.columnProp] === 'Y' ? '#67C23A' : '#909399'}">
+              {{ scope.row[item.columnProp] === 'Y' ? '是' : '否' }}
+            </span>
+            <span v-else>{{ scope.row[item.columnProp] }}</span>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
               style="width: 100px; height: 80px" /></span>
         </template>
@@ -58,7 +72,7 @@
               @click="closeModal(scope.row)">关闭</el-link>
           </template>
           <!-- rqrq - 推送WCS按钮，只在状态为ISSUE且未推送完成时显示 -->
-          <el-link v-if="scope.row.status==='ISSUE' && scope.row.pushWcsFlag!=='推送完成'"
+          <el-link v-if="scope.row.pushWcsFlag!=='出库完成'&&scope.row.status==='ISSUE' && scope.row.pushWcsFlag!=='推送完成'"
                    style="cursor: pointer; margin-left: 10px;"
                    @click="previewInventory(scope.row)">推送WCS</el-link>
           <!-- rqrq - 取消下达按钮，只在状态为ISSUE且未推送WCS时显示 -->
@@ -132,7 +146,12 @@
             :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="!item.columnHidden">
+                <span v-if="item.columnProp === 'pushWmsFlag' || item.columnProp === 'transportFlag'" :style="{color: scope.row[item.columnProp] === 'Y' ? '#67C23A' : '#909399'}">
+                  {{ scope.row[item.columnProp] === 'Y' ? '是' : '否' }}
+                </span>
+                <span v-else>{{scope.row[item.columnProp]}}</span>
+              </span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                   style="width: 100px; height: 80px" /></span>
             </template>
@@ -172,6 +191,35 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
+      <el-tab-pane label="预留标签清单" name="labelDetail">
+        <el-table
+          :data="dataList7"
+          :height="secondHeight - 68"
+          border
+          v-loading="searchLoading"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList6" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden">
+                <span v-if="item.columnProp === 'outWcsFlag'" :style="{color: scope.row[item.columnProp] === 'Y' ? '#67C23A' : '#909399'}">
+                  {{ scope.row[item.columnProp] === 'Y' ? '是' : '否' }}
+                </span>
+                <span v-else>{{ scope.row[item.columnProp] }}</span>
+              </span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
     </el-tabs>
 
     <!-- 收获入库单明细新增 -->
@@ -568,6 +616,8 @@ import {
   saveShipmentMaterialDetail,
   searchUnissueNotifyMaterialList
 } from '@/api/shipment/shipmentIssue.js'
+// rqrq - 导入预留标签清单API
+import { searchMaterialListDetail } from '@/api/orderIssure/soIssueNotify.js'
 import Chooselist from '@/views/modules/common/Chooselist_eam'
 import { getChooselist } from '@/api/chooselist/chooselist.js'
 import {
@@ -597,6 +647,7 @@ export default {
         orderType: '',
         orderStatus: '',
         orderStatusList: [],
+        pushWcsFlag: '', // rqrq - 新增推送WCS筛选条件
         startDate: '',
         endDate: '',
         page: 1,
@@ -820,6 +871,25 @@ export default {
           fixed: '',
           columnWidth: 100,
         },
+        // rqrq - 添加推送WCS字段
+        {
+          userId: this.$store.state.user.name,
+          functionId: 610,
+          serialNumber: '610Table1PushWcsFlag',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'pushWcsFlag',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '推送WCS',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
         /* {
           userId: this.$store.state.user.name,
           functionId: 610,
@@ -1295,6 +1365,60 @@ export default {
           fixed: '',
           columnWidth: 100,
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2PushWmsFlag',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'pushWmsFlag',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '是否推送WCS',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2TransportFlag',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'transportFlag',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '立库取出',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2AreaDesc',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'areaDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '配送区域',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
        /*  {
           userId: this.$store.state.user.name,
           functionId: 701001,
@@ -1466,6 +1590,118 @@ export default {
           columnWidth: 170,
         },
       ],
+      // rqrq - 预留标签清单数据和列定义
+      dataList7: [],
+      columnList6: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6ItemNo',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'itemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '订单序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6BomItemNo',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'bomItemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '订单物料行号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6SerialNo',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'serialNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '标签号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6TaskRef',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'taskRef',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '立库任务号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6TaskItem',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'taskItem',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '立库任务行号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          serialNumber: '444002Table6OutWcsFlag',
+          tableId: '444002Table6',
+          tableName: '预留标签清单表',
+          columnProp: 'outWcsFlag',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '立库取出',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+      ],
       rules: {
         bu: [
           {
@@ -1561,6 +1797,7 @@ export default {
 
     // 获取数据列表
     getDataList() {
+      this.searchData.site = this.$store.state.user.site // rqrq - 设置site
       this.searchData.limit = this.pageSize
       this.searchData.page = this.pageIndex
       this.searchData.orderStatus = this.searchData.orderStatusList.join(',')
@@ -1830,7 +2067,36 @@ export default {
     refreshCurrentTabTable() {
       if (this.activeTable === 'inboundDetail') {
         this.getInboundDetail()
+      } else if (this.activeTable === 'labelDetail') {
+        // rqrq - 查询预留标签清单
+        this.searchMaterialListDetail()
+      }
+    },
+
+    // rqrq - 查询预留标签清单
+    searchMaterialListDetail() {
+      if (!this.currentRow || !this.currentRow.notifyNo) {
+        this.dataList7 = []
+        return
+      }
+      const queryData = {
+        site: this.currentRow.site || this.$store.state.user.site,
+        notifyNo: this.currentRow.notifyNo
       }
+      this.searchLoading = true
+      searchMaterialListDetail(queryData)
+        .then(({ data }) => {
+          this.searchLoading = false
+          if (data && data.code === 0) {
+            this.dataList7 = data.rows || []
+          } else {
+            this.dataList7 = []
+          }
+        })
+        .catch(() => {
+          this.searchLoading = false
+          this.dataList7 = []
+        })
     },
 
     // 查询物料缺陷跟踪