Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app

.gitignore

@@ -15,7 +15,6 @@ yarn-error.log*
 # Editor directories and files
 .project
 .idea
-.vscode
 *.suo
 *.ntvs*
 *.njsproj

.vscode/settings.json

@@ -0,0 +1,85 @@
+{
+  "i18n-ally.localesPaths": ["src/i18n", "src/i18n/lang"],
+  "i18n-ally.displayLanguage": "zh",
+  "workbench.iconTheme": "material-icon-theme",
+  "git.enableSmartCommit": true,
+  "git.autofetch": true,
+  "files.associations": {
+    "*.js": "javascriptreact",
+    "*.cjson": "jsonc",
+    "*.wxss": "css",
+    "*.wxs": "javascript",
+    "*.ejs": "plaintext"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[vue]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[html]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  //   代码格式化
+
+  "editor.fontSize": 12,
+  "editor.tabSize": 2,
+  "editor.codeActionsOnSave": {
+    "source.fixAll": false
+  },
+  "editor.formatOnSave": false,
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "window.zoomLevel": 0,
+  "liveServer.settings.donotShowInfoMsg": true,
+  "javascript.updateImportsOnFileMove.enabled": "always",
+  "editor.detectIndentation": false,
+  "explorer.confirmDelete": false,
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  // 头部注释
+  "fileheader.customMade": {
+    // 头部注释默认字段
+    "Author": "zhou lei",
+    "Date": "Do not edit", // 设置后默认设置文件生成时间
+    "LastEditTime": "Do not edit", // 设置后，保存文件更改默认更新最后编辑时间
+    "LastEditors": "zhou lei", // 设置后，保存文件更改默认更新最后编辑人
+    "Description": "",
+    "FilePath": "Do not edit", // 设置后，默认生成文件相对于项目的路径
+    "custom_string_obkoro1": "联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司"
+  },
+  "[css]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "editor.quickSuggestions": {
+    "strings": true
+  },
+  "emmet.includeLanguages": {
+    "wxml": "html",
+    "vue-html": "html"
+  },
+  "emmet.syntaxProfiles": {
+    "postcss": "css"
+  },
+  "emmet.triggerExpansionOnTab": true,
+  "tailwindCSS.emmetCompletions": true,
+  "tailwindCSS.validate": true,
+  "minapp-vscode.disableAutoConfig": true,
+  "[scss]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "liveServer.settings.donotVerifyTags": true,
+  "diffEditor.ignoreTrimWhitespace": false,
+  "redhat.telemetry.enabled": true,
+  "gitlens.advanced.messages": {
+    "suppressGitMissingWarning": true
+  }
+}

src/main.ts

@@ -1,3 +1,12 @@
+/*
+ * @Author: zhou lei
+ * @Date: 2021-11-08 12:10:26
+ * @LastEditTime: 2022-01-21 09:16:58
+ * @LastEditors: zhou lei
+ * @Description: 
+ * @FilePath: /wms_haiwai_app/src/main.ts
+ * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
+ */
 import Vue from 'vue';
 import uView from 'uview-ui';
 import i18n from '@/i18n';

src/pages/login/login/index.vue

@@ -11,7 +11,6 @@
       <u-image width="288rpx" height="85rpx" :src="image.global.logo1"></u-image>
       <span>V1.6</span>
     </view>
-
     <u-form class="form" :model="form" ref="form" :border-bottom="false" :error-type="['toast']">
       <u-form-item
         class="form-item"
@@ -33,6 +32,7 @@
             color: 'rgba(255, 255, 255, 0.67)',
           }"
       /></u-form-item>
+
       <u-form-item
         class="form-item"
         prop="password"
@@ -86,8 +86,6 @@ import { session } from '@/store/modules/session';
 import { BasePage } from '@/components/base/page';
 import { VForm } from 'vue/types/form';
 import { Lang } from '@/i18n';
-import { url } from '@/utils/url';
-import { path } from 'lodash/fp';
 // mixin 引入示例目前用于弹窗自定义
 import MyMixins from '@/utils/mixin';
 // import { any } from 'lodash/fp';
@@ -172,8 +170,10 @@ export default class LoginPage extends BasePage {
                 //uni.hideLoading();
                 if (downloadResult.statusCode == 200) {
                   //安装更新
-                  plus.runtime.install(downloadResult.tempFilePath, { force: true }, function (res) {
+                  // eslint-disable-next-line no-undef
+                  plus.runtime.install(downloadResult.tempFilePath as any, { force: true }, function () {
                     //uni.showToast('更新成功，重启');
+                    // eslint-disable-next-line no-undef
                     plus.runtime.restart();
                   });
                   // uni.showModal({

src/pages/raw/ingoods/dnReceipt/dnReceiving.vue

@@ -133,7 +133,7 @@ export default class dnReceiptDom extends BasePage {
   requestAmount: number = null;
   //receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0];
   async onReady() {
-    this.model.DNReceivingList = [];
+    // this.model.DNReceivingList = [];
     this.resetForm();
     //this.initLocation();
   }

src/sfc.d.ts

@@ -1,3 +1,13 @@
+/*
+ * @Author: zhou lei
+ * @Date: 2021-11-08 12:10:26
+ * @LastEditTime: 2022-01-21 09:24:11
+ * @LastEditors: zhou lei
+ * @Description:
+ * @FilePath: /wms_haiwai_app/src/sfc.d.ts
+ * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
+ */
+// 1. 确保在声明补充的类型之前导入 'vue'
 declare module '*.vue' {
   import Vue from 'vue';
   export default Vue;

types/vue-prototype.d.ts

@@ -0,0 +1,25 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/*
+ * @Author: zhou lei
+ * @Date: 2022-01-21 09:23:56
+ * @LastEditTime: 2022-01-21 09:34:15
+ * @LastEditors: zhou lei
+ * @Description:
+ * @FilePath: /wms_haiwai_app/types/vue-prototype.d.ts
+ * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
+ */
+import Vue from 'vue';
+//    在 types/vue.d.ts 里 Vue 有构造函数类型
+declare module 'vue/types/vue' {
+  interface Vue {
+    // $myProperty: string;
+    /**
+     * 自定义弹窗提示
+     * @param {string} msg 消息
+     * @param {string} [type='toast'] 类型
+     * @param {string} [title=''] 标题
+     * @memberof Vue
+     */
+    customToast(msg: string, type?: string = 'toast', title?: string = ''): void;
+  }
+}