问题修改

dev-scheduling
zhangdi 2 weeks ago
parent e39c617d6e
commit 898edf3228
  1. 2
      src/api/productionManagement/reworkOrder.js
  2. 6
      src/router/avue-router.js
  3. 2
      src/views/productionManagement/components/addQuantity.vue
  4. 62
      src/views/workRate/index.vue

@ -26,7 +26,7 @@ export const getReceiveOrder = (params) => {
return request({
url: '/blade-desk/ReworkProcess/receiveOrder',
method: 'post',
params: params,
data: params,
});
};

@ -56,9 +56,9 @@ RouterPlugin.install = function (option = {}) {
children = oMenu[propsDefault.children],
query = oMenu[propsDefault.query],
meta = oMenu[propsDefault.meta];
// if (option.keepAlive) {
meta.keepAlive = true;
// }
if (option.keepAlive) {
meta.keepAlive = option.keepAlive;
}
const isChild = !!(children && children.length !== 0);
const oRouter = {
path: path,

@ -92,7 +92,7 @@ export default {
addForm: {},
tableData: [],
ruleForm: {
dayRange: '',
dayRange: '3',
wcId: ''
},
rules: {

@ -307,70 +307,72 @@
<div>
<el-popover
v-if="scope.row.itemName && scope.row.itemName === '厚度检测'"
transition="el-zoom-in-bottom"
offset="100"
placement="top"
placement="top-start"
trigger="hover"
:width="600"
>
<template #reference>
<el-button type="text">测试值</el-button>
</template>
<el-table :data="scope.row.itemDetailList" border>
<el-table-column label="编号" width="80" align="center" property="tools" />
<el-table-column
label="参数1名称"
property="gaugeValue1"
align="right"
align="center"
width="80"
/>
<el-table-column
label="参数1数值"
property="gaugeValue2"
align="right"
align="center"
width="80"
/>
<el-table-column
label="参数2名称"
property="gaugeValue3"
align="right"
align="center"
width="80"
/>
<el-table-column
label="参数2数值"
property="gaugeValue4"
align="right"
align="center"
width="80"
/>
<el-table-column
label="参数3名称"
property="gaugeValue5"
align="right"
align="center"
width="80"
/>
<el-table-column
label="参数3数值"
property="gaugeValue6"
align="right"
align="center"
width="80"
/>
</el-table>
<span>测试值</span>
</el-popover>
<el-popover
v-else-if="scope.row.itemDetailList.length > 0"
transition="el-zoom-in-bottom"
offset="100"
placement="top"
placement="top-start"
trigger="hover"
:width="1080"
@show="loadDetail(scope.row.wpiId)"
>
<template #reference>
<el-button type="text">测试值</el-button>
</template>
<el-table :data="scope.row.itemDetailList" border >
<el-table-column
label="镀前镀后"
width="80"
align="center"
property="testType"
/>
<el-table-column
label="尺寸"
width="120"
align="center"
property="ruleSize"
/>
@ -378,53 +380,45 @@
<el-table-column
label="测试值1"
property="gaugeValue1"
align="right"
width="80"
align="center"
/>
<el-table-column
label="测试值2"
property="gaugeValue2"
align="right"
width="80"
align="center"
/>
<el-table-column
label="测试值3"
property="gaugeValue3"
align="right"
width="80"
align="center"
/>
<el-table-column
label="测试值4"
property="gaugeValue4"
align="right"
width="80"
align="center"
/>
<el-table-column
label="测试值5"
property="gaugeValue5"
align="right"
width="80"
align="center"
/>
<el-table-column
label="测试值6"
property="gaugeValue6"
align="right"
width="80"
align="center"
/>
<el-table-column
label="测试值7"
property="gaugeValue7"
align="right"
width="80"
align="center"
/>
<el-table-column
label="测试值8"
property="gaugeValue8"
align="right"
width="80"
align="center"
/>
</el-table>
<el-button slot="reference">测试值</el-button>
</el-popover>
<span v-else>{{ scope.row.checkValue }}</span>
</div>
@ -740,10 +734,10 @@ export default {
},
methods: {
refreshData() {
this.refreshLoading = true
this.refreshLoading = true;
this.getOrderDetail();
setTimeout(() => {
this.refreshLoading = false
this.refreshLoading = false;
}, 500);
},
// /

Loading…
Cancel
Save