Browse Source

多条任务同时进行查看fileCode错误问题

feature
mk 2 years ago
parent
commit
2a03b92dd6
  1. 4
      src/views/modules/base/smartImport/cpts/completeTask.vue
  2. 14
      src/views/modules/base/smartImport/cpts/executeTask.vue
  3. 6
      src/views/modules/base/smartImport/cpts/smartImportInfo.vue
  4. 3
      src/views/modules/base/smartImport/index.vue

4
src/views/modules/base/smartImport/cpts/completeTask.vue

@ -114,7 +114,7 @@ export default {
type: String, type: String,
default: "", default: "",
}, },
fileCodeP: { fileCodeRow: {
type: String, type: String,
default: "", default: "",
}, },
@ -174,7 +174,7 @@ export default {
async getTaskInfo() { async getTaskInfo() {
let url = "/actual/base/intelligentImportData/getTaskInfo"; let url = "/actual/base/intelligentImportData/getTaskInfo";
let parm = { let parm = {
fileCode: this.fileCodeP || this.fileCode, fileCode: this.fileCodeRow || this.fileCode,
}; };
let { data, code, msg } = await requestPost(url, parm); let { data, code, msg } = await requestPost(url, parm);
if (code == 0) { if (code == 0) {

14
src/views/modules/base/smartImport/cpts/executeTask.vue

@ -128,14 +128,14 @@ export default {
}; };
}, },
props: { props: {
fileCode: { fileCodeRow: {
type: String,
default: "",
},
fileCodeP: {
type: String, type: String,
default: "", default: "",
}, },
fileCode:{
type:String,
default:""
}
}, },
async created() { async created() {
await this.getTaskInfo(); await this.getTaskInfo();
@ -164,7 +164,7 @@ export default {
async getProcessRate() { async getProcessRate() {
let url = "/actual/base/intelligentImportData/processRate"; let url = "/actual/base/intelligentImportData/processRate";
let parm = { let parm = {
fileCode: this.fileCode, fileCode: this.fileCodeRow|| this.fileCode,
}; };
let res = await requestPost(url, parm); let res = await requestPost(url, parm);
if (res.code == 0) { if (res.code == 0) {
@ -181,7 +181,7 @@ export default {
async getTaskInfo() { async getTaskInfo() {
let url = "/actual/base/intelligentImportData/getTaskInfo"; let url = "/actual/base/intelligentImportData/getTaskInfo";
let parm = { let parm = {
fileCode: this.fileCodeP || this.fileCode, fileCode: this.fileCodeRow || this.fileCode,
}; };
let { data, code, msg } = await requestPost(url, parm); let { data, code, msg } = await requestPost(url, parm);
if (code == 0) { if (code == 0) {

6
src/views/modules/base/smartImport/cpts/smartImportInfo.vue

@ -30,13 +30,13 @@
@handelClickBack="handelClickBack" @handelClickBack="handelClickBack"
@updateProgress="updateProgress" @updateProgress="updateProgress"
:fileCode="fileCode" :fileCode="fileCode"
:fileCodeP="fileCodeP" :fileCodeRow="fileCodeRow"
@updateoperatorName="updateoperatorName" @updateoperatorName="updateoperatorName"
></execute-task> ></execute-task>
<complete-task <complete-task
v-if="progress == 3" v-if="progress == 3"
@handelClickBack="handelClickBack" @handelClickBack="handelClickBack"
:fileCodeP="fileCodeP" :fileCodeRow="fileCodeRow"
@updateoperatorName="updateoperatorName" @updateoperatorName="updateoperatorName"
:fileCode="fileCode" :fileCode="fileCode"
></complete-task> ></complete-task>
@ -59,7 +59,7 @@ export default {
}; };
}, },
props: { props: {
fileCodeP: { fileCodeRow: {
type: String, type: String,
default: null, default: null,
}, },

3
src/views/modules/base/smartImport/index.vue

@ -90,7 +90,7 @@
<div v-if="pageType == 'add'"> <div v-if="pageType == 'add'">
<!-- :eventDetailData="eventDetailData" --> <!-- :eventDetailData="eventDetailData" -->
<smart-import-info ref="eleEditForm" :pageType="pageType" <smart-import-info ref="eleEditForm" :pageType="pageType"
@handleClose="handleClose" @handleOk="handleOk" :fileCodeP="fileCode" :taskId="taskId" :processStatus="processStatus"/> @handleClose="handleClose" @handleOk="handleOk" :fileCodeRow="fileCode" :taskId="taskId" :processStatus="processStatus"/>
</div> </div>
</div> </div>
</template> </template>
@ -184,6 +184,7 @@ export default {
// //
async handleAdd() { async handleAdd() {
this.pageType = "add"; this.pageType = "add";
this.fileCode = null;
}, },
// //
async handleDetail(row) { async handleDetail(row) {

Loading…
Cancel
Save