Browse Source

调整页面及标题修改库位bug

sakura 1 year ago
parent
commit
69f4fe93e1

BIN
manager-admin/favicon.ico


+ 19 - 0
manager-admin/src/api/setting.js

@@ -318,3 +318,22 @@ export function getDictCount() {
     loaidng: false
   })
 }
+
+//获取所有仓库
+export function getListAll() {
+  return request({
+    url: '/admin/erp/warehouse/list-all',
+    method: 'get',
+    loaidng: false
+  })
+}
+
+//字典接口 /admin/systems/dict-data/page
+export function getPage(params) {
+  return request({
+    url: '/admin/systems/dict-data/page',
+    method: 'get',
+    loaidng: false,
+    params
+  })
+}

BIN
manager-admin/src/assets/favicon.ico


+ 11 - 11
manager-admin/src/components/SkuEditor/src/helper.js

@@ -22,15 +22,15 @@ export const defaultParams = [
     reg: RegExp.money,
     batch: true
   },
-  // {
-  //   key: 'bar_code',
-  //   name: '条码',
-  //   // value: 0,
-  //   type: 'Number',
-  //   required: true,
-  //   reg: RegExp.money,
-  //   batch: true
-  // },
+  {
+    key: 'bar_code',
+    name: '条码',
+    value: 0,
+    type: 'Number',
+    required: true,
+    reg: RegExp.money,
+    batch: true
+  },
   // {
   //   key: 'sn_code',
   //   name: '序列号',
@@ -67,7 +67,7 @@ export const defaultParams = [
     reg: RegExp.money,
     batch: true
   },
