From 0314aa55e0862fa4a6d5bc845e809be8c8cabcb9 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Tue, 28 Apr 2026 15:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Copilot <copilot@github.com>
---
 src/api/storeManagement/matureSubmission.js   |    9 +
 .../components/addEditDialog.vue              |    1 +
 .../otherIssuing/index.vue                    |  465 ++---
 .../otherIssuing/otherIssuingDailog.vue       | 1611 +++++++++--------
 .../components/exception/dataMissing.vue      |    7 +-
 .../coatingMater/assayedContent.vue           |    1 -
 src/views/system/menu.vue                     |    4 +-
 .../materialExpiration/InspectionDialog.vue   |  164 ++
 .../materialExpiration/matureSubmission.vue   |  730 ++++----
 9 files changed, 1614 insertions(+), 1378 deletions(-)
 create mode 100644 src/views/warehouseManagement/materialExpiration/InspectionDialog.vue

diff --git a/src/api/storeManagement/matureSubmission.js b/src/api/storeManagement/matureSubmission.js
index 6e93804d..f4d2061d 100644
--- a/src/api/storeManagement/matureSubmission.js
+++ b/src/api/storeManagement/matureSubmission.js
@@ -8,4 +8,13 @@ export const getList = params => {
       method: 'get',
       params
     });
+};
+
+// 确认送检  stExpireSubmission/submit
+export const save = params => { 
+    return request({
+      url: '/api/blade-wms/stExpireSubmission/submit',
+      method: 'post',
+      data: params
+    });
 };
