待评估 页面优化

src/views/modules/toolMan/assessment.vue

@@ -81,12 +81,27 @@
         <el-form-item :label="inputLabel.modelInput.label2">
           <el-input onkeyup="value=value.replace(/[^\d]/g,'')" style="width: 150px;padding: 0px 3px;"  v-model="estuseQty"></el-input>
         </el-form-item>
+        <el-form-item :label="inputLabel.modelInput.label5">
+          <el-input onkeyup="value=value.replace(/[^\d]/g,'')" disabled style="width: 150px;padding: 0px 3px;"  v-model="oldEstuseQty"></el-input>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
       <el-button @click="setUp.modelFlag = false">取消</el-button>
       <el-button type="primary" :disabled="setUp.saveModelFlag" @click="modelVerification()">确定</el-button>
     </span>
     </el-dialog>
+
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.modelInput.label3" :visible.sync="setUp.modelFlag1" width="350px">
+      <el-form  label-position="top">
+        <el-form-item :label="inputLabel.modelInput.label4">
+          <el-input type="textarea" :rows="3" placeholder="请输入内容" style="width: 300px;padding: 0px 3px;"  v-model="remark"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="setUp.modelFlag1 = false">取消</el-button>
+      <el-button type="primary" :disabled="setUp.saveModelFlag1" @click="remarkFlag()">确定</el-button>
+    </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -125,13 +140,17 @@ import {
     },
     data() {
       return {
+        remark : '',
         currentData : {},
         flag : '',
         setUp :{
           modelFlag : false,
           saveModelFlag : false,
+          modelFlag1 : false,
+          saveModelFlag1 : false,
         },
         estuseQty : 0,
+        oldEstuseQty : 0,
         queryHeaderData: {
           site : this.$store.state.user.site,
           applyType : '待评估',
@@ -145,7 +164,10 @@ import {
           },
           modelInput : {
             label1 : '审核信息',
-            label2 : '预计使用寿命',
+            label2 : '修改后预计使用寿命',
+            label3 : '不合格信息',
+            label4 : '不合格原因',
+            label5 : '当前预计使用寿命',
           },
         },
         site : this.$store.state.user.site,
@@ -531,10 +553,28 @@ import {
       this.getLanguageList()
     },
     methods: {
+      initRemark(){
+
+      },
+      remarkFlag(){
+        this.saveModelFlag1 = true
+        if(this.remark == null || this.remark === ''){
+          this.$alert('请输入不合格原因！', '操作提示', {
+            confirmButtonText: '确定',
+            type :"warning",
+            callback: action => {
+              this.saveModelFlag1 = false
+            }
+          });
+          return false
+        }
+        this.saveModelFlag1 = false
+        this.saveToolInspection(this.currentData ,this.flag)
+      },
       modelVerification(){
         this.saveModelFlag = true
-        if(this.estuseQty == '' || this.estuseQty <= 0){
-          this.$alert('请输入预计使用寿命！', '操作提示', {
+        if(this.estuseQty == '' || this.estuseQty <= this.oldEstuseQty){
+          this.$alert('请输入正确的预计使用寿命！', '操作提示', {
             confirmButtonText: '确定',
             type :"warning",
             callback: action => {
@@ -579,10 +619,12 @@ import {
           this.currentData = row
           this.flag = passFlag
           this.estuseQty = 0
+          this.oldEstuseQty = row.estuseQty
+          this.remark = ''
           if(passFlag == 'Y'){
             this.setUp.modelFlag = true
           }else {
-            this.saveToolInspection(row ,passFlag)
+            this.setUp.modelFlag1 = true
           }
         })
       },
@@ -616,7 +658,7 @@ import {
           newApplyType : applyType,
           addFlag : addFlag,
           checkBy :row.checkBy,
-          remark : row.remark,
+          remark : this.remark,
           estuseQty : this.estuseQty,
         }
         saveList.push(saveData)
@@ -627,6 +669,11 @@ import {
             if (passFlag == 'N'){
               this.saveEmail(row)
             }
+          if(passFlag == 'Y'){
+            this.setUp.modelFlag = false
+          }else {
+            this.setUp.modelFlag1 = false
+          }
           }else {
             this.$alert(data.msg, '操作提示', {
               confirmButtonText: '确定',

src/views/modules/toolMan/toolOffPlane.vue

@@ -548,6 +548,8 @@ import {
         this.saveHeaderData.toolId = row.toolId
         this.saveHeaderData.site = this.site
         this.saveHeaderData.userName = this.userName
+        this.saveHeaderData.actualuseQty = row.actualuseQty
+        this.saveHeaderData.estuseQty = row.estuseQty
         this.alertModel()
       },
       // 打印方式