成品移库优化 查询明细优化

src/pages/product/outbound/stoOutbound/DN-delivergoods.vue

@@ -12,6 +12,7 @@
       <u-form-item :required="true" :label="$t('message.dn_OddNumbers')" prop="orderNo">
         <u-search :placeholder="$t('message.Commission_tips1')" v-model="form.orderNo" @search="query" :show-action="false"></u-search>
       </u-form-item>
+      <!-- 单据总数 -->
       <u-form-item :label="$t('message.product_TotalNumber')">
         <u-input v-model="model.orderInInfo.stoAmount" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
@@ -20,6 +21,7 @@
         <u-input v-model="form.rowItem" type="select" @click="materialCodeSelect = true" :placeholder="$t('message.po_PleaseInput')" />
         <u-select :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="materialCodeSelect" :list="model.materielList" @confirm="materialConfirm"></u-select>
       </u-form-item>
+      <!-- 成品描述 -->
       <u-form-item :label="$t('message.product_FGDes')">
         <u-input :disabled="true" v-model="form.productDescZh" placeholder="" />
       </u-form-item>
@@ -27,10 +29,11 @@
       <u-form-item :label="$t('message.product_FGCode')">
         <u-input :disabled="true" v-model="form.productCode" placeholder="" />
       </u-form-item>
+      <!-- 物料总数 -->
       <u-row gutter="0">
         <u-col :span="6">
           <u-form-item :label="$t('message.product_MaterilTotalNumber')">
-            <u-input v-model="form.orderAmount" :placeholder="$t('message.po_PleaseInput')" />
+            <u-input v-model="form.orderAmount" :disabled="true" />
           </u-form-item>
         </u-col>
         <u-col :span="6">

src/pages/product/warehouse/wholeTransfer/Local-details.vue

@@ -9,7 +9,7 @@
     </view>
     <u-form class="form" ref="form" style="padding-left: 30px" label-width="180rpx">
       <u-form-item :label="$t('message.Transfer')">
-        <u-input v-model="cpRef4" placeholder="" class="Transfer" />
+        <u-input v-model="model.userDefined4" placeholder="" class="Transfer" />
         <u-button type="primary" style="height: 60rpx; margin-left: 20rpx" @click="generate">{{ $t('message.Query') }}</u-button>
       </u-form-item>
     </u-form>
@@ -28,10 +28,12 @@ import model from './model';
 export default class RawReceiptDetail extends BasePage {
   model = model;
   headers = Headers;
-  cpRef4: any = '';
   detailedList: any = [];
+  onReady() {
+    this.generate();
+  }
   async generate() {
-    if (this.cpRef4 == '') {
+    if (model.userDefined4 == '') {
       uni.showToast({
         icon: 'none',
         title: this.$t('message._tips6') as any,
@@ -41,7 +43,7 @@ export default class RawReceiptDetail extends BasePage {
     let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
     let content = {
       loginName: person.session.user.loginName,
-      cpRef4: this.cpRef4,
+      cpRef4: model.userDefined4,
     };
     await this.model.querydetaildlist(content);
     let arr = this.model.detailedList;

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

@@ -73,9 +73,7 @@ interface OptionType {
   },
 })
 export default class productCheckReceipt extends BasePage {
-  /**
+  //表单引用
-   * 表单引用
-   */
   @Ref('form') readonly $form!: VForm;
   model = model;
   form = {
@@ -86,13 +84,9 @@ export default class productCheckReceipt extends BasePage {
   cboPlaceSelect = false;
   rules: VFormRules<any> = {
     documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }],
-    // originWl: [{ required: true, message: '请选择库位地点' }],
     aimWl: [{ required: true, message: this.$t('message.Warehouse_Tip3') as string }],
     cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }],
   };
-  // back() {
-  //   uni.navigateBack({ delta: 1 });
-  // }
   value = '';
   show = false;
   //选择目标库位回调函数
@@ -120,6 +114,7 @@ export default class productCheckReceipt extends BasePage {
   onReady() {
     this.$form.setRules(this.rules);
     this.model.queryLocation();
+    this.model.empty();
   }
   //点击生成随机移库码
   async generate() {
@@ -134,7 +129,7 @@ export default class productCheckReceipt extends BasePage {
   }
   //移库确认
   onSubmit() {
-    this.$form.validate((valid: boolean) => {
+    this.$form.validate(async (valid: boolean) => {
       if (!valid) return;
       if (model.userDefined4 == ' ' || model.userDefined4.length == 0) {
         uni.showToast({
@@ -177,7 +172,18 @@ export default class productCheckReceipt extends BasePage {
           userDefined4: model.userDefined4,
         },
       ];
-      this.model.onTakeoutConfirm(orderlist);
+      await this.model.onTakeoutConfirm(orderlist);
+      if (model.code == '1') {
+        uni.showToast({
+          icon: 'none',
+          title: this.$t('message.Warehouse_Tip9') as string,
+        });
+        this.form.productCode = '';
+        model.empty();
+        setTimeout(() => {
+          this.toPage(this.page.product.warehouse.wholeTransfer.index);
+        }, 2000);
+      }
     });
   }
 }

src/pages/product/warehouse/wholeTransfer/model.ts

@@ -108,19 +108,16 @@ export class wholeTransfer extends VuexModule {
   @MutationAction
   async empty() {
     const orderInInfo: any = [];
-    return { orderInInfo };
+    const userDefined4 = '';
+    const WlList = [];
+    const code = '';
+    return { orderInInfo, userDefined4, WlList, code };
   }
   @MutationAction
   async onTakeoutConfirm(list: any) {
     const records: any = await http.post(url.warehouse.rowTransfer.commit, list);
-    if (records.code == 1) {
+    const code = records.code;
-      uni.showToast({
+    return { code };
-        icon: 'success',
-        title: 'success',
-      });
-      // uni.navigateTo({ url: page.product.warehouse.index });
-    }
-    return {};
   }
   //生成移库码
   @MutationAction