Merge remote-tracking branch 'origin/master'

src/views/modules/part/bomManagement.vue

@@ -3761,7 +3761,7 @@ export default {
         this.$message.warning('请填写损耗率！')
         return
       }
-      if (this.componentData.issueType === '' || this.componentData.issueType == null) {
+      if (this.componentData.productFlag === 'component' && (this.componentData.issueType === '' || this.componentData.issueType == null)) {
         this.$message.warning('请选择生产属性！')
         return
       }

src/views/modules/part/routingManagement.vue

@@ -789,7 +789,7 @@
     </el-dialog>
 
     <!-- workGuideline 新增模态框 -->
-    <el-dialog title="替代" :close-on-click-modal="false" v-drag :visible.sync="saveWorkGuidelineModal" width="664px">
+    <el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="saveWorkGuidelineModal" width="664px">
       <el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" style="margin-left: 5px">
         <el-form-item :label="'序号'" prop="guidelineSeq" :rules="guidelineRules.guidelineSeq">
           <el-input-number :controls="false" :step="0" v-model="saveWorkGuidelineData.guidelineSeq" style="width: 60px"></el-input-number>
@@ -4017,6 +4017,7 @@ export default {
         type: 'warning'
       }).then(() => {
         let tempData = {
+          updateBy: this.$store.state.user.name,
           informationList: this.workGuidelineSelections
         }
         deleteWorkGuideline(tempData).then(({data}) => {