From df530abb90e478e0587860f57c09d6aa1077218f Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Mon, 18 Nov 2024 10:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/groupSchedulingRule.js           |   8 +-
 .../deliveryLog/components/addOrUpdate.vue    |  18 +-
 .../base/inspection/Confirm/add-or-updata.vue |  11 +-
 .../base/inspection/Confirm/index.vue         | 199 +++++++++---------
 .../Confirm/WaitingListUnplanned--edit.vue    |   8 +-
 .../equipment/base/maintain/Confirm/index.vue |  23 +-
 .../group/base/schedulingRuleConfig/index.vue |   8 +-
 .../orderManage/components/orderSplit.vue     |   4 +-
 8 files changed, 145 insertions(+), 134 deletions(-)

diff --git a/src/api/base/groupSchedulingRule.js b/src/api/base/groupSchedulingRule.js
index d93d02fc..9beec6cf 100644
--- a/src/api/base/groupSchedulingRule.js
+++ b/src/api/base/groupSchedulingRule.js
@@ -8,7 +8,13 @@ export function createGroupRule(data) {
     data: data
   })
 }
-
+// 作废排班规则
+export function disableGroupRule(id) {
+  return request({
+    url: '/base/group-scheduling-rule/disable?id=' + id,
+    method: 'post',
+  })
+}
 // 更新排班规则基础信息
 export function updateGroupRule(data) {
   return request({
diff --git a/src/views/delivery/deliveryLog/components/addOrUpdate.vue b/src/views/delivery/deliveryLog/components/addOrUpdate.vue
index 15c43943..1026062f 100644
--- a/src/views/delivery/deliveryLog/components/addOrUpdate.vue
+++ b/src/views/delivery/deliveryLog/components/addOrUpdate.vue
@@ -38,15 +38,8 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :span='6'>
-        <el-form-item label="发货负责人" prop="deliveryPersonId">
-          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;" filterable>
-            <el-option
-              v-for="item in personList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
+        <el-form-item label="发货负责人" prop="deliveryPerson">
+          <el-input v-model="form.deliveryPerson"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
@@ -75,7 +68,6 @@
   </el-form>
 </template>
 <script>
-import { getWorkerList } from '@/api/base/worker'
 import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog, listOrderList } from '@/api/base/delivery'
 export default {
   name: 'AddOrUpdate',
@@ -87,7 +79,7 @@ export default {
         name: '',
         code: '',
         deliveryTime: null,
-        deliveryPersonId: '',
+        deliveryPerson: '',
         principal: '',
         principalCall: '',
         principalCost: 0.00,
@@ -100,7 +92,6 @@ export default {
         code: [{ required: true, message: "发货单号不能为空", trigger: "blur" }]
       },
       orderList: [],
-      personList: []
     }
   },
   methods: {
@@ -118,9 +109,6 @@ export default {
       listOrderList().then(res => {
         this.orderList = res.data || []
       })
-      getWorkerList().then(res => {
-        this.personList = res.data || []
-      })
     },
     submitForm() {
       this.$refs['addOrUpdate'].validate((valid) => {
diff --git a/src/views/equipment/base/inspection/Confirm/add-or-updata.vue b/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
index 474624ee..b9d94674 100644
--- a/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
+++ b/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: zhp
- * @LastEditTime: 2024-07-31 09:48:36
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-11-18 09:51:03
  * @Description:
 -->
 <template>
@@ -393,9 +393,12 @@ export default {
 						// }
 						this.$axios({
 							url:
-								`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
+								`/base/equipment-check-order/confirm`,
 								method: 'put',
-								data: [this.dataForm.id],
+								data: {
+									ids: [this.dataForm.id],
+									confirmBy: this.$store.getters.nickname,
+								},
 						}).then(res =>{
 							if (res.code == 0) {
 								this.visible = false;
diff --git a/src/views/equipment/base/inspection/Confirm/index.vue b/src/views/equipment/base/inspection/Confirm/index.vue
index b3fce78b..e27bf94a 100644
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@@ -42,9 +42,7 @@
 import AddOrUpdate from './add-or-updata';
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import {
-	exportCheckOrderExcel,
-} from '@/api/equipment/base/maintain/record';
+import { exportCheckOrderExcel } from '@/api/equipment/base/maintain/record';
 import WaitingListTable from './WaitingListTable.vue';
 
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
@@ -76,16 +74,14 @@ export default {
 	name: 'Confirm',
 	components: {
 		WaitingListTable,
-		AddOrUpdate
+		AddOrUpdate,
 	},
 	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
 			recordDetailVisible: false,
-			searchBarKeys: [
-				'name'
-			],
+			searchBarKeys: ['name'],
 			tobeConfirmedIdList: [],
 			searchBarFormConfig: [
 				{
@@ -100,46 +96,51 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-        {
-          type: (this.$auth.hasPermiAnd([
-            'equipment:check-record:create',
-            'base:core-worker:query',
-            'base:core-production-line:query',
-            'base:core-department:query'
-          ]) || this.$auth.hasPermi('equipment:check-record:update') || this.$auth.hasPermi('equipment:check-record:export')) ? 'separate' : '',
-        },
-        {
-          type: this.$auth.hasPermiAnd([
-            'equipment:check-record:create',
-            'base:core-worker:query',
-            'base:core-production-line:query',
-            'base:core-department:query'
-          ])
-            ? 'button'
-            : '',
-          btnName: '新增',
-          name: 'add',
-          plain: true,
-          color: 'success',
-        },
 				{
-          type: this.$auth.hasPermi('equipment:check-record:update')
+					type:
+						this.$auth.hasPermiAnd([
+							'equipment:check-record:create',
+							'base:core-worker:query',
+							'base:core-production-line:query',
+							'base:core-department:query',
+						]) ||
+						this.$auth.hasPermi('equipment:check-record:update') ||
+						this.$auth.hasPermi('equipment:check-record:export')
+							? 'separate'
+							: '',
+				},
+				{
+					type: this.$auth.hasPermiAnd([
+						'equipment:check-record:create',
+						'base:core-worker:query',
+						'base:core-production-line:query',
+						'base:core-department:query',
+					])
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:check-record:update')
 						? 'button'
 						: '',
 					btnName: '巡检人批量确认',
 					name: 'batchConfirm',
 					color: 'primary',
 					plain: true,
-        },
-        {
-          type: this.$auth.hasPermi('equipment:check-record:update')
-            ? 'button'
-            : '',
-          btnName: '确认人批量确认',
-          name: 'batchConfirm2',
-          color: 'primary',
-          plain: true,
-        },
+				},
+				{
+					type: this.$auth.hasPermi('equipment:check-record:update')
+						? 'button'
+						: '',
+					btnName: '确认人批量确认',
+					name: 'batchConfirm2',
+					color: 'primary',
+					plain: true,
+				},
 				// {
 				// 	type: this.$auth.hasPermi('equipment:check-record:export')
 				// 		? 'button'
@@ -211,11 +212,14 @@ export default {
 							// }
 							return this.$axios({
 								// url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
-								url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
+								url: `/base/equipment-check-order/confirm`,
 								method: 'put',
-								data: this.$refs['waiting-list-table'].selectedPlan.map(
-									(item) => item.id
-								),
+								data: {
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
+										(item) => item.id
+									),
+									confirmBy: this.$store.getters.nickname,
+								},
 							});
 						})
 						.then((res) => {
@@ -223,35 +227,38 @@ export default {
 							res.code == 0 && this.$modal.msgSuccess('确认成功');
 							res.code != 0 && this.$modal.msgError('确认失败');
 						})
-            .catch(() => { });
-        case 'batchConfirm2':
-          if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
-            this.$message.warning('请选择待确认的设备巡检单');
-            return;
-          }
-          this.$modal
-            .confirm('是否确认所有选中巡检单"?')
-            .then(() => {
-              // let checkPersonParam = '';
-              // if (!row.checkPerson || row.checkPerson.trim() == '') {
-              // 	/** 如有必要，更新巡检人 */
-              // 	checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
-              // }
-              return this.$axios({
-                // url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
-                url: `/base/equipment-check-order/confirm2?confirmPerson=${this.$store.getters.nickname}`,
-                method: 'put',
-                data: this.$refs['waiting-list-table'].selectedPlan.map(
-                  (item) => item.id
-                ),
-              });
-            })
-            .then((res) => {
-              this.getList();
-              res.code == 0 && this.$modal.msgSuccess('确认成功');
-              res.code != 0 && this.$modal.msgError('确认失败');
-            })
-            .catch(() => { });
+						.catch(() => {});
+				case 'batchConfirm2':
+					if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
+						this.$message.warning('请选择待确认的设备巡检单');
+						return;
+					}
+					this.$modal
+						.confirm('是否确认所有选中巡检单"?')
+						.then(() => {
+							// let checkPersonParam = '';
+							// if (!row.checkPerson || row.checkPerson.trim() == '') {
+							// 	/** 如有必要，更新巡检人 */
+							// 	checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+							// }
+							return this.$axios({
+								// url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
+								url: `/base/equipment-check-order/confirm2`,
+								method: 'put',
+								data: {
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
+										(item) => item.id
+									),
+									confirmBy: this.$store.getters.nickname,
+								},
+							});
+						})
+						.then((res) => {
+							this.getList();
+							res.code == 0 && this.$modal.msgSuccess('确认成功');
+							res.code != 0 && this.$modal.msgError('确认失败');
+						})
+						.catch(() => {});
 					break;
 			}
 		},
@@ -311,7 +318,7 @@ export default {
 		},
 
 		handleSearchBarChange({ param, value }) {
-			console.log('122', param)
+			console.log('122', param);
 			// if ('specialType' === param) {
 			// 	if (!value) {
 			// 		this.setSearchBarEquipmentList(this.allSpecialEquipments);
@@ -327,7 +334,7 @@ export default {
 			this.loading = true;
 			// 执行查询
 			this.recv({
-				...this.queryParams
+				...this.queryParams,
 			}).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
@@ -376,18 +383,18 @@ export default {
 			// this.title = '添加待确认保养记录';
 			// this.addOrEditTitle = '新增';
 			this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init();
-      });
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init();
+			});
 		},
 
 		// 新增 / 修改
-    // addOrUpdateHandle(id) {
-    //   this.addOrUpdateVisible = true;
-    //   this.$nextTick(() => {
-    //     this.$refs.addOrUpdate.init(id);
-    //   });
-    // },
+		// addOrUpdateHandle(id) {
+		//   this.addOrUpdateVisible = true;
+		//   this.$nextTick(() => {
+		//     this.$refs.addOrUpdate.init(id);
+		//   });
+		// },
 
 		getConfirmed() {
 			return this.$confirm('是否直接确认巡检记录', '提示', {
@@ -462,10 +469,12 @@ export default {
 					// 	checkPersonParam = `&checkPerson=${row.checkPerson}`
 					// }
 					return this.$axios({
-						url:
-							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
+						url: `/base/equipment-check-order/confirm`,
 						method: 'put',
-						data: [row.id],
+						data: {
+									ids: [row.id],
+									confirmBy: this.$store.getters.nickname,
+								},
 					});
 				})
 				.then((res) => {
@@ -478,9 +487,9 @@ export default {
 		/** 编辑 */
 		async handleEdit(row) {
 			this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row.id);
-      });
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(row.id);
+			});
 			// this.reset();
 			// if (row.relatePlan == 1) {
 			// 	// 计划型
@@ -501,9 +510,7 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			this.$modal
-				.confirm(
-					'是否确认删除巡检单名称为"' + row.name + '"的数据项?'
-				)
+				.confirm('是否确认删除巡检单名称为"' + row.name + '"的数据项?')
 				.then(() => {
 					return this.$axios({
 						url: '/base/equipment-check-order/delete?id=' + row.id,
@@ -518,9 +525,9 @@ export default {
 		},
 		handleDetail(row) {
 			this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row.id, true);
-      });
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(row.id, true);
+			});
 			// this.recordDetailVisible = true;
 			// this.$nextTick(() => {
 			// 	this.$refs.recordDetailDrawer.show({
diff --git a/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue b/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
index 785db38e..6e38df8c 100644
--- a/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
@@ -392,10 +392,12 @@ export default {
 						console.log('111', confirm)
 						this.$axios({
 							url:
-								'/base/equipment-maintain-log/confirm?confirmPerson=' +
-								this.$store.getters.userId,
+								'/base/equipment-maintain-log/confirm',
 								method: 'put',
-								data: [this.form.id],
+								data: {
+									ids: [this.form.id],
+									confirmBy: this.$store.getters.nickname,
+								},
 						}).then(res =>{
 							if (res.code == 0) {
 								this.visible = false;
diff --git a/src/views/equipment/base/maintain/Confirm/index.vue b/src/views/equipment/base/maintain/Confirm/index.vue
index 146cff29..e7a89c8a 100644
--- a/src/views/equipment/base/maintain/Confirm/index.vue
+++ b/src/views/equipment/base/maintain/Confirm/index.vue
@@ -287,9 +287,12 @@ export default {
 							return this.$axios({
 								url: '/base/equipment-maintain-log/confirm',
 								method: 'put',
-								data: this.$refs['waiting-list-table'].selectedPlan.map(
-									(item) => item.id
-								),
+								data:{
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
+										(item) => item.id
+									),
+									confirmBy: this.$store.getters.nickname,
+								},
 							});
 					// if (res.code == 0) {
 					// 	this.$message.success('确认成功');
@@ -313,9 +316,12 @@ export default {
               return this.$axios({
                 url: '/base/equipment-maintain-log/confirm2',
                 method: 'put',
-                data: this.$refs['waiting-list-table'].selectedPlan.map(
-                  (item) => item.id
-                ),
+                data: {
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
+										(item) => item.id
+									),
+									confirmBy: this.$store.getters.nickname,
+								},
               });
               // if (res.code == 0) {
               // 	this.$message.success('确认成功');
@@ -547,7 +553,10 @@ export default {
 					return this.$axios({
 						url: '/base/equipment-maintain-log/confirm',
 						method: 'put',
-						data: [row.id],
+						data: {
+									ids: [row.id],
+									confirmBy: this.$store.getters.nickname,
+								},
 					});
 			// if (res.code == 0) {
 			// 	this.$message.success('确认成功');
diff --git a/src/views/group/base/schedulingRuleConfig/index.vue b/src/views/group/base/schedulingRuleConfig/index.vue
index 0fa0887f..00f09d8d 100644
--- a/src/views/group/base/schedulingRuleConfig/index.vue
+++ b/src/views/group/base/schedulingRuleConfig/index.vue
@@ -44,6 +44,7 @@ import {
 	deleteGroupRule,
 	updateGroupRule,
 	getGroupRule,
+	disableGroupRule
 } from '@/api/base/groupSchedulingRule';
 import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue';
 import { formatDate } from '@/utils';
@@ -231,14 +232,9 @@ export default {
 						'是否确认作废序号为"' + row.planName + '"的数据项?'
 					,'提示')
 				.then(() => {
-					getGroupRule(row.id).then((response) => {
-						let datas = response.data;
-						datas.list = datas.sequenceList;
-						datas.enabled = 0;
-						updateGroupRule(datas).then(() => {
+					disableGroupRule(row.id).then((response) => {
 							_this.getList();
 							_this.$modal.msgSuccess('操作成功');
-						});
 					});
 				})
 				.catch(() => {});
diff --git a/src/views/produce/order/base/orderManage/components/orderSplit.vue b/src/views/produce/order/base/orderManage/components/orderSplit.vue
index 6d93486d..cc9a0fe0 100644
--- a/src/views/produce/order/base/orderManage/components/orderSplit.vue
+++ b/src/views/produce/order/base/orderManage/components/orderSplit.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-09-26 14:08:58
  * @LastEditors: zwq
- * @LastEditTime: 2024-11-06 09:52:59
+ * @LastEditTime: 2024-11-13 15:23:25
  * @Description:
 -->
 <template>
@@ -92,7 +92,7 @@ const tableProps = [
 		subcomponent: selectTime,
 	},
 	{
-		prop: 'customerId',
+		prop: 'customerName',
 		label: '客户',
 		showOverflowtooltip: true,
 		// subcomponent: selectMember,