版本号调整

src/pages/equipment/Repair/repairing.vue

@@ -674,7 +674,6 @@ export default class ChangePalletNew extends BasePage {
     //   this.customToast('请输入nficl');
     //   return;
     // }
-    console.log(this.detailsinfolist, this.isvalue);
     if (this.isvalue) {
       (this.$refs.uToast as any).show({
         title: '检查标准不能为空',
@@ -683,13 +682,7 @@ export default class ChangePalletNew extends BasePage {
       return;
     }
 
-    if (this.formdata.workCost == '' || this.formdata.workCost == undefined) {
-      (this.$refs.uToast as any).show({
-        title: '维修费用不能为空',
-        type: 'default',
-      });
-      return;
-    }
+
     if (this.workReason.value == '' || this.workReason.value == undefined) {
       (this.$refs.uToast as any).show({
         title: '原因分析不能为空',

src/pages/login/login/index.vue

@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.191'; //正式版本号
+  version = '0.0.194'; //正式版本号
   //version = '0.0.14'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;

src/pages/quality/BpCheck/index.vue

@@ -47,7 +47,7 @@
       <u-button type="primary" @click="submit" >提交</u-button>
     </view>
 
-    <u-calendar v-model="showCalendar" :mode="'date'" @change="changeDate"></u-calendar>
+    <u-calendar v-model="showCalendar" :mode="'date'" @change="changeDate" :max-date="maxDate"></u-calendar>
 
     <u-popup id="popup" v-model="showList" mode="center" width="90%" height="60%">
       <scroll-view id="list" scroll-y="true" :style="{ height: listHeight + 'px' }" :lower-threshold="50">
@@ -159,6 +159,7 @@ import {BasePage} from "@/components/base/page";
 import {Component} from "vue-property-decorator";
 import {removeLeadingZeros} from "@/utils/tool";
 import {session} from "@/store/modules/session";
+import { date } from '@/utils/filter';
 
 @Component({
   methods: { removeLeadingZeros },
@@ -171,6 +172,7 @@ import {session} from "@/store/modules/session";
 
 export default class checkBp extends BasePage {
   userinfo: any = uni.getStorageSync('userinfo');
+  maxDate = new Date().getFullYear()+1 + "-" +(new Date().getMonth()+1) + "-" + new Date().getDate()
 
   form = {
     checkDate:undefined,

src/pages/wms/Raw/ProductionREQ/index.vue

@@ -96,10 +96,9 @@
 import { Component } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
 import jPicker from '@/components/J-Picker/jPicker.vue';
-import model, {submitReverseMaterialList} from './model';
+import model, {submitReverseMaterialList,submitTransferMaterialList} from './model';
 import { session } from '@/store/modules/session';
 import LjListRow from "@/components/lanju/lj-list-row/index.vue";
-import {submitTransferMaterialList} from "@/pages/wms/Raw/ProductionREQ2/model";
 interface OptionType {
   label: string;
   value: string;
@@ -364,10 +363,14 @@ export default class ProductionREQ extends BasePage {
     }
 
     const list = []
+    let x = ''
 
     //遍历列表
     //获取需要过账列表与出账列表
     for (const item of this.materilist){
+      if (item.userDefined3 === "X"){
+        x = "x"
+      }
       if (item.isPost + "" === "1"){
         list.push(item)
         continue;
@@ -382,24 +385,45 @@ export default class ProductionREQ extends BasePage {
       factoryCode:session.FactoryCode,
       orderList:list,
     }
+    if (x === "x"){
+      data.userDefined3 = "X"
+      submitReverseMaterialList(data).then(res=>{
+        if (res.code === 200){
+          uni.showToast({
+            title: '操作成功！',
+            mask:true
+          })
 
-    submitReverseMaterialList(data).then(res=>{
-      if (res.code === 200){
-        uni.showToast({
-          title: '操作成功！',
-          mask:true
-        })
+        }else {
+          uni.showToast({
+            title: '操作失败！',
+            mask:true
+          })
+        }
+        setTimeout(()=>{
+          this.query()
+        },1500)
+      })
+    }else {
+      data.userDefined3 = ""
+      submitTransferMaterialList(data).then(res=>{
+        if (res.code === 200){
+          uni.showToast({
+            title: '操作成功！',
+            mask:true
+          })
 
-      }else {
-        uni.showToast({
-          title: '操作失败！',
-          mask:true
-        })
-      }
-      setTimeout(()=>{
-        this.query()
-      },1500)
-    })
+        }else {
+          uni.showToast({
+            title: '操作失败！',
+            mask:true
+          })
+        }
+        setTimeout(()=>{
+          this.query()
+        },1500)
+      })
+    }
 
   }
 

src/pages/wms/Raw/ProductionREQ/model.ts

@@ -114,3 +114,9 @@ export function submitReverseMaterialList(data: any): Promise<any> {
   return http.post(url.lanjuwms.raw.ProductionREQ.submitReverseMaterialList, data);
 }
 
+export function submitTransferMaterialList(data: any): Promise<any> {
+  return http.post(url.lanjuwms.raw.ProductionREQ2.submitTransferMaterialList, data);
+}
+
+
+

src/pages/wms/Raw/ProductionREQ2/index.vue

@@ -182,6 +182,7 @@ export default class Index extends BasePage {
       createBy:session.userName,
       factoryCode:session.FactoryCode,
       orderList:list,
+      userDefined3:"ZC"
     }
 
     submitTransferMaterialList(data).then(res=>{