生产质检优化

src/components/J-Picker/jPicker.vue

@@ -19,7 +19,7 @@
           </view>
         </view>
         <view class="pickerTop">
-          <view class="lefBtn" @click="cancelSel">{{ $t('message.product_Cancel') }} </view>
+          <view class="lefBtn" @click="cancelSel">取消 </view>
           <view class="midInput">
             <template v-if="searchPosition == 'middle'">
               <input class="searchArea" :focus="focus" @input="filterOp" />
@@ -27,7 +27,7 @@
               <icon class="searchIcon" type="search" />
             </template>
           </view>
-          <view class="rigBtn" @click="sureSelect">{{ $t('message.workArea_Confirm') }} </view>
+          <view class="rigBtn" @click="sureSelect">确定 </view>
         </view>
         <picker-view :value="[nSel]" class="pickerView" :mask-style="'background-color:' + bgColor" :indicator-style="selStyle" @change="selChange">
           <picker-view-column>

src/pages/login/area/model.ts

@@ -32,6 +32,7 @@ class AreaService extends VuexModule {
         factoryname: area.parkName,
         value: area.poolName.split('_')[1],
         label: area.parkName,
+        poolName: area.poolName,
       }));
     } else {
       return [];

src/pages/login/login/index.vue

@@ -75,7 +75,7 @@
       hover-class="button-hover"
       type="primary"
       @click="login"
-      >login</u-button
+      >登录</u-button
     >
     <alerts />
   </view>

src/pages/mes/ProductionQtyInsp/detail.vue

@@ -43,7 +43,7 @@
       </u-form-item>
       <!-- 工单 -->
       <u-form-item label="工单">
-        <u-input :disabled="true" v-model="model.rowdata.workorderName" placeholder="" />
+        <u-input :disabled="true" v-model="model.rowdata.workorderCode" placeholder="" />
       </u-form-item>
       <!-- 是否合格 -->
       <u-form-item label="是否合格">
@@ -52,7 +52,7 @@
       </u-form-item>
       <!-- 不良描述 -->
       <u-form-item label="不良描述">
-        <u-input v-model="model.rowdata.badMeg" placeholder="" type="textarea" :border="border" :height="height" :auto-height="autoHeight" />
+        <u-input :disabled="true" v-model="model.rowdata.badMeg" placeholder="" type="textarea" :border="border" :height="height" :auto-height="autoHeight" />
       </u-form-item>
       <view class="boxtitle">照片</view>
       <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">

src/pages/mes/ProductionQtyInsp/index.vue

@@ -166,7 +166,7 @@ export default class productCheckReceipt extends BasePage {
             fileType: 'image',
             filePath: item,
             header: {
-              Authorization: 'Bearer ' + session.user.access_token,
+              Authorization: 'Bearer ' + session.user?.access_token,
               // 'cosmo-env-sitecode': this.$store.state.siteCode
             },
             name: 'file',
@@ -234,7 +234,7 @@ export default class productCheckReceipt extends BasePage {
     console.log('tupian', this.imgList.join(','));
     let params = {
       rfid: this.orderNo,
-      factoryCode: session.FactoryCode.factoryCode,
+      factoryCode: session.FactoryCode,
       orderCode: model.orderNoItemList.orderCode,
       workorderCode: model.orderNoItemList.workorderCode,
       machineCode: model.orderNoItemList.machineCode,

src/pages/mes/ProductionQtyInsp/listdata.vue

@@ -94,8 +94,8 @@ export default class productCheckReceipt extends BasePage {
     this.query();
   }
   changeContent(e) {
-    console.log('eee', e.data);
-    this.rowdata = e.data[0].lineData;
+    //console.log('eee', e.data);
+    this.rowdata = e.data[0]?.lineData;
     // uni.$emit('changeContent',e);
   }
   gozhijian() {
@@ -105,12 +105,16 @@ export default class productCheckReceipt extends BasePage {
   }
   goxiangxi() {
     //debugger
-    console.log('xssss',this.rowdata);
+    //console.log('xssss',this.rowdata);
+    if (JSON.stringify(this.rowdata) === '{}' || this.rowdata === undefined) {
+      this.customToast('请选择一行进行查看');
+    } else {
       this.model.rowdata = this.rowdata;
       this.uni.navigateTo({
         url: this.page.mes.ProductionQtyInspDetail,
       });
     }
+  }
   async query() {
     this.tableData = [];
     await this.model.queryhandChecklist();

src/pages/mes/ProductionQtyInsp/model.ts

@@ -33,7 +33,7 @@ export class wholeTransfer extends VuexModule {
     const result: any = await http.get(url.lanjumes.product.getInfoByRfid, {
       //loginName: session.loginName,
       params: {
-        factoryCode: session.FactoryCode.factoryCode,
+        factoryCode: session.FactoryCode,
         rfid: orderNo,
       },
     });
@@ -45,8 +45,8 @@ export class wholeTransfer extends VuexModule {
     const result: any = await http.get(url.lanjumes.product.queryhandChecklist, {
       //loginName: session.loginName,
       params: {
-        factoryCode: session.FactoryCode.factoryCode,
-        createBy: session.user.createBy,
+        factoryCode: session.FactoryCode,
+        createBy: session.user?.createBy,
       },
     });
     const Checklist = result;

src/pages/shouye/index.vue

@@ -92,11 +92,13 @@ export default class RawHome extends BasePage {
   selectProductCode(e: any) {
     this.factoryList = e.pickerName;
     const factory: string = this.factoryList.factory;
+    const poolName: string = this.factoryList.poolName;
     console.log('ccccc', this.factoryList);
-    session.setfactoryCode({
+    session.setFactory({
       factoryCode: factory,
+      poolName: poolName,
     });
-    console.log('gongchang', session.FactoryCode);
+    console.log('gongchang', session.factory);
   }
 }
 </script>

src/store/modules/session.ts

@@ -16,6 +16,10 @@ export interface User {
   poolNameList?: Array<Area>;
   createBy: string;
 }
+export interface FactoryCode {
+  factoryCode?: string;
+  poolName?: string;
+}
 
 @Module({
   dynamic: true,
@@ -28,6 +32,7 @@ class SessionService extends VuexModule {
    * 当前登录用户
    */
   user: User | null = null;
+  factory: FactoryCode | null = null;
   factoryCode: string;
   //factoryCode: factoryCode | null = null;
   Version = '';
@@ -85,10 +90,17 @@ class SessionService extends VuexModule {
   }
 
   get FactoryCode(): any {
-    if (this.factoryCode === null) {
+    if (this.factory === null) {
       return null;
     } else {
-      return this.factoryCode;
+      return this.factory.factoryCode;
+    }
+  }
+  get PoolName(): any {
+    if (this.factory === null) {
+      return null;
+    } else {
+      return this.factory.poolName;
     }
   }
   /**
@@ -141,6 +153,13 @@ class SessionService extends VuexModule {
       return this.user;
     }
   }
+  get getFactory(): FactoryCode {
+    if (this.factory === null) {
+      throw new Error('当前无选择工厂');
+    } else {
+      return this.factory;
+    }
+  }
 
   // 登录
   @Action({ rawError: true })
@@ -175,8 +194,8 @@ class SessionService extends VuexModule {
     this.user = user;
   }
   @Mutation
-  setfactoryCode(factoryCode): void {
-    this.factoryCode = factoryCode;
+  setFactory(factory: FactoryCode): void {
+    this.factory = factory;
   }
 
   // 保存工作区信息