工人操作端修改

imcs-ui/src/views/zuihou/machiningClient/touchScreen/Index.vue

@@ -358,7 +358,7 @@ export default {
             if(item.taskName == '上料'){
                 this.$refs.view1.setTenant(item)
                 this.view1Visible = true
-            }else if(item.taskName == '翻面'){
+            }else if(item.taskName == '人工翻面'){
                 this.$refs.view2.setTenant(item)
                 this.view2Visible = true
             }else if(item.taskName == '下料'){

imcs-ui/src/views/zuihou/machiningClient/touchScreen/components/View1.vue

@@ -192,8 +192,8 @@ export default {
 	},
   	submitForm(){
       // 更新改任务的开始时间
-      // TODO 写入rfid内容，工件信息、原材料
-      taskMgrApi.updateTaskStatus({ "id" : this.tenant.id,"meterialId":this.tenant.meterialId, "uniqueCode":this.uniqueCode, "updateType" : "end"}).then((res) => {
+      // TODO 写入rfid内容，工件信息、原材料R
+      taskMgrApi.updateTaskStatus({ "id" : this.tenant.id,"meterialId":this.tenant.meterialId, "uniqueCode":this.uniqueCode, "updateType" : "end", "processType" : "1"}).then((res) => {
           res = res.data;
           if (res.isSuccess) {
               // 通知列表

imcs-ui/src/views/zuihou/machiningClient/touchScreen/components/View2.vue

@@ -74,7 +74,7 @@
           </template>
         </el-table-column>
 			  <!-- 备注 -->
-		      <el-table-column prop="remark" :label='$t("prepare.table.tools.name")' align="center"></el-table-column>
+		      <el-table-column prop="remark" :label='$t("prepare.table.tools.remark")' align="center"></el-table-column>
 
 		    </el-table>
     	</el-row>
@@ -135,7 +135,7 @@ export default {
   },
   methods: {
   	submitForm(){
-      taskMgrApi.updateTaskStatus({ "id" : this.tenant.id, "updateType" : "end"}).then((res) => {
+      taskMgrApi.updateTaskStatus({ "id" : this.tenant.id, "updateType" : "end", "processType" : "2"}).then((res) => {
           res = res.data;
           if (res.isSuccess) {
               // 通知列表

imcs-ui/src/views/zuihou/machiningClient/touchScreen/components/View3.vue

@@ -175,7 +175,7 @@ export default {
       }
 	},
   	submitForm(){
-        taskMgrApi.updateTaskStatus({ "id" : this.tenant.id, "updateType" : "end"}).then((res) => {
+        taskMgrApi.updateTaskStatus({ "id" : this.tenant.id, "updateType" : "end","processType" : "3"}).then((res) => {
             res = res.data;
             if (res.isSuccess) {
                 // 通知列表