Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-app

src/pages/mes/ProductionQtyInsp/index.vue

@@ -314,7 +314,7 @@ export default class productCheckReceipt extends BasePage {
         checkResult: this.productCodeList.value,
       };
       await this.model.sendDestinationStations(params);
-      //this.uni.showToast({ title: '质检成功' });
+      this.uni.showToast({ title: '质检完成' });
       this.orderNo = '';
       this.badMeg = '';
       this.productCodeList = {};

src/pages/mes/ProductionQtyInsp/model.ts

@@ -50,11 +50,12 @@ export class ProductionQtyInsp extends VuexModule {
     return { SubmitCode };
   }
   //烘房出来下发搬运任务
+  SubmitCodeone: any = '';
   @MutationAction
   async sendDestinationStations(params: any) {
     const result: any = await http.post(url.lanjumes.product.sendDestinationStations, params);
-    const SubmitCode = result.code;
-    return { SubmitCode };
+    const SubmitCodeone = result.code;
+    return { SubmitCodeone };
   }
   @MutationAction
   async empty() {

src/pages/shouye/me.vue

@@ -95,7 +95,8 @@ export default class RawHome extends BasePage {
   async checkupdate() {
     try {
       this.checkversion = await model.checkupdate();
-      let versionNumber = this.compareVersion(this.version, this.checkversion.Version);
+      const queryversion = this.checkversion.Version.match(/\d+\.\d+\.\d+/)[0];
+      let versionNumber = this.compareVersion(this.version, queryversion);
       versionNumber = 1;
       if (versionNumber == -1) {
         // 版本更新提示