diff --git a/src/api/productionManagement/sinTerWorkOrder.js b/src/api/productionManagement/sinTerWorkOrder.js index f2845d0e..e66cb93c 100644 --- a/src/api/productionManagement/sinTerWorkOrder.js +++ b/src/api/productionManagement/sinTerWorkOrder.js @@ -20,3 +20,31 @@ export const interlocking = (data) => { params:data, }); }; + + +// 获取是否能做转试记录 +export const isTransferTest = (data) => { + return request({ + url: '/blade-desk/QA/PlanTest/isTransferTest', + method: 'post', + params: data, + }); +}; + +// 获取转试记录列表 +export const trialItemList = (data) => { + return request({ + url: '/blade-desk/QA/PlanTest/trialItemList', + method: 'post', + params: data, + }); +}; + +// 转试记录提交 +export const launchTest = (data) => { + return request({ + url: '/blade-desk/QA/PlanTest/launchTest', + method: 'post', + data: data, + }); +}; \ No newline at end of file diff --git a/src/api/qualityManagement/productionTesting/prPlanTestRec.js b/src/api/qualityManagement/productionTesting/prPlanTestRec.js index bbe0a19b..f8f6a0f7 100644 --- a/src/api/qualityManagement/productionTesting/prPlanTestRec.js +++ b/src/api/qualityManagement/productionTesting/prPlanTestRec.js @@ -3,7 +3,7 @@ import request from '@/axios'; // 获取列表 export const getList = (params) =>{ return request({ - url:'/api/blade-desk/QA/PlanTest/list', + url:'/api/blade-desk/QA/PlanTest/page', method:'get', params }) @@ -12,8 +12,8 @@ export const getList = (params) =>{ // 详情 export const getDetail = (params) =>{ return request({ - url:'/api/blade-desk/QA/PlanTest/detail', - method:'get', - params + url:'/api/blade-desk/QA/PlanTest/detailPageInfo', + method:'post', + data:params }) } \ No newline at end of file diff --git a/src/components/jh-select/index.vue b/src/components/jh-select/index.vue index 806d28d2..74c421f3 100644 --- a/src/components/jh-select/index.vue +++ b/src/components/jh-select/index.vue @@ -210,7 +210,7 @@ export default { // 新增：通过接口获取完整数据 async getEchoData(val) { try { - const params = { [this.echoParamsKey]: val }; + const params = { [this.echoParamsKey]: val==null?'':val }; let res; if (this.echoMethod.toLowerCase() === 'post') { res = await axios.post(this.echoApi, params); diff --git a/src/views/flowManagement/addDialog.vue b/src/views/flowManagement/addDialog.vue index fab57e9f..3c49b9f2 100644 --- a/src/views/flowManagement/addDialog.vue +++ b/src/views/flowManagement/addDialog.vue @@ -8,7 +8,13 @@ fullscreen > - + @@ -607,7 +613,12 @@ export default { getDeplList() { getDeplList().then(res => { // console.log(res.data.data, 'res'); - this.deplList = res.data.data; + if (res.data.data.children.length > 0) { + this.deplList = res.data.data.children; + } else { + this.deplList = []; + } + // this.deplList = res.data.data; }); }, // 获取人员 @@ -719,7 +730,7 @@ export default { } submitData.stoneList = submitData.stoneList.map(row => { const { fmProjectApplication, attachList, paIndex, ...validData } = row; - validData.milestoneNode=validData.milestoneNode+' 00:00:00' + validData.milestoneNode = validData.milestoneNode + ' 00:00:00'; return validData; }); return submitData; diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue index 0df211ec..b90dc2f0 100644 --- a/src/views/productionManagement/sinTerWorkOrder/index.vue +++ b/src/views/productionManagement/sinTerWorkOrder/index.vue @@ -47,6 +47,9 @@ 分批 + + 转试 + 关闭 @@ -138,6 +141,9 @@ @closeDialog="closeDialog" :rowItem="rowItem" > + + + @@ -148,8 +154,9 @@ import closedDialog from '../components/closedDialog.vue'; import abnormalDialog from '../components/abnormalDialog.vue'; import productionMonitoringDialog from '../components/productionMonitoringDialog.vue'; -import { getList, interlocking } from '@/api/productionManagement/sinTerWorkOrder'; +import { getList, interlocking, isTransferTest } from '@/api/productionManagement/sinTerWorkOrder'; import workRate from '@/views/workRate/index.vue'; +import transferTest from './transferTest.vue'; export default { components: { @@ -159,6 +166,7 @@ export default { abnormalDialog, productionMonitoringDialog, workRate, + transferTest }, data() { return { @@ -450,7 +458,7 @@ export default { type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', - + searchLabelWidth: 90, }, { @@ -462,7 +470,7 @@ export default { type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', - + width: 150, searchLabelWidth: 90, }, @@ -522,10 +530,22 @@ export default { }, ], }, + rowItem:{}, + transferTestOpen:false, }; }, mounted() {}, methods: { + transferTest(row) { + isTransferTest({ woId: row.woId }).then(res => { + if (!res.data.data) { + this.transferTestOpen = true; + this.rowItem = row; + } else { + this.$message.warning('该订单不符合转试要求，不能转试！'); + } + }); + }, printCraftCard_new(row) { window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER + '?woId=' + row.woId); }, @@ -639,6 +659,7 @@ export default { this.showAbnormal = false; this.isPriorityOpen = false; this.isWorkRateOpen = false; + this.transferTestOpen = false; // if (type) { this.onLoad(this.page, this.query); // } @@ -695,17 +716,17 @@ export default { color: var(--el-color-primary); display: flex; align-items: center; - font-size: 12px; // 与 el-button type="text" 字体一致 - + font-size: 12px; // 与 el-button type="text" 字体一致 + &:hover { color: var(--el-color-primary-light-3); } } :deep(.el-dropdown-menu__item) { - font-size: 12px; // 下拉项字体与按钮一致 + font-size: 12px; // 下拉项字体与按钮一致 padding: 8px 16px; - + &:hover { background-color: var(--el-fill-color-light); } diff --git a/src/views/productionManagement/sinTerWorkOrder/transferTest.vue b/src/views/productionManagement/sinTerWorkOrder/transferTest.vue new file mode 100644 index 00000000..58c6ab08 --- /dev/null +++ b/src/views/productionManagement/sinTerWorkOrder/transferTest.vue @@ -0,0 +1,129 @@ + + diff --git a/src/views/productionManagement/workReportingManagement/components/wordReporting.vue b/src/views/productionManagement/workReportingManagement/components/wordReporting.vue index fd4940ed..98c411b7 100644 --- a/src/views/productionManagement/workReportingManagement/components/wordReporting.vue +++ b/src/views/productionManagement/workReportingManagement/components/wordReporting.vue @@ -66,6 +66,7 @@ value-key="id" search-key="id" :debounce-time="500" + :title="'修改'" @change="(value, item) => changeTs(value, item, scope.row)" /> @@ -86,6 +87,7 @@ value-key="id" search-key="id" :debounce-time="500" + :title="'修改'" @change="(value, item) => changeUser(value, item, scope.row)" />
-
diff --git a/src/views/productionTesting/prPlanTestRec.vue b/src/views/productionTesting/prPlanTestRec.vue index 50edb20c..387a08c5 100644 --- a/src/views/productionTesting/prPlanTestRec.vue +++ b/src/views/productionTesting/prPlanTestRec.vue @@ -1,16880 +1,240 @@ \ No newline at end of file