2024-07-30

QMS报表

package-lock.json

@@ -597,7 +597,7 @@
     },
     "async-validator": {
       "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
+      "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz",
       "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
       "requires": {
         "babel-runtime": "6.x"
@@ -3555,8 +3555,8 @@
     },
     "de-indent": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0="
+      "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
+      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="
     },
     "debug": {
       "version": "3.2.6",
@@ -3603,7 +3603,7 @@
     },
     "deepmerge": {
       "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
+      "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.5.2.tgz",
       "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
     },
     "default-compare": {
@@ -4021,9 +4021,9 @@
       "integrity": "sha512-lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg=="
     },
     "element-ui": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.8.2.tgz",
-      "integrity": "sha512-LABKHKGUyewFNvpf9BQLecB659Wq0XYvyP1tBveZ4RWpdlPSylDfGW/RLvDYU7zuCBoRasdZAz7ryjOwq1lLNg==",
+      "version": "2.15.14",
+      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz",
+      "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -10620,8 +10620,8 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+      "resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
     },
     "now-and-later": {
       "version": "2.0.1",
@@ -16722,7 +16722,7 @@
     },
     "resize-observer-polyfill": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
       "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
     },
     "resolve": {
@@ -18397,7 +18397,7 @@
     },
     "throttle-debounce": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
       "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
     },
     "through": {
@@ -19173,9 +19173,9 @@
       }
     },
     "vue": {
-      "version": "2.5.16",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
-      "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
+      "version": "2.6.10",
+      "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.10.tgz",
+      "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
     },
     "vue-cookie": {
       "version": "1.1.4",
@@ -19654,9 +19654,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.5.16",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz",
-      "integrity": "sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A==",
+      "version": "2.6.10",
+      "resolved": "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz",
+      "integrity": "sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==",
       "requires": {
         "de-indent": "^1.0.2",
         "he": "^1.1.0"

package.json

@@ -20,7 +20,7 @@
     "babel-polyfill": "6.26.0",
     "dayjs": "^1.10.7",
     "decimal.js": "^10.3.1",
-    "element-ui": "2.8.2",
+    "element-ui": "2.15.14",
     "file-saver": "^2.0.5",
     "gulp": "4.0.2",
     "gulp-concat": "2.6.1",
@@ -35,7 +35,7 @@
     "sass-loader": "6.0.6",
     "svg-sprite-loader": "3.7.3",
     "v-viewer": "^1.6.4",
-    "vue": "2.5.16",
+    "vue": "2.6.10",
     "vue-cookie": "1.1.4",
     "vue-i18n": "^8.25.0",
     "vue-json-excel": "^0.3.0",
@@ -97,7 +97,7 @@
     "vue-jest": "1.0.2",
     "vue-loader": "13.3.0",
     "vue-style-loader": "3.0.1",
-    "vue-template-compiler": "2.5.16",
+    "vue-template-compiler": "2.6.10",
     "webpack": "3.6.0",
     "webpack-bundle-analyzer": "2.9.0",
     "webpack-dev-server": "2.9.1",

src/api/qc/qc_report.js

@@ -0,0 +1,10 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// IQC报表查询
+export const getIQCReport = data => createAPI('/pms/qcReport/getIQCReport','post',data)
+// IPQC报表查询
+export const getIPQCReport = data => createAPI('/pms/qcReport/getIPQCReport','post',data)
+// FAI报表查询
+export const getFAIReport = data => createAPI('/pms/qcReport/getFAIReport','post',data)
+// FQC报表查询
+export const getFQCReport = data => createAPI('/pms/qcReport/getFQCReport','post',data)

src/element-ui/index.js

@@ -65,6 +65,7 @@ import {
   Header,
   Aside,
   Main,
+  Drawer,
   Footer,
   Loading,
   MessageBox,
@@ -72,6 +73,7 @@ import {
   Notification
 } from 'element-ui';
 
+Vue.use(Drawer);
 Vue.use(Pagination);
 Vue.use(Dialog);
 Vue.use(Autocomplete);

src/main.js

@@ -20,6 +20,7 @@ import decimalUtil from '@/utils/decimalUtil.js'
 import getLodop from '@/utils/LodopFuncs.js'
 // import pdf from 'vue-pdf'
 import { debounce,throttle} from '@/utils/common.js'
+import 'element-ui/lib/theme-chalk/drawer.css';
 
 import Viewer from 'v-viewer'
 import 'viewerjs/dist/viewer.css'

src/views/modules/qc/FQCResultEntry.vue

@@ -49,7 +49,6 @@
         </el-select>
       </el-form-item>
     </el-form>
-
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'PN'">
         <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
@@ -1001,7 +1000,7 @@
           site: '',
           userName: this.$store.state.user.name,
           inspectionNo: '',
-          state: '待检验',
+          state: '',
           inspectionResult: '',
           orderNo: '',
           operationDesc: '',

src/views/modules/qc/IPQCResultEntry.vue

@@ -2051,7 +2051,7 @@
             columnWidth: 80,
             columnProp: 'lotsize',
             headerAlign: "center",
-            align: "center",
+            align: "right",
             columnLabel: '工单数量',
             columnHidden: false,
             columnImage: false,
@@ -2069,7 +2069,7 @@
             columnWidth: 80,
             columnProp: 'qtyrequired',
             headerAlign: "center",
-            align: "center",
+            align: "right",
             columnLabel: '派工数量',
             columnHidden: false,
             columnImage: false,
@@ -2077,6 +2077,24 @@
             sortLv: 0,
             status: true,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table3Sjzs',
+            tableId: "301014Table3",
+            tableName: "派工单号表",
+            fixed: '',
+            columnWidth: 80,
+            columnProp: 'sjzs',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '送检总数',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301014,
@@ -2419,7 +2437,7 @@
 
     mounted () {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 210
+        this.height = window.innerHeight - 250
       })
     },