From 5465605098a54e2fe0c33c011bdc2459dd183ec8 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 27 May 2024 17:33:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=AE=A1=E6=A0=B8=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/biz/storage/StorageOut.vue      | 60 +++++++++++++++----
 .../src/views/biz/storage/outdex.vue          |  2 +-
 2 files changed, 50 insertions(+), 12 deletions(-)

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 8d937546..394f9dfe 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
@@ -5,8 +5,8 @@
       <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 == 2" alt="" />
+      <img src="/src/assets/imgs/status/status3.png" v-else-if="formData.status == 3" alt="" />
       <span v-else></span>
     </div>
     <el-form
@@ -39,7 +39,9 @@
                     clearable
                     style="width: 100%"
                     @change="handleStockType"
-                    v-bind:disabled="ctrView || ctrSave || enableHeadNo || activetypetype !== 'create'"
+                    v-bind:disabled="
+                      ctrView || ctrSave || enableHeadNo || activetypetype !== 'create'
+                    "
                   >
                     <el-option
                       v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_OUT_TYPE)"
@@ -558,17 +560,18 @@
         </el-row>
         <el-row justify="center">
           <el-col :span="8">
-            <el-form-item prop="outbound" label="出库人">
+            <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="outboundTime" label="出库时间">
+            <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 }}
@@ -580,18 +583,42 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row justify="center" v-else>
+          <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>
       </el-card>
     </el-form>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
-      <el-button @click="saveFormData('SAVE', 1, 'suc')" type="primary" v-if="btnSave&& activetype !== 'audit'&&formData.status !== 4" size="large"
+      <el-button
+        @click="saveFormData('SAVE', 1, 'suc')"
+        type="primary"
+        v-if="btnSave && activetype !== 'audit' && formData.status !== 4"
+        size="large"
         >保 存</el-button
       >
-      
-       <el-button @click="saveFormData('SAVE', 4, 'suc')" type="success" v-if="btnSave&&activetype !== 'create' &&formData.status !== 4&& activetype !== 'audit'" size="large"
+
+      <el-button
+        @click="saveFormData('SAVE', 4, 'suc')"
+        type="success"
+        v-if="btnSave && activetype !== 'create' && formData.status !== 4 && activetype !== 'audit'"
+        size="large"
         >送 审</el-button
       >
-       <el-button @click="deleteFormData()" type="danger" v-if="btnSave&&activetype !== 'create'&&formData.status !== 4&& activetype !== 'audit'" size="large"
+      <el-button
+        @click="deleteFormData()"
+        type="danger"
+        v-if="btnSave && activetype !== 'create' && formData.status !== 4 && activetype !== 'audit'"
+        size="large"
         >删 除</el-button
       >
       <el-button
@@ -599,7 +626,7 @@
         type="primary"
         v-if="formData.status === 4 && activetype == 'audit'"
         size="large"
-        >提 交</el-button
+        >审 核</el-button
       >
       <el-button
         @click="saveFormData('CANCEL', 3, 'suc')"
@@ -890,6 +917,15 @@ const saveFormData = async (active, status, type) => {
       commonStore.setStore('active', 'update')
       commonStore.setStore('id', formData.value.id)
       reload()
+    } else if (formData.value.active === 'SAVE' && formData.value.status == 4) {
+      data.outbound = useUserStore().getUser.id
+      data.outboundTime = new Date()
+
+      await StorageApi.updateStorage(data)
+    } else if (formData.value.active === 'CANCEL') {
+      data.cancel = useUserStore().getUser.id
+      data.cancelTime = new Date()
+      await StorageApi.updateStorage(data)
     } else {
       await StorageApi.updateStorage(data)
     }
@@ -945,6 +981,8 @@ const saveFormDataSUBMIT = (active, status) => {
     formData.value.active = active
     formData.value.status = status
     const data = formData.value as unknown as StorageApi.StorageVO
+    data.cancel = useUserStore().getUser.id
+    data.cancelTime = new Date()
     await StorageApi.updateStorage(data)
     await initStatus(formData.value.status)
     commonResult = '审核成功'
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
index a318f64b..daced89b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
@@ -172,7 +172,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="180" fixed="right">
           <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 != 3&&scope.row.status != 2">
               编辑
             </el-button>
             <el-button link type="primary" @click="openDetail('review', scope.row.id)">