真机调试优化

src/pages/login/login/index.vue

@@ -21,7 +21,7 @@
           class="input"
           @keyup.enter="EnterPress"
           v-model="form.username"
-          :placeholder="$t('message.PleaseInputUserName')"
+          placeholder="请输入账号"
           placeholder-style="color: rgba(255, 255, 255, 0.36)"
           :custom-style="{
             height: '88rpx',
@@ -48,7 +48,7 @@
           class="input"
           @keyup.enter="EnterPress"
           v-model="form.password"
-          :placeholder="$t('message.PleaseInputPassword')"
+          placeholder="请输入密码"
           type="password"
           placeholder-style="color: rgba(255, 255, 255, 0.36)"
           :custom-style="{

src/pages/mes/PalletChange/index.vue

@@ -12,20 +12,20 @@
       <view class="single">
         <view class="single-left">
           <view>rfid:</view>
-          <u-search placeholder="请扫描" v-model="orderNo" :show-action="false"></u-search>
+          <u-search placeholder="请扫描" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
         </view>
         <!-- <view class="single-right">
           <u-button type="primary" @click="query">提交</u-button>
         </view> -->
       </view>
-      <u-form-item label="托盘码">
+      <u-form-item label="托盘码：">
         <u-search placeholder="请扫描托盘码" v-model="location" :show-action="false"></u-search>
       </u-form-item>
       <u-form-item>
         <choose-one @switchfunction="switchChangeFun" :switchType="'text'" :defaultColor="'#4A72F9'" :highColor="'#FFFFFF'" :defaultValue="locationStatus" :switchList="switchListText"></choose-one>
       </u-form-item>
-      <u-form-item>
+      <u-form-item label="缓存区：">
-        <jPicker sureColor="#ff0000" @bindpicker="selectProductCode" showKey="label" valKey="value" :val="productCodeList.value" :options="model.DictList" />
+        <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductCode" showKey="label" valKey="value" :val="productCodeList.value" :options="model.DictList" />
       </u-form-item>
     </u-form>
     <view class="bottom-bar">
