1. 前端增加中文料盒号的兼容性

2. 前端增加看板需求导出功能

dev_wms_client/src/api/excel.js

@@ -113,6 +113,17 @@ export const exportWorkSummaryExcel = (data) => {
     })
 }
 
+export const exportKanbanExcel = (data) => {
+    return request({
+        url: '/excel/exportKanbanExcel',
+        method: 'post',
+        responseType: 'blob',
+        data: data,
+        timeout: 600000
+    })
+}
+
+// 以下待废弃
 export const downloadInRecordExcel = (data) => {
     return request({
         url: '/excel/downloadInRecordExcel',

dev_wms_client/src/layout/clcKanban.vue

@@ -19,12 +19,12 @@
                                         @change="search()"></el-select-v2>
                                 </el-form-item>
                                 <el-form-item label="工单日期开始（生成看板用）">
-                                    <el-date-picker v-model="kanbanQuery.planStartDateFrom" type="date" placeholder="请选择开始日期"
+                                    <el-date-picker v-model="kanbanQuery.planStartDateFrom" type="date"
-                                        :shortcuts="shortcuts" style="width: 196px;" clearable />
+                                        placeholder="请选择开始日期" :shortcuts="shortcuts" style="width: 196px;" clearable />
                                 </el-form-item>
                                 <el-form-item label="工单日期结束（生成看板用）">
-                                    <el-date-picker v-model="kanbanQuery.planStartDateTo" type="date" placeholder="请选择结束日期"
+                                    <el-date-picker v-model="kanbanQuery.planStartDateTo" type="date"
-                                        :shortcuts="shortcuts" style="width: 196px;" clearable />
+                                        placeholder="请选择结束日期" :shortcuts="shortcuts" style="width: 196px;" clearable />
                                 </el-form-item>
                             </el-row>
                             <div style="align-content: center;">
@@ -90,9 +90,12 @@ import { labelPosition, shortcuts } from '@/constant/form'
 import { kanbanStatusOptions } from '@/constant/options'
 import { loading } from '@/utils/loading.js'
 import { dateFormatter } from '@/utils/formatter.js'
+import { exportKanbanExcel } from '@/api/excel.js'
 /**
  * 常量定义
  */
+const STAND_ID = store.getters.getStandId
+const USER_NAME = store.getters.getUserName
 /**
  * 变量定义
  */
@@ -104,8 +107,8 @@ let baseTableQuery = reactive({
     pageSize: 10,
     total: 0,
     sortBy: new Map([['goodsId', true]]),
-    standId: store.getters.getStandId,
+    standId: STAND_ID,
-    userName: store.getters.getUserName
+    userName: USER_NAME
 })
 let kanbanQuery = reactive({
     goodsId: '',
@@ -197,11 +200,9 @@ const genKanban = () => {
     const request = {
         planStartDateFrom: dateFormatter(kanbanQuery.planStartDateFrom),
         planStartDateTo: dateFormatter(kanbanQuery.planStartDateTo),
-        standId: store.getters.getStandId,
+        standId: STAND_ID,
-        userName: store.getters.getUserName
+        userName: USER_NAME
     }
-    console.log(request)
-    console.log(kanbanQuery)
     loading.open('生成中...')
     genClcKanbanRequirement(request).then(res => {
         loading.close()
@@ -218,6 +219,41 @@ const genKanban = () => {
         ElMessage.error('生成看板需求异常。')
     })
 }
+// 导出看板
+const exportExcel = () => {
+    const params = {
+        goodsId: kanbanQuery.goodsId,
+        kanbanId: kanbanQuery.kanbanId,
+        kanbanStatus: kanbanQuery.kanbanStatus == -99 ? null : kanbanQuery.kanbanStatus,
+        standId: STAND_ID,
+        userName: USER_NAME
+    }
+    exportKanbanExcel(params).then(res => {
+        const link = document.createElement('a');//创建a标签
+        try {
+            // let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'});    //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
+            let blob = res.data    //如果后台返回的直接是blob对象类型，直接获取数据
+            // let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
+            let _fileName = '看板需求' + dateFormatter(new Date) + '.xlsx'
+            link.style.display = 'none'//隐藏
+
+            // 兼容不同浏览器的URL对象
+            const url = window.URL || window.webkitURL || window.moxURL
+            link.href = url.createObjectURL(blob)
+            link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
+            document.body.appendChild(link)
+            link.click()
+            document.body.removeChild(link)
+            url.revokeObjectURL(link.href)//移除url对象
+        } catch (e) {
+            console.log(e)
+            ElMessage.error('下载文件失败')
+        }
+    }).catch(err => {
+        console.log(err)
+        ElMessage.error('导出失败')
+    })
+}
 </script>
 <style scoped>
 .content {

dev_wms_client/src/layout/kitting.vue

@@ -189,7 +189,7 @@
                             </div>
                             <div class="print-tab-image">
                                 <qrcode-vue
-                                    :value="item.singleProductId == '' ? item.productId + '&' + item.boxNo : item.singleProductId + '&' + item.boxNo"
+                                    :value="item.imageId"
                                     :size="size" :foreground="color" level="H" />
                             </div>
                         </div>
@@ -652,6 +652,7 @@ const getPrintTabs = (boxSummary) => {
                     produceDate: boxSummary.produceDate,
                     testNo: boxSummary.testNo,
                     productionQty: boxSummary.productionQty,
+                    imageId: boxSummary.imageId,
                 }
             )
         }

dev_wms_client/src/layout/scanForImage.vue

@@ -26,8 +26,7 @@ let imageData = reactive({
 })
 let inputStr = ''
 let imageRequest = reactive({
-    productId: '',
+    imageId: '',
-    boxNo: '',
     userName: store.getters.getUserName,
     standId: store.getters.getStandId
 })
@@ -43,40 +42,31 @@ const handleKeyDown = (event) => {
     if (event.key.toLowerCase() == 'enter') {
         solveInput()
     } else {
-        if (event.key == 'Backspace') {
+        if (event.key.toLowerCase() == 'backspace') {
             inputStr = inputStr.substring(0, inputStr.length - 1)
-        } else if (isSingleCharacter(event.key) || isNumber(event.key) || event.key == '&') {
+        } else if (isSingleCharacter(event.key) || isNumber(event.key)) {
             inputStr += event.key
         }
     }
 }
 // 处理输入
 const solveInput = () => {
-    console.log(inputStr)
     // 空输入
     if (inputStr == '') {
         closePreview('空输入。')
     }
     // 解析
-    const splitArray = inputStr.split('&')
+    imageRequest.imageId = inputStr
-    if (splitArray.length != 2) {
-        closePreview('请扫描正确的二维码。')
-    } else {
-        imageRequest.productId = splitArray[0]
-        imageRequest.boxNo = splitArray[1]
     // 查询图纸
     findImage()
 }
-    inputStr = ''
-}
 // 查询图纸
 const findImage = () => {
-    if (imageRequest.productId == '' || imageRequest.boxNo == '') {
+    if (imageRequest.imageId == '') {
-        closePreview('请求缺少成品号和料盒号。')
+        closePreview('请求缺少图纸编号。')
     }
     requestImageDetail(imageRequest).then(res => {
         const response = res.data
-        console.log(response)
         if (response.code == 0) {
             const results = response.data
             if (results == undefined || results.length != 1) {
@@ -91,6 +81,8 @@ const findImage = () => {
     }).catch(err => {
         console.log(err)
         closePreview("查询图纸失败，请检查。")
+    }).finally(() => {
+        inputStr = ''
     })
 }
 // 打开图纸

dev_wms_client/src/layout/stockUpdateRecord.vue

@@ -1,226 +1,546 @@
 <template>
-    <div style="margin-bottom: 10px; height: 100%; padding-left: 1%; padding-right: 1%;">
     <el-config-provider :locale="zhCn">
+        <el-container class="content">
+            <div class="work-area">
+                <fieldset class="search-area">
+                    <el-form ref="searchQueryFormRef" :model="searchQueryFormEntity" :label-position="labelPosition"
+                        label-width="158px" style="max-width: 100%" status-icon>
                         <div style="display: flex;justify-content: space-between;">
                             <el-row>
-                    <el-input v-model="vehicleIdQuery" style="width: 158px; margin-right: 10px;" placeholder="箱号"
+                                <el-form-item label="数据类型">
-                        :suffix-icon="Search" />
+                                    <el-select-v2 v-model="searchQueryFormEntity.summaryType" placeholder="数据类型"
-                    <el-input v-model="goodsIdQuery" style="width: 158px; margin-right: 10px;" placeholder="料号"
+                                        :options="summaryTypeOptions" @change="search()"></el-select-v2>
-                        :suffix-icon="Search" />
+                                </el-form-item>
-                    <el-select-v2 v-model="reasonQuery" style="width: 158px; margin-right: 10px;"
+                                <el-form-item label="工单号">
-                        placeholder="请选择更新原因" :options="reasonOptions" @change="search()"></el-select-v2>
+                                    <el-input v-model="searchQueryFormEntity.workOrder" clearable />
-                        <el-date-picker v-model="updateTimeQuery" type="date" placeholder="选择完成日期" :shortcuts="shortcuts"
+                                </el-form-item>
-                        style="width: 158px; margin-right: 10px;" clearable />
+                                <el-form-item label="料盒号">
-                    <el-button type="primary" @click="search()">搜索</el-button>
+                                    <el-input v-model="searchQueryFormEntity.boxNo" clearable />
-                    <el-button type="warning" @click="reset()">重置</el-button>
+                                </el-form-item>
+                                <el-form-item label="工作状态">
+                                    <el-select-v2 v-model="searchQueryFormEntity.workStatus" placeholder="工作状态"
+                                        :options="addAllOptionOfOptions(workStatusOptions)"
+                                        @change="search()"></el-select-v2>
+                                </el-form-item>
+                                <el-form-item label="缺料状态">
+                                    <el-select-v2 v-model="searchQueryFormEntity.lackStatus" placeholder="缺料状态"
+                                        :options="addAllOptionOfOptions(lackStatusOptions)"
+                                        @change="search()"></el-select-v2>
+                                </el-form-item>
+                            </el-row>
+                            <div style="align-content: center;">
+                                <el-row>
+                                    <el-button type="primary" class="btn-search" @click="search()">查询</el-button>
+                                    <el-button type="warning" class="btn-search" @click="clearQuery()">清除输入</el-button>
+                                </el-row>
+                                <el-row>
+                                    <el-button type="success" class="btn-search"
+                                        @click="exportExcel()">导出excel</el-button>
                                 </el-row>
                             </div>
-            <br />
+                        </div>
-            <el-table :data="recordList" stripe border v-loading="loading" class="table-class" highlight-current-row
+                    </el-form>
-                max-height="650px" @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
+                </fieldset>
-                :cell-style="{ 'text-align': 'center' }">
+                <div class="table-area">
+                    <el-table :data="tableData" stripe border v-loading="tableLoading" class="table-class"
+                        :max-height="maxHeight" highlight-current-row @row-click="getCurrentRow"
+                        :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
+                        @sort-change="handleSortChange">
                         <el-table-column width="65px" fixed="left">
                             <template v-slot="scope">
-                        <el-radio :label="scope.row.recordId" v-model="recordId">&nbsp;</el-radio>
+                                <el-radio :label="scope.row.workIndex" v-model="workIndex">&nbsp;</el-radio>
                             </template>
                         </el-table-column>
-                <el-table-column prop="recordId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
+                        <el-table-column prop="workIndex" label="数据编号" fixed="left" min-width="120px" sortable="custom"
-                <el-table-column prop="stockId" label="库存编号" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="vehicleId" label="箱号" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="goodsId" label="料号" show-overflow-tooltip min-width="120px" />
-                <el-table-column prop="goodsName" label="物料名称" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="locationBefore" label="原位置" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="locationAfter" label="新位置" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="quantityBefore" label="原数量" min-width="120px" />
-                <el-table-column prop="quantityAfter" label="新数量" min-width="120px" />
-                <el-table-column prop="reason" label="原因" fixed="right" show-overflow-tooltip min-width="120px" />
-                <el-table-column prop="updateTime" label="完成时间" :formatter="timeFormat" min-width="120px"
                             show-overflow-tooltip />
-                <el-table-column prop="updateUser" label="操作用户"  show-overflow-tooltip min-width="120px" />
+                        <el-table-column prop="workOrder" label="工单" fixed="left" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="boxNo" label="料盒号" fixed="left" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="productId" label="成品号" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="singleProductId" label="单片号" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="goodsId" label="料号" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="planStartDate" label="计划开工日期" min-width="120px" :formatter="dateFormat"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="needNum" label="需求数量" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="distributeNum" label="已分配数量" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="finishNum" label="已完成数量" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="workStand" label="工作站台" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="workUser" label="操作用户" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="isOut" label="库外料" :formatter="outGoodsFormat" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="productType" label="成品类型" :formatter="productTypeFormat"
+                            min-width="120px" sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="lackStatus" label="缺料状态" :formatter="lackStatusFormat" fixed="right"
+                            min-width="120px" sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="workStatus" label="工作状态" :formatter="workStatusFormat" fixed="right"
+                            min-width="120px" sortable="custom" show-overflow-tooltip />
+                        <el-table-column fixed="right" label="操作" width="170px" v-if="searchQueryFormEntity.summaryType == 1">
+                            <template v-slot="scope">
+                                <div style="display: inline-block; align-content: center;">
+                                    <el-button type="primary" @click="editCurrentRowFormEntity(scope.row)">编辑</el-button>
+                                    <el-button type="danger" @click="closeLackWork(scope.row)">关闭</el-button>
+                                </div>
+                            </template>
+                        </el-table-column>
                     </el-table>
                     <br />
-            <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
+                    <el-pagination v-model:current-page="baseTableQuery.currentPage"
-                :small="false" :disabled="false" :background="false" :default-page-size="10"
+                        v-model:page-size="baseTableQuery.pageSize" :page-sizes="[10, 25, 50]" :small="false"
-                layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
+                        :disabled="false" :background="false" :default-page-size="10" @size-change="search"
-                @current-change="search" />
+                        @current-change="search" layout="total, sizes, prev, pager, next, jumper"
-        </el-config-provider>
+                        :total="baseTableQuery.total" />
                 </div>
+                <el-dialog v-model="rowEditFlag" title="工作信息" width="40%" draggable :show-close="false">
+                    <el-form ref="rowEditFormRef" :model="rowFormEntity" :label-position="labelPosition"
+                        label-width="100px" style="max-width: 100%" status-icon>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="工作编号">
+                                    <el-input v-model="rowFormEntity.workIndex" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="工单号">
+                                    <el-input v-model="rowFormEntity.workOrder" disabled />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="总成号">
+                                    <el-input v-model="rowFormEntity.productId" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="成品号">
+                                    <el-input v-model="rowFormEntity.singleProductId" disabled />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="料盒号">
+                                    <el-input v-model="rowFormEntity.boxNo" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="料号">
+                                    <el-input v-model="rowFormEntity.goodsId" disabled />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="需求数量">
+                                    <el-input-number v-model.number="rowFormEntity.needNum" controls-position="right"
+                                        :min="0" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="已完成数量">
+                                    <el-input-number v-model.number="rowFormEntity.finishNum"
+                                        controls-position="right" :min="0" :max="rowFormEntity.needNum" clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="已分配数量">
+                                    <el-input-number v-model.number="rowFormEntity.distributeNum"
+                                        controls-position="right" :min="0" :max="rowFormEntity.needNum" clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="工作状态">
+                                    <el-select-v2 v-model="rowFormEntity.workStatus" placeholder="请选择工作状态"
+                                        :options="workStatusOptions"></el-select-v2>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="缺料状态">
+                                    <el-select-v2 v-model="rowFormEntity.lackStatus" placeholder="请选择缺料状态"
+                                        :options="lackStatusOptions"></el-select-v2>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-form>
+                    <template #footer>
+                        <span class="dialog-footer">
+                            <el-button type="primary" @click="rowEditFlag = false">取消</el-button>
+                            <el-button type="success" @click="submitUpdateRow(rowFormEntity)">
+                                确定
+                            </el-button>
+                        </span>
+                    </template>
+                </el-dialog>
+            </div>
+        </el-container>
+    </el-config-provider>
 </template>
 
 <script setup>
 import store from '@/store'
-import { getStockUpdateRecord } from '@/api/stock.js'
-import { errorBox } from '@/utils/myMessageBox.js'
-import { dateFormatter, timeFormatter } from '@/utils/formatter.js'
-import { Search } from '@element-plus/icons-vue'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
-</script>
+import { queryWorkSummaryByPage, updateKateWorks, closeCurrentWorks } from '@/api/kateWork.js'
-<script>
+import { dateFormatter, timeFormatter, yesOrNoFormatter } from '@/utils/formatter.js'
-export default {
+import { ref, reactive, onMounted, nextTick, onBeforeUnmount } from 'vue'
-    name: 'stockUpdateRecord',
+import { ElMessage } from 'element-plus'
-    data() {
+import { genTableRequest } from '@/utils/generator.js'
-        return {
+import { labelPosition } from '@/constant/form.js'
-            recordList: [],
+import { summaryTypeOptions, workStatusOptions, lackStatusOptions } from '@/constant/options.js'
+import { exportWorkSummaryExcel } from '@/api/excel.js'
+import { addAllOptionOfOptions } from '@/utils/generator.js'
+import { loading } from '@/utils/loading'
+/**
+ * 常量定义
+ */
+const STAND_ID = store.getters.getStandId
+const USER_NAME = store.getters.getUserName
+/**
+ * 变量定义
+ */
+let maxHeight = ref(window.innerHeight * 0.55)
+let tableLoading = ref(false)
+let tableData = ref([])
+let baseTableQuery = reactive({
     currentPage: 1,
     pageSize: 10,
     total: 0,
-            vehicleIdQuery: '',
+    sortBy: new Map([['productId', true]]),// 按照成品号顺序排序
-            goodsIdQuery: '',
+    standId: STAND_ID,
-            reasonQuery: '',
+    userName: USER_NAME
-            updateTimeQuery: null,
+})
-            shortcuts: [
+let searchQueryFormEntity = reactive({
-                {
+    summaryType: 1,
-                    text: '今天',
+    workOrder: '',
-                    value: new Date(),
+    boxNo: '',
-                },
+    lackStatus: -99,
-                {
+    workStatus: -99
-                    text: '昨天',
+})
-                    value: () => {
+let searchQueryFormRef = ref()
-                        const date = new Date()
+let rowEditFlag = ref(false)
-                        date.setTime(date.getTime() - 3600 * 1000 * 24)
+let workIndex = ''
-                        return date
+let rowEditFormRef = ref()
-                    },
+let rowFormEntity = reactive({})
-                },
+/**
-            ],
+ * 系统方法
-            loading: true,
+ */
-            recordId: '',
+onMounted(() => {
-            reasonOptions: [
+    nextTick(() => {
-                {
+        window.addEventListener('resize', resizeHeight)
-                    value: '',
+        search()
-                    label: '全部'
+    })
-                },
+})
-                {
+onBeforeUnmount(() => {
-                    value: '备料拣选更新',
+    nextTick(() => {
-                    label: '备料拣选更新'
+        window.removeEventListener('resize', resizeHeight)
-                },
+    })
-                {
+})
-                    value: '站台确认更新',
+const resizeHeight = () => {
-                    label: '站台确认更新'
+    maxHeight.value = window.innerHeight * 0.55
-                },
-                {
-                    value: '直接物料非计划领料回库更新',
-                    label: '直接物料非计划领料回库更新'
-                },
-                {
-                    value: '站台处理箱料错误',
-                    label: '站台处理箱料错误'
-                },
-                {
-                    value: '界面修改库存',
-                    label: '界面修改库存'
-                },
-                {
-                    value: '界面删除库存',
-                    label: '界面删除库存'
-                },
-                {
-                    value: '界面增加库存',
-                    label: '界面增加库存'
-                },
-                {
-                    value: '入库更新库存',
-                    label: '入库更新库存'
-                },
-                {
-                    value: '入库增加库存',
-                    label: '入库增加库存'
-                },
-                {
-                    value: '整出',
-                    label: '整出'
-                },
-            ],
 }
-    },
+/**
-    mounted() {
+ * 自定义方法
-        this.search()
+ */
-    },
+// 查询
-    methods: {
+const search = () => {
-        search() {
+    tableLoading.value = true
-            this.loading = true
+    let request = genTableRequest(baseTableQuery)
-            const request = {
+    // 设定查询参数
-                pageNo: this.currentPage,
+    request.summaryType = searchQueryFormEntity.summaryType
-                pageSize: this.pageSize,
+    request.workOrder = searchQueryFormEntity.workOrder.trim()
-                vehicleId: this.vehicleIdQuery.trim(),
+    request.boxNo = searchQueryFormEntity.boxNo.trim()
-                goodsId: this.goodsIdQuery.trim(),
+    request.workStatus = searchQueryFormEntity.workStatus == -99 ? null : searchQueryFormEntity.workStatus
-                reason: this.reasonQuery.trim(),
+    request.lackStatus = searchQueryFormEntity.lackStatus == -99 ? null : searchQueryFormEntity.lackStatus
-                updateTime: timeFormatter(this.updateTimeQuery),
+    queryWorkSummaryByPage(request).then((res) => {
-                userName: store.getters.getUserName
+        const response = res.data
-            }
+        if (response.code == 0) {
-            getStockUpdateRecord(request).then(res => {
+            const data = response.data
-                const tableResponse = res.data
+            if (data != null) {
-                if (tableResponse.code == 0) {
+                tableData.value = data.lists
-                    this.recordList = tableResponse.returnData.lists
+                baseTableQuery.total = data.total
-                    this.total = tableResponse.returnData.total
             } else {
-                    errorBox(tableResponse.message)
+                tableData.value = []
+                baseTableQuery.total = 0
+            }
+        } else {
+            ElMessage.error(response.message)
         }
     }).catch(err => {
         console.log(err)
-                errorBox('查询库存更新记录错误')
+        ElMessage.error('查询数据异常。')
+    }).finally(() => {
+        tableLoading.value = false
     })
-            this.loading = false
+}
-        },
+const clearQuery = () => {
-        timeFormat: (row, column, cellValue, index) => {
+    searchQueryFormEntity.workOrder = ''
+}
+const handleSortChange = (data) => {
+    if (baseTableQuery.sortBy.has(data.prop)) {
+        baseTableQuery.sortBy.delete(data.prop)
+    }
+    baseTableQuery.sortBy.set(data.prop, data.order == 'ascending')
+    search()
+}
+const getCurrentRow = (row) => {
+    workIndex = row.workIndex
+}
+const dateFormat = (row, column, cellValue, index) => {
+    return dateFormatter(cellValue)
+}
+const timeFormat = (row, column, cellValue, index) => {
     return timeFormatter(cellValue)
-        },
+}
-        reset() {
+const workStatusFormat = (row, column, cellValue, index) => {
-            this.vehicleIdQuery = ''
+    switch (cellValue) {
-            this.goodsIdQuery = ''
+        case -1:
-            this.reasonQuery = ''
+            return '已暂停'
-            this.updateTimeQuery = null
+        case 0:
-            this.search()
+            return '未开始'
-        },
+        case 1:
-        getCurrentRow(row) {
+            return '已开始'
-            this.recordId = row.recordId
+        case 2:
-        },
+            return '已完成'
-    },
+        default:
+            return '异常'
+    }
+}
+const lackStatusFormat = (row, column, cellValue, index) => {
+    switch (cellValue) {
+        case 0:
+            return '不缺料'
+        case 1:
+            return '缺料'
+        default:
+            return '异常'
+    }
+}
+const productTypeFormat = (row, column, cellValue, index) => {
+    switch (cellValue) {
+        case 1:
+            return '非服务件'
+        case 2:
+            return '服务件'
+        default:
+            return '异常'
+    }
+}
+const outGoodsFormat = (row, column, cellValue, index) => {
+    return yesOrNoFormatter(cellValue)
+}
+const exportExcel = () => {
+    const params = {
+        summaryType: searchQueryFormEntity.summaryType,
+        workOrder: searchQueryFormEntity.workOrder,
+        workStatus: searchQueryFormEntity.workStatus == -99 ? null : searchQueryFormEntity.workStatus,
+        lackStatus: searchQueryFormEntity.lackStatus == -99 ? null : searchQueryFormEntity.lackStatus,
+        standId: STAND_ID,
+        userName: USER_NAME
+    }
+    exportWorkSummaryExcel(params).then(res => {
+        const link = document.createElement('a');//创建a标签
+        try {
+            // let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'});    //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
+            let blob = res.data    //如果后台返回的直接是blob对象类型，直接获取数据
+            // let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
+            let _fileName = '工作详情' + dateFormatter(new Date) + '.xlsx'
+            link.style.display = 'none'//隐藏
+
+            // 兼容不同浏览器的URL对象
+            const url = window.URL || window.webkitURL || window.moxURL
+            link.href = url.createObjectURL(blob)
+            link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
+            document.body.appendChild(link)
+            link.click()
+            document.body.removeChild(link)
+            url.revokeObjectURL(link.href)//移除url对象
+        } catch (e) {
+            console.log(e)
+            ElMessage.error('下载文件失败')
+        }
+    }).catch(err => {
+        console.log(err)
+        ElMessage.error('导出失败')
+    })
+}
+// 编辑弹框
+const editCurrentRowFormEntity = (row) => {
+    // 设置form值
+    rowFormEntity.workIndex = row.workIndex
+    rowFormEntity.workOrder = row.workOrder
+    rowFormEntity.productId = row.productId
+    rowFormEntity.singleProductId = row.singleProductId
+    rowFormEntity.boxNo = row.boxNo
+    rowFormEntity.goodsId = row.goodsId
+    rowFormEntity.needNum = row.needNum
+    rowFormEntity.distributeNum = row.distributeNum
+    rowFormEntity.finishNum = row.finishNum
+    rowFormEntity.workStatus = row.workStatus
+    rowFormEntity.lackStatus = row.lackStatus
+    // 弹出框
+    rowEditFlag.value = true
+}
+// 关闭当前缺料工作
+const closeLackWork = (row) => {
+    const request = {
+        workIndex: row.workIndex,
+        standId: STAND_ID,
+        userName: USER_NAME
+    }
+    loading.open('关闭中...')
+    closeCurrentWorks(request).then(res => {
+        const response = res.data
+        if (response.code == 0) {
+            ElMessage.success(response.message)
+            search()
+        } else {
+            ElMessage.error(response.message)
+        }
+    }).catch(err => {
+        console.log(err)
+        ElMessage.error('请求异常。')
+    }).finally(() => {
+        loading.close()
+    })
+}
+// 更新当前行数据
+const submitUpdateRow = (rowFormEntity) => {
+    const request = {
+        workIndex: rowFormEntity.workIndex,
+        distributeNum: rowFormEntity.distributeNum,
+        finishNum: rowFormEntity.finishNum,
+        workStatus: rowFormEntity.workStatus,
+        lackStatus: rowFormEntity.lackStatus,
+        standId: STAND_ID,
+        userName: USER_NAME
+    }
+    loading.open('更新中...')
+    updateKateWorks(request).then(res => {
+        if (res.data.code == 0) {
+            ElMessage.success('更新数据成功。')
+            rowEditFlag.value = false
+            search()
+        } else {
+            ElMessage.error('更新数据失败。')
+        }
+    }).catch(err => {
+        console.log(err)
+        ElMessage.error('更新数据异常。')
+    }).finally(() => {
+        loading.close()
+    })
 }
 </script>
-
 <style scoped>
-.el-pagination {
+.content {
-    padding-left: 5px;
+    display: flex;
-}
-
-.el-row .el-button {
-    width: 72px;
-    margin-left: 0px;
-    margin-right: 5px;
-}
-
-.table-class {
     width: 100%;
 }
 
-.el-row .el-form-item {
+.work-area {
-    width: 10% inherit;
+    width: 100%;
-    justify-content: center;
+    /* padding: 5px; */
 }
 
-.el-row .el-form-item .el-select-v2 {
+.search-area {
-    width: 100% !important;
-}
-
-.el-row .el-form-item .el-input-number {
-    width: 100% !important;
-}
-
-.el-row .el-form-item .el-button {
     margin: auto;
-}
+    min-height: fit-content;
-
+    max-height: 40%;
-.title-area {
-    display: flex;
-    /* min-height: 10%; */
-    max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
     border: solid 1px;
     border-radius: 10px;
     box-shadow: 0px 15px 10px -15px #000;
     overflow: auto;
-    flex-direction: column;
     padding: 10px;
 }
+
+.table-area {
+    margin: auto;
+    min-height: fit-content;
+    max-height: 60%;
+    margin-bottom: 10px;
+    min-width: inherit;
+    border: solid 1px;
+    border-radius: 10px;
+    box-shadow: 0px 15px 10px -15px #000;
+    overflow: auto;
+    padding: 10px;
+}
+
+.el-form-item {
+    margin: 5px 5px 5px 5px;
+}
+
+.el-form-item .el-input {
+    width: 196px;
+}
+
+.el-form-item .el-input-number {
+    width: 196px;
+}
+
+.el-form-item .el-select-v2 {
+    width: 196px;
+}
+
+.table-class {
+    margin: 5px 5px 5px 5px;
+    width: inherit;
+}
+
+.el-pagination {
+    padding-left: 5px;
+}
+
+.my-autocomplete li {
+    width: 196px;
+    line-height: normal;
+    padding: 7px;
+}
+
+.my-autocomplete li .name {
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+    font-size: 12px;
+    color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+    color: #ddd;
+}
+
+.my-autocomplete li .goods_id {
+    color: brown;
+}
+
+.my-autocomplete li .goods_name {
+    color: cornflowerblue;
+}
+
+.btn-search {
+    height: 30px;
+    width: 80px;
+    margin: auto 5px 5px auto;
+    color: black;
+}
 </style>