Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/storage/stocktaking.js

@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/wms/apiadmin/inventory/wmsinventorycheckbill/listPage',
+      url: '/wms/v1/wmsinventorycheckbill/listPage',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }

yxt-as-ui/src/api/warehouse/warehouseArea.js

@@ -32,7 +32,7 @@ export default {
     return request({
      url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
      method: 'get',
-     params: data,
+     params: params,
      headers: { 'Content-Type': 'application/json' }
     })
   },

yxt-as-ui/src/views/storage/adjustment/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@@ -58,7 +58,7 @@
               <div class="span-sty"><span class="must">*</span> 供应商</div>
               <el-form-item prop="supplierName"> <el-select v-model="formobj.supplierName" filterable clearable
                   placeholder="请选择" class="addinputInfo" @change="supplierNameSelect">
-                  <el-option v-for="item in supplierList" :key="item.sid" :label="item.name" :value="item.sid">
+                  <el-option v-for="item in supplierList" :key="item.sid" :label="item.supplierName" :value="item.sid">
                   </el-option>
                 </el-select></el-form-item>
             </el-col>
@@ -296,8 +296,10 @@
           "sourceBillNo": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
           "createByName": window.sessionStorage.getItem('name'),
-          "deptName": '',
+          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-          "deptSid": '',
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
           "createTime": getCurrentDate(),
           "busTypeKey": "",
           "busTypeValue": "",
@@ -640,8 +642,10 @@
           "sourceBillNo": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
           "createByName": window.sessionStorage.getItem('name'),
-          "deptName": '',
+          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-          "deptSid": '',
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
           "createTime": getCurrentDate(),
           "busTypeKey": "",
           "busTypeValue": "",

yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue

@@ -54,8 +54,8 @@
           <el-col :span="16">
             <div class="span-sty"><span class="must">*</span> 库位编码</div>
             <el-form-item prop="rackCode">
-              <el-input v-model="formobj.rackCode" placeholder="库位编码" class="addinputw addinputInfo" clearable
+              <el-input v-model="formobj.rackCode" placeholder="格式：排-架-层-位" class="addinputw addinputInfo" clearable
-                oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
+                oninput="this.value=this.value.replace(/[^\w_-]/g,'');" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -177,7 +177,12 @@
       getWarehouseArea(sid) {
         this.formobj.locationSid = ''
         this.formobj.locationName = ''
-        req3.getAllWarehouseareaBysid(sid).then(resp => {
+
+        var params = {
+          ckSid: sid
+        }
+
+        req3.getAllWarehouseareaBysid(params).then(resp => {
           console.log('>>>>>>>>>getAllWarehousearea', resp)
           this.warehouseAreaList = resp.data
         }).catch(() => {})
@@ -242,6 +247,31 @@
         // }
 
 
+        var aaa = this.formobj.rackCode.split('-')
+
+        console.log('>>>>>>>>>saveOrUpdate', aaa)
+        if (aaa.length != 4) {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '库位编码格式错误'
+          })
+          return
+        }
+
+        for (var i = 0; i < aaa.length; i++) {
+          if (aaa[i] == '') {
+            this.$message({
+              showClose: true,
+              type: 'warning',
+              message: '库位编码格式错误'
+            })
+            return
+          }
+        }
+
+
+
         this.$refs['form_obj'].validate((valid) => {
           if (valid) {
             req.saveGoodsShelves(this.formobj)