-  {
+ /*  {
     key: 'mkt_price',
     name: '市场价',
     value: 0,
@@ -84,7 +84,7 @@ export const defaultParams = [
     required: true,
     reg: RegExp.money,
     batch: true
-  },
+  }, */
   {
     key: 'weight',
     name: '重量(kg)',

+ 3 - 0
manager-admin/src/store/modules/permission.js

@@ -11,6 +11,7 @@ const permission = {
   },
   mutations: {
     SET_ROUTERS: (state, routers) => {
+      console.log(state, routers);
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
@@ -27,11 +28,13 @@ const permission = {
       if (user.founder === 1) role_id = 0
       return new Promise((resolve, reject) => {
         if (role_id === 0) {
+          console.log(112);
           commit('SET_ROUTERS_ALL', ['*:*:*'])
           commit('SET_ROUTERS', asyncRouterMap)
           resolve()
         } else {
           getUserRolesPermissions(role_id).then(response => {
+            console.log(113);
             let accessedRouters = filterRoleRouter(asyncRouterMap, response)
             commit('SET_ROUTERS_ALL', response)
             commit('SET_ROUTERS', accessedRouters)

+ 6 - 0
manager-admin/src/views/basicSetting/goods/editForm/Sku.vue

@@ -13,6 +13,12 @@
           <el-radio :label="true">有</el-radio>
         </el-radio-group>
       </el-form-item>
+      <!-- <el-form-item label="是否为租赁商品" >
+        <el-radio-group v-model="formData.haveSn">
+          <el-radio :label="false">否</el-radio>
+          <el-radio :label="true">是</el-radio>
+        </el-radio-group>
+      </el-form-item> -->
       <el-form-item label="SKU信息" prop="product_list">
         <template slot="label">
           <span style="color: #F56C6C;margin-right: 1px">*</span>SKU信息

+ 2 - 0
manager-admin/src/views/login/index.vue

@@ -155,6 +155,7 @@ export default {
       return new Promise((resolve, reject) => {
         this.$store.dispatch('loginAction', params).then((res) => {
           this.loading = false
+          console.log(res);
           if (res && api.adminWS) {
             try {
               const WS = new WebSocket(api.adminWS, res.access_token)
@@ -164,6 +165,7 @@ export default {
             }
           }
           const forward = this.$route.query.forward
+          console.log(forward);
           let query = JSON.parse(JSON.stringify(this.$route.query))
           delete query.forward
           this.$router.push({ path: forward || '/', query }).catch(() => { })

+ 65 - 32
manager-admin/src/views/stock/goodsLend.vue

@@ -15,8 +15,8 @@
             advancedWidth="465">
             <template slot="advanced-content">
               <el-form ref="advancedForm" :model="advancedForm" label-width="90px">
-                <el-form-item label="所属部门">
-                  <el-cascader v-model="advancedForm.dept_id" :options="deptList" :props="{
+                <el-form-item label="仓库">
+                  <el-cascader v-model="advancedForm.dept_id" :options="warehouseList" :props="{
                     label: 'name',
                     value: 'id',
                     emitPath: false,
@@ -45,7 +45,7 @@
 
       <template slot="table-columns">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="" label="仓库编号">
+        <el-table-column prop="warehouse.sn" label="仓库编号">
           <!-- <template slot-scope="scope">
             <router-link
               v-if="checkPermission(['goodsLend'])"
@@ -56,11 +56,13 @@
             <span v-else>{{scope.row.sn}}</span>
           </template> -->
         </el-table-column>
-        <el-table-column prop="name" label="仓库名称">
+        <el-table-column prop="warehouse.name" label="仓库名称">
           <!-- <template slot-scope="scope">{{ scope.row.lend_time | unixToDate }}</template> -->
         </el-table-column>
         <el-table-column prop="code" label="库位号" />
-        <el-table-column prop="type" label="仓库类型" />
+        <el-table-column prop="type" label="仓库类型">
+          <template slot-scope="scope">{{ statusFilter(scope.row.type) }}</template>
+        </el-table-column>
         <el-table-column prop="intro" label="库位说明" />
         <!-- <el-table-column prop="lend_person" label="借出人" />
         <el-table-column prop="status" label="状态">
@@ -98,20 +100,26 @@
     </el-dialog>
     <el-dialog :title="title" :visible.sync="dialogVisibleForm"  width="940px" center @close='addHandleCancle'>
         <el-form ref="addLendForm" :model="addLendForm" :rules="rules" label-width="90px">
-          <el-form-item label="仓库编号" prop="code">
+          <!-- <el-form-item label="仓库编号" prop="code">
             <el-input v-model="addLendForm.code" placeholder="请输入仓库编号"></el-input>
           </el-form-item>
           <el-form-item label="仓库名称" prop="name">
             <el-input v-model="addLendForm.name" placeholder="请输入仓库名称"></el-input>
+          </el-form-item> -->
+          <el-form-item label="仓库" prop="warehouse_id">
+            <el-select v-model="addLendForm.warehouse_id" clearable @change="selWarehouse">
+              <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+            <span style="color: red;margin-left: 20px;cursor: pointer;" v-if="!warehouseList" @click="gowareHouse">请新增仓库</span>
           </el-form-item>
-          <el-form-item label="库位号" prop="create_time">
-            <el-input v-model="addLendForm.create_time" placeholder="请输入库位号"></el-input>
+          <el-form-item label="库位号" prop="code">
+            <el-input v-model="addLendForm.code" maxlength="12" placeholder="请输入库位号" style="width: 270px;">
+              <template slot="prepend">{{ warehouseSn }}-</template>
+            </el-input>
           </el-form-item>
           <el-form-item label="仓库类型" prop="type">
             <el-select v-model="addLendForm.type" clearable>
-              <el-option key="d" label="大型" value="大型" />
-              <el-option key="z" label="中型" value="中型" />
-              <el-option key="s" label="小型" value="小型" />
+              <el-option v-for="item in typeList" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="库位说明">
@@ -141,7 +149,8 @@ export default {
   name: 'goodsLend',
   data() {
     return {
-      deptList: [],
+      warehouseSn:"",
+      warehouseList: [],
       // 列表loading状态
       loading: false,
       // 列表参数
@@ -164,19 +173,20 @@ export default {
       addLendForm:{
       },
       rules: {
-        code: [
-            { required: true, message: '请输入仓库编号', trigger: 'blur' },
+        warehouse_id: [
+            { required: true, message: '请选择仓库', trigger: 'change' },
           ],
           name: [
             { required: true, message: '请选择输入仓库名称', trigger: 'blur' }
           ],
-          create_time: [
+          code: [
             { required: true, message: '请选择输入库位号', trigger: 'blur' }
           ],
           type: [
             {  required: true, message: '请选择仓库类型', trigger: 'change' }
           ]
-        }
+        },
+        typeList:[]
     }
   },
   mounted() {
@@ -197,15 +207,28 @@ export default {
     }
   },
   methods: {
+    gowareHouse(){
+      this.dialogVisibleForm=false
+      this.$router.push({ name: 'warehouseList'})
+    },
+    /* 选中仓库 */
+    selWarehouse(val){
+      const list=this.warehouseList.filter(el=>{
+        return el.id===val
+      })
+      let obj = list[0]
+      this.warehouseSn=obj.sn
+    },
     // 确认提交
     lendCommit(){
       this.$refs.addLendForm.validate((valid) => {
       if (valid) {
         if(this.title==='新增'){
-          this.addLendForm.create_time=Date.parse(new Date())
+          this.addLendForm.code=this.warehouseSn+"-"+this.addLendForm.code
            API_GoodsLend.create(this.addLendForm).then(res=>{
             this.$message.success('添加成功!')
             this.dialogVisibleForm=false
+            this.warehouseSn=""
             this.addLendForm={}
             this.GET_GoodsLendList()
            })
@@ -251,10 +274,10 @@ export default {
     },
     handleEditGoodsLend(row) {
       console.log(row);
-      // this.title="编辑"
-      // this.addLendForm=row
-      // this.dialogVisibleForm=true
-      this.$router.push({ name: 'goodsLendEdit', params: { id: row.id }})
+      this.title="编辑"
+      this.addLendForm=row
+      this.dialogVisibleForm=true
+      // this.$router.push({ name: 'goodsLendEdit', params: { id: row.id }})
     },
     handleReturnGoodsLend(row) {
       this.$confirm('确定要删除吗?', '提示', { type: 'warning' }).then(() => {
@@ -266,16 +289,15 @@ export default {
     },
     /** 状态 */
     statusFilter(val) {
-      switch (val) {
-        case 'NEW':
-          return '新创建'
-        case 'CONFIRMED':
-          return '已确认'
-        case 'RETURNED':
-          return '已归还'
-        default:
-          return ''
+      const obj=this.typeList.filter(el=>{
+        return el.value===val
+      })
+      if(obj.length !== 0){
+        return obj[0].label
+      }else{
+        return ""
       }
+
     },
     handleConfirmGoodsLend() {
       if (!this.multipleSelection || !this.multipleSelection.length) return this.$message.error('请先选择!')
@@ -287,8 +309,12 @@ export default {
     },
     /** 获取部门 */
     GET_DeptList() {
-      API_Setting.getDeptList().then(response => {
-        this.deptList = Foundation.buildTree(response, '0')
+      API_Setting.getListAll().then(response => {
+        this.warehouseList = response
+        console.log(response);
+      })
+      API_Setting.getPage({dictType:"Warehouse_location_type",page_no: 1,page_size: 50}).then(res=>{
+        this.typeList=res.data
       })
     },
     /** 打印对账详情 */
@@ -427,4 +453,11 @@ export default {
 /deep/ .el-dialog__body {
   padding: 10px 20px;
 }
+/deep/.el-form{
+    .el-form-item__content{
+    display: flex;
+  }
+}
+
+
 </style>

+ 1 - 1
manager-admin/src/views/stock/warehouseList.vue

@@ -34,7 +34,7 @@
       @open="handleDialogOpen" :modal-append-to-body="false" :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form :model="stockForm" :rules="stockRules" ref="stockForm" label-width="120px">
         <el-form-item label="仓库编号" prop="sn">
-          <el-input v-model="stockForm.sn" :minlength="2" :maxlength="20" clearable placeholder="请输入仓库编号"></el-input>
+          <el-input v-model="stockForm.sn" :minlength="2" :maxlength="4" clearable placeholder="请输入仓库编号"></el-input>
         </el-form-item>
         <el-form-item label="仓库名称" prop="name">
           <el-input v-model="stockForm.name" :minlength="2" :maxlength="20" clearable placeholder="请输入仓库名称"></el-input>

+ 17 - 1
manager-admin/src/views/stock/warehouseOut.vue

@@ -1,5 +1,11 @@
 <template>
   <div>
+    <div>
+      <el-tabs v-model="activeShipped" type="card" @tab-click="handleClick">
+        <el-tab-pane label="已发货" name="shipped"></el-tab-pane>
+        <el-tab-pane label="未发货" name="unShipped"></el-tab-pane>
+      </el-tabs>
+    </div>
     <div class="search">
       <el-form ref="advancedForm" :model="advancedForm" label-width="160px">
         <el-row>
@@ -304,7 +310,8 @@ export default {
       // 当前操作审核ID
       auditId: '',
       // 审核状态
-      auditStatus: 'AUDIT_PASS'
+      auditStatus: 'AUDIT_PASS',
+      activeShipped:"shipped"
     }
   },
   mounted() {
@@ -320,6 +327,15 @@ export default {
     }
   },
   methods: {
+    /* 切换发货列表 */
+    handleClick(tab, event) {
+      this.activeShipped=tab.name
+      if (tab.name == "shipped") {
+       /*  this.GET_GoodsExchangeList(); */
+      } else {
+        /* this.GET_WarehouseEntry(); */
+      }
+    },
     addWarehouse(){
       this.$router.push({
         name: 'orderOutboundAdd',