From 40c65b2a13157dc0ece5a015e517735a5af9e20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Mon, 13 Nov 2023 13:02:50 +0800
Subject: [PATCH] =?UTF-8?q?2023-11-13=20=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/eam/eamWorkOrderForDefect.vue     | 91 +++++++++++--------
 src/views/modules/qc/FAIResultEntry.vue       |  6 +-
 src/views/modules/qc/FQCResultEntry.vue       |  6 +-
 src/views/modules/qc/IPQCResultEntry.vue      |  6 +-
 src/views/modules/qc/IQCResultEntry.vue       |  7 +-
 src/views/modules/qc/sub_detail_upload.vue    | 11 ++-
 6 files changed, 76 insertions(+), 51 deletions(-)

diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index e0704c5..19b8e0a 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -90,6 +90,25 @@
         :selectable="selectFlag"
         width="50">
       </el-table-column>
+      <el-table-column
+        prop="urgency"
+        header-align="center"
+        align="center"
+        label="紧急程度"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="result"
+        header-align="center"
+        align="center"
+        label="维修结论"
+        width="80">
+        <template slot-scope="scope">
+          <div :style="{fontWeight:'bold', color: scope.row.result =='维修失败' ? 'red' : scope.row.result =='维修完成' ? '#3ac252' : ''}">
+            {{ scope.row.result }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
         :sortable="item.columnSortable"
@@ -399,42 +418,42 @@
         departmentList:[],
         // 展示列集
         columnList: [
-          {
-            userId: this.$store.state.user.name,
-            functionId: 101018,
-            serialNumber: '101018TableOrderNo',
-            tableId: "101018Table",
-            tableName: "common",
-            columnProp: 'urgency',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '紧急程度',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: true,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 90,
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 101014,
-            serialNumber: '101014TableResult',
-            tableId: "101014Table",
-            tableName: "common",
-            columnProp: 'result',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '维修结论',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: true,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80,
-          },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   functionId: 101018,
+          //   serialNumber: '101018TableOrderNo',
+          //   tableId: "101018Table",
+          //   tableName: "common",
+          //   columnProp: 'urgency',
+          //   headerAlign: "center",
+          //   align: "center",
+          //   columnLabel: '紧急程度',
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: true,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          //   columnWidth: 90,
+          // },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   functionId: 101014,
+          //   serialNumber: '101014TableResult',
+          //   tableId: "101014Table",
+          //   tableName: "common",
+          //   columnProp: 'result',
+          //   headerAlign: "center",
+          //   align: "center",
+          //   columnLabel: '维修结论',
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: true,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          //   columnWidth: 80,
+          // },
           {
             userId: this.$store.state.user.name,
             functionId: 101014,
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 68c2179..a2f60ad 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -340,7 +340,7 @@
         </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
-          <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">子明细导入</el-button>
+          <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">明细导入</el-button>
         </el-form-item>
         <el-form-item  :label="' '"></el-form-item>
       </el-form>
@@ -393,7 +393,7 @@
           header-align="center"
           align="center"
           min-width="80"
-          label="子明细">
+          label="检验明细">
           <template slot-scope="scope">
             <el-button v-if="scope.row.subDetailRecordNum <= 0" type="primary" @click="subDetailModal(scope.row) ">点击输入</el-button>
             <el-button v-if="scope.row.subDetailRecordNum > 0" type="success" @click="subDetailModal(scope.row) ">点击输入</el-button>
@@ -651,7 +651,7 @@
     <!-- 上传文件的modal -->
     <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile>
     <!-- 子明细导入 -->
-    <subDetailUpload ref="subDetailUpload" @refreshPageTables="getDataList()" v-drag></subDetailUpload>
+    <subDetailUpload ref="subDetailUpload" @refreshPageTables="getInspectionFormData()" v-drag></subDetailUpload>
   </div>
 </template>
 
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 09723d9..e75af80 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -338,7 +338,7 @@
         </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
-          <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">子明细导入</el-button>
+          <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">明细导入</el-button>
         </el-form-item>
         <el-form-item :label="' '"></el-form-item>
       </el-form>
@@ -391,7 +391,7 @@
           header-align="center"
           align="center"
           min-width="80"
-          label="子明细">
+          label="检验明细">
           <template slot-scope="scope">
             <el-button v-if="scope.row.subDetailRecordNum <= 0" type="primary" @click="subDetailModal(scope.row) ">点击输入</el-button>
             <el-button v-if="scope.row.subDetailRecordNum > 0" type="success" @click="subDetailModal(scope.row) ">点击输入</el-button>
@@ -649,7 +649,7 @@
     <!-- 上传文件的modal -->
     <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile>
     <!-- 子明细导入 -->
-    <subDetailUpload ref="subDetailUpload" @refreshPageTables="getDataList()" v-drag></subDetailUpload>
+    <subDetailUpload ref="subDetailUpload" @refreshPageTables="getInspectionFormData()" v-drag></subDetailUpload>
   </div>
 </template>
 
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index ffc0f54..d577057 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -359,7 +359,7 @@
         </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
-          <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">子明细导入</el-button>
+          <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">明细导入</el-button>
         </el-form-item>
         <el-form-item  :label="' '"></el-form-item>
       </el-form>
@@ -412,7 +412,7 @@
           header-align="center"
           align="center"
           min-width="80"
-          label="子明细">
+          label="检验明细">
           <template slot-scope="scope">
             <el-button v-if="scope.row.subDetailRecordNum <= 0" type="primary" @click="subDetailModal(scope.row) ">点击输入</el-button>
             <el-button v-if="scope.row.subDetailRecordNum > 0" type="success" @click="subDetailModal(scope.row) ">点击输入</el-button>
@@ -667,7 +667,7 @@
     <!-- 上传文件的modal -->
     <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile>
     <!-- 子明细导入 -->
-    <subDetailUpload ref="subDetailUpload" @refreshPageTables="getDataList()" v-drag></subDetailUpload>
+    <subDetailUpload ref="subDetailUpload" @refreshPageTables="getInspectionFormData()" v-drag></subDetailUpload>
   </div>
 </template>
 
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index d2a2a76..0c14f17 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -210,7 +210,7 @@
         </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
-          <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">子明细导入</el-button>
+          <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">明细导入</el-button>
         </el-form-item>
         <el-form-item  :label="' '"></el-form-item>
       </el-form>
@@ -263,7 +263,7 @@
             header-align="center"
             align="center"
             min-width="80"
-            label="子明细">
+            label="检验明细">
             <template slot-scope="scope">
               <el-button v-if="scope.row.subDetailRecordNum <= 0" type="primary" @click="subDetailModal(scope.row) ">点击输入</el-button>
               <el-button v-if="scope.row.subDetailRecordNum > 0" type="success" @click="subDetailModal(scope.row) ">点击输入</el-button>
@@ -409,8 +409,9 @@
 
     <!-- 上传文件的modal -->
     <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile>
+
     <!-- 子明细导入 -->
-    <subDetailUpload ref="subDetailUpload" @refreshPageTables="getDataList()" v-drag></subDetailUpload>
+    <subDetailUpload ref="subDetailUpload" @refreshPageTables="getInspectionFormData()" v-drag></subDetailUpload>
 
   </div>
 </template>
diff --git a/src/views/modules/qc/sub_detail_upload.vue b/src/views/modules/qc/sub_detail_upload.vue
index 15bd481..885bede 100644
--- a/src/views/modules/qc/sub_detail_upload.vue
+++ b/src/views/modules/qc/sub_detail_upload.vue
@@ -71,7 +71,7 @@ export default {
       this.visible = false
     },
     /*保修当前的数据*/
-    saveUploadFile(){
+    saveUploadFile () {
       /*判断文件是否上传*/
       if(null == this.fileList || 0 === this.fileList.length){
         this.$message.error("请先上传文件!")
@@ -89,8 +89,13 @@ export default {
           this.$refs.uploadFile.clearFiles()
           // 关闭窗口并刷新页面
           this.closeDialog()
-        }else {
-          this.$message.warning(data.msg)
+        } else {
+          let message = data.msg.split(';')
+          this.$alert(message[0] + '<br/>' + message[1], '导入失败', {
+            confirmButtonText: '确定',
+            dangerouslyUseHTMLString: true
+          })
+          this.fileList = []
         }
       })
     },