任务选择调整

pages/index/index.vue

@@ -17,7 +17,7 @@
       <ProContent v-if="tabIndex === 'DV'"></ProContent>
     </view>
     <u-modal width="90%" v-model="showWorkstationFlag" :showConfirmButton="false" :showCancelButton="true"
-             title="请选择工作站" content="操作内容">
+             title="请选择工作单元" content="操作内容">
 
       <view class="station_list">
         <u-empty text="暂无工作单元" mode="list" v-if="workUnitList.length==0"

pages/mes/prodReport/index.vue

@@ -246,7 +246,6 @@
                           <uni-th width="110px" align="center">产品物料编码</uni-th>
                           <uni-th width="110px" align="center">产品物料名称</uni-th>
                           <uni-th width="110px" align="center">批次号</uni-th>
-                          <uni-th width="100px" align="center">备注</uni-th>
                       </uni-tr>
                       <uni-tr v-for="(line,index) in recoilMaterialList" :key="index">
                           <uni-td align="center">
@@ -258,7 +257,6 @@
                           <uni-td align="center">{{ line.itemCode }}</uni-td>
                           <uni-td align="center">{{ line.itemName }}({{line.specification}})/{{line.unitOfMeasure}}</uni-td>
                           <uni-td align="center">{{ line.batchNo }}</uni-td>
-                          <uni-td align="center">{{ line.remark }}</uni-td>
                       </uni-tr>
                   </uni-table>
               </scroll-view>
@@ -1093,7 +1091,7 @@ export default {
     },
     feedingInspectionLoadAndScan(){
       const t = this;
-      const taskInfo = this.curTaskInfo;
+      const taskInfo = this.tableSelectData[0];
       this.$u.api.listFeedingInspection({"taskId":taskInfo.taskId}).then(res => {
           if (res.code === 200) {
               t.feedingInspectionList = res.data;
@@ -1116,7 +1114,7 @@ export default {
     },
     validateFeedingInspection(line){
         const t = this;
-        const taskInfo = this.curTaskInfo;
+        const taskInfo = this.tableSelectData[0];
         this.$u.api.validateFeedingInspectionById({"lineId":line.lineId}).then(res2=>{
             if (res2.code === 200) {
                 t.$u.api.listFeedingInspection({"taskId":taskInfo.taskId}).then(res => {
@@ -1133,7 +1131,7 @@ export default {
     },
     recoilMaterialLoadAndScan(){
       const t = this;
-      const taskInfo = this.curTaskInfo;
+      const taskInfo = this.tableSelectData[0];
       this.$u.api.recoilMaterialList({"taskId":taskInfo.taskId}).then(res => {
           if (res.code === 200) {
               t.recoilMaterialList = res.data;
@@ -1143,10 +1141,9 @@ export default {
     },
     recoilMaterialScan(){
       const t = this;
-      const taskInfo = this.curTaskInfo;
+      const taskInfo = this.tableSelectData[0];
       uni.scanCode({
           success: function (res) {
-              t.$u.toast(res.result);
               t.$u.api.addRecoilMaterial({"taskId":taskInfo.taskId, "plnr": res.result}).then(res2=>{
                   if (res2.code === 200) {
                       t.recoilMaterialLoadAndScan();
@@ -1158,7 +1155,7 @@ export default {
     },
     recoilMaterialDelete(line){
       const t = this;
-      const taskInfo = this.curTaskInfo;
+      const taskInfo = this.tableSelectData[0];
       this.$u.api.deleteRecoilMaterial({"id":line.recoilMaterialId}).then(res2=>{
           t.$u.api.recoilMaterialList({"taskId":taskInfo.taskId}).then(res => {
               if (res.code === 200) {
@@ -1169,7 +1166,7 @@ export default {
 
     },
     materialRequestShow(){
-      const taskInfo = this.curTaskInfo;
+      const taskInfo = this.tableSelectData[0];
       const t = this;
       this.materialRequestVisible=true;
       this.$u.api.listMaterialRequest({"taskId":taskInfo.taskId}).then(res => {
@@ -1189,7 +1186,7 @@ export default {
     },
     materialRequestSave(){
         const rst = [];
-        const taskInfo = this.curTaskInfo;
+        const taskInfo = this.tableSelectData[0];
         const t = this;
         this.materialRequestList.forEach(s=>{
             if(s.applyNum!=null){
@@ -1211,7 +1208,7 @@ export default {
     materialReturnShow(){
         const t = this;
         this.materialReturnVisible=true;
-        const taskInfo = this.curTaskInfo;
+        const taskInfo = this.tableSelectData[0];
         this.$u.api.listMaterialReturn({"taskId":taskInfo.taskId}).then(res => {
           if (res.code === 200) {
               t.materialReturnList = res.data;
@@ -1228,7 +1225,7 @@ export default {
         this.materialReturnFormVisible=false;
     },
     materialReturnSave(){
-        const taskInfo = this.curTaskInfo;
+        const taskInfo = this.tableSelectData[0];
         const rst = [];
         const t = this;
         this.materialReturnList.forEach(s=>{