Browse Source

修改bug

branch_ccpg_220107
songnan.zhang 3 years ago
parent
commit
d0d1863e4e
  1. 46
      vue/src/components/ImportTxt/index.vue
  2. 191
      vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
  3. 176
      vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue

46
vue/src/components/ImportTxt/index.vue

@ -151,13 +151,13 @@
<span class="result-info__detail--all"
>{{ this.resultData.successMessage }}
</span>
<el-button
<!-- <el-button
v-if="this.resultData && this.resultData.errSize > 0"
class="result-info__btn--err"
type="text"
@click="downloadErrData"
>下载错误数据</el-button
>
> -->
</p>
</el-card>
</div>
@ -427,7 +427,7 @@ export default {
this.factoryList = [];
// this.listQuery.SkipCount = (this.page - 1) * 500;
this.$axios
.posts("/api/settleaccount/CentralizedControl/openlist")
.posts("/api/newjit/assembly-cfg-erp/import")
.then((response) => {
response.forEach((element) => {
let options = {};
@ -440,25 +440,25 @@ export default {
this.listLoading = false;
});
},
getAllCarModel() {
//
this.carModelList = [];
this.listQueryCustom.SkipCount = (this.page - 1) * 500;
console.log(JSON.stringify(this.listQueryCustom));
this.$axios
.posts("/api/settleaccount/CodeSetting/list", this.listQueryCustom)
.then((response) => {
response.items.forEach((element) => {
let options = {};
options.value = element.value;
options.label = element.description;
this.carModelList.push(options);
});
})
.catch(() => {
this.listLoading = false;
});
},
// getAllCarModel() {
// //
// this.carModelList = [];
// this.listQueryCustom.SkipCount = (this.page - 1) * 500;
// console.log(JSON.stringify(this.listQueryCustom));
// this.$axios
// .posts("/api/settleaccount/CodeSetting/list", this.listQueryCustom)
// .then((response) => {
// response.items.forEach((element) => {
// let options = {};
// options.value = element.value;
// options.label = element.description;
// this.carModelList.push(options);
// });
// })
// .catch(() => {
// this.listLoading = false;
// });
// },
handleImportExcelClick() {
//
this.fileuploadList = [];
@ -602,7 +602,7 @@ export default {
this.stepList[0].status = "wait";
this.resultData.errTemplate = res; //
this.resultData.errSize = 1; //0
this.resultData.successMessage = "数据导入失败!";
this.resultData.successMessage = res.message;
this.stepsActive = 3;
}
}

191
vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue

@ -99,7 +99,7 @@
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
@click="print()"
>作废(支持批量)</el-button
>
</el-form-item>
@ -195,6 +195,57 @@
/>
</div>
</div>
<div>
<el-dialog
title="作废信息"
append-to-body="true"
:visible.sync="dialogTableVisible"
>
<el-table :data="zflist">
<el-table-column
property="billNum"
label="装箱单号"
width="100"
></el-table-column>
<el-table-column
property="billSerialNum"
label="单据顺号"
width="100"
></el-table-column>
<el-table-column
property="billLocation"
label="左或右"
width="100"
></el-table-column>
<el-table-column
property="providerCode"
label="供应商厂家代码"
width="100"
></el-table-column>
<el-table-column
property="partType"
label="零件类型"
width="100"
></el-table-column>
<el-table-column
property="capacity"
label="器具容量"
width="100"
></el-table-column>
<el-table-column
property="printDate"
label="打印日期"
width="100"
></el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="dialogTableVisible = false"
>取消</el-button
>
<el-button type="primary" @click="handleDelete"> </el-button>
</div>
</el-dialog>
</div>
</div>
</template>
@ -243,6 +294,7 @@ export default {
};
return {
crmType: "M100Online-MB",
dialogTableVisible: false,
getRowKeys: (row) => {
return row.id; //id
},
@ -507,19 +559,13 @@ export default {
)
.then((response) => {
response.items.forEach((item) => {
if(item.printType == 0)
{
if (item.printType == 0) {
item.printType = "正常打印";
}
else if(item.printType == 1)
{
} else if (item.printType == 1) {
item.printType = "重打";
}
else
{
} else {
item.printType = "补打";
}
});
this.list = response.items;
this.totalCount = response.totalCount;
@ -581,25 +627,21 @@ export default {
.catch(() => {});
}
},
//-
handleDelete(row) {
//
print(row) {
var params = [];
let myalert = ""; //使
let myalertcount = [];
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
console.log("作废查询参数:" + JSON.stringify(params));
this.zuofei = params;
this.dialogTableVisible = true;
this.$axios
.posts("/api/newjit/MenBanPackingList/get-all-del-List", params)
.then((response) => {
@ -613,46 +655,111 @@ export default {
return;
} else {
this.fileQuery.dataname = JSON.stringify(response);
response.forEach((itemsss) => {
myalertcount.push(itemsss.billNum);
});
this.zflist = response;
console.log(
"门板-调用Handlers/Handler1.ashx?report=menban传的值:" +
JSON.stringify(this.fileQuery.dataname)
);
this.$confirm(
"是否作废选中的" + response.length + "条记录?",
"提示",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(() => {
})
.catch(() => {});
},
//
handleDelete() {
//debugger;
let params = this.zuofei;
this.$axios
.posts("/api/newjit/MenBanPackingList/scrap", params)
.then((response) => {
const index = this.list.indexOf(row);
console.log(
"门板-调用Handlers/Handler1.ashx?report=menban传的值:" +
JSON.stringify(response)
);
this.$notify({
title: "成功",
message: "作废成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
}
})
.catch(() => {});
this.dialogTableVisible = false;
this.getList();
},
//-
// handleDelete(row) {
// //
// var params = [];
// let myalert = ""; //使
// let myalertcount = [];
// if (row) {
// //
// params.push(row.id);
// myalert = row.name;
// } else {
// //
// this.multipleSelection.forEach((element) => {
// let id = element.id;
// params.push(id);
// });
// myalert = "";
// }
// console.log("" + JSON.stringify(params));
// this.$axios
// .posts("/api/newjit/MenBanPackingList/get-all-del-List", params)
// .then((response) => {
// //alert(response.status);
// const index = this.list.indexOf(row);
// if (response.status === false) {
// this.$message({
// message: response.message,
// type: "error",
// });
// return;
// } else {
// this.fileQuery.dataname = JSON.stringify(response);
// response.forEach((itemsss) => {
// myalertcount.push(itemsss.billNum);
// });
// console.log(
// "-Handlers/Handler1.ashx?report=menban" +
// JSON.stringify(this.fileQuery.dataname)
// );
// this.$confirm(
// "" + response.length + "?",
// "",
// {
// confirmButtonText: "",
// cancelButtonText: "",
// type: "warning",
// }
// )
// .then(() => {
// this.$axios
// .posts("/api/newjit/MenBanPackingList/scrap", params)
// .then((response) => {
// const index = this.list.indexOf(row);
// this.$notify({
// title: "",
// message: "",
// type: "success",
// duration: 2000,
// });
// this.getList();
// });
// })
// .catch(() => {
// this.$message({
// type: "info",
// message: "",
// });
// });
// }
// })
// .catch(() => {});
// },
fetchData(id) {
//
this.$axios

176
vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue

@ -124,7 +124,7 @@
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
@click="print()"
>作废(支持批量)</el-button
>
</el-form-item>
@ -200,6 +200,53 @@
/>
</div>
</div>
<div>
<el-dialog title="作废信息" append-to-body="true" :visible.sync="dialogTableVisible">
<el-table :data="zflist">
<el-table-column
property="billNum"
label="装箱单号"
width="100"
></el-table-column>
<el-table-column
property="billSerialNum"
label="单据顺号"
width="100"
></el-table-column>
<el-table-column
property="billLocation"
label="左或右"
width="100"
></el-table-column>
<el-table-column
property="providerCode"
label="供应商厂家代码"
width="100"
></el-table-column>
<el-table-column
property="partType"
label="零件类型"
width="100"
></el-table-column>
<el-table-column
property="capacity"
label="器具容量"
width="100"
></el-table-column>
<el-table-column
property="printDate"
label="打印日期"
width="100"
></el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="dialogTableVisible = false"
>取消</el-button
>
<el-button type="primary" @click="handleDelete"> </el-button>
</div>
</el-dialog>
</div>
</div>
</template>
@ -248,6 +295,7 @@ export default {
};
return {
crmType: "M100Online-MB",
dialogTableVisible :false,
getRowKeys: (row) => {
return row.id; //id
},
@ -594,25 +642,21 @@ export default {
.catch(() => {});
}
},
//-
handleDelete(row) {
//
print(row) {
var params = [];
let myalert = ""; //使
let myalertcount = [];
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
console.log("作废查询参数:" + JSON.stringify(params));
this.zuofei = params;
this.dialogTableVisible = true;
this.$axios
.posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params)
.then((response) => {
@ -626,46 +670,110 @@ export default {
return;
} else {
this.fileQuery.dataname = JSON.stringify(response);
response.forEach((itemsss) => {
myalertcount.push(itemsss.billNum);
});
this.zflist = response;
console.log(
"板-调用Handlers/Handler1.ashx?report=menban传的值:" +
"柱护板-调用Handlers/Handler1.ashx?report=menban传的值:" +
JSON.stringify(this.fileQuery.dataname)
);
this.$confirm(
"是否作废选中的" + response.length + "条记录?",
"提示",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(() => {
})
.catch(() => {});
},
//
handleDelete() {
//debugger;
let params = this.zuofei;
this.$axios
.posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
.then((response) => {
const index = this.list.indexOf(row);
console.log(
"门板-调用Handlers/Handler1.ashx?report=menban传的值:" +
JSON.stringify(response)
);
this.$notify({
title: "成功",
message: "作废成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
}
})
.catch(() => {});
this.dialogTableVisible = false;
this.getList();
},
//-
// handleDelete(row) {
// //
// var params = [];
// let myalert = ""; //使
// let myalertcount = [];
// if (row) {
// //
// params.push(row.id);
// myalert = row.name;
// } else {
// //
// this.multipleSelection.forEach((element) => {
// let id = element.id;
// params.push(id);
// });
// myalert = "";
// }
// console.log("" + JSON.stringify(params));
// this.$axios
// .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params)
// .then((response) => {
// //alert(response.status);
// const index = this.list.indexOf(row);
// if (response.status === false) {
// this.$message({
// message: response.message,
// type: "error",
// });
// return;
// } else {
// this.fileQuery.dataname = JSON.stringify(response);
// response.forEach((itemsss) => {
// myalertcount.push(itemsss.billNum);
// });
// console.log(
// "-Handlers/Handler1.ashx?report=menban" +
// JSON.stringify(this.fileQuery.dataname)
// );
// this.$confirm(
// "" + response.length + "?",
// "",
// {
// confirmButtonText: "",
// cancelButtonText: "",
// type: "warning",
// }
// )
// .then(() => {
// this.$axios
// .posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
// .then((response) => {
// const index = this.list.indexOf(row);
// this.$notify({
// title: "",
// message: "",
// type: "success",
// duration: 2000,
// });
// this.getList();
// });
// })
// .catch(() => {
// this.$message({
// type: "info",
// message: "",
// });
// });
// }
// })
// .catch(() => {});
// },
fetchData(id) {
//
this.$axios

Loading…
Cancel
Save