一键修改

src/views/modules/sampleTracking/projectProofTracking.vue

@@ -185,7 +185,7 @@
       }"
     >{{ processTooltip.content }}</div>
 
-    <el-dialog :title="oneKeyDialogMode === 'edit' ? '修改项目/物料/打样' : '一键创建项目/物料'" :visible.sync="oneKeyDialogVisible" :close-on-click-modal="false" width="1100px">
+    <el-dialog :title="oneKeyDialogMode === 'edit' ? '修改项目/物料/打样' : '一键创建项目/物料'" :visible.sync="oneKeyDialogVisible" :close-on-click-modal="false" width="1000px">
       <el-form :model="oneKeyForm" label-position="top" class="one-key-grid-form">
         <el-row :gutter="16">
           <el-col :span="6">
@@ -217,7 +217,7 @@
               <el-input v-model="oneKeyForm.customerNo" @blur="customerNoBlur" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="客户名称">
               <el-input v-model="oneKeyForm.customerDesc" disabled style="width: 100%"></el-input>
             </el-form-item>
@@ -234,11 +234,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目来源">
-              <el-input v-model="oneKeyForm.projectSource" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
         </el-row>
 
         <el-row :gutter="16">
@@ -895,6 +890,7 @@ export default {
       pageSize: 20,
       totalPage: 0,
       currentRow: null,
+      manualSelectedTrackingId: null,
       selectionRows: [],
       batchEditMode: false,
       processHistoryMap: {},
@@ -1253,11 +1249,19 @@ export default {
               this.cancelCommentsEdit()
             }
           }
-          if (this.dataList.length > 0) {
-            this.currentRow = this.dataList[0]
-          } else {
-            this.currentRow = null
+          const manualSelectedId = this.manualSelectedTrackingId
+          const previousCurrentId = this.currentRow && this.currentRow.trackingId
+          let nextCurrentRow = null
+          if (manualSelectedId != null) {
+            // 只要用户没有手动点新行，刷新后始终尝试回选上次手动选中的那一行
+            nextCurrentRow = this.dataList.find(item => item && item.trackingId === manualSelectedId) || null
+          } else if (previousCurrentId != null) {
+            nextCurrentRow = this.dataList.find(item => item && item.trackingId === previousCurrentId) || null
+          }
+          if (!nextCurrentRow && manualSelectedId == null && this.dataList.length > 0) {
+            nextCurrentRow = this.dataList[0]
           }
+          this.currentRow = nextCurrentRow
           this.$nextTick(() => {
             if (this.$refs.trackingTable && typeof this.$refs.trackingTable.setCurrentRow === 'function') {
               this.$refs.trackingTable.setCurrentRow(this.currentRow || null)
@@ -1366,6 +1370,7 @@ export default {
     },
     rowClick (row) {
       this.currentRow = row
+      this.manualSelectedTrackingId = row && row.trackingId ? row.trackingId : null
     },
     sizeChangeHandle (val) {
       this.pageSize = val