固定列可以支持自定义

src/views/modules/sampleTracking/projectProofTracking.vue

@@ -289,7 +289,7 @@
     <el-dialog
       title="默认进度设置"
       :visible.sync="defaultProcessConfigDialogVisible"
-      width="650px" class="zxClass"
+      width="600px" class="zxClass"
       :close-on-click-modal="false"
       custom-class="default-process-config-dialog"
       @opened="initDefaultProcessConfigSortable"
@@ -312,7 +312,7 @@
         row-key="_rowKey"
         border
         stripe
-        max-height="560"
+        max-height="640"
         @selection-change="handleDefaultProcessConfigSelectionChange"
       >
         <el-table-column type="selection" width="50" />
@@ -332,14 +332,14 @@
             <el-input v-model.trim="scope.row.label" size="mini" clearable placeholder="如: Coating" />
           </template>
         </el-table-column>
-        <el-table-column label="启用" width="100" align="center">
+<!--        <el-table-column label="启用" width="100" align="center">
           <template slot-scope="scope">
             <el-select v-model="scope.row.activeFlag" size="mini" style="width: 80px;">
               <el-option label="是" value="Y" />
               <el-option label="否" value="N" />
             </el-select>
           </template>
-        </el-table-column>
+        </el-table-column>-->
       </el-table>
       <div v-if="defaultProcessConfigRows.length === 0" class="default-process-config-empty">
         当前没有默认行，请点击“新增一行”后填写并保存。
@@ -1555,6 +1555,13 @@ export default {
     },
     ensureBuProcessConfigRows () {
       const allCodes = this.getAllProcessCodes()
+      const builtinCodeMap = {}
+      DEFAULT_PROCESS_COLUMNS.forEach(item => {
+        if (item && item.code) {
+          builtinCodeMap[item.code] = true
+        }
+      })
+      const defaultSelectedCodes = allCodes.filter(code => !!builtinCodeMap[code])
       const rows = []
       const usedBuMap = {}
       const appendRow = (buNo, buDesc, site) => {
@@ -1568,22 +1575,25 @@ export default {
           buNo: key,
           buDesc: buDesc || key,
           processOrderCodes: allCodes.slice(),
-          processCodes: allCodes.slice()
+          // 新增默认工序默认不勾选：仅预勾选系统内置工序，自定义新增项需事业部手工勾选。
+          processCodes: (defaultSelectedCodes.length > 0 ? defaultSelectedCodes : allCodes).slice()
         }
         if (cfg) {
           const validOrderCodes = this.getValidProcessOrderCodes(cfg.processOrderCodes)
           row.processOrderCodes = validOrderCodes
-          if (cfg.showAll === false) {
           const validCodes = this.getValidProcessCodes(cfg.processCodes, validOrderCodes)
-            if (validCodes.length > 0 && validCodes.length < validOrderCodes.length) {
+          if (validCodes.length > 0) {
             const selectedCodeMap = {}
             validCodes.forEach(code => {
               selectedCodeMap[code] = true
             })
             row.processCodes = validOrderCodes.filter(code => selectedCodeMap[code])
-            }
           } else {
-            row.processCodes = validOrderCodes.slice()
+            const defaultSelectedCodeMap = {}
+            row.processCodes.forEach(code => {
+              defaultSelectedCodeMap[code] = true
+            })
+            row.processCodes = validOrderCodes.filter(code => defaultSelectedCodeMap[code])
           }
         }
         rows.push(row)