src/views/extend/processEquValueBom/add-or-updata.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: zhp
+ * @LastEditors: DY
- * @LastEditTime: 2024-03-08 09:14:38
+ * @LastEditTime: 2023-12-14 14:03:27
  * @Description:
 -->
 <template>
@@ -224,7 +224,6 @@ export default {
       this.equipmentList.forEach((ele) => {
         if (val === ele.id) {
           this.dataForm.equipmentCode = ele.code
-          console.log(this.dataForm.equipmentCode);
         }
       })
     },
@@ -337,17 +336,16 @@ export default {
             pageSize:10
           }).then(response => {
             this.dataForm = response.data
-            this.getCode(response.data.equipmentId)
 						// this.dataForm.unit = String(this.dataForm.unit)
 						// this.dataForm.ValueType = String(this.dataForm.ValueType)
 						// this.dataForm.productType = String(this.dataForm.productType)
           });
 					// 获取产品属性列表
-          this.getList()
+					this.getList();
 				} else {
-					// if (this.urlOptions.isGetCode) {
+					if (this.urlOptions.isGetCode) {
-          //   this.getCode()
+            this.getCode()
-          // }
+          }
 				}
 			});
 		},

src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue

@@ -114,12 +114,10 @@ export default {
       inspectionDetList:[],
 			workshopSectionList: [],
 		};
-  },
+	},
-  created () {
+	mounted() {
-
+    this.getProductionLineList()
-  },
+    this.getQualityInspectionDetList()
-  mounted() {
-
     // this.getList()
 		// this.getWorksectionList();
 		// this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
@@ -141,9 +139,7 @@ export default {
   methods: {
     init(obj) {
       // console.log(productionLineId);
-      console.log(obj)
+      console.log(obj);
-      this.getProductionLineList()
-      this.getQualityInspectionDetList()
       this.visible = true
       // if(obj.id)
       if (obj) {

src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue

@@ -97,13 +97,11 @@ export default {
 				// },
 				{
           prop: 'productionLineName',
-          label: '产线',
+					label: '产线',
-          width:120,
 				},
 				{
 					prop: 'sectionName',
-          label: '工段',
+					label: '工段',
-          width: 120,
 				},
 				{
           prop: 'inspectionInfoList',

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

@@ -22,7 +22,8 @@
       </el-col>
       <el-col :span="8">
         <el-form-item label="报废时间" prop="logTime">
-          <el-date-picker v-model="dataForm.logTime" type="datetime" value-format="timestamp" placeholder="选择日期">
+          <el-date-picker v-model="dataForm.logTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
       </el-col>

src/views/quality/base/qualityScrapLog/basic-add.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2024-02-28 09:51:25
- * @LastEditTime: 2024-03-08 13:46:46
+ * @LastEditTime: 2024-02-28 10:05:00
  * @LastEditors: zhp
  * @Description:
  */
@@ -41,7 +41,7 @@ export default {
             console.log(response)
             this.dataForm = response.data
             this.dataForm.detId = response.data.detIdList
-            this.dataForm.logTime = new Date(response.data.logTime)
+            this.dataForm.logTime = new Date(response.data.createTime)
 
             // if (this.setData) {
             //   this.setDataForm()

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

@@ -36,7 +36,7 @@ const tableProps = [
 	// 	filter: parseTime
   // },
   {
-    prop: 'createTime',
+    prop: 'logTime',
     label: '报废时间',
     filter: parseTime
   },

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-03-08 08:38:25
+ * @LastEditTime: 2023-12-01 16:33:41
  * @LastEditors: zhp
  * @Description:
 -->
@@ -22,7 +22,7 @@
     </el-row>
     <el-row :gutter="24">
       <el-col :span="12">
-        <el-form-item label="报废类型描述" prop="description" label-width="110px">
+        <el-form-item label="描述类型" prop="description" label-width="110px">
           <el-input v-model="dataForm.description" clearable placeholder="描述类型" />
         </el-form-item>
       </el-col>

src/views/report/glass/day.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-03-08 15:09:26
+ * @LastEditTime: 2024-03-07 16:21:26
  * @LastEditors: zhp
  * @Description:
 -->
@@ -65,7 +65,6 @@ export default {
 	created() {
     this.getDict()
     this.getTodayStartTimeAndEndTime()
-    this.getDataList()
 	},
   methods: {
     getTodayStartTimeAndEndTime() {
@@ -143,6 +142,7 @@ export default {
         this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
         this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
         console.log(this.listQuery.reportTime);
+        this.getDataList();
 			} else {
 					this.listQuery.reportTime = []
 			}

src/views/report/glass/month.vue

@@ -56,8 +56,7 @@ export default {
 	},
   created() {
     this.getCurrentMonthFirst()
-    this.getDict()
+		this.getDict()
-    this.getDataList()
 	},
 	methods: {
 		async getDict() {
@@ -80,10 +79,7 @@ export default {
         this.tableData = response.data.filter(item => {
 					this.proLineList.forEach(it => {
 						if (item.lineId === it.id) {
-              item.lineName = it.name
+							item.lineName = it.name
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : null
-              item.actualProductTrend = item.actualProductTrend ? this.multipliedByHundred(item.actualProductTrend) + '%' : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend ? this.multipliedByHundred(item.originalGlassPassTrend) * 100 + '%' : null
 						}
 					})
 					if (item.det === false) {

src/views/report/glass/weekly.vue

@@ -91,8 +91,7 @@ export default {
     // console.log('周四', day)
     this.getCurrentWeekStartTimeAndEndTime()
 		// this.changeTime(new Date(new Date().getTime() - day * 24 * 60 * 60 * 1000))
-    this.getDict()
+		this.getDict()
-    this.getDataList()
 	},
 	methods: {
 		async getDict() {
@@ -113,10 +112,7 @@ export default {
         this.tableData = response.data.filter(item => {
 					this.proLineList.forEach(it => {
 						if (item.lineId === it.id) {
-              item.lineName = it.name
+							item.lineName = it.name
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : null
-              item.actualProductTrend = item.actualProductTrend ? this.multipliedByHundred(item.actualProductTrend) + '%' : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend ? this.multipliedByHundred(item.originalGlassPassTrend) * 100 + '%' : null
 						}
 					})
 					if (item.det === false) {

src/views/report/glass/year.vue

@@ -56,7 +56,6 @@ export default {
   },
   mounted () {
     this.getCurrentYearFirst()
-    this.getDataList()
       ;
   },
   methods: {
@@ -81,10 +80,7 @@ export default {
       await this.urlOptions.getDataListURL(this.listQuery).then(response => {
         this.tableData = response.data.filter(item => {
 					this.proLineList.forEach(it => {
-            if (item.lineId === it.id) {
+						if (item.lineId === it.id) {
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : null
-              item.actualProductTrend = item.actualProductTrend ? this.multipliedByHundred(item.actualProductTrend) + '%' : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend ? this.multipliedByHundred(item.originalGlassPassTrend) * 100 + '%' : null
 							item.lineName = it.name
 						}
 					})