路由调整 sidebar显示调整

src/layout/components/Sidebar/SidebarItem.vue

@@ -87,9 +87,9 @@ export default {
       })
 
       // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
+      // if (showingChildren.length === 1) {
+      //   return true
+      // }
 
       // Show parent if there are no child router to display
       if (showingChildren.length === 0) {

src/router/index.js

@@ -988,7 +988,7 @@ export const powerRoutes = [
               "icon": "",
               "noCache": false,
               "link": null,
-              "mkid": 920090100,
+              "mkid": 920070701,
             },
             name: 'pdd',
             path: "pdd",

src/views/ccgl/cqgl/cskc/top/index.vue

@@ -5,11 +5,13 @@
       <Shd v-if="ctx.basePage.showDialog" :app='ctx.basePage' />
     </template>
     <template #toolbar="ctx">
-
+      <el-button @click="wc(ctx.basePage)" size='mini' type="primary">完成</el-button>
+      <el-button @click="qxwc(ctx.basePage)" size='mini' type="primary" style="margin-right: 10px;">取消完成</el-button>
       <ImportButton @success="()=>{
 		  			        ctx.basePage.refresh()
 		  			        }" :url="'/wms/rkgl/cskc/import'" />
       <!-- <el-button @click="qktjkw(ctx.basePage)" size='mini'  type="primary">清空推荐库位</el-button> -->
+
     </template>
 
   </BasePage>
@@ -22,7 +24,7 @@
     data() {
       return {
         config: {
-          queryDetailAllUrl:'wms/rkgl/cskc/query/rkqd',
+          queryDetailAllUrl: 'wms/rkgl/cskc/query/rkqd',
           queryDetail: true,
           /* 基本配置*/
           url: 'wms/rkgl/cskc',
@@ -103,8 +105,8 @@
                 endProp: "end",
                 span: 8,
                 type: 'RelDaterangeV2',
-								startValue: new Date().getTime()-1000*60*60*24*30,
-								endValue:new Date().getTime(),
+                startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
+                endValue: new Date().getTime(),
               },
               {
                 "label": "仓库",
@@ -130,8 +132,8 @@
 
 
 
-						],[
-							{
+            ],
+            [{
                 label: '状态',
                 prop: 'zt',
                 span: 8,
@@ -165,94 +167,141 @@
 
     },
     methods: {
-      tbshd(ctx){
-        ctx.DialogWidth='35vw'
-        ctx.DialogTitle='同步送货单'
-        ctx.showDialog=true
+      qxwc(ctx) {
+
+        if (ctx.singleItem && ctx.singleItem.id) {
+          this.$confirm('是否继续该操作?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(res => {
+            this.$post('wms/rkgl/cskc/cancelComplete', {
+              id: ctx.singleItem.id
+            }).then(res => {
+              if (res.success) {
+                this.$success('操作成功')
+                ctx.refresh()
+              }
+            })
+          })
+
+
+        } else {
+          this.warning('请选中一条数据')
+        }
+
+      },
+      wc(ctx) {
+        if (ctx.singleItem && ctx.singleItem.id) {
+          this.$confirm('是否继续该操作?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(res => {
+            this.$post('wms/rkgl/cskc/complete', {
+              id: ctx.singleItem.id
+            }).then(res => {
+              if (res.success) {
+                this.$success('操作成功')
+                ctx.refresh()
+              }
+            })
+          })
+
+
+        } else {
+          this.warning('请选中一条数据')
+        }
+
+      },
+      tbshd(ctx) {
+        ctx.DialogWidth = '35vw'
+        ctx.DialogTitle = '同步送货单'
+        ctx.showDialog = true
       },
-      qktjkw(ctx){
-        if(ctx.singleItem&&ctx.singleItem.id){
+      qktjkw(ctx) {
+        if (ctx.singleItem && ctx.singleItem.id) {
           this.$confirm('是否继续该操作?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
-          				}).then(res=>{
-          					this.$post('lxyl/rkgl/sjtz/cleanKw ',{
-          					  id:ctx.singleItem.id
-          					}).then(res=>{
-          					  if(res.success){
+          }).then(res => {
+            this.$post('lxyl/rkgl/sjtz/cleanKw ', {
+              id: ctx.singleItem.id
+            }).then(res => {
+              if (res.success) {
                 this.$success('操作成功')
                 ctx.refresh()
               }
             })
           })
-        }else{
+        } else {
           this.$warning('请选中一条数据')
         }
       },
-      sapgz(ctx){
-        if(ctx.singleItem&&ctx.singleItem.id){
+      sapgz(ctx) {
+        if (ctx.singleItem && ctx.singleItem.id) {
           this.$confirm('是否继续该操作?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
-          				}).then(res=>{
-          					this.$post('lxyl/rkgl/rktz/sap/gz',{
-          					  id:ctx.singleItem.id
-          					}).then(res=>{
-          					  if(res.success){
+          }).then(res => {
+            this.$post('lxyl/rkgl/rktz/sap/gz', {
+              id: ctx.singleItem.id
+            }).then(res => {
+              if (res.success) {
                 this.$success('操作成功')
                 ctx.refresh()
               }
             })
           })
-        }else{
+        } else {
           this.$warning('请选中一条数据')
         }
       },
-      getRow(val){
-        this.$emit('getRow',val)
+      getRow(val) {
+        this.$emit('getRow', val)
       },
-      qr(ctx){
-        if(ctx.singleItem&&ctx.singleItem.id){
+      qr(ctx) {
+        if (ctx.singleItem && ctx.singleItem.id) {
           this.$confirm('是否继续?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
-          				}).then(res=>{
-                    this.$post('lxyl/rkgl/rktz/confirm',{
-                      id:ctx.singleItem.id
-                    }).then(res=>{
-                      if(res.success){
+          }).then(res => {
+            this.$post('lxyl/rkgl/rktz/confirm', {
+              id: ctx.singleItem.id
+            }).then(res => {
+              if (res.success) {
                 this.$success('操作成功')
                 ctx.refresh()
               }
             })
 
           })
-        }else{
+        } else {
           this.$warning('请选中一条数据进行操作')
         }
 
       },
-      qxqr(ctx){
-        if(ctx.singleItem&&ctx.singleItem.id){
+      qxqr(ctx) {
+        if (ctx.singleItem && ctx.singleItem.id) {
           this.$confirm('是否继续?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
-          				}).then(res=>{
-                    this.$post('lxyl/rkgl/rktz/unconfirm',{
-                      id:ctx.singleItem.id
-                    }).then(res=>{
-                      if(res.success){
+          }).then(res => {
+            this.$post('lxyl/rkgl/rktz/unconfirm', {
+              id: ctx.singleItem.id
+            }).then(res => {
+              if (res.success) {
                 this.$success('操作成功')
                 ctx.refresh()
               }
             })
 
           })
-        }else{
+        } else {
           this.$warning('请选中一条数据进行操作')
         }
       }