src/views/base/packagingPrintLog/add-or-updata.vue

@@ -1,79 +1,72 @@
 <!--
  * @Author: zhp
  * @Date: 2023-10-17 16:50:19
- * @LastEditTime: 2024-02-28 10:07:29
+ * @LastEditTime: 2023-12-01 16:48:53
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <el-dialog class="baseDialog" :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="40%"
+  <el-dialog class="baseDialog" :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="40%" show-close="true">
-    show-close="true">
     <small-title slot="title" :no-padding="true">
       {{ !dataForm.id ? '新增' : '编辑' }}
     </small-title>
-    <!--
+<!--
     <div class="content">
       <div class="visual-part"> -->
-    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
+        <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
-      @keyup.enter.native="dataFormSubmit">
+          @keyup.enter.native="dataFormSubmit">
-      <el-row :gutter="20">
+          <el-row :gutter="20">
-        <el-col :span="12">
+            <el-col :span="12">
-          <el-form-item label="包装流水号" prop="packagingCode">
+              <el-form-item label="包装流水号" prop="packagingCode">
-            <el-input v-model="dataForm.packagingCode" clearable placeholder="请输入包装流水号" />
+                <el-input v-model="dataForm.packagingCode" clearable placeholder="请输入包装流水号" />
-          </el-form-item>
+              </el-form-item>
-        </el-col>
+            </el-col>
-        <el-col :span="12">
+            <el-col :span="12">
-          <el-form-item label="内容" prop="content">
+              <el-form-item label="内容" prop="content">
-            <el-input v-model="dataForm.content" clearable placeholder="请输入内容" />
+                <el-input v-model="dataForm.content" clearable placeholder="请输入内容" />
-          </el-form-item>
+              </el-form-item>
-        </el-col>
+            </el-col>
-      </el-row>
+          </el-row>
-      <el-row :gutter="20">
+          <el-row :gutter="20">
-        <el-col :span="12">
+            <el-col :span="12">
-          <el-form-item label="所属工单" prop="workOrderId">
+              <el-form-item label="所属工单" prop="workOrderId">
-            <el-select v-model="dataForm.workOrderId" style="width: 100%;" placeholder="请选择所属工单" clearable>
+                <el-select v-model="dataForm.workOrderId" style="width: 100%;" placeholder="请选择所属工单" clearable>
-              <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
+                  <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
-            </el-select>
+                </el-select>
-          </el-form-item>
+              </el-form-item>
-        </el-col>
+            </el-col>
-        <el-col :span="12">
+            <el-col :span="12">
-          <el-form-item label="客户" prop="customerId">
+              <el-form-item label="客户" prop="customerId">
-            <el-select v-model="dataForm.customerId" style="width: 100%;" placeholder="请选择客户" clearable>
+                <el-select v-model="dataForm.customerId" style="width: 100%;" placeholder="请选择客户" clearable>
-              <el-option v-for="dict in customerList" :key="dict.id" :label="dict.name" :value="dict.id" />
+                  <el-option v-for="dict in customerList" :key="dict.id" :label="dict.name" :value="dict.id" />
-            </el-select>
+                </el-select>
-          </el-form-item>
+              </el-form-item>
-        </el-col>
+            </el-col>
-      </el-row>
+          </el-row>
-      <el-row :gutter="20">
+          <el-row :gutter="20">
-
+            <el-col :span="12">
-        <el-col :span="12">
+              <el-form-item label="标签模板" prop="modelId">
-          <el-form-item label="包装条码" prop="packagingBarCode">
+                <el-select v-model="dataForm.modelId" style="width: 100%;" placeholder="请选择标签模板" clearable>
-            <el-input v-model="dataForm.packagingBarCode" clearable placeholder="请输入包装条码" />
+                  <el-option v-for="dict in modelList" :key="dict.id" :label="dict.name" :value="dict.id" />
-          </el-form-item>
+                </el-select>
-        </el-col>
+              </el-form-item>
-        <el-col :span="12">
+            </el-col>
-          <el-form-item label="标签模板" prop="modelId">
+            <!-- <el-col :span="12">
-            <el-select v-model="dataForm.modelId" style="width: 100%;" placeholder="请选择标签模板" clearable>
-              <el-option v-for="dict in modelList" :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="area">
                 <el-input v-model="dataForm.area" placeholder="请输入单位平方数" />
               </el-form-item>
             </el-col> -->
-      </el-row>
+          </el-row>
-      <!-- <el-row :gutter="20">
+          <!-- <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="完成单位产品用时" prop="processTime">
                 <el-input v-model="dataForm.processTime" placeholder="请输入完成单位产品用时" />
               </el-form-item>
             </el-col>
           </el-row> -->
-    </el-form>
+        </el-form>
 
-    <!-- <small-title
+        <!-- <small-title
 					style="margin: 16px 0; padding-left: 8px"
 					:no-padding="true">
 					产品属性列表
@@ -103,7 +96,7 @@
 						:page-sizes="[5, 10, 15]"
 						@pagination="getList" />
 				</div> -->
-    <!-- </div> -->
+      <!-- </div> -->
     <!-- </div> -->
 
     <!-- <div style="position: absolute; bottom: 24px; right: 24px">
