库存调整，其他变更

src/router/index.js

@@ -729,11 +729,11 @@ export const constantRoutes = [{
     component: () => import('@/views/login'),
     hidden: true
   },
-  {
-    path: '/register',
-    component: () => import('@/views/register'),
-    hidden: true
-  },
+  // {
+  //   path: '/register',
+  //   component: () => import('@/views/register'),
+  //   hidden: true
+  // },
   {
     path: '/404',
     component: () => import('@/views/error/404'),

src/views/ccgl/kngl/kwtzd/mx.vue

@@ -44,10 +44,19 @@
               field: "rqCode",
               width: 120,
             },
-
+            {
+              title: "库区",
+              field: "kqName",
+              width: 120,
+            },
+            {
+              title: "目标库区",
+              field: "mbkqName",
+              width: 120,
+            },
             {
               title: "库位",
-              field: "kwName",
+              field: "kwCode",
               width: 120,
             },
             {

src/views/ccgl/kngl/kwtzd/qd.vue

@@ -82,11 +82,6 @@
                 field: "sl",
                 width: 120,
               },
-              {
-                title: "状态",
-                field: "zt",
-                width: 120,
-              },
           ],
           queryParams: [],
 

src/views/ccgl/kngl/kwtzd/top/edit.vue

@@ -12,8 +12,9 @@
       </el-row>
 
       <div class="editTab">
-        <editTableForEdit :indexApp='app' :AuxButton='false' ref="editTableForEdit" :editTableTitle='editTableTitle'
-          v-if="editTableForEdit" :computedRow='computedRow' :editTableData="formDetail">
+        <editTableForEdit :indexApp='app' :AuxButton='false' :type='type' ref="editTableForEdit"
+          :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
+          :editTableData="formDetail">
           <template v-if="type!='view'" #toolbar="ctx">
             <el-button @click="add" size='mini' type="primary">选择调整明细</el-button>
           </template>
@@ -40,9 +41,9 @@
     methods: {
       add() {
         /* */
-        if(this.form.ckid){
+        if (this.form.ckid) {
           this.showDialog = true
-        }else{
+        } else {
           this.$warning('请选择仓库后再进行操作')
         }
 
@@ -59,6 +60,7 @@
         /* 添加熬子表*/
         list.forEach(item => {
           item.lydjid = item.id
+          item.mbkqName = ''
           delete item.id
           delete item.rqZt
           delete item.rqKczt
@@ -146,6 +148,7 @@
             field: "kqName",
             width: 200,
           },
+
           {
             title: "唯一码",
             field: "packid",
@@ -173,15 +176,24 @@
                 "value": "id",
                 "label": "name"
               },
-            							// give(data) {
-            							// 	this.form.wlid = data.id
-            							// 	this.form.wlmc = data.name
-            							// 	this.form.wlcode = data.code
-
-            							// }
+              queryParams: ()=>{
+                return {
+                  ckid:this.form.ckid
+                }
+              },
+              give(data) {
+                this.form.mbkqName = data.kqName
+                this.$forceUpdate()
 
               }
+
             }
+          },
+          {
+            title: "目标库区",
+            field: "mbkqName",
+            width: 200,
+          },
 
 
 

src/views/ccgl/kngl/kwtzd/top/index.vue

@@ -40,14 +40,26 @@
               width: 140
             },
             {
-              title: "备注",
-              field: "bz",
-              width: 240
+              title: "状态",
+              field: "zt",
+              width: 100,
+              "transform": {
+                "url": "wms/kcgl/kwtz/init/zt",
+                "label": "name",
+                "value": "id"
+              }
             },
             {
               title: "维护人",
-              field: "whr"
+              field: "whr",
+                width: 140
+            },
+            {
+              title: "备注",
+              field: "bz",
+
             },
+
             {
               title: "维护时间",
               field: "whsj",

src/views/ccgl/kngl/zlhbg/top/index.vue

@@ -44,19 +44,19 @@
                 "value": "id"
               }
             },
-            {
-              title: "备注",
-              field: "bz",
-              width: 240
-            },
             {
               title: "维护人",
-              field: "whr"
+              field: "whr",
+              width: 140
             },
             {
               title: "维护时间",
               field: "whsj",
               fieldType: 'ftDateTime'
+            },
+            {
+              title: "备注",
+              field: "bz",
             }
           ],
           queryParams: [
@@ -104,22 +104,22 @@
       }
     },
     methods: {
-      doConfirm(ctx){
-        if(ctx.singleItem&&ctx.singleItem.id){
+      doConfirm(ctx) {
+        if (ctx.singleItem && ctx.singleItem.id) {
           this.$confirm('是否确认?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
-          				}).then(res=>{
-                      this.$post('lxyl/kcgl/zlhbg/doConfirm',{
-                        id:ctx.singleItem.id
-                      }).then(res=>{
-                        if(res.success){
+          }).then(res => {
+            this.$post('lxyl/kcgl/zlhbg/doConfirm', {
+              id: ctx.singleItem.id
+            }).then(res => {
+              if (res.success) {
                 ctx.refresh()
               }
             })
           })
-        }else{
+        } else {
           this.$warning('请选中一条数据')
         }
       },

src/views/index.vue

 <template>
-  <div class="min_full">
-  <!-- <iframe src="https://web.wetab.link/" class="full" ></iframe> -->
-   <iframe src=" https://chat12.aichatos.xyz/" class="full" ></iframe>
+  <div class="errPage-container">
+  <!--  <el-button icon="arrow-left" class="pan-back-btn" @click="back">
+      返回
+    </el-button> -->
+    <el-row>
+      <el-col :span="12">
+        <h1 class="text-jumbo text-ginormous">
+          暂未设置首页
+        </h1>
+       <!-- <h2>您没有访问权限！</h2> -->
+        <h6>您可以联系系统管理员设置初始页面。</h6>
+  <!--      <ul class="list-unstyled">
+          <li class="link-type">
+            <router-link to="/">
+              回首页
+            </router-link>
+          </li>
+        </ul> -->
+      </el-col>
+      <el-col :span="12">
+        <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
+import errGif from '@/assets/401_images/401.gif'
+
 export default {
+  name: 'Page401',
   data() {
     return {
-
+      errGif: errGif + '?' + +new Date()
     }
   },
   methods: {
-
+    back() {
+      if (this.$route.query.noGoBack) {
+        this.$router.push({ path: '/' })
+      } else {
+        this.$router.go(-1)
+      }
+    }
   }
 }
 </script>
 
-<style scoped>
-
-
+<style lang="scss" scoped>
+  .errPage-container {
+    width: 800px;
+    max-width: 100%;
+    margin: 100px auto;
+    .pan-back-btn {
+      background: #008489;
+      color: #fff;
+      border: none!important;
+    }
+    .pan-gif {
+      margin: 0 auto;
+      display: block;
+    }
+    .pan-img {
+      display: block;
+      margin: 0 auto;
+      width: 100%;
+    }
+    .text-jumbo {
+      font-size: 38px;
+      font-weight: 700;
+      color: #484848;
+    }
+    .list-unstyled {
+      font-size: 14px;
+      li {
+        padding-bottom: 5px;
+      }
+      a {
+        color: #008489;
+        text-decoration: none;
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+  }
 </style>