From 90f41f5709bc0ee010d00f5c551d878548e6f0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Fri, 28 Jul 2023 17:44:24 +0800
Subject: [PATCH] =?UTF-8?q?2023-07-28=20=E5=BC=82=E5=B8=B8=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/knifemold/tool-info.js                |  1 +
 .../modules/knifemold/tool-info-list.vue      |  2 +-
 .../modules/knifemold/toolUseQtyAssess.vue    | 64 +++++++++++++------
 3 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/api/knifemold/tool-info.js b/src/api/knifemold/tool-info.js
index f851291..497b694 100644
--- a/src/api/knifemold/tool-info.js
+++ b/src/api/knifemold/tool-info.js
@@ -49,6 +49,7 @@ export const updateReceiveToolDetail = data => createAPI(`PRHeader/updateReceive
 export const queryToolOperatorRecord = data => createAPI(`toolInfo/queryToolOperatorRecord`, 'POST', data)
 export const saveToolUseQtyAssess = data => createAPI(`toolInfo/saveToolUseQtyAssess`, 'POST', data)
 export const getToolUseQtyAssessList = data => createAPI(`toolInfo/getToolUseQtyAssessList`, 'POST', data)
+export const checkToolUseQtyAssess = data => createAPI(`toolInfo/checkToolUseQtyAssess`, 'POST', data)
 
 export const getItemModal = data => createAPI(`toolInfo/getItemModal`, 'POST', data)
 
diff --git a/src/views/modules/knifemold/tool-info-list.vue b/src/views/modules/knifemold/tool-info-list.vue
index b64ef27..0e3266f 100644
--- a/src/views/modules/knifemold/tool-info-list.vue
+++ b/src/views/modules/knifemold/tool-info-list.vue
@@ -634,7 +634,7 @@ export default {
     //  --------- 导出 end ----------
   },
   created () {
-    this.getTableUserColumn()
+    this.getDataList()
   }
 }
 </script>
diff --git a/src/views/modules/knifemold/toolUseQtyAssess.vue b/src/views/modules/knifemold/toolUseQtyAssess.vue
index 15bd54d..ddd7e8b 100644
--- a/src/views/modules/knifemold/toolUseQtyAssess.vue
+++ b/src/views/modules/knifemold/toolUseQtyAssess.vue
@@ -49,6 +49,17 @@
           border
           v-loading="dataListLoading"
           style="width: 100%;">
+          <el-table-column
+            prop="status"
+            header-align="center"
+            align="center"
+            label="状态">
+            <template slot-scope="scope">
+              <div :style="{fontWeight:'bold', color: scope.row.status === '待审核' ? 'red' : '#3ac252'}">
+                {{ scope.row.status }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             v-for="(item,index) in columnList" :key="index"
             :sortable="item.columnSortable"
@@ -102,22 +113,22 @@
       </el-form>
       <el-form :inline="true" label-position="top">
         <el-form-item :label="'预计使用寿命:'">
-          <el-input style="width: 85px;" disabled type="number" v-model="checkData.estUseQty"></el-input>
+          <el-input style="width: 120px;" disabled type="number" v-model="checkData.estUseQty"></el-input>
         </el-form-item>
         <el-form-item :label="'已使用寿命:'">
-          <el-input style="width: 85px;" disabled type="number" v-model="checkData.ActualUseQty"></el-input>
+          <el-input style="width: 120px;" disabled type="number" v-model="checkData.ActualUseQty"></el-input>
         </el-form-item>
         <el-form-item :label="'新增寿命:'">
-          <el-input style="width: 85px;" type="number" v-model="checkData.addUseQty"></el-input>
-        </el-form-item>
-        <el-form-item :label="'新预计使用寿命:'">
-          <el-input style="width: 85px;" readonly type="number" v-model="checkData.newEstUseQty"></el-input>
+          <el-input style="width: 120px;" type="number" v-model="checkData.addUseQty"></el-input>
         </el-form-item>
+<!--        <el-form-item :label="'新预计使用寿命:'">-->
+<!--          <el-input style="width: 85px;" readonly type="number" v-model="checkData.newEstUseQty"></el-input>-->
+<!--        </el-form-item>-->
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveToolUseQtyAssess()">确定</el-button>
+        <el-button type="primary" @click="checkToolUseQtyAssess()">确定</el-button>
         <el-button type="primary" @click="checkFlag = false">取消</el-button>
-    </span>
+      </span>
     </el-dialog>
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
   </div>
@@ -126,7 +137,7 @@
 <script>
 import column from '../common/column'
 import Chooselist from '@/views/modules/common/Chooselist'
-import {saveToolUseQtyAssess, getToolUseQtyAssessList} from '@/api/knifemold/tool-info.js'
+import {checkToolUseQtyAssess, getToolUseQtyAssessList} from '@/api/knifemold/tool-info.js'
 var functionId = '106001005'
 export default {
   components: {column, Chooselist},
@@ -162,11 +173,23 @@ export default {
       // ------------ 页面属性 ----------
       // 展示列集
       columnList: [
+        // {
+        //   columnProp: 'status',
+        //   headerAlign: 'center',
+        //   align: 'center',
+        //   columnLabel: '状态',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: ''
+        // },
         {
-          columnProp: 'status',
+          columnProp: 'toolId',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '状态',
+          columnLabel: '工具编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -175,10 +198,10 @@ export default {
           fixed: ''
         },
         {
-          columnProp: 'toolId',
+          columnProp: 'toolDescription',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '工具编码',
+          columnLabel: '工具名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -295,7 +318,7 @@ export default {
           fixed: ''
         },
         {
-          columnProp: 'checkerDate',
+          columnProp: 'checkDate',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '审核时间',
@@ -315,6 +338,8 @@ export default {
       exportFooter: [],
       exportDefaultValue: '',
       checkData: {
+        id: '',
+        site: this.$store.state.user.site,
         toolId: '',
         toolDescription: '',
         toolInstanceId: '',
@@ -336,11 +361,11 @@ export default {
   },
   methods: {
     /**
-     * 新增寿命评估记录
+     * 审核
      */
-    saveToolUseQtyAssess () {
-      this.checkData.status = '待审核'
-      saveToolUseQtyAssess(this.checkData).then(({data}) => {
+    checkToolUseQtyAssess () {
+      this.checkData.status = '已完成'
+      checkToolUseQtyAssess(this.checkData).then(({data}) => {
         if (data && data.code === 0) {
           this.getDataList()
           this.checkFlag = false
@@ -362,13 +387,14 @@ export default {
      * 寿命评估
      */
     checkModal (row) {
+      this.checkData.id = row.id
       this.checkData.toolId = row.toolId
       this.checkData.toolDescription = row.toolDescription
       this.checkData.toolInstanceId = row.toolInstanceId
       this.checkData.addUseQty = row.addUseQty
       this.checkData.estUseQty = row.estUseQty
       this.checkData.ActualUseQty = row.ActualUseQty
-      this.checkData.newEstUseQty = Number(row.ActualUseQty) + Number(row.addUseQty)
+      //this.checkData.newEstUseQty = Number(row.estUseQty) + Number(row.addUseQty)
       this.checkFlag = true
     },
     // ---------------  业务  -------------------