|
@@ -171,12 +171,12 @@
|
|
|
@closeModel="closeModel"
|
|
@closeModel="closeModel"
|
|
|
/>
|
|
/>
|
|
|
|
|
|
|
|
- <Transfer
|
|
|
|
|
|
|
+ <transfer
|
|
|
v-if="transferVisible"
|
|
v-if="transferVisible"
|
|
|
:transferVisible.sync="transferVisible"
|
|
:transferVisible.sync="transferVisible"
|
|
|
@success="transferConfirm"
|
|
@success="transferConfirm"
|
|
|
:id="transferId"
|
|
:id="transferId"
|
|
|
- ></Transfer>
|
|
|
|
|
|
|
+ ></transfer>
|
|
|
|
|
|
|
|
<process-submit-dialog
|
|
<process-submit-dialog
|
|
|
api-fun-name="qmsReportApprovalAPI"
|
|
api-fun-name="qmsReportApprovalAPI"
|
|
@@ -202,6 +202,7 @@
|
|
|
import detailsOrder from './details.vue';
|
|
import detailsOrder from './details.vue';
|
|
|
import addSample from './components/addSample.vue';
|
|
import addSample from './components/addSample.vue';
|
|
|
import processSubmitDialog from '@/components/processSubmitDialog/processSubmitDialog.vue';
|
|
import processSubmitDialog from '@/components/processSubmitDialog/processSubmitDialog.vue';
|
|
|
|
|
+ import transfer from './components/transfer.vue';
|
|
|
import jimureportBrowse from '@/components/jimureport/browseModal.vue';
|
|
import jimureportBrowse from '@/components/jimureport/browseModal.vue';
|
|
|
import {
|
|
import {
|
|
|
getList,
|
|
getList,
|
|
@@ -214,6 +215,7 @@
|
|
|
import { queryTodo } from '@/api/bpm/task';
|
|
import { queryTodo } from '@/api/bpm/task';
|
|
|
import { getFile } from '@/api/system/file';
|
|
import { getFile } from '@/api/system/file';
|
|
|
import { getByCode } from '@/api/system/dictionary-data';
|
|
import { getByCode } from '@/api/system/dictionary-data';
|
|
|
|
|
+ import { parameterGetByCode } from '@/api/system/dictionary-data';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
mixins: [dictMixins, tabMixins],
|
|
mixins: [dictMixins, tabMixins],
|
|
@@ -224,7 +226,8 @@
|
|
|
edit,
|
|
edit,
|
|
|
detailsOrder,
|
|
detailsOrder,
|
|
|
processSubmitDialog,
|
|
processSubmitDialog,
|
|
|
- addSample
|
|
|
|
|
|
|
+ addSample,
|
|
|
|
|
+ transfer
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
@@ -575,13 +578,13 @@
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
async openEdit(type, row) {
|
|
async openEdit(type, row) {
|
|
|
- if (type == 'edit') {
|
|
|
|
|
- const code = await verificationQualityInspector(row.id);
|
|
|
|
|
- if (code == '-1') {
|
|
|
|
|
- console.log('不是报工人');
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // if (type == 'edit') {
|
|
|
|
|
+ // const code = await verificationQualityInspector(row.id);
|
|
|
|
|
+ // if (code == '-1') {
|
|
|
|
|
+ // console.log('不是报工人');
|
|
|
|
|
+ // return;
|
|
|
|
|
+ // }
|
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
const req = {
|
|
const req = {
|
|
|
workOrderId: row.id,
|
|
workOrderId: row.id,
|