Merge remote-tracking branch 'origin/master' into master

src/views/ProductionProcess/workOrder.vue

@@ -222,8 +222,8 @@
         </el-row>
       </el-form>
       <div>
-        <el-tabs type="border-card">
-          <el-tab-pane label="工单Bom">
+        <el-tabs type="border-card" v-model="tabsName">
+          <el-tab-pane label="工单Bom" name="bom">
             <el-table
               v-loading="Loading1"
               :data="bomList"
@@ -297,7 +297,7 @@
               @pagination="getBomTable"
             />
           </el-tab-pane>
-          <el-tab-pane label="工站信息">
+          <el-tab-pane label="工站信息" name="station">
             <el-table
               v-loading="Loading3"
               :data="stationList"
@@ -356,7 +356,7 @@
               @pagination="getStationTable"
             />
           </el-tab-pane>
-          <el-tab-pane label="开工信息">
+          <el-tab-pane label="开工信息" name="action">
             <el-table
               v-loading="Loading2"
               :data="lineList"
@@ -469,6 +469,8 @@ export default {
     return {
       // 搜索栏显示（默认显示）
       showSearch: true,
+      // tabs默认选中
+      tabsName: 'bom',
       // 搜索框参数
       queryParams: {
         page: 1,
@@ -576,8 +578,8 @@ export default {
     /** 详情按钮方法 */
     handleDetail(row) {
       this.Loading4 = true
-      getOrder(row.businessId).then(response => {
       this.open = true
+      getOrder(row.businessId).then(response => {
         if (response.data === null) {
           getOrder1(row.businessId).then(response1 => {
             this.form = response1.data
@@ -665,6 +667,7 @@ export default {
       this.stationList = []
       this.bomList = []
       this.Loading1 = true
+      this.tabsName = 'bom'
     },
     /** 导入按钮方法 */
     handleImport() {

src/views/productionInfo/MaterialFile.vue

@@ -72,8 +72,8 @@
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" align="center" prop="contract">
           <template slot="header">
-            <div>区域</div>
-            <div>CONTRACT</div>
+            <div>工厂</div>
+            <div>Factory</div>
           </template>
           <template slot-scope="scope">
             <span>{{ scope.row.contract || '-' }}</span>