修bug

dist/css/2407.1f6aa78f.css

@@ -0,0 +1 @@
+@media screen and (max-width:2104px){.searchStyle[data-v-018c1e50]{width:1000px}}@media screen and (min-width:2105px){.searchStyle[data-v-018c1e50]{width:100%}}

dist/css/2581.fa424ad2.css

@@ -0,0 +1 @@
+.tableInner .el-input__inner{border:none;padding:0;height:33px}.samplingAdd .form-box[data-v-2adb9530]{height:100%;padding:0 32px;position:relative}.samplingAdd .form-box .first-line[data-v-2adb9530]{border-bottom:1px solid #e9e9e9;margin-bottom:23px}.samplingAdd .bottom[data-v-2adb9530]{position:absolute;bottom:0;right:32px}.standardSetting .form-box[data-v-fbc9d82a]{height:100%;padding:0 32px;position:relative}.standardSetting .bottom[data-v-fbc9d82a]{position:absolute;bottom:0;right:32px}

dist/css/299.450cca55.css

@@ -0,0 +1 @@
+.box[data-v-6ad9120b]{padding:0 32px}

dist/css/4941.cb8dd88e.css

@@ -1 +0,0 @@
-.finalInspectionData[data-v-1932e535]{width:100%}.finalInspectionData .box-top[data-v-1932e535]{width:100%;padding:8px 16px 0}.finalInspectionData .box-top .search-box[data-v-1932e535]{height:62px;padding:10px 16px;box-sizing:border-box;border-radius:8px;background-color:#fff}.finalInspectionData .box[data-v-1932e535]{width:100%;padding:8px 8px 0 16px}.finalInspectionData .box .left-box[data-v-1932e535],.finalInspectionData .box .right-box[data-v-1932e535]{height:calc(100vh - 220px);padding:16px;border-radius:8px;background-color:#fff}.finalInspectionData .box .left-box .table-box[data-v-1932e535],.finalInspectionData .box .right-box .table-box[data-v-1932e535]{margin-top:16px;height:calc(100vh - 290px);overflow:auto}.finalInspectionData .box .left-box .table-button[data-v-1932e535]{display:inline-block;height:30px;width:100%;text-align:center;padding-top:4px;margin-bottom:16px;font-size:14px;color:#0b58ff;border-radius:4px;border:1px dotted #0b58ff;cursor:pointer}.finalInspectionData .box .right-box .title[data-v-1932e535]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}

dist/css/5304.95c8a4ad.css

@@ -1 +1 @@
-.device-add .device-uploader{width:178px;height:178px;display:block}.device-add .device-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.device-add .device-uploader .el-upload:hover{border-color:#409eff}.device-add .device-uploader .avatar-uploader-icon{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.img-box[data-v-170526ff]{border:1px dashed #d9d9d9}.img-box .avatar[data-v-170526ff]{width:100%;cursor:pointer}.img-box .avatar-close-icon[data-v-170526ff]{font-size:24px;position:absolute;right:-10px;top:-10px;cursor:pointer}.main-box[data-v-50aec75c]{width:100%;padding:0 6px 0 16px}.main-box .left-box[data-v-50aec75c],.main-box .right-box[data-v-50aec75c]{border-radius:8px;background-color:#fff;overflow-y:auto;height:calc(100vh - 147px);margin-top:8px}.main-box .left-box[data-v-50aec75c]{padding:16px 0 0}.main-box .right-box[data-v-50aec75c]{padding:16px 10px 0}
+.device-add .device-uploader{width:178px;height:178px;display:block}.device-add .device-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.device-add .device-uploader .el-upload:hover{border-color:#409eff}.device-add .device-uploader .avatar-uploader-icon{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.img-box[data-v-0a02c89e]{border:1px dashed #d9d9d9}.img-box .avatar[data-v-0a02c89e]{width:100%;cursor:pointer}.img-box .avatar-close-icon[data-v-0a02c89e]{font-size:24px;position:absolute;right:-10px;top:-10px;cursor:pointer}.main-box[data-v-50aec75c]{width:100%;padding:0 6px 0 16px}.main-box .left-box[data-v-50aec75c],.main-box .right-box[data-v-50aec75c]{border-radius:8px;background-color:#fff;overflow-y:auto;height:calc(100vh - 147px);margin-top:8px}.main-box .left-box[data-v-50aec75c]{padding:16px 0 0}.main-box .right-box[data-v-50aec75c]{padding:16px 10px 0}

dist/css/6234.3ff852d9.css

@@ -0,0 +1 @@
+.finalInspectionData[data-v-6863655e]{width:100%}.finalInspectionData .box-top[data-v-6863655e]{width:100%;padding:8px 16px 0}.finalInspectionData .box-top .search-box[data-v-6863655e]{height:62px;padding:10px 16px;box-sizing:border-box;border-radius:8px;background-color:#fff}.finalInspectionData .box[data-v-6863655e]{width:100%;padding:8px 8px 0 16px}.finalInspectionData .box .left-box[data-v-6863655e],.finalInspectionData .box .right-box[data-v-6863655e]{height:calc(100vh - 220px);padding:16px;border-radius:8px;background-color:#fff}.finalInspectionData .box .left-box .table-box[data-v-6863655e],.finalInspectionData .box .right-box .table-box[data-v-6863655e]{margin-top:16px;height:calc(100vh - 290px);overflow:auto}.finalInspectionData .box .left-box .table-button[data-v-6863655e]{display:inline-block;height:30px;width:100%;text-align:center;padding-top:4px;margin-bottom:16px;font-size:14px;color:#0b58ff;border-radius:4px;border:1px dotted #0b58ff;cursor:pointer}.finalInspectionData .box .right-box .title[data-v-6863655e]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}

dist/css/640.056a6a05.css

@@ -1 +0,0 @@
-.tableInner .el-input__inner{border:none;padding:0;height:33px}.samplingAdd .form-box[data-v-7b3115e1]{height:100%;padding:0 32px;position:relative}.samplingAdd .form-box .first-line[data-v-7b3115e1]{border-bottom:1px solid #e9e9e9;margin-bottom:23px}.samplingAdd .bottom[data-v-7b3115e1]{position:absolute;bottom:0;right:32px}.standardSetting .form-box[data-v-fbc9d82a]{height:100%;padding:0 32px;position:relative}.standardSetting .bottom[data-v-fbc9d82a]{position:absolute;bottom:0;right:32px}

dist/css/6781.770b0df0.css

@@ -1 +0,0 @@
-@media screen and (max-width:2104px){.searchStyle[data-v-09b450c4]{width:1000px}}@media screen and (min-width:2105px){.searchStyle[data-v-09b450c4]{width:100%}}

dist/css/7802.25e37ece.css

@@ -1 +0,0 @@
-.box[data-v-0592f1fa]{padding:0 32px}

dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.a42f8636.js"></script><script defer="defer" src="/js/app.8c6c63a4.js"></script><link href="/css/app.68cbc19b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.a42f8636.js"></script><script defer="defer" src="/js/app.8ddc6159.js"></script><link href="/css/app.68cbc19b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

src/api/basicConfig.js

@@ -114,7 +114,15 @@ export function consumableUpdate(data) {
     data
   })
 }
-
+// 获取耗材名称列表
+export function getMaterialArr(data) {
+  return request({
+    url: '/basic/consumableConfiguration/getMaterialList',
+    method: 'post',
+    data
+  })
+}
+// 获取耗材名称ID规格和单位
 export function materialList(data) {
   return request({
     url: '/basic/consumableConfiguration/materialAndUnit',

src/api/qualityManagement.js

@@ -196,3 +196,20 @@ export function claGlassData(data) {
     data
   })
 }
+
+// 产品追溯-获取分页产品追溯
+export function productTrace(data) {
+  return request({
+    url: '/quality/productTrace/page',
+    method: 'post',
+    data
+  })
+}
+// 产品追溯-获取分页工艺流程（只用传玻璃ID）
+export function pageProcess(data) {
+  return request({
+    url: '/quality/productTrace/pageProcess',
+    method: 'post',
+    data
+  })
+}

src/views/basicConfig/components/deviceAdd.vue

@@ -329,6 +329,7 @@ export default {
       this.$refs.form.resetFields()
       this.deviceImg = ''
       this.srcList = []
+      this.unitModuleList = []
     },
     handleAvatarSuccess(res) {
       this.form.imgId = res.data[0].id

src/views/consumablesManagement/components/inAndOutManagementAdd.vue

@@ -178,7 +178,7 @@ import {
   materialManageInsert,
   materialManageDelete
 } from '@/api/consumablesManagement'
-import { sideLibraryList, materialList, getSpecList } from '@/api/basicConfig'
+import { sideLibraryList, getMaterialArr, getSpecList } from '@/api/basicConfig'
 export default {
   name: 'inAndOutManagementAdd',
   data() {
@@ -273,7 +273,7 @@ export default {
       })
     },
     getMaterialList() {
-      materialList().then((res) => {
+      getMaterialArr().then((res) => {
         if (res.code === 0) {
           this.consumablesNameList = res.data
         }

src/views/deviceManagement/maintenanceManagement/statusTag.vue

@@ -28,6 +28,8 @@ export default {
         this.tagType = 'info'
       } else if (this.injectData.status === '未完成') {
         this.tagType = 'warning'
+      } else if (this.injectData.status === '已超时') {
+        this.tagType = 'danger'
       } else {
         this.tagType = 'success'
       }

src/views/deviceManagement/spareParts/sparePartsOut.vue

@@ -198,6 +198,9 @@ export default {
           this.form.remark = res.data.remark
         })
       }
+      this.form.recipient = this.$store.getters.username
+        ? this.$store.getters.username
+        : ''
     },
     getBatchList(id) {
       getBatchList({ id }).then((res) => {

src/views/productionScheduling/workOrderManagement.vue

@@ -238,9 +238,9 @@ const tableBtn = [
       type: '&',
       data: [
         {
-          type: 'less',
+          type: 'equal',
           name: 'status',
-          value: 1
+          value: 0
         }
       ]
     }

src/views/qualityManagement/components/processFlowDetail.vue

@@ -52,14 +52,16 @@
 </template>
 <script>
 import { tableHeight } from '@/utils/index'
+import { pageProcess } from '@/api/qualityManagement'
+import { timeFormatter } from '@/utils'
 const tableProps = [
   {
-    prop: 'processName',
+    prop: 'unitName',
     label: '工序名称',
     minWidth: 120
   },
   {
-    prop: 'deviceName',
+    prop: 'eqName',
     label: '设备名称',
     minWidth: 120
   },
@@ -69,17 +71,19 @@ const tableProps = [
     minWidth: 150
   },
   {
-    prop: 'deviceLaunchTime',
+    prop: 'inEquipmentTime',
     label: '设备上片时间',
+    filter: timeFormatter,
     minWidth: 160
   },
   {
-    prop: 'deviceUnloadingTime',
+    prop: 'outEquipmentTime',
     label: '设备下片时间',
+    filter: timeFormatter,
     minWidth: 160
   },
   {
-    prop: 'grindingTrayId',
+    prop: 'palletId',
     label: '面磨托盘ID',
     minWidth: 150
   }
@@ -160,21 +164,22 @@ export default {
     }
   },
   methods: {
-    init() {
+    init(id) {
       this.visible = true
       window.addEventListener('resize', () => {
         this.tableH = tableHeight(115)
       })
-      for (let i = 0; i < 30; i++) {
-        let obj = {}
-        obj.processName = '1'
-        obj.deviceName = '设备名称' + i
-        obj.glassId = '玻璃ID' + i
-        obj.deviceLaunchTime = '2022-08-22 08:12:15'
-        obj.deviceUnloadingTime = '2022-08-22 08:12:15'
-        obj.grindingTrayId = '面磨托盘ID' + i
-        this.tableData.push(obj)
+      pageProcess({
+        current: 1,
+        glassId: id,
+        size: 500
+      }).then((res) => {
+        if (res.code === 0) {
+          this.tableData = res.data.records
+        } else {
+          this.tableData = []
         }
+      })
     },
     handleClick(val) {
       console.log(val)

src/views/qualityManagement/components/samplingAdd.vue

@@ -168,7 +168,8 @@ export default {
         this.tableH = tableHeight(250)
       })
       this.form.model = 'G8.5'
-      this.form.detectTime = moment().format('yyyy-MM-DDTHH:mm:ss')
+      // this.form.detectTime = moment().format('yyyy-MM-DD HH:mm:ss')
+      this.form.detectTime = moment().format('yyyy-MM-DD HH:mm:ss')
     },
     selectItem() {
       this.getStandard()
@@ -216,7 +217,9 @@ export default {
           for (let i of this.tableData) {
             let obj = {}
             obj.detectStandardId = i.id
-            obj.detectTime = this.form.detectTime
+            obj.detectTime = moment(this.form.detectTime).format(
+              'yyyy-MM-DDTHH:mm:ss'
+            )
             obj.detector = this.form.detector
             obj.glassId = this.form.glassId
             obj.remark = i.remark ? i.remark : ''

src/views/qualityManagement/finalInspectionData.vue

@@ -143,8 +143,8 @@ export default {
       tableHL: tableHeight(300),
       reportTitle: '',
       listQuery: {
-        startTime: '2020-07-06T16:59:23',
-        endTime: '2023-07-06T16:59:23',
+        startTime: '',
+        endTime: '',
         glassFrame: '',
         current: 1,
         size: 500

src/views/qualityManagement/processSampling.vue

@@ -32,6 +32,7 @@
 import { tableHeight, timeFormatter } from '@/utils/index'
 import SamplingAdd from './components/samplingAdd'
 import StandarSetting from './components/standardSetting'
+import moment from 'moment'
 import {
   getProcessDetectPage,
   processDetectExport
@@ -137,6 +138,7 @@ export default {
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'timeVal',
+          defaultSelect: [],
           width: 350
         },
         {
@@ -145,11 +147,6 @@ export default {
           name: 'search',
           color: 'primary'
         },
-        {
-          type: 'button',
-          btnName: '重置',
-          name: 'reset'
-        },
         {
           type: 'separate'
         },
@@ -198,6 +195,12 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = tableHeight(270)
     })
+    this.formConfig[4].defaultSelect = [
+      moment().format('yyyy-MM-DD') + 'T00:00:00',
+      moment().format('yyyy-MM-DD') + 'T23:59:59'
+    ]
+    this.listQuery.startTime = moment().format('yyyy-MM-DD') + 'T00:00:00'
+    this.listQuery.endTime = moment().format('yyyy-MM-DD') + 'T23:59:59'
     this.formConfig[0].defaultSelect = 1
     this.formConfig[1].type = 'input'
     this.formConfig[1].label = '玻璃ID'
@@ -223,17 +226,6 @@ export default {
           this.listQuery.endTime = val.timeVal ? val.timeVal[1] : ''
           this.getList()
           break
-        case 'reset':
-          this.$refs.searchBarForm.resetForm()
-          this.listQuery.glassId = ''
-          this.listQuery.detector = ''
-          this.listQuery.detectItem = ''
-          this.listQuery.startTime = ''
-          this.listQuery.endTime = ''
-          this.$nextTick(() => {
-            this.getList()
-          })
-          break
         case 'add':
           this.addOrEditTitle = '抽检录入'
           this.centervisible = true
@@ -299,6 +291,8 @@ export default {
         this.formConfig[3].type = 'select'
         this.formConfig[3].label = '检验项目'
       }
+      this.formConfig[4].defaultSelect =
+        this.$refs.searchBarForm.formInline.timeVal
     }
   }
 }

src/views/qualityManagement/productTraceability.vue

@@ -22,7 +22,12 @@
         @clickBtn="handleClick"
       />
     </base-table>
-    <pagination :limit="listQuery.size" :total="total" />
+    <pagination
+      :page.sync="listQuery.current"
+      :limit.sync="listQuery.size"
+      :total="total"
+      @pagination="getList()"
+    />
     <!-- 抽屉 -->
     <process-flow-detail v-if="processFlowVisible" ref="processFlowDetail" />
   </div>
@@ -30,15 +35,17 @@
 <script>
 import ProcessFlowDetail from './components/processFlowDetail'
 import { tableHeight } from '@/utils/index'
-import defaultSettings from '@/settings'
+import moment from 'moment'
+import { productTrace } from '@/api/qualityManagement'
+import { timeFormatter } from '@/utils'
 const tableProps = [
   {
-    prop: 'productionLine',
+    prop: 'proLineName',
     label: '产线',
     minWidth: 120
   },
   {
-    prop: 'orderCode',
+    prop: 'workOrderNo',
     label: '工单编号',
     minWidth: 120
   },
@@ -48,32 +55,34 @@ const tableProps = [
     minWidth: 150
   },
   {
-    prop: 'finishedRackId',
+    prop: 'rackId',
     label: '成品架ID',
     minWidth: 150
   },
   {
-    prop: 'productLaunchTime',
+    prop: 'loadTime',
     label: '产品上片时间',
+    filter: timeFormatter,
     minWidth: 160
   },
   {
-    prop: 'productUnloadingTime',
+    prop: 'unloadTime',
     label: '产品下片时间',
+    filter: timeFormatter,
     minWidth: 160
   },
   {
-    prop: 'glassGrade',
+    prop: 'grade',
     label: '玻璃等级',
     minWidth: 100
   },
   {
-    prop: 'grindingTrayId',
+    prop: 'palletId',
     label: '面磨托盘ID',
     minWidth: 150
   },
   {
-    prop: 'supplier',
+    prop: 'glassLength',
     label: '玻璃长度',
     minWidth: 100
   },
@@ -83,14 +92,14 @@ const tableProps = [
     minWidth: 100
   },
   {
-    prop: 'glassThickness',
+    prop: 'glassHeight',
     label: '玻璃厚度',
     minWidth: 100
   }
 ]
 const tableBtn = [
   {
-    type: 'edit',
+    type: 'view',
     btnName: '点击查看'
   }
 ]
@@ -103,30 +112,35 @@ export default {
         {
           type: 'datePicker',
           label: '产品上片时间',
-          dateType: 'datetime',
+          dateType: 'datetimerange',
           format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          placeholder: '产品上片时间',
-          param: 'testTime',
-          defaultSelect: '2022-08-17 08:20:10',
-          width: 200
+          valueFormat: 'yyyy-MM-ddTHH:mm:ss',
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 350
         },
         {
           type: 'select',
           label: '产线',
-          selectOptions: defaultSettings.productionLineList,
-          param: 'productionLine',
+          selectOptions: JSON.parse(localStorage.getItem('publicList'))
+            .proLineVoList,
+          param: 'lineName',
+          labelField: 'dataName',
+          valueField: 'dataName',
           defaultSelect: '',
-          width: 100
+          onchange: true,
+          width: 150
         },
         {
           type: 'select',
           label: '查询方式',
           selectOptions: [
-            { id: 1, name: '成品架ID' },
-            { id: 2, name: '时间查询' },
-            { id: 3, name: '玻璃ID' },
-            { id: 4, name: '托盘ID' }
+            { id: 'rackId', name: '成品架ID' },
+            { id: 'glassId', name: '玻璃ID' },
+            { id: 'palletId', name: '托盘ID' }
           ],
           param: 'inquiryMode',
           defaultSelect: '',
@@ -156,6 +170,8 @@ export default {
       tableH: tableHeight(270),
       total: 0,
       listQuery: {
+        startTime: '',
+        endTime: '',
         current: 1,
         size: 20
       },
@@ -166,45 +182,50 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = tableHeight(270)
     })
-    for (let i = 0; i < 30; i++) {
-      let obj = {}
-      obj.productionLine = '产线1'
-      obj.orderCode = '工单编号' + i
-      obj.glassId = '玻璃ID' + i
-      obj.finishedRackId = '成品架ID' + i
-      obj.productLaunchTime = '2022-08-22 08:12:15'
-      obj.productUnloadingTime = '2022-08-22 08:12:15'
-      obj.glassGrade = i
-      obj.grindingTrayId = '面磨托盘ID' + i
-      obj.supplier = 2600
-      obj.glassWidth = 2250
-      obj.glassThickness = 5
-      obj.remark = '备注' + i
-      this.tableData.push(obj)
-    }
+    this.formConfig[0].defaultSelect = [
+      moment().format('yyyy-MM-DD') + 'T00:00:00',
+      moment().format('yyyy-MM-DD') + 'T23:59:59'
+    ]
+    this.listQuery.startTime = moment().format('yyyy-MM-DD') + 'T00:00:00'
+    this.listQuery.endTime = moment().format('yyyy-MM-DD') + 'T23:59:59'
+    this.getList()
   },
   methods: {
-    getList() {},
+    getList() {
+      productTrace({ ...this.listQuery }).then((res) => {
+        if (res.code === 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
+    },
     buttonClick(val) {
-      console.log(val)
       if (val.btnName === 'search') {
+        this.listQuery.startTime = val.timeVal ? val.timeVal[0] : ''
+        this.listQuery.endTime = val.timeVal ? val.timeVal[1] : ''
+        this.listQuery.proLineName = val.lineName
+        this.listQuery.rackId =
+          val.inquiryMode === 'rackId' ? val.queryContent : ''
+        this.listQuery.glassId =
+          val.inquiryMode === 'glassId' ? val.queryContent : ''
+        this.listQuery.palletId =
+          val.inquiryMode === 'palletId' ? val.queryContent : ''
         this.getList()
       } else if (val.btnName === 'reset') {
         this.$refs.searchBarForm.resetForm()
+        this.listQuery.startTime = moment().format('yyyy-MM-DD') + 'T00:00:00'
+        this.listQuery.endTime = moment().format('yyyy-MM-DD') + 'T23:59:59'
         this.$nextTick(() => {
           this.getList()
         })
       }
     },
-    handleClick() {
+    handleClick(val) {
       this.processFlowVisible = true
-      let id = 1
+      let id = val.data.glassId
       this.$nextTick(() => {
         this.$refs.processFlowDetail.init(id)
       })
-    },
-    handleClose() {
-      console.log('========')
     }
   }
 }