cosmoim-852 fix 俄罗斯原材料判废，半成品盘点修改

src/i18n/lang/cn.ts

@@ -552,5 +552,8 @@ export default {
     Notcompleted: '物料没有收货完成',
     ScrapLocation: '报废位置',
     Pleaseoption: '请输入供应商(选填)',
+    Reasoncode: '原因编码',
+    Reasonname: '原因名称',
+    responsiblepersonname: '责任人名称',
   },
 };

src/i18n/lang/en.ts

@@ -551,5 +551,8 @@ export default {
     Notcompleted: 'material has not been received',
     ScrapLocation: 'Scrap location',
     Pleaseoption: 'Please enter the supplier (optional)',
+    Reasoncode: 'Reason code',
+    Reasonname: 'Reason name',
+    responsiblepersonname: 'Name of responsible person',
   },
 };

src/i18n/lang/ru.ts

@@ -551,5 +551,8 @@ export default {
     Notcompleted: 'Материалы пока не получены',
     ScrapLocation: 'участок списания',
     Pleaseoption: 'Пожалуйста, введите поставщика (заполните)',
+    Reasoncode: 'Код причины',
+    Reasonname: 'Причина называется',
+    responsiblepersonname: 'Имя ответственного лица',
   },
 };

src/pages/login/login/index.vue

@@ -171,7 +171,7 @@ export default class LoginPage extends BasePage {
     console.log('......', server.serverAddress);
     if (server.serverAddress.includes('https://eurmom.haier.net')) {
       //修改俄罗斯版本号
-      this.Version = '1.1.29';
+      this.Version = '1.1.30';
     } else {
       this.Version = '1.0.49';
     }

src/pages/raw/LineSide/rawWasteJudgment/index.vue

@@ -26,13 +26,23 @@
       <u-form-item :required="!isavailable" :label="$t('message.Container')" prop="productCode">
         <u-search :disabled="isavailable" :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.productCode" @search="query" :show-action="false"></u-search>
       </u-form-item>
-      <!-- 原因 -->
-      <u-form-item :required="true" :label="$t('message.reason1')">
-        <u-input v-model="histroyItem.reason" :required="true" :placeholder="$t('message.po_PleaseInput')" />
+      <!-- 原因编码 -->
+      <u-form-item :required="true" :label="$t('message.Reasoncode')">
+        <u-search placeholder="" v-model="histroyItem.reason" @search="queryreason" :show-action="false"></u-search>
+        <!-- <u-input v-model="histroyItem.reason" :required="true" :placeholder="$t('message.po_PleaseInput')" /> -->
+      </u-form-item>
+      <!-- 原因名称 -->
+      <u-form-item :required="true" :label="$t('message.Reasonname')">
+        <u-input :disabled="true" v-model="reasonList.dicName" placeholder="" style="overflow: hidden" />
       </u-form-item>
       <!-- 责任人 -->
       <u-form-item :required="true" :label="$t('message.personLiable')">
-        <u-input v-model="histroyItem.responsibleUser" :required="true" :placeholder="$t('message.po_PleaseInput')" />
+        <!-- <u-input v-model="histroyItem.responsibleUser" :required="true" :placeholder="$t('message.po_PleaseInput')" /> -->
+        <u-search placeholder="" v-model="histroyItem.responsibleUser" @search="querypersonliable" :show-action="false"></u-search>
+      </u-form-item>
+      <!-- 责任人名称 -->
+      <u-form-item :required="true" :label="$t('message.responsiblepersonname')">
+        <u-input :disabled="true" v-model="ProcessList.dicName" placeholder="" style="overflow: hidden" />
       </u-form-item>
       <!-- 供应商 -->
       <u-form-item :label="$t('message.po_Supplier')">
@@ -114,6 +124,8 @@ export default class productCheckReceipt extends BasePage {
   };
   value = '';
   show = false;
+  reasonList: any = {};
+  ProcessList: any = {};
   //选择原库位回调函数
   bookTypeChangeold(e: any) {
     console.log('???', e);
@@ -143,6 +155,36 @@ export default class productCheckReceipt extends BasePage {
   //     }
   //   });
   // }
+  async queryreason() {
+    if (this.histroyItem.reason == '' || this.histroyItem.reason.length == 0) {
+      this.customToast(this.$t('message.Pleasedefects') as string);
+      return;
+    }
+    await this.model.checkDicCode(this.histroyItem.reason);
+    if (this.model.code == '1') {
+      uni.showToast({
+        title: this.$t('message.successful') as string,
+        duration: 2000,
+        image: '/static/icons/icon-51.png',
+      });
+      this.reasonList = this.model.resdata;
+    }
+  }
+  async querypersonliable() {
+    if (this.histroyItem.responsibleUser == '' || this.histroyItem.responsibleUser.length == 0) {
+      this.customToast(this.$t('message.PleaseResponsibleArea') as string);
+      return;
+    }
+    await this.model.checkDicCode(this.histroyItem.responsibleUser);
+    if (this.model.code == '1') {
+      uni.showToast({
+        title: this.$t('message.successful') as string,
+        duration: 2000,
+        image: '/static/icons/icon-51.png',
+      });
+      this.ProcessList = this.model.resdata;
+    }
+  }
   //扫描条码回车
   async query() {
     if (this.form.productCode == ' ' || this.form.productCode.length == 0) {

src/pages/raw/LineSide/rawWasteJudgment/model.ts

@@ -35,6 +35,7 @@ export class rawWasteJudgment extends VuexModule {
   removeMaterialList: any = [];
   dnNo = '';
   orderInInfo: OrderInInfo = new OrderInInfo();
+  resdata: any = {};
   @MutationAction
   async queryLocation() {
     const result: any = await http.get(url.warehouse.wholeTransfer.getMdLocationRawAndLine, {
@@ -141,6 +142,15 @@ export class rawWasteJudgment extends VuexModule {
     });
     return kw;
   }
+  ////
+  //扫描缺陷，责任区域
+  @MutationAction
+  async checkDicCode(params: any) {
+    const res: any = await http.post(url.warehouse.wholeTransfer.checkDicCode, { dicCode: params, factoryCode: session.factoryCode as string, loginName: session.loginName as string });
+    const resdata = res.data;
+    const code = res.code;
+    return { code, resdata };
+  }
 }
 
 export default getModule(rawWasteJudgment);

src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue

@@ -21,7 +21,7 @@
       </u-form-item>
       <!-- 条码 -->
       <u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
-        <u-search :placeholder="$t('message.barcode')" v-model.trim="barcode" @search="onSearchBarcode" :show-action="false"></u-search>
+        <u-search :placeholder="$t('message.barcode')" :focus="isfocus" v-model.trim="barcode" @search="onSearchBarcode" :show-action="false"></u-search>
       </u-form-item>
       <!-- 库位 -->
       <u-form-item :label="$t('message.CommissionedLocation')" prop="spQty">
@@ -88,6 +88,7 @@ export default class rawMaterialInventory extends BasePage {
   wl: any = {};
   barcode: any = '';
   scanreturndata: any = {};
+  isfocus = false;
   // 页面初始化
   onReady() {
     this.empty();
@@ -122,6 +123,10 @@ export default class rawMaterialInventory extends BasePage {
       // this.productItem = this.model.InventoryList[0];
       // this.wl = this.model.InventoryItemList[0];
     }
+    this.isfocus = false;
+    setTimeout(() => {
+      this.isfocus = true;
+    }, 0);
   }
   //选择其中一条物料
   // onchange(e: any) {