领料出库新增出库单

sgzb-ui/src/api/claimAndRefund/receive.js

@@ -309,6 +309,15 @@ export function outboundCompleted(params){
   })
 }
 
+// 查看测试单
+export const outboundOrderApi = (params) => {
+  return request({
+    url: '/base/leaseOutDetails/getOutboundOrder',
+    method: 'get',
+    params
+  })
+}
+
 
 
 

sgzb-ui/src/components/DialogModel/index.vue

@@ -7,6 +7,7 @@
             :visible.sync="dialogConfig.outerVisible"
             v-if="dialogConfig.outerVisible"
             :before-close="handleCloseOuter"
+            :center="dialogConfig.center || false"
             append-to-body
         >
             <!-- 外层弹框内容 -->

sgzb-ui/src/views/base/unit/index.vue

@@ -93,21 +93,21 @@
                 prop="status"
                 width="200"
             >
-                <template slot-scope="scope">
+                <template slot-scope="{ row }">
                     <el-switch
                         v-model="scope.row.status"
                         active-value="0"
                         inactive-value="1"
-                        @change="changeStatus(scope.row)"
+                        @change="changeStatus(row)"
-                    ></el-switch>
+                    />
                 </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="200">
-                <template slot-scope="scope">
+                <template slot-scope="{ row }">
                     <el-button
                         type="text"
                         icon="el-icon-edit"
-                        @click="handleUpdate(scope.row)"
+                        @click="handleUpdate(row)"
                         v-hasPermi="['base:unit:edit']"
                         >修改</el-button
                     >
@@ -115,7 +115,7 @@
                         type="text"
                         icon="el-icon-delete"
                         style="color: #f56c6c"
-                        @click="handleDelete(scope.row)"
+                        @click="handleDelete(row)"
                         v-hasPermi="['base:unit:del']"
                         >删除</el-button
                     >

sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue

@@ -174,19 +174,26 @@
             @selection-change="handleSelectionChange"
         >
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
-            <el-table-column label="序号" type="index" width="80" />
+            <el-table-column
+                label="序号"
+                type="index"
+                width="80"
+                align="center"
+            />
             <el-table-column
                 label="类型名称"
                 prop="typeCn"
                 :show-overflow-tooltip="true"
+                align="center"
             />
             <el-table-column
                 label="规格型号"
                 prop="guigeCn"
                 :show-overflow-tooltip="true"
+                align="center"
             />
-            <el-table-column label="计量单位" prop="unitCn" />
+            <el-table-column label="计量单位" prop="unitCn" align="center" />
-            <el-table-column label="库存数量" prop="num" />
+            <el-table-column label="库存数量" prop="num" align="center" />
             <el-table-column label="预领数量" align="center">
                 <template slot-scope="scope">
                     <el-input
@@ -213,13 +220,7 @@
                     />
                 </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="操作" align="center" v-if="isAdd || isEdit">
-                label="操作"
-                align="center"
-                fixed="right"
-                class-name="small-padding fixed-width"
-                v-if="isAdd || isEdit"
-            >
                 <template slot-scope="scope">
                     <!--          <el-button-->
                     <!--            size="mini"-->
@@ -905,8 +906,6 @@ export default {
                 pageNum: 1,
                 pageSize: 9999,
             })
-            console.log(res, '成套设备---')
-
             this.completeSetList = res.rows
         },
 

sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue

@@ -162,62 +162,62 @@
                 label="领料单号"
                 align="center"
                 prop="code"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
                 width="150"
             />
             <el-table-column
                 label="领料单位"
                 align="center"
                 prop="unitName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="领料工程"
                 align="center"
                 prop="proName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="协议号"
                 align="center"
                 prop="agreementCode"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="现场领料人"
                 align="center"
                 prop="leasePerson"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="联系电话"
                 align="center"
                 prop="leasePhone"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="领料申请人"
                 align="center"
                 prop="nickName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="申请时间"
                 align="center"
                 prop="createTimes"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="任务状态"
                 align="center"
                 prop="taskName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
                 width="120px"
             />
             <el-table-column
                 label="审批意见 "
                 align="center"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             >
                 <template slot-scope="scope">
                     <span v-if="scope.row.taskStatus < 31"></span>
