mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新bug #406

Merged
zwq merged 1 commits from projects/mes-zwq into projects/mes-test 2024-11-18 10:45:22 +08:00
Conversation 0 Commits 1 Files Changed 8 +145 -134
8 changed files with 145 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/base/groupSchedulingRule.js
View File

@ -8,7 +8,13 @@ export function createGroupRule(data) {
data: data data: data
}) })
} }
// 作废排班规则
export function disableGroupRule(id) {
return request({
url: '/base/group-scheduling-rule/disable?id=' + id,
method: 'post',
})
}
// 更新排班规则基础信息 // 更新排班规则基础信息
export function updateGroupRule(data) { export function updateGroupRule(data) {
return request({ return request({

18
src/views/delivery/deliveryLog/components/addOrUpdate.vue
View File

@ -38,15 +38,8 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span='6'> <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-form-item>
</el-col> </el-col>
<el-col :span='6'> <el-col :span='6'>
@ -75,7 +68,6 @@
</el-form> </el-form>
</template> </template>
<script> <script>
import { getWorkerList } from '@/api/base/worker'
import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog, listOrderList } from '@/api/base/delivery' import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog, listOrderList } from '@/api/base/delivery'
export default { export default {
name: 'AddOrUpdate', name: 'AddOrUpdate',
@ -87,7 +79,7 @@ export default {
name: '', name: '',
code: '', code: '',
deliveryTime: null, deliveryTime: null,
deliveryPersonId: '', deliveryPerson: '',
principal: '', principal: '',
principalCall: '', principalCall: '',
principalCost: 0.00, principalCost: 0.00,
@ -100,7 +92,6 @@ export default {
code: [{ required: true, message: "发货单号不能为空", trigger: "blur" }] code: [{ required: true, message: "发货单号不能为空", trigger: "blur" }]
}, },
orderList: [], orderList: [],
personList: []
} }
}, },
methods: { methods: {
@ -118,9 +109,6 @@ export default {
listOrderList().then(res => { listOrderList().then(res => {
this.orderList = res.data || [] this.orderList = res.data || []
}) })
getWorkerList().then(res => {
this.personList = res.data || []
})
}, },
submitForm() { submitForm() {
this.$refs['addOrUpdate'].validate((valid) => { this.$refs['addOrUpdate'].validate((valid) => {

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

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @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: * @Description:
--> -->
<template> <template>
@ -393,9 +393,12 @@ export default {
// } // }
this.$axios({ this.$axios({
url: url:
`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`, `/base/equipment-check-order/confirm`,
method: 'put', method: 'put',
data: [this.dataForm.id], data: {
ids: [this.dataForm.id],
confirmBy: this.$store.getters.nickname,
},
}).then(res =>{ }).then(res =>{
if (res.code == 0) { if (res.code == 0) {
this.visible = false; this.visible = false;

53
src/views/equipment/base/inspection/Confirm/index.vue
View File

@ -42,9 +42,7 @@
import AddOrUpdate from './add-or-updata'; import AddOrUpdate from './add-or-updata';
import moment from 'moment'; import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; 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'; import WaitingListTable from './WaitingListTable.vue';
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
@ -76,16 +74,14 @@ export default {
name: 'Confirm', name: 'Confirm',
components: { components: {
WaitingListTable, WaitingListTable,
AddOrUpdate AddOrUpdate,
}, },
mixins: [basicPageMixin], mixins: [basicPageMixin],
data() { data() {
return { return {
addOrUpdateVisible: false, addOrUpdateVisible: false,
recordDetailVisible: false, recordDetailVisible: false,
searchBarKeys: [ searchBarKeys: ['name'],
'name'
],
tobeConfirmedIdList: [], tobeConfirmedIdList: [],
searchBarFormConfig: [ searchBarFormConfig: [
{ {
@ -101,19 +97,24 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: (this.$auth.hasPermiAnd([ type:
this.$auth.hasPermiAnd([
'equipment:check-record:create', 'equipment:check-record:create',
'base:core-worker:query', 'base:core-worker:query',
'base:core-production-line: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([ type: this.$auth.hasPermiAnd([
'equipment:check-record:create', 'equipment:check-record:create',
'base:core-worker:query', 'base:core-worker:query',
'base:core-production-line:query', 'base:core-production-line:query',
'base:core-department:query' 'base:core-department:query',
]) ])
? 'button' ? 'button'
: '', : '',
@ -211,11 +212,14 @@ export default {
// } // }
return this.$axios({ 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}` + checkPersonParam,
url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`, url: `/base/equipment-check-order/confirm`,
method: 'put', method: 'put',
data: this.$refs['waiting-list-table'].selectedPlan.map( data: {
ids: this.$refs['waiting-list-table'].selectedPlan.map(
(item) => item.id (item) => item.id
), ),
confirmBy: this.$store.getters.nickname,
},
}); });
}) })
.then((res) => { .then((res) => {
@ -239,11 +243,14 @@ export default {
// } // }
return this.$axios({ 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}` + checkPersonParam,
url: `/base/equipment-check-order/confirm2?confirmPerson=${this.$store.getters.nickname}`, url: `/base/equipment-check-order/confirm2`,
method: 'put', method: 'put',
data: this.$refs['waiting-list-table'].selectedPlan.map( data: {
ids: this.$refs['waiting-list-table'].selectedPlan.map(
(item) => item.id (item) => item.id
), ),
confirmBy: this.$store.getters.nickname,
},
}); });
}) })
.then((res) => { .then((res) => {
@ -311,7 +318,7 @@ export default {
}, },
handleSearchBarChange({ param, value }) { handleSearchBarChange({ param, value }) {
console.log('122', param) console.log('122', param);
// if ('specialType' === param) { // if ('specialType' === param) {
// if (!value) { // if (!value) {
// this.setSearchBarEquipmentList(this.allSpecialEquipments); // this.setSearchBarEquipmentList(this.allSpecialEquipments);
@ -327,7 +334,7 @@ export default {
this.loading = true; this.loading = true;
// 执行查询 // 执行查询
this.recv({ this.recv({
...this.queryParams ...this.queryParams,
}).then((response) => { }).then((response) => {
this.list = response.data.list; this.list = response.data.list;
this.total = response.data.total; this.total = response.data.total;
@ -462,10 +469,12 @@ export default {
// checkPersonParam = `&checkPerson=${row.checkPerson}` // checkPersonParam = `&checkPerson=${row.checkPerson}`
// } // }
return this.$axios({ return this.$axios({
url: url: `/base/equipment-check-order/confirm`,
`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
method: 'put', method: 'put',
data: [row.id], data: {
ids: [row.id],
confirmBy: this.$store.getters.nickname,
},
}); });
}) })
.then((res) => { .then((res) => {
@ -501,9 +510,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal this.$modal
.confirm( .confirm('是否确认删除巡检单名称为"' + row.name + '"的数据项?')
'是否确认删除巡检单名称为"' + row.name + '"的数据项?'
)
.then(() => { .then(() => {
return this.$axios({ return this.$axios({
url: '/base/equipment-check-order/delete?id=' + row.id, url: '/base/equipment-check-order/delete?id=' + row.id,

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

@ -392,10 +392,12 @@ export default {
console.log('111', confirm) console.log('111', confirm)
this.$axios({ this.$axios({
url: url:
'/base/equipment-maintain-log/confirm?confirmPerson=' + '/base/equipment-maintain-log/confirm',
this.$store.getters.userId,
method: 'put', method: 'put',
data: [this.form.id], data: {
ids: [this.form.id],
confirmBy: this.$store.getters.nickname,
},
}).then(res =>{ }).then(res =>{
if (res.code == 0) { if (res.code == 0) {
this.visible = false; this.visible = false;

15
src/views/equipment/base/maintain/Confirm/index.vue
View File

@ -287,9 +287,12 @@ export default {
return this.$axios({ return this.$axios({
url: '/base/equipment-maintain-log/confirm', url: '/base/equipment-maintain-log/confirm',
method: 'put', method: 'put',
data: this.$refs['waiting-list-table'].selectedPlan.map( data:{
ids: this.$refs['waiting-list-table'].selectedPlan.map(
(item) => item.id (item) => item.id
), ),
confirmBy: this.$store.getters.nickname,
},
}); });
// if (res.code == 0) { // if (res.code == 0) {
// this.$message.success('确认成功'); // this.$message.success('确认成功');
@ -313,9 +316,12 @@ export default {
return this.$axios({ return this.$axios({
url: '/base/equipment-maintain-log/confirm2', url: '/base/equipment-maintain-log/confirm2',
method: 'put', method: 'put',
data: this.$refs['waiting-list-table'].selectedPlan.map( data: {
ids: this.$refs['waiting-list-table'].selectedPlan.map(
(item) => item.id (item) => item.id
), ),
confirmBy: this.$store.getters.nickname,
},
}); });
// if (res.code == 0) { // if (res.code == 0) {
// this.$message.success('确认成功'); // this.$message.success('确认成功');
@ -547,7 +553,10 @@ export default {
return this.$axios({ return this.$axios({
url: '/base/equipment-maintain-log/confirm', url: '/base/equipment-maintain-log/confirm',
method: 'put', method: 'put',
data: [row.id], data: {
ids: [row.id],
confirmBy: this.$store.getters.nickname,
},
}); });
// if (res.code == 0) { // if (res.code == 0) {
// this.$message.success('确认成功'); // this.$message.success('确认成功');

8
src/views/group/base/schedulingRuleConfig/index.vue
View File

@ -44,6 +44,7 @@ import {
deleteGroupRule, deleteGroupRule,
updateGroupRule, updateGroupRule,
getGroupRule, getGroupRule,
disableGroupRule
} from '@/api/base/groupSchedulingRule'; } from '@/api/base/groupSchedulingRule';
import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue'; import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue';
import { formatDate } from '@/utils'; import { formatDate } from '@/utils';
@ -231,15 +232,10 @@ export default {
'是否确认作废序号为"' + row.planName + '"的数据项?' '是否确认作废序号为"' + row.planName + '"的数据项?'
,'提示') ,'提示')
.then(() => { .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.getList();
_this.$modal.msgSuccess('操作成功'); _this.$modal.msgSuccess('操作成功');
}); });
});
}) })
.catch(() => {}); .catch(() => {});
}, },

4
src/views/produce/order/base/orderManage/components/orderSplit.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2024-09-26 14:08:58 * @Date: 2024-09-26 14:08:58
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2024-11-06 09:52:59 * @LastEditTime: 2024-11-13 15:23:25
* @Description: * @Description:
--> -->
<template> <template>
@ -92,7 +92,7 @@ const tableProps = [
subcomponent: selectTime, subcomponent: selectTime,
}, },
{ {
prop: 'customerId', prop: 'customerName',
label: '客户', label: '客户',
showOverflowtooltip: true, showOverflowtooltip: true,
// subcomponent: selectMember, // subcomponent: selectMember,