diff --git a/src/views/device/anHuanInspectionReport/index.vue b/src/views/device/anHuanInspectionReport/index.vue new file mode 100644 index 0000000..8d28bd8 --- /dev/null +++ b/src/views/device/anHuanInspectionReport/index.vue @@ -0,0 +1,1117 @@ + + + + diff --git a/src/views/device/anHuanMaintenanceReport/index.vue b/src/views/device/anHuanMaintenanceReport/index.vue new file mode 100644 index 0000000..399b366 --- /dev/null +++ b/src/views/device/anHuanMaintenanceReport/index.vue @@ -0,0 +1,1239 @@ + + + + diff --git a/src/views/device/anHuanSpotInspectionReport/index.vue b/src/views/device/anHuanSpotInspectionReport/index.vue new file mode 100644 index 0000000..d5a1f00 --- /dev/null +++ b/src/views/device/anHuanSpotInspectionReport/index.vue @@ -0,0 +1,879 @@ + + + + diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index cac3d4d..17c571b 100644 --- a/src/views/device/faultReport/index.vue +++ b/src/views/device/faultReport/index.vue @@ -223,20 +223,11 @@ label="报修单号" align="center" prop="orderCode" - width="220" + width="250" :show-overflow-tooltip="true" fixed > - - diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue index 5b3dbdd..fbf8c74 100644 --- a/src/views/device/inspectionWork/index.vue +++ b/src/views/device/inspectionWork/index.vue @@ -473,6 +473,12 @@ align="center" prop="equipmentName" /> + + + @@ -689,6 +690,7 @@ export default { loopStartArray: [], orderStartArray: [], orderEndArray: [], + complianceRate: null, }, // 表单参数 form: {}, @@ -781,6 +783,7 @@ export default { loopStartArray: [], orderStartArray: [], orderEndArray: [], + complianceRate: null, }; this.resetForm("form"); }, diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue index 415a646..eb36a0f 100644 --- a/src/views/quality/checkType/index.vue +++ b/src/views/quality/checkType/index.vue @@ -89,12 +89,19 @@ @click="handleDelete(scope.row)" v-hasPermi="['quality:checkType:remove']" >删除 - 分配检检员 + >分配检验员 + diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 2ce8a72..91f64cc 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -606,6 +606,11 @@ + + + + + diff --git a/src/views/quality/qcTableDL/index.vue b/src/views/quality/qcTableDL/index.vue index 2b223fd..4486601 100644 --- a/src/views/quality/qcTableDL/index.vue +++ b/src/views/quality/qcTableDL/index.vue @@ -37,7 +37,6 @@ @@ -52,7 +51,6 @@ diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue index b5175bc..4f30660 100644 --- a/src/views/quality/qcTableXJ/index.vue +++ b/src/views/quality/qcTableXJ/index.vue @@ -17,6 +17,7 @@ @keyup.enter.native="handleQuery" /> + + + + + + 搜索 重置 @@ -155,6 +168,7 @@ export default { open: false, // 查询参数 queryParams: { + incomeTimeArray: [], pageNum: 1, pageSize: 10, checkNo: null, @@ -212,7 +226,9 @@ export default { /**获取默认查询时间段**/ getDate() { let start = this.Fungetdate (0) - this.queryParams.incomeTime =start + let end = this.Fungetdate (1) + this.queryParams.incomeTimeArray.push(start,end) + //this.queryParams.checkTimeArray.push(start,end) }, Fungetdate (num) { var dd = new Date(); @@ -231,9 +247,12 @@ export default { this.loading = true; - if(this.queryParams.incomeTime != null){ - this.queryParams.incomeTimeStr = moment(this.queryParams.incomeTime).format('YYYY-MM-DD'); - + if(this.queryParams.incomeTimeArray != null &&this.queryParams.incomeTimeArray.length>0){ + this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); + this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); + }else{ + this.queryParams.incomeTimeStart = null; + this.queryParams.incomeTimeEnd = null; } getXJCheckTableList(this.queryParams).then(response => { diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue index d23c529..9bb99f2 100644 --- a/src/views/wms/product/index.vue +++ b/src/views/wms/product/index.vue @@ -24,6 +24,14 @@ @keyup.enter.native="handleQuery" /> + + + +