Merge remote-tracking branch 'origin/master' into master

src/pages/login/login/index.vue

@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.184'; //正式版本号
+  version = '0.0.186'; //正式版本号
   //version = '0.0.14'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;

src/pages/login/login/model.ts

@@ -13,7 +13,7 @@ export class login extends VuexModule {
   checkversion: any = {};
   @MutationAction
   async checkupdate() {
-    const result: any = await http.post('/prod-api/system/apkFile/getLastApkVersion', {
+    const result: any = await http.post('/dev-api/system/apkFile/getLastApkVersion', {
       factory: 1000,
     });
     const checkversion: any = result.data;

src/pages/quality/Materialinspection/index.vue

@@ -593,6 +593,7 @@ export default class PurchaseWHSRM extends BasePage {
     cxzz: null,
     jgy: null,
     pgy: null,
+    attr3: null,
   };
   isvalue = false;
   isvalue2 = false;
@@ -1347,9 +1348,9 @@ export default class PurchaseWHSRM extends BasePage {
       //   return;
       // }
       if (this.formdata.checkResult == 'N') {
-        if (this.formdata.remark === null || this.formdata.remark === '') {
+        if (this.formdata.attr3 === null || this.formdata.attr3 === '') {
           (this.$refs.uToast as any).show({
-            title: '不合格描述不能为空',
+            title: '备注描述不能为空',
             type: 'default',
           });
           return;

src/pages/shouye/model.ts

@@ -13,7 +13,7 @@ export class shouye extends VuexModule {
   checkversion: any = {};
   @MutationAction
   async checkupdate() {
-    const result: any = await http.post('/prod-api/system/apkFile/getLastApkVersion', {
+    const result: any = await http.post('/dev-api/system/apkFile/getLastApkVersion', {
       factory: 1000,
     });
     const checkversion: any = result.data;

src/pages/wms/Raw/ArrivalRegistration/index.vue

@@ -83,6 +83,10 @@
             <view class="pouptitle">登记数量：</view>
             <u-input class="poupcontent" :clearable="false" v-model="czNumber" placeholder="" style="overflow: hidden" />
           </view>
+          <!--          <view class="poupitem">-->
+          <!--            <view class="pouptitle">托盘号：</view>-->
+          <!--            <u-input class="poupcontent" :clearable="false" v-model="rfidCode" placeholder="" style="overflow: hidden" />-->
+          <!--          </view>-->
           <view class="poupbutton" style="margin-top: 10px">
             <div>
               <u-button style="width: 100px; height: 35px" @click="onOksing" size="mini" type="primary">确定</u-button>
@@ -120,6 +124,7 @@ export default class ArrivalRegistration extends BasePage {
   operationNumber = 0;
   nooperationNumber = 0;
   czNumber = '';
+  rfidCode = '';
   whList: any = [];
   waCodeList: any = [];
   show = false;
@@ -190,6 +195,7 @@ export default class ArrivalRegistration extends BasePage {
     this.operationNumber = 0;
     this.nooperationNumber = 0;
     this.czNumber = '';
+    this.rfidCode = '';
   }
   // async onFormDoubleClick(item) {
   //   console.log('双击', item);
@@ -407,6 +413,7 @@ export default class ArrivalRegistration extends BasePage {
       procureCode: this.prodobj.value,
       id: this.list[0].id,
       czNumber: this.czNumber,
+      rfidCode: this.rfidCode,
       lastUpdateBy: session.loginName,
     };
     //console.log('99999',params);

src/utils/request.ts

@@ -25,16 +25,16 @@ http.interceptors.request.use(
     config.timeout = 1000 * 60 * 60;
     //console.log('123456',config)
     //生产请将注释解开重要重要
-    if (config.url.includes('/api')) {
-      config.baseURL = 'http://192.168.202.23:5001';
-    } else if (config.url.includes('http')) {
-      //直接使用写死地址
-    } else {
-      config.baseURL = 'http://192.168.202.34:30000'; //正式
-      // config.baseURL = 'http://192.168.202.20:9000'//测试
-      //'http://192.168.202.20:9000' ///测试
-      //'http://192.168.202.34:30000'; //正式
-    }
+    // if (config.url.includes('/api')) {
+    //   config.baseURL = 'http://192.168.202.23:5001';
+    // } else if (config.url.includes('http')) {
+    //   //直接使用写死地址
+    // } else {
+    //   config.baseURL = 'http://192.168.202.34:30000'; //正式
+    //   // config.baseURL = 'http://192.168.202.20:9000'//测试
+    //   //'http://192.168.202.20:9000' ///测试
+    //   //'http://192.168.202.34:30000'; //正式
+    // }
     // 所有请求默认提示加载中
     if (config.url == '/prod-api/quality/handCheck/commitCheckResultsCg') {
       loading = undefined;

src/utils/url.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-// const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
-const qianzhuione = '/prod-api';
+const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
+// const qianzhuione = '/prod-api';
 export const url = {
   wmspda: {
     system: {
@@ -393,6 +393,6 @@ export const url = {
       getCheckBpList: qianzhuione + '/quality/checkBp/checkBpList',
       getQcDefectTypeClassList: qianzhuione + '/quality/defectClass/list',
       submitCheckResult: qianzhuione + '/quality/checkBp/submitCheckResult',
-    }
+    },
   },
 };

vue.config.js

@@ -4,18 +4,16 @@ module.exports = {
       '/prod-api': {
         //正式生产
         target: 'http://192.168.202.34:30000',
-        //测试生产
-        //target: 'http://192.168.202.20:9000',
         changeOrigin: true,
-        // pathRewrite: {
-        //   '^/prod-ap': '',
-        // },
+        pathRewrite: {
+          '^/prod-api': '',
+        },
       },
       '/dev-api': {
         //target: 'http://192.168.3.63:8080',
         // target: 'http://192.168.3.66:8080',
-        target: 'http://192.168.3.231:8080', //贵迎
-        //target: 'http://192.168.3.158:8080',
+        // target: 'http://172.18.80.120:8080', //贵迎
+        target: 'http://192.168.0.10:8080',
         changeOrigin: true,
         pathRewrite: {
           '^/dev-api': '',