Merge branch '调拨入库独立页面'

src/router/page/index.js

@@ -784,19 +784,6 @@ export default [
     ],
   },
   {
-    path: '/putInStorage/transfer',
-    component: Layout,
-    redirect: '/putInStorage/transfer',
-    children: [
-      {
-        path: '/putInStorage/transfer',
-        name: '调拨登记',
-        component: () => import(/* webpackChunkName: "page" */ '@/views/shengde/warehouse/putInStorage/transfer/register'),
-        props: true,
-      },
-    ],
-  },
-  {
     path: '/outbound/register',
     component: Layout,
     redirect: '/outbound/register',

src/views/shengde/warehouse/putInStorage/single.vue

@@ -53,7 +53,6 @@
     <el-row :gutter="10" style="margin-bottom: 10px">
       <el-col :span="1.5">
         <el-button type="primary" size="mini" @click="handleAdd" v-db-click>入库登记</el-button>
-        <el-button type="primary" size="mini" @click="handleTransfer" v-db-click>调拨登记</el-button>
       </el-col>
     </el-row>
 
@@ -211,20 +210,6 @@ export default {
         },
       })
     },
-    handleTransfer() {
-      let $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'
-      let maxPos = $chars.length
-      let random = ''
-      for (let i = 0; i < 32; i++) {
-        random += $chars.charAt(Math.floor(Math.random() * maxPos))
-      }
-      this.$router.push({
-        path: '/putInStorage/transfer',
-        query: {
-          random: random,
-        },
-      })
-    },
     clickPassword() {
       if (this.pwd) {
         if (this.pwd === 'sd2022') {

src/views/shengde/warehouse/putInStorage/transfer/register.vue

@@ -1,140 +0,0 @@
-<template>
-  <div class="box-card">
-    <el-form ref="form" :model="form" v-loading="loadingStatus" :element-loading-text="loadingText" element-loading-background="rgba(0, 0, 0, 0.2)">
-      <el-card>
-        <LabelTemplate title="入库信息"></LabelTemplate>
-        <Storage :form="form" ref="storage"></Storage>
-      </el-card>
-      <div class="interval">
-        <div></div>
-      </div>
-      <el-card>
-        <LabelTemplate title="物料信息"></LabelTemplate>
-        <Material :form="form" ref="material"></Material>
-        <div style="width: 100%; text-align: center">
-          <el-button type="primary" @click="clickSubmit()" size="small" v-db-click>提 交</el-button>
-          <el-button @click="clickCancel" size="small" v-db-click>取 消</el-button>
-        </div>
-        <br />
-      </el-card>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import LabelTemplate from '@/components/LabelTemplate'
-import Storage from './storage'
-import Material from './material'
-import * as API from '@/api/shengde/warehouse/outAndInWarehouse'
-import Utils from '@/util/transit'
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'putInStorageTransfer',
-  components: { LabelTemplate, Storage, Material },
-  data() {
-    return {
-      loadingText: '',
-      loadingStatus: false,
-      form: {
-        comeSubsidiaryId: '',
-        comeWarehouseId: '',
-        putSubsidiaryId: '',
-        putWarehouseId: '',
-        proposer: '',
-        content: '',
-        allotDetailList: [],
-      },
-    }
-  },
-  created() {
-    this.form.proposer = this.userInfo.real_name
-  },
-  mounted() {},
-  computed: mapGetters(['userInfo']),
-  methods: {
-    clickSubmit() {
-      let flagStorage = this.$refs.storage.validateForm()
-      let flagProduct = true
-      let flagMaterial = true
-      flagMaterial = this.$refs.material.validateForm()
-      if (flagStorage && flagProduct && flagMaterial) {
-        if (this.form.allotDetailList && this.form.allotDetailList.length > 0) {
-          this.loadingText = '提交数据中,请稍后'
-          this.loadingStatus = true
-          API.allotSave(this.form).then(
-            () => {
-              Utils.$emit('refreshPutList', true)
-              this.msgSuccess('提交完成')
-              this.form = {
-                comeSubsidiaryId: '',
-                comeWarehouseId: '',
-                putSubsidiaryId: '',
-                putWarehouseId: '',
-                proposer: '',
-                content: '',
-                allotDetailList: [],
-              }
-              this.loadingStatus = false
-              this.$store.dispatch('delView', this.$route)
-              this.$router.replace({
-                path: '/shengde/warehouse/putInStorage/index',
-              })
-            },
-            (err) => {
-              console.log('allotSave: ' + err)
-              this.loadingStatus = false
-            }
-          )
-        } else {
-          this.msgInfo('请选择BOM信息')
-        }
-      } else {
-        setTimeout(() => {
-          const errorDiv = document.getElementsByClassName('is-error')
-          errorDiv[0].scrollIntoView()
-        }, 0)
-      }
-    },
-    clickCancel() {
-      this.$store.dispatch('delView', this.$route)
-      this.$router.replace({
-        path: '/shengde/warehouse/putInStorage/index',
-      })
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-* {
-  font-size: 12px;
-}
-
-.box-card {
-  height: calc(100vh - 110px);
-  overflow-y: auto;
-}
-
-::v-deep {
-  .el-input__inner {
-    border-radius: 1px;
-  }
-  .el-button--mini {
-    border-radius: 1px;
-  }
-  .tableHeader th {
-    background-color: #edf0f5;
-    height: 35px;
-    padding: 0;
-  }
-}
-
-.interval {
-  div {
-    height: 12px;
-    background-color: #f2f2f2;
-    box-shadow: var(--devui-shadow-fullscreen-overlay, 0 10px 40px 0) var(--devui-shadow, rgba(0, 0, 0, 0.08));
-  }
-}
-</style>

src/views/shengde/warehouse/putInStorage/transfer/storage.vue

@@ -4,7 +4,7 @@
       <el-row>
         <el-col :span="12" style="padding-right: 8px">
           <el-form-item label="出库事业部:" prop="comeSubsidiaryId">
-            <el-select v-model="form.comeSubsidiaryId" placeholder="请选择出库事业部" size="small" style="width: 100%">
+            <el-select v-model="form.comeSubsidiaryId" placeholder="请选择出库事业部" size="small" style="width: 100%" @change="changeSubsidiary">
               <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -14,7 +14,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="入库事业部:" prop="putSubsidiaryId">
-            <el-select v-model="form.putSubsidiaryId" placeholder="请选择入库事业部" size="small" style="width: 100%">
+            <el-select v-model="form.putSubsidiaryId" placeholder="请选择入库事业部" size="small" style="width: 100%" disabled>
               <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -54,7 +54,7 @@ export default {
       formRules: {
         comeSubsidiaryId: [{ required: true, message: '请选择出库事业部', trigger: 'change' }],
         comeWarehouseId: [{ required: true, message: '请选择出库仓库', trigger: 'change' }],
-        putSubsidiaryId: [{ required: true, message: '请选择入库事业部', trigger: 'change' }],
+        // putSubsidiaryId: [{ required: true, message: '请选择入库事业部', trigger: 'change' }],
         putWarehouseId: [{ required: true, message: '请选择入库仓库', trigger: 'change' }],
         proposer: [{ required: true, message: '请输入申请人', trigger: 'blur' }],
       },
@@ -91,6 +91,9 @@ export default {
       })
       return flag
     },
+    changeSubsidiary(val) {
+      this.form.putSubsidiaryId = val
+    },
   },
 }
 </script>