fix:

imcs-ui/src/views/zuihou/centralToolMagazine/cutterCategoriesGroup/tab/partNeedGroupCutter/components/CutterGroup.vue

@@ -23,9 +23,10 @@
               :key="item.parts_no"
               :label="item.name"
               :value="item.parts_no"
-              :disabled="item.disabled">
-              <span style="float:left; width: 50%;font-size: 16px">{{ item.name }}</span>
-              <span style="float:left; width: 50%;font-size: 16px">{{ item.parts_no }}</span>
+              :disabled="item.disabled"
+				      style="width: 600px;">
+              <span style="float:left; width: 60%;font-size: 16px">{{ item.name }}</span>
+              <span style="float:left; width: 40%;font-size: 16px">{{ item.parts_no }}</span>
             </el-option>
       	</el-select>
       </el-form-item>      
@@ -37,8 +38,9 @@
               :key="item.cuttingToolNo"
               :label="item.cuttingToolName"
               :value="item.cuttingToolNo"
-              :disabled="item.disabled">
-              <span style="float:left; width: 30%;font-size: 16px">{{ item.cuttingToolNo }}</span>
+              :disabled="item.disabled"
+              style="width: 600px;">
+              <span style="float:left; width: 20%;font-size: 16px">{{ item.cuttingToolNo }}</span>
               <span style="float:left; width: 70%;font-size: 16px">{{ item.cuttingToolName }}</span>
             </el-option>
       	</el-select>

imcs-ui/src/views/zuihou/centralToolMagazine/cutterCategoriesGroup/tab/partNeedGroupCutter/index.vue

@@ -4,14 +4,14 @@
     <div class="filter-container">
       <span>
         <span>零件编号：</span>
-      	<el-select v-model="queryParams.model.partsNo" :placeholder='$t("common.pleaseSelect")' >
+      	<el-select clearable v-model="queryParams.model.partsNo" :placeholder='$t("common.pleaseSelect")' >
            <el-option
               v-for="item in bomList"
               :key="item.parts_no"
               :label="item.name"
               :value="item.parts_no"
               :disabled="item.disabled"
-				style="width: 500px;">
+				style="width: 600px;">
               <span style="float:left; width: 60%;font-size: 16px">{{ item.name }}</span>
               <span style="float:left; width: 40%;font-size: 16px">{{ item.parts_no }}</span>
             </el-option>

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

@@ -4,10 +4,30 @@
       <el-col :span="24">
         <el-card shadow="always">
           <div slot="header" class="clearfix">
-            <span>产线运行记录</span>
-
-            <el-radio v-model="exeStatus" label="1">全部</el-radio>
-				    <el-radio v-model="exeStatus" label="0">执行中</el-radio>
+            <span style="margin-left: 15px;">
+            <span>产线运行记录：</span>
+              <el-radio v-model="exeStatus" label="1">全部</el-radio>
+              <el-radio v-model="exeStatus" label="0">执行中</el-radio>
+            </span>
+            <!-- <span style="margin-left: 15px;">
+              <span>任务类型：</span>
+              <el-select v-model="taskType" clearable :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
+                <el-option
+                  v-for="item in taskTypeData"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </span> -->
+            <span style="margin-left: 15px;">
+              <span>批次：</span>
+              <el-input v-model="completeBatchNo" :placeholder='$t("common.pleaseSelect")'  style="width: 150px;" ></el-input>
+            </span>
+            <span style="margin-left: 15px;">
+              <span>零件编号：</span>
+              <el-input v-model="uniqueCode" :placeholder='$t("common.pleaseSelect")'  style="width: 150px;"></el-input>
+            </span>
 
             <el-button type="primary" size="mini" @click="getLog()">刷新</el-button>
           </div>
@@ -352,6 +372,16 @@ export default {
       dialogVisible: false,
       id: '',
       exeStatus:'1',
+      taskType:'',
+      uniqueCode:'',
+      completeBatchNo:'',
+      taskTypeData: [{
+        value: '1',
+        label: '物料'
+      }, {
+        value: '2',
+        label: '刀具'
+      }],
       visible: false,
       taskNodeList: []
     }
@@ -574,6 +604,9 @@ export default {
       this.queryParams.current = params.current ? params.current : this.queryParams.current
       this.queryParams.size = params.size ? params.size : this.queryParams.size
       this.queryParams.model.exeStatus = this.exeStatus=='1'? '' : '2'
+      this.queryParams.model.taskType = this.taskType
+      this.queryParams.model.uniqueCode = this.uniqueCode
+      this.queryParams.model.completeBatchNo = this.completeBatchNo
       dispatchMgrApi.selectLogs(this.queryParams).then((response) => {
         const res = response.data;
         this.loading = false

imcs-ui/src/views/zuihou/runManageCenter/mesNotice/tab/apply/index.vue

@@ -143,7 +143,7 @@
 			            @click="edit(row)"
 			          />
 		          </el-tooltip>
-				  <el-tooltip class="item" content='执行处理' effect="dark" placement="top-start" v-if="(row.status=='0' && row.apiType!='MESPROCESSREPORT')||(row.status=='4' && row.apiType=='MESPROCESSREPORT') || (row.status=='5' && row.apiType=='MESPROCESSREPORT')">
+				  <el-tooltip class="item" content='执行处理' effect="dark" placement="top-start" v-if="(row.status=='0' && row.apiType!='MESPROCESSREPORT')||(row.status=='4' && row.apiType=='MESPROCESSREPORT') || row.status=='5' ">
 			          <i					    
 			            class="el-icon-bell table-operation"
 			            style="color: #87d068;"