Merge remote-tracking branch 'origin/master'

src/views/modules/project/projectInfo/com_project_info_part.vue

@@ -1977,8 +1977,8 @@
               density: data.rows.density,
               variableLeadTimeHour: data.rows.variableLeadTimeHour,
               customerNo: this.searchData.customerId,
-              buNo: data.rows.buNo,
-              buDesc: data.rows.buDesc,
+              buNo: '',
+              buDesc: '',
             }
             this.modalFlag = true
             this.modalDisableFlag = true
@@ -2093,7 +2093,9 @@
               density: data.rows.density,
               variableLeadTimeHour: data.rows.variableLeadTimeHour,
               customerNo: this.searchData.customerId,
-              partNoSource: '料号复制'
+              partNoSource: '料号复制',
+              buNo: '',
+              buDesc: '',
             }
             this.modalFlag = true
             this.modalDisableFlag = false

src/views/modules/tooling/components/com_tool_info_add_update.vue

@@ -8,7 +8,7 @@
           <el-row class="customer-row" >
             <el-col :span="6" class="first-col">
               <el-form-item :label=labels.toolId prop="toolId">
-                <span slot="label" ><a herf="#">工具标识号 <el-button type="primary"  v-if="addFlag" class="customer-button" @click="nextToolIdFun">Next Tool ID</el-button></a></span>
+                <span slot="label" >工具标识号 <el-button type="primary"  v-if="addFlag" class="customer-button" @click="nextToolIdFun">Next Tool ID</el-button></span>
                 <el-input  v-model="pageData.toolId"   style="width: 180px;" :disabled="!this.addFlag"></el-input>
               </el-form-item>
             </el-col>