@@ -267,15 +267,9 @@
                     <!-- <span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> -->
                 </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="备注" align="center" show-overflow-tooltip>
-                label="备注"
-                align="center"
-                :show-overflow-tooltip="true"
-            >
                 <template slot-scope="scope">
-                    <span>{{
+                    {{ scope.row.leaseApplyInfoList[0].remark || '' }}
-                        scope.row.leaseApplyInfoList[0].remark || ''
-                    }}</span>
                 </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="180">

sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue

@@ -115,51 +115,51 @@
                 label="领料单号"
                 align="center"
                 prop="code"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="领料申请单位"
                 align="center"
                 prop="unitName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="领料申请工程"
                 align="center"
                 prop="proName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="申请数量"
                 align="center"
                 prop="preCountNum"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
                 label="申请时间"
                 align="center"
                 prop="createTimes"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
                 label="已出库数量"
                 align="center"
                 prop="alNum"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
                 label="出库状态"
                 align="center"
                 prop="taskName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
-            ></el-table-column>
+            />
 
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="200">
-                <template slot-scope="scope">
+                <template slot-scope="{ row }">
                     <el-button
                         type="text"
                         icon="el-icon-zoom-in"
-                        @click="handleView(scope.row)"
+                        @click="handleView(row)"
                         v-hasPermi="['picking:outbound:view']"
                         >查看</el-button
                     >
@@ -167,13 +167,20 @@
                         icon="el-icon-shopping-cart-2"
                         style="color: #e6a23c"
                         type="text"
-                        v-if="scope.row.taskStatus != 35"
+                        v-if="row.taskStatus != 35"
-                        @click="handleOut(scope.row)"
+                        @click="handleOut(row)"
                         v-hasPermi="['picking:outbound:out']"
                     >
                         出库
                     </el-button>
-                    <!-- <el-button type="text"> 出库单 </el-button> -->
+                    <el-button
+                        type="text"
+                        style="color: #67c23a"
+                        icon="el-icon-tickets"
+                        @click="handleOutboundOrder(row)"
+                    >
+                        出库单
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -530,6 +537,106 @@
                 </el-table-column>
             </el-table>
         </el-dialog>
