前端页面功能处理

imcs-ui/src/views/zuihou/dispatchMgr/productLineInfo/Index.vue

@@ -48,8 +48,8 @@
             <el-table-column prop="sendStatus" label='是否下发' width="80px">
               <template slot-scope="{ row }">
                 <el-tag v-if="row.sendStatus == '0'" type="info">未下发</el-tag>
-                <el-tag v-if="row.sendStatus == '1'"  type="primary">已下发</el-tag>
-                <el-tag v-if="row.sendStatus == '2'" type="success">已返回</el-tag>
+                <el-tag v-if="row.sendStatus == '1'"  type="success">已下发</el-tag>
+                <el-tag v-if="row.sendStatus == '2'" type="warning">已取消</el-tag>
               </template>
             </el-table-column>
             <el-table-column prop="exeResult" label='执行结果' width="80px">
@@ -58,10 +58,11 @@
                 <el-tag v-if="row.exeResult == '0'" type="danger">失败</el-tag>
               </template>
             </el-table-column>
-            <el-table-column prop="feedback" label='运行时信息' width="160px" show-tooltip-when-overflow></el-table-column>
-            <el-table-column prop="callBack" label='回调信息' width="160px" show-overflow-tooltip >
+            <el-table-column prop="feedback" label='运行时信息' width="250px" show-tooltip-when-overflow></el-table-column>
+            <el-table-column prop="callBack" label='回调信息' width="150px" show-overflow-tooltip >
               <template slot-scope="{ row }">
-                <el-tag v-if="row.sendStatus == '1'" type="info">{{ row.feedback }}}</el-tag>
+                <el-tag v-if="row.sendStatus == '1'" type="info">{{ row.exeStatus == '3'? '回调成功':'' }}</el-tag>
+                <el-tag v-if="row.sendStatus == '2'" type="danger">异常处理流程结束</el-tag>
               </template>  
             </el-table-column>
           <el-table-column 

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

@@ -79,7 +79,7 @@
 
     	<div slot="footer" class="dialog-footer">
         <el-button type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('machining.buttons.finished') }}</el-button>
-	      <el-button type="primary" :disabled="confirmDisabled" @click="storageForm">{{ $t('machining.buttons.inFinished') }}</el-button>
+	      <!--<el-button type="primary" :disabled="confirmDisabled" @click="storageForm">{{ $t('machining.buttons.inFinished') }}</el-button>-->
 	    </div>
     </div>
   </el-dialog>