Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

package.json

@@ -65,6 +65,7 @@
     "vue-plugin-hiprint": "0.0.56",
     "vue-printjs": "^1.0.0",
     "vue-property-decorator": "^9.1.2",
+    "vue-quill-editor": "^3.0.6",
     "vue-router": "3.0.0",
     "vue-tour": "^2.0.0",
     "vuedraggable": "^2.24.3",

src/api/system/user/login.js

@@ -983,10 +983,10 @@ export const restoreTrash = msg_id => {
  * @date   : 2024-02-20 09:38
  */
 export const getQrCode = uuid => {
-  return request(`oauth-server/oauth/qrcode?uuid=${uuid}`)
-  // return request('oauth-server/oauth/qrcode', {
-  //   uuid: uuid
-  // })
+  // return request(`oauth-server/oauth/qrcode?uuid=${uuid}`)
+  return request('oauth-server/oauth/qrcode', {
+    uuid: uuid
+  })
 }
 
 /**

src/config/index.js

@@ -605,8 +605,9 @@ export default {
     'order_out': '销售单',
     'order_return': '销售退货',
     'cus_receipt': '客户收款',
-    entry: '入库单',
+    inbound: '入库单',
     out: '出库单',
+    return :'退货单',
     'ivt_transfer': '库存调整',
     'ivt_freeze': '库存冻结',
     'ivt_check': '库存盘点',