Merge pull request 'projects/mesxc-dy' (#378) from projects/mesxc-dy into projects/mesxc-test

Reviewed-on: #378

src/views/quality/base/qualityIsra/index.vue

@@ -199,10 +199,9 @@ export default {
       this.queryParams.lineName = this.$route.query.lineName
       this.searchBarFormConfig[2].defaultSelect = this.$route.query.lineName
     }
-    if (this.$route.query.originalGlassOutputTime) {
+    if (this.$route.query.startTime && this.$route.query.endTime) {
-      console.log('你好', this.$route.query.originalGlassOutputTime)
+      this.queryParams.startTime = parseTime(new Date(Number(this.$route.query.startTime)))
-      this.queryParams.startTime = parseTime(new Date(Number(this.$route.query.originalGlassOutputTime)))
+      this.queryParams.endTime = parseTime(new Date(Number(this.$route.query.endTime)))
-      this.queryParams.endTime = parseTime(new Date(Number(this.$route.query.originalGlassOutputTime)))
       this.searchBarFormConfig[3].defaultSelect = [
         this.queryParams.startTime,
         this.queryParams.endTime,

src/views/quality/base/qualityScrapLog/add-or-updata.vue

@@ -1,11 +1,76 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-04-09 15:14:08
+ * @LastEditTime: 2024-04-28 17:10:02
- * @LastEditors: zhp
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
+  <!-- <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-form-item label="工单号" prop="workOrderId">
+          <el-select filterable v-model="dataForm.workOrderId" placeholder="请选择工单号">
+            <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="数量" prop="num">
+          <el-input v-model="dataForm.num" placeholder="请输入数量" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="报废时间" prop="logTime">
+          <el-date-picker style="width: 100%;" v-model="dataForm.logTime" type="datetime" value-format="timestamp"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-form-item label="产线" prop="lineId">
+          <el-select v-model="dataForm.lineId" placeholder="请选择产线" @change="getWorksectionById">
+            <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="工段" prop="sectionId">
+          <el-select v-model="dataForm.sectionId" placeholder="请选择工段">
+            <el-option v-for="dict in sectionList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="报废原因" prop="detId">
+          <el-select v-model="dataForm.detId" placeholder="请选择报废原因" multiple>
+            <el-option v-for="dict in detList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="24">
+        <el-form-item label="描述" prop="description">
+          <el-input v-model="dataForm.description" type="textarea" :rows="4" placeholder="请输入描述" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-col :span="8">
+      <el-form-item label="来源" prop="source">
+        <el-select v-model="dataForm.source" placeholder="请选择来源">
+          <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
+        </el-select>
+      </el-form-item>
+    </el-col>
+    <el-col :span="8">
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dataForm.remark" placeholder="备注" />
+      </el-form-item>
+    </el-col>
+  </el-form> -->
 	<el-form
 		:model="dataForm"
 		:rules="dataRule"
@@ -166,15 +231,27 @@ export default {
 			dataForm: {
         id: undefined,
         logTime: undefined,
+        source: 2,
         detId: undefined,
         workOrderId: null,
         teamId: undefined,
         num: undefined,
-				sectionId: undefined,
+        sectionId:undefined,
-				lineId: undefined,
+        lineId:undefined,
-				description: undefined,
+        description:undefined,
         // description: undefined,
-				remark: undefined,
+        remark: undefined
+				// id: undefined,
+				// logTime: undefined,
+				// detId: undefined,
+				// workOrderId: null,
+				// teamId: undefined,
+				// num: undefined,
+				// sectionId: undefined,
+				// lineId: undefined,
+				// description: undefined,
+				// // description: undefined,
+				// remark: undefined,
 			},
 			// materialList: [],
 			dataRule: {

src/views/quality/base/qualityScrapLog/index.vue

@@ -90,7 +90,7 @@ const tableProps = [
 	{
 		prop: 'source',
 		label: '来源',
-		filter: (val) => (val == 1 ? '平板端' : '网页端'),
+		filter: (val) => ['', '平板端', '网页端'][val],
 		width: 90,
 	},
 ];

src/views/quality/monitoring/originalGlassRetrace/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: DY
- * @LastEditTime: 2024-04-26 09:58:51
+ * @LastEditTime: 2024-04-28 16:10:20
  * @Description:
 -->
 <template>
@@ -47,7 +47,7 @@
 		</el-form>
     <!-- <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
       :table-data="list"> -->
-    <base-table :max-height="tableH" :table-props="tableProps"
+    <base-table :max-height="tableH" :table-props="tableProps" :page="1" :limit="100"
       :table-data="list">
       <method-btn v-if="tableBtn.length" slot="handleBtn" :width="220" label="缺陷操作" :method-list="tableBtn"
         @clickBtn="handleClick" />
@@ -282,12 +282,31 @@ export default {
     handleClick(raw) {
 			if (raw.type === 'detail1') {
         // 原片缺陷
+        // console.log('你好', raw.data._pageIndex)
+        // const tempArray = this?.list[raw.data._pageIndex]
+        // console.log('你好tempArray', tempArray)
+        // let startTime = raw.data.originalGlassOutputTime
+        // if (tempArray) {
+        //   startTime = tempArray.originalGlassOutputTime
+        // }
+        // console.log('你好', parseTime(raw.data.originalGlassOutputTime))
+        const startTime = new Date(raw.data.originalGlassOutputTime)
+        const endTime = new Date(raw.data.originalGlassOutputTime)
+        startTime.setHours(startTime.getHours() - 1)
+        startTime.setMinutes(0)
+        startTime.setSeconds(0)
+        endTime.setHours(endTime.getHours() + 1)
+        endTime.setMinutes(0)
+        // endTime.setSeconds(0)
+        // console.log('设置时间', startTime, parseTime(startTime))
+        // console.log('设置时间11', endTime, parseTime(endTime))
 				this.$router.push({
           path: '/quality/base/quality-isra',
           query: {
             // deepProcessingLineId: raw.data.deepProcessingLineId,
             lineName: raw.data.deepProcessingLineName,
-            originalGlassOutputTime: raw.data.originalGlassOutputTime
+            endTime: endTime,
+            startTime: startTime
           },
         });
 			} else {
@@ -328,7 +347,11 @@ export default {
       } else {
         if (this.useTime === true) {
           if (this.listQuery.packTime !== null && this.listQuery.packTime !== '' && this.listQuery.lineName !== null && this.listQuery.lineName !== '') {
-            getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
+
+            getOriginalGlassRetrace({
+              lineNameList: [this.listQuery.lineName],
+               ...this.listQuery
+            }).then(res => {
               console.log(res);
               this.list = res.data || []
               console.log(this.list);