cosmoim-852 fix sto成品出库样式调整&&报废增加字段

src/i18n/lang/cn.ts

@@ -503,5 +503,10 @@ export default {
     Lineedge_raw_transfer: '线边库原材料移库',
     CostCenter: '成本中心',
     recovery: '回收',
+    personLiable: '责任人',
+    CausesOfDefects: '不良原因',
+    PleaseOne: '请输入责任人',
+    PleaseTwo: '请输入不良原因',
+    ManualOffline: '半成品手动下线',
   },
 };

src/i18n/lang/en.ts

@@ -503,5 +503,10 @@ export default {
     Lineedge_raw_transfer: 'Line edge raw material transfer',
     CostCenter: 'Cost Center',
     recovery: 'recovery',
+    personLiable: 'person liable',
+    CausesOfDefects: 'Causes of defects',
+    PleaseOne: 'Please enter the responsible person',
+    PleaseTwo: 'Please enter the cause of the defect',
+    ManualOffline: 'Manual offline of semi-finished products',
   },
 };

src/i18n/lang/ru.ts

@@ -503,5 +503,10 @@ export default {
     Lineedge_raw_transfer: 'транзитный склад',
     CostCenter: 'центр себестоимости',
     recovery: 'рекуперация',
+    personLiable: 'ответственное лицо',
+    CausesOfDefects: 'нежелательная причина',
+    PleaseOne: 'Введите ответственное лицо',
+    PleaseTwo: 'Введите причину неисправности',
+    ManualOffline: 'ручной спуск полуфабриката',
   },
 };

src/pages/product/STO-Outbound/index.vue

@@ -73,7 +73,7 @@
         </view>
       </view>
       <!-- 扫码 -->
-      <u-form-item :label="$t('message.product_BarCode')">
+      <u-form-item :labelWidth="140" :label="$t('message.product_BarCode')">
         <u-search :placeholder="$t('message.po_PleaseInput')" v-model="barCode" @search="onOk" :focus="firstFocus" :show-action="false"></u-search>
       </u-form-item>
     </view>
@@ -281,11 +281,14 @@ export default class dnReceiptDom extends BasePage {
         display: flex;
 
         view {
-          width: 140rpx;
+          width: 180rpx;
           line-height: 100rpx;
         }
       }
     }
+    .u-form-item--left {
+      width: 130rpx;
+    }
 
     // .material {
     //   width: 100%;
