tracking

src/views/modules/sampleTracking/projectPartTracking.vue

@@ -298,7 +298,7 @@
       </el-footer>
     </el-dialog>
 
-    <el-dialog title="新增打样" :visible.sync="proofDialogVisible" width="768px" :close-on-click-modal="false">
+    <el-dialog title="新增打样" :visible.sync="proofDialogVisible" width="780px" :close-on-click-modal="false">
       <el-form :inline="true" label-position="top" :model="proofDialogData" style="margin-left: 7px; margin-top: -5px;">
         <el-form-item label="项目编码">
           <el-input v-model="proofDialogData.projectNo" style="width: 189px;" disabled></el-input>
@@ -394,13 +394,13 @@
         </el-form-item>
       </el-form>
 
-      <el-form :inline="true" label-position="top" :model="proofDialogData" style="margin-left: 7px; margin-top: 20px;">
+      <el-form :inline="true" label-position="top" :model="proofDialogData" style="margin-left: 7px; ">
         <el-form-item label="备注">
           <el-input v-model="proofDialogData.remark" style="width: 731px" type="textarea" :rows="2"></el-input>
         </el-form-item>
       </el-form>
 
-      <el-footer style="height: 40px; margin-top: 10px; text-align: center">
+      <el-footer style="height: 40px; margin-top: 40px; text-align: center">
         <el-button @click="proofDialogVisible = false">取 消</el-button>
         <el-button type="primary" :loading="proofSaveLoading" @click="saveProofRecord">保 存</el-button>
       </el-footer>

src/views/modules/sampleTracking/projectProofTracking.vue

@@ -95,7 +95,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd"
-                placeholder="请选择"
+                placeholder=""
                 style="width: 122px"
                 @change="handleProcessDateChange(scope.row, item, $event)"
               />
@@ -127,6 +127,7 @@
                 placeholder="请输入,回车也可保存"
                 @keydown.enter.native.prevent="saveCommentsEdit(scope.row)"
                 @keyup.esc.native="cancelCommentsEdit"
+                @blur="handleCommentsBlur(scope.row)"
               />
               <el-button
                 class="comments-save-btn"
@@ -134,6 +135,7 @@
                 size="mini"
                 plain
                 :loading="commentsSaveLoading"
+                @mousedown.native.prevent
                 @click.stop="saveCommentsEdit(scope.row)"
               >√</el-button>
             </template>
@@ -388,11 +390,6 @@
         </el-row>
 
         <el-row :gutter="16">
-          <el-col :span="6">
-            <el-form-item label="Tracker">
-              <el-input v-model="oneKeyForm.tracker" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item label="打样单号">
               <el-input v-model="oneKeyForm.proofingNo" style="width: 100%"></el-input>
@@ -1266,7 +1263,23 @@ export default {
       this.commentsEditingTrackingId = null
       this.commentsDraft = ''
     },
-    saveCommentsEdit (row) {
+    handleCommentsBlur (row) {
+      if (this.commentsSaveLoading || !this.isCommentsEditing(row)) {
+        return
+      }
+      const comments = this.commentsDraft == null ? '' : String(this.commentsDraft)
+      if (comments.trim()) {
+        this.saveCommentsEdit(row, {
+          fromBlur: true,
+          draftComments: comments
+        })
+        return
+      }
+      this.cancelCommentsEdit()
+    },
+    saveCommentsEdit (row, options) {
+      const saveOptions = options || {}
+      const fromBlur = !!saveOptions.fromBlur
       if (this.commentsSaveLoading) {
         return
       }
@@ -1274,11 +1287,17 @@ export default {
         this.$message.warning('跟踪记录ID不能为空')
         return
       }
-      const comments = this.commentsDraft == null ? '' : String(this.commentsDraft)
+      const comments = Object.prototype.hasOwnProperty.call(saveOptions, 'draftComments')
+        ? (saveOptions.draftComments == null ? '' : String(saveOptions.draftComments))
+        : (this.commentsDraft == null ? '' : String(this.commentsDraft))
       if (comments === (row.comments || '')) {
         this.cancelCommentsEdit()
         return
       }
+      if (fromBlur) {
+        this.commentsEditingTrackingId = null
+        this.commentsDraft = ''
+      }
       this.commentsSaveLoading = true
       updateProofTrackingComments({
         trackingId: row.trackingId,