Merge branch 'dev' into 'master'

Dev

See merge request !63

components.d.ts

@@ -32,7 +32,6 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElOption: typeof import('element-plus/es')['ElOption']

src/views/order/podUs/index.vue

@@ -264,7 +264,14 @@
         </ElFormItem>
         </ElFormItem>
 
 
         <ElFormItem>
         <ElFormItem>
-          <span v-if="status === 'PICKING'" class="item">
+          <span
+            v-if="
+              status === 'PICKING' ||
+              status === 'TO_BE_REPLENISHMENT' ||
+              status === 'IN_PRODUCTION'
+            "
+            class="item"
+          >
             <ElButton
             <ElButton
               :loading="tifDownloadLoading"
               :loading="tifDownloadLoading"
               type="warning"
               type="warning"
@@ -273,7 +280,14 @@
               TIF排版
               TIF排版
             </ElButton>
             </ElButton>
           </span>
           </span>
-          <span v-if="status === 'PICKING'" class="item">
+          <span
+            v-if="
+              status === 'PICKING' ||
+              status === 'TO_BE_REPLENISHMENT' ||
+              status === 'IN_PRODUCTION'
+            "
+            class="item"
+          >
             <ElButton
             <ElButton
               :loading="pngDownloadLoading"
               :loading="pngDownloadLoading"
               type="warning"
               type="warning"
@@ -462,7 +476,8 @@
               status === 'PICKING' ||
               status === 'PICKING' ||
               status === 'STOCK_OUT' ||
               status === 'STOCK_OUT' ||
               status === 'EXCEPTION_ORDER' ||
               status === 'EXCEPTION_ORDER' ||
-              status === 'TO_BE_REPLENISHMENT'
+              status === 'TO_BE_REPLENISHMENT' ||
+              status === 'IN_PRODUCTION'
             "
             "
             class="item"
             class="item"
           >
           >

src/views/podBillOrder/index.vue

@@ -685,8 +685,8 @@
                   layout="total, sizes, prev, pager, next, jumper"
                   layout="total, sizes, prev, pager, next, jumper"
                   :total="detailPager.total"
                   :total="detailPager.total"
                   style="margin: 10px auto 0; text-align: right"
                   style="margin: 10px auto 0; text-align: right"
-                  @size-change="handleSizeChange"
-                  @current-change="handleCurrentChange"
+                  @size-change="handleDetailSizeChange"
+                  @current-change="handleDetailCurrentChange"
                 ></ElPagination>
                 ></ElPagination>
               </el-tab-pane>
               </el-tab-pane>
               <el-tab-pane name="1" label="操作日志">
               <el-tab-pane name="1" label="操作日志">
@@ -994,6 +994,15 @@ const getSelectionsProperty = (property: keyof AccountStatementNote) => {
     .join(',')
     .join(',')
 }
 }
 
 
+const handleDetailSizeChange = (size: number) => {
+  detailPager.value.rows = size
+  searchDetail()
+}
+
+const handleDetailCurrentChange = (size: number) => {
+  detailPager.value.page = size
+  searchDetail()
+}
 const nodeId = ref<number | string>(0)
 const nodeId = ref<number | string>(0)
 const treeRef = ref<InstanceType<typeof ElTree>>()
 const treeRef = ref<InstanceType<typeof ElTree>>()
 const {
 const {