代码备份,bug修复

master
anthonywj 3 years ago
parent 38b68a8d05
commit 001a569607

@ -17,6 +17,14 @@ export function addChangeBusType(query) {
});
}
export function removeBusChange(query) {
return axios({
url: "/spms/bussinessChangeType/remove",
method: "post",
data: query
});
}
export function deleteChangeBusType(query) {
return axios({

@ -187,6 +187,8 @@ export default {
secCheckPc: null,
secCheckWebNew: null,
secCheckChange: null,
checkBalacne: null,
secCheckBalacne: null,
corpType: null,
storageCode: null,
supplementOrderType: null,
@ -319,6 +321,8 @@ export default {
corpType: row.corpType + "",
storageCode: row.storageCode,
supplementOrderType: row.supplementOrderType,
checkBalacne: row.checkBalacne,
secCheckBalacne: row.secCheckBalacne,
};
this.modifyDialogVisible = true;
},

@ -216,7 +216,7 @@ import {
getChangeBusType,
addChangeBusType,
deleteChangeBusType,
updateChangeBusType
updateChangeBusType, removeBusChange
} from "../../api/basic/busChangeType";
export default {
@ -306,7 +306,17 @@ export default {
});
},
removeBusChangeType() {
let query = {
scAction: this.inputQuery.action,
};
removeBusChange(query)
.then((response) => {
this.changeList = [];
})
.catch(() => {
});
},
addChangeType() {
this.changeEdit = 0;
this.editQuery = {};
@ -367,6 +377,7 @@ export default {
this.getList()
} else {
this.visibleChange = false;
this.removeBusChangeType();
}
}
,

@ -234,13 +234,23 @@
<el-checkbox v-model="inputQuery.checkPc" :disabled="!inputQuery.checkEnable">UDI</el-checkbox>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.checkChange" :disabled="!inputQuery.checkEnable">
<el-checkbox v-model="inputQuery.checkChange" :disabled="!inputQuery.checkEnable">
</el-checkbox>
</div>
</el-col>
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.checkBalacne" :disabled="!inputQuery.checkEnable">
</el-checkbox>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row :gutter="20" class="el-row" type="flex">
<!-- <el-col :span="5" class="el-col">-->
@ -289,9 +299,18 @@
</el-checkbox>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.secCheckChange" :disabled="!inputQuery.secCheckEnable">
</el-checkbox>
</div>
</el-col>
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.secCheckChange" :disabled="!inputQuery.secCheckEnable">
<el-checkbox v-model="inputQuery.secCheckBalacne" :disabled="!inputQuery.secCheckEnable">
</el-checkbox>
</div>
</el-col>

@ -562,6 +562,7 @@
page: 1,
limit: 20,
addType: 1,
isDisable: false,
},
editQuery: null,

@ -472,7 +472,8 @@ const formJson = {
code: null,
status: 1,
advanceType: false,
isDefault: false
isDefault: false,
level:1,
};
export default {
data() {
@ -815,8 +816,10 @@ export default {
});
},
changeLevel(row) {
this.formData.pcode =null;
this.getParentInv(this.formData.level);
},
loadLinkData(row) {
let query = {
code: row.code

@ -36,6 +36,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group>
@ -70,7 +82,8 @@
</template>
</el-table-column>
<el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip></el-table-column>
<el-table-column label="仓库" prop="invStorageName" v-if="showSup" show-overflow-tooltip></el-table-column>
<el-table-column label="仓库" prop="invStorageName" v-if="showSup"
show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope">
<el-button
@ -124,12 +137,14 @@ import codeDetail from "./InvProductsDetail";
import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {filterAllByUser} from "@/api/basic/invWarehouse";
export default {
data() {
return {
filterQuery: {
invStorageCode: null,
cpmctymc: null,
nameCode: null,
relIdFk: null,
@ -147,6 +162,7 @@ export default {
limit: 20,
},
list: [],
storageList: [],
codeDetailVisible: false,
total: 0,
loading: true,
@ -273,7 +289,15 @@ export default {
this.loading = false;
});
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
intentDetail(row) {
this.idQuery = row;
@ -318,6 +342,7 @@ export default {
};
},
created() {
this.getStorage();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);

@ -355,8 +355,9 @@ export default {
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "补录单据",
"7": "UDI供应商平台"
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
},
//
unitquery: {key: "", page: 1, limit: 20},

@ -12,8 +12,6 @@
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button

@ -307,8 +307,9 @@ export default {
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "补录单据",
"7": "UDI供应商平台"
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
},
list: [],
adId: [],

@ -119,6 +119,11 @@
{{ scope.row.fromCorp }}
</template>
</el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150">
<template slot-scope="scope">
<span>{{ getStorageName(scope.row.locStorageCode) }}</span>
</template>
</el-table-column>
<el-table-column
label="创建时间"
prop="actDate"
@ -525,8 +530,9 @@ export default {
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "补录单据",
"7": "UDI供应商平台"
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
},
busTypes: [],
//
@ -801,7 +807,13 @@ export default {
this.$message.error(response.message);
});
},
getStorageName(code) {
for (let i = 0; i < this.storageList.length; i++) {
if (this.storageList[i].code === code) {
return this.storageList[i].name;
}
}
},
repeatPrintCheckClick(row) {
let tQuery = {
orderId: row.id,

@ -298,8 +298,9 @@ export default {
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "补录单据",
"7": "UDI供应商平台"
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
},
list: [],
adId: [],

@ -100,6 +100,11 @@
<!-- </p>-->
</template>
</el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150">
<template slot-scope="scope">
<span>{{ getStorageName(scope.row.locStorageCode) }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
<template slot-scope="scope">
<i class="el-icon-time"></i>
@ -369,11 +374,12 @@ export default {
fromTypeMap: {
"1": "UDIMS平台",
"2": "网页新增",
"3": "pda校验",
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "补录单据",
"7": "UDI供应商平台"
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
},
deleteData: {
id: "",
@ -453,6 +459,13 @@ export default {
.catch(() => {
});
},
getStorageName(code) {
for (let i = 0; i < this.storageList.length; i++) {
if (this.storageList[i].code === code) {
return this.storageList[i].name;
}
}
},
addOrders(row) {
console.log(row)
this.idQuery.id = '';

@ -109,6 +109,11 @@
{{ scope.row.fromCorp }}
</template>
</el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150">
<template slot-scope="scope">
<span>{{ getStorageName(scope.row.locStorageCode) }}</span>
</template>
</el-table-column>
<el-table-column
label="创建时间"
prop="actDate"
@ -454,8 +459,9 @@ export default {
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "补录单据",
"7": "UDI供应商平台"
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
},
//
unitquery: {key: "", page: 1, limit: 20},
@ -470,6 +476,7 @@ export default {
},
actDateRange: [],
filterQuery: {
locStorageCode: null,
id: "",
mainAction: null,
action: null,
@ -613,6 +620,13 @@ export default {
.catch(() => {
});
},
getStorageName(code) {
for (let i = 0; i < this.storageList.length; i++) {
if (this.storageList[i].code === code) {
return this.storageList[i].name;
}
}
},
handleErrorDetail(poistion) {
var mOrder = this.list[poistion];
this.errorDetail = mOrder.remark;

@ -105,6 +105,11 @@
{{ scope.row.fromCorp }}
</template>
</el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150">
<template slot-scope="scope">
<span>{{ getStorageName(scope.row.locStorageCode) }}</span>
</template>
</el-table-column>
<el-table-column
label="创建时间"
prop="actDate"
@ -498,8 +503,9 @@ export default {
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "补录单据",
"7": "UDI供应商平台"
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
},
exportQuery: {
orderId: "",
@ -601,7 +607,13 @@ export default {
console.log(val);
this.multipleSelection = val;
},
getStorageName(code) {
for (let i = 0; i < this.storageList.length; i++) {
if (this.storageList[i].code === code) {
return this.storageList[i].name;
}
}
},
handleErrorDetail(poistion) {
var mOrder = this.list[poistion];
this.errorDetail = mOrder.remark;

@ -103,7 +103,7 @@
>
<el-option
v-for="item in fromOptions"
:key="item.name"
:key="item.id"
:label="item.name"
:value="item"
>
@ -729,7 +729,13 @@ export default {
};
filterAllByUser(cQuery)
.then((response) => {
this.fromStorageOptions = response.data || [];
let temp = response.data || [];
for(let i = 0;i<temp.length;i++){
if(temp[i].code != this.formData.locStorageCode){
this.fromStorageOptions.push(temp[i]);
}
}
})
.catch(() => {
});
@ -1245,9 +1251,15 @@ export default {
}
},
actionChange(item) {
console.log("item = " + item);
if (item == '') {
this.formData.locStorageCode == null;
} else {
this.curAction = this.getActionItem(item);
this.formData.locStorageCode = this.curAction.storageCode;
console.log(this.curAction.corpType + "---" + this.formData.locStorageCode + "-----" + this.curAction.action);
}
},
locInChange(item) {
console.log(item);

@ -130,7 +130,7 @@
type="text"
size="small"
@click.native="supplementOrder(scope.row)">
补单
平衡补单
</el-button>
</div>
</template>
@ -185,7 +185,9 @@
</el-table-column>
<el-table-column label="发票日期" width="150" prop="invoiceDate">
<template slot-scope="scope">
<el-date-picker :disabled="scope.$index !== currentCheckIndex" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="scope.row.invoiceDate" style="width: 100%;"></el-date-picker>
<el-date-picker :disabled="scope.$index !== currentCheckIndex" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
v-model="scope.row.invoiceDate" style="width: 100%;"></el-date-picker>
</template>
</el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
@ -254,7 +256,8 @@
<el-input style="width: 80%;" v-model="batchForm.secSalesInvNo" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="发票日期:" :label-width="formLabelWidth">
<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="batchForm.invoiceDate" style="width: 80%;"></el-date-picker>
<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
v-model="batchForm.invoiceDate" style="width: 80%;"></el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

Loading…
Cancel
Save