14 changed files with 66 additions and 102 deletions
--- a/src/views/base/coreProductionLine/index.vue
+++ b/src/views/base/coreProductionLine/index.vue
@ -144,8 +144,8 @@ export default {
    getDataList() {
      this.dataListLoading = true;
      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        // this.tableData = response.data.list;
-				this.getStatus(response.data.list)
+        this.tableData = response.data.list;
+				// this.getStatus(response.data.list)
        this.listQuery.total = response.data.total;
        this.dataListLoading = false;
      });
--- a/src/views/base/coreWorkOrder/add-or-updata.vue
+++ b/src/views/base/coreWorkOrder/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-11-24 18:20:26
+ * @LastEditTime: 2023-11-20 16:51:24
 * @Description:
 -->
 <template>
@ -29,10 +29,11 @@

 				<div class="action_btn">
 					<template>
-            <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
-            </span>
-          </template>
+						<span style="display: inline-block;" @click="addNew()">
+							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
+							<span class="add">添加</span>
+						</span>
+					</template>
 				</div>
 				<base-table
 					:table-props="tableProps"
@ -297,7 +298,7 @@ export default {
 }
 .action_btn {
  float: right;
-  margin: -40px 15px;
+  margin: 5px 15px;
  font-size: 14px;
 }
 .add {
--- a/src/views/base/coreWorkOrder/addWorkOrder.vue
+++ b/src/views/base/coreWorkOrder/addWorkOrder.vue
@ -311,11 +311,11 @@ export default {
      if (val) {
        this.productList.map(item => {
          if (val === item.id) {
-            this.dataForm.specifications = item.specifications
+            this.dataForm.productSpec = item.specifications
          }
        })
      } else {
-        this.dataForm.specifications = ''
+        this.dataForm.productSpec = ''
      }
    }
  }
--- a/src/views/base/coreWorker/add-or-updata.vue
+++ b/src/views/base/coreWorker/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-11-24 18:13:02
+ * @LastEditTime: 2023-11-22 10:26:58
 * @Description:
 -->
 <template>
@ -196,7 +196,7 @@ export default {
 				workCost: undefined,
        remark: undefined,
 			},
-			majorIdList: [],
+			majorIdList: undefined,
 			departmentlList: [],
 			menuOptions: [],
 			bindIds: [],
@ -267,7 +267,7 @@ export default {
 				workCost: undefined,
        remark: undefined
 			}
-			this.majorIdList = []
+			this.majorIdList = undefined
 		},
 		// 表单提交
    dataFormSubmit() {
@ -288,28 +288,24 @@ export default {
            this.visible = false;
            this.$emit("refreshDataList");
          });
