UDI
/
udiwms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/orderChange' into zhairh

Browse Source
zhairh
x_z 2 years ago
parent dafdca99d8 4d5cdb4501
commit 3c86c2b297
13 changed files with 186 additions and 242 deletions
Show Stats Download Patch File Download Diff File

6
src/views/basic/UdiInfoManage.vue
Unescape Escape View File

@ -1060,6 +1060,7 @@ export default {
},
productType: null,
editQuery: null,
pId:0,
productRemarkSet: {},
relevanceEdit: {
id: null,
@ -1071,6 +1072,7 @@ export default {
allowNoBatch: null,
allowNoExpire: null,
allowNoProduct: null,
pId:null,
},
defaultSys: null,
isImport: false,
@ -1415,6 +1417,7 @@ export default {
this.thisData = row;
this.editDialogVisible = true;
this.editQuery = row;
this.pId=row.id;
this.relevanceEdit = {
id: row.id,
// thirdId: row.thirdId,
@ -1527,6 +1530,7 @@ export default {
this.relevanceEdit.isLock = this.editQuery.isLock;
this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
this.relevanceEdit = this.editQuery;
this.relevanceEdit.pid = this.pId;
if (this.checked == true) {
this.relevanceEdit.isUseDy = 1;
} else {
@ -1561,7 +1565,7 @@ export default {
let query = {
paramKey: "smp_isUploadProuct",
};
debugger
spcombie().then((response) => {
if (response.code == 20000) {
if (response.data.paramValue == "1") {

8
src/views/business/selectThrOrderDialog.vue
Unescape Escape View File

@ -161,7 +161,7 @@ export default {
page: 1,
limit: 10,
allocateStatus: 0,
type: 0,
type: null,
customerId: null,
},
detailList: [],
@ -384,9 +384,13 @@ export default {
},
},
created() {
this.getBusType();
this.getStorage();
this.getList();
this.getList();
},
components: {selectInvDialog}

48
src/views/business/stockOrderInvSearch.vue
Unescape Escape View File

@ -26,19 +26,19 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
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 class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- 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 class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
size="mini"
@ -829,25 +829,12 @@ export default {
}
}
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
if (this.storageList.length > 0) {
this.getSubInvList();
this.getList();
}
})
.catch(() => {
});
},
invChange() {
this.query.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.query.locStorageCode
filter: 3,
};
filterSubByInv(query)
.then((response) => {
@ -859,11 +846,12 @@ export default {
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
filter: 3,
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -940,7 +928,7 @@ export default {
}
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let end = new Date();
let start = new Date();

19
src/views/inout/IOAddOrder.vue
Unescape Escape View File

@ -161,11 +161,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" v-if="enableDept">
<el-col :span="2">
<div class="ao-text">
<span>使用科室：</span>
@ -182,11 +177,13 @@
placeholder="请选择科室"
:remote-method="findDeptMethod"
:loading="loading"
:disabled="corpOrderIdDisabled"
@change="ksChange"
@focus="findDeptMethod('')"
>
<el-option
v-for="item in fromDeptOptions"
:key="item.id"
:key="item.code"
:label="item.name"
:value="item.code"
>
@ -195,9 +192,12 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="20" class="el-col">-->
<!-- <div class="text item">-->
@ -823,6 +823,10 @@ export default {
this.formData.fromCorpId = row.parentId;
this.formData.fromCorp = row.name;
},
ksChange(code){
this.formData.deptCode=code;
},
deleteCode(index, row) {
@ -1185,10 +1189,10 @@ export default {
},
created() {
this.formData.code = '';
this.formData.actDate = new Date();
this.codeArray = [];
this.findDeptMethod();
this.getStorage(this.formData.action);
if (this.$isNotBlank(this.idQuery.id)) {
this.formData.actDate = new Date(this.idQuery.actDate);
@ -1196,6 +1200,7 @@ export default {
this.corpOrderIdDisabled = true;
this.formData.action = this.idQuery.action;
this.formData.fromCorp = this.idQuery.fromCorp;
this.formData.deptCode= this.idQuery.deptCode
this.formData.fromCorpId = this.idQuery.fromCorpId;
this.formData.locStorageCode = this.idQuery.locStorageCode;
this.formData.invWarehouseCode = this.idQuery.invWarehouseCode;

45
src/views/inout/IOAdditionalOrder.vue
Unescape Escape View File

@ -25,21 +25,21 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- 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 class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
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 class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<el-option
v-for="item in subInvList"
@ -530,21 +530,12 @@ export default {
}
}
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
invChange() {
this.filterQuery.invWarehouseCode = "";
getSubInvList() {
this.subInvList = [];
let query = {
pcode: this.filterQuery.locStorageCode
filter: 3,
};
filterSubByInv(query)
.then((response) => {
@ -596,7 +587,7 @@ export default {
};
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);

42
src/views/inout/IONewOrder.vue
Unescape Escape View File

@ -25,7 +25,18 @@
</el-option>
</el-select>
</el-form-item>
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange"
>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-col>
<el-col>
<!-- <el-form-item class="query-form-item">-->
@ -41,20 +52,19 @@
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange"
>
<el-option
v-for="item in subInvList"
: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 class="query-form-item">-->
<!-- <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- size="mini"--><!-- @change="subInvChange"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in subInvList"-->
<!-- :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>
@ -466,7 +476,7 @@ export default {
this.idQuery.locStorageCode = row.locStorageCode;
this.idQuery.invWarehouseCode = row.invWarehouseCode;
this.idQuery.fromSubInvCode = row.fromSubInvCode;
this.idQuery.deptCode = row.deptCode;
this.idQuery.preCheck = row.preCheck;
}

37
src/views/inventory/InvProducts.vue
Unescape Escape View File

@ -49,19 +49,19 @@
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
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 class="query-form-item">-->
<!-- <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- 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 class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
:disabled="invWarehouseDisabled"
@ -320,10 +320,12 @@ export default {
findMethod(query) {
this.fromOptions = [];
let cQuery = {
key: query,
customerName: query,
key: query,
customerName: query,
corpType:2,
page: 1,
limit: 20
limit: 20,
};
getBasicUnitMaintains(cQuery)
@ -352,7 +354,7 @@ export default {
if (this.filterQuery.invStorageCode != null && this.filterQuery.invStorageCode != "") {
this.invWarehouseDisabled = false;
let query = {
pcode: this.filterQuery.invStorageCode
filter: 3,
};
filterSubByInv(query)
.then((response) => {
@ -416,7 +418,6 @@ export default {
}
,
created() {
this.getStorage();
this.findMethod();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);

41
src/views/inventory/InvStatistics.vue
Unescape Escape View File

@ -49,18 +49,18 @@
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange" 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 class="query-form-item">-->
<!-- <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange" 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 class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
size="mini">
@ -325,21 +325,10 @@ export default {
}
}
},
getStorage() {
this.storageList = [];
filterUplLocInv()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
invChange() {
// this.$set(this.filterQuery, "entrustUser", "");
this.filterQuery.invWarehouseCode = "";
getSubInvList() {
this.subInvList = [];
let query = {
pcode: this.filterQuery.invStorageCode
filter: 3,
};
filterSubByInv(query)
.then((response) => {
@ -372,7 +361,7 @@ export default {
this.loading = true;
this.getList();
this.findStorageCode();
this.getStorage();
this.getSubInvList();
this.findMethod();
},
};

62
src/views/inventory/invCountOrderAudit.vue
Unescape Escape View File

@ -6,19 +6,19 @@
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.orderId" placeholder="盘点单号" clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
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 class="query-form-item">-->
<!-- <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- 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 class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="invWarehouseChange"
@ -336,34 +336,22 @@ export default {
.catch(() => {
});
},
getStorage() {
this.storageList = [];
filterUplLocInv()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
invChange() {
this.filterQuery.invWarehouseCode = null;
this.filterQuery.invSpaceCode = null;
this.subInvList = [];
this.spaceCodeList = [];
if (!isBlank(this.filterQuery.invStorageCode)) {
this.invWarehouseDisabled = false;
let query = {
pcode: this.filterQuery.invStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
} else {
this.invWarehouseDisabled = true;
}
this.invWarehouseDisabled = false;
let query = {
filter: 3,
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
invWarehouseChange() {
this.invSpaceDisabled = false;
@ -447,7 +435,7 @@ export default {
countOrderCodes
},
created() {
this.getStorage();
//获取用户默认仓库信息
userInfo().then((res) => {
if (res.code === 20000) {

62
src/views/inventory/invCountOrderCompleted.vue
Unescape Escape View File

@ -6,19 +6,19 @@
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.orderId" placeholder="盘点单号" clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
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 class="query-form-item">-->
<!-- <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- 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 class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="invWarehouseChange"
@ -315,34 +315,20 @@ export default {
.catch(() => {
});
},
getStorage() {
this.storageList = [];
filterUplLocInv()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
invChange() {
this.filterQuery.invWarehouseCode = null;
this.filterQuery.invSpaceCode = null;
this.subInvList = [];
this.spaceCodeList = [];
if (!isBlank(this.filterQuery.invStorageCode)) {
this.invWarehouseDisabled = false;
let query = {
pcode: this.filterQuery.invStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
} else {
this.invWarehouseDisabled = true;
}
this.invWarehouseDisabled = false;
let query = {
filter: 3,
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
invWarehouseChange() {
this.invSpaceDisabled = false;
@ -418,7 +404,7 @@ export default {
countOrderCodes
},
created() {
this.getStorage();
//获取用户默认仓库信息
userInfo().then((res) => {
if (res.code === 20000) {

41
src/views/inventory/invCountOrderNew.vue
Unescape Escape View File

@ -6,19 +6,19 @@
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.orderId" placeholder="盘点单号" clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
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 class="query-form-item">-->
<!-- <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- 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 class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange"
@ -189,7 +189,6 @@ export default {
customerId: null
},
list: [],
storageList: [],
subInvList: [],
codeDetailVisible: false,
total: 0,
@ -284,22 +283,12 @@ export default {
.catch(() => {
});
},
getStorage() {
this.storageList = [];
filterUplLocInv()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
invChange() {
this.filterQuery.invWarehouseCode = "";
this.subInvList = [];
if (this.filterQuery.invStorageCode != null && this.filterQuery.invStorageCode != "") {
this.invWarehouseDisabled = false;
let query = {
pcode: this.filterQuery.invStorageCode
filter: 3,
};
filterSubByInv(query)
.then((response) => {
@ -397,7 +386,7 @@ export default {
addCountOrder
},
created() {
this.getStorage();
// 加载表格数据
//获取用户默认仓库信息
userInfo().then((res) => {

13
src/views/purchase/purPlanDetailDialog.vue
Unescape Escape View File

@ -62,18 +62,7 @@
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="采购仓库信息" @change="locInChange"
style="width: 50%" :disabled="true"
clearable>
<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-select v-model="formData.invWarehouseCode" placeholder="采购分库信息" style="width: 50%"
<el-select v-model="formData.invWarehouseCode" placeholder="采购分库信息" style="width: 100%"
:disabled="true" clearable>
<el-option
v-for="item in subInvList"

4
src/views/purchase/supCertSet.vue
Unescape Escape View File

@ -501,7 +501,7 @@ export default {
{required: true, message: "证书名称", trigger: "blur"}
],
need: [
{required: true, message: "请选择产地", trigger: "blur"}
{required: true, message: "是否必传", trigger: "blur"}
],
},
@ -537,7 +537,7 @@ export default {
name: [
{required: true, message: "请输入证书名称", trigger: "blur"}
],
},
/**--------产品资质设置--------------*/

Write Preview
Loading…
Cancel
Save