质量样式

Merge pull request 'projects/mesxc-dy' (#374 ) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #374
2024-04-26 16:44:01 +08:00 · 2024-04-26 10:39:55 +08:00 · 2024-04-26 10:36:29 +08:00 · 2024-04-26 10:16:38 +08:00 · 2024-04-26 10:16:07 +08:00 · 2024-04-26 10:15:45 +08:00
20 changed files with 1358 additions and 990 deletions
--- 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'

--- a/package.json
+++ b/package.json
@ -50,7 +50,7 @@
    "benz-amr-recorder": "^1.1.5",
    "bpmn-js-token-simulation": "0.10.0",
    "clipboard": "2.0.8",
-    "code-brick-zj": "^1.0.5",
+    "code-brick-zj": "^1.1.0",
    "core-js": "^3.26.0",
    "crypto-js": "^4.0.0",
    "diagram-js": "^12.3.0",
--- a/src/api/quality/rawMaterialTraceability.js
+++ b/src/api/quality/rawMaterialTraceability.js
@ -1,8 +1,8 @@
 /*
 * @Author: zhp
 * @Date: 2023-10-31 10:55:20
- * @LastEditTime: 2023-12-06 14:09:14
- * @LastEditors: zhp
+ * @LastEditTime: 2024-04-25 15:28:44
+ * @LastEditors: DY
 * @Description:
 */
 import request from '@/utils/request'
@ -34,11 +34,11 @@ export function exportEnergyPlcExcel(query) {
  })
 }

-export function getOriginalGlassRetrace(query) {
+export function getOriginalGlassRetrace(data) {
   return request({
    url: '/base/original-glass-statistics/originalGlassRetrace',
-    method: 'get',
-    params: query,
+    method: 'post',
+    data
  })
 }

--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-07-19 15:18:30
 * @LastEditors: zhp
- * @LastEditTime: 2024-04-26 08:32:02
+ * @LastEditTime: 2024-04-26 09:57:41
 * @Description:
 -->
 <template>
@ -42,20 +42,21 @@
              <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
                <!-- <el-col :span="12"> -->
                <!-- <div style="height: 34px;"> -->
-                <span style="display: inline-block;width: 400px;height: 10px;">
-                  <span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span>
-                  <el-divider class="split" v-if="op.name" direction="vertical"></el-divider>
+                <span style="display: inline-block;width: 400px">
+                  <span v-if="op.name" class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name
+                  }}</span>
+                  <el-divider v-if="op.specifications" class="split" direction="vertical"></el-divider>
                  <!-- <span v-if="op.size" class="split"></span> -->
                  <span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
                  op.specifications }}</span>
-                  <el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider>
+                  <el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
                  <span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
                  op.planQuantity }}</span>
                  <span v-if="op.planQuantity" class="orderFinishTwo"
                    style="font-size: 14px;opacity: calc(.6);">片</span>
                </span>
                <!-- <span style="overflow: hidden;"> -->
-                <span v-if="op.actualQuantity" class="orderFinish" style="font-size: 14px;margin-left: 40px;">{{
+                <span class="orderFinish" style="font-size: 14px;margin-left: 40px;">{{
                op.actualQuantity
                }}</span>
                <span v-if="op.actualQuantity" class="orderFinishTwo" style="font-size: 14px">片</span>
@ -746,7 +747,7 @@ export default {
                name: this.getStr(String(ele.name), 8),
                progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
                specifications: ele.specifications ? '规格' + ele.specifications : '',
-                planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan),6) : '',
+                planQuantity: ele.planQuantity ? '计划' + this.getStr(String(ele.planQuantity),6) : '',
                actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
 							};
 						}
@ -756,11 +757,11 @@ export default {
 					let eqArr = this.SJGWsData.detData.map((item, index) => [
 						`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
            </span>`,
+            `<span style="color:rgba(255,255,255,0.5)">${item.lineName || ''
+            }</span>`,
 						`<span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
            </span>`,
-						`<span style="color:rgba(255,255,255,0.5)">${
-            item.lineName || ''
-						}</span>`,
+
            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0' : item.status == '停机' ? 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;background-color: #FFBD02;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0'}"></div>  ${item.status || ''}</span>`,
            // `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == false ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:10px 10px 0 0 '}"></div>  ${item.error == true ?'是' :'否'  || ''}</span>`,
 					]);
--- a/src/views/quality/base/qualityIsra/index.vue
+++ b/src/views/quality/base/qualityIsra/index.vue
@ -86,16 +86,19 @@ import moment from 'moment';
 // import DialogForm from './dialogForm.vue';
 import * as echarts from 'echarts';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import { getCorePLList } from '@/api/base/coreProductionLine';
