From 88a8023447246406fca2babace85e1e3910347c0 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Sat, 13 Jul 2024 16:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BC=98=E5=8C=96=E3=80=81?=
 =?UTF-8?q?=E9=80=80=E6=96=99=E6=A8=A1=E5=9D=97=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/biz/Packaging/ChestDialog.vue   |  19 +-
 .../src/views/biz/Packaging/detail.vue        |   9 +-
 .../src/views/biz/storage/StorageForm.vue     | 796 ++++++++++--------
 .../src/views/biz/storage/StorageOut.vue      |  60 +-
 .../src/views/biz/storage/index.vue           |  95 ++-
 .../src/views/biz/storage/indexAudit.vue      | 310 +++++++
 6 files changed, 851 insertions(+), 438 deletions(-)
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/ChestDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/ChestDialog.vue
index 68d35c71..e0cd0b47 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/ChestDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/ChestDialog.vue
@@ -4,7 +4,7 @@
     <el-card class="hl-card-info">
       <el-row>
         <el-col>
-          <el-button type="primary" size="large" @click="onAddItem">新增</el-button>
+          <el-button type="primary" size="large" @click="onAddItem" v-if="!distype">新增</el-button>
         </el-col>
         <el-col>
           <el-card class="hl-incard">
@@ -42,7 +42,7 @@
                     <el-input-number
                       min="1"
                       :precision="0"
-                      :disabled="detailDisabled"
+                      :disabled="distype"
                       v-model="scope.row.sort"
                       placeholder="请输入显示顺序"
                     />
@@ -54,7 +54,7 @@
                     <el-input-number
                       min="1"
                       :precision="0"
-                      :disabled="detailDisabled"
+                      :disabled="distype"
                       @change="endTimeChange(scope.row)"
                       v-model="scope.row.amount"
                       placeholder="请输入每箱配比"
@@ -63,10 +63,10 @@
                 </el-table-column>
                 <el-table-column label="箱数量" align="center" prop="integer" min-width="100" />
                 <el-table-column label="剩余数量" align="center" prop="remainder" min-width="100" />
-                <el-table-column label="操作" align="center" prop="" fixed="right" min-width="120">
+                <el-table-column label="操作" align="center" prop="" fixed="right" min-width="120" v-if="!distype">
                   <template #default="scope">
                     <el-button type="danger" link size="small" @click="onDeleteItem(scope.$index)"
-                      >删除</el-button
+                    >删除</el-button
                     >
                   </template>
                 </el-table-column>
@@ -79,7 +79,7 @@
 
     <template #footer>
       <el-button @click="dialogVisible = false" :loading="formLoading">取 消</el-button>
-      <el-button type="primary" @click="submitForm()" :loading="formLoading">保 存</el-button>
+      <el-button type="primary" @click="submitForm()" :loading="formLoading" v-if="!distype">保 存</el-button>
     </template>
   </Dialog>
   <Fromdialog ref="fromref" @success="handleFromClick" />
@@ -117,7 +117,12 @@ const subFormRules = reactive({
 })
 /** 打开弹窗 */
 const fid = ref()
