From 23afb0db0d9815ed41b399a44fadabfa0cfc7d99 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 26 Apr 2024 16:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   1 +
 .../base/qualityScrapLog/add-or-updata.vue    | 470 +++++++++-------
 .../quality/base/qualityScrapLog/basic-add.js |   4 -
 .../base/qualityScrapLog/basic-page.js        |   2 +-
 .../base/qualityScrapLog/detail-or-updata.vue | 507 ++++++++++--------
 .../quality/base/qualityScrapLog/index.vue    | 366 +++++++------
 .../qualityInspectionRecord/index.vue         | 370 +++++++------
 .../Environmental/sectionProduction/index.vue |  28 +-
 .../report/qcReport/israLineReport/index.vue  |  40 +-
 9 files changed, 1007 insertions(+), 781 deletions(-)

diff --git a/.env.dev b/.env.dev
index af46599c..9a3e70a1 100644
--- a/.env.dev
+++ b/.env.dev
@@ -14,6 +14,7 @@ VUE_APP_TITLE = MES系统
 # 芋道管理系统/开发环境
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
+# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.1.101:48082'
 
diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
index 9e944998..91d6700d 100644
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -6,79 +6,144 @@
  * @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="请选择来源" multiple>
-          <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"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="auto">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="工单号"
+					prop="workOrderId">
+					<el-select
+						filterable
+						v-model="dataForm.workOrderId"
+						placeholder="请选择工单号"
+						style="width: 100%">
+						<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="12">
+				<el-form-item
+					label="数量"
+					prop="num"
+					style="width: 100%">
+					<el-input
+						v-model="dataForm.num"
+						placeholder="请输入数量" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="产线"
+					prop="lineId">
+					<el-select
+						v-model="dataForm.lineId"
+						placeholder="请选择产线"
+						@change="getWorksectionById"
+						style="width: 100%">
+						<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="12">
+				<el-form-item
+					label="工段"
+					prop="sectionId">
+					<el-select
+						v-model="dataForm.sectionId"
+						placeholder="请选择工段"
+						style="width: 100%">
+						<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="12">
+				<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-col :span="12">
+				<el-form-item
+					label="报废原因"
+					prop="detId">
+					<el-select
+						v-model="dataForm.detId"
+						placeholder="请选择报废原因"
+						multiple
+						style="width: 100%">
+						<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="请输入描述"
+						style="width: 100%" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-col :span="24">
+			<el-form-item
+				label="备注"
+				prop="remark">
+				<el-input
+					v-model="dataForm.remark"
+					placeholder="备注"
+					style="width: 100%" />
+			</el-form-item>
+		</el-col>
+	</el-form>
 </template>
 
 <script>
 import basicAdd from './basic-add';
 import {
-  createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
-  getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
-import { getList,} from "@/api/base/qualityScrapType";
+	createQualityScrapLog,
+	updateQualityScrapLog,
+	getQualityScrapLog,
+	getWorkOrderList,
+	getTeamList,
+	getDetList,
+	getLineList,
+} from '@/api/base/qualityScrapLog';
+import { getList } from '@/api/base/qualityScrapType';
 // import { getMaterialList } from "@/api/base/material";
 import moment from 'moment';
 export default {
@@ -86,154 +151,149 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-			  isGetCode: false,
-        // codeURL: getCode,
-        createURL: createQualityScrapLog,
-        updateURL: updateQualityScrapLog,
-        infoURL: getQualityScrapLog,
-      },
-      lineList:[],
-      typeList: [],
-      workOrderList: [],
-      detList:[],
-      teamList: [],
-      sectionList:[],
-      sourceList: [
-        {
-          id: 1,
-          name: '平板端',
-        },
-        {
-          id: 2,
-          name: '网页端',
-        }
-      ],
+				isGetCode: false,
+				// codeURL: getCode,
+				createURL: createQualityScrapLog,
+				updateURL: updateQualityScrapLog,
+				infoURL: getQualityScrapLog,
+			},
+			lineList: [],
+			typeList: [],
+			workOrderList: [],
+			detList: [],
+			teamList: [],
+			sectionList: [],
 			dataForm: {
-        id: undefined,
-        logTime: undefined,
-        source:1,
-        detId: undefined,
-        workOrderId: null,
-        teamId: undefined,
-        num: undefined,
-        sectionId:undefined,
-        lineId:undefined,
-        description:undefined,
-        // description: 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: {
 				// materialId: [{ required: true, message: "", trigger: "blur" }],
-        workOrderId: [{ required: true, message: "工单号不能为空", trigger: "change" }],
-        num: [{ required: true, message: "数量不能为空", trigger: "blur" }],
-        detId: [{ required: true, message: "报废原因不能为空", trigger: "change" }],
+				workOrderId: [
+					{ required: true, message: '工单号不能为空', trigger: 'change' },
+				],
+				num: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+				detId: [
+					{ required: true, message: '报废原因不能为空', trigger: 'change' },
+				],
 
-        logTime: [{ required: true, message: "报废时间不能为空", trigger: "change" }],
-      }
+				logTime: [
+					{ required: true, message: '报废时间不能为空', trigger: 'change' },
+				],
+			},
 		};
 	},
 	mounted() {
-		this.getDict()
-    console.log('我看看', this.dataForm)
-    // this.getCurrentTime()
-    // this.dataForm.logTime = new Date()
+		this.getDict();
+		console.log('我看看', this.dataForm);
+		// this.getCurrentTime()
+		// this.dataForm.logTime = new Date()
 	},
