出库管理

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="activetype == 'review'"
+                v-bind:disabled="activetype == 'review'||activetype =='audit2'"
               />
             </el-form-item>
           </el-col>
@@ -166,7 +166,7 @@
                   class="hl-addbutton"
                   type="primary"
                   size="large"
-                  v-bind:disabled="activetype == 'review'"
+                  v-bind:disabled="activetype == 'review'||activetype =='audit2'"
                   @click="openMatForm"
                   >新增</el-button
                 >
@@ -251,7 +251,7 @@
                       >
                         <el-input
                           v-model="scope.row.storageOkQty"
-                          v-bind:disabled="activetype == 'review'"
+                          v-bind:disabled="activetype == 'review'||activetype =='audit2'"
                         />
                       </el-form-item>
                     </template>
@@ -271,7 +271,7 @@
                         class="mb-0px!"
                       >
                         <ProcedureSelect
-                          v-bind:disabled="activetype == 'review'"
+                          v-bind:disabled="activetype == 'review'||activetype =='audit2' "
                           v-model="row.procedureId"
                           @update:newValue="
                             (val) => {
@@ -286,7 +286,7 @@
                     <template #default="scope">
                       <el-input
                         v-model="scope.row.description"
-                        v-bind:disabled="activetype == 'review'"
+                        v-bind:disabled="activetype == 'review'||activetype =='audit2'"
                       />
                     </template>
                   </el-table-column>
@@ -297,8 +297,8 @@
                         link
                         type="danger"
                         size="small"
-                        @click.prevent="handleDelete2(scope.$index)"
-                        v-bind:disabled="activetype == 'review'"
+                        @click.prevent="handleDelete2(scope.$index,scope.row.id)"
+                        v-bind:disabled="activetype == 'review'||activetype =='audit2'"
                       >
                         删除
                       </el-button>
@@ -317,7 +317,7 @@
                   class="hl-addbutton"
                   type="primary"
                   size="large"
-                  v-bind:disabled="activetype == 'review'"
+                  v-bind:disabled="activetype == 'review'||activetype =='audit2'"
                   @click="openMatForm2"
                   >新增</el-button
                 >
@@ -402,7 +402,7 @@
                       >
                         <el-input
                           v-model="scope.row.storageOkQty"
-                          v-bind:disabled="activetype == 'review'"
+                          v-bind:disabled="activetype == 'review'||activetype =='audit2'"
                         />
                       </el-form-item>
                     </template>
@@ -421,7 +421,7 @@
                         class="mb-0px!"
                       >
                         <ProcedureSelect
-                          v-bind:disabled="activetype == 'review'"
+                          v-bind:disabled="activetype == 'review'||activetype =='audit2'"
                           v-model="row.procedureId"
                           @update:newValue="
                             (val) => {
@@ -436,7 +436,7 @@
                     <template #default="scope">
                       <el-input
                         v-model="scope.row.description"
-                        v-bind:disabled="activetype == 'review'"
+                        v-bind:disabled="activetype == 'review'||activetype =='audit2'"
                       />
                     </template>
                   </el-table-column>
@@ -447,8 +447,8 @@
                         link
                         type="danger"
                         size="small"
-                        @click.prevent="handleDelete2(scope.$index)"
-                        v-bind:disabled="activetype == 'review'"
+                        @click.prevent="handleDelete2(scope.$index,scope.row.id)"
+                        v-bind:disabled="activetype == 'review'||activetype =='audit2'"
                       >
                         删除
                       </el-button>
@@ -488,7 +488,7 @@
                   :before-upload="before"
                   class="upload-file-uploader"
                 >
-                  <el-button type="primary" v-bind:disabled="activetype == 'review'">
+                  <el-button type="primary" v-bind:disabled="activetype == 'review'||activetype =='audit2'">
                     <Icon icon="ep:upload-filled" />上传
                   </el-button>
                 </el-upload>
@@ -519,7 +519,7 @@
                       link
                       type="danger"
                       size="small"
-                      v-bind:disabled="ctrView || ctrDelete"
+                      v-bind:disabled="ctrView || ctrDelete||activetype == 'review'||activetype =='audit2'"
                       @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
                     >
                       删除
@@ -993,7 +993,10 @@ const saveFormDataSUBMIT = (active, status) => {
   }, 1000)
 }
 //删除新增物料信息
-const handleDelete2 = (index: number) => {
+const handleDelete2 = async(index: number,id:number,) => {
+  console.log(id,index);
+  await StorageMatApi.deleteStorageMat(id)
+// deleteStorageMat
   formData.value.matItemDOList.splice(index, 1)
 }
 

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

@@ -74,7 +74,7 @@
           </el-select>
         </el-form-item>
 
-        <!-- <el-form-item label="单据状态" prop="status">
+        <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)"
@@ -83,7 +83,7 @@
               :value="dict.value"
             />
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
 
         <el-form-item style="margin-left:15px">
           <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
@@ -170,9 +170,14 @@
             <dict-tag :type="DICT_TYPE.BIZ_STORAGE_STATUS" :value="scope.row.status" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="180" fixed="right">
+        <el-table-column label="操作" align="right" width="180" fixed="right">
+          <template #header>
+            <span style="margin-right:35%">
+              操作
+            </span>
+          </template>
           <template #default="scope">
-            <el-button link type="primary" @click="openDetail('audit', scope.row.id)" v-if="scope.row.status != 3">
+            <el-button link type="primary" @click="openDetail('audit2', scope.row.id)" v-if="scope.row.status != 3">
               审核
             </el-button>
             <el-button link type="primary" @click="openDetail('review', scope.row.id)">