Merge remote-tracking branch 'origin/master'

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

@@ -96,4 +96,19 @@ export default {
     })
   },
 
+
+
+  // 初始化新增上架单
+  initUpshelf: function(params) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/getInit?sid=' + params.sid + "&orgPath=" + params.orgPath + "&userSid=" +
+        params.userSid,
+      method: 'get',
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+
+  },
+
 }

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

@@ -148,7 +148,6 @@
           "billNo": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
           "createByName": window.sessionStorage.getItem('name'),
-          "createByName": window.sessionStorage.getItem('name'),
           "deptName": '',
           "deptSid": '',
           "sourceBillNo": "",
@@ -269,10 +268,12 @@
         this.getWarehouseList()
         this.getAllOrgper()
         var params = {
-          sid: row.sid
+          sid: row.sid,
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          userSid: window.sessionStorage.getItem('userSid')
         }
 
-        req.init(row.sid)
+        req.initUpshelf(params)
           .then(resp => {
             if (resp.success) {
               this.formobj = resp.data