Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue

@@ -147,7 +147,7 @@
                 show-word-limit
                 maxlength="200"
                 class="!w-2080px"
-                v-bind:disabled="ctrView || ctrSave"
+                v-bind:disabled="activetype == 'review'"
               />
             </el-form-item>
           </el-col>
@@ -166,7 +166,7 @@
                   class="hl-addbutton"
                   type="primary"
                   size="large"
-                  v-bind:disabled="ctrView || ctrSave"
+                  v-bind:disabled="activetype == 'review'"
                   @click="openMatForm"
                   >新增</el-button
                 >
@@ -251,7 +251,7 @@
                       >
                         <el-input
                           v-model="scope.row.storageOkQty"
-                          v-bind:disabled="ctrView || ctrSave"
+                          v-bind:disabled="activetype == 'review'"
                         />
                       </el-form-item>
                     </template>
@@ -271,7 +271,7 @@
                         class="mb-0px!"
                       >
                         <ProcedureSelect
-                          v-bind:disabled="ctrView || ctrSave"
+                          v-bind:disabled="activetype == 'review'"
                           v-model="row.procedureId"
                           @update:newValue="
                             (val) => {
@@ -286,7 +286,7 @@
                     <template #default="scope">
                       <el-input
                         v-model="scope.row.description"
-                        v-bind:disabled="ctrView || ctrSave"
+                        v-bind:disabled="activetype == 'review'"
                       />
                     </template>
                   </el-table-column>
@@ -298,7 +298,7 @@
                         type="danger"
                         size="small"
                         @click.prevent="handleDelete2(scope.$index)"
-                        v-bind:disabled="ctrView || ctrDelete"
+                        v-bind:disabled="activetype == 'review'"
                       >
                         删除
                       </el-button>
@@ -317,8 +317,8 @@
                   class="hl-addbutton"
                   type="primary"
                   size="large"
-                  v-bind:disabled="ctrView || ctrSave"
-                  @click="openMatForm"
+                  v-bind:disabled="activetype == 'review'"
+                  @click="openMatForm2"
                   >新增</el-button
                 >
               </el-col>
@@ -347,7 +347,7 @@
                         <el-input
                           class="!w-265px"
                           placeholder="物料编码"
-                          v-bind:disabled="true || ctrView || ctrSave"
+                          v-bind:disabled="true"
                           v-model="scope.row.projectSubCode"
                           readonly
                         >
@@ -402,7 +402,7 @@
                       >
                         <el-input
                           v-model="scope.row.storageOkQty"
-                          v-bind:disabled="ctrView || ctrSave"
+                          v-bind:disabled="activetype == 'review'"
                         />
                       </el-form-item>
                     </template>
@@ -421,7 +421,7 @@
                         class="mb-0px!"
                       >
                         <ProcedureSelect
-                          v-bind:disabled="ctrView || ctrSave"
+                          v-bind:disabled="activetype == 'review'"
                           v-model="row.procedureId"
                           @update:newValue="
                             (val) => {
@@ -436,7 +436,7 @@
                     <template #default="scope">
                       <el-input
                         v-model="scope.row.description"
-                        v-bind:disabled="ctrView || ctrSave"
+                        v-bind:disabled="activetype == 'review'"
                       />
                     </template>
                   </el-table-column>
@@ -448,7 +448,7 @@
                         type="danger"
                         size="small"
                         @click.prevent="handleDelete2(scope.$index)"
-                        v-bind:disabled="ctrView || ctrDelete"
+                        v-bind:disabled="activetype == 'review'"
                       >
                         删除
                       </el-button>
@@ -488,7 +488,7 @@
                   :before-upload="before"
                   class="upload-file-uploader"
                 >
-                  <el-button type="primary" v-bind:disabled="ctrView || ctrSave">
+                  <el-button type="primary" v-bind:disabled="activetype == 'review'">
                     <Icon icon="ep:upload-filled" />上传
                   </el-button>
                 </el-upload>
@@ -602,7 +602,7 @@
       <el-button
         @click="saveFormData('SAVE', 1, 'suc')"
         type="primary"
-        v-if="btnSave && activetype !== 'audit' && formData.status !== 4"
+        v-if="activetype !== 'audit' && formData.status !== 4&& formData.status !== 2"
         size="large"
         >保 存</el-button
       >
@@ -610,7 +610,7 @@
       <el-button
         @click="saveFormData('SUBMIT', 2, 'suc')"
         type="success"
-        v-if="btnSave && activetype !== 'create' && formData.status !== 4 && activetype !== 'audit'"
+        v-if="formData.status !== 2 && activetype !== 'create' && formData.status !== 4 && activetype !== 'audit'"
         size="large"
         >送 审</el-button
       >
@@ -734,10 +734,10 @@ const proOpenFormRef = ref()
 const openMatForm = () => {
   matOpenFormRef.value.open(formData.value.whId)
 }
-// //派工单号不为空
-// const openMatForm2 = () => {
-//   matOpenFormRef2.value.open(formData.value.whId, formData.value.projectSubCode)
-// }
+//派工单号不为空
+const openMatForm2 = () => {
+  matOpenFormRef2.value.open(formData.value.whId, formData.value.projectSubCode)
+}
 
 const handleHeaderNoRef = ref()
 const handleHeaderNo = () => {

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue

@@ -141,25 +141,25 @@
           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.outbound)?.nickname }}
           </template>
         </el-table-column>
         <el-table-column
-          label="提交时间"
+          label="送审时间"
           align="center"
           prop="outboundTime"
           :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"
@@ -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&&scope.row.status != 2">
+            <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,7 +206,6 @@ 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'
-
 defineOptions({ name: 'Storage' })
 import { useCommonStateWithOut } from '@/store/modules/common'
 const message = useMessage() // 消息弹窗

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue

@@ -141,25 +141,25 @@
           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.outbound)?.nickname }}
           </template>
         </el-table-column>
         <el-table-column
-          label="提交时间"
+          label="送审时间"
           align="center"
           prop="outboundTime"
           :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"