生产报工的扣减寿命

pages/mes/prodReport/index.vue

@@ -170,11 +170,11 @@
                  :title-style="{'background-color':'#1E3770','color': '#FFFFFF' ,'line-height': '60px','padding-top': '0px'}"
                  v-model="aopen" width="1300rpx">
           <u-form label-width="90px" :rules="rules">
-           <u-form-item label="异常时间" prop="abnormalTime">
-              <u-input disabled="true"  :border="true" v-model="ExceptionForms.abnormalTime"></u-input>
-              <!-- <uni-datetime-picker class="times" type="date" :clear-icon="false" v-model="ExceptionForms.abnormalTime" /> -->
-            </u-form-item>
-
+           <!-- <u-form-item label="异常时间" prop="abnormalTime">
+              <u-input   :border="true" v-model="ExceptionForms.abnormalTime"></u-input>
+              <uni-datetime-picker class="times" type="date" :clear-icon="false" v-model="ExceptionForms.abnormalTime" />
+            </u-form-item> -->
+			
             <u-row>
               <u-col span="6">
                 <u-form-item label="异常类型" prop="abnormalType">
@@ -385,7 +385,6 @@
 <script>
 import SearchInput from "@/components/ScanInput/index.vue";
 import dModelList from './components/dModelList.vue'
-import timeFormat from '@/uview-ui/libs/function/timeFormat.js'
 export default {
   name: "ProdReport",
     components: {
@@ -606,9 +605,7 @@ export default {
             dModelData: [],
             tableSelectData: [],
             feedbackForms: [],
-            ExceptionForms: {
-              abnormalTime: timeFormat(new Date(), 'yyyy-mm-dd')
-            },
+            ExceptionForms: {},
             reasonList: [],
             materialUsageRecordList: [],
             materialusagerecordLoading: false,
@@ -661,13 +658,13 @@ export default {
             materialReturnList: [],
             materialRequestFormData: {
                 itemName:null,
-                applyNum:1
+                applyNum:null
             },
             materialRequestFormVisible:false,
             materialRequestSelected:{},
             materialReturnFormData: {
                 itemName:null,
-                applyNum:1
+                applyNum:null
             },
             materialReturnFormVisible:false,
             materialReturnSelected:{},
@@ -1046,7 +1043,7 @@ export default {
 		  workstationName: this.vuex_workunit.workunitName,
           abnormalType: '',
           abnormalReason: '',
-          abnormalTime: timeFormat(new Date(), 'yyyy-mm-dd')
+          abnormalTime: ''
       })
       this.aopen = true;
     },
@@ -1092,7 +1089,11 @@ export default {
             startTime: item.startTime
         }).then(res => {
           if (res.code === 200) {
-            this.$u.toast('上报成功');
+			if(res.msg === ""){
+			this.$u.toast('上报成功');
+			}else{
+		  this.$u.toast(res.msg);
+		  }
             this.getTaskList()
           }
         });
@@ -1115,10 +1116,9 @@ export default {
     },
     feedingInspectionScan(){
       const t = this;
-      const taskInfo = this.tableSelectData[0];
       uni.scanCode({
           success: function (res) {
-              t.$u.api.validateFeedingInspection({"plnr":res.result,"taskId":taskInfo.taskId}).then(res2=>{
+              t.$u.api.validateFeedingInspection({"plnr":res.result}).then(res2=>{
                   if (res2.code === 200) {
                       t.feedingInspectionLoadAndScan();
                   }
@@ -1192,7 +1192,7 @@ export default {
     },
     materialRequestFormShow(line){
       this.materialRequestFormVisible=true;
-      this.materialRequestFormData.itemName = line.itemName
+      this.materialRequestFormData = {itemName: line.itemName};
       this.materialRequestSelected = line;
     },
     materialRequestSetting(){
@@ -1232,7 +1232,7 @@ export default {
     },
     materialReturnFormShow(line){
         this.materialReturnFormVisible=true;
-        this.materialReturnFormData.itemName = line.itemName;
+        this.materialReturnFormData = {itemName: line.itemName};
         this.materialReturnSelected = line;
     },
     materialReturnSetting(){