@@ -324,7 +327,7 @@ export default class dnReceiptDom extends BasePage {
         display: flex;
 
         .material-right-title {
-          width: 140rpx;
+          width: 180rpx;
           height: 100%;
           line-height: 100rpx;
         }
@@ -344,12 +347,12 @@ export default class dnReceiptDom extends BasePage {
       display: flex;
 
       .number-left {
-        width: 45%;
+        width: 50%;
         height: 100%;
         display: flex;
 
         .number-left-title {
-          width: 120rpx;
+          width: 150rpx;
           height: 100%;
           line-height: 100rpx;
         }
@@ -363,12 +366,12 @@ export default class dnReceiptDom extends BasePage {
       }
 
       .number-right {
-        width: 55%;
+        width: 50%;
         height: 100%;
         display: flex;
 
         .number-right-title {
-          width: 140rpx;
+          width: 150rpx;
           height: 100%;
           //text-align: center;
           line-height: 100rpx;

src/pages/product/warehouse/wholeScrap/index.vue

@@ -47,6 +47,14 @@
       <u-form-item :label="$t('message.DocumentNumber')">
         <u-input v-model="Some.fileNo" :border="border" :placeholder="$t('message.fileNumber')" />
       </u-form-item>
+      <!-- 责任人 -->
+      <u-form-item :label="$t('message.personLiable')">
+        <u-input v-model="dockCode" :placeholder="$t('message.PleaseOne')" :border="border" />
+      </u-form-item>
+      <!-- 不良原因 -->
+      <u-form-item :label="$t('message.CausesOfDefects')">
+        <u-input v-model="dockName" :placeholder="$t('message.PleaseTwo')" :border="border" />
+      </u-form-item>
       <!-- 已扫 -->
       <u-form-item :label="$t('message.product_Swept')">
         <u-input :disabled="true" v-model="Some.actualQty" placeholder="" />
@@ -102,6 +110,8 @@ export default class productCheckReceipt extends BasePage {
     order3: '',
     barcode: '',
   };
+  dockCode: any = '';
+  dockName: any = '';
   wl: any = {};
   Some: any = {};
   //选择成品编码
@@ -223,6 +233,8 @@ export default class productCheckReceipt extends BasePage {
         aimWl: this.Some.aimWl,
         type: '0',
         orderType: '1',
+        dockCode: this.dockCode,
+        dockName: this.dockName,
         keepBy: session.loginName as string,
         factoryCode: session.factoryCode as string,
         order3: this.form.order3,
@@ -241,6 +253,8 @@ export default class productCheckReceipt extends BasePage {
       this.Some = {};
       this.Some.fileNo = ' ';
       this.wl = {};
+      this.dockCode = '';
+      this.dockName = '';
       // this.form.order3 = '';
       this.form.barcode = '';
       this.query();

src/pages/raw/warehouse/RUS-rowScrap/index.vue

@@ -2,7 +2,7 @@
   <view class="page-kan-dan-index">
     <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
       </view>
       <view class="title">{{ $t('message.RowScrap') }}</view>
       <view class="right"></view>
@@ -72,10 +72,18 @@
       <u-form-item :label="$t('message.product_Number')">
         <u-input v-model="qty" placeholder="" :border="border" type="number" />
       </u-form-item>
+      <!-- 责任人 -->
+      <u-form-item :label="$t('message.personLiable')">
+        <u-input v-model="dockCode" :placeholder="$t('message.PleaseOne')" :border="border" />
+      </u-form-item>
+      <!-- 不良原因 -->
+      <u-form-item :label="$t('message.CausesOfDefects')">
+        <u-input v-model="dockName" :placeholder="$t('message.PleaseTwo')" :border="border" />
+      </u-form-item>
       <wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="RUSdetailHeader" :contents="SubmitOrderlist" :show-vert-border="false" @onCellClick="deleteItem($event)"></wyb-table>
       <u-row class="button-bar">
         <u-col :span="6">
-          <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
+          <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
         </u-col>
         <u-col :span="6">
           <u-button type="primary" @click="submit">{{ $t('message.InventoryFinish') }} </u-button>
@@ -102,6 +110,8 @@ export default class KanDanHandOver extends BasePage {
   model = model;
   border = true;
   wl: any = {};
+  dockCode: any = '';
+  dockName: any = '';
   Some: any = {};
   MaterialList: any = [];
   SubmitOrderlist: any = [];
@@ -186,6 +196,16 @@ export default class KanDanHandOver extends BasePage {
       this.customToast(this.$t('message.scanningContainer') as string);
       return;
     }
+    /////
+    // if (!this.dockCode) {
+    //   this.customToast(this.$t('message.PleaseOne') as string);
+    //   return;
+    // }
+    // if (!this.dockName) {
+    //   this.customToast(this.$t('message.PleaseTwo') as string);
+    //   return;
+    // }
+    //////
     if (parseFloat(this.qty) <= 0) {
       this.customToast(this.$t('message.AppendMateriel2') as string);
       return;
@@ -231,12 +251,16 @@ export default class KanDanHandOver extends BasePage {
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].type = '1';
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].keepBy = session.loginName;
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].orderType = '1';
+    this.SubmitOrderlist[this.SubmitOrderlist.length - 1].dockCode = this.dockCode;
+    this.SubmitOrderlist[this.SubmitOrderlist.length - 1].dockName = this.dockName;
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = this.qty;
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].barCode = this.Container.barcode;
     this.model.orderInInfoList[this.SomeIndex].totalqty += parseFloat(this.qty);
     this.Container = '';
     this.qty = 0;
     this.Barcode = '';
+    this.dockCode = '';
+    this.dockName = '';
   }
   deleteItem(e: any) {
     uni.showModal({
@@ -289,6 +313,8 @@ export default class KanDanHandOver extends BasePage {
       this.Container = '';
       this.SubmitOrderlist = [];
       this.Barcode = '';
+      this.dockCode = '';
+      this.dockName = '';
       this.query();
     }
   }