111

src/views/checkList.vue

@@ -73,8 +73,8 @@
                 <div class="recordOneContainer">
                   <div class="inspectionStandards">
                     <el-form :model="inspectJbAl2o3List">
-                      <el-form-item label="检验标准1:" label-width="80">
-                        <el-input v-model="inspectJbAl2o3List.standardOne" class="inspectionStandardsInput" />
+                      <el-form-item label="检验标准1:" label-width="80" >
+                        <el-input v-model="inspectJbAl2o3List.standardOne" @blur="getInspect" class="inspectionStandardsInput" />
                       </el-form-item>
                     </el-form>
                   </div>
@@ -134,7 +134,7 @@
                   <div class="inspectionStandards">
                     <el-form :model="inspectJbAl2o3List">
                       <el-form-item label="检验标准2:" label-width="80">
-                        <el-input v-model="inspectJbAl2o3List.standardTwo" class="inspectionStandardsInput" />
+                        <el-input v-model="inspectJbAl2o3List.standardTwo" @blur="getInspect"  class="inspectionStandardsInput" />
                       </el-form-item>
                     </el-form>
                   </div>
@@ -162,8 +162,7 @@
             </div>
 
             <div class="inspect">
-              <div class="inspectDate">检验日期: {{ inspectJbAl2o3List.date }}</div>
-              <div class="inspectTime">检验时间: {{ inspectJbAl2o3List.time }}</div>
+              <div class="inspectDate">检验日期: {{ inspectJbAl2o3List.oneJcDate }}</div>
               <div class="inspectPerson">检验人: {{ inspectJbAl2o3List.inspector }}</div>
             </div>
             <!--        计算结果-->
@@ -183,19 +182,19 @@
               <div class="recordOne">
                 <!--     标题      -->
                 <div class="recordThreeTitle">
-                  检查记录1
+                  检查记录3
                 </div>
                 <!--          检查内容-->
                 <div class="recordOneContainer">
                   <div class="inspectionStandards">
                     <el-form :model="inspectJbAl2o3List">
                       <el-form-item label="检验标准1:" label-width="80">
-                        <el-input v-model="inspectJbAl2o3List.limitOne" class="inspectionStandardsInput" />
+                        <el-input v-model="inspectJbAl2o3List.limitOne" class="inspectionStandardsInput" @blur="getInspectNext" />
                       </el-form-item>
                     </el-form>
                     <el-form :model="inspectJbAl2o3List">
                       <el-form-item label="检验标准2:" label-width="80">
-                        <el-input v-model="inspectJbAl2o3List.limitTwo" class="inspectionStandardsInput" />
+                        <el-input v-model="inspectJbAl2o3List.limitTwo" class="inspectionStandardsInput" @blur="getInspectNext" />
                       </el-form-item>
                     </el-form>
                   </div>
@@ -213,10 +212,14 @@
                       <div class="Value">{{ item.differenceValue }}</div>
                     </div>
                   </div>
+
+                  <div class="inspect">
+                    <div class="inspectDate">检验日期: {{ inspectJbAl2o3List.twoJcDate }}</div>
+                    <div class="inspectPerson">检验人: {{ inspectJbAl2o3List.inspector }}</div>
+                  </div>
                 </div>
               </div>
             </div>
-
           </div>
         </el-tab-pane>
         <el-tab-pane label="标签三" name="third">
@@ -455,7 +458,7 @@
       </div>
       <div v-if="showButton" class="submitButton">
         <el-button class="buttoon" type="primary" @click="submitControl">保存</el-button>
-        <el-button class="buttoon" type="primary" >保存</el-button>
+        <el-button class="buttoon" type="primary" @click="present">提交</el-button>
       </div>
       <div v-if="!showButton" class="submitButton">
         <el-button class="buttoon" type="primary">同意</el-button>
