Эх сурвалжийг харах

Merge branch 'master' into 测试

lxf 1 жил өмнө
parent
commit
15996d25e9

+ 1 - 1
src/views/group/finance/check-bill/printBOM.vue

@@ -33,7 +33,7 @@
       </el-table>
     </div>
     <div style="padding: 4px; text-align: center">
-      <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button>
+      <!-- <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button> -->
       <el-button @click="clickCancel">关 闭</el-button>
       <el-button type="primary" @click="deriveExcel()" v-preReClick>导 出</el-button>
     </div>

+ 1 - 1
src/views/group/finance/check-bill/printOrder.vue

@@ -14,7 +14,7 @@
       </el-auto-resizer>
     </div>
     <div style="padding: 4px; text-align: center">
-      <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button>
+      <!-- <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button> -->
       <el-button @click="clickCancel">关 闭</el-button>
       <el-button type="primary" @click="deriveExcel()" v-preReClick>导 出</el-button>
     </div>

+ 1 - 1
src/views/group/finance/check-bill/printSKU.vue

@@ -26,7 +26,7 @@
       </el-table>
     </div>
     <div style="padding: 4px; text-align: center">
-      <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button>
+      <!-- <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button> -->
       <el-button @click="clickCancel">关 闭</el-button>
       <el-button type="primary" @click="deriveExcel()" v-preReClick>导 出</el-button>
     </div>

+ 1 - 1
src/views/group/finance/summary/printBOM.vue

@@ -33,7 +33,7 @@
       </el-table>
     </div>
     <div style="padding: 4px; text-align: center">
-      <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button>
+      <!-- <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button> -->
       <el-button @click="clickCancel">关 闭</el-button>
       <el-button type="primary" @click="deriveExcel()" v-preReClick>导 出</el-button>
     </div>

+ 1 - 1
src/views/group/finance/summary/printOrder.vue

@@ -14,7 +14,7 @@
       </el-auto-resizer>
     </div>
     <div style="padding: 4px; text-align: center">
-      <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button>
+      <!-- <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button> -->
       <el-button @click="clickCancel">关 闭</el-button>
       <el-button type="primary" @click="deriveExcel()" v-preReClick>导 出</el-button>
     </div>

+ 1 - 1
src/views/group/finance/summary/printSKU.vue

@@ -26,7 +26,7 @@
       </el-table>
     </div>
     <div style="padding: 4px; text-align: center">
-      <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button>
+      <!-- <el-button type="primary" v-if="judgeOneKeyStatus()" @click="clickOneKeyStatus()" :loading="loadingOneKey" v-preReClick>一键出库</el-button> -->
       <el-button @click="clickCancel">关 闭</el-button>
       <el-button type="primary" @click="deriveExcel()" v-preReClick>导 出</el-button>
     </div>

+ 33 - 1
src/views/production/warehouse/finished-parts-storage/index.vue

@@ -9,6 +9,12 @@
           :loading="loading"
           :searchConfig="searchConfig"
           highlight-current-row
+          :action-list="[
+            {
+              text: '查看今日入库列表',
+              action: () => clickViewTodayEntry(),
+            },
+          ]"
           @get-list="getList"
           @clickReset="clickReset">
         </byTable>
@@ -43,12 +49,21 @@
         </div>
       </div>
     </el-dialog>
+
+    <el-dialog title="今日成品库入库列表" v-if="openTodayEntry" v-model="openTodayEntry" width="60%">
+      <div style="max-height: calc(100vh - 184px); overflow-y: auto; overflow-x: hidden">
+        <byTable :hidePagination="true" :source="tableList" :config="config" :loading="loadingTodayEntry" highlight-current-row> </byTable>
+      </div>
+      <template #footer>
+        <el-button @click="openTodayEntry = false">关 闭</el-button>
+      </template>
+    </el-dialog>
   </el-card>
 </template>
 
 <script setup>
 import byTable from "/src/components/byTable/index";
-import { ElMessage, ElMessageBox } from "element-plus";
+import { ElMessage } from "element-plus";
 import moment from "moment";
 
 const { proxy } = getCurrentInstance();
@@ -313,10 +328,27 @@ const giveawayServerLog = (params) => {
     }
   );
 };
+const openTodayEntry = ref(false);
+const tableList = ref([]);
+const loadingTodayEntry = ref(false);
+const clickViewTodayEntry = () => {
+  loadingTodayEntry.value = true;
+  openTodayEntry.value = true;
+  proxy.post("/inventoryFinished/getTodayInStorageList", {}).then((res) => {
+    tableList.value = res;
+    setTimeout(() => {
+      loadingTodayEntry.value = false;
+    }, 200);
+  });
+};
 </script>
 
 <style lang="scss" scoped>
 ::v-deep(.el-input-number .el-input__inner) {
   text-align: left;
 }
+:deep(.el-dialog) {
+  margin-top: 10px !important;
+  margin-bottom: 10px !important;
+}
 </style>