1.修复注册页面删除文件后仍可查看的问题

2.库存详情页码查询添加仓库参数
3.删除无用代码
master
x_z 3 years ago
parent 35edfc24f4
commit 02034b6e62

@ -258,7 +258,6 @@ export default {
if (this.inputQuery.mainAction != null && this.inputQuery.mainAction != "") { if (this.inputQuery.mainAction != null && this.inputQuery.mainAction != "") {
this.getOrderType(); this.getOrderType();
} }
console.log(this.inputQuery);
this.getList(); this.getList();
this.getStorage(); this.getStorage();

@ -189,6 +189,7 @@ export default {
this.query.batchNo = this.idQuery.batchNo; this.query.batchNo = this.idQuery.batchNo;
this.query.supId = this.idQuery.supId; this.query.supId = this.idQuery.supId;
this.query.invStorageCode = this.idQuery.invStorageCode; this.query.invStorageCode = this.idQuery.invStorageCode;
this.query.invCodes = [this.idQuery.invCodes];
filterDetailProducts(this.query) // filterDetailProducts(this.query) //
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
@ -251,7 +252,6 @@ export default {
}, },
created() { created() {
this.getCodeList(); this.getCodeList();
// this.getStat();
this.getBusTypeByUser(); this.getBusTypeByUser();
}, },
}; };

@ -402,9 +402,7 @@ import {
getSystemPDFModules, moduleDetail getSystemPDFModules, moduleDetail
} from "../../../api/param/systemPDFTemplate"; } from "../../../api/param/systemPDFTemplate";
import {saveAs} from "file-saver"; import {saveAs} from "file-saver";
import {BASE_URL, SERVER_IP} from "../../../config/app"; import {BASE_URL} from "../../../config/app";
import {authRoleAuthList} from "../../../api/auth/authRole";
import {updateStockOrderDetail} from "@/api/warehouse/stockOrder";
import {demoPrint} from "@/api/itextpdf/itextpdf"; import {demoPrint} from "@/api/itextpdf/itextpdf";
const formJson = { const formJson = {

@ -323,8 +323,7 @@ import {
getSystemPDFModules getSystemPDFModules
} from "../../../api/param/systemPDFTemplate"; } from "../../../api/param/systemPDFTemplate";
import {BASE_URL, SERVER_IP} from "../../../config/app"; import {BASE_URL} from "../../../config/app";
import {authRoleAuthList} from "../../../api/auth/authRole";
import {saveAs} from 'file-saver'; import {saveAs} from 'file-saver';
import {demoPrint} from "@/api/itextpdf/itextpdf"; import {demoPrint} from "@/api/itextpdf/itextpdf";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";

@ -316,6 +316,7 @@
:action="this.uploadUrl" :action="this.uploadUrl"
:on-preview="uploadHandlePreview" :on-preview="uploadHandlePreview"
:on-remove="uploadHandleRemove" :on-remove="uploadHandleRemove"
:before-remove="beforeRemove"
:headers="headers" :headers="headers"
:limit="1" :limit="1"
:on-exceed="uploadHandleExceed" :on-exceed="uploadHandleExceed"
@ -329,9 +330,7 @@
:show-file-list="true" :show-file-list="true"
> >
<div> <div>
<el-button slot="trigger" size="small" type="primary" <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
:disabled="companyEditDisabled">选取文件
</el-button>
<el-button <el-button
:disabled="inputQuery.licenseUrl === null || inputQuery.licenseUrl === ''" :disabled="inputQuery.licenseUrl === null || inputQuery.licenseUrl === ''"
@click.native="openFile(inputQuery.licenseUrl)" @click.native="openFile(inputQuery.licenseUrl)"
@ -482,6 +481,7 @@ export default {
selectedOptions: [], selectedOptions: [],
fromOptions: [], fromOptions: [],
fromUdplatOptions: [], fromUdplatOptions: [],
fileList:[],
acoountInfo: "账号:" + "------" + "\n密码" + "-----", acoountInfo: "账号:" + "------" + "\n密码" + "-----",
rules: { rules: {
nickName: [ nickName: [
@ -591,9 +591,6 @@ export default {
this.$message.error("企业名称不能为空"); this.$message.error("企业名称不能为空");
return; return;
} }
let tQuery = {
companyName: this.inputQuery.companyName
};
}, },
registerConfig() { registerConfig() {
getRegisterConfig().then((response) => { getRegisterConfig().then((response) => {
@ -629,6 +626,24 @@ export default {
} }
this.inputQuery.areaCode = value.toString(); this.inputQuery.areaCode = value.toString();
}, },
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${ file.name }`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$message({
type: 'success',
message: '删除成功!'
});
this.inputQuery.licenseUrl = null;
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
copy() { copy() {
let sel = this; let sel = this;
@ -694,6 +709,9 @@ export default {
this.$message.warning(`当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`); this.$message.warning(`当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
}, },
uploadOnchange(file, fileList) { uploadOnchange(file, fileList) {
console.log("触发了")
console.log(fileList)
console.log(file)
let fileName = file.name; let fileName = file.name;
let uid = file.uid; let uid = file.uid;
let pos = fileName.lastIndexOf("."); let pos = fileName.lastIndexOf(".");
@ -729,7 +747,12 @@ export default {
uploadHandleError() { uploadHandleError() {
}, },
openFile(path) { openFile(path) {
window.open(this.fileUrl + path); if (this.inputQuery.licenseUrl != null && this.inputQuery.licenseUrl != undefined
&& this.inputQuery.licenseUrl != '') {
window.open(this.fileUrl + path);
} else {
this.$message.error("请先上传营业执照!");
}
} }
} }
}; };

Loading…
Cancel
Save