\ No newline at end of file
diff --git a/src/views/inboundOutboundManagement/components/addEditDialog.vue b/src/views/inboundOutboundManagement/components/addEditDialog.vue
index c3fc855a..c674fd07 100644
--- a/src/views/inboundOutboundManagement/components/addEditDialog.vue
+++ b/src/views/inboundOutboundManagement/components/addEditDialog.vue
@@ -402,6 +402,7 @@ export default {
       console.log('index--------', index);
       getGlassPieList({
         woCode: e.target.value,
+        goodsCode:this.tableData[index].goodsCode,
       }).then(res => {
         console.log('res--------', res);
       });
diff --git a/src/views/inboundOutboundManagement/otherIssuing/index.vue b/src/views/inboundOutboundManagement/otherIssuing/index.vue
index 1f973c8a..b32cce9d 100644
--- a/src/views/inboundOutboundManagement/otherIssuing/index.vue
+++ b/src/views/inboundOutboundManagement/otherIssuing/index.vue
@@ -1,45 +1,77 @@
 <template>
   <basic-container>
-    <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" 
-      v-model:page="page" ref="crud"
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
       v-model:search="searchForm"
-      @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
-      :before-open="beforeOpen">
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+      :before-open="beforeOpen"
+    >
       <template #menu-left>
-        <el-input v-model="checkCode" @keyup.enter.native="changeCode" style="width: 240px; margin-right: 24px" placeholder="请扫描条形码" />
+        <el-input
+          v-model="checkCode"
+          @keyup.enter.native="changeCode"
+          style="width: 240px; margin-right: 24px"
+          placeholder="请扫描条形码"
+        />
         <el-button type="primary" @click="addView()">新增</el-button>
       </template>
       <template #menu-right> </template>
       <template #menu="scope">
-        <el-button type="text"  @click="handeDetails(scope.row)">详情</el-button>
-        <el-button type="text" v-if="scope.row.approvalStatus === 0" @click="handeExamine(scope.row)">审批</el-button>
+        <el-button type="text" @click="handeDetails(scope.row)">详情</el-button>
+        <el-button
+          type="text"
+          v-if="scope.row.approvalStatus === 0"
+          @click="handeExamine(scope.row)"
+          >审批</el-button
+        >
       </template>
       <!-- <template #menu="scope">
         <el-button type="text" size="mini" @click="handle(scope.row.tbId)">处理</el-button>
       </template> -->
     </avue-crud>
-    <otherIssuingDailog v-if="openShow" :showDialog="openShow" :checkCode="checkCode" @closeDialog="closeDialog"></otherIssuingDailog>
-    <detailsDialog v-if="showDetail" :showDialog="showDetail" :id="checkId" @closeDialog="closeDialog"></detailsDialog>
+    <otherIssuingDailog
+      v-if="openShow"
+      :showDialog="openShow"
+      :checkCode="checkCode"
+      @closeDialog="closeDialog"
+    ></otherIssuingDailog>
+    <detailsDialog
+      v-if="showDetail"
+      :showDialog="showDetail"
+      :id="checkId"
+      @closeDialog="closeDialog"
+    ></detailsDialog>
     <el-dialog width="30%" v-model="approveDialog" title="审批">
-            <el-form :model="auditForm" :rules="auditRules" ref="auditForm">
-                <el-form-item label="是否审核通过" prop="approvalResult">
-                    <el-radio v-model="auditForm.approvalResult" label="1">是</el-radio>
-                    <el-radio v-model="auditForm.approvalResult" label="10">否</el-radio>
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <span class="dialog-footer">
-                    <el-button @click="approveDialog = false">取 消</el-button>
-                    <el-button type="primary" @click="submit">确 定</el-button>
-                </span>
-            </template>
-        </el-dialog>
+      <el-form :model="auditForm" :rules="auditRules" ref="auditForm">
+        <el-form-item label="是否审核通过" prop="approvalResult">
+          <el-radio v-model="auditForm.approvalResult" label="1">是</el-radio>
+          <el-radio v-model="auditForm.approvalResult" label="10">否</el-radio>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="approveDialog = false">取 消</el-button>
+          <el-button type="primary" @click="submit">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </basic-container>
 </template>
 <script>
-import {getList,getDetail,approve} from "@/api/storeManagement/otherIssuing"
-import otherIssuingDailog from "./otherIssuingDailog.vue";
+import { getList, getDetail, approve } from '@/api/storeManagement/otherIssuing';
+import otherIssuingDailog from './otherIssuingDailog.vue';
 import detailsDialog from './detailsDialog.vue';
 export default {
   components: {
@@ -49,15 +81,15 @@ export default {
   data() {
     return {
       openShow: false,
-      checkId:'',
-      showDetail:false,
-      checkCode:"",
+      checkId: '',
+      showDetail: false,
+      checkCode: '',
       selectionList: [],
-      query:{},
-      searchForm:{},
-      loading:false,
+      query: {},
+      searchForm: {},
+      loading: false,
       option: {
-        height: "auto",
+        height: 'auto',
         calcHeight: 32,
         tip: false,
         // size: "medium",
@@ -73,12 +105,12 @@ export default {
         viewBtn: false,
         delBtn: false,
         addBtn: false,
-        editBtnText: "修改",
-        editBtn:false,
-        viewBtnIcon: " ",
-        delBtnIcon: " ",
-        editBtnIcon: " ",
-        viewBtnText: "详情",
+        editBtnText: '修改',
+        editBtn: false,
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        viewBtnText: '详情',
         labelWidth: 120,
         menuWidth: 120,
         dialogWidth: 1200,
@@ -91,22 +123,22 @@ export default {
         excelBtn: true,
         columnSort: true,
         index: true,
-        searchLabelPosition: "left",
-        searchLabelWidth: "auto",
+        searchLabelPosition: 'left',
+        searchLabelWidth: 'auto',
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: "center",
+        menuAlign: 'center',
         gridBtn: false,
-        searchMenuPosition: "right",
-        addBtnIcon: " ",
-        viewBtnIcon: " ",
-        delBtnIcon: " ",
-        editBtnIcon: " ",
-        align: "center",
+        searchMenuPosition: 'right',
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        align: 'center',
         column: [
           {
-            label: "出库单号",
-            prop: "sirCode",
+            label: '出库单号',
+            prop: 'sirCode',
             // bind: "stAccBill.billCode",
             sortable: true,
             filter: true,
@@ -115,18 +147,24 @@ export default {
             width: 180,
           },
           {
-            label: "出库日期",
-            prop: "inOutDate",
+            label: '出库日期',
+            prop: 'inOutDate',
             // bind: "stAccBill.billDate",
             search: true,
             sortable: true,
             filter: true,
             span: 12,
             width: 180,
+            type: 'date',
+            searchRange: true,
+            valueFormat: 'YYYY-MM-DD',
+            format: 'YYYY-MM-DD',
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
           },
           {
-            label: "出库仓库",
-            prop: "shName",
+            label: '出库仓库',
+            prop: 'shName',
             // bind: "stAccBill.coStorehouse.shName",
             search: true,
             sortable: true,
@@ -135,91 +173,89 @@ export default {
             width: 180,
           },
           {
-            label: "出库类别",
-            prop: "outType",
-            type: "select",
+            label: '出库类别',
+            prop: 'outType',
+            type: 'select',
             // bind: "stAccBill.billFlagStr",
             search: false,
             sortable: true,
             filter: true,
             span: 12,
-            width:110,
-            dicData:[
+            width: 110,
+            dicData: [
               /*0:报废出库,1:料头出库,2.超额出库,3复检出库,4领用出库,5库转移,6退货出库,11不合格退库*/
-              { label: "报废出库", value: 0 },
-              { label: "料头出库", value: 1 },
-              { label: "超额出库", value: 2 },
-              { label: "复检出库", value: 3 },
-              { label: "领用出库", value: 4 },
-              { label: "库转移", value: 5 },
-              { label: "退货出库", value: 6 },
-              { label: "班组提请", value: 8 },
-              { label: "不合格退库", value: 11 },
-
-            ]
+              { label: '报废出库', value: 0 },
+              { label: '料头出库', value: 1 },
+              { label: '超额出库', value: 2 },
+              { label: '复检出库', value: 3 },
+              { label: '领用出库', value: 4 },
+              { label: '库转移', value: 5 },
+              { label: '退货出库', value: 6 },
+              { label: '班组提请', value: 8 },
+              { label: '不合格退库', value: 11 },
+            ],
           },
           {
-            label: "出库原因",
-            prop: "inOutReason",
-            type: "select",
+            label: '出库原因',
+            prop: 'inOutReason',
+            type: 'select',
             search: false,
             sortable: true,
             filter: true,
             span: 12,
             width: 180,
-            dicData:[
+            dicData: [
+              {
+                value: '0',
+                label: '报废出库',
+              },
+              {
+                value: '1',
+                label: '料头出库',
+              },
+              {
+                value: '2',
+                label: '超额出库',
+              },
+              {
+                value: '3',
+                label: '复检出库',
+              },
+              {
+                value: '4',
+                label: '领用出库',
+              },
               {
-                    value: '0',
-                    label: "报废出库"
-                },
-                {
-                    value: '1',
-                    label: "料头出库"
-                },
-                {
-                    value: '2',
-                    label: "超额出库"
-                },
-                {
-                    value: '3',
-                    label: "复检出库"
-                },
-                {
-                    value: '4',
-                    label: "领用出库"
-                },
-                {
-                    value: '5',
-                    label: "库转移"
-                },
-                {
-                    value: '6',
-                    label: "退货出库"
-                },
-                {
-                    value: '7',
-                    label: "物料出库"
-                },
-                {
-                    value: '8',
-                    label: "班组提请"
-                },
-                {label:'不合格退库',value:'11'}
-            ]
+                value: '5',
+                label: '库转移',
+              },
+              {
+                value: '6',
+                label: '退货出库',
+              },
+              {
+                value: '7',
+                label: '物料出库',
+              },
+              {
+                value: '8',
+                label: '班组提请',
+              },
+              { label: '不合格退库', value: '11' },
+            ],
           },
           {
-            label: "领料人",
-            prop: "pickerName",
+            label: '领料人',
+            prop: 'pickerName',
             search: true,
             sortable: true,
             filter: true,
             span: 12,
             width: 100,
-
           },
           {
-            label: "制单人",
-            prop: "createUserName",
+            label: '制单人',
+            prop: 'createUserName',
             // bind: "stAccBill.createMan.userName",
             search: false,
             sortable: true,
@@ -228,8 +264,8 @@ export default {
             width: 100,
           },
           {
-            label: "工装编号",
-            prop: "toolCode",
+            label: '工装编号',
+            prop: 'toolCode',
             // bind: "pjMold.toolingCode",
             search: false,
             sortable: true,
@@ -239,8 +275,8 @@ export default {
             width: 180,
           },
           {
-            label: "报废单号",
-            prop: "bfCode",
+            label: '报废单号',
+            prop: 'bfCode',
             search: false,
             sortable: true,
             filter: true,
@@ -249,8 +285,8 @@ export default {
             width: 180,
           },
           {
-            label: "关联车间订单号",
-            prop: "woCode",
+            label: '关联车间订单号',
+            prop: 'woCode',
             search: false,
             sortable: true,
             filter: true,
@@ -259,26 +295,26 @@ export default {
             width: 150,
           },
           {
-            label: "审批状态",
-            prop: "approvalStatus",
+            label: '审批状态',
+            prop: 'approvalStatus',
             search: false,
             sortable: true,
             filter: true,
             span: 12,
             display: false,
-            type: "select",
+            type: 'select',
             width: 180,
             dicData: [
               {
-                label: "审批中",
+                label: '审批中',
                 value: 0,
               },
               {
-                label: "审批通过",
+                label: '审批通过',
                 value: 1,
               },
               {
-                label: "审批驳回",
+                label: '审批驳回',
                 value: 10,
               },
               // {
@@ -288,8 +324,8 @@ export default {
             ],
           },
           {
-            label: "审批意见",
-            prop: "approvalOpinion",
+            label: '审批意见',
+            prop: 'approvalOpinion',
             search: false,
             sortable: true,
             filter: true,
@@ -298,8 +334,8 @@ export default {
             width: 180,
           },
           {
-            label: "审批人",
-            prop: "approverName",
+            label: '审批人',
+            prop: 'approverName',
             search: false,
             sortable: true,
             filter: true,
@@ -308,22 +344,22 @@ export default {
             width: 180,
           },
           {
-            label: "审批时间",
-            prop: "approvalTime",
+            label: '审批时间',
+            prop: 'approvalTime',
             search: false,
             sortable: true,
             filter: true,
             span: 12,
             display: false,
-            type: "datetime",
+            type: 'datetime',
             width: 180,
           },
           {
-            label: "报废原因",
-            prop: "bfType",
+            label: '报废原因',
+            prop: 'bfType',
             // bind: "scrapReason",
             search: false,
-            type:"select",
+            type: 'select',
             sortable: true,
             // /**
             //  * 报废类型：到期维护报废
@@ -337,11 +373,11 @@ export default {
             //  * 报废类型：玻璃饼报废
             //  */
             // public static final Short BF_TYPE_GLASS_CAKE = 3;
-            dicData:[
-              { label: "到期维护报废", value: 1 },
-              { label: "未报废", value: 0 },
-              { label: "归还报废", value: 2 },
-              { label: "玻璃饼报废", value: 3 }
+            dicData: [
+              { label: '到期维护报废', value: 1 },
+              { label: '未报废', value: 0 },
+              { label: '归还报废', value: 2 },
+              { label: '玻璃饼报废', value: 3 },
             ],
             filter: true,
             span: 24,
@@ -349,8 +385,8 @@ export default {
             width: 180,
           },
           {
-            label: "提请单号",
-            prop: "crCode",
+            label: '提请单号',
+            prop: 'crCode',
             // bind: "stAccBill.billCode",
             sortable: true,
             filter: true,
@@ -359,8 +395,8 @@ export default {
             width: 180,
           },
           {
-            label: "备注",
-            prop: "memo",
+            label: '备注',
+            prop: 'memo',
             search: false,
             sortable: true,
             filter: true,
@@ -368,7 +404,6 @@ export default {
             display: false,
             width: 180,
           },
-
         ],
       },
       form: {},
@@ -377,15 +412,15 @@ export default {
         currentPage: 1,
         total: 0,
       },
-      approveDialog:false,
-      auditForm:{},
-      auditRules:{
-        approvalResult:[{ required: true, message: '请选择是否通过审核', trigger: 'blur' }] 
+      approveDialog: false,
+      auditForm: {},
+      auditRules: {
+        approvalResult: [{ required: true, message: '请选择是否通过审核', trigger: 'blur' }],
       },
     };
   },
-  created(){
-    if (JSON.stringify(this.$store.state.client.otherOutParams) !== "{}") {
+  created() {
+    if (JSON.stringify(this.$store.state.client.otherOutParams) !== '{}') {
       this.query = this.$store.state.client.otherOutParams;
       this.searchForm = this.$store.state.client.otherOutParams;
     }
@@ -394,82 +429,82 @@ export default {
     addView() {
       this.openShow = true;
     },
-    changeCode(val){
-      if(this.checkCode == "") return
-      this.openShow = true
+    changeCode(val) {
+      if (this.checkCode == '') return;
+      this.openShow = true;
     },
-    beforeOpen(done, type){
-      if(['view'].includes(type)){
-        getDetail({id:this.form.id}).then(res =>{
-          console.log('res=============',res)
-        })
-      }else{
+    beforeOpen(done, type) {
+      if (['view'].includes(type)) {
+        getDetail({ id: this.form.id }).then(res => {
+          console.log('res=============', res);
+        });
+      } else {
         done();
       }
     },
-    searchChange(params, done){
+    searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad()
-      this.$store.dispatch("changeSetting", {
-        title: "otherOutParams",
+      this.onLoad();
+      this.$store.dispatch('changeSetting', {
+        title: 'otherOutParams',
         form: this.query,
       });
-      done()
+      done();
     },
-    searchReset(){
-      this.query = {}
-      this.$store.dispatch("changeSetting", {
-        title: "otherOutParams",
+    searchReset() {
+      this.query = {};
+      this.$store.dispatch('changeSetting', {
+        title: 'otherOutParams',
         form: this.query,
       });
-      this.onLoad()
+      this.onLoad();
     },
-    currentChange(currentPage){
-      this.page.currentPage = currentPage
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
     },
-    sizeChange(pageSize){
-      this.page.pageSize = pageSize
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
     },
-    closeDialog(val){
-      this.openShow = false
-      this.showDetail = false
-      if(val){
-        this.onLoad()
+    closeDialog(val) {
+      this.openShow = false;
+      this.showDetail = false;
+      if (val) {
+        this.onLoad();
       }
     },
     handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => { });
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {});
     },
-    handeExamine(row){
-      this.auditForm = {}
-      this.auditForm.id = row.id
-      this.approveDialog = true
+    handeExamine(row) {
+      this.auditForm = {};
+      this.auditForm.id = row.id;
+      this.approveDialog = true;
     },
-    handeDetails(row){
-      this.showDetail = true
-      this.checkId = row.id
+    handeDetails(row) {
+      this.showDetail = true;
+      this.checkId = row.id;
     },
-    submit(){
+    submit() {
       this.$refs.auditForm.validate(valid => {
-        if(valid){
-            approve({...this.auditForm}).then(res =>{
-                if(res.data.code == 200){
-                    this.$message.success('审批成功')
-                    this.approveDialog = false
-                    this.onLoad()
-                }
-            })
+        if (valid) {
+          approve({ ...this.auditForm }).then(res => {
+            if (res.data.code == 200) {
+              this.$message.success('审批成功');
+              this.approveDialog = false;
+              this.onLoad();
+            }
+          });
         }
-      })
+      });
     },
     // 多选
     selectionChange(list) {
@@ -477,18 +512,26 @@ export default {
     },
     onLoad() {
       this.loading = true;
+      let params = {
+        ...this.query,
+        startInOutDate:
+          this.query.inOutDate && this.query.inOutDate.length != 0 && this.query.inOutDate[0],
+        endInOutDate:
+          this.query.inOutDate && this.query.inOutDate.length != 0 && this.query.inOutDate[1],
+      };
+      if (params.inOutDate) delete params.inOutDate;
       getList({
         current: this.page.currentPage,
         size: this.page.pageSize,
-        ...this.query,
+        ...params,
       }).then(res => {
         res.data.data.records.forEach(item => {
-          item.approvalStatus = item.approvalStatus === -1 ? '' : item.approvalStatus
-        })
-        this.data = res.data.data.records
-        this.page.total = res.data.data.total
-        this.loading = false
-      })
+          item.approvalStatus = item.approvalStatus === -1 ? '' : item.approvalStatus;
+        });
+        this.data = res.data.data.records;
+        this.page.total = res.data.data.total;
+        this.loading = false;
+      });
       // this.data = [
       //   {
       //     tbId: 'OT2023001',
diff --git a/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue b/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
index 98caaed0..955a5b3d 100644
--- a/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
+++ b/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
@@ -1,835 +1,864 @@
 <template>
-    <el-dialog title="新增其他出库" append-to-body :modelValue="openShow" width="70%" @close="closeDialog" fullscreen>
+  <el-dialog
+    title="新增其他出库"
+    append-to-body
+    :modelValue="openShow"
+    width="70%"
+    @close="closeDialog"
+    fullscreen
+  >
+    <el-form ref="form" :model="stOtherOutRecord" :rules="rules" label-width="100px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="出库原因" prop="outType">
+            <el-select
+              v-model="stOtherOutRecord.outType"
+              @change="changeUseType"
+              class="item-choose"
+            >
+              <el-option
+                v-for="(item, index) in useTypeOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="出库仓库" prop="shId">
+            <el-select
+              v-model="stOtherOutRecord.shId"
+              @change="storeHouseChange"
+              class="item-choose"
+            >
+              <el-option
+                v-for="(item, index) in wareList"
+                :key="item.id"
+                :label="item.shName"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="领料人员" prop="picker">
+            <el-select v-model="stOtherOutRecord.picker" filterable class="item-choose">
+              <el-option
+                v-for="(item, index) in userData"
+                :key="item.id"
+                :label="`${item.realName}(${item.workNo})`"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="工装编号" prop="mid">
+            <el-select v-model="stOtherOutRecord.mid" value-key="id" filterable class="item-choose">
+              <el-option
+                v-for="item in treeData"
+                :key="item.mid"
+                :label="item.toolingCode"
+                :value="item.mid"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" v-if="isShowInput">
+          <el-form-item label="出库工作订单">
+            <el-input v-model="stOtherOutRecord.woCode" class="item-choose" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="备注" prop="memo" class="auto-fit">
+            <el-input
+              placeholder="请输入"
+              :rows="2"
+              v-model="stOtherOutRecord.memo"
+              type="textarea"
+              minlength="0"
+              maxlength="100"
+              show-word-limit
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row> </el-row>
+      <div slot="left" style="margin-bottom: 12px">
+        <el-button type="primary" @click="insertEvent()">插入一行</el-button>
+        <el-button type="danger" @click="deleteRow()">删除一行</el-button>
+      </div>
+      <el-table ref="xTable" :data="outbankList" border @select="selectChange">
+        <el-table-column type="selection" width="40" />
+        <el-table-column
+          label="出库单号"
+          prop="sirCode"
+          width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="仓库物料" prop="goodsCode" width="150" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>仓库物料</span>
+          </template>
+          <template #default="scope">
+            <!-- <el-select v-model="scope.row.goodsCode" @change="val => changeCode(val, scope.$index)">
+              <el-option
+                v-for="item in goodsList"
+                :key="item.id"
+                :label="item.goodsCode"
+                :value="item.goodsCode"
+              ></el-option>
+            </el-select> -->
 
-        <el-form ref="form" :model="stOtherOutRecord" :rules="rules" label-width="100px" size="mini">
-            <el-row>
-                <!-- <el-col :span="8">
-                    <el-form-item label="出库单号" prop="stAccBill.billCode">
-                        <el-input v-model="stOtherOutRecord.stAccBill.billCode" :disabled="true" />
-                    </el-form-item>
-                </el-col> -->
-                <!-- <el-col :span="6">
-                    <el-form-item label="出库日期" prop="billDate">
-                        <el-date-picker class="item-choose" v-model="stOtherOutRecord.billDate"
-                            :picker-options="billDatePicker" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" clearable
-                            placeholder="请选择" style="width: 250px;" />
-                    </el-form-item>
-                </el-col> -->
-                <el-col :span="6">
-                    <el-form-item label="出库原因" prop="outType">
-                        <el-select v-model="stOtherOutRecord.outType" @change="changeUseType" class="item-choose">
-                            <el-option v-for="(item, index) in useTypeOptions" :key="index" :label="item.label"
-                                :value="item.value" />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="出库仓库" prop="shId">
-                        <!-- <co-store-house-sel ref="storeHouse" v-model="stOtherOutRecord.stAccBill.coStorehouse.shId"
-                    :option="shOption" @itemValue="storeHouseChange" /> -->
-                        <el-select v-model="stOtherOutRecord.shId" @change="storeHouseChange"
-                            class="item-choose">
-                            <el-option v-for="(item, index) in wareList" :key="item.id" :label="item.shName"
-                                :value="item.id" />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="领料人员" prop="userId">
-                        <el-select v-model="stOtherOutRecord.userId" filterable
-                            class="item-choose">
-                            <el-option v-for="(item, index) in userData" :key="item.id"
-                                :label="`${item.realName}(${item.workNo})`" :value="item.id" />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="工装编号" prop="mid">
-                        <el-select v-model="stOtherOutRecord.mid" value-key="id" filterable class="item-choose">
-                            <el-option v-for="item in treeData" :key="item.mid" :label="item.toolingCode"
-                                :value="item.mid" />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6" v-if="isShowInput">
-                    <el-form-item label="出库工作订单">
-                        <el-input v-model="stOtherOutRecord.woCode" class="item-choose" />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="备注" prop="memo" class="auto-fit">
-                        <el-input placeholder="请输入" :rows="2" v-model="stOtherOutRecord.memo" type="textarea"
-                            minlength="0" maxlength="100" show-word-limit style="width: 100%;" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
+            <jhSelect
+              @input="val => (scope.row.goodsCode = val)"
+              :value="scope.row.goodsCode"
+              placeholder="请搜索选择"
+              api-url="/blade-wms/stGoods/list"
+              echo-api="/blade-wms/stGoods/list"
+              echoParamsKey="goodsCode"
+              echo-method="get"
+              api-method="get"
+              list-key="records"
+              total-key="total"
+              label-key="goodsCode"
+              value-key="goodsCode"
+              search-key="goodsCode"
+              :debounce-time="100"
+              @change="(val, item) => changeCode(val, item, scope.$index)"
+              :title="'修改'"
+            />
+          </template>
+        </el-table-column>
 
-            </el-row>
-            <div slot="left" style="margin-bottom: 12px;">
-                <el-button type="success" size="mini" @click="insertEvent()">插入一行</el-button>
-                <el-button type="danger" size="mini" @click="deleteRow()">删除一行</el-button>
-                <!-- <el-button type="primary" size="mini" @click="submit()">保存</el-button> -->
-            </div>
-            <el-table ref="xTable"  :data="outbankList" border @select="selectChange">
-                <el-table-column type="selection" width="40" />
-                <el-table-column label="出库单号" prop="sirCode" width="120" align="center"></el-table-column>
-                <el-table-column label="仓库物料" prop="goodsCode" width="200" align="center" >
-                    <template #header>
-                        <span><i style="color: red">*</i>仓库物料</span>
-                    </template>
-                    <template #default="scope">
-                        <el-select v-model="scope.row.goodsCode" @change="(val) => changeCode(val,scope.$index)">
-                            <el-option v-for="item in goodsList" :key="item.id" :label="item.goodsCode" :value="item.goodsCode"></el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                    <!-- <template v-slot:edit="scope">
+        <el-table-column label="物料名称" prop="goodsName" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>物料名称</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="型号/牌号" prop="materialModel" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>型号/牌号</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="库位号" prop="slId" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>库位号</span>
+          </template>
+          <template #default="scope">
+            <el-select v-model="scope.row.slId" @change="val => changeLocation(val, scope.$index)">
+              <el-option
+                v-for="item in scope.row.locationList"
+                :key="item.id"
+                :label="item.location"
+                :value="item.slId"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="批次号" prop="piNo" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>批号</span>
+          </template>
+          <template #default="scope">
+            <el-select v-model="scope.row.piNo" @change="val => changePiNo(val, scope.$index)">
+              <el-option
+                v-for="item in scope.row.piNoList"
+                :key="item.piNo"
+                :label="item.piNo"
+                :value="item.piNo"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="炉批号" prop="stovePiNo" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>炉批号</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="库存数量" prop="quantity" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>库存数量</span>
+          </template>
+        </el-table-column>
 
-                        <st-store-goods-out v-model="scope.row.rlsId" :option="[]" :params="goodsParams"
-                            @itemValue="goodsItemValue" />
-                    </template>
-                    <template v-slot="{ row }">{{ row.goodsCodeAndGoodsName }}</template> -->
-                <el-table-column label="物料名称" prop="goodsName" align="center">
-                    <template #header>
-                        <span><i style="color: red">*</i>物料名称</span>
-                    </template>
-                    <!-- <template #default="scope">
-                        <el-input v-model="scope.row.coGoods.goodsName" disabled placeholder="请输入" />
-                    </template> -->
-                </el-table-column>
-                <el-table-column label="型号/牌号" prop="materialModel" align="center">
-                    <template #header>
-                        <span><i style="color: red">*</i>型号/牌号</span>
-                    </template>
-                    <!-- <template #default="scope">
-                        <el-input v-model="scope.row.coGoods.mtltmrk" placeholder="请输入" />
-                    </template> -->
-                </el-table-column>
-                <el-table-column label="库位号" prop="slId" align="center">
-                    <template #header>
-                        <span><i style="color: red">*</i>库位号</span>
-                    </template>
-                    <template #default="scope">
-                        <el-select v-model="scope.row.slId" @change="(val) => changeLocation(val,scope.$index)">
-                            <el-option v-for="item in scope.row.locationList" :key="item.id"
-                            :label="item.location" :value="item.slId"></el-option>
-                        </el-select>
-                        <!-- <el-input v-model="scope.row.storageLocation.location" placeholder="请输入" /> -->
-                    </template>
-                </el-table-column>
-                <el-table-column label="批次号" prop="piNo" align="center">
-                    <template #header>
-                        <span><i style="color: red">*</i>批号</span>
-                    </template>
-                    <template #default="scope">
-                        <el-select v-model="scope.row.piNo" @change="val => changePiNo(val,scope.$index)">
-                            <el-option v-for="item in scope.row.piNoList" :key="item.piNo"
-                            :label="item.piNo" :value="item.piNo"></el-option>
-                        </el-select>
-                        <!-- <el-input v-model="scope.row.piNo" placeholder="请输入" /> -->
-                    </template>
-                </el-table-column>
-                <el-table-column label="炉批号" prop="stovePiNo" align="center">
-                    <template #header>
-                        <span><i style="color: red">*</i>炉批号</span>
-                    </template>
-                    <!-- <template #default="scope">
-                        <el-input v-model="scope.row.stovePiNo" placeholder="请输入" />
-                    </template> -->
-                </el-table-column>
-                <el-table-column label="库存数量" prop="quantity" align="center">
-                    <template #header>
-                        <span><i style="color: red">*</i>库存数量</span>
-                    </template>
-                    <!-- <template #default="scope">
-                        <el-input v-model="scope.row.quantity" placeholder="请输入"  type="number"/>
-                    </template> -->
-                </el-table-column>
-                <!-- <el-table-column label="出库件数" :edit-render="{ type: 'default' }" prop="outQuantity">
-                    <template v-slot:edit="scope">
-                        <vd-input-number v-model="scope.row.outQuantity" :min="-1000000000" :max="1000000000"
-                            :precision="4" />
-                    </template>
-                    <template v-slot="{ row }">{{ row.outQuantity }}</template>
-                </el-table-column> -->
-                <el-table-column label="出库件数" prop="outQuantity" align="center">
-                    <template #header>
-                        <span><i style="color: red">*</i>出库件数</span>
-                    </template>
-                    <template #default="scope">
-                        <el-input-number style="width:90%;" v-model="scope.row.outQuantity" 
-                        :max="scope.row.quantity" placeholder="请输入" controls-position="right"></el-input-number>
-                    </template>
-                </el-table-column>
-                <el-table-column label="计量单位" prop="unitName" align="center">
-                    <template #header>
-                        <span><i style="color: red">*</i>计量单位</span>
-                    </template>
-                    <!-- <template #default="scope">
-                        <el-input v-model="scope.unitName" placeholder="请输入"/>
-                    </template> -->
-                </el-table-column>
-                <el-table-column label="到期日期" prop="scrapCycle" align="center">
-                    <template #header>
-                        <span><i style="color: red">*</i>到期日期</span>
-                    </template>
-                    <template #default="scope">
-                        <el-date-picker disabled v-model="scope.row.scrapCycle" format="YYYY-MM-DD HH:mm:ss"
-                            value-format="YYYY-MM-DD HH:mm:ss" type="date" placeholder="选择日期" style="width: 100%" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="入库日期" prop="inOutDate" align="center">
-                    <template #header>
-                        <span><i style="color: red">*</i>入库日期</span>
-                    </template>
-                    <template #default="scope">
-                        <el-date-picker disabled v-model="scope.row.inOutDate" format="YYYY-MM-DD HH:mm:ss"
-                            value-format="YYYY-MM-DD HH:mm:ss" type="date" placeholder="选择日期" style="width: 100%" />
-                    </template>
-                </el-table-column>
-            </el-table>
+        <el-table-column label="出库件数" prop="outQuantity" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>出库件数</span>
+          </template>
+          <template #default="scope">
+            <el-input-number
+              style="width: 90%"
+              v-model="scope.row.outQuantity"
+              :max="scope.row.quantity"
+              placeholder="请输入"
+              controls-position="right"
+            ></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column label="计量单位" prop="unitName" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>计量单位</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="到期日期" prop="scrapCycle" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>到期日期</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              disabled
+              v-model="scope.row.scrapCycle"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="入库日期" prop="inOutDate" align="center">
+          <template #header>
+            <span><i style="color: red">*</i>入库日期</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              disabled
+              v-model="scope.row.inOutDate"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
 
-        </el-form>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="closeDialog">取 消</el-button>
-                <el-button type="primary" @click="submit">确 定</el-button>
-            </span>
-        </template>
-    </el-dialog>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 <script>
-import {dateFormat} from '@/utils/date'
-import {getOtherOutNo,getWarehouseList,getKeeperList,getGoodsOutList,getLocationList,completeIssue,
-getLocationData,addIssue,getShList} from "@/api/storeManagement/otherIssuing"
+import { dateFormat } from '@/utils/date';
+import {
+  getOtherOutNo,
+  getWarehouseList,
+  getKeeperList,
+  getGoodsOutList,
+  getLocationList,
+  completeIssue,
+  getLocationData,
+  addIssue,
+  getShList,
+} from '@/api/storeManagement/otherIssuing';
 export default {
-    props: {
-        showDialog: {
-            type: Boolean,
-            default: false
-        },
-        checkCode:{
-            type: String,
-            default: ''
-        }
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-        const assQuantityValid = ({
-            cellValue,
-            rule,
-            rules,
-            row,
-            rowIndex,
-            column,
-            columnIndex
-        }) => {
-            return new Promise((resolve, reject) => {
-                if (row.coGoods) {
-                    if (row.coGoods.numAcc) {
-                        if (cellValue == null) {
-                            reject(new Error(this.$t("store.goodsMustInputAssQuatity")));
-                        }
-                    }
-                }
-                resolve();
-            });
-        };
-        return {
-            openShow: false,
-            billCode:null,
-            userOption: [],
-            wareList:[],
-            shOption: [],
-            moldOption: {},
-            treeData: [],
-            goodsList:[],
-            stOtherOutRecord: {
-                // billDate:dateFormat(new Date(),'yyyy-MM-dd'),
-                // stAccBill: {
-                    // billDate: new Date(),
-                    // pfUserInfo: { dept: {} },
-                    // coStorehouse: { shId: null }
-                // },
-                mid:null,
-                outType: 4,
-                woCode: null,
-                memo: null
-            },
-            btnLoading: false,
-            outbankList: [],
-            oldShId: null,
-            disableTaskCode: true,
-            billDatePicker: '',
-            useTypeOptions: [
-                {
-                    value: 0,
-                    label: "报废出库"
-                },
-                {
-                    value: 1,
-                    label: "料头出库"
-                },
-                {
-                    value: 2,
-                    label: "超额出库"
-                },
-                {
-                    value: 3,
-                    label: "复检出库"
-                },
-                {
-                    value: 4,
-                    label: "领用出库"
-                },
-                {
-                    value: 5,
-                    label: "库转移"
-                },
-                {
-                    value: 6,
-                    label: "退货出库"
-                },
-                {
-                    value: 7,
-                    label: "物料出库"
-                },
-                {
-                    value: 8,
-                    label: "班组提请"
-                }
-            ],
-            goodsParams: {},
-            piNoParams: {},
-            rules: {
-                // stAccBill: {
-                //     coStorehouse: {
-                        shId: [{ required: true,message:"请选择仓库",trigger:"blur" }],
-                    // },
-                    // pfUserInfo: {
-                        userId: [{ required: true,message:"请选择领料人",trigger:"blur" }],
-                    // }
-                // },
-                // moId: [],
-
-                outType: [{ required: true,message:"请选择出库原因",trigger:"blur" }],
-            },
-            gridRules: {
-                rlsId: [{ required: true }],
-                shelfNo: [{ required: true }],
-                assQuantity: [{ validator: assQuantityValid }]
-            },
-            isShowInput: false,
-            userData: []
-        }
+    checkCode: {
+      type: String,
+      default: '',
     },
-    mounted() {
-        this.openShow = this.showDialog
-        this.getCode()
-        if(this.checkCode == ""){
-            this.getWare()
-            this.getKeeper()
-            this.getGoods()
-        }else{
-            this.getKeeper()
-            this.getShData()
-        }
-    },
-    methods: {
-        getShData(){
-            getShList({
-                goodsCode:this.checkCode
-            }).then(res =>{
-                this.wareList = res.data.data
-
-                
-            })
-        },
-        getBasicData(){
-            completeIssue({
-                barCode:this.checkCode
-            }).then(res =>{
-                this.outbankList = [
-                    {sirCode:this.billCode,...res.data.data}
-                ]
-                this.stOtherOutRecord.shId = res.data.data.shId
-            })
-        },
-        getCode(){
-            getOtherOutNo().then(res =>{
-                this.billCode = res.data.data.sirCode
-                if(this.checkCode != ''){
-                    this.getBasicData()
-                }
-            })
-        },
-        uniqueById(arr) {
-            const seen = new Map();
-            for (const item of arr) {
-                if (!seen.has(item.slId)) {
-                seen.set(item.slId, item);
-                }
+  },
+  data() {
+    const assQuantityValid = ({ cellValue, rule, rules, row, rowIndex, column, columnIndex }) => {
+      return new Promise((resolve, reject) => {
+        if (row.coGoods) {
+          if (row.coGoods.numAcc) {
+            if (cellValue == null) {
+              reject(new Error(this.$t('store.goodsMustInputAssQuatity')));
             }
-            return Array.from(seen.values());
-        },
-        changeCode(val,index){
-            let tmp = this.goodsList.find(item => item.goodsCode == val)
-            console.log('tmp------------',tmp)
-            this.outbankList[index].goodsName = tmp.goodsName
-            this.outbankList[index].materialModel = tmp.materialModel
-            this.outbankList[index].unitName = tmp.unitName
-            this.outbankList[index].goodsId = tmp.id
-            this.outbankList[index].slId = ""
-            this.outbankList[index].piNo = ""
-            this.outbankList[index].quantity = ''
-
-            getLocationData({
-                shId:this.stOtherOutRecord.shId,
-                goodsId:tmp.id
-            }).then(res =>{
-                console.log('res--------',res)
-                let data = this.uniqueById(res.data.data.records)
-                this.outbankList[index].locationList = data
-            })
-        },
-        changeLocation(val,index){
-            this.outbankList[index].piNo = ""
-            getLocationData({
-                shId:this.stOtherOutRecord.shId,
-                goodsId:this.outbankList[index].goodsId,
-                slId:val
-            }).then(res =>{
-                this.outbankList[index].piNoList = res.data.data.records
-            })
+          }
+        }
+        resolve();
+      });
+    };
+    return {
+      openShow: false,
+      billCode: null,
+      userOption: [],
+      wareList: [],
+      shOption: [],
+      moldOption: {},
+      treeData: [],
+      goodsList: [],
+      stOtherOutRecord: {
+        // billDate:dateFormat(new Date(),'yyyy-MM-dd'),
+        // stAccBill: {
+        // billDate: new Date(),
+        // pfUserInfo: { dept: {} },
+        // coStorehouse: { shId: null }
+        // },
+        mid: null,
+        outType: 4,
+        woCode: null,
+        memo: null,
+      },
+      btnLoading: false,
+      outbankList: [],
+      oldShId: null,
+      disableTaskCode: true,
+      billDatePicker: '',
+      useTypeOptions: [
+        {
+          value: 0,
+          label: '报废出库',
         },
-        changePiNo(val,index){
-            let tmp = this.outbankList[index].piNoList.find(item => item.piNo == val)
-            if(tmp){
-                this.outbankList[index].stovePiNo = tmp.stovePiNo
-                this.outbankList[index].quantity = tmp.quantity
-                this.outbankList[index].scrapCycle = tmp.scrapCycle
-                this.outbankList[index].inOutDate = tmp.inOutDate
-                this.outbankList[index].id = tmp.id
-            }
+        {
+          value: 1,
+          label: '料头出库',
         },
-        getGoods(){
-            getGoodsOutList().then(res =>{
-                this.goodsList = res.data.data.records
-            })
+        {
+          value: 2,
+          label: '超额出库',
         },
-        getKeeper(){
-            getKeeperList().then(res =>{
-                this.userData = res.data.data
-            })
+        {
+          value: 3,
+          label: '复检出库',
         },
-        getWare(){
-            getWarehouseList().then(res =>{
-                this.wareList = res.data.data.records
-            })
+        {
+          value: 4,
+          label: '领用出库',
         },
-        closeDialog(val) {
-            this.openShow = false
-            this.$emit('closeDialog',val);
+        {
+          value: 5,
+          label: '库转移',
         },
-        userDataFn() {
-            // this.$ajax.post("sysComBox/user", { "filterValue": null, "paging": { "pageSize": 9999999, "pageNumber": 1 }, "baseParams": {} }).then(res => {
-            //     if (this.$ifAjax(res)) {
-            //         this.userData = res.data.list;
-
-            //     }
-            // });
+        {
+          value: 6,
+          label: '退货出库',
         },
-        opened() {
-            this.stOtherOutRecord = {
-                stAccBill: {
-                    billDate: new Date(),
-                    pfUserInfo: { dept: {} },
-                    coStorehouse: { shId: null }
-                },
-                mid: null,
-                outType: 4,
-                memo: null
-            };
-            this.oldShId = null;
-            this.outbankList = [];
-            this.$refs.form.resetFields();
-            if (this.abId == null) {
-                this.queryDataForAdd();
-            } else {
-                this.queryData();
-            }
-            this.changeUseType(this.stOtherOutRecord.outType);
-            this.moldList();
+        {
+          value: 7,
+          label: '物料出库',
         },
-        moldList() {
-            // this.$ajax.post("stOtherReceiptRecord/queryMoldList").then(res => {
-            //     if (this.$ifAjax(res)) {
-            //         this.loading = false;
-            //         this.treeData = res.data.list;
-            //     }
-            // });
-            // this.$ajax.post("stOtherOutRecord/generateCode").then(res => {
-            //     if (this.$ifAjax(res)) {
-            //         this.stOtherOutRecord.stAccBill.billCode =
-            //             res.data.stAccBill.billCode;
-
-            //     }
-            // });
+        {
+          value: 8,
+          label: '班组提请',
         },
-        queryDataForAdd() {
-            this.$ajax.get("stOtherOutRecord/preparedForAdd").then(res => {
-                this.stOtherOutRecord = res.data;
-                this.userOption = [
-                    {
-                        userId: this.stOtherOutRecord.stAccBill.pfUserInfo.userId,
-                        userName: this.stOtherOutRecord.stAccBill.pfUserInfo.userName
-                    }
-                ];
+      ],
+      goodsParams: {},
+      piNoParams: {},
+      rules: {
+        // stAccBill: {
+        //     coStorehouse: {
+        shId: [{ required: true, message: '请选择仓库', trigger: 'blur' }],
+        // },
+        // pfUserInfo: {
+        picker: [{ required: true, message: '请选择领料人', trigger: 'blur' }],
+        // }
+        // },
+        // moId: [],
 
-            });
-        },
-        queryData() {
-            // 根据凭证单ID查询入库数据
-            this.$ajax.get("stOtherOutRecord/queryForEdit/" + this.abId).then(res => {
-                const { stOtherOutRecord, outbankList, prMoldOrder } = res.data;
-                this.stOtherOutRecord = stOtherOutRecord;
-                this.outbankList = outbankList;
-                this.oldShId = this.stOtherOutRecord.stAccBill.coStorehouse.shId;
-                this.userOption = [
-                    {
-                        userId: this.stOtherOutRecord.stAccBill.pfUserInfo.userId,
-                        userName: this.stOtherOutRecord.stAccBill.pfUserInfo.userName
-                    }
-                ];
-                this.shOption = [
-                    {
-                        shId: this.stOtherOutRecord.stAccBill.coStorehouse.shId,
-                        shName: this.stOtherOutRecord.stAccBill.coStorehouse.shName
-                    }
-                ];
-                this.stOtherOutRecord.moId = prMoldOrder.moId;
-                this.moldOption[prMoldOrder.moId] = prMoldOrder;
-            });
-        },
-        insertEvent(row = -1) {
-            if(!this.stOtherOutRecord.shId || this.stOtherOutRecord.shId == ''){
-                this.$message.error('请选择仓库！');
-                return
-            }
-            // 新增一行
-            // 创建一个新行对象，包含所有必要的字段
-            let sirCode = '';
-            const len = this.outbankList;
-            if (len.length === 0) {
-                sirCode = this.billCode;
-            } else {
-                const newBoCode = len[len.length - 1].sirCode;
-                sirCode = Number(newBoCode) + 1;
-            }
-            const newRow = {
-                sirCode:sirCode,
-                _select:false
-            };
-            this.outbankList.push(newRow);
-        },
-        selectChange(list, row) {
-            row._select = !row._select;
-        },
-        // 删除选中行
-        deleteRow() {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.outbankList = this.outbankList.filter(row => !row._select);
-             });
+        outType: [{ required: true, message: '请选择出库原因', trigger: 'blur' }],
+      },
+      gridRules: {
+        rlsId: [{ required: true }],
+        shelfNo: [{ required: true }],
+        assQuantity: [{ validator: assQuantityValid }],
+      },
+      isShowInput: false,
+      userData: [],
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+    this.getCode();
+    if (this.checkCode == '') {
+      this.getWare();
+      this.getKeeper();
+      this.getGoods();
+    } else {
+      this.getKeeper();
+      this.getShData();
+    }
+  },
+  methods: {
+    getShData() {
+      getShList({
+        goodsCode: this.checkCode,
+      }).then(res => {
+        this.wareList = res.data.data;
+      });
+    },
+    getBasicData() {
+      completeIssue({
+        barCode: this.checkCode,
+      }).then(res => {
+        this.outbankList = [{ sirCode: this.billCode, ...res.data.data }];
+        this.stOtherOutRecord.shId = res.data.data.shId;
+      });
+    },
+    getCode() {
+      getOtherOutNo().then(res => {
+        this.billCode = res.data.data.sirCode;
+        if (this.checkCode != '') {
+          this.getBasicData();
+        }
+      });
+    },
+    uniqueById(arr) {
+      const seen = new Map();
+      for (const item of arr) {
+        if (!seen.has(item.slId)) {
+          seen.set(item.slId, item);
+        }
+      }
+      return Array.from(seen.values());
+    },
+    changeCode(val, item, index) {
+    //   let tmp = this.goodsList.find(item => item.goodsCode == val);
+    //   console.log('tmp------------', tmp);
+      
+      if (item != undefined) {
+        this.outbankList[index].goodsName = item.goodsName;
+      this.outbankList[index].materialModel = item.materialModel;
+      this.outbankList[index].unitName = item.unitName;
+      this.outbankList[index].goodsId = item.id;
+      this.outbankList[index].slId = '';
+      this.outbankList[index].piNo = '';
+      this.outbankList[index].quantity = '';
+      }
+      getLocationData({
+        shId: this.stOtherOutRecord.shId,
+        goodsId: item.id,
+      }).then(res => {
+        console.log('res--------', res);
+        let data = this.uniqueById(res.data.data.records);
+        this.outbankList[index].locationList = data;
+      });
+    },
+    changeLocation(val, index) {
+      this.outbankList[index].piNo = '';
+      getLocationData({
+        shId: this.stOtherOutRecord.shId,
+        goodsId: this.outbankList[index].goodsId,
+        slId: val,
+      }).then(res => {
+        this.outbankList[index].piNoList = res.data.data.records;
+      });
+    },
+    changePiNo(val, index) {
+      let tmp = this.outbankList[index].piNoList.find(item => item.piNo == val);
+      if (tmp) {
+        this.outbankList[index].stovePiNo = tmp.stovePiNo;
+        this.outbankList[index].quantity = tmp.quantity;
+        this.outbankList[index].scrapCycle = tmp.scrapCycle;
+        this.outbankList[index].inOutDate = tmp.inOutDate;
+        this.outbankList[index].id = tmp.id;
+      }
+    },
+    getGoods() {
+      getGoodsOutList().then(res => {
+        this.goodsList = res.data.data.records;
+      });
+    },
+    getKeeper() {
+      getKeeperList().then(res => {
+        this.userData = res.data.data;
+      });
+    },
+    getWare() {
+      getWarehouseList().then(res => {
+        this.wareList = res.data.data.records;
+      });
+    },
+    closeDialog(val) {
+      this.openShow = false;
+      this.$emit('closeDialog', val);
+    },
+    userDataFn() {
+      // this.$ajax.post("sysComBox/user", { "filterValue": null, "paging": { "pageSize": 9999999, "pageNumber": 1 }, "baseParams": {} }).then(res => {
+      //     if (this.$ifAjax(res)) {
+      //         this.userData = res.data.list;
+      //     }
+      // });
+    },
+    opened() {
+      this.stOtherOutRecord = {
+        stAccBill: {
+          billDate: new Date(),
+          pfUserInfo: { dept: {} },
+          coStorehouse: { shId: null },
         },
-        editActived({ row, rowIndex, column, columnIndex, $columnIndex, cell }) {
+        mid: null,
+        outType: 4,
+        memo: null,
+      };
+      this.oldShId = null;
+      this.outbankList = [];
+      this.$refs.form.resetFields();
+      if (this.abId == null) {
+        this.queryDataForAdd();
+      } else {
+        this.queryData();
+      }
+      this.changeUseType(this.stOtherOutRecord.outType);
+      this.moldList();
+    },
+    moldList() {
+      // this.$ajax.post("stOtherReceiptRecord/queryMoldList").then(res => {
+      //     if (this.$ifAjax(res)) {
+      //         this.loading = false;
+      //         this.treeData = res.data.list;
+      //     }
+      // });
+      // this.$ajax.post("stOtherOutRecord/generateCode").then(res => {
+      //     if (this.$ifAjax(res)) {
+      //         this.stOtherOutRecord.stAccBill.billCode =
+      //             res.data.stAccBill.billCode;
+      //     }
+      // });
+    },
+    queryDataForAdd() {
+      this.$ajax.get('stOtherOutRecord/preparedForAdd').then(res => {
+        this.stOtherOutRecord = res.data;
+        this.userOption = [
+          {
+            userId: this.stOtherOutRecord.stAccBill.pfUserInfo.userId,
+            userName: this.stOtherOutRecord.stAccBill.pfUserInfo.userName,
+          },
+        ];
+      });
+    },
+    queryData() {
+      // 根据凭证单ID查询入库数据
+      this.$ajax.get('stOtherOutRecord/queryForEdit/' + this.abId).then(res => {
+        const { stOtherOutRecord, outbankList, prMoldOrder } = res.data;
+        this.stOtherOutRecord = stOtherOutRecord;
+        this.outbankList = outbankList;
+        this.oldShId = this.stOtherOutRecord.stAccBill.coStorehouse.shId;
+        this.userOption = [
+          {
+            userId: this.stOtherOutRecord.stAccBill.pfUserInfo.userId,
+            userName: this.stOtherOutRecord.stAccBill.pfUserInfo.userName,
+          },
+        ];
+        this.shOption = [
+          {
+            shId: this.stOtherOutRecord.stAccBill.coStorehouse.shId,
+            shName: this.stOtherOutRecord.stAccBill.coStorehouse.shName,
+          },
+        ];
+        this.stOtherOutRecord.moId = prMoldOrder.moId;
+        this.moldOption[prMoldOrder.moId] = prMoldOrder;
+      });
+    },
+    insertEvent(row = -1) {
+      if (!this.stOtherOutRecord.shId || this.stOtherOutRecord.shId == '') {
+        this.$message.error('请选择仓库！');
+        return;
+      }
+      // 新增一行
+      // 创建一个新行对象，包含所有必要的字段
+      let sirCode = '';
+      const len = this.outbankList;
+      if (len.length === 0) {
+        sirCode = this.billCode;
+      } else {
+        const newBoCode = len[len.length - 1].sirCode;
+        sirCode = Number(newBoCode) + 1;
+      }
+      const newRow = {
+        sirCode: sirCode,
+        _select: false,
+      };
+      this.outbankList.push(newRow);
+    },
+    selectChange(list, row) {
+      row._select = !row._select;
+    },
+    // 删除选中行
+    deleteRow() {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.outbankList = this.outbankList.filter(row => !row._select);
+      });
+    },
+    editActived({ row, rowIndex, column, columnIndex, $columnIndex, cell }) {},
+    editClosed({ row, rowIndex, column, columnIndex, $columnIndex, cell }) {
+      // 编辑完成后触发
+      if (
+        column.property === 'quantity' ||
+        column.property === 'unitPrice' ||
+        column.property === 'abdMoney' ||
+        column.property === 'assQuantity'
+      ) {
+        this.changeData(row, column.property);
+      }
+    },
+    activeCellMethod({ column, columnIndex }) {
+      // 文本禁止编辑
+      if (this.stOtherOutRecord.stAccBill.coStorehouse.shId == null) {
+        this.$message.error(this.$t('store.pleaseChoseStore'));
+        return false;
+      }
 
-        },
-        editClosed({ row, rowIndex, column, columnIndex, $columnIndex, cell }) {
-            // 编辑完成后触发
-            if (
-                column.property === "quantity" ||
-                column.property === "unitPrice" ||
-                column.property === "abdMoney" ||
-                column.property === "assQuantity"
-            ) {
-                this.changeData(row, column.property);
-            }
-        },
-        activeCellMethod({ column, columnIndex }) {
-            // 文本禁止编辑
-            if (this.stOtherOutRecord.stAccBill.coStorehouse.shId == null) {
-                this.$message.error(this.$t("store.pleaseChoseStore"));
-                return false;
-            }
+      var row = this.$refs.xTable.getCurrentRecord();
 
-            var row = this.$refs.xTable.getCurrentRecord();
+      if (column.property === 'assQuantity') {
+        if (!row.coGoods.numAcc) {
+          this.$message.error(this.$t('store.pleaseChoseGoodsForNumAcc'));
+          return false;
+        }
+      }
+      return true;
+    },
+    close(isRefresh) {
+      this.$emit('cancel', isRefresh === true);
+    },
+    goodsItemValue(item) {
+      // 选择完数据，对关联数据进行修改
+      var row = this.$refs.xTable.getCurrentRecord();
 
-            if (column.property === "assQuantity") {
-                if (!row.coGoods.numAcc) {
-                    this.$message.error(this.$t("store.pleaseChoseGoodsForNumAcc"));
-                    return false;
-                }
-            }
-            return true;
-        },
-        close(isRefresh) {
-            this.$emit("cancel", isRefresh === true);
-        },
-        goodsItemValue(item) {
-            // 选择完数据，对关联数据进行修改
-            var row = this.$refs.xTable.getCurrentRecord();
+      if (item.storageLocation != null) {
+        this.$set(row, 'storageLocation', item.storageLocation);
+      }
 
-            if (item.storageLocation != null) {
-                this.$set(row, "storageLocation", item.storageLocation);
-            }
+      this.$set(row, 'quantity', item.quantity);
+      this.$set(row, 'coGoods', item.coGoods);
+      this.$set(row, 'rlsId', item.rlsId);
+      this.$set(row, 'piNo', item.piNo);
+      this.$set(row, 'stovePiNo', item.stovePiNo);
+      this.$set(row, 'goodsCodeAndGoodsName', item.goodsCodeAndGoodsName);
+      this.$set(row, 'createTime', item.createTime);
+      this.$set(row, 'scrapCycle', item.scrapCycle);
+    },
+    storeHouseChange(val) {
+      // console.log("item", item)
+      console.log('wareList---------', this.wareList);
 
-            this.$set(row, "quantity", item.quantity);
-            this.$set(row, "coGoods", item.coGoods);
-            this.$set(row, "rlsId", item.rlsId);
-            this.$set(row, "piNo", item.piNo);
-            this.$set(row, "stovePiNo", item.stovePiNo);
-            this.$set(row, "goodsCodeAndGoodsName", item.goodsCodeAndGoodsName);
-            this.$set(row, "createTime", item.createTime);
-            this.$set(row, "scrapCycle", item.scrapCycle);
-        },
-        storeHouseChange(val) {
-            // console.log("item", item)
-            console.log('wareList---------',this.wareList)
-           
-                let tmp = this.wareList.find(item => item.id == val)
-                if(tmp.shName.indexOf("玻璃饼") !== -1){
-                    this.isShowInput = true;
-                }else{
-                this.isShowInput = false; 
-                }
-            if(this.outbankList.length == 1){
-                this.outbankList[0].slId = ''
-                this.outbankList[0].piNo = ''
-                this.outbankList[0].quantity = ''
-                getGoodsOutList({
-                    shId:val
-                }).then(res =>{
-                    this.goodsList = res.data.data.records
-                    if(this.outbankList[0].goodsCode != ''){
-                        let tmp = this.goodsList.find(item => item.goodsCode == this.outbankList[0].goodsCode)
-                        this.outbankList[0].goodsId = tmp.id
-                        if(tmp){
-                        getLocationData({
-                                shId:val,
-                                goodsId:tmp.id
-                            }).then(res =>{
-                                console.log('res--------',res)
-                                let data = this.uniqueById(res.data.data.records)
-                                this.outbankList[0].locationList = data
-                            })  
-                        }
-                        
-                    }
-                })
-            }else{
-                this.outbankList = []
+      let tmp = this.wareList.find(item => item.id == val);
+      if (tmp.shName.indexOf('玻璃饼') !== -1) {
+        this.isShowInput = true;
+      } else {
+        this.isShowInput = false;
+      }
+      if (this.outbankList.length == 1) {
+        this.outbankList[0].slId = '';
+        this.outbankList[0].piNo = '';
+        this.outbankList[0].quantity = '';
+        getGoodsOutList({
+          shId: val,
+        }).then(res => {
+          this.goodsList = res.data.data.records;
+          if (this.outbankList[0].goodsCode != '') {
+            let tmp = this.goodsList.find(item => item.goodsCode == this.outbankList[0].goodsCode);
+            this.outbankList[0].goodsId = tmp.id;
+            if (tmp) {
+              getLocationData({
+                shId: val,
+                goodsId: tmp.id,
+              }).then(res => {
+                console.log('res--------', res);
+                let data = this.uniqueById(res.data.data.records);
+                this.outbankList[0].locationList = data;
+              });
             }
-        },
-        changeUseType(outType) {
+          }
+        });
+      } else {
+        this.outbankList = [];
+      }
+    },
+    changeUseType(outType) {},
 
-        },
+    changeData(row, fieldName) {
+      // 数量
+      let quantityVal = row.quantity;
+      // 件数
+      let assQuantityVal = row.assQuantity;
+      // 单价
+      let priceVal = row.unitPrice;
+      // 金额
+      let abdMoneyVal = row.abdMoney;
+      // 件数核算
+      const numAcc = row.coGoods.numAcc;
 
-        changeData(row, fieldName) {
-            // 数量
-            let quantityVal = row.quantity;
-            // 件数
-            let assQuantityVal = row.assQuantity;
-            // 单价
-            let priceVal = row.unitPrice;
-            // 金额
-            let abdMoneyVal = row.abdMoney;
-            // 件数核算
-            const numAcc = row.coGoods.numAcc;
+      if (quantityVal === undefined || quantityVal === null) {
+        quantityVal = 0;
+      }
+      if (assQuantityVal === undefined || assQuantityVal === null) {
+        assQuantityVal = 0;
+      }
+      if (priceVal === undefined || priceVal === null) {
+        priceVal = 0;
+      }
 
-            if (quantityVal === undefined || quantityVal === null) {
-                quantityVal = 0;
-            }
-            if (assQuantityVal === undefined || assQuantityVal === null) {
-                assQuantityVal = 0;
-            }
-            if (priceVal === undefined || priceVal === null) {
-                priceVal = 0;
-            }
+      const n = this.$number;
+      if (fieldName === 'quantity' || fieldName === 'unitPrice' || fieldName === 'assQuantity') {
+        if (numAcc) {
+          abdMoneyVal = n.floatMul(priceVal, assQuantityVal, 2);
+        } else {
+          abdMoneyVal = n.floatMul(priceVal, quantityVal, 2);
+        }
+        this.$set(row, 'abdMoney', abdMoneyVal);
+      } else {
+        if (numAcc) {
+          priceVal = n.floatDiv(abdMoneyVal, assQuantityVal, 6);
+        } else {
+          priceVal = n.floatDiv(abdMoneyVal, quantityVal, 6);
+        }
+        this.$set(row, 'abdMoney', abdMoneyVal);
+      }
+    },
+    getMinBillDate() {
+      const self = this;
 
-            const n = this.$number;
-            if (
-                fieldName === "quantity" ||
-                fieldName === "unitPrice" ||
-                fieldName === "assQuantity"
-            ) {
-                if (numAcc) {
-                    abdMoneyVal = n.floatMul(priceVal, assQuantityVal, 2);
-                } else {
-                    abdMoneyVal = n.floatMul(priceVal, quantityVal, 2);
-                }
-                this.$set(row, "abdMoney", abdMoneyVal);
-            } else {
-                if (numAcc) {
-                    priceVal = n.floatDiv(abdMoneyVal, assQuantityVal, 6);
-                } else {
-                    priceVal = n.floatDiv(abdMoneyVal, quantityVal, 6);
-                }
-                this.$set(row, "abdMoney", abdMoneyVal);
-            }
+      return {
+        disabledDate(time) {
+          if (self.stOtherOutRecord.stAccBill.billDate) {
+            return new Date(self.stOtherOutRecord.stAccBill.billDate).getTime() > time.getTime();
+          }
         },
-        getMinBillDate() {
-            const self = this;
+      };
+    },
+    submit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.outbankList.map(item => {
+            if (item.outQuantity > item.quantity) {
+              this.$message.error('出库数量不可大于库存数量');
+              return;
+            }
+          });
+          // 校验通过：准备提交数据（过滤无用字段）
+          const submitData = this.outbankList.map(row => {
+            const { piNoList, locationList, _select, ...validData } = row; // 剔除选择状态字段
+            return validData;
+          });
+          let params = {
+            outList: submitData,
+            stOtherOutRecord: this.stOtherOutRecord,
+          };
+          console.log('params', params);
+          addIssue(params).then(res => {
+            if (res.data.code == 200) {
+              this.$message.success('保存成功');
 
-            return {
-                disabledDate(time) {
-                    if (self.stOtherOutRecord.stAccBill.billDate) {
-                        return (
-                            new Date(self.stOtherOutRecord.stAccBill.billDate).getTime() >
-                            time.getTime()
-                        );
-                    }
-                }
-            };
-        },
-        submit() {
-            this.$refs.form.validate(valid => {
-                if (valid) {
-              
-                this.outbankList.map(item =>{
-                    if(item.outQuantity > item.quantity){
-                        this.$message.error('出库数量不可大于库存数量')
-                        return
-                    }
-                })
-                // 校验通过：准备提交数据（过滤无用字段）
-                const submitData = this.outbankList.map(row => {
-                    const { piNoList,locationList,_select, ...validData } = row; // 剔除选择状态字段
-                    return validData;
+              this.outbankList.map((item, index) => {
+                getLocationData({
+                  shId: this.stOtherOutRecord.shId,
+                  goodsId: item.goodsId,
+                  slId: item.slId,
+                }).then(res => {
+                  item.piNoList = res.data.data.records;
+                  let tmp = item.piNoList.find(item1 => item1.piNo == item.piNo);
+                  item.quantity = tmp.quantity;
                 });
-                let params = {
-                    outList:submitData,
-                    stOtherOutRecord:this.stOtherOutRecord
-                }
-                console.log('params',params)
-                addIssue(params).then(res =>{
-                    if(res.data.code == 200){
-                        this.$message.success('保存成功')
-
-                        this.outbankList.map((item,index) =>{
-                            getLocationData({
-                                shId:this.stOtherOutRecord.shId,
-                                goodsId:item.goodsId,
-                                slId:item.slId
-                            }).then(res =>{
-                                item.piNoList = res.data.data.records
-                                let tmp = item.piNoList.find(item1 => item1.piNo == item.piNo)
-                                item.quantity = tmp.quantity
-                            })
-                        })
-                        // this.outbankList = []
-                        // this.stOtherOutRecord = {}
-                        // this.closeDialog(true)
-                        // this.onLoad()
-                    }
-                })
-              }
-            })
-            // this.$message.success("保存成功");
-            // this.$refs.form.validate(formValid => {
-            //     if (formValid) {
-            //         if (this.isShowInput) {
-            //             if (
-            //                 this.stOtherOutRecord.woCode == null &&
-            //                 this.stOtherOutRecord.woCode == undefined
-            //             ) {
-            //                 return this.$message.warning("请填写工作订单号");
-            //             }
-            //         }
+              });
+              // this.outbankList = []
+              // this.stOtherOutRecord = {}
+              // this.closeDialog(true)
+              // this.onLoad()
+            }
+          });
+        }
+      });
+      // this.$message.success("保存成功");
+      // this.$refs.form.validate(formValid => {
+      //     if (formValid) {
+      //         if (this.isShowInput) {
+      //             if (
+      //                 this.stOtherOutRecord.woCode == null &&
+      //                 this.stOtherOutRecord.woCode == undefined
+      //             ) {
+      //                 return this.$message.warning("请填写工作订单号");
+      //             }
+      //         }
 
-            //         let submitList = [];
-            //         const deleteIds = [];
+      //         let submitList = [];
+      //         const deleteIds = [];
 
-            //         if (
-            //             this.oldShId != null &&
-            //             this.stOtherOutRecord.stAccBill.coStorehouse.shId !== this.oldShId
-            //         ) {
-            //             const { fullData } = this.$refs.xTable.getTableData();
-            //             if (fullData.length > 0) {
-            //                 submitList = submitList.concat(fullData);
-            //             }
-            //         } else {
-            //             const {
-            //                 insertRecords,
-            //                 updateRecords
-            //             } = this.$refs.xTable.getRecordset();
-            //             if (insertRecords.length > 0) {
-            //                 insertRecords.forEach(item => {
-            //                     if (item.coGoods.goodsId != null) {
-            //                         submitList.push(item);
-            //                     }
-            //                 });
-            //             }
-            //             if (updateRecords.length > 0) {
-            //                 submitList = submitList.concat(updateRecords);
-            //             }
-            //         }
+      //         if (
+      //             this.oldShId != null &&
+      //             this.stOtherOutRecord.stAccBill.coStorehouse.shId !== this.oldShId
+      //         ) {
+      //             const { fullData } = this.$refs.xTable.getTableData();
+      //             if (fullData.length > 0) {
+      //                 submitList = submitList.concat(fullData);
+      //             }
+      //         } else {
+      //             const {
+      //                 insertRecords,
+      //                 updateRecords
+      //             } = this.$refs.xTable.getRecordset();
+      //             if (insertRecords.length > 0) {
+      //                 insertRecords.forEach(item => {
+      //                     if (item.coGoods.goodsId != null) {
+      //                         submitList.push(item);
+      //                     }
+      //                 });
+      //             }
+      //             if (updateRecords.length > 0) {
+      //                 submitList = submitList.concat(updateRecords);
+      //             }
+      //         }
 
-            //         const removeRecords = this.$refs.xTable.getRemoveRecords();
-            //         if (removeRecords.length) {
-            //             removeRecords.forEach(obj => {
-            //                 if (obj.stAccBillDetail.abdId) {
-            //                     deleteIds.push(obj.stAccBillDetail.abdId);
-            //                 }
-            //             });
-            //         }
+      //         const removeRecords = this.$refs.xTable.getRemoveRecords();
+      //         if (removeRecords.length) {
+      //             removeRecords.forEach(obj => {
+      //                 if (obj.stAccBillDetail.abdId) {
+      //                     deleteIds.push(obj.stAccBillDetail.abdId);
+      //                 }
+      //             });
+      //         }
 
-            //         if (
-            //             (this.stOtherOutRecord.abId === undefined ||
-            //                 this.stOtherOutRecord.abId === null) &&
-            //             submitList.length === 0
-            //         ) {
-            //             this.$message.warning(
-            //                 this.$t("videaVueLib.publics.message.noDataToSave")
-            //             );
-            //         } else {
-            //             this.$refs.xTable.validate(submitList, errMap => {
-            //                 if (errMap) {
-            //                     return;
-            //                 }
-            //                 this.btnLoading = true;
-            //                 this.$ajax
-            //                     .post("stOtherOutRecord/addStOtherOutRecord", {
-            //                         stOtherOutRecord: this.stOtherOutRecord,
-            //                         list: submitList,
-            //                         deleteIds: deleteIds
-            //                     })
-            //                     .then(res => {
-            //                         if (this.$ifAjax(res)) {
-            //                             this.$message.success(
-            //                                 this.$t("videaVueLib.publics.message.success")
-            //                             );
-            //                             this.close(true);
-            //                         }
-            //                         this.btnLoading = false;
-            //                     });
-            //             });
-            //         }
-            //     }
-            // });
-        },
-        piCodeChange(id, item) {
-            this.stOtherOutRecord.taskCode = item.moCode;
-        }
-    }
-}
+      //         if (
+      //             (this.stOtherOutRecord.abId === undefined ||
+      //                 this.stOtherOutRecord.abId === null) &&
+      //             submitList.length === 0
+      //         ) {
+      //             this.$message.warning(
+      //                 this.$t("videaVueLib.publics.message.noDataToSave")
+      //             );
+      //         } else {
+      //             this.$refs.xTable.validate(submitList, errMap => {
+      //                 if (errMap) {
+      //                     return;
+      //                 }
+      //                 this.btnLoading = true;
+      //                 this.$ajax
+      //                     .post("stOtherOutRecord/addStOtherOutRecord", {
+      //                         stOtherOutRecord: this.stOtherOutRecord,
+      //                         list: submitList,
+      //                         deleteIds: deleteIds
+      //                     })
+      //                     .then(res => {
+      //                         if (this.$ifAjax(res)) {
+      //                             this.$message.success(
+      //                                 this.$t("videaVueLib.publics.message.success")
+      //                             );
+      //                             this.close(true);
+      //                         }
+      //                         this.btnLoading = false;
+      //                     });
+      //             });
+      //         }
+      //     }
+      // });
+    },
+    piCodeChange(id, item) {
+      this.stOtherOutRecord.taskCode = item.moCode;
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 .item-choose {
-    width: 250px;
+  width: 250px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/orderManagement/components/exception/dataMissing.vue b/src/views/orderManagement/components/exception/dataMissing.vue
index 3d166ded..1fa7ccf6 100644
--- a/src/views/orderManagement/components/exception/dataMissing.vue
+++ b/src/views/orderManagement/components/exception/dataMissing.vue
@@ -876,7 +876,6 @@ export default {
       }
     },
     partCodeChange(val,value,item) {
-      console.log(val, value,item,9090909090)
       this.editForm.partName =item.partName
     },
     submitEdit() {
@@ -1011,3 +1010,9 @@ export default {
   },
 };
 </script>
+<style scoped>
+:deep(.el-dialog){
+  height: 85vh;
+  margin-top: 5vh;
+}
+</style>
diff --git a/src/views/productionManagement/components/coatingMater/assayedContent.vue b/src/views/productionManagement/components/coatingMater/assayedContent.vue
index 080189e7..4001d56b 100644
--- a/src/views/productionManagement/components/coatingMater/assayedContent.vue
+++ b/src/views/productionManagement/components/coatingMater/assayedContent.vue
@@ -151,7 +151,6 @@ export default {
               label: '化验时间',
               prop: 'assayTime',
               span: 24,
-              type: 'datetime',
               overflow: true,
               search: false,
               headerAlign: 'center',
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 7460ef4b..7c119acf 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -102,12 +102,12 @@ addBtnIcon: ' ',
         delBtnIcon: ' ',
         editBtnIcon: ' ',
         searchShowBtn:false,
-        align: 'center',
+        // align: 'center',
         column: [
           {
             label: '菜单名称',
             prop: 'name',
-            width: 300,
+            width: 240,
             search: true,
             rules: [
               {
diff --git a/src/views/warehouseManagement/materialExpiration/InspectionDialog.vue b/src/views/warehouseManagement/materialExpiration/InspectionDialog.vue
new file mode 100644
index 00000000..aaad7cc5
--- /dev/null
+++ b/src/views/warehouseManagement/materialExpiration/InspectionDialog.vue
@@ -0,0 +1,164 @@
+<template>
+  <el-dialog
+    title="批量送检"
+    append-to-body
+    :modelValue="openShow"
+    width="90%"
+    @close="closeDialog"
+  >
+    <el-table
+      ref="xTable"
+      :loading="btnLoading"
+      :data="rowData"
+      border
+      show-overflow
+      class="el-table-element"
+      stripe
+      height="400px"
+      highlight-current-row
+      row-id="rowIndex"
+    >
+      <!-- <el-table-column type="checkbox" width="40" /> -->
+      <el-table-column label="物料编码" align="center" prop="goodsCode" min-width="120" />
+
+      <el-table-column label="物料名称" align="center" prop="goodsName" min-width="150" />
+      <el-table-column label="送检数量" align="center" prop="esQty" min-width="150">
+        <template #header>
+          <span><i style="color: red">*</i>送检数量</span>
+        </template>
+        <template #default="scope">
+          <!-- <el-input v-model="scope.row.esQty" placeholder="请输入" /> -->
+          <el-input-number v-model="scope.row.esQty" :min="0" label="请输入"></el-input-number>
+        </template>
+      </el-table-column>
+      <el-table-column label="送检部门" align="center" prop="esDeptId" min-width="150">
+        <template #header>
+          <span><i style="color: red">*</i>送检部门</span>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-model="scope.row.esDeptId"
+            clearable
+            filterable
+            @change="deptChange(scope.row)"
+          >
+            <el-option
+              v-for="(item, index) in deplList"
+              :key="index"
+              :label="item.deptName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="炉批号" align="center" prop="stovePiNo" min-width="100" />
+      <el-table-column label="型号/牌号" align="center" prop="specifications" min-width="100" />
+      <el-table-column label="生产标识" align="center" min-width="100" prop="quantityLevel" />
+      <el-table-column label="检验编号" align="center" prop="checkoutCode" width="100" />
+      <el-table-column label="供方代码" align="center" prop="splyCode" width="100" />
+    </el-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { getDeplList } from '@/api/flowManagement/index';
+import { save } from '@/api/storeManagement/matureSubmission';
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+    rowData: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      openShow: false,
+      deplList: [],
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+
+    console.log('rowData', this.rowData);
+    this.getDeplLists();
+  },
+  methods: {
+    // 制单部门名称
+    deptChange(row) {
+      let sel = this.deplList.filter(item => item.id == row.esDeptId)[0];
+      row.esDept = sel.deptName;
+    },
+    // 获取部门列表
+    getDeplLists() {
+      getDeplList().then(res => {
+        let data = res.data.data;
+        data.forEach(item => {
+          if (item.deptName == '热表分厂') {
+            this.deplList = item.children || [];
+          }
+        });
+      });
+    },
+    closeDialog() {
+      this.openShow = false;
+      this.$emit('closeDialog');
+    },
+    submit() {
+      if (!this.rowData || this.rowData.length === 0) {
+        this.$message.warning('没有可提交的数据');
+        return;
+      }
+
+      // 2. 遍历每一行进行校验
+      for (let i = 0; i < this.rowData.length; i++) {
+        const row = this.rowData[i];
+
+        // 校验送检数量 (esQty)
+        // 注意：el-input-number 的值可能是数字 0，如果是 0 通常也视为无效或未输入，根据业务需求调整
+        // 如果允许为0，则只判断 null/undefined；如果不允许为0，则判断 !row.esQty
+        if (row.esQty === null || row.esQty === undefined || row.esQty === '') {
+          this.$message.error(`第 ${i + 1} 行数据的“送检数量”不能为空`);
+          return; // 发现错误立即停止
+        }
+
+        // 校验送检部门 (esDeptId)
+        if (!row.esDeptId) {
+          this.$message.error(`第 ${i + 1} 行数据的“送检部门”不能为空`);
+          return; // 发现错误立即停止
+        }
+      }
+
+      // 3. 校验通过，执行提交逻辑
+      console.log('校验通过，准备提交数据:', this.rowData);
+      save(this.rowData)
+        .then(res => {
+          this.$message.success('送检成功');
+          this.closeDialog();
+        })
+        .catch(err => {
+          this.closeDialog();
+        });
+      // TODO: 调用后端接口
+      // submitInspection(this.rowData).then(res => {
+      //   if (res.data.code === 200) {
+      //     this.$message.success('送检成功');
+      //     this.closeDialog();
+      //   }
+      // });
+
+      //   this.$message.success('校验通过');
+      //   this.closeDialog();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/warehouseManagement/materialExpiration/matureSubmission.vue b/src/views/warehouseManagement/materialExpiration/matureSubmission.vue
index 012eaa27..60e1ae33 100644
--- a/src/views/warehouseManagement/materialExpiration/matureSubmission.vue
+++ b/src/views/warehouseManagement/materialExpiration/matureSubmission.vue
@@ -1,385 +1,371 @@
 <template>
-    <basic-container>
-        <avue-crud :option="option" v-model:search="search" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
-            @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
-            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
-            <template #menu-left>
-                <!-- 批量送检  对接erp中的数据 -->
-                <el-button type="primary" @click="allocationFun()">批量送检</el-button>
-                <!-- <el-button type="danger" @click="handle()">删除</el-button> -->
-            </template>
-            <template #menu-right>
-                <el-button type="warning" @click="searchData(0)" plain>即将到期</el-button>
-                <el-button type="danger" @click="searchData(1)" plain>已到期</el-button>
-                <!-- <el-button type="primary" @click="allocationFun()">批量调拨</el-button>
+  <basic-container>
+    <avue-crud
+      :option="option"
+      v-model:search="search"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <!-- 批量送检  对接erp中的数据 -->
+        <el-button type="primary" @click="allocationFun()">批量送检</el-button>
+        <!-- <el-button type="danger" @click="handle()">删除</el-button> -->
+      </template>
+      <template #menu-right>
+        <el-button type="warning" @click="searchData(0)" plain>即将到期</el-button>
+        <el-button type="danger" @click="searchData(1)" plain>已到期</el-button>
+        <!-- <el-button type="primary" @click="allocationFun()">批量调拨</el-button>
                 <el-button type="primary" @click="handle()">导入</el-button> -->
-            </template>
-            <template #menu="scope">
-                <!-- <el-button type="text" @click="handle(scope.row.tbId)">调拨</el-button> -->
-            </template>
+      </template>
+      <template #menu="scope">
+        <!-- <el-button type="text" @click="handle(scope.row.tbId)">调拨</el-button> -->
+      </template>
+    </avue-crud>
 
-        </avue-crud>
-    </basic-container>
+    <!-- 到期送检 -->
+    <inspectionDialog
+      ref="inspectionDialog"
+      @closeDialog="closeDialog"
+      :showDialog="inspectionShow"
+      :rowData="rowData"
+      v-if="inspectionShow"
+    />
+  </basic-container>
 </template>
 <script>
-import {getList} from "@/api/storeManagement/matureSubmission"
+import { getList } from '@/api/storeManagement/matureSubmission';
+import inspectionDialog from './InspectionDialog.vue';
 export default {
-    data() {
-        return {
-            selectionList: [],
-            loading: false,
-            search:{
-                days:30
-            },
-            option: {
-                height: 'auto',
-                calcHeight: 32,
-                tip: false,
-                // size: 'medium',
-                simplePage: true,
-                searchShow: true,
-                searchMenuSpan: 6,
-                searchIcon: true,
-                searchIndex: 3,
-                tree: false,
-                border: true,
-                index: true,
-                selection: true,
-                viewBtn: false,
-                delBtn: false,
-                addBtn: false,
-                editBtnText: '修改',
-                addBtnIcon: ' ',
-                viewBtnIcon: ' ',
-                delBtnIcon: ' ',
-                editBtnIcon: ' ',
-                viewBtnText: '详情',
-                labelWidth: 120,
-                menuWidth: 180,
-                dialogWidth: 1040,
-                dialogClickModal: false,
-                searchEnter: true,
-                excelBtn: false,
-                filterBtn: true,
-                searchShowBtn: false,
-                columnSort: true,
-                excelBtn: true,
-                columnSort: true,
-                index: false,
-                showOverflowTooltip: true,
-                menu: false,
-                searchLabelPosition: 'left',
-                searchLabelWidth: 'auto',
-                searchGutter: 24,
-                searchSpan: 6,
-                menuAlign: 'left',
-                gridBtn: false,
-                searchMenuPosition: 'right',
-                align: 'center',
-                column: [
-                    {
-                        label: '送检单号',
-                        prop: 'esCode',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: true,
-                        width: 200,
-                    },
-                    {
-                        label: '物料编码',
-                        prop: 'goodsCode',
-                        // bind: 'coGoods.goodsCode',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: true,
-                        width: 160,
-                    },
-                    {
-                        label: '物料名称',
-                        prop: 'goodsName',
-                        // bind: 'coGoods.goodsName',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: false,
-                        width: 120,
-                    },
-                    // {
-                    //     label: '库房名称',
-                    //     prop: 'shName',
-                    //     // bind: 'stRealtimeStock.coStorehouse.shName',
-                    //     sortable: true,
-                    //     filter: true,
-                    //     span: 12,
-                    //     search: false,
-                    //     width: 120,
-                    // },
-                    {
-                        label: '所属仓库',
-                        prop: 'shName',
-                        // bind: 'stRealtimeStock.storageLocation.location',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: false,
-                        width: 160,
-                        headerAlign: 'center',
-                    },
-                    {
-                        label: '炉批号',
-                        prop: 'stovePiNo',
-                        // bind: 'stovePiNo',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: false,
-                        width: 120,
-                    },
-                    {
-                        label: '检验编号',
-                        prop: 'checkCode',
-                        // bind: 'checkCode',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: false,
-                        width: 120,
-                    },
-                    {
-                        label: '质量等级',
-                        prop: 'quantityLevel',
-                        // bind: 'quantityLevel',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: false,
-                        width: 120,
-                    },
-                    {
-                        label: '送检数量',
-                        prop: 'esQty',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: false,
-                        width: 120,
-                    },
-                    {
-                        label: '送检部门',
-                        prop: 'esDept',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: false,
-                        width: 120,
-                    },
-                    {
-                        label: '送检日期',
-                        prop: 'esTime',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: false,
-                        width: 160,
-                    },
-                    {
-                        label: '送检人',
-                        prop: 'esMan',
-                        // bind: 'userName',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: false,
-                        width: 120,
-                    },
-                    {
-                        label: '临期天数',
-                        prop:"expireDays",
-                        width:120
-                    },
-                    {
-                        label: '到期状态',
-                        prop: 'expireStatus',
-                        // bind: 'wsMan.userName',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: false,
-                        width: 120,
-                        type: 'select',
-                        dicData: [
-                            {
-                                label: '未到期',
-                                value: 0
-                            },
-                            {
-                                label: '已到期',
-                                value: 1
-                            }
-                        ]
-                    },
-                    {
-                        label: '送检状态',
-                        prop: 'applyFor',
-                        // bind: 'wsMan.userName',
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        search: true,
-                        width: 120,
-                        type: 'select',
-                        dicData: [
-                            {
-                                label: '未送检',
-                                value: false
-                            },
-                            {
-                                label: '已送检',
-                                value: true
-                            }
-                        ]
-                    },
+  components: {
+    inspectionDialog,
+  },
 
-                ]
-            },
-            form: {
+  data() {
+    return {
+      inspectionShow: false,
+      selectionList: [],
+      loading: false,
+      search: {
+        days: 30,
+      },
+      option: {
+        height: 'auto',
+        calcHeight: 32,
+        tip: false,
+        simplePage: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: false,
+        delBtn: false,
+        addBtn: false,
+        editBtnText: '修改',
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        viewBtnText: '详情',
+        labelWidth: 120,
+        menuWidth: 180,
+        dialogWidth: 1040,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: false,
+        filterBtn: true,
+        searchShowBtn: false,
+        columnSort: true,
+        excelBtn: true,
+        columnSort: true,
+        index: false,
+        showOverflowTooltip: true,
+        menu: false,
+        searchLabelPosition: 'left',
+        searchLabelWidth: 'auto',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        align: 'center',
+        column: [
+          {
+            label: '送检单号',
+            prop: 'esCode',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: true,
+            width: 200,
+          },
+          {
+            label: '物料编码',
+            prop: 'goodsCode',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: true,
+            width: 160,
+          },
+          {
+            label: '物料名称',
+            prop: 'goodsName',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: false,
+            width: 120,
+          },
 
-            },
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
-            },
-            query:{}
-        }
+          {
+            label: '所属仓库',
+            prop: 'shName',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: false,
+            width: 160,
+            headerAlign: 'center',
+          },
+          {
+            label: '炉批号',
+            prop: 'stovePiNo',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: false,
+            width: 120,
+          },
+          {
+            label: '检验编号',
+            prop: 'checkCode',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: false,
+            width: 120,
+          },
+          {
+            label: '质量等级',
+            prop: 'quantityLevel',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: false,
+            width: 120,
+          },
+          {
+            label: '送检数量',
+            prop: 'esQty',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: false,
+            width: 120,
+          },
+          {
+            label: '送检部门',
+            prop: 'esDept',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: false,
+            width: 120,
+          },
+          {
+            label: '送检日期',
+            prop: 'esTime',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: false,
+            width: 160,
+          },
+          {
+            label: '送检人',
+            prop: 'esMan',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: false,
+            width: 120,
+          },
+          {
+            label: '临期天数',
+            prop: 'expireDays',
+            width: 120,
+          },
+          {
+            label: '到期状态',
+            prop: 'expireStatus',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: true,
+            width: 120,
+            fixed: 'right',
+            type: 'select',
+            dicData: [
+              {
+                label: '即将到期',
+                value: 0,
+              },
+              {
+                label: '已超期',
+                value: 1,
+              },
+            ],
+          },
+          {
+            label: '送检状态',
+            prop: 'applyFor',
+            sortable: true,
+            filter: true,
+            span: 12,
+            search: true,
+            width: 120,
+            type: 'select',
+            fixed: 'right',
+            dicData: [
+              {
+                label: '未送检',
+                value: false,
+              },
+              {
+                label: '已送检',
+                value: true,
+              },
+            ],
+          },
+        ],
+      },
+      form: {},
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      query: {},
+      rowData:[]
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.inspectionShow = false;
+      this.onLoad(this.page, this.query);
     },
-    methods: {
-        searchChange(params, done){
-            this.query = params
-            this.page.currentPage = 1;
-            this.onLoad()
-            done()
-        },
-        searchReset(){
-            this.query = {}
-            this.onLoad()
-        },
-        currentChange(currentPage){
-            this.page.currentPage = currentPage;
-        },
-        sizeChange(pageSize){
-            this.page.pageSize = pageSize;
-        },
-        warehousing() {
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad();
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    warehousing() {},
+    warehousingLog() {},
+    searchData(type) {
+      this.query.expireStatus = type;
+      this.onLoad();
+    },
+    // 到期送检弹框
+    allocationFun() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      const allUninspected = this.selectionList.every(item => item.applyFor === false);
 
-        },
-        warehousingLog() {
+      if (!allUninspected) {
+        this.$message.error('只能对“未送检”的数据进行批量送检，请检查选中项');
+        return;
+      }
+      this.selectionList.forEach(item => {
+        item.esDept = '' //送检部门名称
+        item.esQty = ''  //送检数量
+        item.esDeptId='' //送检部门id
+      });
+      this.rowData = this.selectionList
+      this.inspectionShow = true
 
-        },
-        searchData(type){
-            this.query.expireStatus = type
-            this.onLoad()
-        },
-        allocationFun(arId) {
-            // this.$confirm('是否确认调拨', '提示', {
-            //     confirmButtonText: '确认',
-            //     cancelButtonText: '取消',
-            //     type: 'warning'
-            // })
-            //     .then(() => {
-            //         const obj = { list: [] };
-            //         if (arId == null) {
-            //             this.selectionArr.forEach(item => {
-            //                 obj.list.push(item.arId);
-            //             });
-            //         } else {
-            //             obj.list.push(arId);
-            //         }
-            //         //   this.$ajax.post('stAllotRecord/updateLocation', obj).then(res => {
-            //         //     if (res.code === 0) {
-            //         //       this.$message.success(this.$t('store.allocationOk'));
-            //         //       this.$refs.myTable.load();
-            //         //     }
-            //         //   });
-            //     })
-            //     .catch(() => {
-            //         this.$message.info(
-            //             this.$t('global.canceled') + this.$t('store.allocation')
-            //         );
-            //     });
-        },
-        handleDelete() {
-            if (this.selectionList.length === 0) {
-                this.$message.warning('请选择至少一条数据');
-                return;
-            }
-            this.$confirm('确定将选择数据删除?', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-            }).then(() => {
-            })
-        },
-        // 多选
-        selectionChange(list) {
-            this.selectionList = list;
-        },
-        onLoad() {
-            this.loading = true
-            getList({
-                current:this.page.currentPage,
-                size:this.page.pageSize,
-                ...this.query
-            }).then(res =>{
-                this.data = res.data.data.records
-                console.log('data-----------',this.data)
-                this.page.total = res.data.data.total
-                this.loading = false
-            })
-            // this.data = [
-            //     {
-            //         "wsCode": "34544554",
-            //         "goodsCode": "876788",
-            //         "goodsName": "物料一",
-            //         "shName": "库房一",
-            //         "location": "仓库名称(仓库编号)",
-            //         "stovePiNo": "87889",
-            //         "checkCode": "8767677",
-            //         "quantityLevel": "一級",
-            //         "wsQty": 89,
-            //         "wsDept": "质量三部",
-            //         "wsTime": "2025-10-09",
-            //         "userName": "检验人",
-            //         "status": "送检中",
-            //         "statusTitle": "已完成"
-            //     },
-            //     {
-            //         "wsCode": "34544554",
-            //         "goodsCode": "876788",
-            //         "goodsName": "物料一",
-            //         "shName": "库房一",
-            //         "location": "位置",
-            //         "stovePiNo": "87889",
-            //         "checkCode": "8767677",
-            //         "quantityLevel": "一級",
-            //         "wsQty": 89,
-            //         "wsDept": "质量三部",
-            //         "wsTime": "2025-10-09",
-            //         "userName": "检验人",
-            //         "status": "送检中",
-            //         "statusTitle": "已完成"
-            //     }
-            // ]
-            // this.page.total = this.data.length
-            // this.loading = false
-            // setTimeout(() => {
-            //     this.selectionClear()
-            // }, 500)
-        }
-    }
-}
+      // this.$confirm('是否确认调拨', '提示', {
+      //     confirmButtonText: '确认',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      // })
+      //     .then(() => {
+      //         const obj = { list: [] };
+      //         if (arId == null) {
+      //             this.selectionArr.forEach(item => {
+      //                 obj.list.push(item.arId);
+      //             });
+      //         } else {
+      //             obj.list.push(arId);
+      //         }
+      //         //   this.$ajax.post('stAllotRecord/updateLocation', obj).then(res => {
+      //         //     if (res.code === 0) {
+      //         //       this.$message.success(this.$t('store.allocationOk'));
+      //         //       this.$refs.myTable.load();
+      //         //     }
+      //         //   });
+      //     })
+      //     .catch(() => {
+      //         this.$message.info(
+      //             this.$t('global.canceled') + this.$t('store.allocation')
+      //         );
+      //     });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {});
+    },
+    // 多选
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    onLoad() {
+      this.loading = true;
+      getList({
+        current: this.page.currentPage,
+        size: this.page.pageSize,
+        ...this.query,
+      }).then(res => {
+        this.data = res.data.data.records;
+        this.page.total = res.data.data.total;
+        this.loading = false;
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped></style>
\ No newline at end of file