@@ -467,7 +470,9 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-
+import { addIncomeInspectInfo } from '@/api/oneTbale'
+import { parseTime } from '@/utils'
+import { getInfo } from '@/api/login'
 export default {
   name: 'CheckList',
   data() {
@@ -510,18 +515,17 @@ export default {
       //  表单
       inspectInfoList:{
         businessId: undefined,
-        jcPn: 'XXX',
-        jcCj: 'XXX',
-        jcCode: 'XXX',
-        jcLot: 'XXX',
-        jcNum: 'XXX',
-        jcRank: 'XX',
-        jcFacadeCy: 'XXX',
-        jcFacadeBl: 'XXX',
+        jcPn: '',
+        jcCj: '',
+        jcCode: '',
+        jcLot: '',
+        jcNum: '',
+        jcRank: '',
+        jcFacadeCy: undefined,
+        jcFacadeBl: undefined,
         jcResult: '1',
         remarks: '',
-        jcFacadeCy:'',
-        jcFacadeBl:''
+        approveStatus: '0'
       },
       //审核部分
       inspectsForm:{
@@ -532,17 +536,19 @@ export default {
       },
       // 表单二
       inspectJbAl2o3List:{
+        oneJcUser: undefined,
+        oneJcDate: undefined,
+        twoJcUser: undefined,
+        twoJcDate: undefined,
         limitOne:undefined,
         limitTwo:undefined,
         businessId: undefined,
-        standardOne: '合格',
-        standardTwo: '不合格',
+        standardOne: undefined,
+        standardTwo: undefined,
         standardOneData:undefined,
         standardTwoData:undefined,
         recordData:'',
-        date: '2023-02-15',
-        time: '12:30',
-        inspector: 'XX',
+        inspector: undefined,
         firstHdN: undefined,
         firstHdPn: undefined,
         firstHdRes: undefined,
@@ -569,237 +575,344 @@ export default {
         limitData: undefined
       },
       // 检查记录1
-      recode1: [
+      recode1: [],
+      // 检查记录2
+      recode2: [],
+      // 检查记录3
+      recode3: []
+    }
+  },
+  created() {
+    this.resetRecord()
+  },
+  methods: {
+    parseTime,
+    // 获取检验时间和检验人
+    getInspect() {
+      let time =  parseTime(new Date(),'{y}-{m}-{d} {h}:{i}:{s}')
+      this.inspectJbAl2o3List.oneJcDate = time
+      getInfo().then(res => {
+        console.log('res',res)
+        this.inspectJbAl2o3List.oneJcUser = Number(res.data.user.businessId)
+        this.inspectJbAl2o3List.inspector = res.data.user.nickName
+      })
+    },
+    getInspectNext() {
+      let time =  parseTime(new Date(),'{y}-{m}-{d} {h}:{i}:{s}')
+      this.inspectJbAl2o3List.twoJcDate = time
+      getInfo().then(res => {
+        console.log('res',res)
+        this.inspectJbAl2o3List.twoJcUser = Number(res.data.user.businessId)
+        this.inspectJbAl2o3List.inspector = res.data.user.nickName
+      })
+    },
+    // 重值
+    resetRecord(){
+      this.recode1 = [
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '',
           differenceValue1: '',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.226',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '0.002',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.225',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '0.002',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.223',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.225',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         }
-      ],
-      // 检查记录2
-      recode2: [
+      ]
+      this.recode2 = [
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '',
           differenceValue1: '',
-          differenceValue2: '71.224'
+          differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.225',
-          differenceValue: '0.02',
-          differenceValue1: '0.02',
-          differenceValue2: '71.224'
+          recordData: '',
+          differenceValue: '0.001',
+          differenceValue1: '0.001',
+          differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.226',
-          differenceValue: '0.02',
-          differenceValue1: '0.02',
-          differenceValue2: '71.224'
+          recordData: '',
+          differenceValue: '0.001',
+          differenceValue1: '0.001',
+          differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
-          differenceValue: '0.02',
-          differenceValue1: '0.02',
-          differenceValue2: '71.224'
-
+          recordData: '',
+          differenceValue: '0.002',
+          differenceValue1: '0.001',
+          differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.225',
-          differenceValue: '0.02',
-          differenceValue1: '0.02',
-          differenceValue2: '71.224'
+          recordData: '',
+          differenceValue: '0.001',
+          differenceValue1: '0.001',
+          differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
-          differenceValue: '0.02',
-          differenceValue1: '0.02',
-          differenceValue2: '71.224'
+          recordData: '',
+          differenceValue: '0.001',
+          differenceValue1: '0.001',
+          differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
-          differenceValue: '0.02',
-          differenceValue1: '0.02',
-          differenceValue2: '71.224'
+          recordData: '',
+          differenceValue: '0.002',
+          differenceValue1: '0.001',
+          differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.223',
-          differenceValue: '0.02',
-          differenceValue1: '0.02',
-          differenceValue2: '71.224'
+          recordData: '',
+          differenceValue: '0.001',
+          differenceValue1: '0.001',
+          differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
-          differenceValue: '0.02',
-          differenceValue1: '0.02',
-          differenceValue2: '71.224'
+          recordData: '',
+          differenceValue: '0.001',
+          differenceValue1: '0.001',
+          differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.225',
-          differenceValue: '0.02',
-          differenceValue1: '0.02',
-          differenceValue2: '71.224'
+          recordData: '',
+          differenceValue: '0.001',
+          differenceValue1: '0.001',
+          differenceValue2: '61.224'
         }
-      ],
-      // 检查记录3
-      recode3: [
+      ]
+      this.recode3 = [
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '',
           differenceValue1: '',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.225',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.226',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '0.002',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.225',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '0.002',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.223',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.224',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         },
         {
           // 记录数据
-          recordData: '61.225',
+          recordData: '',
           differenceValue: '0.001',
           differenceValue1: '0.001',
           differenceValue2: '61.224'
         }
       ]
-    }
-  },
-  methods: {
+    },
+    resetInspectInfo() {
+      this.inspectInfoList = {
+        businessId: undefined,
+          jcPn: '',
+          jcCj: '',
+          jcCode: '',
+          jcLot: '',
+          jcNum: '',
+          jcRank: '',
+          jcFacadeCy: undefined,
+          jcFacadeBl: undefined,
+          jcResult: '1',
+          remarks: '',
+          approveStatus: '0'
+      }
+    },
+    reaetinspectJbAl2o3List() {
+     this.inspectJbAl2o3List={
+       limitOne:undefined,
+       limitTwo:undefined,
+       businessId: undefined,
+       standardOne: undefined,
+       standardTwo: undefined,
+       standardOneData:undefined,
+       standardTwoData:undefined,
+       recordData:undefined,
+       firstHdN: undefined,
+       firstHdPn: undefined,
+       firstHdRes: undefined,
+       wxN: undefined,
+       wxPn: undefined,
+       wxRes: undefined,
+       cyN: undefined,
+       cyPn: undefined,
+       cyRes: undefined,
+       finalRes: undefined,
+       noProject: undefined,
+       wgKx: undefined,
+       wgLlw: undefined,
+       wgWlw: undefined,
+       wgJbwq: undefined,
+       wgZk: undefined,
+       wgSh: undefined,
+       wgBm: undefined,
+       wgTc: undefined,
+       wgQg: undefined,
+       wgCq: undefined,
+       wgFf: undefined,
+       wgTf: undefined,
+       limitData: undefined
+     }
+    },
     submitControl() {
       this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.recode1)
       this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.recode2)
       this.inspectJbAl2o3List.limitData = this.getStringByArray(this.recode3)
+      this.inspectInfoList.approveStatus = '0'
+      let obj = {
+        incomeInspectInfo: this.inspectInfoList,
+        incomeInspectJbAl2o3: this.inspectJbAl2o3List
+      }
+      console.log('obj',obj)
+      addIncomeInspectInfo(obj).then( response=> {
+        console.log('re',response)
+        if (response.code==200){
+          this.msgSuccess('保存成功')
+        }
+      });
+    },
+    present() {
+      this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.recode1)
+      this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.recode2)
+      this.inspectJbAl2o3List.limitData = this.getStringByArray(this.recode3)
+      this.inspectInfoList.approveStatus = '1'
       var obj = {
-        inspectInfo: this.inspectInfoList,
-        inspectJbAl2o3: this.inspectJbAl2o3List
+        incomeInspectInfo: this.inspectInfoList,
+        incomeInspectJbAl2o3: this.inspectJbAl2o3List
       }
       console.log('obj',obj)
+      addIncomeInspectInfo(obj).then( response=> {
+        console.log('re',response)
+        if (response.code==200){
+          this.msgSuccess('提交成功')
+          this.resetInspectInfo()
+          this.reaetinspectJbAl2o3List()
+          this.resetRecord()
+        }
+      });
     },
     // 根据数组得到字符串
     getStringByArray: function(recodeList) {