-  methods: {
-    // getCurrentTime() {
-    //   // new Date().Format("yyyy-MM-dd HH:mm:ss")
-    //   // this.dataForm.logTime = year + "-" + month + "-" + day;
-    //   // console.log(this.dataForm.logTime);
-    // },
+	methods: {
+		// getCurrentTime() {
+		//   // new Date().Format("yyyy-MM-dd HH:mm:ss")
+		//   // this.dataForm.logTime = year + "-" + month + "-" + day;
+		//   // console.log(this.dataForm.logTime);
+		// },
 		async getDict() {
-      // 物料列表
-      const res = await getList()
-      this.typeList = res.data
-      getWorkOrderList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.workOrderList = res.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-      getLineList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.lineList = res.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-      getDetList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.detList = res.data.map((item) => {
-          return {
-            name: item.content,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-      getTeamList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.teamList = res.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-    },
-    async getWorksectionById(lineId) {
-      if (lineId) {
-        const { code, data } = await this.$axios({
-          url: '/base/core-workshop-section/listByParentId',
-          method: 'get',
-          params: {
-            id: lineId,
-          },
-        });
-        if (code == 0) {
-          console.log(data)
-          this.sectionList = data.map((item) => {
-            return {
-              name: item.name,
-              id: item.id,
-            };
-          });
-        }
-      } else {
-        this.$axios({
-          url: '/base/core-workshop-section/listAll',
-          method: 'get',
-          // params: {
-          //   id: lineId,
-          // },
-        }).then((res) => {
-          // console.log(data)
-          this.sectionList = res.data.map((item) => {
-            return {
-              name: item.name,
-              id: item.id,
-            };
-          });
-        })
-      }
-    },
+			// 物料列表
+			const res = await getList();
+			this.typeList = res.data;
+			getWorkOrderList().then((res) => {
+				console.log(res);
+				// console.log(response);
+				this.workOrderList = res.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+			getLineList().then((res) => {
+				console.log(res);
+				// console.log(response);
+				this.lineList = res.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+			getDetList().then((res) => {
+				console.log(res);
+				// console.log(response);
+				this.detList = res.data.map((item) => {
+					return {
+						name: item.content,
+						id: item.id,
+					};
+				});
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+			getTeamList().then((res) => {
+				console.log(res);
+				// console.log(response);
+				this.teamList = res.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+		},
+		async getWorksectionById(lineId) {
+			if (lineId) {
+				const { code, data } = await this.$axios({
+					url: '/base/core-workshop-section/listByParentId',
+					method: 'get',
+					params: {
+						id: lineId,
+					},
+				});
+				if (code == 0) {
+					console.log(data);
+					this.sectionList = data.map((item) => {
+						return {
+							name: item.name,
+							id: item.id,
+						};
+					});
+				}
+			} else {
+				this.$axios({
+					url: '/base/core-workshop-section/listAll',
+					method: 'get',
+					// params: {
+					//   id: lineId,
+					// },
+				}).then((res) => {
+					// console.log(data)
+					this.sectionList = res.data.map((item) => {
+						return {
+							name: item.name,
+							id: item.id,
+						};
+					});
+				});
+			}
+		},
 		// setMaterialCode() {
 		// 	const chooseM = this.materialList.filter(item => {
 		// 		return item.id === this.dataForm.materialId
diff --git a/src/views/quality/base/qualityScrapLog/basic-add.js b/src/views/quality/base/qualityScrapLog/basic-add.js
index 376156f1..f2f76a74 100644
--- a/src/views/quality/base/qualityScrapLog/basic-add.js
+++ b/src/views/quality/base/qualityScrapLog/basic-add.js
@@ -58,10 +58,6 @@ export default {
             this.dataForm.detId = response.data.detIdList
             this.getWorksectionById(this.dataForm.lineId)
             this.dataForm.logTime = new Date(response.data.logTime)
-
-            // if (this.setData) {
-            //   this.setDataForm()
-            // }
           });
         } else {
           if (this.urlOptions.isGetCode) {
diff --git a/src/views/quality/base/qualityScrapLog/basic-page.js b/src/views/quality/base/qualityScrapLog/basic-page.js
index a7c9f3fa..4ca6b010 100644
--- a/src/views/quality/base/qualityScrapLog/basic-page.js
+++ b/src/views/quality/base/qualityScrapLog/basic-page.js
@@ -24,7 +24,7 @@ export default {
       },
       tableData: [],
       listQuery: {
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 1,
       },
diff --git a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
index 32e0b484..13a04351 100644
--- a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
@@ -6,239 +6,322 @@
  * @Description:
 -->
 <template>
-  <el-dialog :visible.sync="visible" width="50%">
-    <small-title slot="title" :no-padding="true">
-      {{ '详情' }}
-    </small-title>
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
-      label-width="auto">
-      <el-row :gutter="24">
-        <el-col :span="8">
-          <el-form-item label="工单号" prop="workOrderId">
-            <el-select disabled 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 disabled v-model="dataForm.num" placeholder="请输入数量" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="报废时间" prop="logTime">
-            <el-date-picker disabled v-model="dataForm.logTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-              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 disabled 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="请选择工段" disabled>
-              <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 disabled>
-              <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="remark">
-          <el-input v-model="dataForm.remark" placeholder="备注" />
-        </el-form-item>
-      </el-col>
-    </el-form>
-  </el-dialog>
-
+	<el-dialog
+		:visible.sync="visible"
+		width="50%">
+		<small-title
+			slot="title"
+			:no-padding="true">
+			{{ '详情' }}
+		</small-title>
+		<el-form
+			:model="dataForm"
+			:rules="dataRule"
+			ref="dataForm"
+			@keyup.enter.native="dataFormSubmit()"
+			label-width="auto">
+			<el-row :gutter="24">
+				<el-col :span="8">
+					<el-form-item
+						label="工单号"
+						prop="workOrderId">
+						<el-select
+							disabled
+							v-model="dataForm.workOrderId"
+							placeholder="请选择工单号"
+							style="width: 100%">
+							<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
+							disabled
+							v-model="dataForm.num"
+							placeholder="请输入数量"
+							style="width: 100%" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item
+						label="报废时间"
+						prop="logTime"
+						style="width: 100%">
+						<el-date-picker
+							disabled
+							v-model="dataForm.logTime"
+							type="datetime"
+							value-format="yyyy-MM-dd HH:mm:ss"
+							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
+							disabled
+							v-model="dataForm.lineId"
+							placeholder="请选择产线"
+							@change="getWorksectionById"
+							style="width: 100%">
+							<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="请选择工段"
+							disabled
+							style="width: 100%">
+							<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
+							disabled
+							style="width: 100%">
+							<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-col :span="24">
+					<el-form-item
+						label="备注"
+						prop="remark">
+						<el-input
+							v-model="dataForm.remark"
+							placeholder="备注" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+	</el-dialog>
 </template>
 
 <script>
 import basicAdd from './basic-add';
 import {
-  createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
-  getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
-import { getList,} from "@/api/base/qualityScrapType";
+	createQualityScrapLog,
+	updateQualityScrapLog,
+	getQualityScrapLog,
+	getWorkOrderList,
+	getTeamList,
+	getDetList,
+	getLineList,
+} from '@/api/base/qualityScrapLog';
+import { getList } from '@/api/base/qualityScrapType';
 import SmallTitle from './SmallTitle';
 export default {
-  components: {
-    SmallTitle,
-  },
+	components: {
+		SmallTitle,
+	},
 	mixins: [basicAdd],
 	data() {
 		return {
 			urlOptions: {
-			  isGetCode: false,
-        // codeURL: getCode,
-        createURL: createQualityScrapLog,
-        updateURL: updateQualityScrapLog,
-        infoURL: getQualityScrapLog,
-      },
-      lineList:[],
-      typeList: [],
-      workOrderList: [],
-      detList:[],
-      teamList: [],
-      sourceList: [
-        {
-          id: 1,
-          name: '手动',
-        },
-        {
-          id: 2,
-          name: '自动',
-        }
-      ],
-      sectionList:[],
-      visible:false,
+				isGetCode: false,
+				// codeURL: getCode,
+				createURL: createQualityScrapLog,
+				updateURL: updateQualityScrapLog,
+				infoURL: getQualityScrapLog,
+			},
+			lineList: [],
+			typeList: [],
+			workOrderList: [],
+			detList: [],
+			teamList: [],
+			sourceList: [
+				{
+					id: 1,
+					name: '手动',
+				},
+				{
+					id: 2,
+					name: '自动',
+				},
+			],
+			sectionList: [],
+			visible: false,
 			dataForm: {
-        id: undefined,
-        logTime: undefined,
-        source:1,
-        detId: undefined,
-        workOrderId: null,
-        teamId: undefined,
-        num: undefined,
-        lineId:undefined,
-        description:undefined,
-        // description: undefined,
-        remark: undefined,
+				id: undefined,
+				logTime: undefined,
+				source: 1,
+				detId: undefined,
+				workOrderId: null,
+				teamId: undefined,
+				num: undefined,
+				lineId: undefined,
+				description: undefined,
+				// description: undefined,
+				remark: undefined,
 			},
 			// materialList: [],
 			dataRule: {
 				// materialId: [{ required: true, message: "", trigger: "blur" }],
-        workOrderId: [{ required: true, message: "工单号不能为空", trigger: "change" }],
-        num: [{ required: true, message: "数量不能为空", trigger: "blur" }],
-        detId: [{ required: true, message: "报废原因不能为空", trigger: "change" }],
+				workOrderId: [
+					{ required: true, message: '工单号不能为空', trigger: 'change' },
+				],
+				num: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+				detId: [
+					{ required: true, message: '报废原因不能为空', trigger: 'change' },
+				],
 
-        logTime: [{ required: true, message: "报废时间不能为空", trigger: "change" }],
-      }
+				logTime: [
+					{ required: true, message: '报废时间不能为空', trigger: 'change' },
+				],
+			},
 		};
 	},
 	mounted() {
-		this.getDict()
-    console.log('我看看', this.dataForm)
-    // this.getCurrentTime()
+		this.getDict();
+		console.log('我看看', this.dataForm);
+		// this.getCurrentTime()
 	},
-  methods: {
-    // init() {
-    //   this.dialogVisible = true
-    // },
-    // getCurrentTime() {
-    //   // new Date().Format("yyyy-MM-dd HH:mm:ss")
-    //   this.dataForm.logTime = new Date()
-    //   // this.dataForm.logTime = year + "-" + month + "-" + day;
-    //   console.log(this.dataForm.logTime);
-    // },
-    async getDict() {
-      // 物料列表
-      const res = await getList()
-      this.typeList = res.data
-      getWorkOrderList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.workOrderList = res.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-      getLineList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.lineList = res.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-      getDetList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.detList = res.data.map((item) => {
-          return {
-            name: item.content,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-      getTeamList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.teamList = res.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-    },
-    async getWorksectionById(lineId) {
-      if (lineId) {
-        const { code, data } = await this.$axios({
-          url: '/base/core-workshop-section/listByParentId',
-          method: 'get',
-          params: {
-            id: lineId,
-          },
-        });
-        if (code == 0) {
-          console.log(data)
-          this.sectionList = data.map((item) => {
-            return {
-              name: item.name,
-              id: item.id,
-            };
-          });
-        }
-      } else {
-        this.$axios({
-          url: '/base/core-workshop-section/listAll',
-          method: 'get',
-          // params: {
-          //   id: lineId,
-          // },
-        }).then((res) => {
-          // console.log(data)
-          this.sectionList = res.data.map((item) => {
-            return {
-              name: item.name,
-              id: item.id,
-            };
-          });
-        })
-      }
-    },
+	methods: {
+		// init() {
+		//   this.dialogVisible = true
+		// },
+		// getCurrentTime() {
+		//   // new Date().Format("yyyy-MM-dd HH:mm:ss")
+		//   this.dataForm.logTime = new Date()
+		//   // this.dataForm.logTime = year + "-" + month + "-" + day;
+		//   console.log(this.dataForm.logTime);
+		// },
+		async getDict() {
+			// 物料列表
+			const res = await getList();
+			this.typeList = res.data;
+			getWorkOrderList().then((res) => {
+				console.log(res);
+				// console.log(response);
+				this.workOrderList = res.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+			getLineList().then((res) => {
+				console.log(res);
+				// console.log(response);
+				this.lineList = res.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+			getDetList().then((res) => {
+				console.log(res);
+				// console.log(response);
+				this.detList = res.data.map((item) => {
+					return {
+						name: item.content,
+						id: item.id,
+					};
+				});
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+			getTeamList().then((res) => {
+				console.log(res);
+				// console.log(response);
+				this.teamList = res.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+		},
+		async getWorksectionById(lineId) {
+			if (lineId) {
+				const { code, data } = await this.$axios({
+					url: '/base/core-workshop-section/listByParentId',
+					method: 'get',
+					params: {
+						id: lineId,
+					},
+				});
+				if (code == 0) {
+					console.log(data);
+					this.sectionList = data.map((item) => {
+						return {
+							name: item.name,
+							id: item.id,
+						};
+					});
+				}
+			} else {
+				this.$axios({
+					url: '/base/core-workshop-section/listAll',
+					method: 'get',
+					// params: {
+					//   id: lineId,
+					// },
+				}).then((res) => {
+					// console.log(data)
+					this.sectionList = res.data.map((item) => {
+						return {
+							name: item.name,
+							id: item.id,
+						};
+					});
+				});
+			}
+		},
 	},
 };
 </script>
diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue
index d03bc214..d3d273d1 100644
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -1,19 +1,45 @@
 <template>
-  <div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
-      :limit="listQuery.pageSize" :table-data="tableData">
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-        @clickBtn="handleClick" />
-    </base-table>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getDataList" />
-    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
-      @confirm="handleConfirm" :before-close="handleCancel" width="50%">
-      <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
-    </base-dialog>
-    <detail-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" @refreshDataList="successSubmit" />
-  </div>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			:max-height="tableH"
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+		<detail-or-update
+			v-if="detailOrUpdateVisible"
+			ref="detailOrUpdate"
+			@refreshDataList="successSubmit" />
+	</div>
 </template>
 
 <script>
@@ -23,201 +49,211 @@ import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import basicPage from './basic-page';
 import { parseTime } from '../../../core/mixins/code-filter';
 import {
-  getQualityScrapLogPage,
-  deleteQualityScrapLog,
-  getWorkOrderList,
-  // getTeamList
+	getQualityScrapLogPage,
+	deleteQualityScrapLog,
+	getWorkOrderList,
+	// getTeamList
 } from '@/api/base/qualityScrapLog';
 
 const tableProps = [
-	// {
-	// 	prop: 'createTime',
-	// 	label: '添加时间',
-	// 	filter: parseTime
-  // },
-  {
-    prop: 'createTime',
-    label: '报废时间',
-    filter: parseTime
-  },
-  {
-    prop: 'lineName',
-    label: '产线名称'
-  },
-  {
-    prop: 'sectionName',
-    label: '工段'
-  },
-  {
-    prop: 'workOrderName',
-    label: '工单名称'
-  },
-  {
-    prop: 'num',
-    label: '数量'
-  },
 	{
-    prop: 'detContent',
-    label: '报废原因'
-  },
-  {
-    prop: 'source',
-    label: '来源',
-    filter: (val) => val == 1 ? '平板端' : '网页端'
-  },
+		prop: 'createTime',
+		label: '报废时间',
+		filter: parseTime,
+		width: 160,
+	},
+	{
+		prop: 'lineName',
+		label: '产线名称',
+		width: 90,
+	},
+	{
+		prop: 'sectionName',
+		label: '工段',
+		minWidth: 100,
+	},
+	{
+		prop: 'workOrderName',
+		label: '工单名称',
+		minWidth: 160,
+	},
+	{
+		prop: 'num',
+		label: '数量',
+		width: 90,
+	},
+	{
+		prop: 'detContent',
+		label: '报废原因',
+		minWidth: 160,
+	},
+	{
+		prop: 'source',
+		label: '来源',
+		filter: (val) => (val == 1 ? '平板端' : '网页端'),
+		width: 90,
+	},
 ];
 
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
-        getDataListURL: getQualityScrapLogPage,
-        deleteURL: deleteQualityScrapLog,
+				getDataListURL: getQualityScrapLogPage,
+				deleteURL: deleteQualityScrapLog,
 				// exportURL: exportFactoryExcel,
 			},
 			tableProps,
 			tableBtn: [
-        this.$auth.hasPermi(`base:quality-scrap-log:update`)
+				this.$auth.hasPermi(`base:quality-scrap-log:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
-          : undefined,
-        this.$auth.hasPermi(`base:quality-scrap-log:detail`)
-          ? {
-            type: 'detail',
-            btnName: '详情',
-          }
-          : undefined,
-        this.$auth.hasPermi(`base:quality-scrap-log:delete`)
+					: undefined,
+				this.$auth.hasPermi(`base:quality-scrap-log:detail`)
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:quality-scrap-log:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
-			].filter((v)=>v),
-      tableData: [],
-      detailOrUpdateVisible:false,
+			].filter((v) => v),
+			tableData: [],
+			detailOrUpdateVisible: false,
 			formConfig: [
-        {
-          type: 'select',
-          label: '工单',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'workOrderId',
-          filterable: true
-        },
-        // {
-        //   type: 'select',
-        //   label: '班组',
-        //   selectOptions: [],
-        //   labelField: 'name',
-        //   valueField: 'id',
-        //   param: 'teamId',
-        //   filterable: true
-        // },
 				{
-          type: this.$auth.hasPermi('base:quality-scrap-det:query') ? 'button' : '',
+					type: 'select',
+					label: '工单',
+					selectOptions: [],
+					labelField: 'name',
+					valueField: 'id',
+					param: 'workOrderId',
+					filterable: true,
+				},
+				// {
+				//   type: 'select',
+				//   label: '班组',
+				//   selectOptions: [],
+				//   labelField: 'name',
+				//   valueField: 'id',
+				//   param: 'teamId',
+				//   filterable: true
+				// },
+				{
+					type: this.$auth.hasPermi('base:quality-scrap-det:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
-        {
-          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'separate' : '',
+				{
+					type: this.$auth.hasPermi('base:quality-scrap-det:create')
+						? 'separate'
+						: '',
 					// type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:quality-scrap-det:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-					plain: true
+					plain: true,
 				},
 			],
 		};
 	},
 	components: {
-    AddOrUpdate,
-    DetailOrUpdate
+		AddOrUpdate,
+		DetailOrUpdate,
 	},
-  mounted() {
-    this.getDict()
-    this.getDataList()
-  },
-  methods: {
-    otherMethods(val) {
-      if (val.type === 'detail') {
-        this.detailOrUpdateVisible = true;
-        // this.addOrEditTitle = "详情";
-        this.$nextTick(() => {
-          this.$refs.detailOrUpdate.init(val.data.id, true);
-        });
-      }
-    },
-    deleteHandle(id, name, index, data) {
-      this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-              duration: 1500,
-              onClose: () => {
-                this.getDataList();
-              },
-            });
-          });
-        })
-        .catch(() => { });
-    },
-    // 获取数据列表
-    getDict() {
-      getWorkOrderList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.formConfig[0].selectOptions = res.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-      // getTeamList().then((res) => {
-      //   console.log(res);
-      //   // console.log(response);
-      //   this.formConfig[1].selectOptions = res.data.map((item) => {
-      //     return {
-      //       name: item.name,
-      //       id: item.id
-      //     }
-      //   })
-      //   // console.log(this.formConfig[0].selectOptions);
-      //   // this.listQuery.total = response.data.total;
-      // })
-    },
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
+	mounted() {
+		this.getDict();
+		this.getDataList();
+	},
+	methods: {
+		otherMethods(val) {
+			if (val.type === 'detail') {
+				this.detailOrUpdateVisible = true;
+				// this.addOrEditTitle = "详情";
+				this.$nextTick(() => {
+					this.$refs.detailOrUpdate.init(val.data.id, true);
+				});
+			}
+		},
+		deleteHandle(id, name, index, data) {
+			this.$confirm(`确认要删除序号为${index}的数据项?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					this.urlOptions.deleteURL(id).then(({ data }) => {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList();
+							},
+						});
+					});
+				})
+				.catch(() => {});
+		},
+		// 获取数据列表
+		getDict() {
+			getWorkOrderList().then((res) => {
+				console.log(res);
+				// console.log(response);
+				this.formConfig[0].selectOptions = res.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+			// getTeamList().then((res) => {
+			//   console.log(res);
+			//   // console.log(response);
+			//   this.formConfig[1].selectOptions = res.data.map((item) => {
+			//     return {
+			//       name: item.name,
+			//       id: item.id
+			//     }
+			//   })
+			//   // console.log(this.formConfig[0].selectOptions);
+			//   // this.listQuery.total = response.data.total;
+			// })
+		},
+		getDataList() {
+			this.dataListLoading = true;
+			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+				this.tableData = response.data.list;
+				this.listQuery.total = response.data.total;
+				this.dataListLoading = false;
+			});
+		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 20;
-          this.listQuery.workOrderId = val.workOrderId ? val.workOrderId : undefined;
-          // this.listQuery.teamId = val.teamId ? val.teamId : undefined;
+					this.listQuery.workOrderId = val.workOrderId
+						? val.workOrderId
+						: undefined;
+					// this.listQuery.teamId = val.teamId ? val.teamId : undefined;
 					this.getDataList();
 					break;
 				case 'reset':
@@ -227,7 +263,7 @@ export default {
 						pageNo: 1,
 						total: 1,
 					};
-					this.getDataList()
+					this.getDataList();
 					break;
 				case 'add':
 					this.addOrEditTitle = '新增';
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/index.vue b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
index ae818d58..7bab78e6 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@@ -1,26 +1,52 @@
 <template>
-  <div class="app-container">
-    <!-- 搜索工作栏 -->
-    <SearchBar :isFold="true" :formConfigs="searchBarFormConfig" ref="search-bar"
-      @headBtnClick="handleSearchBarBtnClick" />
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:isFold="true"
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
 
-    <!-- 列表 -->
-    <base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
-      @emitFun="handleEmitFun">
-      <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
-        @clickBtn="handleTableBtnClick" />
-    </base-table>
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="90"
+				fixed="right"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
 
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
 
-    <!-- 对话框(添加 / 修改) -->
-    <base-dialog :dialogTitle="title" :dialogVisible="open" width="50%" @close="cancel" @cancel="cancel"
-      @confirm="submitForm">
-      <DialogForm v-if="open" ref="form" v-model="form" />
-    </base-dialog>
-  </div>
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="50%"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form" />
+		</base-dialog>
+	</div>
 </template>
 
 <script>
@@ -37,27 +63,34 @@ import moment from 'moment';
 import DialogForm from './dialogForm.vue';
 
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 export default {
 	name: 'QualityInspectionRecord',
 	components: {
 		DialogForm,
 	},
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
-      rows: [
-        [
-          {
-            select: true,
-            label: '工单名称',
-            url: 'base/core-work-order/listbyfilter',
-            prop: 'workOrderId',
-            rules: [{ required: true, message: '工单名称不能为空', trigger: 'change' }],
-            bind: {
-              filterable: true,
-            },
-          }
-        ],
+			rows: [
+				[
+					{
+						select: true,
+						label: '工单名称',
+						url: 'base/core-work-order/listbyfilter',
+						prop: 'workOrderId',
+						rules: [
+							{
+								required: true,
+								message: '工单名称不能为空',
+								trigger: 'change',
+							},
+						],
+						bind: {
+							filterable: true,
+						},
+					},
+				],
 				[
 					{
 						select: true,
@@ -65,7 +98,9 @@ export default {
 						url: '/base/quality-inspection-det/listAll',
 						prop: 'inspectionDetId',
 						labelKey: 'content',
-						rules: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '检测内容不能为空', trigger: 'blur' },
+						],
 						bind: {
 							filterable: true,
 						},
@@ -93,7 +128,9 @@ export default {
 						bind: {
 							filterable: true,
 						},
-						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '产线不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						select: true,
@@ -113,7 +150,6 @@ export default {
 						label: '检测人员',
 						prop: 'checkPerson',
 					},
-
 				],
 				[{ textarea: true, label: '描述', prop: 'explainText' }],
 				[{ input: true, label: '备注', prop: 'remark' }],
@@ -121,32 +157,32 @@ export default {
 			searchBarFormConfig: [
 				{
 					type: 'select',
-          label: '工单名称',
-          placeholder: '请选择工单名称',
+					label: '工单名称',
+					placeholder: '请选择工单名称',
 					param: 'workOrderId',
-          selectOptions: [],
-          filterable:true
+					selectOptions: [],
+					filterable: true,
 				},
 				{
-          type: 'select',
+					type: 'select',
 					label: '检测内容',
-          placeholder: '请输入检测内容',
-          selectOptions: [],
-          param: 'inspectionDetContent',
-          filterable: true
-        },
-        {
-          type: 'select',
-          label: '检测人员',
-          placeholder: '请选择检测人员',
-          selectOptions: [],
-          param: 'checkPerson',
-          filterable: true,
-          multiple:true,
-        },
+					placeholder: '请输入检测内容',
+					selectOptions: [],
+					param: 'inspectionDetContent',
+					filterable: true,
+				},
+				{
+					type: 'select',
+					label: '检测人员',
+					placeholder: '请选择检测人员',
+					selectOptions: [],
+					param: 'checkPerson',
+					filterable: true,
+					multiple: true,
+				},
 				{
 					type: 'datePicker',
-					label: '时间段',
+					label: '检测时间',
 					dateType: 'daterange', // datetimerange
 					// format: 'yyyy-MM-dd HH:mm:ss',
 					format: 'yyyy-MM-dd',
@@ -159,27 +195,21 @@ export default {
 					// width: 350,
 				},
 				{
-          type: this.$auth.hasPermi(
-            'base:quality-inspection-record:query'
-          )
-            ? 'button'
-            : '',
+					type: this.$auth.hasPermi('base:quality-inspection-record:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
-        {
-          type: this.$auth.hasPermi(
-            'base:quality-inspection-record:create'
-          )
-            ? 'separate'
-            : '',
+				{
+					type: this.$auth.hasPermi('base:quality-inspection-record:create')
+						? 'separate'
+						: '',
 					// type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi(
-						'base:quality-inspection-record:create'
-					)
+					type: this.$auth.hasPermi('base:quality-inspection-record:create')
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -195,7 +225,7 @@ export default {
 							btnName: '修改',
 					  }
 					: undefined,
-        this.$auth.hasPermi('base:quality-inspection-record:delete')
+				this.$auth.hasPermi('base:quality-inspection-record:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -207,64 +237,66 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
+					width: 160,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-        },
-        {
-          // width: 128,
-          prop: 'workOrderName',
-          label: '工单名称',
-        },
-        {
-          // width: 128,
-          prop: 'productionLineName',
-          label: '产线',
-        },
-        {
-          // width: 128,
-          prop: 'sectionName',
-          label: '工段',
-        },
+				},
+				{
+					prop: 'workOrderName',
+					label: '工单名称',
+					minWidth: 180,
+					showOverflowtooltip: true,
+				},
 				{
-					// width: 128,
 					prop: 'inspectionDetContent',
 					label: '检测内容',
+					minWidth: 180,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'productionLineName',
+					label: '产线',
+					minWidth: 80,
+				},
+				{
+					prop: 'sectionName',
+					label: '工段',
+					minWidth: 120,
 				},
-				// {
-				// 	// width: 128,
-        //   prop: 'productionLineName',
-				// 	label: '产线',
-				// },
 				{
-					// width: 128,
 					prop: 'checkPerson',
 					label: '检测人员',
+					showOverflowtooltip: true,
 				},
 				{
-					// width: 160,
 					prop: 'checkTime',
 					label: '检测时间',
+					width: 160,
 					filter: (val) =>
 						val != null ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '-',
 				},
 				{
-					width: 90,
 					prop: 'source',
 					label: '来源',
-          filter: (val) => val == 1 ? '平板端' : '网页端',
+					width: 80,
+					filter: (val) => (val == 1 ? '平板端' : '网页端'),
 				},
 			],
 			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
-      searchBarKeys: ['inspectionDetContent', 'checkTime', 'workOrderId','checkPerson'],
+			searchBarKeys: [
+				'inspectionDetContent',
+				'checkTime',
+				'workOrderId',
+				'checkPerson',
+			],
 			form: {
-        id: undefined,
-        // workOrderId:undefined,
+				id: undefined,
+				// workOrderId:undefined,
 				inspectionDetId: undefined,
 				inspectionDetContent: undefined,
 				productionLineId: undefined,
 				sectionId: undefined,
-        checkPerson: undefined,
-        workOrderId:undefined,
+				checkPerson: undefined,
+				workOrderId: undefined,
 				checkTime: undefined,
 				source: undefined,
 				explainText: undefined,
@@ -273,26 +305,26 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-        pageSize: 10,
-        workOrderId:null,
+				pageSize: 20,
+				workOrderId: null,
 				inspectionDetContent: null,
-        checkTime: [],
-        checkPerson:undefined,
+				checkTime: [],
+				checkPerson: undefined,
 				// productionLineId: null,
 			},
 		};
 	},
 	created() {
 		this.getList();
-		this.getProductLineList()
+		this.getProductLineList();
 	},
 	watch: {
 		form: {
 			handler: function (val) {
 				console.log('form change:', val);
 			},
-			deep: true
-		}
+			deep: true,
+		},
 		// 注册弹窗里产线改变时的监听事件
 		// 'form.productionLineId': {
 		// 	handler: function (val) {
@@ -318,29 +350,29 @@ export default {
 		// },
 	},
 	methods: {
-    /** 获取搜索栏的产线列表 */
-    deleteHandle(id, name, index, data) {
-      this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-              duration: 1500,
-              onClose: () => {
-                this.getDataList();
-              },
-            });
-          });
-        })
-        .catch(() => { });
-    },
+		/** 获取搜索栏的产线列表 */
+		deleteHandle(id, name, index, data) {
+			this.$confirm(`确认要删除序号为${index}的数据项?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					this.urlOptions.deleteURL(id).then(({ data }) => {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList();
+							},
+						});
+					});
+				})
+				.catch(() => {});
+		},
 		getProductLineList() {
-      this.$axios('/base/core-work-order/listbyfilter').then((response) => {
+			this.$axios('/base/core-work-order/listbyfilter').then((response) => {
 				this.searchBarFormConfig[0].selectOptions = response.data.map(
 					(item) => {
 						return {
@@ -349,34 +381,36 @@ export default {
 						};
 					}
 				);
-      })
-      this.$axios('/base/quality-inspection-det/listAll').then((response) => {
-        this.searchBarFormConfig[1].selectOptions = response.data.map(
-          (item) => {
-            return {
-              name: item.content,
-              id: item.content,
-            };
-          }
-        );
-      })
-      this.$axios('base/quality-inspection-box-btn-auth/getUserList', {
-          pageNo: 1,
-          pageSize: 999
-      }).then((res) => {
-        // console.log(response);
-        this.searchBarFormConfig[2].selectOptions = res.data.map((item) => ({
-          name: item.username,
-          id: item.username,
-        }));
-        })
+			});
+			this.$axios('/base/quality-inspection-det/listAll').then((response) => {
+				this.searchBarFormConfig[1].selectOptions = response.data.map(
+					(item) => {
+						return {
+							name: item.content,
+							id: item.content,
+						};
+					}
+				);
+			});
+			this.$axios('base/quality-inspection-box-btn-auth/getUserList', {
+				pageNo: 1,
+				pageSize: 999,
+			}).then((res) => {
+				// console.log(response);
+				this.searchBarFormConfig[2].selectOptions = res.data.map((item) => ({
+					name: item.username,
+					id: item.username,
+				}));
+			});
 		},
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
-      // 执行查询
-      let str = this.queryParams.checkPerson ?  this.queryParams.checkPerson.join() :undefined
-      this.queryParams.checkPerson = str
+			// 执行查询
+			let str = this.queryParams.checkPerson
+				? this.queryParams.checkPerson.join()
+				: undefined;
+			this.queryParams.checkPerson = str;
 			getQualityInspectionRecordPage(this.queryParams).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
@@ -396,8 +430,8 @@ export default {
 				inspectionDetContent: undefined,
 				sectionId: undefined,
 				checkPerson: undefined,
-        checkTime: undefined,
-        workOrderId:undefined,
+				checkTime: undefined,
+				workOrderId: undefined,
 				source: undefined,
 				explainText: undefined,
 				remark: undefined,
@@ -426,14 +460,14 @@ export default {
 			this.reset();
 			const id = row.id;
 			getQualityInspectionRecord(id).then((response) => {
-        /** 因为后端返回的时间是时间戳格式，需转换 */
-        console.log(response.data);
-				const info = {}
-				Object.keys(this.form).forEach(key => {
-					info[key] = response.data[key]
+				/** 因为后端返回的时间是时间戳格式，需转换 */
+				console.log(response.data);
+				const info = {};
+				Object.keys(this.form).forEach((key) => {
+					info[key] = response.data[key];
 				});
-        this.form = info;
-        console.log(this.form);
+				this.form = info;
+				console.log(this.form);
 				this.open = true;
 				this.title = '修改质量检查信息记录表';
 			});
@@ -444,9 +478,9 @@ export default {
 				if (!valid) {
 					return;
 				}
-        // 修改的提交
-        let str = this.form.checkPerson ? this.form.checkPerson.join() : null
-        this.form.checkPerson = str
+				// 修改的提交
+				let str = this.form.checkPerson ? this.form.checkPerson.join() : null;
+				this.form.checkPerson = str;
 				if (this.form.id != null) {
 					updateQualityInspectionRecord(this.form).then((response) => {
 						this.$modal.msgSuccess('修改成功');
diff --git a/src/views/report/Environmental/sectionProduction/index.vue b/src/views/report/Environmental/sectionProduction/index.vue
index 4e572a0c..ac843a79 100644
--- a/src/views/report/Environmental/sectionProduction/index.vue
+++ b/src/views/report/Environmental/sectionProduction/index.vue
@@ -68,6 +68,7 @@ export default {
 					label: '生产线',
 					selectOptions: [],
 					param: 'lineId',
+					multiple: true,
 				},
 				{
 					type: 'select',
@@ -104,6 +105,7 @@ export default {
 					label: '生产线',
 					selectOptions: [],
 					param: 'lineId',
+					multiple: true,
 				},
 				{
 					type: 'select',
@@ -137,12 +139,12 @@ export default {
 			queryParams: {
 				startTime: '',
 				endTime: '',
-				lineId: '',
+				lineId: [],
 			},
 			queryParams2: {
 				startTime: '',
 				endTime: '',
-				lineId: '',
+				lineId: [],
 			},
 			tableProp1,
 			tableProp: [],
@@ -150,11 +152,11 @@ export default {
 			tableProp2: [],
 			tableData2: [],
 			procedureName: [
-				{ name: '压延(拉引量t)', ename: 'calenderingCapacity' },
+				// { name: '压延(拉引量t)', ename: 'calenderingCapacity' },
 				{ name: '优化切割(片)', ename: 'cuttingNum' },
 				{ name: '堆垛(片)', ename: 'unloadPieces' },
 				{ name: '堆垛(托)', ename: 'unloadCount' },
-				{ name: '良品率(%)', ename: 'rate' },
+				{ name: '优切良品率(%)', ename: 'rate' },
 			],
 			span: [], //表2第一列合并
 		};
@@ -311,10 +313,10 @@ export default {
 				} else {
 					if (data[i].lineName === data[i - 1].lineName) {
 						//相同产线,添加列
-						let startNum = 5 * (lineNum - 1);
-						let endNum = 5 * lineNum - 1;
+						let startNum = 4 * (lineNum - 1);
+						let endNum = 4 * lineNum - 1;
 						for (let k = startNum; k <= endNum; k++) {
-							let str = this.procedureName[k % 5];
+							let str = this.procedureName[k % 4];
 							tempData[k][data[i].timeStr] = data[i][str.ename];
 						}
 					} else {
@@ -356,9 +358,9 @@ export default {
 		// 合并第一列
 		objectSpanMethod({ row, column, rowIndex, columnIndex }) {
 			if (columnIndex === 0) {
-				if (rowIndex % 5 === 0) {
+				if (rowIndex % 4 === 0) {
 					return {
-						rowspan: 5,
+						rowspan: 4,
 						colspan: 1,
 					};
 				} else {
@@ -472,7 +474,7 @@ export default {
 		top: 0;
 		left: 0;
 		background-color: #ebeef5;
-		transform: rotate(-70deg);
+		transform: rotate(-63deg);
 		-webkit-transform-origin: top;
 		transform-origin: top;
 		width: 1px;
@@ -480,11 +482,11 @@ export default {
 	.el-table thead.is-group tr:last-of-type th:nth-child(1):before {
 		content: '';
 		position: absolute;
-		height: 67px;
+		height: 93px;
 		top: 0;
-		left: 75px;
+		left: 55px;
 		background-color: #ebeef5;
-		transform: rotate(-70deg);
+		transform: rotate(-63deg);
 		-webkit-transform-origin: top;
 		transform-origin: top;
 		width: 1px;
diff --git a/src/views/report/qcReport/israLineReport/index.vue b/src/views/report/qcReport/israLineReport/index.vue
index 61963522..6c9bcbc4 100644
--- a/src/views/report/qcReport/israLineReport/index.vue
+++ b/src/views/report/qcReport/israLineReport/index.vue
@@ -3,7 +3,8 @@
 		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
-			@headBtnClick="buttonClick" />
+			@headBtnClick="buttonClick"
+			@datepicker-change="datepickerChange" />
 		<base-table
 			class="israLineReportTable1"
 			ref="israLineReportTable11"
@@ -57,14 +58,16 @@ export default {
 					type: 'datePicker',
 					label: '时间段',
 					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					param: 'timeVal',
 					defaultSelect: [],
-					width: 250,
+					width: 300,
+					onchange: true,
+					clearable: false,
 				},
 				{
 					type: 'select',
@@ -106,12 +109,14 @@ export default {
 	},
 	mounted() {
 		this.tableProp = this.tableProp1;
-		let start = moment().format('yyyy-MM-DD');
-		let end = moment().format('yyyy-MM-DD');
+		let start = moment(moment().format('yyyy-MM-DD') + ' 07:00:00').format(
+			'yyyy-MM-DD HH:mm:ss'
+		);
+		let end =
+			moment(moment().valueOf() + 86400000).format('yyyy-MM-DD') + ' 06:59:59';
 		this.formConfig[0].defaultSelect = [start, end];
-		this.queryParams.startTime =
-			moment(start + ' 00:00:00').valueOf() + 25200000;
-		this.queryParams.endTime = moment(end + ' 23:59:59').valueOf() + 25200000;
+		this.queryParams.startTime = moment(start).valueOf();
+		this.queryParams.endTime = moment(end).valueOf();
 		this.getList();
 	},
 	methods: {
@@ -237,13 +242,22 @@ export default {
 				}
 			}
 		},
+		// 时间选择器change
+		datepickerChange(val) {
+			console.log(val);
+			let start = moment(
+				moment(val.value[0]).format('yyyy-MM-DD') + ' 07:00:00'
+			).format('yyyy-MM-DD HH:mm:ss');
+			let end =
+				moment(moment(val.value[1]).valueOf() + 86400000).format('yyyy-MM-DD') +
+				' 06:59:59';
+			this.formConfig[0].defaultSelect = [start, end];
+		},
 		buttonClick(val) {
 			if (val.btnName === 'search') {
 				if (val.timeVal && val.timeVal.length > 0) {
-					this.queryParams.startTime =
-						moment(val.timeVal[0] + ' 00:00:00').valueOf() + 25200000;
-					this.queryParams.endTime =
-						moment(val.timeVal[1] + ' 23:59:59').valueOf() + 25200000;
+					this.queryParams.startTime = moment(val.timeVal[0]).valueOf();
+					this.queryParams.endTime = moment(val.timeVal[1]).valueOf();
 				}
 				this.queryParams.lineId = val.lineId;
 				this.getList();