suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

Browse Source
dev-scheduling
zhangdi 2 weeks ago
parent e39c617d6e
commit 898edf3228
4 changed files with 127 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/api/productionManagement/reworkOrder.js
  2. 6
      src/router/avue-router.js
  3. 2
      src/views/productionManagement/components/addQuantity.vue
  4. 250
      src/views/workRate/index.vue

2
src/api/productionManagement/reworkOrder.js
Unescape View File

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

6
src/router/avue-router.js
Unescape View File

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

2
src/views/productionManagement/components/addQuantity.vue
Unescape View File

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

250
src/views/workRate/index.vue
Unescape View File

@ -304,131 +304,125 @@
/> />
<el-table-column label="测试值" align="center" width="120"> <el-table-column label="测试值" align="center" width="120">
<template #default="scope"> <template #default="scope">
<div> <div>
<el-popover <el-popover
v-if="scope.row.itemName&&scope.row.itemName === '厚度检测'" v-if="scope.row.itemName && scope.row.itemName === '厚度检测'"
transition="el-zoom-in-bottom" placement="top-start"
offset="100" trigger="hover"
placement="top" :width="600"
trigger="hover" >
> <template #reference>
<el-table :data="scope.row.itemDetailList" border> <el-button type="text">测试值</el-button>
<el-table-column label="编号" width="80" align="center" property="tools" /> </template>
<el-table-column <el-table :data="scope.row.itemDetailList" border>
label="参数1名称" <el-table-column label="编号" width="80" align="center" property="tools" />
property="gaugeValue1" <el-table-column
align="right" label="参数1名称"
width="80" property="gaugeValue1"
/> align="center"
<el-table-column width="80"
label="参数1数值" />
property="gaugeValue2" <el-table-column
align="right" label="参数1数值"
width="80" property="gaugeValue2"
/> align="center"
<el-table-column width="80"
label="参数2名称" />
property="gaugeValue3" <el-table-column
align="right" label="参数2名称"
width="80" property="gaugeValue3"
/> align="center"
<el-table-column width="80"
label="参数2数值" />
property="gaugeValue4" <el-table-column
align="right" label="参数2数值"
width="80" property="gaugeValue4"
/> align="center"
<el-table-column width="80"
label="参数3名称" />
property="gaugeValue5" <el-table-column
align="right" label="参数3名称"
width="80" property="gaugeValue5"
/> align="center"
<el-table-column width="80"
label="参数3数值" />
property="gaugeValue6" <el-table-column
align="right" label="参数3数值"
width="80" property="gaugeValue6"
/> align="center"
</el-table> width="80"
<span>测试值</span> />
</el-popover> </el-table>
<el-popover
v-else-if="scope.row.itemDetailList.length > 0" </el-popover>
transition="el-zoom-in-bottom" <el-popover
offset="100" v-else-if="scope.row.itemDetailList.length > 0"
placement="top" placement="top-start"
trigger="hover" trigger="hover"
@show="loadDetail(scope.row.wpiId)" :width="1080"
> @show="loadDetail(scope.row.wpiId)"
<el-table :data="scope.row.itemDetailList" border> >
<el-table-column <template #reference>
label="镀前镀后" <el-button type="text">测试值</el-button>
width="80" </template>
align="center" <el-table :data="scope.row.itemDetailList" border >
property="testType" <el-table-column
/> label="镀前镀后"
<el-table-column align="center"
label="尺寸" property="testType"
width="120" />
align="center" <el-table-column
property="ruleSize" label="尺寸"
/> align="center"
<el-table-column label="量具" width="80" align="center" property="tools" /> property="ruleSize"
<el-table-column />
label="测试值1" <el-table-column label="量具" width="80" align="center" property="tools" />
property="gaugeValue1" <el-table-column
align="right" label="测试值1"
width="80" property="gaugeValue1"
/> align="center"
<el-table-column />
label="测试值2" <el-table-column
property="gaugeValue2" label="测试值2"
align="right" property="gaugeValue2"
width="80" align="center"
/> />
<el-table-column <el-table-column
label="测试值3" label="测试值3"
property="gaugeValue3" property="gaugeValue3"
align="right" align="center"
width="80" />
/> <el-table-column
<el-table-column label="测试值4"
label="测试值4" property="gaugeValue4"
property="gaugeValue4" align="center"
align="right" />
width="80" <el-table-column
/> label="测试值5"
<el-table-column property="gaugeValue5"
label="测试值5" align="center"
property="gaugeValue5" />
align="right" <el-table-column
width="80" label="测试值6"
/> property="gaugeValue6"
<el-table-column align="center"
label="测试值6" />
property="gaugeValue6" <el-table-column
align="right" label="测试值7"
width="80" property="gaugeValue7"
/> align="center"
<el-table-column />
label="测试值7" <el-table-column
property="gaugeValue7" label="测试值8"
align="right" property="gaugeValue8"
width="80" align="center"
/> />
<el-table-column </el-table>
label="测试值8"
property="gaugeValue8" </el-popover>
align="right" <span v-else>{{ scope.row.checkValue }}</span>
width="80" </div>
/> </template>
</el-table>
<el-button slot="reference">测试值</el-button>
</el-popover>
<span v-else>{{ scope.row.checkValue }}</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column label="试验数量" property="testQty" align="center" width="70" /> <el-table-column label="试验数量" property="testQty" align="center" width="70" />
<el-table-column label="消耗数量" property="lossQty" align="center" width="70" /> <el-table-column label="消耗数量" property="lossQty" align="center" width="70" />
@ -687,7 +681,7 @@ export default {
}, },
data() { data() {
return { return {
refreshLoading:false, refreshLoading: false,
processSelectLoading: false, processSelectLoading: false,
selectedItemId: null, selectedItemId: null,
selectedItemInfo: {}, selectedItemInfo: {},
@ -740,10 +734,10 @@ export default {
}, },
methods: { methods: {
refreshData() { refreshData() {
this.refreshLoading = true this.refreshLoading = true;
this.getOrderDetail(); this.getOrderDetail();
setTimeout(() => { setTimeout(() => {
this.refreshLoading = false this.refreshLoading = false;
}, 500); }, 500);
}, },
// 切换订单信息展开/收起 // 切换订单信息展开/收起

Write Preview
Loading…
Cancel
Save