8 changed files with 134 additions and 145 deletions
--- a/src/api/base/groupSchedulingRule.js
+++ b/src/api/base/groupSchedulingRule.js
@ -8,13 +8,7 @@ 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({
--- a/src/views/delivery/deliveryLog/components/addOrUpdate.vue
+++ b/src/views/delivery/deliveryLog/components/addOrUpdate.vue
@ -38,8 +38,15 @@
    </el-row>
    <el-row :gutter="20">
      <el-col :span='6'>
-        <el-form-item label="发货负责人" prop="deliveryPerson">
-          <el-input v-model="form.deliveryPerson"></el-input>
+        <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>
      </el-col>
      <el-col :span='6'>
@ -68,6 +75,7 @@
  </el-form>
 </template>
 <script>
+import { getWorkerList } from '@/api/base/worker'
 import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog, listOrderList } from '@/api/base/delivery'
 export default {
  name: 'AddOrUpdate',
@ -79,7 +87,7 @@ export default {
        name: '',
        code: '',
        deliveryTime: null,
-        deliveryPerson: '',
+        deliveryPersonId: '',
        principal: '',
        principalCall: '',
        principalCost: 0.00,
@ -92,6 +100,7 @@ export default {
        code: [{ required: true, message: "发货单号不能为空", trigger: "blur" }]
      },
      orderList: [],
+      personList: []
    }
  },
  methods: {
@ -109,6 +118,9 @@ export default {
      listOrderList().then(res => {
        this.orderList = res.data || []
      })
+      getWorkerList().then(res => {
+        this.personList = res.data || []
+      })
    },
    submitForm() {
      this.$refs['addOrUpdate'].validate((valid) => {
--- 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: zwq
- * @LastEditTime: 2024-11-18 09:51:03
+ * @LastEditors: zhp
+ * @LastEditTime: 2024-07-31 09:48:36
 * @Description:
 -->
 <template>
@ -393,12 +393,9 @@ export default {
 						// }
 						this.$axios({
 							url:
-								`/base/equipment-check-order/confirm`,
+								`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 								method: 'put',
-								data: {
-									ids: [this.dataForm.id],
-									confirmBy: this.$store.getters.nickname,
-								},
+								data: [this.dataForm.id],
 						}).then(res =>{
 							if (res.code == 0) {
 								this.visible = false;
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@ -42,7 +42,9 @@
 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');
@ -74,14 +76,16 @@ export default {
 	name: 'Confirm',
 	components: {
 		WaitingListTable,
-		AddOrUpdate,
+		AddOrUpdate
 	},
 	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
 			recordDetailVisible: false,
-			searchBarKeys: ['name'],
+			searchBarKeys: [
+				'name'
+			],
 			tobeConfirmedIdList: [],
 			searchBarFormConfig: [
 				{
@ -97,24 +101,19 @@ export default {
 					color: 'primary',
 				},
        {
-					type:
-						this.$auth.hasPermiAnd([
+          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'
-							: '',
+            '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',
+            'base:core-department:query'
          ])
            ? 'button'
            : '',
@ -212,14 +211,11 @@ export default {
 							// }
 							return this.$axios({
 								// url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
-								url: `/base/equipment-check-order/confirm`,
+								url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 								method: 'put',
-								data: {
-									ids: this.$refs['waiting-list-table'].selectedPlan.map(
+								data: this.$refs['waiting-list-table'].selectedPlan.map(
 									(item) => item.id
 								),
-									confirmBy: this.$store.getters.nickname,
-								},
 							});
 						})
 						.then((res) => {
@ -227,7 +223,7 @@ export default {
 							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('请选择待确认的设备巡检单');
@ -243,14 +239,11 @@ export default {
              // }
              return this.$axios({
                // url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
-								url: `/base/equipment-check-order/confirm2`,
+                url: `/base/equipment-check-order/confirm2?confirmPerson=${this.$store.getters.nickname}`,
                method: 'put',
-								data: {
-									ids: this.$refs['waiting-list-table'].selectedPlan.map(
+                data: this.$refs['waiting-list-table'].selectedPlan.map(
                  (item) => item.id
                ),
-									confirmBy: this.$store.getters.nickname,
-								},
              });
            })
            .then((res) => {
@ -258,7 +251,7 @@ export default {
              res.code == 0 && this.$modal.msgSuccess('确认成功');
              res.code != 0 && this.$modal.msgError('确认失败');
            })
-						.catch(() => {});
+            .catch(() => { });
 					break;
 			}
 		},
@ -318,7 +311,7 @@ export default {
 		},

 		handleSearchBarChange({ param, value }) {
-			console.log('122', param);
+			console.log('122', param)
 			// if ('specialType' === param) {
 			// 	if (!value) {
 			// 		this.setSearchBarEquipmentList(this.allSpecialEquipments);
@ -334,7 +327,7 @@ export default {
 			this.loading = true;
 			// 执行查询
 			this.recv({
-				...this.queryParams,
+				...this.queryParams
 			}).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
@ -469,12 +462,10 @@ export default {
 					// 	checkPersonParam = `&checkPerson=${row.checkPerson}`
 					// }
 					return this.$axios({
-						url: `/base/equipment-check-order/confirm`,
+						url:
+							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 						method: 'put',
-						data: {
-									ids: [row.id],
-									confirmBy: this.$store.getters.nickname,
-								},
+						data: [row.id],
 					});
 				})
 				.then((res) => {
@ -510,7 +501,9 @@ 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,
--- a/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
@ -392,12 +392,10 @@ export default {
 						console.log('111', confirm)
 						this.$axios({
 							url:
-								'/base/equipment-maintain-log/confirm',
+								'/base/equipment-maintain-log/confirm?confirmPerson=' +
+								this.$store.getters.userId,
 								method: 'put',
-								data: {
-									ids: [this.form.id],
-									confirmBy: this.$store.getters.nickname,
-								},
+								data: [this.form.id],
 						}).then(res =>{
 							if (res.code == 0) {
 								this.visible = false;
--- a/src/views/equipment/base/maintain/Confirm/index.vue
+++ b/src/views/equipment/base/maintain/Confirm/index.vue
@ -287,12 +287,9 @@ export default {
 							return this.$axios({
 								url: '/base/equipment-maintain-log/confirm',
 								method: 'put',
-								data:{
-									ids: this.$refs['waiting-list-table'].selectedPlan.map(
+								data: this.$refs['waiting-list-table'].selectedPlan.map(
 									(item) => item.id
 								),
-									confirmBy: this.$store.getters.nickname,
-								},
 							});
 					// if (res.code == 0) {
 					// 	this.$message.success('确认成功');
@ -316,12 +313,9 @@ export default {
              return this.$axios({
                url: '/base/equipment-maintain-log/confirm2',
                method: 'put',
-                data: {
-									ids: this.$refs['waiting-list-table'].selectedPlan.map(
+                data: this.$refs['waiting-list-table'].selectedPlan.map(
                  (item) => item.id
                ),
-									confirmBy: this.$store.getters.nickname,
-								},
              });
              // if (res.code == 0) {
              // 	this.$message.success('确认成功');
@ -553,10 +547,7 @@ export default {
 					return this.$axios({
 						url: '/base/equipment-maintain-log/confirm',
 						method: 'put',
-						data: {
-									ids: [row.id],
-									confirmBy: this.$store.getters.nickname,
-								},
+						data: [row.id],
 					});
 			// if (res.code == 0) {
 			// 	this.$message.success('确认成功');
--- a/src/views/group/base/schedulingRuleConfig/index.vue
+++ b/src/views/group/base/schedulingRuleConfig/index.vue
@ -44,7 +44,6 @@ import {
 	deleteGroupRule,
 	updateGroupRule,
 	getGroupRule,
-	disableGroupRule
 } from '@/api/base/groupSchedulingRule';
 import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue';
 import { formatDate } from '@/utils';
@ -232,10 +231,15 @@ export default {
 						'是否确认作废序号为"' + row.planName + '"的数据项?'
 					,'提示')
 				.then(() => {
-					disableGroupRule(row.id).then((response) => {
+					getGroupRule(row.id).then((response) => {
+						let datas = response.data;
+						datas.list = datas.sequenceList;
+						datas.enabled = 0;
+						updateGroupRule(datas).then(() => {
 							_this.getList();
 							_this.$modal.msgSuccess('操作成功');
 						});
+					});
 				})
 				.catch(() => {});
 		},
--- 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-13 15:23:25
+ * @LastEditTime: 2024-11-06 09:52:59
 * @Description:
 -->
 <template>
@ -92,7 +92,7 @@ const tableProps = [
 		subcomponent: selectTime,
 	},
 	{
-		prop: 'customerName',
+		prop: 'customerId',
 		label: '客户',
 		showOverflowtooltip: true,
 		// subcomponent: selectMember,