Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/pro/feedback/index.vue

@@ -326,9 +326,9 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
         <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
-        <el-button type="primary" @click="handleSubmit" v-if="form.status =='PREPARE' && optType !='view' && form.recordId !=null ">提交审批</el-button>
+        <!-- <el-button type="primary" @click="handleSubmit" v-if="form.status =='PREPARE' && optType !='view' && form.recordId !=null ">提交审批</el-button>
         <el-button type="success" @click="handleExecute" v-if="form.status =='APPROVING'  && form.recordId !=null">审批通过</el-button>
-        <el-button type="danger" @click="handleReject" v-if="form.status =='APPROVING'  && form.recordId !=null">审批不通过</el-button>
+        <el-button type="danger" @click="handleReject" v-if="form.status =='APPROVING'  && form.recordId !=null">审批不通过</el-button> -->
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>

src/views/mes/tm/toolrequest/selectTask.vue

@@ -93,10 +93,10 @@
       </el-table-column>
       <el-table-column
         label="任务单编码"
-        width="100"
+        width="110"
         align="center"
-        key="taskWorkunitId"
-        prop="taskWorkunitId"
+        key="taskCode"
+        prop="taskCode"
       />
       <!-- <el-table-column
         label="排产数量"
@@ -148,14 +148,10 @@
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" width="100" label="状态" align="center" prop="statusName" />
-      <el-table-column :show-overflow-tooltip="true" min-width="180" label="工序任务编码" align="center" prop="taskCode" />
-      <el-table-column :show-overflow-tooltip="true" min-width="300" label="工序任务名称" align="center" prop="taskName" />
       <el-table-column :show-overflow-tooltip="true" width="100" label="工作单元名称" align="center" prop="workunitName" />
       <el-table-column :show-overflow-tooltip="true" width="100" label="工作单元编码" align="center" prop="workunitCode" />
       <el-table-column :show-overflow-tooltip="true" width="100" label="工站编码" align="center" prop="workstationCode" />
       <el-table-column :show-overflow-tooltip="true" width="100" label="工站名称" align="center" prop="workstationName" />
-      <el-table-column :show-overflow-tooltip="true" width="100" label="工艺名称" align="center" prop="routeName" />
-      <el-table-column :show-overflow-tooltip="true" width="100" label="工艺编码" align="center" prop="routeCode" />
       <el-table-column :show-overflow-tooltip="true" min-width="150" label="工序编码" align="center" prop="processCode" />
       <el-table-column :show-overflow-tooltip="true" width="100" label="工序名称" align="center" prop="processName" />
     </el-table>