@@ -58,6 +58,9 @@ import jPicker from '@/components/J-Picker/jPicker.vue';
 })
 export default class PalletChange extends BasePage {
   model = model;
+  moren = '选择缓存区';
+  shouciFocus = true;
+  zaiciFocus = false;
   switchListText = [
     {
       title: '置为正常',
@@ -79,7 +82,7 @@ export default class PalletChange extends BasePage {
   // }
   orderNo: any = '';
   location: any = '';
-  locationStatus: any = 1;
+  locationStatus: any = -1;
   generateGUID() {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
       var r = (Math.random() * 16) | 0,
@@ -110,13 +113,24 @@ export default class PalletChange extends BasePage {
       reqTime: formattedDate,
       location: this.location,
       locationStatus: this.locationStatus,
-      productionState: '2', //this.productCodeList.value,
+      productionState: this.productCodeList.value,
     };
     await this.model.palletInforUpdate(params);
     if (model.SubmitCode == 10) {
       this.uni.showToast({ title: '成功' });
+      this.Clear();
     }
   }
+  Clear() {
+    this.orderNo = '';
+    this.location = '';
+    this.locationStatus = -1;
+    this.productCodeList = {};
+    this.shouciFocus = false;
+    this.$nextTick(() => {
+      this.shouciFocus = true;
+    });
+  }
   switchChangeFun(e) {
     //console.log(e);
     this.locationStatus = e.swithcSelectItem.value;

src/pages/mes/PalletChange/model.ts

@@ -7,7 +7,7 @@ import { session } from '@/store/modules/session';
   namespaced: true,
   dynamic: true,
   store,
-  name: 'page.raw.ingoods.SpareInbound.sparePartsShelves',
+  name: 'page.mes.PalletChange',
 })
 export class PalletChange extends VuexModule {
   orderNoItemList: any = [];

src/pages/mes/ProductionQtyInsp/index.vue

@@ -12,10 +12,10 @@
       <view class="single">
         <view class="single-left">
           <view>rfid:</view>
-          <u-search placeholder="请扫描" v-model="orderNo" @search="query" :show-action="false"></u-search>
+          <u-search placeholder="请扫描" :focus="shouciFocus" v-model="orderNo" @search="query" :show-action="false"></u-search>
         </view>
         <view class="single-right">
-          <u-button type="primary" @click="query">扫描</u-button>
+          <u-button type="primary" @click="query">查询</u-button>
         </view>
       </view>
       <!-- 物料编码 -->
@@ -40,10 +40,10 @@
       </u-form-item>
       <!-- 工单 -->
       <u-form-item label="工单">
-        <u-input :disabled="true" v-model="model.orderNoItemList.workorderName" placeholder="" />
+        <u-input :disabled="true" v-model="model.orderNoItemList.workorderCode" placeholder="" />
       </u-form-item>
-      <u-form-item>
+      <u-form-item label="缓存区">
-        <jPicker sureColor="#ff0000" @bindpicker="selectProductLOC" showKey="label" valKey="value" :val="productLocList.value" :options="model.DictList" />
+        <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductLOC" showKey="label" valKey="value" :val="productLocList.value" :options="model.DictList" />
       </u-form-item>
       <!-- 是否合格 -->
       <u-form-item label="是否合格">
@@ -108,6 +108,8 @@ import { session } from '@/store/modules/session';
 })
 export default class productCheckReceipt extends BasePage {
   model = model;
+  moren = '选择缓存区';
+  shouciFocus = true;
   // remove: any = {};
   // async onReady() {
   //   await this.model.queryLocation();
@@ -173,7 +175,8 @@ export default class productCheckReceipt extends BasePage {
         let imgUrlList: any = res.tempFilePaths;
         tempFilePaths.map((item, index) => {
           uni.uploadFile({
-            url: '/api/dev-api/file/upload',
+            url: 'http://192.168.202.20:9000/prod-api/file/upload',
+            //url: '/dev-api/file/upload',
             fileType: 'image',
             filePath: item,
             header: {
@@ -288,13 +291,22 @@ export default class productCheckReceipt extends BasePage {
       fileId: this.imgList.join(','),
     };
     await this.model.OnSubmit(params);
-    if (this.model.SubmitCode == '1') {
+    if (this.model.SubmitCode == 200) {
-      this.customToast('质检成功！');
+      // this.customToast('质检成功！');
+      this.uni.showToast({ title: '质检成功' });
       this.orderNo = '';
       this.badMeg = '';
       this.productCodeList = {};
+      this.productLocList = {};
+      this.imgUrlList = [];
+      this.imgList = [];
       this.model.empty();
-      await this.query();
+      this.shouciFocus = false;
+      this.$nextTick(() => {
+        this.shouciFocus = true;
+      });
+
+      //await this.query();
     }
   }
 }

src/pages/mes/ProductionQtyInsp/listdata.vue

@@ -36,7 +36,7 @@ import model from './model';
     jPicker,
   },
 })
-export default class productCheckReceipt extends BasePage {
+export default class ProductionQtyInsplist extends BasePage {
   model = model;
   rowdata: any = {};
   headers = [
@@ -90,7 +90,7 @@ export default class productCheckReceipt extends BasePage {
   // selectItem(e: any) {
   //   this.remove = e.pickerName;
   // }
-  onLoad() {
+  onShow() {
     this.query();
   }
   changeContent(e) {
@@ -116,9 +116,10 @@ export default class productCheckReceipt extends BasePage {
     }
   }
   async query() {
-    this.tableData = [];
+    //this.tableData = [];
     await this.model.queryhandChecklist();
-    this.tableData = model.Checklist.rows;
+    //console.log('1234567', this.model.Checklist);
+    this.tableData = this.model.Checklist;
     this.tableData.map((item, index) => {
       item.index = index + 1;
     });

src/pages/mes/ProductionQtyInsp/model.ts

@@ -7,12 +7,12 @@ import { session } from '@/store/modules/session';
   namespaced: true,
   dynamic: true,
   store,
-  name: 'page.raw.ingoods.SpareInbound.sparePartsShelves',
+  name: 'page.mes.ProductionQtyInsp',
 })
-export class wholeTransfer extends VuexModule {
+export class ProductionQtyInsp extends VuexModule {
   rowdata: any;
   WlList = [];
-  Checklist: any = [];
+  // Checklist: any;
   orderNoItemList: any = [];
   productCodeList: any = [];
   @MutationAction
@@ -27,17 +27,19 @@ export class wholeTransfer extends VuexModule {
     const orderNoItemList = result.data;
     return { orderNoItemList };
   }
+  Checklist: any = [];
   @MutationAction
   async queryhandChecklist() {
     const result: any = await http.get(url.lanjumes.product.queryhandChecklist, {
       //loginName: session.loginName,
       params: {
         factoryCode: session.FactoryCode,
-        createBy: session.user?.createBy,
+        createBy: session.user?.loginName,
       },
     });
-    const Checklist = result;
+    const Checklist: any = result.rows;
     console.log('this.tableData', Checklist);
+    // debugger
     return { Checklist };
   }
   SubmitCode: any = '';
@@ -77,4 +79,4 @@ export class wholeTransfer extends VuexModule {
   }
 }
 
-export default getModule(wholeTransfer);
+export default getModule(ProductionQtyInsp);

src/utils/url.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const qianzhuione = '/prod-api'; // '/dev-api'开发环境
+const qianzhuione = '/prod-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
 export const url = {
   wmspda: {
     system: {

vue.config.js

@@ -10,8 +10,8 @@ module.exports = {
         // },
       },
       '/dev-api': {
-        //target: 'http://192.168.3.93:81',
+        target: 'http://192.168.3.93:81',
-        target: 'http://192.168.202.20:9000',
+        //target: 'http://192.168.202.20:9000',
         changeOrigin: true,
         // pathRewrite: {
         //   '^/dev-api': '',