-					if (this.majorIdList.length > 0) {
-						this.majorIdList.forEach(majorId => {
-							createWoBindMa({
-								workerId: this.dataForm.id,
-								majorId: majorId
-							}).then(res => {})
-						});
-					}
+					this.majorIdList.forEach(majorId => {
+						createWoBindMa({
+							workerId: this.dataForm.id,
+							majorId: majorId
+						}).then(res => {})
+					});
          return;
        }
        // 添加的提交
        this.urlOptions.createURL(this.dataForm).then(response => {
 					// response.data = id
 					this.workerId = response.data
-					if (this.majorIdList.length > 0) {
-						this.majorIdList.forEach(majorId => {
-							createWoBindMa({
-								workerId: this.workerId,
-								majorId: majorId
-							}).then(res => {})
-						});
-					}
+					this.majorIdList.forEach(majorId => {
+						createWoBindMa({
+							workerId: this.workerId,
+							majorId: majorId
+						}).then(res => {})
+					});
          this.$modal.msgSuccess("新增成功");
          this.visible = false;
          this.$emit("refreshDataList");
@ -328,7 +324,6 @@ export default {
        if (this.dataForm.id) {
          this.urlOptions.infoURL(id).then(response => {
            this.dataForm = response.data;
-						this.dataForm.departmentName = undefined
          });
 					// 获取员工--专业
 					getWoBindMaPage({
--- a/src/views/equipment/base/inspection/Record/addRecord.vue
+++ b/src/views/equipment/base/inspection/Record/addRecord.vue
@ -77,9 +77,9 @@
 					<el-form-item label="巡检时间" prop="actualTime">
 						<el-date-picker
 							v-model="dataForm.actualTime"
-							type="datetime"
+							type="date"
 							:disabled="isdetail"
-							format='yyyy-MM-dd HH:mm:ss'
+							format='yyyy-MM-dd'
 							value-format="timestamp"
 							placeholder="选择巡检时间" />
 					</el-form-item>
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@ -69,7 +69,7 @@ export default {
 	data() {
 		return {
 			addOrUpdateVisible: false,
-			searchBarKeys: ['equipmentId', 'actualTime'],
+			searchBarKeys: ['equipmentId', 'createTime'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:check-record:detail')
 					? {
@ -113,12 +113,12 @@ export default {
 					label: '时间段',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'actualTime',
+					param: 'startTime',
 					// width: 350,
 				},
 				{
--- a/src/views/equipment/base/inspection/Settings/add-or-updata.vue
+++ b/src/views/equipment/base/inspection/Settings/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-11-24 18:38:22
+ * @LastEditTime: 2023-11-09 11:09:26
 * @Description:
 -->
 <template>
@ -52,10 +52,11 @@

 				<div v-if="!isdetail" class="action_btn">
 					<template>
-            <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
-            </span>
-          </template>
+						<span style="display: inline-block;" @click="addNew()">
+							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
+							<span class="add">添加</span>
+						</span>
+					</template>
 				</div>
 				<base-table
 					:table-props="tableProps"
@ -289,7 +290,7 @@ export default {

 .drawer >>> .visual-part {
 	flex: 1 auto;
-	max-height: 16vh;
+	max-height: 76vh;
 	overflow: hidden;
 	overflow-y: scroll;
 	padding-right: 10px; /* 调整滚动条样式 */
@ -307,7 +308,7 @@ export default {
 }
 .action_btn {
  float: right;
-  margin: -40px 15px;
+  margin: 5px 15px;
  font-size: 14px;
 }
 .add {
--- a/src/views/equipment/base/inspection/Settings/index.vue
+++ b/src/views/equipment/base/inspection/Settings/index.vue
@ -101,7 +101,7 @@ export default {
 				{ prop: 'sectionName', label: '工段' },
 				{ prop: 'equipmentName', label: '设备' },
 				{ prop: 'equipmentCode', label: '设备编码' },
-				// { prop: 'responsible', label: '负责人' },
+				{ prop: 'responsible', label: '负责人' },
 				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
 			],
 			searchBarFormConfig: [
@ -116,7 +116,6 @@ export default {
 					label: '设备名称',
 					placeholder: '请选择设备',
 					param: 'equipmentId',
-					filterable: true,
 				},
 				{
 					type: 'button',
@ -171,12 +170,8 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/listAll',
-						bind: {
-							filterable: true,
-							clearable: true,
-						},
 						rules: [
-							{ required: true, message: '设备名称不能为空', trigger: 'change' },
+							{ required: true, message: '设备名称不能为空', trigger: 'blur' },
 						],
 					},
 					{
--- a/src/views/equipment/base/maintain/Record/index.vue
+++ b/src/views/equipment/base/maintain/Record/index.vue
@ -45,11 +45,6 @@
 				:disabled="mode == 'detail'"
 				:has-files="true"
 				:rows="rows" />
-			<el-row v-if="mode === 'detail'" slot="footer" type="flex" justify="end">
-				<el-col :span="12">
-					<el-button size="small" class="btnTextStyle" @click="cancel">关闭</el-button>
-				</el-col>
-			</el-row>
 		</base-dialog>
 	</div>
 </template>
--- a/src/views/equipment/base/spareParts/Config/addSparts.vue
+++ b/src/views/equipment/base/spareParts/Config/addSparts.vue
@ -75,6 +75,9 @@

 		<div class="drawer-body__footer">
 			<el-button type="primary" @click="goback()">关闭</el-button>
+			<el-button v-if="disabled" type="primary" @click="goEdit()">
+				编辑
+			</el-button>
 		</div>

 		<attr-add
--- a/src/views/equipment/base/spareParts/Config/attr-add.vue
+++ b/src/views/equipment/base/spareParts/Config/attr-add.vue
@ -35,7 +35,7 @@
 		</el-form>

 		<el-row style="text-align: right">
-			<el-button @click="cancel">取消</el-button>
+			<el-button @click="visible = false">取消</el-button>
 			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 		</el-row>
 	</el-dialog>
@ -79,13 +79,21 @@ export default {
 				this.partList = res.data.list;
 			})
 		},
-		cancel() {
-			this.$refs['dataForm'].resetFields()
-			this.visible = false
-		},
 		init(id) {
-			// this.dataForm.id = id || '';
+			this.dataForm.id = id || '';
 			this.visible = true;
+			// this.$nextTick(() => {
+			// 	this.$refs['dataForm'].resetFields();
+			// 	if (this.dataForm.id) {
+			// 		getCoreProductAttr({
+			// 			id: this.dataForm.id
+			// 		}).then((res) => {
+			// 			const { name, value } = res.data;
+			// 			this.dataForm.name = name;
+			// 			this.dataForm.value = value;
+			// 		});
+			// 	}
+			// });
 		},
 		// 表单提交
 		dataFormSubmit() {
@ -109,7 +117,6 @@ export default {
 						configId: this.configId,
 					}).then((response) => {
 						this.$modal.msgSuccess('新增成功');
-						this.$refs['dataForm'].resetFields()
 						this.visible = false;
 						this.$emit('refreshDataList');
 					});
--- a/src/views/equipment/base/spareParts/List/index.vue
+++ b/src/views/equipment/base/spareParts/List/index.vue
@ -301,12 +301,6 @@ export default {
 			const id = row.id;
 			this.info({ id }).then((response) => {
 				this.form = response.data;
-				if (this.form.unit !== undefined) {
-					this.form.unit = String(this.form.unit)
-				}
-				if (this.form.type !== undefined) {
-					this.form.type = String(this.form.type)
-				}
 				this.open = true;
 				this.title = '修改备品备件';
 			});
--- a/src/views/equipment/base/spareParts/Monitor/addSparts.vue
+++ b/src/views/equipment/base/spareParts/Monitor/addSparts.vue
@ -310,8 +310,7 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'change') {
 				// 更换
-				console.log(raw)
-				this.addNew(raw.data.sparePartId);
+				this.addNew();
 			} else {}
 		},
 		getList() {
@ -321,7 +320,7 @@ export default {
 				configId: this.dataForm.id,
 			}).then((response) => {
 				this.list = response.data;
-				this.listQuery.total = response.data.length;
+				this.listQuery.total = response.data.total;
 			});
 		},
 		getList1() {
@ -335,10 +334,10 @@ export default {
 			});
 		},
 		// 新增 / 修改
-		addNew(sparePartId) {
+		addNew(id) {
 			this.addOrUpdateVisible = true;
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(sparePartId);
+				this.$refs.addOrUpdate.init(id);
 			});
 		},
 		/** 导出按钮操作 */
--- a/src/views/equipment/base/spareParts/Monitor/attr-add.vue
+++ b/src/views/equipment/base/spareParts/Monitor/attr-add.vue
@ -25,27 +25,10 @@
 					clearable
 					placeholder="请输入操作人" />
 			</el-form-item>
-			<el-form-item label="更换耗时(min)" prop="timeUsed">
-				<el-input-number
-					v-model="dataForm.timeUsed"
-					controls-position="right"
-					clearable
-					placeholder="请输入更换耗时"
-					style="width: 100%" />
-			</el-form-item>
-			<el-form-item label="更换时间" prop="replacementTime">
-				<el-date-picker
-					v-model="dataForm.replacementTime"
-					type="date"
-					format='yyyy-MM-dd'
-					value-format='timestamp'
-					placeholder="选择入更换时间"
-					style="width: 100%" />
-			</el-form-item>
 		</el-form>

 		<el-row style="text-align: right">
-			<el-button @click="cancel">取消</el-button>
+			<el-button @click="visible = false">取消</el-button>
 			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 		</el-row>
 	</el-dialog>
@ -66,15 +49,11 @@ export default {
 			visible: false,
 			dataForm: {
 				id: undefined,
-				responsible: '',
-				timeUsed: 0,
-				sparePartId: '',
-				replacementTime: undefined
+				responsible: ''
 			},
 			partList: [],
 			dataRule: {
-				responsible: [{ required: true, message: '操作人不能为空', trigger: 'blur' }],
-				replacementTime: [{ required: true, message: '更换时间不能为空', trigger: 'blur' }]
+				responsible: [{ required: true, message: '操作人不能为空', trigger: 'blur' }]
 			},
 		};
 	},
@ -87,13 +66,9 @@ export default {
 		// 	this.partList = res.data
 		// },
 		init(id) {
-			this.dataForm.sparePartId = id || undefined;
+			this.dataForm.id = id || '';
 			this.visible = true;
 		},
-		cancel() {
-			this.$refs['dataForm'].resetFields();
-			this.visible = false;
-		},
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {
@ -116,7 +91,6 @@ export default {
 						configId: this.configId,
 					}).then((response) => {
 						this.$modal.msgSuccess('新增成功');
-						this.$refs['dataForm'].resetFields();
 						this.visible = false;
 						this.$emit('refreshDataList');
 					});