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

projects/mesxc-zhp #252

Merged
juzi merged 3 commits from projects/mesxc-zhp into projects/mesxc-test 2024-03-18 16:11:51 +08:00
Conversation 0 Commits 3 Files Changed 27 +116 -91
13 changed files with 116 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a0a9107863 - Show all commits

34
src/views/order/base/orderGroup/orderGroupDetailData.vue
View File

@ -5,7 +5,8 @@
<span class="blueTitle"></span>
<span>集团编码: {{ orderGroupMsg.code }}</span>
</div>
<el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
<el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon
icon-class="return" /> 返回</el-button>
<div style="padding-left: 14px;">
<el-row>
<el-col :span='4'>
@ -153,13 +154,8 @@
<span class="blueTitle"></span>
<span>工单信息</span>
</div>
<base-table
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-props="tableProps"
:table-data="item.coreWorkOrderRespVOS || []"
:max-height="tableH"
/>
<base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps"
:table-data="item.coreWorkOrderRespVOS || []" :max-height="tableH" />
</div>
</div>
</template>
@ -192,14 +188,14 @@ const tableProps = [
filter: publicFormatter('workshop')
},
{
prop: 'planQuantity',
label: '计划加工量',
width: 100
prop: 'planAssignmentQuantity',
label: '计划分配数量',
width: 110
},
{
prop: 'actualQuantity',
label: '实际加工量',
width: 100
prop: 'actualAssignmentQuantity',
label: '实际分配数量',
width: 110
},
{
prop: 'actualArea',
@ -285,9 +281,12 @@ export default {
height: calc(100vh - 120px - 8px);
background-color: rgb(242, 244, 249);
overflow: auto;
.box1, .box2 {
.box1,
.box2 {
background-color: #fff;
border-radius: 9px;
.blodTip {
height: 16px;
font-size: 14px;
@ -295,6 +294,7 @@ export default {
color: rgba(0, 0, 0, 0.85);
margin-bottom: 8px;
}
.lightTip {
height: 16px;
font-size: 14px;
@ -306,15 +306,18 @@ export default {
text-overflow: ellipsis;
}
}
.box2 {
height: 415px;
padding: 12px 16px 0;
margin: 8px 0;
}
.box1 {
height: 215px;
padding: 16px 16px 0 16px;
}
.boxTitle {
display: inline-block;
font-size: 16px;
@ -322,6 +325,7 @@ export default {
color: #000000;
margin: 0 10px 20px 0;
}
.blueTitle {
content: '';
display: inline-block;

38
src/views/order/base/orderManage/orderDetailData.vue
View File

@ -2,14 +2,17 @@
<div class="orderDetailData">
<div v-show="!isSingle" style="position: relative;padding-right: 90px;">
<TopTab :orderIdList='orderIdList' :orderId="orderId" @emitFun='toggleName' />
<el-button type="primary" plain size="small" style="position: absolute;right: 0; top: 0;height: 48px;font-size: 14px;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
<el-button type="primary" plain size="small"
style="position: absolute;right: 0; top: 0;height: 48px;font-size: 14px;" @click="returnOrderManage"><svg-icon
icon-class="return" /> 返回</el-button>
</div>
<div class="box1">
<div class="boxTitle">
<span class="blueTitle"></span>
<span>订单编码: {{ orderMsg.code }}</span>
</div>
<el-button v-show="isSingle" type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
<el-button v-show="isSingle" type="primary" plain size="small" style="float: right;"
@click="returnOrderManage"><svg-icon icon-class="return" /> 返回</el-button>
<div style="padding-left: 14px;">
<el-row>
<el-col :span='4'>
@ -85,13 +88,8 @@
<span>工单信息</span>
</div>
<!-- 列表 -->
<base-table
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-props="tableProps1"
:table-data="list1"
:max-height="tableH"
/>
<base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps1"
:table-data="list1" :max-height="tableH" />
</div>
</div>
</template>
@ -125,14 +123,14 @@ const tableProps1 = [
filter: publicFormatter('workshop')
},
{
prop: 'planQuantity',
label: '计划加工量',
width: 100
prop: 'planAssignmentQuantity',
label: '计划分配数量',
width: 110
},
{
prop: 'actualQuantity',
label: '实际加工量',
width: 100
prop: 'actualAssignmentQuantity',
label: '实际分配数量',
width: 110
},
{
prop: 'actualArea',
@ -253,18 +251,23 @@ export default {
<style lang='scss' scoped>
.orderDetailData {
background-color: rgb(242, 244, 249);
.box1, .box2{
.box1,
.box2 {
background-color: #fff;
border-radius: 9px;
}
.box2 {
height: calc(100vh - 351px);
padding: 12px 16px 0;
margin-top: 8px;
}
.box1 {
height: 215px;
padding: 16px 16px 0 16px;
.blodTip {
height: 16px;
font-size: 14px;
@ -272,6 +275,7 @@ export default {
color: rgba(0, 0, 0, 0.85);
margin-bottom: 8px;
}
.lightTip {
height: 16px;
font-size: 14px;
@ -280,6 +284,7 @@ export default {
margin-bottom: 12px;
}
}
.boxTitle {
display: inline-block;
font-size: 16px;
@ -287,6 +292,7 @@ export default {
color: #000000;
margin: 0 10px 20px 0;
}
.blueTitle {
content: '';
display: inline-block;

3
src/views/specialEquipment/basic/FireFighthing.vue
View File

@ -251,7 +251,8 @@ export default {
select: true,
label: '负责人',
prop: 'responsiblePeopleId',
url: '/base/core-worker/listAll',
url: '/base/core-worker/workerList',
// url: '/base/core-worker/listAll',
},
],
[

3
src/views/specialEquipment/basic/Manage.vue
View File

@ -244,7 +244,8 @@ export default {
select: true,
label: '负责人',
prop: 'responsiblePeopleId',
url: '/base/core-worker/listAll',
url: '/base/core-worker/workerList',
// url: '/base/core-worker/listAll',
},
],
[{ input: true, label: '备注', prop: 'remark' }],

3
src/views/specialEquipment/basic/Safety.vue
View File

@ -120,7 +120,6 @@ import {
createEquipment,
updateEquipment,
deleteEquipment,
getEquipment,
getEquipmentPage,
exportEquipmentExcel,
} from '@/api/base/equipment';
@ -244,7 +243,7 @@ export default {
select: true,
label: '负责人',
prop: 'responsiblePeopleId',
url: '/base/core-worker/listAll',
url: '/base/core-worker/workerList',
},
],
[{ input: true, label: '备注', prop: 'remark' }],

5
src/views/specialEquipment/check/Content-add.vue
View File

@ -164,7 +164,10 @@ export default {
}))
);
}
const workerlist = await this.$axios('/base/core-worker/listAll');
const workerlist = await this.$axios(
// '/base/core-worker/listAll'
'/base/core-worker/workerList'
);
if (workerlist.code == 0) {
inspectorList = inspectorList.concat(
workerlist.data.map((item) => ({

5
src/views/specialEquipment/check/Content-edit.vue
View File

@ -555,7 +555,10 @@ export default {
}))
);
}
const workerlist = await this.$axios('/base/core-worker/listAll');
const workerlist = await this.$axios(
'/base/core-worker/workerList'
// '/base/core-worker/listAll'
);
if (workerlist.code == 0) {
inspectorList = inspectorList.concat(
workerlist.data.map((item) => ({

3
src/views/specialEquipment/components/EquipmentInfoForm.vue
View File

@ -356,7 +356,8 @@ export default {
async getRpList() {
this.formLoading = true;
const { code, data } = await this.$axios(
'/base/core-worker/listAll'
'/base/core-worker/workerList'
// '/base/core-worker/listAll'
);
// debugger;
if (code == 0) {

5
src/views/specialEquipment/components/manageDrawerForm.vue
View File

@ -182,7 +182,10 @@ export default {
async getRpList() {
this.formLoading = true;
const { code, data } = await this.$axios('/base/core-worker/listAll');
const { code, data } = await this.$axios(
'/base/core-worker/workerList'
// '/base/core-worker/listAll'
);
// debugger;
if (code == 0) {
this.rpList = data;

3
src/views/specialEquipment/maintain/PlanConfig--add.vue
View File

@ -390,7 +390,8 @@ export default {
const urls = [
'/base/core-production-line/listAll',
'/base/core-department/listAll',
'/base/core-worker/listAll',
'/base/core-worker/workerList',
// '/base/core-worker/listAll',
];
let res;
switch (source) {

3
src/views/specialEquipment/maintain/Repair--add.vue
View File

@ -639,7 +639,8 @@ export default {
);
/** worker */
const workerList = await this.$axios({
url: '/base/core-worker/listAll',
url: '/base/core-worker/workerList',
// url: '/base/core-worker/listAll',
});
list = list.concat(
(workerList.data || []).map((item) => ({

3
src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
View File

@ -326,7 +326,8 @@ export default {
const urls = [
'/base/core-production-line/listAll',
'/base/core-department/listAll',
'/base/core-worker/listAll',
'/base/core-worker/workerList',
// '/base/core-worker/listAll',
];
let res;
switch (source) {

3
src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue
View File

@ -598,7 +598,8 @@ export default {
const urls = [
'/base/core-production-line/listAll',
'/base/core-department/listAll',
'/base/core-worker/listAll',
'/base/core-worker/workerList',
// '/base/core-worker/listAll',
];
let res;
switch (source) {