Merge pull request '更新bug' (#406) from projects/mes-zwq into projects/mes-test

Reviewed-on: #406

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({

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-form-item label="发货负责人" prop="deliveryPerson">
-          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;" filterable>
+          <el-input v-model="form.deliveryPerson"></el-input>
-            <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'>
@@ -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) => {

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
+ * @LastEditors: zwq
- * @LastEditTime: 2024-07-31 09:48:36
+ * @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;

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 {
+import { exportCheckOrderExcel } from '@/api/equipment/base/maintain/record';
-	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: [
+			searchBarKeys: ['name'],
-				'name'
-			],
 			tobeConfirmedIdList: [],
 			searchBarFormConfig: [
 				{
@@ -101,19 +97,24 @@ 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'
+							'base:core-department:query',
-          ]) || this.$auth.hasPermi('equipment:check-record:update') || this.$auth.hasPermi('equipment:check-record:export')) ? 'separate' : '',
+						]) ||
+						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'
 						: '',
@@ -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(
+								data: {
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
 										(item) => item.id
 									),
+									confirmBy: this.$store.getters.nickname,
+								},
 							});
 						})
 						.then((res) => {
@@ -239,11 +243,14 @@ export default {
 							// }
 							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}`,
+								url: `/base/equipment-check-order/confirm2`,
 								method: 'put',
-                data: this.$refs['waiting-list-table'].selectedPlan.map(
+								data: {
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
 										(item) => item.id
 									),
+									confirmBy: this.$store.getters.nickname,
+								},
 							});
 						})
 						.then((res) => {
@@ -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;
@@ -462,10 +469,12 @@ export default {
 					// 	checkPersonParam = `&checkPerson=${row.checkPerson}`
 					// }
 					return this.$axios({
-						url:
+						url: `/base/equipment-check-order/confirm`,
-							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 						method: 'put',
-						data: [row.id],
+						data: {
+									ids: [row.id],
+									confirmBy: this.$store.getters.nickname,
+								},
 					});
 				})
 				.then((res) => {
@@ -501,9 +510,7 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			this.$modal
-				.confirm(
+				.confirm('是否确认删除巡检单名称为"' + row.name + '"的数据项?')
-					'是否确认删除巡检单名称为"' + row.name + '"的数据项?'
-				)
 				.then(() => {
 					return this.$axios({
 						url: '/base/equipment-check-order/delete?id=' + row.id,

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=' +
+								'/base/equipment-maintain-log/confirm',
-								this.$store.getters.userId,
 								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;

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(
+								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(
+                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('确认成功');

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,15 +232,10 @@ export default {
 						'是否确认作废序号为"' + row.planName + '"的数据项?'
 					,'提示')
 				.then(() => {
-					getGroupRule(row.id).then((response) => {
+					disableGroupRule(row.id).then((response) => {
-						let datas = response.data;
-						datas.list = datas.sequenceList;
-						datas.enabled = 0;
-						updateGroupRule(datas).then(() => {
 							_this.getList();
 							_this.$modal.msgSuccess('操作成功');
 					});
-					});
 				})
 				.catch(() => {});
 		},

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,