+import { parseTime } from '@/utils/ruoyi';

 // import basicPageMixin from '@/mixins/lb/basicPageMixin';
 export default {
-  name: 'statisticalData',
+  name: 'QualityIsra',
 	// components: {
 	// 	DialogForm,
 	// },
  mixins: [tableHeightMixin],
 	data() {
    return {
+      isFold: false,
      list: [],
      dynamicProps: [],
      activeName: 'day',
@ -106,6 +109,16 @@ export default {
      weekListUrl: '/base/quality-isra-statistics/weekList',
      monthListUrl: '/base/quality-isra-statistics/monthList',
      searchBarFormConfig: [
+        {
+          type: 'select',
+          label: '是否报废',
+          placeholder: '请选择是否报废',
+          param: 'checkDiscard',
+          selectOptions: [
+            { name: '否', id: 0 },
+						{ name: '是', id: 1 }
+          ],
+        },
        {
          type: 'select',
          label: '缺陷类型',
@ -114,6 +127,17 @@ export default {
          selectOptions: [],
          labelField: 'name',
          valueField: 'name',
+          defaultSelect: [],
+          filterable: true
+        },
+        {
+          type: 'select',
+          label: '产线',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'name',
+          param: 'lineName',
+          filterable: true,
          defaultSelect: []
        },
 				{
@ -139,8 +163,9 @@ export default {
 			],
 			// 查询参数
 			queryParams: {
+        checkDiscard: undefined,
        checkType:undefined,
-        // productionId: undefined,
+        lineName: undefined,
        startTime: undefined,
        endTime: undefined,
 				// productionLineId: null,
@ -149,6 +174,7 @@ export default {
  },
 	created() {
 		// this.getProductLineList();
+    // this.isFold = this.searchBarWidth('QualityIsraBox', 1198);
  },
  computed: {
    tableProps() {
@ -168,29 +194,20 @@ export default {
    },
  },
  mounted() {
-    // if (this.$route.query.woIdString) {
-    //   console.log(this.$route.query.woIdString)
-    //   this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
-    //   // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
-    //   // let arr =[]
-    //   this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
-    //   console.log(this.searchBarFormConfig[0].defaultSelect);
-    // }
-    // if (this.$route.params.startTime && this.$route.params.endTime) {
-    //   this.searchBarFormConfig[0].defaultSelect = [
-    //     this.$route.params.startTime,
-    //     this.$route.params.endTime,
-    //   ];
-    //   this.queryParams.param = {};
-    //   this.$set(
-    //     this.queryParams.param,
-    //     'startTime',
-    //     this.$route.params.startTime
-    //   );
-    //   this.$set(this.queryParams.param, 'endTime', this.$route.params.endTime);
-    // } else {
-    //   this.searchBarFormConfig[0].defaultSelect = [];
-    // }
+    if (this.$route.query.lineName) {
+      // console.log('打印看看产线', this.$route.query.lineName)
+      this.queryParams.lineName = this.$route.query.lineName
+      this.searchBarFormConfig[2].defaultSelect = this.$route.query.lineName
+    }
+    if (this.$route.query.originalGlassOutputTime) {
+      console.log('你好', this.$route.query.originalGlassOutputTime)
+      this.queryParams.startTime = parseTime(new Date(Number(this.$route.query.originalGlassOutputTime)))
+      this.queryParams.endTime = parseTime(new Date(Number(this.$route.query.originalGlassOutputTime)))
+      this.searchBarFormConfig[3].defaultSelect = [
+        this.queryParams.startTime,
+        this.queryParams.endTime,
+      ];
+    }
    this.getList()
    this.getData()
    this.getDict()
@ -393,8 +410,12 @@ export default {
          pageNo:1
        }
      });
-      console.log(res)
-      this.searchBarFormConfig[0].selectOptions = res.data.list
+      // console.log(res)
+      this.searchBarFormConfig[1].selectOptions = res.data.list
+      await getCorePLList().then((res) => {
+				// console.log(res);
+				this.searchBarFormConfig[2].selectOptions = res.data;
+			})
      // this.searchBarFormConfig[1].selectOptions = res.data.map((item) => {
      //   return {
      //     name: item.name,
@ -425,7 +446,7 @@ export default {
    },
 		/** 查询列表 */
    async getDataList() {
-      console.log(this.queryParams);
+      console.log('查询条件', this.queryParams);
 			this.loading = true;
 			// 执行查询
      const {
@ -467,7 +488,10 @@ export default {
    },
 		/** 取消按钮 */
    handleSearchBarBtnClick(val) {
+      console.log('11111', val)
      if (val.btnName === 'search') {
+        this.queryParams.checkDiscard = (val?.checkDiscard === 0 || val?.checkDiscard === 1) ? val?.checkDiscard : undefined
+        this.queryParams.lineName = val.lineName ? val.lineName : undefined
        this.queryParams.checkType = val.checkType ? val.checkType : undefined
        // this.queryParams.productionId = val.productionId ? val.productionId : undefined
        this.queryParams.startTime = val.checkTime ? val.checkTime[0] : undefined
--- 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
--- 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) {
--- 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,
      },
--- 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>
--- 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 = '新增';
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/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-25 14:42:53
+ * @LastEditTime: 2024-04-26 09:58:51
 * @Description:
 -->
 <template>
@ -23,18 +23,16 @@
 			</el-form-item>
 			<el-form-item label="包装全检时间及产线" prop="val">
 				<el-date-picker
-					v-model="listQuery.timeVal"
+					v-model="listQuery.packTime"
 					value-format="timestamp"
-					type="datetimerange"
+					type="datetime"
 					size="small"
          clearable
-					start-placeholder="包装全检开始时间"
-          end-placeholder="包装全检结束时间"
-          range-separator="-"
+					placeholder="包装全检时间"
          @change="countTimes('timestamp3')"
        />
        <el-select v-model="listQuery.lineName" size="small" clearable filterable placeholder="产线" @change="countTimes('timestamp3')" style="margin-left: 5px">
-          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option v-for="(item, index) in lineOptions" :key="index" :label="item.name" :value="item.name"></el-option>
        </el-select>
 			</el-form-item>
      <el-form-item>
@ -51,8 +49,8 @@
      :table-data="list"> -->
    <base-table :max-height="tableH" :table-props="tableProps"
      :table-data="list">
-      <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-        @clickBtn="handleClick" /> -->
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="220" label="缺陷操作" :method-list="tableBtn"
+        @clickBtn="handleClick" />
    </base-table>
    <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
      @pagination="getList" /> -->
@ -64,56 +62,76 @@
 // import AddOrUpdate from './add-or-updata';
 // import unitDict from './unitDict';
 // import basicPage from '../mixins/basic-page';
-import { publicFormatter } from '@/utils/dict';
+// import { publicFormatter } from '@/utils/dict';
 import { parseTime } from '../mixins/code-filter';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import { getCorePLList } from '@/api/base/coreProductionLine';

-import {
-  getOriginalGlassRetrace,
-  getWorkOrderList,
-  // exportEnergyPlcExcel
-} from '@/api/quality/rawMaterialTraceability';
+import { getOriginalGlassRetrace } from '@/api/quality/rawMaterialTraceability';

 const tableProps = [
  {
    prop: 'certificateNumber',
    label: '合格证号',
+    minWidth: 120,
+		showOverflowtooltip: true,
+    filter: (val) => val ? val : '--'
  },
  {
    prop: 'boxNumber',
    label: '箱号',
+    minWidth: 150,
+		showOverflowtooltip: true,
+    filter: (val) => val ? val : '--'
  },
  {
    prop: 'packagingCode',
    label: '成品周转编号',
+    minWidth: 180,
+		showOverflowtooltip: true,
+    filter: (val) => val ? val : '--'
  },
  {
    prop: 'deepProcessingLineName',
    label: '深加工产线',
+    minWidth: 120,
+		showOverflowtooltip: true,
+    filter: (val) => val ? val : '--'
  },
  {
    prop: 'deepProcessingInputTime',
    label: '深加工上片时间',
-    filter: parseTime
+    // filter: (val) => parseTime(val) ? parseTime(val) : '--',
+    filter: parseTime,
+    minWidth: 180,
+		showOverflowtooltip: true
  },
  {
    prop: 'deepProcessingOutputTime',
    label: '深加工下片时间',
-    filter: parseTime
+    filter: parseTime,
+    minWidth: 180,
+		showOverflowtooltip: true
  },
  {
    prop: 'glassCode',
    label: '原片周转编码',
+    minWidth: 150,
+		showOverflowtooltip: true
  },
  {
    prop: 'originalGlassLineName',
    label: '原片产线',
+    minWidth: 150,
+		showOverflowtooltip: true
  },
  {
    prop: 'originalGlassOutputTime',
    label: '原片下片时间',
-    filter: parseTime
-  },
+    filter: parseTime,
+    minWidth: 180,
+		showOverflowtooltip: true
+  }
  // {
  //   prop: 'scrapDetail',
  //   label: '详情',
@ -126,29 +144,25 @@ export default {
  mixins: [tableHeightMixin],
  data() {
    return {
-      // urlOptions: {
-      //   getDataListURL: getMaterialUseLogPage,
-      //   // deleteURL: deletePackingType,
-      //   // exportURL: exportPackingExcel,
-      // },
+      lineOptions: [],
      tableProps,
-      // tableBtn: [
-      //   // this.$auth.hasPermi(`base:packaging-print-log:update`)
-      //   //   ?
-      //     {
-      //       type: 'edit',
-      //       btnName: '编辑',
-      //     },
-      //     // : undefined,
-      //   // this.$auth.hasPermi(`base:packaging-print-log:delete`)
-      //   //   ?
-      //     {
-      //       type: 'delete',
-      //       btnName: '删除',
-      //     }
-      //     // : undefined,
+      tableBtn: [
+        // this.$auth.hasPermi(`base:packaging-print-log:update`)
+        //   ?
+          {
+            type: 'detail0',
+            btnName: '成品缺陷详情',
+          },
+          // : undefined,
+        // this.$auth.hasPermi(`base:packaging-print-log:delete`)
+        //   ?
+          {
+            type: 'detail1',
+            btnName: '原片缺陷详情',
+          }
+          // : undefined,

-      // ].filter((v) => v),
+      ].filter((v) => v),
      list: [],
      listQuery: {
        // pageSize: 10,
@ -156,13 +170,12 @@ export default {
        // total: 0,
        certificateNumber: undefined,
        packagingCode: undefined,
-        timeVal:undefined,
-        lineName: undefined,
+        packTime: null,
+        lineName: null,
        glassCode: undefined
      },
-      count: 0,
      useTime: false,
-      countArray: [],
+      countArray: [false, false, false, false],
      // tableH: this.tableHeight(260),
      formConfig: [
        // {
@ -260,82 +273,86 @@ export default {
    // window.addEventListener('resize', () => {
    //   this.tableH = this.tableHeight(260)
    // })
-    this.count = 0
+    countArray: [false, false, false, false],
    this.useTime = false
    // this.getList()
    this.getDict()
  },
  methods: {
+    handleClick(raw) {
+			if (raw.type === 'detail1') {
+        // 原片缺陷
+				this.$router.push({
+          path: '/quality/base/quality-isra',
+          query: {
+            // deepProcessingLineId: raw.data.deepProcessingLineId,
+            lineName: raw.data.deepProcessingLineName,
+            originalGlassOutputTime: raw.data.originalGlassOutputTime
+          },
+        });
+			} else {
+				// 成品缺陷
+				this.$router.push({
+          path: '/quality/base/quality-inspection-data/detection-information/statistical-data',
+          query: {
+            startTime: raw.data.deepProcessingInputTime,
+            endTime: raw.data.deepProcessingOutputTime
+          },
+        });
+			}
+		},
    countTimes(val) {
      if (val === 1) {
-        let temp = this.listQuery?.certificateNumber !== ''
-        this.countArray[0] = temp
-        console.log('你好', this.countArray)
+        this.countArray[0] = this.listQuery.certificateNumber !== '' && this.listQuery.certificateNumber !== undefined
      }
-      if (val && val !== '') {
-        if (val === 'timestamp3') {
-          if (this.listQuery.timeVal.length > 0 || this.listQuery?.lineName !== '') {
-            this.useTime = true
-          } else {
-            this.useTime = false
-          }
+      if (val === 2) {
+        this.countArray[1] = this.listQuery?.packagingCode !== '' && this.listQuery?.packagingCode !== undefined
+      }
+      if (val === 3) {
+        this.countArray[2] = this.listQuery?.glassCode !== '' && this.listQuery?.glassCode !== undefined
+      }
+      if (val === 'timestamp3') {
+        if ((this.listQuery.packTime !== '' && this.listQuery.packTime !== null) || (this.listQuery?.lineName !== '' && this.listQuery.lineName !== null)) {
+          this.useTime = true
+          this.countArray[3] = true
        } else {
-          this.count ++
+          this.useTime = false
+          this.countArray[3] = true
        }
-      } else {
-        this.count --
      }
    },
    getList() {
-      // console.log('nihc ', this.count, this.listQuery)
-      // if (this.count > 1) {
-      //   this.$message.error('请选择一个条件进行查询！')
-      // } else {
-      //   if (this.useTime === true) {
-      //     if (this.listQuery.timeVal.length > 0 && this.listQuery?.lineName !== '') {
-      //       getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
-      //         console.log(res);
-      //         this.list = res.data || []
-      //         console.log(this.list);
-      //         // this.listQuery.total = res.data.total || 0
-      //       })
-      //     } else {
-      //       this.$message.error('选择包装全检时，时间和产线必填！')
-      //     }
-      //   } else {
-      getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
-        console.log(res);
-        this.list = res.data || []
-        console.log(this.list);
-        // this.listQuery.total = res.data.total || 0
-      })
-      //   }
-      // }
+      let trueArray = this.countArray.filter(val => val === true)
+      if (trueArray.length !== 1) {
+        this.$message.error('请选择一个条件进行查询！')
+      } 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 => {
+              console.log(res);
+              this.list = res.data || []
+              console.log(this.list);
+              // this.listQuery.total = res.data.total || 0
+            })
+          } else {
+            this.$message.error('选择包装全检时，时间和产线均为必填！')
+          }
+        } else {
+          getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
+            console.log(res);
+            this.list = res.data || []
+            console.log(this.list);
+          })
+        }
+      }
      
    },
    getDict() {
-      // 获取产品的属性列表
-      // getCustomerList().then((response) => {
-      //   console.log(response);
-      //   this.customerList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      // getModelList().then((response) => {
-      //   console.log(response);
-      //   this.modelList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      getWorkOrderList().then((response) => {
-        // console.log(response);
-        this.formConfig[0].selectOptions = response.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
+      // 获取产线
+      getCorePLList().then((res) => {
+				console.log(res);
+				this.lineOptions = res.data;
+			})
    },
    // handleExport() {
    //   // 处理查询参数
--- 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('修改成功');
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@ -60,26 +60,26 @@ export default {
      list: [],
      dynamicProps:[],
      searchBarFormConfig: [
-        {
-          type: 'select',
-          label: '工单名称',
-          placeholder: '请选择工单名称',
-          param: 'workOrderIdList',
-          selectOptions: [],
-          multiple: true,
-          labelField: 'name',
-          valueField: 'id',
-          defaultSelect: [],
-          filterable: true
-        },
-				{
-					type: 'select',
-					label: '产品',
-          placeholder: '请选择产品',
-          param: 'productionId',
-          selectOptions: [],
-          filterable: true
-				},
+        // {
+        //   type: 'select',
+        //   label: '工单名称',
+        //   placeholder: '请选择工单名称',
+        //   param: 'workOrderIdList',
+        //   selectOptions: [],
+        //   multiple: true,
+        //   labelField: 'name',
+        //   valueField: 'id',
+        //   defaultSelect: [],
+        //   filterable: true
+        // },
+				// {
+				// 	type: 'select',
+				// 	label: '产品',
+        //   placeholder: '请选择产品',
+        //   param: 'productionId',
+        //   selectOptions: [],
+        //   filterable: true
+				// },
 				// {
 				// 	type: 'input',
 				// 	label: '检测内容',
@ -193,8 +193,8 @@ export default {
 			// },
 			// 查询参数
 			queryParams: {
-        workOrderIdList:undefined,
-        productionId: undefined,
+        // workOrderIdList:undefined,
+        // productionId: undefined,
        startTime: undefined,
        endTime: undefined,
 				// productionLineId: null,
@ -207,16 +207,16 @@ export default {
  computed: {
    tableProps() {
      return [
-        {
-          // width: 128,
-          prop: 'workOrderName',
-          label: '工单名称',
-        },
-        {
-          // width: 128,
-          prop: 'productionName',
-          label: '产品',
-        },
+        // {
+        //   // width: 128,
+        //   prop: 'workOrderName',
+        //   label: '工单名称',
+        // },
+        // {
+        //   // width: 128,
+        //   prop: 'productionName',
+        //   label: '产品',
+        // },
        {
          // width: 160,
          prop: 'inspectionContent',
@ -259,17 +259,17 @@ export default {
    },
  },
  mounted() {
-    if (this.$route.query.woIdString) {
-      console.log(this.$route.query.woIdString)
-      this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
-      // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
-      // let arr =[]
-      this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
-      console.log(this.searchBarFormConfig[0].defaultSelect);
-    }
+    // if (this.$route.query.woIdString) {
+    //   console.log(this.$route.query.woIdString)
+    //   this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
+    //   // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
+    //   // let arr =[]
+    //   this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
+    //   console.log(this.searchBarFormConfig[0].defaultSelect);
+    // }
    if (this.$route.query.startTime && this.$route.query.endTime) {
      // console.log(this.$route.query.startTime);
-      this.searchBarFormConfig[2].defaultSelect = [moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss'), moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss'),]
+      this.searchBarFormConfig[0].defaultSelect = [moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss'), moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss'),]
      this.queryParams.startTime = moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss')
      this.queryParams.endTime = moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss')
    }
@ -370,8 +370,8 @@ export default {
 		/** 取消按钮 */
    handleSearchBarBtnClick(val) {
      if (val.btnName === 'search') {
-        this.queryParams.workOrderIdList = val.workOrderIdList ? val.workOrderIdList : undefined
-        this.queryParams.productionId = val.productionId ? val.productionId : undefined
+        // this.queryParams.workOrderIdList = val.workOrderIdList ? val.workOrderIdList : undefined
+        // this.queryParams.productionId = val.productionId ? val.productionId : undefined
        this.queryParams.startTime = val.checkTime ? val.checkTime[0] : undefined
        this.queryParams.endTime = val.checkTime ? val.checkTime[1] : undefined
        this.getList()
--- 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;
--- a/src/views/report/Product/monthly.vue
+++ b/src/views/report/Product/monthly.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: Do not edit
 * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-25 14:30:44
+ * @LastEditTime: 2024-04-26 10:32:29
 * @LastEditors: DY
 * @Description: 
 -->
@ -43,12 +43,16 @@
 			</el-button>
 		</el-form>
 		<base-table
+			ref="productionDataMonthTable11"
+			id="productionDataMonthTable1"
 			:table-props="tableProps"
 			:table-data="tableData"
 			:span-method="objectSpanMethod1"
 			@emitFun="handleEmitFun"
 			:max-height="tableH" />
 		<base-table
+		ref="productionDataMonthTable22"
+			id="productionDataMonthTable2"
 			:table-props="tableProps1"
 			:table-data="tableData1"
 			:span-method="objectSpanMethod1"
@ -94,26 +98,47 @@ export default {
    now.setHours(0, 0, 0, 0)
    now.setDate(1)
    let startOfMonth = now.getTime()
-    // let firstDayOfMonth = new Date(startOfMonth)
    this.listQuery.time = startOfMonth
 	},
 	mounted() {
 		this.getList();
 	},
 	methods: {
+		getTime1() {
+			const firstDayOfMonth = new Date(this.listQuery.time)
+			const lastDayOfMonth = new Date(firstDayOfMonth.getFullYear(), firstDayOfMonth.getMonth() + 1, 0, 0, 0, 0, 0)
+			// console.log('时间', parseTime(firstDayOfMonth), parseTime(lastDayOfMonth))
+			this.$set(this.tableProps[2], 'label', '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')')
+			this.$set(this.tableProps1[2], 'label', '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')') 
+			// this.tableProps[2].label = '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')'
+			// this.tableProps1[2].label = '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')'
+			console.log(this.tableProps, this.tableProps1)
+		},
 		async getList() {
+			const firstDayOfMonth = new Date(this.listQuery.time)
+			const lastDayOfMonth = new Date(firstDayOfMonth.getFullYear(), firstDayOfMonth.getMonth() + 1, 0, 0, 0, 0, 0)
 			this.tableData = [];
 			this.tableProps = [
 				{
 					prop: 'lineName',
 					label: '',
 					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
 				},
 				{
 					prop: 'paramsName',
 					label: '',
 					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
 				},
+				{
+					prop: 'xc',
+					label: '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')',
+					// align: 'center',
+					children: []
+				}
 			];
 			this.tableData1 = [];
 			this.tableProps1 = [
@ -121,18 +146,28 @@ export default {
 					prop: 'lineName',
 					label: '',
 					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
 				},
 				{
 					prop: 'paramsName',
 					label: '',
 					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true,
 				},
+				{
+					prop: 'xc1',
+					label: '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')',
+					// align: 'center',
+					children: []
+				}
 			];
 			await productionMonthY(this.listQuery).then((res) => {
 				this.resData = res.data;
 				// 设置表头
 				Object.keys(this.resData).forEach((item) => {
-					this.tableProps.push({
+					this.tableProps[2].children.push({
 						prop: item,
 						label: item,
 						'show-overflow-tooltip': true,
@ -144,7 +179,7 @@ export default {
 				this.resData1 = res.data;
 				// 设置表头
 				Object.keys(this.resData1).forEach((item) => {
-					this.tableProps1.push({
+					this.tableProps1[2].children.push({
 						prop: item,
 						label: item,
 						'show-overflow-tooltip': true,
@ -152,6 +187,7 @@ export default {
 				});
 				this.buildTableData1(this.resData1);
 			});
+			// this.getTime1()
 		},
 		// 设置表格2数据
 		buildTableData1(data) {
@ -187,6 +223,9 @@ export default {
 			}
 			this.tableData1 = tempData;
 			this.getSpanArr1(this.tableData1);
+			this.$nextTick(() => {
+				this.reTable1();
+			});
 		},
 		// 设置表格数据
 		buildTableData(data) {
@ -222,6 +261,15 @@ export default {
 			}
 			this.tableData = tempData;
 			this.getSpanArr(this.tableData);
+			this.$nextTick(() => {
+				this.reTable();
+			});
+		},
+		reTable() {
+			this.$refs.productionDataMonthTable11.doLayout('productionDataMonthTable1');
+		},
+		reTable1() {
+			this.$refs.productionDataMonthTable22.doLayout('productionDataMonthTable2');
 		},
 		getSpanArr1(data) {
 			this.span2 = [];
--- a/src/views/report/Product/year.vue
+++ b/src/views/report/Product/year.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: Do not edit
 * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-25 11:14:34
+ * @LastEditTime: 2024-04-26 10:34:12
 * @LastEditors: DY
 * @Description: 
 -->
@ -43,12 +43,16 @@
 			</el-button>
 		</el-form>
 		<base-table
+		ref="productionDataYearTable11"
+			id="productionDataYearTable1"
 			:table-props="tableProps"
 			:table-data="tableData"
 			:span-method="objectSpanMethod1"
 			@emitFun="handleEmitFun"
 			:max-height="tableH" />
 		<base-table
+		ref="productionDataYearTable22"
+			id="productionDataYearTable2"
 			:table-props="tableProps1"
 			:table-data="tableData1"
 			:span-method="objectSpanMethod1"
@ -103,19 +107,39 @@ export default {
 		this.getList();
 	},
 	methods: {
+		getTime() {
+			const firstDayOfYear = new Date(this.listQuery.time)
+			const lastDayOfYear = new Date(firstDayOfYear.getFullYear() + 1, 0, 0, 0, 0, 0, 0)
+			// console.log('时间', parseTime(firstDayOfMonth), parseTime(lastDayOfMonth))
+			this.tableProps[0].label = '许昌安彩年原片生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')'
+			this.tableProps1[0].label = '许昌安彩年成品生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')'
+		},
 		async getList() {
+			// this.getTime()
+			const firstDayOfYear = new Date(this.listQuery.time)
+			const lastDayOfYear = new Date(firstDayOfYear.getFullYear() + 1, 0, 0, 0, 0, 0, 0)
 			this.tableData = [];
 			this.tableProps = [
 				{
 					prop: 'lineName',
 					label: '',
 					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
 				},
 				{
 					prop: 'paramsName',
 					label: '',
 					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
 				},
+				{
+					prop: 'xc',
+					label: '许昌安彩年原片生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')',
+					// align: 'center',
+					children: []
+				}
 			];
 			this.tableData1 = [];
 			this.tableProps1 = [
@ -123,18 +147,26 @@ export default {
 					prop: 'lineName',
 					label: '',
 					fixed: true,
+					'show-overflow-tooltip': true
 				},
 				{
 					prop: 'paramsName',
 					label: '',
 					fixed: true,
+					'show-overflow-tooltip': true
 				},
+				{
+					prop: 'xc1',
+					label: '许昌安彩年成品生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')',
+					// align: 'center',
+					children: []
+				}
 			];
 			await productionYearY(this.listQuery).then((res) => {
 				this.resData = res.data;
 				// 设置表头
 				Object.keys(this.resData).forEach((item) => {
-					this.tableProps.push({
+					this.tableProps[2].children.push({
 						prop: item,
 						label: item,
 						'show-overflow-tooltip': true,
@ -146,7 +178,7 @@ export default {
 				this.resData1 = res.data;
 				// 设置表头
 				Object.keys(this.resData1).forEach((item) => {
-					this.tableProps1.push({
+					this.tableProps1[2].children.push({
 						prop: item,
 						label: item,
 						'show-overflow-tooltip': true,
@ -189,6 +221,9 @@ export default {
 			}
 			this.tableData1 = tempData;
 			this.getSpanArr1(this.tableData1);
+			this.$nextTick(() => {
+				this.reTable1();
+			});
 		},
 		// 设置表格数据
 		buildTableData(data) {
@ -224,6 +259,15 @@ export default {
 			}
 			this.tableData = tempData;
 			this.getSpanArr(this.tableData);
+			this.$nextTick(() => {
+				this.reTable();
+			});
+		},
+		reTable() {
+			this.$refs.productionDataYearTable11.doLayout('productionDataYearTable1');
+		},
+		reTable1() {
+			this.$refs.productionDataYearTable22.doLayout('productionDataYearTable2');
 		},
 		getSpanArr1(data) {
 			this.span2 = [];
--- a/src/views/report/qcReport/fullInspection/index.vue
+++ b/src/views/report/qcReport/fullInspection/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-25 17:13:28
+ * @LastEditTime: 2024-04-26 09:10:53
 * @LastEditors: zhp
 * @Description:
 -->
@ -13,7 +13,7 @@
        </el-date-picker>
      </el-form-item>
      <el-form-item label="产线" prop="productionLineId">
-        <el-select v-model="listQuery.productionLineId" placeholder="请选择">
+        <el-select v-model="listQuery.productionLineId" placeholder="请选择" clearable>
          <el-option v-for="item in lineList" :key="item.id" :label="item.name" :value="item.id">
          </el-option>
        </el-select>
--- 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();
--- a/src/views/report/qcReport/lineReport.vue
+++ b/src/views/report/qcReport/lineReport.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-25 17:13:43
+ * @LastEditTime: 2024-04-26 09:42:54
 * @LastEditors: zhp
 * @Description:
 -->
@ -56,7 +56,7 @@ const tableProps = [
  },
  {
    prop: 'equipmentName',
-    label: '',
+    label: '机械手名称',
    width: '200'
  },
  {
--- a/src/views/report/qcReport/optimizeCutData.vue
+++ b/src/views/report/qcReport/optimizeCutData.vue
@ -1,14 +1,14 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-26 08:42:00
+ * @LastEditTime: 2024-04-26 09:41:54
 * @LastEditors: zhp
 * @Description:
 -->
 <template>
  <div class="app-container">
    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <el-table :header-cell-style="{
+    <el-table :max-height="tableH" :header-cell-style="{
      background: '#F2F4F9',
      color: '#606266'
    }" class="baseTable" border id="exportTable" :data="tableData" style="width: 100%" :span-method="objectSpanMethod">
@ -40,6 +40,8 @@ import {
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
+// import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 // import { getList, } from "@/api/base/qualityScrapType";
 const tableProps = [
  // {
@ -54,7 +56,7 @@ const tableProps = [
  },
  {
    prop: 'dataType',
-    label: '',
+    label: '类别',
    width: '150',
  },
  {
@ -71,7 +73,12 @@ const tableProps = [
  },
  {
    prop: 'rate',
-    label: '占比%',
+    label: '占比(%)',
+    // filter: (val) => val == false ? '不合格' : '合格',
+  },
+  {
+    prop: 'rateSum',
+    label: '综合成品率(%)',
    // filter: (val) => val == false ? '不合格' : '合格',
  },
  // {
@ -286,14 +293,15 @@ export default {
        // })
        this.tableData = response.data.map((ele) => {
          return {
-            dataType: ele.dataType == 1 ? '成品' : ele.dataType == 2 ? '取样' : '废版',
+            dataType: ele.dataType == 1 ? '成品' : ele.dataType == 2 ? '取样板' : ele.dataType == 4 ? '合计' : ele.dataType == 3 ? '废版' : '',
            code: ele.code,
            putNum: ele.putNum,
            lineName: ele.lineName,
-            type: ele.type,
+            type: ele.type == '合计' ? '' : ele.type,
            pieces: ele.pieces,
            area: ele.area,
-            rate: (ele.rate * 100).toFixed(2)
+            rate: ele.lineName != '总计' &&  ele.rate ? (ele.rate * 100).toFixed(2) : '',
+            rateSum: ele.lineName === '总计' ? (ele.rate * 100).toFixed(2) : ''
            // useNum: ele.useNum,
            // num: ele.num,
            // size: typeof (ele.size)
Author	SHA1	Message	Date
juzi	23afb0db0d	质量样式	2024-04-26 16:44:01 +08:00
juzi	14b2a49053	Merge pull request 'projects/mesxc-dy' (#374 ) from projects/mesxc-dy into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #374	2024-04-26 10:39:55 +08:00
helloDy	6adac714f0	time	2024-04-26 10:36:29 +08:00
helloDy	0349f3cde0	Merge branch 'projects/mesxc-test' into projects/mesxc-dy	2024-04-26 10:16:38 +08:00
helloDy	4cafa78908	原片追溯，报表日期	2024-04-26 10:16:07 +08:00
juzi	61ef172534	Merge pull request 'projects/mesxc-zhp' (#373 ) from projects/mesxc-zhp into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #373	2024-04-26 10:15:45 +08:00
‘937886381’	19d913a49e	Merge branch 'projects/mesxc-test' into projects/mesxc-zhp	2024-04-26 09:58:48 +08:00
‘937886381’	70c3fd44d6	修改bug	2024-04-26 09:58:14 +08:00
juzi	78d6f0bb23	Merge pull request 'projects/mesxc-zhp' (#372 ) from projects/mesxc-zhp into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #372	2024-04-26 09:54:08 +08:00
‘937886381’	cf51eff0b7	修改bug	2024-04-26 09:52:37 +08:00
‘937886381’	539dddf217	修改bug	2024-04-26 09:51:31 +08:00
‘937886381’	317d01934b	Merge branch 'projects/mesxc-test' into projects/mesxc-zhp	2024-04-26 09:28:46 +08:00
‘937886381’	cdfe5c9c1b	修改bug	2024-04-26 09:28:24 +08:00
juzi	c1ea5157a5	Merge pull request 'projects/mesxc-zjl' (#371 ) from projects/mesxc-zjl into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #371	2024-04-26 08:56:39 +08:00