@@ -193,7 +186,6 @@ export default {
         workOrderId: null, // 单位产品用时 (s)
         customerId: '', // 规格
         content: '', // 单位id
-        packagingBarCode: null
 			},
 			listQuery: {
 				pageSize: 10,

src/views/base/packagingPrintLog/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-28 10:38:34
+ * @LastEditTime: 2023-11-24 09:13:50
  * @Description:
 -->
 <template>
@@ -55,11 +55,7 @@ const tableProps = [
 	{
     prop: 'packagingCode',
     label: '包装流水号'
-  },
+	},
-  {
-    prop: 'packagingBarCode',
-    label: '包装条码'
-  },
 	{
     prop: 'workOrderName',
 		label: '所属工单'

src/views/equipment/base/inspection/Confirm/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-28 14:45:58
+ * @LastEditTime: 2024-02-27 09:41:00
  * @Description:
 -->
 <template>
@@ -27,14 +27,13 @@
 					<el-row :gutter="20">
 						<el-col :span="8">
 							<el-form-item label="巡检单名称" prop="name">
-								<el-input v-model="dataForm.name" :disabled="isdetail" placeholder="请输入巡检单名称" />
+								<el-input v-model="dataForm.name" placeholder="请输入巡检单名称" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="部门" prop="departmentId">
 								<el-select
 									v-model="dataForm.departmentId"
-									:disabled="isdetail"
 									:placeholder="`请选择部门`">
 									<el-option
 										v-for="opt in departmentOptions"
@@ -51,7 +50,7 @@
 									filterable
 									clearable
 									multiple
-									:disabled="isdetail"
+									:disabled="isedit"
 									style="width: 100%"
 									placeholder="请选择班次">
 									<el-option
@@ -71,7 +70,7 @@
 									:placeholder="`请选择巡检人`"
 									multiple
 									clearable
-									:disabled="isdetail"
+									:disabled="isedit"
 									filterable>
 									<el-option
 										v-for="opt in inspectorOptions"
@@ -86,7 +85,7 @@
 								<el-date-picker
 									v-model="dataForm.planCheckTime"
 									type="datetime"
-									:disabled="isdetail"
+									:disabled="isedit"
 									placeholder="请选择巡检时间"
 									value-format="timestamp"></el-date-picker>
 							</el-form-item>
@@ -143,8 +142,7 @@
 		<div v-if="!isdetail" class="drawer-body__footer">
 			<el-button @click="goback()">取消</el-button>
 			<!-- <el-button :disabled="isdetail" @click="init(dataForm.id)">重置</el-button> -->
-			<el-button v-if="isshowConfirm" type="primary" @click="confirmIns()">保存</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-			<el-button v-else type="primary" @click="dataFormSubmit()">保存</el-button>
 		</div>
 
 		<attr-add
@@ -207,7 +205,6 @@ export default {
 			tableProps,
 			topBtnConfig,
 			addOrUpdateVisible: false,
-			isshowConfirm: false,
 			urlOptions: {
 			  isGetCode: false,
 				createURL: createCheckOrder,
@@ -401,34 +398,6 @@ export default {
 				this.$refs.addOrUpdate.init(id);
 			});
 		},
-		getConfirmed() {
-			return this.$confirm('是否直接确认巡检记录', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			});
-		},
-		async confirmIns() {
-			await this.getConfirmed().then(confirm => {
-				this.$axios({
-					url:
-						'/base/equipment-check-order/confirm?confirmPerson=' +
-						this.$store.getters.userId,
-						method: 'put',
-						data: [this.dataForm.id],
-				}).then(res =>{
-					if (res.code == 0) {
-						this.visible = false; 
-						this.$emit("refreshDataList");
-						this.$message.success('已确认');
-					}
-				}).catch(() => {
-					this.visible = false; 
-					this.$emit("refreshDataList");
-					this.$message.success('取消确认');
-				})
-			})
-		},
 		// 表单提交
     dataFormSubmit() {
       this.$refs["dataForm"].validate((valid) => {
@@ -460,7 +429,6 @@ export default {
 				}).then(response => {
           this.$modal.msgSuccess("新增成功");
 					this.idAttrShow = true
-					this.isshowConfirm = true
 					this.dataForm.id = response.data
           // this.visible = false;
           this.$emit("refreshDataList");

src/views/equipment/base/inspection/Confirm/index.vue

@@ -172,27 +172,24 @@ export default {
 		async searchBarClicked(btn) {
 			switch (btn.btnName) {
 				case 'batchConfirm':
+					const ids = this.$refs['waiting-list-table'].selectedPlan.map(
+						(item) => item.id
+					)
 					if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
 						this.$message.warning('请选择待确认的设备巡检单');
 						return;
 					}
-					this.$modal
+					const res = await this.$axios({
-						.confirm('是否确认所有选中保养单"?')
+						url: '/base/equipment-check-order/confirm?confirmPerson=' + this.$store.getters.userId + '&ids=' + ids,
-						.then(() => {
+						method: 'put',
-							return this.$axios({
+						// data: this.$refs['waiting-list-table'].selectedPlan.map(
-								url: '/base/equipment-check-order/confirm?confirmPerson=' + this.$store.getters.userId,
+						// 	(item) => item.id
-								method: 'put',
+						// ),
-								data: this.$refs['waiting-list-table'].selectedPlan.map(
+					});
-									(item) => item.id
+					if (res.code == 0) {
-								),
+						this.$message.success('确认成功');
-							});
+						this.getList();
-						})
+					}
-						.then((res) => {
-							this.getList();
-							res.code == 0 && this.$modal.msgSuccess('确认成功');
-							res.code != 0 && this.$modal.msgError('确认失败');
-						})
-						.catch(() => {});
 					break;
 			}
 		},
@@ -331,7 +328,7 @@ export default {
     // },
 
 		getConfirmed() {
-			return this.$confirm('是否直接确认巡检记录', '提示', {
+			return this.$confirm('是否直接确认保养记录', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
@@ -391,16 +388,17 @@ export default {
 		},
 		/** 确认 */
 		async handleConfirm(row) {
+			console.log('111', this.$store.getters.userId)
 			this.$modal
 				.confirm('是否确认巡检单"' + row.name + '"?')
 				.then(() => {
 					return this.$axios({
 						url:
 							'/base/equipment-check-order/confirm?confirmPerson=' +
-							this.$store.getters.userId,
+							this.$store.getters.userId + '&ids=' + [row.id],
 						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
 						method: 'put',
-						data: [row.id],
+						// data: [row.id],
 					});
 				})
 				.then((res) => {

src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue

@@ -14,7 +14,7 @@
 		custom-class="mes-drawer"
 		size="60%"
 		@closed="$emit('destroy')">
-		<SmallTitle slot="title">{{ showTable ? '编辑' : '新增' }}</SmallTitle>
+		<SmallTitle slot="title">编辑</SmallTitle>
 
 		<div class="drawer-body flex">
 			<div class="drawer-body__content">
@@ -184,53 +184,49 @@
 					</el-form>
 				</div>
 
-				<div v-if="showTable">
+				<SmallTitle>保养内容</SmallTitle>
-					<SmallTitle>保养内容</SmallTitle>
 
-					<div style="margin-top: 12px; position: relative">
+				<div style="margin-top: 12px; position: relative">
-						<SearchBar
+					<SearchBar
-							:formConfigs="searchBarFormConfig"
+						:formConfigs="searchBarFormConfig"
-							ref="attr-search-bar"
+						ref="attr-search-bar"
-							@headBtnClick="handleSearchBarBtnClick" />
+						@headBtnClick="handleSearchBarBtnClick" />
+				</div>
+
+				<div style="margin-top: 12px; position: relative">
+					<div style="position: absolute; top: -40px; right: 0">
+						<el-button @click="handleAddAttr" type="text">
+							<i class="el-icon-plus"></i>
+							添加属性
+						</el-button>
 					</div>
+					<base-table
+						v-loading="attrListLoading"
+						:table-props="attrTableProps"
+						:page="attrQuery?.params.pageNo || 1"
+						:limit="attrQuery?.params.pageSize || 10"
+						:table-data="attrList"
+						@emitFun="handleEmitFun">
+						<method-btn
+							slot="handleBtn"
+							label="操作"
+							:method-list="tableBtn"
+							@clickBtn="handleTableBtnClick" />
+					</base-table>
 
-					<div style="margin-top: 12px; position: relative">
+					<!-- 分页组件 -->
-						<div style="position: absolute; top: -40px; right: 0">
+					<pagination
-							<el-button @click="handleAddAttr" type="text">
+						v-show="attrTotal > 0"
-								<i class="el-icon-plus"></i>
+						:total="attrTotal"
-								添加属性
+						:page.sync="attrQuery.params.pageNo"
-							</el-button>
+						:limit.sync="attrQuery.params.pageSize"
-						</div>
+						@pagination="getAttrList" />
-						<base-table
-							v-loading="attrListLoading"
-							:table-props="attrTableProps"
-							:page="attrQuery?.params.pageNo || 1"
-							:limit="attrQuery?.params.pageSize || 10"
-							:table-data="attrList"
-							@emitFun="handleEmitFun">
-							<method-btn
-								slot="handleBtn"
-								label="操作"
-								:method-list="tableBtn"
-								@clickBtn="handleTableBtnClick" />
-						</base-table>
-
-						<!-- 分页组件 -->
-						<pagination
-							v-show="attrTotal > 0"
-							:total="attrTotal"
-							:page.sync="attrQuery.params.pageNo"
-							:limit.sync="attrQuery.params.pageSize"
-							@pagination="getAttrList" />
-					</div>
 				</div>
 			</div>
 
 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<!-- 新增可确认 -->
+				<el-button type="primary" @click="handleConfirm">保存</el-button>
-				<el-button v-if="isAdd" type="primary" @click="addConfirm">保存</el-button>
-				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
 				<!-- sections的第二项必须是 属性列表  -->
 				<!-- <el-button
 						v-if="sections[1].allowAdd"
@@ -296,8 +292,6 @@ export default {
 		return {
 			visible: false,
 			btnLoading: false,
-			showTable: false,
-			isAdd: false,
 			form: {},
 			formLoading: false,
 			lineList: [],
@@ -393,7 +387,7 @@ export default {
 			attrListLoading: false,
 			// syncFileListFlag: null,
 			tableBtn: [],
-			row: {},
+			row: null,
 		};
 	},
 	computed: {
@@ -444,106 +438,23 @@ export default {
 					break;
 			}
 		},
-		async addConfirm() {
-			console.log('11', this.showTable)
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				this.$nextTick(() => {
-					this.getConfirmed().then(confirm => {
-						console.log('111', confirm)
-						this.$axios({
-							url:
-								'/base/equipment-maintain-log/confirm?confirmPerson=' +
-								this.$store.getters.userId,
-								method: 'put',
-								data: [this.form.id],
-						}).then(res =>{
-							if (res.code == 0) {
-								this.visible = false; 
-								this.$emit("refreshDataList");
-								this.$message.success('已确认');
-							}
-						})
-					}).catch(() => {
-						this.visible = false; 
-						this.$emit("refreshDataList");
-						this.$message.success('取消确认');
-					})
-				})
-			});
-		},
-		getConfirmed() {
-			return this.$confirm('是否直接确认保养记录', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			});
-		},
 		async handleConfirm() {
 			this.btnLoading = true;
-			// this.$nextTick(async () => {
+			this.$nextTick(async () => {
-			// 	const { code, data } = await this.$axios({
+				const { code, data } = await this.$axios({
-			// 		url: '/base/equipment-maintain-log/update',  
+					url: '/base/equipment-maintain-log/update',  
-			// 		method: 'put',
+					method: 'put',
-			// 		data: {
-			// 			...this.form,
-			// 			maintainWorker: this.form.maintainWorker.join(',')
-			// 		},
-			// 	});
-			// 	if (code == 0) {
-			// 		this.$modal.msgSuccess('更新成功');
-			// 	}
-			// 	this.btnLoading = false;
-			// 	this.$emit('refreshDataList');
-			// 	this.handleCancel();
-			// });
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					this.$axios({
-						url: '/base/equipment-maintain-log/update',  
-						method: 'put',
-						data: {
-							...this.form,
-							maintainWorker: this.form.maintainWorker.join(','),
-							special: false,
-							relatePlan: 2
-						}
-					}).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.btnLoading = false;
-						this.$emit('refreshDataList');
-						this.handleCancel();
-					});
-					return;
-				}
-
-				// 添加的提交
-				this.$axios({
-					url: '/base/equipment-maintain-log/create',  
-					method: 'post',
 					data: {
 						...this.form,
-						maintainWorker: this.form.maintainWorker.join(','),
+						maintainWorker: this.form.maintainWorker.join(',')
-						special: false,
+					},
-						relatePlan: 2,
-						confirmed: false,
-					}
-				}).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.btnLoading = false;
-					this.form.id = response.data
-					this.row.id = response.data
-					this.showTable = true
-					this.isAdd = true
-					this.$emit('refreshDataList');
-					// this.handleCancel();
 				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
 			});
 		},
 
@@ -553,22 +464,15 @@ export default {
 
 		init(row) {
 			this.visible = true;
-			if (row) {
+			this.row = row;
-				this.row = row;
+			this.getInfo(row);
-				this.showTable = row ? true : false;
+			this.getAttrList(row);
-				this.$nextTick(() => {
-					if (row.id) {
-						this.getInfo(row.id);
-						this.getAttrList(row.id);
-					}
-				})
-			}
 		},
 
-		async getInfo(id) {
+		async getInfo(row) {
 			this.formLoading = true;
 			const res = await this.$axios(
-				'/base/equipment-maintain-log/get?id=' + id
+				'/base/equipment-maintain-log/get?id=' + row.id
 			);
 			if (res.code == 0) {
 				this.form = res.data;
@@ -578,15 +482,15 @@ export default {
 			this.formLoading = false;
 		},
 
-		async getAttrList(id, condition = {}) {
+		async getAttrList(row, condition = {}) {
-			if (!id) id = this.row.id;
+			if (!row) row = this.row;
 			this.attrListLoading = true;
 			const res = await this.$axios({
 				url: '/base/equipment-maintain-log-det/page',
 				method: 'get',
 				params: {
 					...this.attrQuery.params,
-					logId: id,
+					logId: row.id,
 					...condition,
 				},
 			});

src/views/equipment/base/maintain/Confirm/index.vue

@@ -258,27 +258,17 @@ export default {
 						this.$message.warning('请选择待确认的设备保养记录');
 						return;
 					}
-					this.$modal
+					const res = await this.$axios({
-						.confirm('是否确认所有选中保养单"?')
+						url: '/base/equipment-maintain-log/confirm',
-						.then(() => {
+						method: 'put',
-							return this.$axios({
+						data: this.$refs['waiting-list-table'].selectedPlan.map(
-								url: '/base/equipment-maintain-log/confirm',
+							(item) => item.id
-								method: 'put',
+						),
-								data: this.$refs['waiting-list-table'].selectedPlan.map(
+					});
-									(item) => item.id
+					if (res.code == 0) {
-								),
+						this.$message.success('确认成功');
-							});
+						this.getList();
-					// if (res.code == 0) {
+					}
-					// 	this.$message.success('确认成功');
-					// 	this.getList();
-					// }
-						})
-						.then((res) => {
-							this.getList();
-							res.code == 0 && this.$modal.msgSuccess('确认成功');
-							res.code != 0 && this.$modal.msgError('确认失败');
-						})
-						.catch(() => {});
 					break;
 			}
 		},
@@ -422,13 +412,9 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			// this.reset();
+			this.reset();
-			// this.open = true;
+			this.open = true;
-			// this.title = '添加待确认保养记录';
+			this.title = '添加待确认保养记录';
-			this.openUnplannedDrawer = true;
-			this.$nextTick(() => {
-				this.$refs.unplanned.init();
-			});
 		},
 
 		getConfirmed() {
@@ -492,25 +478,15 @@ export default {
 		},
 		/** 确认 */
 		async handleConfirm(row) {
-			this.$modal
+			const res = await this.$axios({
-				.confirm('是否确认保养单"' + row.maintainOrderNumber + '"?')
+				url: '/base/equipment-maintain-log/confirm',
-				.then(() => {
+				method: 'put',
-					return this.$axios({
+				data: [row.id],
-						url: '/base/equipment-maintain-log/confirm',
+			});
-						method: 'put',
+			if (res.code == 0) {
-						data: [row.id],
+				this.$message.success('确认成功');
-					});
+				this.getList();
-			// if (res.code == 0) {
+			}
-			// 	this.$message.success('确认成功');
-			// 	this.getList();
-			// }
-				})
-				.then((res) => {
-					this.getList();
-					res.code == 0 && this.$modal.msgSuccess('确认成功');
-					res.code != 0 && this.$modal.msgError('确认失败');
-				})
-				.catch(() => {});
 		},
 		/** 编辑 */
 		async handleEdit(row) {

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-02-28 09:58:34
+ * @LastEditTime: 2024-02-18 14:07:08
  * @LastEditors: zhp
  * @Description:
 -->
@@ -15,11 +15,35 @@
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col :span="8">
+        <el-form-item label="班组" prop="teamId">
+          <el-select v-model="dataForm.teamId" placeholder="请选择班组">
+            <el-option v-for="dict in teamList" :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-row>
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-form-item label="产线" prop="lineId">
+          <el-select v-model="dataForm.lineId" placeholder="请选择产线">
+            <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="detId">
+          <el-select v-model="dataForm.detId" placeholder="请选择报废原因">
+            <el-option v-for="dict in detList" :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="logTime">
           <el-date-picker v-model="dataForm.logTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
@@ -30,28 +54,12 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :span="8">
-        <el-form-item label="产线" prop="lineId">
+        <el-form-item label="来源" prop="source">
-          <el-select v-model="dataForm.lineId" placeholder="请选择产线" @change="getWorksectionById">
+          <el-select v-model="dataForm.source" placeholder="请选择来源">
-            <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
+            <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="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="8">
         <el-form-item label="描述" prop="description">
           <el-input v-model="dataForm.description" placeholder="请输入描述" />
@@ -68,7 +76,7 @@
 </template>
 
 <script>
-import basicAdd from './basic-add';
+import basicAdd from '../../../core/mixins/basic-add';
 import {
   createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
   getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
@@ -91,7 +99,6 @@ export default {
       workOrderList: [],
       detList:[],
       teamList: [],
-      sectionList:[],
       sourceList: [
         {
           id: 1,
@@ -110,7 +117,6 @@ export default {
         workOrderId: null,
         teamId: undefined,
         num: undefined,
-        sectionId:undefined,
         lineId:undefined,
         description:undefined,
         // description: undefined,
@@ -131,7 +137,6 @@ export default {
 		this.getDict()
     console.log('我看看', this.dataForm)
     this.getCurrentTime()
-    this.getWorksectionById()
 	},
   methods: {
     getCurrentTime() {
@@ -192,43 +197,7 @@ export default {
         // 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

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

@@ -1,106 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2024-02-28 09:51:25
- * @LastEditTime: 2024-02-28 10:05:00
- * @LastEditors: zhp
- * @Description:
- */
-export default {
-  data() {
-    /* eslint-disable */
-    return {
-      urlOptions: {
-        createURL: '',
-        updateURL: '',
-        infoURL: '',
-        codeURL: '',
-        getOption: false,
-        isGetCode: false,
-        optionArrUrl: [],
-        optionArr: {}
-      },
-      visible: false,
-      setData: false
-    }
-  },
-  created() {
-  },
-  activated() {
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id || "";
-      this.visible = true;
-      if (this.urlOptions.getOption) {
-        this.getArr()
-      }
-      this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
-        if (this.dataForm.id) {
-          this.urlOptions.infoURL(id).then(response => {
-            console.log(response)
-            this.dataForm = response.data
-            this.dataForm.detId = response.data.detIdList
-            this.dataForm.logTime = new Date(response.data.createTime)
-
-            // if (this.setData) {
-            //   this.setDataForm()
-            // }
-          });
-        } else {
-          if (this.urlOptions.isGetCode) {
-            this.getCode()
-          }
-				}
-      });
-    },
-		getCode() {
-			this.urlOptions.codeURL()
-				.then(({ data: res }) => {
-					this.dataForm.code = res;
-				})
-				.catch(() => {});
-		},
-    getArr() {
-      const params = {
-        pageSize: 100,
-        pageNo: 1,
-      }
-      this.urlOptions.optionArrUrl.forEach((item, index) => {
-        item(params).then(({ data: res }) => {
-          this.$set(this.urlOptions.optionArr, `arr${index}`, res.list)
-        })
-          .catch(() => {
-          });
-      });
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        // 修改的提交
-        let str = this.dataForm.detId.join(',')
-        this.dataForm.detId = str
-        if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.visible = false;
-            this.$emit("refreshDataList");
-          });
-          return;
-        }
-        // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    },
-    formClear() {
-      this.$refs.dataForm.resetFields()
-    }
-  }
-}

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-02-28 10:13:10
+ * @LastEditTime: 2023-12-01 10:58:25
  * @LastEditors: zhp
  * @Description:
 -->
@@ -15,19 +15,43 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="工单号" prop="workOrderId">
-            <el-select disabled v-model="dataForm.workOrderId" placeholder="请选择工单号">
+            <el-select v-model="dataForm.workOrderId" placeholder="请选择工单号" disabled>
               <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-form-item label="班组" prop="teamId">
-            <el-input disabled v-model="dataForm.num" placeholder="请输入数量" />
+            <el-select v-model="dataForm.teamId" placeholder="请选择班组" disabled>
+              <el-option v-for="dict in teamList" :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="sum">
+            <el-input v-model="dataForm.sum" placeholder="请输入数量" disabled />
+          </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="请选择产线" disabled>
+              <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="detId">
+            <el-select v-model="dataForm.detId" placeholder="请选择报废原因" 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-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"
+            <el-date-picker v-model="dataForm.logTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" disabled
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -35,28 +59,12 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="8">
-          <el-form-item label="产线" prop="lineId">
+          <el-form-item label="来源" prop="source">
-            <el-select disabled v-model="dataForm.lineId" placeholder="请选择产线" @change="getWorksectionById">
+            <el-select v-model="dataForm.source" placeholder="请选择来源" disabled>
-              <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
+              <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="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="8">
           <el-form-item label="描述" prop="description">
             <el-input v-model="dataForm.description" placeholder="请输入描述" disabled />
@@ -139,7 +147,6 @@ export default {
 		this.getDict()
     console.log('我看看', this.dataForm)
     this.getCurrentTime()
-    // this.getWorksectionById()
 	},
   methods: {
     // init() {
@@ -191,7 +198,6 @@ export default {
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
       })
-
       getTeamList().then((res) => {
         console.log(res);
         // console.log(response);
@@ -201,46 +207,16 @@ export default {
             id: item.id
           }
         })
-        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,
-            };
-          });
-        })
-        // if (code == 0) {
-
-        // }
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
       })
-    },
+		},
-    async getWorksectionById(lineId) {
+		setMaterialCode() {
-        const { code, data } = await this.$axios({
+			const chooseM = this.materialList.filter(item => {
-          url: '/base/core-workshop-section/listByParentId',
+				return item.id === this.dataForm.materialId
-          method: 'get',
+			})
-          params: {
+			this.dataForm.materialCode = chooseM[0].code
-            id: lineId,
+		}
-          },
-        });
-        if (code == 0) {
-          console.log(data)
-          this.sectionList = data.map((item) => {
-            return {
-              name: item.name,
-              id: item.id,
-            };
-          });
-        }
-    }
 	},
 };
 </script>

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

@@ -30,41 +30,32 @@ import {
 } from '@/api/base/qualityScrapLog';
 
 const tableProps = [
-	// {
+	{
-	// 	prop: 'createTime',
+		prop: 'createTime',
-	// 	label: '添加时间',
+		label: '添加时间',
-	// 	filter: parseTime
+		filter: parseTime
-  // },
-  {
-    prop: 'logTime',
-    label: '报废时间',
-    filter: parseTime
-  },
-  {
-    prop: 'lineName',
-    label: '产线名称'
-  },
-  {
-    prop: 'sectionName',
-    label: '工段'
   },
   {
     prop: 'workOrderName',
-    label: '工单名称'
+    label: '工单'
   },
   {
-    prop: 'num',
+    prop: 'teamName',
-    label: '数量'
+    label: '班组'
   },
 	{
     prop: 'detContent',
     label: '报废原因'
 	},
-  {
+	{
-    prop: 'source',
+    prop: 'logTime',
-    label: '来源',
+    label: '报废时间',
-    filter: (val) => val == 1 ? '平板端' : '网页端'
+    filter: parseTime
-  },
+	},
+	{
+    prop: 'num',
+		label: '数量'
+	},
 ];
 
 export default {

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

@@ -286,7 +286,6 @@ export default {
     //   this.searchBarFormConfig[0].defaultSelect = [];
     // }
     this.getList()
-    this.getDict()
   },
 	methods: {
     /** 获取搜索栏的产线列表 */
@@ -321,7 +320,7 @@ export default {
     // },
     getList() {
       this.getDataList()
-      // this.getDict()
+      this.getDict()
     },
 		/** 查询列表 */
     async getDataList() {
@@ -331,7 +330,7 @@ export default {
       const {
         data: { data, otherList, otherMap, nameData },
       } = await getStatisticalDataPage(this.queryParams)
-      // console.log(this.queryParams);
+      console.log(this.queryParams);
       this.dynamicProps = this.filterNameData(nameData)
       this.list = this.filterData(data);
     },
@@ -374,7 +373,7 @@ export default {
 
         this.getList()
       }
-    //  console.log(val);
+     console.log(val);
     }
 		/** 搜索按钮操作 */
 		// handleQuery() {

src/views/specialEquipment/check/Content-add_detail.vue

@@ -269,7 +269,7 @@ export default {
 		},
 
 		getConfirmed() {
-			return this.$confirm('是否直接确认巡检记录', '提示', {
+			return this.$confirm('是否直接确认保养记录', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',

src/views/specialEquipment/check/Content.vue

@@ -281,7 +281,7 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.open = true;
-			this.title = '新增巡检单';
+			this.title = '新建巡检单';
 			this.$nextTick(() => {
 				this.$refs.add.init();
 			});

src/views/specialEquipment/maintain/WaitingList.vue

@@ -76,7 +76,6 @@
 			v-if="openUnplannedDrawer"
 			@refreshDataList="getList"
 			@destroy="openUnplannedDrawer = false" />
-
 		<PlannedEditDrawer
 			ref="planned"
 			v-if="openPlannedDrawer"
@@ -87,12 +86,6 @@
 			v-if="recordDetailVisible"
 			ref="recordDetailDrawer"
 			@closed="recordDetailVisible = false" />
-
-		<UnplannedAddDet
-			ref="unplanned-det"
-			v-if="openUnplannedDetDrawer"
-			@refreshDataList="getList"
-			@destroy="openUnplannedDetDrawer = false" />
 	</div>
 </template>
 
@@ -102,8 +95,8 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import DialogFormUnplanned from './WaitingList--add--unplanned.vue';
 import UnplannedEditDrawer from './WaitingListUnplanned--edit.vue';
 import PlannedEditDrawer from './WaitingListPlanned--edit.vue';
-import UnplannedAddDet from './WaitingListUnplanned--add_detail.vue';
 import {
+	deleteEqMaintainLog,
 	exportMaintainLogExcel,
 } from '@/api/equipment/base/maintain/record';
 import WaitingListTable from './WaitingListTable.vue';
@@ -141,8 +134,7 @@ export default {
 		WaitingListTable,
 		RecordDetail,
 		UnplannedEditDrawer,
-		UnplannedAddDet,
+		PlannedEditDrawer
-		PlannedEditDrawer,
 	},
 	mixins: [basicPageMixin],
 	data() {
@@ -469,7 +461,7 @@ export default {
 			allSpecialEquipments: [],
 			openPlannedDrawer: false,
 			openUnplannedDrawer: false,
-			openUnplannedDetDrawer: false,
+			openPlannedDrawer: false,
 		};
 	},
 	watch: {
@@ -689,6 +681,7 @@ export default {
 				if (!valid) {
 					return;
 				}
+				// 修改的提交
 				if (this.form.id != null) {
 					this.put({
 						...this.form,
@@ -701,51 +694,36 @@ export default {
 						this.getList();
 					});
 					return;
-				} else {
-					this.post({
-						...this.form,
-						maintainWorker: this.form.maintainWorker.join(','),
-						special: true,
-						relatePlan: 2,
-						confirmed: false,
-					}).then((response) => {
-						this.$modal.msgSuccess('新增成功');
-						this.open = false;
-						this.getList();
-						setTimeout(() => {
-							this.handleAddDet(response.data);
-						}, 450);
-					});
 				}
 
 				// 添加的提交
-				// this.getConfirmed()
+				this.getConfirmed()
-				// 	.then((confirmed) => {
+					.then((confirmed) => {
-				// 		this.post({
+						this.post({
-				// 			...this.form,
+							...this.form,
-				// 			maintainWorker: this.form.maintainWorker.join(','),
+							maintainWorker: this.form.maintainWorker.join(','),
-				// 			special: true,
+							special: true,
-				// 			relatePlan: 2,
+							relatePlan: 2,
-				// 			confirmed: true,
+							confirmed: true,
-				// 		}).then((response) => {
+						}).then((response) => {
-				// 			this.$modal.msgSuccess('新增成功');
+							this.$modal.msgSuccess('新增成功');
-				// 			this.open = false;
+							this.open = false;
-				// 			this.getList();
+							this.getList();
-				// 		});
+						});
-				// 	})
+					})
-				// 	.catch((err) => {
+					.catch((err) => {
-				// 		this.post({
+						this.post({
-				// 			...this.form,
+							...this.form,
-				// 			maintainWorker: this.form.maintainWorker.join(','),
+							maintainWorker: this.form.maintainWorker.join(','),
-				// 			special: true,
+							special: true,
-				// 			relatePlan: 2,
+							relatePlan: 2,
-				// 			confirmed: false,
+							confirmed: false,
-				// 		}).then((response) => {
+						}).then((response) => {
-				// 			this.$modal.msgSuccess('新增成功');
+							this.$modal.msgSuccess('新增成功');
-				// 			this.open = false;
+							this.open = false;
-				// 			this.getList();
+							this.getList();
-				// 		});
+						});
-				// 	});
+					});
 			});
 		},
 		/** 确认 */
@@ -779,15 +757,6 @@ export default {
 				});
 			}
 		},
-
-		/** 新增后添加内容 */
-		handleAddDet(id) {
-			this.openUnplannedDetDrawer = true;
-			this.$nextTick(() => {
-				this.$refs['unplanned-det'].init({ id });
-			});
-		},
-
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			this.$modal

src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue

@@ -209,12 +209,12 @@
 				</div>
 
 				<div style="margin-top: 12px; position: relative">
-					<!-- <div style="position: absolute; top: -40px; right: 0">
+					<div style="position: absolute; top: -40px; right: 0">
 						<el-button @click="handleAddAttr" type="text">
 							<i class="el-icon-plus"></i>
 							添加属性
 						</el-button>
-					</div> -->
+					</div>
 					<base-table
 						v-loading="attrListLoading"
 						:table-props="attrTableProps"
@@ -222,11 +222,11 @@
 						:limit="attrQuery?.params.pageSize || 10"
 						:table-data="attrList"
 						@emitFun="handleEmitFun">
-						<!-- <method-btn
+						<method-btn
 							slot="handleBtn"
 							label="操作"
 							:method-list="tableBtn"
-							@clickBtn="handleTableBtnClick" /> -->
+							@clickBtn="handleTableBtnClick" />
 					</base-table>
 
 					<!-- 分页组件 -->
@@ -324,45 +324,6 @@ export default {
 				{
 					prop: 'maintenanceDes',
 					label: '保养描述',
-					subcomponent: {
-						name: 'TableCellInput',
-						props: ['injectData'],
-						data() {
-							return {
-								inputvalue: null,
-							};
-						},
-						mounted() {
-							this.inputvalue = this.injectData.maintenanceDes;
-						},
-						methods: {
-							async handleValueChange(maintenanceDes) {
-								document.body.style.cursor = 'wait';
-								await this.$axios({
-									url: '/base/equipment-maintain-log-det/update',
-									method: 'put',
-									data: {
-										logId: this.injectData.logId,
-										remark: this.injectData.remark,
-										program: this.injectData.program,
-										id: this.injectData.id,
-										maintenanceDes: maintenanceDes,
-									},
-								});
-								document.body.style.cursor = 'default';
-							},
-						},
-						render: function (h) {
-							return (
-								<el-input
-									size="small"
-									key={this.injectData.id}
-									v-model={this.inputvalue}
-									onChange={this.handleValueChange}
-								/>
-							);
-						},
-					},
 				},
 			],
 			attrList: [],
@@ -623,7 +584,7 @@ export default {
 		handleAddAttr() {
 			if (!this.row.id) return this.$message.error('请先选中保养记录');
 			this.resetAttrform();
-			this.attrTitle = '添加保养项目';
+			this.attrTitle = '添加设备属性';
 			this.attrFormVisible = true;
 		},
 
@@ -636,14 +597,14 @@ export default {
 			});
 			if (res.code == 0) {
 				this.attrForm = res.data;
-				this.attrTitle = '编辑保养项目';
+				this.attrTitle = '编辑设备属性';
 				this.attrFormVisible = true;
 			}
 		},
 
 		// 删除属性
 		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该保养项目?', '提示', {
+			this.$confirm('确定删除该保养内容?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',

src/views/specialEquipment/maintain/WaitingListUnplanned--add_detail.vue

@@ -1,516 +0,0 @@
-<!-- 
-    filename: WaitingListUnplanned--edit.vue
-    author: liubin
-    date: 2023-08-22 14:38:56
-    description: 
--->
-
-<template>
-	<el-drawer
-		:visible="visible"
-		:show-close="false"
-		:wrapper-closable="false"
-		class="drawer"
-		custom-class="mes-drawer"
-		size="60%"
-		@closed="$emit('destroy')">
-		<SmallTitle slot="title">添加保养项目</SmallTitle>
-
-		<div class="drawer-body flex">
-			<div class="drawer-body__content">
-				<SmallTitle>保养内容</SmallTitle>
-
-				<div style="margin-top: 12px; position: relative">
-					<SearchBar
-						:formConfigs="searchBarFormConfig"
-						ref="attr-search-bar"
-						@headBtnClick="handleSearchBarBtnClick" />
-				</div>
-
-				<div style="margin-top: 12px; position: relative">
-					<div style="position: absolute; top: -40px; right: 0">
-						<el-button @click="handleAddAttr" type="text">
-							<i class="el-icon-plus"></i>
-							添加项目
-						</el-button>
-					</div>
-					<base-table
-						v-loading="attrListLoading"
-						:table-props="attrTableProps"
-						:page="attrQuery?.params.pageNo || 1"
-						:limit="attrQuery?.params.pageSize || 10"
-						:table-data="attrList"
-						@emitFun="handleEmitFun">
-						<method-btn
-							slot="handleBtn"
-							label="操作"
-							:method-list="tableBtn"
-							@clickBtn="handleTableBtnClick" />
-					</base-table>
-
-					<!-- 分页组件 -->
-					<pagination
-						v-show="attrTotal > 0"
-						:total="attrTotal"
-						:page.sync="attrQuery.params.pageNo"
-						:limit.sync="attrQuery.params.pageSize"
-						@pagination="getAttrList" />
-				</div>
-			</div>
-
-			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button type="primary" @click="handleConfirm">保存</el-button>
-				<!-- sections的第二项必须是 属性列表  -->
-				<!-- <el-button
-						v-if="sections[1].allowAdd"
-						type="primary"
-						@click="handleAddAttr">
-						添加属性
-					</el-button> -->
-			</div>
-		</div>
-
-		<!-- 属性对话框 -->
-		<base-dialog
-			:dialogTitle="attrTitle"
-			:dialogVisible="attrFormVisible"
-			width="35%"
-			:append-to-body="true"
-			custom-class="baseDialog"
-			@close="closeAttrForm"
-			@cancel="closeAttrForm"
-			@confirm="submitAttrForm">
-			<DialogForm
-				v-if="attrFormVisible"
-				ref="attrForm"
-				v-model="attrForm"
-				:rows="attrRows" />
-		</base-dialog>
-	</el-drawer>
-</template>
-
-<script>
-import DialogForm from '../../../components/DialogForm/index.vue';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
-
-export default {
-	components: { SmallTitle, DialogForm },
-	props: ['dataId'], // dataId 作为一个通用的存放id的字段
-	data() {
-		return {
-			visible: false,
-			btnLoading: false,
-			form: {},
-			formLoading: false,
-			lineList: [],
-			maintainerList: [],
-			departmentList: [],
-			attrTableProps: [
-				{
-					prop: 'equipmentName',
-					label: '设备名称',
-				},
-				{
-					prop: 'program',
-					label: '保养项目',
-				},
-				{
-					prop: 'maintenanceDes',
-					label: '保养描述',
-				},
-			],
-			attrList: [],
-			attrTotal: 0,
-			attrTitle: '',
-			attrForm: {
-				id: null,
-				logId: null,
-				program: null,
-				maintenanceDes: null,
-				remark: null,
-			},
-			attrFormVisible: false,
-			attrRows: [
-				[
-					{
-						select: true,
-						label: '设备名称',
-						prop: 'equipmentId',
-						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
-						// method: 'post',
-						// queryParams: {
-						// 	pageNo: 1,
-						// 	pageSize: 100,
-						// 	special: true,
-						// },
-						rules: [
-							{ required: true, message: '设备不能为空', trigger: 'blur' },
-						],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '保养项目',
-						prop: 'program',
-					},
-				],
-				[
-					{
-						input: true,
-						label: '保养描述',
-						prop: 'maintenanceDes',
-					},
-				],
-				[
-					{
-						input: true,
-						label: '备注',
-						prop: 'remark',
-					},
-				],
-			],
-			attrQuery: {
-				params: {
-					pageNo: 1,
-					pageSize: 10,
-					equipmentName: null,
-				},
-			}, // 属性列表的请求
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '设备',
-					placeholder: '请输入设备名称',
-					param: 'equipmentName',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-			attrFormSubmitting: false,
-			attrListLoading: false,
-			// syncFileListFlag: null,
-			tableBtn: [],
-			row: null,
-		};
-	},
-	computed: {
-		departmentOptions() {
-			return (this.departmentList || []).map((item) => ({
-				id: item.id,
-				label: item.name,
-				value: item.id,
-			}));
-		},
-		lineOptions() {
-			return (this.lineList || []).map((item) => ({
-				id: item.id,
-				label: item.name,
-				value: item.id,
-			}));
-		},
-		maintainerOptions() {
-			return (this.maintainerList || []).map((item) => ({
-				id: item.id,
-				label: item.name,
-				value: item.name,
-			}));
-		},
-	},
-	mounted() {
-		// this.getList('maintainer');
-		// this.getList('department');
-		// this.getList('line');
-	},
-	methods: {
-		handleSearchBarBtnClick(btn) {
-			switch (btn.btnName) {
-				case 'search':
-					this.attrQuery.params.equipmentName = btn.equipmentName;
-					this.getAttrList();
-					break;
-			}
-		},
-		handleTableBtnClick({ type, data }) {
-			switch (type) {
-				case 'edit':
-					this.handleEditAttr(data.id);
-					break;
-				case 'delete':
-					this.handleDeleteAttr(data.id);
-					break;
-			}
-		},
-
-		getConfirmed() {
-			return this.$confirm('是否直接确认保养记录', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			});
-		},
-
-		async handleConfirm() {
-			if (this.attrList.length == 0) {
-				return this.$message.error('请添加保养项目');
-			}
-
-			let confirmed = false;
-			try {
-				confirmed = await this.getConfirmed();
-			} catch (err) {
-				confirmed = false;
-			}
-
-			if (confirmed) {
-				const res = await this.$axios({
-					url: '/base/equipment-maintain-log/confirm',
-					method: 'put',
-					data: [this.row.id],
-				});
-				if (res.code == 0) {
-					this.$message.success('已确认');
-				}
-			}
-
-			// this.btnLoading = true;
-			// this.$nextTick(async () => {
-			// 	const { code, data } = await this.$axios({
-			// 		url: '/base/equipment-maintain-log/update',
-			// 		method: 'put',
-			// 		data: {
-			// 			...this.form,
-			// 			maintainWorker: this.form.maintainWorker.join(','),
-			// 		},
-			// 	});
-			// 	if (code == 0) {
-			// 		this.$modal.msgSuccess('更新成功');
-			// 	}
-			// 	this.btnLoading = false;
-			// 	this.$emit('refreshDataList');
-			// 	this.handleCancel();
-			// });
-			this.$emit('refreshDataList');
-			this.handleCancel();
-		},
-
-		handleEmitFun(val) {
-			console.log('handleEmitFun', val);
-		},
-
-		init(row) {
-			this.visible = true;
-			this.row = row;
-			this.getAttrList(row);
-		},
-
-		async getAttrList(row, condition = {}) {
-			if (!row) row = this.row;
-			this.attrListLoading = true;
-			const res = await this.$axios({
-				url: '/base/equipment-maintain-log-det/page',
-				method: 'get',
-				params: {
-					...this.attrQuery.params,
-					logId: row.id,
-					...condition,
-				},
-			});
-			if (res.code == 0) {
-				this.attrList = res.data.list;
-				this.attrTotal = res.data.total;
-			}
-			this.attrListLoading = false;
-		},
-
-		handleCancel() {
-			if (!this.attrList.length) {
-				return this.$message.error('请添加保养项目');
-			}
-			this.visible = false;
-		},
-
-		resetAttrform() {
-			this.attrForm = {
-				id: null,
-				logId: this.row.id,
-				maintenanceDes: '',
-				program: null,
-				remark: null,
-			};
-		},
-
-		// 新增属性
-		handleAddAttr() {
-			if (!this.row.id) return this.$message.error('请先选中保养记录');
-			this.resetAttrform();
-			this.attrTitle = '添加保养项目';
-			this.attrFormVisible = true;
-		},
-
-		// 编辑属性
-		async handleEditAttr(attrId) {
-			const res = await this.$axios({
-				url: '/base/equipment-maintain-log-det/get',
-				method: 'get',
-				params: { id: attrId },
-			});
-			if (res.code == 0) {
-				this.attrForm = res.data;
-				this.attrTitle = '编辑保养项目';
-				this.attrFormVisible = true;
-			}
-		},
-
-		// 删除属性
-		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该保养项目?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			})
-				.then(async () => {
-					const res = await this.$axios({
-						url: 'url delete', // this.sections[1].urlDelete,
-						method: 'delete',
-						params: { id: attrId },
-					});
-					if (res.code == 0) {
-						this.$message({
-							message: '删除成功',
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getAttrList();
-							},
-						});
-					}
-				})
-				.catch(() => {});
-		},
-
-		// 提交属性表
-		submitAttrForm() {
-			this.$refs['attrForm'].validate(async (valid) => {
-				if (!valid) {
-					return;
-				}
-
-				try {
-					const isEdit = this.attrForm.id != null;
-					this.attrFormSubmitting = true;
-					const res = await this.$axios({
-						url: isEdit
-							? '/base/equipment-maintain-log-det/update'
-							: '/base/equipment-maintain-log-det/create',
-						method: isEdit ? 'put' : 'post',
-						data: this.attrForm,
-					});
-
-					if (res.code == 0) {
-						this.closeAttrForm();
-						this.$message({
-							message: `${isEdit ? '更新' : '创建'}成功`,
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getAttrList();
-							},
-						});
-					}
-					this.attrFormSubmitting = false;
-				} catch (err) {
-					this.$message({
-						message: err,
-						type: 'error',
-						duration: 1500,
-					});
-					this.attrFormSubmitting = false;
-				}
-			});
-		},
-
-		closeAttrForm() {
-			this.attrFormVisible = false;
-		},
-	},
-};
-</script>
-
-<style scoped>
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-}
-
-.drawer >>> .el-date-editor,
-.drawer >>> .el-select {
-	width: 100%;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 0px;
-}
-
-.small-title::before {
-	content: '';
-	display: inline-block;
-	vertical-align: top;
-	width: 4px;
-	height: 22px;
-	border-radius: 1px;
-	margin-right: 8px;
-	background-color: #0b58ff;
-}
-
-.drawer-body {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-}
-
-.drawer-body__content {
-	flex: 1;
-	/* background: #eee; */
-	padding: 20px 30px;
-	overflow-y: auto;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>

src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue

@@ -559,7 +559,7 @@ export default {
 		handleAddAttr() {
 			if (!this.row.id) return this.$message.error('请先选中保养记录');
 			this.resetAttrform();
-			this.attrTitle = '添加保养项目';
+			this.attrTitle = '添加设备属性';
 			this.attrFormVisible = true;
 		},
 
@@ -572,14 +572,14 @@ export default {
 			});
 			if (res.code == 0) {
 				this.attrForm = res.data;
-				this.attrTitle = '编辑保养项目';
+				this.attrTitle = '编辑设备属性';
 				this.attrFormVisible = true;
 			}
 		},
 
 		// 删除属性
 		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该保养项目?', '提示', {
+			this.$confirm('确定删除该属性?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',