+
+        <!-- 出库单 -->
+        <DialogModel
+            :dialogConfig="dialogConfig"
+            @closeDialogOuter="closeDialogOuter"
+        >
+            <template slot="outerContent">
+                <VueEasyPrint tableShow ref="remarksPrintRef">
+                    <!-- <el-row :gutter="20">
+                        <el-col span="6">申请人：</el-col>
+                        <el-col span="6">领料工程：</el-col>
+                        <el-col span="6">领料单位：</el-col>
+                        <el-col span="6">领料单号：</el-col>
+                    </el-row> -->
+                    <h2 class="outbound-title">出库单</h2>
+                    <ul class="apply-info">
+                        <li>
+                            领料申请人：<span>{{ applyFor }}</span>
+                        </li>
+                        <li>
+                            领料单位：<span>{{ unitName }}</span>
+                        </li>
+                        <li>
+                            领料工程：<span>{{ proName }}</span>
+                        </li>
+                        <li>
+                            领料单号：<span>{{ code }}</span>
+                        </li>
+                    </ul>
+                    <el-table style="margin: 15px 0" :data="outboundOrderList">
+                        <el-table-column
+                            align="center"
+                            label="序号"
+                            type="index"
+                        />
+                        <el-table-column
+                            align="center"
+                            label="设备类型"
+                            prop="typeName"
+                        />
+                        <el-table-column
+                            align="center"
+                            label="规格型号"
+                            prop="typeModelName"
+                        />
+                        <el-table-column
+                            align="center"
+                            label="设备编码"
+                            prop="maCode"
+                        />
+                        <el-table-column
+                            align="center"
+                            label="申请数量"
+                            prop="preNum"
+                        />
+                        <el-table-column
+                            align="center"
+                            label="出库数量"
+                            prop="outNum"
+                        />
+                        <el-table-column
+                            align="center"
+                            label="领料人"
+                            prop="leasePerson"
+                        />
+                        <el-table-column
+                            align="center"
+                            label="出库人"
+                            prop="outPerson"
+                        />
+                        <el-table-column align="center" label="出库日期">
+                            <template slot-scope="{ row }">
+                                {{ parseTime(row.createTime) }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            align="center"
+                            label="车牌号"
+                            prop="carCode"
+                        />
+                    </el-table>
+                </VueEasyPrint>
+
+                <pagination
+                    :total="outboundOrderTotal"
+                    :page.sync="outboundParams.pageNum"
+                    :limit.sync="outboundParams.pageSize"
+                    @pagination="queryOutBoundList"
+                />
+
+                <el-row class="print-btn">
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handlePrinting()"
+                        >打 印</el-button
+                    >
+                </el-row>
+            </template>
+        </DialogModel>
     </div>
 </template>
 
@@ -543,15 +650,18 @@ import {
     submitOut,
     submitNumOut,
     outboundCompleted,
+    outboundOrderApi,
 } from '@/api/claimAndRefund/receive.js'
 import { getTypeList } from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import store from '@/store'
+import DialogModel from '@/components/DialogModel'
+import VueEasyPrint from 'vue-easy-print'
 export default {
     name: 'receiveOut',
-    components: { Treeselect },
+    components: { Treeselect, DialogModel, VueEasyPrint },
     data() {
         return {
             // 遮罩层
@@ -626,7 +736,25 @@ export default {
             outCodeList: [], //编码弹窗表格数据
             outNumList: [], //数量弹窗表格数据
             userId: sessionStorage.getItem('userId'), // 当前登录用户的 userId
-            isMonitor: false,
+            isMonitor: false, // 判断当前登录用户是否为机具班长 如是班长 则可以对所有机具设备出库
+            outboundOrderList: [], // 出库单 数据源
+            applyFor: '', // 出库单回显 领料申请人
+            code: '', // 出库单回显 领料单号
+            proName: '', // 出库单回显 领料工程
+            unitName: '', // 出库单回显 领料单位
+            outboundOrderTotal: 0, // 出库单回显 数据条数
+            // 出库单 查询参数
+            outboundParams: {
+                parentId: '',
+                pageNum: 1,
+                pageSize: 10,
+            },
+            // 出库单 弹框配置项
+            dialogConfig: {
+                outerWidth: '80%',
+                outerVisible: false,
+                center: true,
+            },
         }
     },
 
@@ -773,6 +901,7 @@ export default {
             this.$set(obj, 'outNum', row.outNum) //待出库数量
             this.$set(obj, 'inputNum', 1) //出库数量
             this.$set(obj, 'num', row.num) //库存
+            this.$set(obj, 'createBy', sessionStorage.getItem('userId')) // 当前用户Id
             this.outNumList = [obj]
         },
         // 手动操作
@@ -787,6 +916,7 @@ export default {
                     outboundCompleted({
                         id: this.dialogQuery.id,
                         typeId: row.typeId,
+                        createBy: sessionStorage.getItem('userId'),
                     }).then((res) => {
                         this.$modal.msgSuccess('已完成')
                         this.handleDialogQuery()
@@ -841,6 +971,7 @@ export default {
                         parentId: this.outObj.parentId,
                         outNum: 1,
                         taskId: this.outObj.taskId,
+                        createBy: sessionStorage.getItem('userId'),
                     }
                     return obj
                 })
@@ -902,6 +1033,33 @@ export default {
                 }
             }
         },
+        // 出库单
+        handleOutboundOrder(row) {
+            const { applyFor, code, proName, unitName } = row
+            this.applyFor = applyFor
+            this.code = code
+            this.proName = proName
+            this.unitName = unitName
+            this.outboundParams.parentId = row.id
+            this.queryOutBoundList()
+            this.dialogConfig.outerVisible = true
+        },
+        // 获取出库单详情
+        async queryOutBoundList() {
+            const { data: res } = await outboundOrderApi(this.outboundParams)
+            this.outboundOrderList = res.rows
+            this.outboundOrderTotal = res.total
+        },
+        // 外层弹框关闭
+        closeDialogOuter() {
+            this.outboundParams.pageNum = 1
+            this.outboundParams.pageSize = 10
+            this.dialogConfig.outerVisible = false
+        },
+        // 打印按钮
+        handlePrinting() {
+            this.$refs.remarksPrintRef.print()
+        },
     },
 }
 </script>
