前端页面功能处理

imcs-ui/src/api/AxiosApi.js

@@ -109,7 +109,7 @@ const httpServer = (opts) => {
     baseURL: process.env.VUE_APP_PROD_REQUEST_DOMAIN_PREFIX + process.env.VUE_APP_BASE_API,
     url: opts.url,
     responseType: opts.responseType || '',
-    timeout: 20000
+    timeout: 200000
   }
   if (opts['meta']) {
     httpDefaultOpts.headers = opts['meta']

imcs-ui/src/api/machiningClient/machiningClient.js

@@ -98,11 +98,11 @@ const apiList = {
 	},
 	read: {
 		method: 'POST',
-    	url: `http://192.168.11.245:8089/api/ReadRFID`
+    	url: `http://192.168.11.240:8089/api/ReadRFID`
 	},
 	write: {
 		method: 'POST',
-    	url: `http://192.168.11.245:8089/api/WriteRFID`
+    	url: `http://192.168.11.240:8089/api/WriteRFID`
 	},
 }
 

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

@@ -481,7 +481,7 @@ export default {
         // item.procedurePosition = current[0].name;
         // 只有开始中的页面可以点击进入详情页面操作         
         item.currentStationName = this.currentStationName        
-        if(item.exeStatus === '2' && item.interfaceType === '04'){
+        if(item.exeStatus === '2' && item.interfaceType === '04' && item.step=="1"){
             if(item.taskName == '上料' || item.nodeName == '上料' ){
                 this.$refs.view1.setTenant(item)
                 this.view1Visible = true

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

@@ -131,7 +131,7 @@
             <el-button v-show="this.active==1 && this.existed==0" size="medium" type="primary" :disabled="callRobotFlag" @click="callRobot" round>呼叫托盘工装</el-button>
             <el-button v-show="this.active==1 && this.existed==2 && !this.matched" size="medium" type="primary" :disabled="confirmDisabled" @click="callRobot" round>替换托盘工装</el-button>	
             <el-button plain type="info" @click.native="prev" v-show="this.active>1"  >返回上一步</el-button>
-            <el-button type="primary" :disabled="confirmDisabled" @click.native="next" v-show="this.active==1 && this.existed==2 && this.matched">已完成,下一步</el-button>
+            <el-button type="primary" @click.native="next" v-show="this.active==1 && this.existed==2 && this.matched">已完成,下一步</el-button>
             <el-button type="primary" :disabled="confirmDisabled" @click.native="submitForm" v-show="this.active>1">上料完成</el-button>
           </div>
       </div>
@@ -275,7 +275,7 @@
 	    });       
     },
       confirmCode(){
-          let valid = this.uniqueCode!=''? true: false;
+          let valid = this.tenant.completeBatchNo!=''? true: false;
           if(!valid){
             this.$message({
                 message: "零件编码" + this.$t("rules.require"),
@@ -284,13 +284,16 @@
             this.confirmDisabled = false
             return false
           }
-          taskMgrApi.confirmCode({ "uniqueCode" : this.uniqueCode, "orderId":this.tenant.orderId}).then((res) => {
+          taskMgrApi.confirmCode({ "completeBatchNo" : this.tenant.completeBatchNo, "orderId":this.tenant.orderId, "procedureSort": this.tenant.procedureSort}).then((res) => {
             res = res.data;
             if (res.isSuccess) {            
               this.confirmDisabled = false
+              this.uniqueCode = res.data.uniqueCode
+            }else{             
+              this.confirmDisabled = true 
             }
           });       
-          this.confirmDisabled = true
+          
         },
         submitForm(){
         // 更新改任务的开始时间

imcs-ui/src/views/zuihou/prepareProductMgr/technologyVersion/components/trayForm/index.vue

@@ -38,11 +38,12 @@
 	    		</template>
 	      </el-table-column>
 	    	<!-- 物料名称 -->
-	    	<el-table-column prop="name" :label='$t("prepare.table.toolGroup.name")' align="center" width="120px" :show-overflow-tooltip="true"></el-table-column>
+	    	<el-table-column prop="name" :label='$t("prepare.table.toolGroup.name")' align="center" width="150px" :show-overflow-tooltip="true"></el-table-column>
 	      <!-- 物料类型 -->
-	      <el-table-column prop="materialType" :label='$t("prepare.table.toolGroup.category")' width="150px"></el-table-column>
+	      <el-table-column prop="materialType" :label='$t("prepare.table.toolGroup.category")' width="100px" align="center"></el-table-column>
+		  
 	      <!-- 附件 -->
-	      <el-table-column prop="armorPic" :label='$t("prepare.table.toolGroup.armorPic")' align="center" width="180px">
+	      <el-table-column prop="armorPic" :label='$t("prepare.table.toolGroup.armorPic")' align="center" width="300px">
 	      	<template slot-scope="{ row }">
 	      		<div v-if="row.jjImgList && row.jjImgList.length > 0" class="demo-image__preview">
 						  <el-image
@@ -50,9 +51,9 @@
 						    :src="row.jjImgList[0]"
 						    :preview-src-list="row.jjImgList">
 						  </el-image>
-						</div>
-	          <el-button v-else type="text" @click="handleClick(row)">{{$t("common.uploadImg")}}</el-button>
-					</template>
+				</div>
+	          	<el-button v-if="radio=='2'" type="text" @click="handleClick(row)">{{$t("common.uploadImg")}}</el-button>
+			</template>
 	      </el-table-column>
 	      <!-- 备注 -->
 	      <el-table-column prop="remark" :label='$t("common.remark")'>