-const open = async (fData, val, index) => {
+const distype = ref(false)
+const open = async (fData, val, index, type) => {
+  console.log(type)
+  if (type == 'detail') {
+    distype.value=true
+  }
   resetForm()
   formData.value.index = index
   console.log(val.saleOrderPackingClauseDetails == undefined)
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/detail.vue
index ffbf0b95..38c6a211 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/detail.vue
@@ -313,7 +313,7 @@
                     min-width="220"
                     :formatter="dateFormatter"
                   />
-                  <el-table-column label="操作" align="center" width="180">
+                  <el-table-column label="操作" align="center" width="220">
                     <template #default="scope">
                       <el-button
                         v-if="'update,create,alter'.indexOf(query.active) > -1"
@@ -345,6 +345,9 @@
                       >
                         打印
                       </el-button>
+                     <el-button  link
+                        type="primary"
+                        size="small" @click="openDetail(scope.row, scope.$index,'detail')">详情</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -563,8 +566,8 @@ const onAddItem = () => {
 
 //编辑包装规则
 const chestref = ref()
-const openDetail = (val, index) => {
-  chestref.value.open(formData.value, val, index)
+const openDetail = (val, index,type) => {
+  chestref.value.open(formData.value, val, index,type)
 }
 const handlechestSuccess = (val) => {
   List.value[val.index].saleOrderPackingClauseDetails = []
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue
index 1d8da744..2d8bd1c7 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue
@@ -1,18 +1,23 @@
 <template>
-  <!-- 入库 -->
+  <!-- 退料 -->
   <el-card class="hl-card" style="position: relative">
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
     <div class="abstatus">
-      <img src="/src/assets/imgs/status/status2.png" v-if="formData.status == 2" alt="" />
-      <img src="/src/assets/imgs/status/statuszf.png" v-else-if="formData.status == 3" alt="" />
+      <img src="/src/assets/imgs/status/status16.png" v-if="formData.status == 4" alt="" />
+      <img src="/src/assets/imgs/status/status3.png" v-else-if="formData.status == 3" alt="" />
       <span v-else></span>
     </div>
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
       <!--  基础信息   -->
       <el-card class="hl-card-info">
-
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
         </template>
@@ -20,16 +25,27 @@
           <el-col :span="8">
             <el-row>
               <el-col :span="24">
-                <el-form-item prop="name" label="入库单号">
+                <el-form-item prop="name" label="退料单号">
                   <el-input v-model="formData.stockNo" disabled placeholder="系统自动生成" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item prop="stockInType" label="入库类型">
-                  <el-select v-model="formData.stockInType" clearable style="width: 100%" @change="handleStockType" v-bind:disabled="ctrView || ctrSave">
-                    <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_IN_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-form-item prop="stockInType" label="退料类型">
+                  <el-select
+                    v-model="formData.stockInType"
+                    clearable
+                    style="width: 100%"
+                    @change="handleStockType"
+                    v-bind:disabled="ctrView || ctrSave || enableHeadNo || activetype !== 'create'"
+                  >
+                    <el-option
+                      v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_IN_TYPE)"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -38,17 +54,54 @@
           <el-col :span="8">
             <el-row>
               <el-col :span="24">
-                <el-form-item prop="industry" label="单据状态">
-                  <el-select v-model="formData.status" placeholder="下拉选择" clearable class="!w-700px" disabled>
-                    <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
-                  </el-select>
+                <el-form-item label="单据日期" prop="createTime">
+                  <!-- {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm:ss') }} -->
+                  <el-date-picker
+                    v-model="formData.createTime"
+                    value-format="x"
+                    placeholder="单据日期"
+                    disabled
+                    class="!w-400px"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item prop="headerNo" label="上游单号">
-                  <el-input v-model="formData.headerNo" class="!w-700px" v-bind:disabled="ctrView || ctrSave || enableHeadNo" />
+                <el-form-item prop="whId" label="接收仓库">
+                  <el-select
+                    v-model="formData.whId"
+                    v-if="wstatus"
+                    placeholder="下拉选择"
+                    style="text-decoration: line-through"
+                    clearable
+                    class="!w-400px"
+                    @change="handleWh"
+                    v-bind:disabled="ctrView || ctrSave || activetype !== 'create'"
+                  >
+                    <el-option
+                      v-for="dict in whList"
+                      :key="dict.id"
+                      :label="dict.whName"
+                      :value="dict.id"
+                    />
+                  </el-select>
+                  <el-select
+                    v-model="formData.whId"
+                    v-else
+                    placeholder="下拉选择"
+                    clearable
+                    class="!w-400px"
+                    @change="handleWh"
+                    v-bind:disabled="ctrView || ctrSave || activetype !== 'create'"
+                  >
+                    <el-option
+                      v-for="dict in whList"
+                      :key="dict.id"
+                      :label="dict.whName"
+                      :value="dict.id"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -56,20 +109,20 @@
           <el-col :span="8">
             <el-row>
               <el-col :span="24">
-                <el-form-item label="单据日期" prop="createTime">
-                  <!-- {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm:ss') }} -->
-                  <el-date-picker v-model="formData.createTime" value-format="x" placeholder="单据日期" disabled class="!w-400px" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="whId" label="入库仓库">
-                  <el-select v-model="formData.whId" v-if="wstatus" placeholder="下拉选择" style="text-decoration: line-through" clearable class="!w-400px" @change="handleWh" v-bind:disabled="ctrView || ctrSave">
-                    <el-option v-for="dict in whList" :key="dict.id" :label="dict.whName" :value="dict.id" />
-                  </el-select>
-                  <el-select v-model="formData.whId" v-else placeholder="下拉选择" clearable class="!w-400px" @change="handleWh" v-bind:disabled="ctrView || ctrSave">
-                    <el-option v-for="dict in whList" :key="dict.id" :label="dict.whName" :value="dict.id" />
+                <el-form-item prop="industry" label="单据状态">
+                  <el-select
+                    v-model="formData.status"
+                    placeholder="下拉选择"
+                    clearable
+                    class="!w-700px"
+                    disabled
+                  >
+                    <el-option
+                      v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_STATUS)"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -79,14 +132,19 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="description">
-              <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" v-bind:disabled="ctrView || ctrSave" />
+              <el-input
+                type="textarea"
+                v-model="formData.description"
+                show-word-limit
+                maxlength="200"
+                v-bind:disabled="ctrView || ctrSave"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-card>
       <!--  物料信息   -->
       <el-card class="hl-card-info">
-
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">物料信息</span>
         </template>
@@ -94,100 +152,111 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-button class="hl-addbutton" type="primary" size="large" @click="openMatForm" v-bind:disabled="ctrView || ctrSave">新增</el-button>
+                <el-button
+                  class="hl-addbutton"
+                  type="primary"
+                  size="large"
+                  @click="openMatForm"
+                  v-bind:disabled="ctrView || ctrSave"
+                  >新增</el-button
+                >
               </el-col>
-              <el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
-                <el-table :data="formData.matItemDOList" class="hl-table">
+              <el-form
+                ref="matSubFormRef"
+                :model="formData.matItemDOList"
+                :rules="subFormRules"
+                v-loading="subFormLoading"
+                label-width="0"
+              >
+                <el-table
+                  :data="formData.matItemDOList"
+                  class="hl-table"
+                  :stripe="true"
+                  :show-overflow-tooltip="true"
+                >
                   <el-table-column type="index" label="序号" min-width="80" align="center" fixed />
-                  <el-table-column prop="matCode" min-width="140" align="center">
+                  <el-table-column prop="projectSubCode" min-width="180" align="center">
                     <template #header> <span class="hl-table_header">*</span> 物料编码</template>
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.matCode`" :rules="subFormRules.matCode" class="mb-0px!">
-                        <el-input class="!w-265px" placeholder="物料编码" v-bind:disabled="true || ctrView || ctrSave" v-model="scope.row.matCode" readonly>
-                          <!-- <template #append ><el-button @click="openMatForm" > <Icon icon="ep:search" class="mr-5px" /> </el-button></template> -->
+                      <el-form-item
+                        :prop="`${scope.$index}.projectSubCode`"
+                        :rules="subFormRules.projectSubCode"
+                        class="mb-0px!"
+                      >
+                        <el-input
+                          class="!w-265px"
+                          placeholder="物料编码"
+                          v-bind:disabled="true || ctrView || ctrSave"
+                          v-model="scope.row.projectSubCode"
+                          readonly
+                        >
+                          <!-- <template #append><el-button @click="openMatForm" disabled>
+                              <Icon icon="ep:search" class="mr-5px" />
+                            </el-button></template> -->
                         </el-input>
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="matName" label="物料名称" min-width="120" align="center" />
-                  <el-table-column prop="matType" label="物料类型" align="center" min-width="120">
-
-                    <!-- <template #default="scope">
-                      <dict-tag :type="DICT_TYPE.BIZ_MATERIAL_TYPE" :value="scope.row.matType"
-                        v-if="scope.row.matType ==undefined || !isNaN(Number(scope.row.matType))? true : false" />
-                    </template> -->
-                  </el-table-column>
-                  <el-table-column prop="matSpec" label="规格/型号" align="center" min-width="120" />
-
-                  <el-table-column prop="matUnit" label="系统单位" align="center" min-width="120">
-
-                    <!-- <template #default="scope">
-                      <dict-tag :type="DICT_TYPE.BIZ_MATERIAL_UNIT" :value="scope.row.matUnit"
-                        v-if="scope.row.matUnit ? true : false" />
-                    </template> -->
-                  </el-table-column>
-                  <el-table-column prop="rgId" align="center" min-width="150">
-
-                    <template #header> <span class="hl-table_header">*</span>入库库区 </template>
-
+                  <el-table-column
+                    prop="projectSubName"
+                    label="物料名称"
+                    min-width="180"
+                    align="center"
+                  />
+                  <el-table-column
+                    prop="materialType"
+                    label="物料类型"
+                    min-width="170"
+                    align="center"
+                  >
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.rgId`" :rules="subFormRules.rgId" class="mb-0px!">
-                        <!-- <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%;" @change="handleRg(scope)" v-bind:disabled="ctrView || ctrSave" >
-                          <el-option v-for="dict in rgList" :key="dict.id" :label="dict.rg_name" :value="dict.id" :style="{textDecoration: dict.rg_status === 2 ? 'line-through' : ''}"  />
-                        </el-select> -->
-                        <RgSelect v-model="scope.row.rgId" v-bind:disabled="ctrView || ctrSave" :anotherProp="formData.whId"  @update:newValue="handleSelectedrg(scope.$index, $event)" />
-                      </el-form-item>
+                      <dict-tag
+                        :type="DICT_TYPE.BIZ_MATERIAL_TYPE"
+                        :value="scope.row.materialType"
+                        v-if="scope.row.materialType ? true : false"
+                      />
                     </template>
                   </el-table-column>
-                  <el-table-column prop="pnId" align="center" min-width="180">
-
-                    <template #header> <span class="hl-table_header">*</span> 入库库位 </template>
+                  <el-table-column prop="spec" label="规格/型号" min-width="120" align="center" />
 
+                  <el-table-column prop="unit" label="系统单位" min-width="120" align="center">
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.pnId`" :rules="subFormRules.pnId" class="mb-0px!">
-                        <!-- <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%" v-bind:disabled="ctrView || ctrSave">
-                          <el-option v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pn_name" :value="dict.id" />
-                        </el-select> -->
-                          <PnSelect v-model="scope.row.pnId" v-bind:disabled="ctrView || ctrSave" :anotherProp="formData.matItemDOList[scope.$index].rgId"  @update:newValue="handleSelectedpn(scope.$index, $event)" />
-                      </el-form-item>
+                      <dict-tag :type="DICT_TYPE.BIZ_MATERIAL_UNIT" :value="scope.row.unit" />
                     </template>
                   </el-table-column>
-                  <el-table-column prop="storageOkQty" align="center" min-width="120">
-
-                    <template #header> <span class="hl-table_header">*</span> 入库数量 </template>
-
+                  <el-table-column prop="storageOkQty" min-width="160" align="center">
+                    <template #header> <span class="hl-table_header">*</span>本次退料数量</template>
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty" class="mb-0px!">
-                        <el-input v-model="scope.row.storageOkQty" v-bind:disabled="ctrView || ctrSave" />
+                      <el-form-item
+                        :prop="`${scope.$index}.storageOkQty`"
+                        :rules="subFormRules.storageOkQty"
+                        class="mb-0px!"
+                      >
+                        <el-input
+                          v-model="scope.row.storageOkQty"
+                          v-bind:disabled="activetype == 'review' || activetype == 'Check'"
+                        />
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="lotNo" label="批次号" align="center" min-width="120" v-if="false">
-
+                  <el-table-column prop="description" min-width="220" label="备注" align="center">
                     <template #default="scope">
-                      <el-input v-model="scope.row.lotNo" v-bind:disabled="ctrView || ctrSave" />
+                      <el-input
+                        v-model="scope.row.description"
+                        v-bind:disabled="activetype == 'review' || activetype == 'Check'"
+                      />
                     </template>
                   </el-table-column>
-
-                  <el-table-column prop="projectSubName" label="子项目名称" align="center" min-width="230">
+                  <el-table-column label="操作" align="center" width="100">
                     <template #default="scope">
-                      <el-input v-model="scope.row.projectSubName" v-bind:disabled="ctrView || ctrSave" readonly>
-                        <template #append><el-button @click="openProjectForm(scope)">
-                            <Icon icon="ep:search" class="mr-5px" />
-                          </el-button></template>
-                      </el-input>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="description" label="备注" align="center" min-width="180">
-
-                    <template #default="scope">
-                      <el-input v-model="scope.row.description" v-bind:disabled="ctrView || ctrSave" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" align="center" min-width="120" fixed="right">
-
-                    <template #default="scope">
-                      <el-button link type="danger" @click.prevent="handleDelete2(scope.$index)" v-bind:disabled="ctrView || ctrDelete">
+                      <!-- <el-button link type="primary" @click="handlefuke(scope.$index, scope.row)">复制</el-button>  -->
+                      <el-button
+                        link
+                        type="danger"
+                        size="small"
+                        @click.prevent="handleDelete2(scope.$index)"
+                        v-bind:disabled="activetype == 'review' || activetype == 'Check'"
+                      >
                         删除
                       </el-button>
                     </template>
@@ -200,7 +269,6 @@
       </el-card>
       <!--  附件信息   -->
       <el-card class="hl-card-info">
-
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
         </template>
@@ -208,31 +276,68 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-upload ref="matUploadRef" :file-list="matUploadFiles" multiple :action="uploadUrl" :headers="{
-        Authorization: 'Bearer ' + getAccessToken(),
-        'tenant-id': getTenantId()
-      }" name="files" :show-file-list="false" :auto-upload="false" :data="matUploadData" :on-change="matUploadChange" :on-error="handleError" :on-success="handleSuccess" :before-upload="before" class="upload-file-uploader">
+                <el-upload
+                  ref="matUploadRef"
+                  :file-list="matUploadFiles"
+                  multiple
+                  :action="uploadUrl"
+                  :headers="{
+                    Authorization: 'Bearer ' + getAccessToken(),
+                    'tenant-id': getTenantId()
+                  }"
+                  name="files"
+                  :show-file-list="false"
+                  :auto-upload="false"
+                  :data="matUploadData"
+                  :on-change="matUploadChange"
+                  :on-error="handleError"
+                  :on-success="handleSuccess"
+                  :before-upload="before"
+                  class="upload-file-uploader"
+                >
                   <el-button type="primary" v-bind:disabled="ctrView || ctrSave">
                     <Icon icon="ep:upload-filled" />上传
                   </el-button>
                 </el-upload>
               </el-col>
-              <el-table :data="formData.attachments" class="hl-table" v-loading.fullscreen.lock="uploading" element-loading-text="附件上传中..." element-loading-background="rgba(122, 122, 122, 0.6)">
+              <el-table
+                :data="formData.attachments"
+                class="hl-table"
+                v-loading.fullscreen.lock="uploading"
+                element-loading-text="附件上传中..."
+                element-loading-background="rgba(122, 122, 122, 0.6)"
+              >
                 <el-table-column prop="name" label="文件名称" align="center">
                   <!-- <template #default="scope">
                     <a :href="scope.row.url" target="_blank" style="color: #409eff">{{ scope.row.name }} </a>
                   </template> -->
                 </el-table-column>
 
-                <el-table-column prop="createTime" align="center" label="上传日期" :formatter="dateFormatter" />
+                <el-table-column
+                  prop="createTime"
+                  align="center"
+                  label="上传日期"
+                  :formatter="dateFormatter"
+                />
 
                 <el-table-column label="操作" align="center">
-
                   <template #default="scope">
-                    <el-button link type="danger" size="small" v-bind:disabled="ctrView || ctrDelete" @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)">
+                    <el-button
+                      link
+                      type="danger"
+                      size="small"
+                      v-bind:disabled="ctrView || ctrDelete"
+                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
+                    >
                       删除
                     </el-button>
-                    <el-button link type="primary" size="small" v-bind:disabled="ctrView || ctrDelete" @click="downloadAttachment(scope.row.name, scope.row.url)">
+                    <el-button
+                      link
+                      type="primary"
+                      size="small"
+                      v-bind:disabled="ctrView || ctrDelete"
+                      @click="downloadAttachment(scope.row.name, scope.row.url)"
+                    >
                       下载
                     </el-button>
                   </template>
@@ -243,8 +348,7 @@
         </el-row>
       </el-card>
       <!--  系统信息   -->
-      <el-card class="hl-card-info">
-
+      <el-card class="hl-card-info" :style="{ display: activetype == 'create' ? 'none' : '' }">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
         </template>
@@ -257,23 +361,24 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="createTime" label="创建时间">
-              {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm:ss') }}
+              {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
             </el-form-item>
           </el-col>
         </el-row>
         <el-row justify="center">
           <el-col :span="8">
-            <el-form-item prop="keeper" label="入库人">
-              {{ userList.find((user) => user.id == formData.keeper)?.nickname }}
+            <el-form-item prop="outbound" label="送审人">
+              {{ userList.find((user) => user.id == formData.outbound)?.nickname }}
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="keeperTime" label="入库时间">
-              {{ formatDate(formData.keeperTime, 'YYYY-MM-DD HH:mm:ss') }}
+            <el-form-item prop="outboundTime" label="送审时间">
+              {{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row justify="center">
+
+        <!-- <el-row justify="center" v-if="formData.status == 3">
           <el-col :span="8">
             <el-form-item prop="cancel" label="作废人">
               {{ userList.find((user) => user.id == formData.cancel)?.nickname }}
@@ -281,7 +386,19 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="cancelTime" label="作废时间">
-              {{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm:ss') }}
+              {{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm') }}
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row justify="center">
+          <el-col :span="8">
+            <el-form-item prop="cancel" label="审核人">
+              {{ userList.find((user) => user.id == formData.cancel)?.nickname }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="cancelTime" label="审核时间">
+              {{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm') }}
             </el-form-item>
           </el-col>
         </el-row>
@@ -289,12 +406,71 @@
     </el-form>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
-      <el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
-        存</el-button>
-      <el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">提
-        交</el-button>
-      <el-button @click="handleStatus(3)" type="danger" v-if="btnCancel" size="large">作
-        废</el-button>
+      <el-button
+        @click="saveFormData('SAVE', 1, 'suc')"
+        type="primary"
+        v-if="
+          activetype !== 'audit' &&
+          formData.status !== 4 &&
+          formData.status !== 2 &&
+          activetype !== 'review'
+        "
+        size="large"
+        >保 存</el-button
+      >
+
+      <el-button
+        @click="saveFormData('SUBMIT', 2, 'suc')"
+        type="success"
+        v-if="
+          formData.status !== 2 &&
+          activetype !== 'create' &&
+          formData.status !== 4 &&
+          activetype !== 'audit' &&
+          activetype !== 'review'
+        "
+        size="large"
+        >送 审</el-button
+      >
+      <el-button
+        @click="deleteFormData()"
+        type="danger"
+        v-if="
+          btnSave &&
+          activetype !== 'create' &&
+          formData.status !== 4 &&
+          activetype !== 'audit' &&
+          activetype !== 'review'
+        "
+        size="large"
+        >删 除</el-button
+      >
+      <el-button
+        @click="saveFormDataSUBMIT('AUDIT', 4)"
+        type="primary"
+        v-if="
+          (formData.status === 2 && activetype == 'audit') ||
+          (activetype == 'Check' &&
+            formData.status !== 3 &&
+            activetype !== 'review' &&
+            formData.status !== 1)
+        "
+        size="large"
+        >审 核</el-button
+      >
+      <el-button
+        @click="saveFormData('INVALID', 3, 'suc')"
+        type="danger"
+        v-if="
+          (formData.status === 2 && activetype == 'audit') ||
+          (activetype == 'Check' &&
+            formData.status !== 3 &&
+            activetype !== 'review' &&
+            formData.status !== 1)
+        "
+        size="large"
+        >打 回</el-button
+      >
     </div>
   </el-card>
   <!-- 表单弹窗：物料列表 -->
@@ -326,6 +502,7 @@ import download from '@/utils/download'
 import * as UserApi from '@/api/system/user'
 import materials from './materials.vue'
 import projects from './subproject.vue'
+import { useCommonStore } from '@/store/modules/common'
 
 const reload: any = inject('reload')
 
@@ -333,13 +510,15 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const { query } = useRoute()
 const router = useRouter()
-
+const commonStore = useCommonStore()
+const activetype = toRef(commonStore.getStore('active'))
+const activeId = toRef(commonStore.getStore('id'))
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formData = ref({
   id: undefined,
   stockType: 1,
-  stockInType: undefined,
+  stockInType: 5, //字典类型
   stockOutType: undefined,
   stockNo: undefined,
   headerNo: undefined,
@@ -360,8 +539,8 @@ const formData = ref({
 const formRules = reactive({
   // name: [{ required: true, message: '模具类型不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }],
-  stockInType: [{ required: true, message: '入库类型不能为空', trigger: 'blur' }],
-  whId: [{ required: true, message: '入库仓库不能为空', trigger: 'blur' }]
+  stockInType: [{ required: true, message: '退料类型不能为空', trigger: 'blur' }],
+  whId: [{ required: true, message: '接收仓库不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const matSubFormRef = ref() //子表单 Ref
@@ -376,8 +555,6 @@ const subFormRules = reactive({
 })
 
 const matOpenFormRef = ref()
-const proOpenFormRef = ref()
-
 const openMatForm = () => {
   // if (formData.value.whId == undefined || formData.value.whId == '') {
   //   message.alertWarning('请选择入库仓库')
@@ -387,124 +564,18 @@ const openMatForm = () => {
   matOpenFormRef.value.open(formData.value.whId, 'in')
 }
 
-const openProjectForm = (scope) => {
-  proOpenFormRef.value.open(scope)
-}
 const getList = async (arrMat) => {
-  arrMat.forEach((row) => {
-    if (
-      formData.value.matItemDOList.filter(
-        (item) =>
-          item.matId == row.id &&
-          item.whId == row.whId &&
-          item.rgId == row.rgId &&
-          item.pnId == row.pnId
-      ).length == 0
-    ) {
-      row.matId = row.id
-      row.pnlist = ref([])
-      row.pnlist = pnList.value.filter((pn) => pn.wh_id == row.whId && pn.rg_id == row.rgId)
-      if (row.pnlist.length == 0) {
-        row.rgId = ''
-        row.pnId = ''
-        row.matRest = 0
-      }
-      formData.value.matItemDOList.push(row)
+  arrMat.forEach((item) => {
+    const exists = formData.value.matItemDOList.some(
+      (listItem) => listItem.projectSubCode === item.projectSubCode
+    )
+    if (!exists) {
+      formData.value.matItemDOList.push(item)
     }
   })
 }
-
-const getProject = async (pro, scope) => {
-  formData.value.matItemDOList.forEach((item) => {
-    if (
-      item.matId == scope.value.row.matId &&
-      item.whId == scope.value.row.whId &&
-      item.rgId == scope.value.row.rgId &&
-      item.pnId == scope.value.row.pnId
-    ) {
-      item.projectNo = pro.projectSubId
-      item.projectSubName = pro.projectSubName
-    }
-  })
-}
-
 const deleteMatCodes = ref([])
 const canRemove = ref(true)
-//作废时物料库存剩余验证 storageOkQty> 剩余数 ，不能删除
-
-// 提交、作废按钮数据状态提交
-const handleStatus = async (num) => {
-  // 校验表单
-  await formRef.value.validate()
-  if (formData.value.matItemDOList.length === 0) {
-    message.alertWarning('请添加物料信息!')
-    return
-  }
-  // 校验子表单
-  try {
-    await matSubFormRef.value.validate()
-  } catch (e) {
-    return
-  }
-  // 提示用户是否保存入库信息
-  await message.confirm('确认' + (num == 2 ? '提交' : '作废') + '入库信息?')
-
-  // 入库单作废时验证库存是否为空
-  if (num == 3) {
-    // formData.value.matItemDOList.forEach(async(item) => {
-    //   item.matRest = await StorageCheckApi.getStorageNowMatRest(item.matId, item.pnId)
-    //   if (item.matRest < item.storageOkQty) {
-    //     canRemove.value = false
-    //     deleteMatCodes.value.push(item.matCode + ' ' + item.matName)
-    //   }
-    // })
-    for (var i = 0; i < formData.value.matItemDOList.length; i++) {
-      var item = formData.value.matItemDOList[i]
-      item.matRest = await StorageCheckApi.getStorageNowMatRest(item.matId, item.pnId)
-      if (item.matRest < item.storageOkQty) {
-        canRemove.value = false
-        var errMsg =
-          '[' +
-          item.matCode +
-          ' ' +
-          item.matName +
-          ' ' +
-          item.pnlist.filter((pn) => pn.id == item.pnId)[0].pn_name +
-          ']'
-        deleteMatCodes.value.push(errMsg)
-      }
-    }
-    if (!canRemove.value) {
-      message.alertWarning(
-        '该入库单对应的物料' + deleteMatCodes.value.join(',') + '已出库，不允许作废！'
-      )
-      return
-    }
-  }
-
-  formData.value.status = num
-
-  //保存表单数据
-  await saveFormData()
-
-  const dataUpdate = formData.value as unknown as StorageApi.StorageVO
-
-  if (num == 2) {
-    dataUpdate.keeper = useUserStore().getUser.id
-  } else {
-    dataUpdate.cancel = useUserStore().getUser.id
-  }
-
-  await StorageApi.updateStorageStatus(dataUpdate)
-
-  message.success(t('common.updateSuccess'))
-
-  query.id = formData.value.id
-  query.type = 'update'
-  if (sumbefore.value == 0) {
-    reload()
-  }
-}
 
 // 根据入库类型显示上游单号
 const enableHeadNo = ref(false)
@@ -634,40 +705,133 @@ var commonResult = ''
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 
-const saveFormData = async () => {
+const saveFormData = async (active, status, type) => {
+  if (active === 'SUBMIT') {
+    //提示
+    if (formData.value.matItemDOList.length === 0) {
+      message.alertWarning('请添加物料信息!')
+      return
+    }
+  }
+  await formRef.value.validate()
+  formData.value.active = active
+  formData.value.status = status
+  await initStatus(formData.value.status)
   // 提交请求
   formLoading.value = true
   try {
     const data = formData.value as unknown as StorageApi.StorageVO
-    if (query.type === 'create') {
+    if (activetype.value === 'create') {
       //库存信息保存
       formData.value.id = await StorageApi.createStorage(data)
-      commonResult = 'common.createSuccess'
+      commonStore.setStore('active', 'update')
+      commonStore.setStore('id', formData.value.id)
+      reload()
+    } else if (formData.value.active === 'SUBMIT' && formData.value.status == 2) {
+      // //先执行一下保存物料和保存附件
+
+      // formData.value.active = 'SAVE'
+      // formData.value.matItemDOList.forEach((item) => {
+      //   item.stockId = formData.value.id
+      //   item.whId = formData.value.whId
+      // })
+      // const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
+      // await StorageMatApi.createStorageMatBatch(dataMats, formData.value.id)
+      // if (formData.value.attachments != undefined && formData.value.attachments.length > 0) {
+      //   //附件信息保存
+      //   matUploadData.value.businessId = formData.value.id
+      //   await matUploadRef.value!.submit()
+      // }
+
+      //通过异步执行送审
+      // setTimeout(async () => {
+      // console.log('------');
+
+      formData.value.active === 'SUBMIT'
+      data.outbound = useUserStore().getUser.id
+      const nowStr = formatDate(new Date(), 'YYYY-MM-DD HH:mm')
+      const now = new Date(nowStr).getTime()
+      data.outboundTime = now
+      await StorageApi.updateStorage(data)
+      commonStore.setStore('active', 'review')
+      // reload()
+      // }, 500)
+
+      // commonStore.setStore('id', formData.value.id)
+    } else if (formData.value.active === 'INVALID') {
+      data.cancel = useUserStore().getUser.id
+      data.cancelTime = new Date()
+      await StorageApi.updateStorage(data)
+      commonStore.setStore('active', 'review')
+      reload()
     } else {
       await StorageApi.updateStorage(data)
-      commonResult = 'common.updateSuccess'
+      // reload()
     }
-    //物料信息保存
+    var repeatItem = []
     formData.value.matItemDOList.forEach((item) => {
-      item.stockId = formData.value.id
-      item.whId = formData.value.whId
+      if (formData.value.matItemDOList.filter((mat) => mat.matId == item.matId).length > 1) {
+        var tmpCode = item.code
+        if (repeatItem.indexOf(tmpCode) < 0) {
+          repeatItem.push(tmpCode)
+        }
+      }
     })
-    const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
-    await StorageMatApi.createStorageMatBatch(dataMats, formData.value.id)
+    if (repeatItem.length > 0) {
+      message.alertWarning(
+        '物料编码' + repeatItem.join(' ') + '出库库位存在多行数据,请修改,避免重复出库'
+      )
+      return
+    }
+    if (active !== 'INVALID') {
+      // console.log('保存物料-------');
+
+      formData.value.matItemDOList.forEach((item) => {
+        item.stockId = formData.value.id
+        item.whId = formData.value.whId
+      })
+      const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
+      await StorageMatApi.createStorageMatBatch(dataMats, formData.value.id)
+    }
+    //物料信息保存
 
     if (formData.value.attachments != undefined && formData.value.attachments.length > 0) {
       //附件信息保存
       matUploadData.value.businessId = formData.value.id
       await matUploadRef.value!.submit()
     }
-    await initStatus(formData.value.status)
-    //formData.value = await StorageApi.getStorage(formData.value.id)
 
-    message.success(t(commonResult))
+    if (type == 'suc') {
+      commonResult = 'common.updateSuccess'
+      message.success(t(commonResult))
+    }
+  } catch (error) {
+    // 捕获并处理异常
+    console.error('创建物料存储时发生错误:', error)
+    // 可以在这里展示错误消息给用户，或者执行重试逻辑等
+    reload()
   } finally {
     formLoading.value = false
   }
 }
+
+const saveFormDataSUBMIT = (active, status) => {
+  setTimeout(async () => {
+    //提交
+    formData.value.active = active
+    formData.value.status = status
+    const data = formData.value as unknown as StorageApi.StorageVO
+    data.cancel = useUserStore().getUser.id
+    const nowStr = formatDate(new Date(), 'YYYY-MM-DD HH:mm')
+    const now = new Date(nowStr).getTime()
+    data.cancelTime = now
+    await StorageApi.updateStorage(data)
+    await initStatus(formData.value.status)
+    commonResult = '审核成功'
+    message.success(t(commonResult))
+    reload()
+  }, 1000)
+}
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
@@ -686,7 +850,7 @@ const submitForm = async () => {
   // // 提示用户是否保存入库信息
   // await message.confirm('确认保存入库信息?')
   //保存表单数据
-  await saveFormData()
+  // await saveFormData()
 
   // 成功后刷新
   query.id = formData.value.id
@@ -732,31 +896,6 @@ const handleDelete2 = (index: number) => {
 
 //仓库全数据
 const whList = ref([])
-//库区全数据
-const rgList = ref([])
-//库位全数据
-const pnList = ref([])
-const handleWh = async (wid) => {
-  //-------------------库区全数据
-  // 获得库区列表
-  const dataRgList = await RgApi.getSimpList()
-  const dataPnList = await PnApi.getSimpList()
-  rgList.value = dataRgList.filter((rg) => rg.wh_id == wid)
-  pnList.value = dataPnList.filter((pn) => pn.wh_id == wid)
-
-  formData.value.matItemDOList.forEach((item) => {
-    item.rgId = ''
-    item.pnId = ''
-    item.pnlist.value = []
-  })
-}
-const handleRg = async (scope) => {
-  //-------------------库位全数据
-  const dataPnList = await PnApi.getSimpList()
-  scope.row.pnId = ''
-  scope.row.pnlist = dataPnList.filter((pn) => pn.rg_id == scope.row.rgId)
-  //-------------------
-}
 
 // 远程数据筛选物料
 const matList = ref<MaterialApi.MaterialVO[]>([]) // 物料列表
@@ -774,25 +913,6 @@ const remoteMatCodeSearch = async (code) => {
   matList.value = (await MaterialApi.getMaterialPage(matParams)).list
   matSelectLoading.value = false
 }
-// 选中物料编码时，列表中数据
-const handleMatCode = async (scope, matid) => {
-  if (matid) {
-    const matVo = matSimpList.value.find((item) => item.id == scope.row.matId)
-    scope.row.matId = matVo.id
-    scope.row.matName = matVo.name
-    scope.row.matCode = matVo.code
-    scope.row.matSpec = matVo.spec
-    scope.row.matType = matVo.material_type
-    scope.row.matUnit = matVo.unit
-  } else {
-    scope.row.matId = ''
-    scope.row.matCode = ''
-    scope.row.matName = ''
-    scope.row.matSpec = ''
-    scope.row.matType = ''
-    scope.row.matUnit = ''
-  }
-}
 
 // 按钮控制
 const ctrView = ref(false)
@@ -853,16 +973,23 @@ const pnstatus = ref(false)
 /** 初始化 **/
 onMounted(async () => {
   // 页面标题展示
-  dialogTitle.value = query.type === 'review' ? '查看' : t('action.' + query.type)
+  // 页面标题展示
+  dialogTitle.value =
+    activetype.value === 'review'
+      ? '查看'
+      : activetype.value === 'Check'
+        ? '审核'
+        : t('action.' + activetype.value)
+
   //- 获取仓库全数据
   whList.value = await WarehouseApi.getWarehouseSimpList()
 
-  formData.value.whId = Math.min.apply(
-    Math,
-    whList.value.map(function (i) {
-      return i.id
-    })
-  )
+  // formData.value.whId = Math.min.apply(
+  //   Math,
+  //   whList.value.map(function (i) {
+  //     return i.id
+  //   })
+  // )
 
   // 获取原始物料信息
   matSimpList.value = await MaterialApi.getSimpList()
@@ -897,15 +1024,6 @@ onMounted(async () => {
     // 页面控件可视初始化
     await initStatus(formData.value.status)
 
-    // 获得库区列表
-    const dataRgList = await RgApi.getSimpList()
-    rgList.value = dataRgList.filter((rg) => rg.wh_id == formData.value.whId)
-
-
-    // 获得库区列表
-    const dataPnList = await PnApi.getSimpList()
-    pnList.value = dataPnList.filter((pn) => pn.wh_id == formData.value.whId)
-
     // 获取库存物料列表信息
     const queryParamsMat = reactive({
       pageNo: 1,
@@ -914,28 +1032,6 @@ onMounted(async () => {
     })
     const dataMats = await StorageMatApi.getStorageMatPage(queryParamsMat)
     formData.value.matItemDOList = dataMats
-
-    var matTypes = getIntDictOptions(DICT_TYPE.BIZ_MATERIAL_TYPE)
-    var matUnits = getIntDictOptions(DICT_TYPE.BIZ_MATERIAL_UNIT)
-    // 填充物料原始信息
-    formData.value.matItemDOList.forEach((item) => {
-      item.rgStatus = matSimpList.value.find(
-        (record) => record.rgStatus === item.rgStatus
-      )?.rgStatus
-      item.matId = matSimpList.value.find((record) => record.id === item.matId)?.id
-      item.matCode = matSimpList.value.find((record) => record.id === item.matId)?.code
-      item.matName = matSimpList.value.find((record) => record.id === item.matId)?.name
-      item.matSpec = matSimpList.value.find((record) => record.id === item.matId)?.spec
-      item.matType = matTypes.find(
-        (op) =>
-          op.value == matSimpList.value.find((record) => record.id === item.matId)?.material_type
-      )?.label
-      item.matUnit = matUnits.find(
-        (op) => op.value == matSimpList.value.find((record) => record.id === item.matId)?.unit
-      )?.label //matSimpList.value.find((record) => record.id === item.matId)?.unit
-      item.pnlist = pnList.value.filter((pn) => pn.rg_id === item.rgId)
-    })
-
     // 附件信息
     let attParams = {
       pageNo: 1,
@@ -949,26 +1045,6 @@ onMounted(async () => {
   //用户信息，用于底部数据展示
   userList.value = await UserApi.getSimpleUserList()
 })
-
-//接收物料传递的数据
-const handleSelectedMaterial = (currentIndex: number, newValue: any) => {
-  // console.log(currentIndex,'接收物料对应的数据:', newValue)
-  formData.value.matItemDOList[currentIndex].matId = newValue?.id
-  formData.value.matItemDOList[currentIndex].matName = newValue?.name
-  formData.value.matItemDOList[currentIndex].matCode = newValue?.code
-  formData.value.matItemDOList[currentIndex].matSpec = newValue?.spec
-  formData.value.matItemDOList[currentIndex].matType = newValue?.materialType
-  formData.value.matItemDOList[currentIndex].matUnit = newValue?.unit
-}
-
-//接收库区传递的数据
-const handleSelectedrg = (currentIndex: number, newValue: any) => {
-  formData.value.matItemDOList[currentIndex].rgId = newValue?.id
-}
-//接收库区传递的数据
-const handleSelectedpn= (currentIndex: number, newValue: any) => {
-  formData.value.matItemDOList[currentIndex].pnId = newValue?.id
-}
 </script>
 
 <style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue
index a2e3fe4b..838b3241 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue
@@ -39,9 +39,7 @@
                     clearable
                     style="width: 100%"
                     @change="handleStockType"
-                    v-bind:disabled="
-                      ctrView || ctrSave || enableHeadNo || activetypetype !== 'create'
-                    "
+                    v-bind:disabled="ctrView || ctrSave || enableHeadNo || activetype !== 'create'"
                   >
                     <el-option
                       v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_OUT_TYPE)"
@@ -188,6 +186,7 @@
                   >新增</el-button
                 >
                 <el-button
+                  style="margin-left: 10px !important"
                   class="hl-addbutton"
                   type="primary"
                   size="large"
@@ -337,24 +336,24 @@
         <el-row v-else>
           <el-col>
             <el-card class="hl-incard">
-              <el-col>
-                <el-button
-                  class="hl-addbutton"
-                  type="primary"
-                  size="large"
-                  v-bind:disabled="activetype == 'review' || activetype == 'Check'"
-                  @click="openMatForm2"
-                  >新增(bom)</el-button
-                >
-                <el-button
-                  class="hl-addbutton"
-                  type="primary"
-                  size="large"
-                  v-bind:disabled="activetype == 'review' || activetype == 'Check'"
-                  @click="processBom"
-                  >更新BOM</el-button
-                >
-              </el-col>
+              <el-button
+                class="hl-addbutton"
+                type="primary"
+                size="large"
+                v-bind:disabled="activetype == 'review' || activetype == 'Check'"
+                @click="openMatForm2"
+                >新增</el-button
+              >
+              <!-- (bom) -->
+              <el-button
+                style="margin-left: 10px !important"
+                class="hl-addbutton"
+                type="primary"
+                size="large"
+                v-bind:disabled="activetype == 'review' || activetype == 'Check'"
+                @click="processBom"
+                >更新BOM</el-button
+              >
               <el-form
                 ref="matSubFormRef"
                 :model="formData.matItemDOList"
@@ -732,7 +731,6 @@ import { id } from 'node_modules/element-plus/es/locale'
 
 const reload: any = inject('reload')
 const commonStore = useCommonStore()
-
 const activetype = toRef(commonStore.getStore('active'))
 const activeId = toRef(commonStore.getStore('id'))
 const { t } = useI18n() // 国际化
@@ -812,13 +810,23 @@ const handleHeaderNo = () => {
 }
 
 const getList = async (arrMat) => {
-  arrMat.forEach((row) => {
-    formData.value.matItemDOList.push(row)
+  arrMat.forEach((item) => {
+    const exists = formData.value.matItemDOList.some(
+      (listItem) => listItem.projectSubCode === item.projectSubCode
+    )
+    if (!exists) {
+      formData.value.matItemDOList.push(item)
+    }
   })
 }
 const getList2 = async (arrMat) => {
-  arrMat.forEach((row) => {
-    formData.value.matItemDOList.push(row)
+  arrMat.forEach((item) => {
+    const exists = formData.value.matItemDOList.some(
+      (listItem) => listItem.projectSubCode === item.projectSubCode
+    )
+    if (!exists) {
+      formData.value.matItemDOList.push(item)
+    }
   })
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue
index d395ee83..0d26144d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card class="hl-card">
-    <template #header> <span>入库管理</span></template>
+    <template #header> <span>退料申请</span></template>
     <ContentWrap class="borderxx">
       <!-- 搜索工作栏 -->
       <el-form
@@ -10,7 +10,7 @@
         :inline="true"
         label-width="108px"
       >
-        <el-form-item label="入库单号" prop="stockNo">
+        <el-form-item label="退料单号" prop="stockNo">
           <el-input
             v-model="queryParams.stockNo"
             placeholder="入库单号"
@@ -19,10 +19,10 @@
             class="!w-240px"
           />
         </el-form-item>
-        <el-form-item label="上游单号" prop="headerNo">
+        <el-form-item label="单据日期" prop="stockNo">
           <el-input
-            v-model="queryParams.headerNo"
-            placeholder="上游单号"
+            v-model="queryParams.stockNo"
+            placeholder="单据日期"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
@@ -38,30 +38,16 @@
           />
         </el-form-item>
         <el-form-item label="物料名称" prop="matName">
-        <el-input
-          v-model="queryParams.matName"
-          placeholder="物料名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-        <el-form-item label="入库类型" prop="stockInType">
-          <el-select
-            v-model="queryParams.stockInType"
-            placeholder="下拉选择"
+          <el-input
+            v-model="queryParams.matName"
+            placeholder="物料名称"
             clearable
+            @keyup.enter="handleQuery"
             class="!w-240px"
-          >
-            <el-option
-              v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_IN_TYPE)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
+          />
         </el-form-item>
-        <el-form-item label="入库仓库" prop="whId">
+
+        <el-form-item label="接收仓库" prop="whId">
           <el-select v-model="queryParams.whId" placeholder="下拉选择" clearable class="!w-240px">
             <el-option
               v-for="dict in warehouseList"
@@ -106,23 +92,28 @@
 
     <!-- 列表 -->
     <ContentWrap>
-      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true"  class="hl-table">
+      <el-table
+        v-loading="loading"
+        :data="list"
+        :show-overflow-tooltip="true"
+        :stripe="true"
+        class="hl-table"
+      >
         <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-          <el-table-column type="index" width="100" fixed label="序号" align="center" />
-        <el-table-column label="入库单号" align="center" prop="stockNo" min-width="210" fixed >
+        <el-table-column type="index" width="100" fixed label="序号" align="center" />
+        <el-table-column label="退料单号" align="center" prop="stockNo" min-width="210" fixed>
           <template #default="scope">
-            <el-button text type="primary" @click="openDetail('review',scope.row.id)">
-              {{scope.row.stockNo}}
+            <el-button text type="primary" @click="openDetail('review', scope.row.id)">
+              {{ scope.row.stockNo }}
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column label="入库类型" align="center" prop="stockInType" min-width="120">
+        <el-table-column label="退料类型" align="center" prop="stockInType" min-width="120">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.BIZ_STORAGE_IN_TYPE" :value="scope.row.stockInType" />
           </template>
         </el-table-column>
-        <el-table-column label="上游单号" align="center" prop="headerNo" min-width="200" />
-        <el-table-column label="入库仓库" align="center" prop="whId" min-width="120">
+        <el-table-column label="接收仓库" align="center" prop="whId" min-width="120">
           <template #default="scope">
             {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
           </template>
@@ -141,38 +132,54 @@
           min-width="240"
         />
 
-        <el-table-column label="提交人" align="center" prop="keeper" min-width="120">
+        <el-table-column label="送审人" align="center" prop="keeper" min-width="120">
           <template #default="scope">
             {{ userList.find((user) => user.id == scope.row.keeper)?.nickname }}
           </template>
         </el-table-column>
         <el-table-column
-          label="提交时间"
+          label="送审时间"
           align="center"
           prop="keeperTime"
           :formatter="dateFormatter"
           min-width="240"
         />
-        <el-table-column label="作废人" align="center" prop="cancel" min-width="120">
+        <el-table-column label="审核人" align="center" prop="cancel" min-width="120">
           <template #default="scope">
             {{ userList.find((user) => user.id == scope.row.cancel)?.nickname }}
           </template>
         </el-table-column>
         <el-table-column
-          label="作废时间"
+          label="审核时间"
           align="center"
           prop="cancelTime"
           :formatter="dateFormatter"
-         min-width="240"
+          min-width="240"
         />
-        <el-table-column label="单据状态" align="center" prop="status" min-width="120" fixed="right">
+        <el-table-column
+          label="单据状态"
+          align="center"
+          prop="status"
+          min-width="120"
+          fixed="right"
+        >
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.BIZ_STORAGE_STATUS" :value="scope.row.status" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="180" fixed="right">
+        <el-table-column label="操作" align="right" min-width="180" fixed="right">
+          <template #header>
+            <span style="margin-right:35%">
+              操作
+            </span>
+          </template>
           <template #default="scope">
-            <el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.status != 3">
+            <el-button
+              link
+              type="primary"
+              @click="openDetail('update', scope.row.id)"
+             v-if="scope.row.status != 4&&scope.row.status != 2"
+            >
               编辑
             </el-button>
             <el-button link type="primary" @click="openDetail('review', scope.row.id)">
@@ -206,8 +213,10 @@ import download from '@/utils/download'
 import * as StorageApi from '@/api/biz/storage'
 import * as WarehouseApi from '@/api/biz/warehouse'
 import * as UserApi from '@/api/system/user'
+import { useCommonStateWithOut } from '@/store/modules/common'
 
 defineOptions({ name: 'Storage' })
+const commonStore = useCommonStateWithOut()
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -276,6 +285,8 @@ const openForm = (type: string, id?: number) => {
 }
 /** 详情操作 新增/查看 */
 const openDetail = (active: string, id?: number) => {
+  commonStore.setStore('active', active)
+  commonStore.setStore('id', id)
   router.push({ path: '/inventory/storagedetail', query: { type: active, id: id } })
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue
new file mode 100644
index 00000000..48cd4c9e
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue
@@ -0,0 +1,310 @@
+<template>
+  <el-card class="hl-card">
+    <template #header> <span>退料申请</span></template>
+    <ContentWrap class="borderxx">
+      <!-- 搜索工作栏 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="108px"
+      >
+        <el-form-item label="退料单号" prop="stockNo">
+          <el-input
+            v-model="queryParams.stockNo"
+            placeholder="入库单号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="单据日期" prop="stockNo">
+          <el-input
+            v-model="queryParams.stockNo"
+            placeholder="单据日期"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="物料编码" prop="matNo">
+          <el-input
+            v-model="queryParams.matNo"
+            placeholder="物料编码"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="matName">
+          <el-input
+            v-model="queryParams.matName"
+            placeholder="物料名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+
+        <el-form-item label="接收仓库" prop="whId">
+          <el-select v-model="queryParams.whId" placeholder="下拉选择" clearable class="!w-240px">
+            <el-option
+              v-for="dict in warehouseList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <!-- <el-form-item label="单据状态" prop="status">
+          <el-select v-model="queryParams.status" placeholder="下拉选择" clearable class="!w-240px">
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_STATUS)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item> -->
+
+        <el-form-item>
+          <el-button @click="handleQuery" type="primary"
+            ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
+          >
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+          <el-button type="primary" plain @click="openDetail('create')">
+            <Icon icon="ep:plus" class="mr-5px" /> 新增
+          </el-button>
+          <!-- <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['biz:storage:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button> -->
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <!-- 列表 -->
+    <ContentWrap>
+      <el-table
+        v-loading="loading"
+        :data="list"
+        :show-overflow-tooltip="true"
+        :stripe="true"
+        class="hl-table"
+      >
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column type="index" width="100" fixed label="序号" align="center" />
+        <el-table-column label="退料单号" align="center" prop="stockNo" min-width="210" fixed>
+          <template #default="scope">
+            <el-button text type="primary" @click="openDetail('review', scope.row.id)">
+              {{ scope.row.stockNo }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="退料类型" align="center" prop="stockInType" min-width="120">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.BIZ_STORAGE_IN_TYPE" :value="scope.row.stockInType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="接收仓库" align="center" prop="whId" min-width="120">
+          <template #default="scope">
+            {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="description" min-width="160" />
+        <el-table-column label="创建人" align="center" prop="creator" min-width="120">
+          <template #default="scope">
+            {{ userList.find((user) => user.id === scope.row.creator)?.nickname }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          :formatter="dateFormatter"
+          min-width="240"
+        />
+
+        <el-table-column label="送审人" align="center" prop="keeper" min-width="120">
+          <template #default="scope">
+            {{ userList.find((user) => user.id == scope.row.keeper)?.nickname }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="送审时间"
+          align="center"
+          prop="keeperTime"
+          :formatter="dateFormatter"
+          min-width="240"
+        />
+        <el-table-column label="审核人" align="center" prop="cancel" min-width="120">
+          <template #default="scope">
+            {{ userList.find((user) => user.id == scope.row.cancel)?.nickname }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="审核时间"
+          align="center"
+          prop="cancelTime"
+          :formatter="dateFormatter"
+          min-width="240"
+        />
+        <el-table-column
+          label="单据状态"
+          align="center"
+          prop="status"
+          min-width="120"
+          fixed="right"
+        >
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.BIZ_STORAGE_STATUS" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="right" min-width="180" fixed="right">
+          <template #header>
+            <span style="margin-right:35%">
+              操作
+            </span>
+          </template>
+          <template #default="scope">
+            <el-button link type="primary" @click="openDetail('Check', scope.row.id)" v-if="scope.row.status ==2">
+              审核
+            </el-button>
+            <el-button link type="primary" @click="openDetail('review', scope.row.id)">
+              查看详情
+            </el-button>
+            <!-- <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button> -->
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </ContentWrap>
+  </el-card>
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as StorageApi from '@/api/biz/storage'
+import * as WarehouseApi from '@/api/biz/warehouse'
+import * as UserApi from '@/api/system/user'
+import { useCommonStateWithOut } from '@/store/modules/common'
+
+defineOptions({ name: 'Storage' })
+const commonStore = useCommonStateWithOut()
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const router = useRouter() // 路由
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  stockType: 1,
+  stockInType: undefined,
+  stockOutType: undefined,
+  stockNo: undefined,
+  headerNo: undefined,
+  description: undefined,
+  status: 2,
+  whId: undefined,
+  creator: undefined,
+  createTime: [],
+  updater: undefined,
+  updateTime: [],
+  keeper: undefined,
+  keeperTime: [],
+  outbound: undefined,
+  outboundTime: [],
+  cancel: undefined,
+  cancelTime: [],
+  matNo: undefined,
+  matName: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const warehouseList = ref([])
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StorageApi.getStoragePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+/** 详情操作 新增/查看 */
+const openDetail = (active: string, id?: number) => {
+  commonStore.setStore('active', active)
+  commonStore.setStore('id', id)
+  router.push({ path: '/inventory/storagedetail', query: { type: active, id: id } })
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  const queryParamsWarehouse = reactive({
+    pageNo: 1,
+    pageSize: 99
+  })
+  const data = await WarehouseApi.getWarehousePage(queryParamsWarehouse)
+
+  data.list.forEach((element) => {
+    element.label = element.whName
+    element.value = element.id
+  })
+
+  warehouseList.value = data.list
+
+  userList.value = await UserApi.getSimpleUserList()
+
+  await getList()
+})
+onActivated(() => {
+  getList()
+})
+</script>