@@ -914,4 +1072,34 @@ export default {
     color: #02a7f0;
     cursor: pointer;
 }
+
+// 领料单抬头样式
+.outbound-title {
+    font-size: 20px;
+    font-weight: bold;
+    letter-spacing: 3px;
+    text-align: center;
+}
+.apply-info {
+    margin-top: 30px;
+    display: flex;
+    justify-content: space-between;
+    list-style: none;
+    padding: 0;
+    font-size: 16px;
+    font-weight: bold;
+
+    span {
+        font-weight: 400;
+        letter-spacing: 2px;
+    }
+}
+
+.print-btn {
+    margin-top: 30px;
+
+    .el-button {
+        padding: 10px 20px;
+    }
+}
 </style>

sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue

@@ -191,7 +191,6 @@ import {
     auditingPreScrapApi,
 } from '@/api/scrap/forecastWaste.js'
 import { config, getSelList, getTypeListSel, dialogConfig } from './config'
-import { registerLayout } from 'echarts'
 export default {
     name: 'Inventory',
     components: {

sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue

@@ -7,7 +7,7 @@
             @getTableSelectionChange="getTableSelectionChange"
         >
             <template slot="export">
-                <el-row :gutter="10" class="mb8">
+                <el-row class="mb8">
                     <el-button type="warning" plain size="mini"
                         >完成退料</el-button
                     >

sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue

@@ -151,10 +151,7 @@
         </template>
 
         <template v-if="temp">
-            <el-row type="flex" justify="space-between" class="back-text">
+            <PageHeader :pageContent="pageContent" @goBack="goBack" />
-                <span>驳回退料</span>
-                <el-button type="text" @click="handleBack">返回</el-button>
-            </el-row>
             <AuditingReturn :sendParams="sendParamsAuditing" />
         </template>
     </div>
@@ -163,6 +160,7 @@
 <script>
 import TableModel from '@/components/TableModel'
 import DialogModel from '@/components/DialogModel'
+import PageHeader from '@/components/pageHeader'
 import SelDepart from '../../component/selDepart.vue'
 import ScrapSource from '../../component/scrapSource.vue'
 import AuditingReturn from '../auditingReturn/index.vue' // 退料驳回页面
@@ -179,6 +177,7 @@ export default {
     components: {
         TableModel,
         DialogModel,
+        PageHeader,
         SelDepart,
         ScrapSource,
         AuditingReturn,
@@ -205,6 +204,7 @@ export default {
             },
             auditingList: [],
             sendParamsAuditing: {},
+            pageContent: '驳回退料',
         }
     },
     created() {
@@ -282,10 +282,6 @@ export default {
                 this.submitScrapParams.taskIdList.push(e.taskId)
             })
         },
-        handleBack() {
-            this.temp = !this.temp
-            this.dialogVisible = false
-        },
         /* 外层弹框关闭 */
         closeDialogOuter() {
             this.dialogConfig.outerVisible = false
@@ -306,6 +302,11 @@ export default {
             )
             console.log('数据导出', data)
         },
+
+        // 返回按钮
+        goBack() {
+            this.temp = !this.temp
+        },
     },
 }
 </script>