diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js
index 5d903098..0f90ffd6 100644
--- a/sgzb-ui/src/api/claimAndRefund/receive.js
+++ b/sgzb-ui/src/api/claimAndRefund/receive.js
@@ -300,7 +300,14 @@ export function auditAll(params){
   })
 }
 
-
+// 手动出库结单
+export function outboundCompleted(params){
+  return request({
+    url: '/base/tm_task/outboundCompleted',
+    method: 'post',
+    data: params
+  })
+}
 
 
 
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index 0e333e53..271fb738 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -286,7 +286,7 @@
                             @click="codeOut(scope.row)"
                             v-if="
                                 scope.row.manageType == 0 &&
-                                scope.row.outNum != 0
+                                scope.row.status != 0
                             "
                         >
                             编码出库
@@ -297,12 +297,20 @@
                             v-if="
                                 (scope.row.manageType == 1 ||
                                     scope.row.manageType == 2) &&
-                                scope.row.outNum != 0
+                                scope.row.status != 2
                             "
                             @click="numOut(scope.row)"
                         >
                             数量出库
                         </el-button>
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            v-if="scope.row.status != 2"
+                            @click="manualOperation(scope.row)"
+                        >
+                            出库结单
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -520,6 +528,7 @@ import {
     getDetailsByTypeId,
     submitOut,
     submitNumOut,
+    outboundCompleted,
 } from '@/api/claimAndRefund/receive.js'
 import { getTypeList } from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
@@ -740,6 +749,28 @@ export default {
             this.$set(obj, 'num', row.num) //库存
             this.outNumList = [obj]
         },
+        // 手动操作
+        manualOperation(row) {
+            // 弹框确认
+            this.$confirm('是否确认出库结单？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    outboundCompleted({ id: this.dialogQuery.id, typeId: row.typeId }).then((response) => {
+                        this.$modal.msgSuccess('出库结单成功')
+                        this.handleDialogQuery()
+                        this.handleQuery()
+                    })
+                })
+                .catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消出库结单',
+                    })
+                })
+        },
         handleOutQuery() {
             this.outQuery.pageNum = 1
             this.getCodeList()
diff --git a/sgzb-ui/src/views/newLogin.vue b/sgzb-ui/src/views/newLogin.vue
index 6eb5336e..8d73e494 100644
--- a/sgzb-ui/src/views/newLogin.vue
+++ b/sgzb-ui/src/views/newLogin.vue
@@ -507,13 +507,14 @@ export default {
                     this.$store
                         .dispatch('Login', this.loginForm)
                         .then(() => {
-                            if (localStorage.getItem('isCode') == 1) {
-                                this.$router.push({ path: '/resetPassword' }).catch(() => {})
-                            } else {
-                                this.$router.push({ path: '/' }).catch(() => {})
-                            }
+                            // 宁夏目前不需要重置初始密码
+                            // if (localStorage.getItem('isCode') == 1) {
+                            //     this.$router.push({ path: '/resetPassword' }).catch(() => {})
+                            // } else {
+                            //     this.$router.push({ path: '/' }).catch(() => {})
+                            // }
 
-                            // this.$router.push({ path: '/' }).catch(() => {})
+                            this.$router.push({ path: '/' }).catch(() => {})
                         })
                         .catch(() => {
                             this.loading = false