Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front

Browse Source
master
LAPTOP-R6EHHS26\86155 7 months ago
parent e53cf8b537 dc1675c02f
commit 3579495d81
8 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File

3
src/api/systemFinished/systemFinished.js
Unescape Escape View File

@ -14,7 +14,8 @@ export function addOdsProductEmbryoInventory(data) {
return request({
url: '/wms/systemFinished/addOdsProductEmbryoInventory',
method: 'post',
params: data
data: data,
contentType:'application/json',
});
}

20
src/views/mes/reportWork/index.vue
Unescape Escape View File

@ -21,6 +21,7 @@
</el-form-item>
<el-form-item label="生产时间" prop="feedbackTimeArray">
<el-date-picker v-model="queryParams.feedbackTimeArray" format="yyyy-MM-dd" type="datetimerange"
clearable
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
@ -879,23 +880,17 @@ export default {
},
/** 查询报工报表列表 */
getList() {
/**
if(this.queryParams.createTimeArray !=null && this.queryParams.createTimeArray.length>0){
this.queryParams.createTimeStart = moment(this.queryParams.createTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.createTimeEnd = moment(this.queryParams.createTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}
if (
this.queryParams.feedbackTimeArray != null &&
this.queryParams.feedbackTimeArray.length > 0
) {
if (this.queryParams.feedbackTimeArray != null &&this.queryParams.feedbackTimeArray.length > 0) {
this.queryParams.feedbackTimeStart = moment(
this.queryParams.feedbackTimeArray[0]
).format("YYYY-MM-DD");
this.queryParams.feedbackTimeEnd = moment(
this.queryParams.feedbackTimeArray[1]
).format("YYYY-MM-DD");
}**/
}else{
this.queryParams.feedbackTimeStart = null;
this.queryParams.feedbackTimeEnd = null;
}
this.loading = true;
listReportWork(this.queryParams).then((response) => {
this.reportWorkList = response.rows;
@ -916,6 +911,7 @@ export default {
},
// 取消按钮
cancel() {
window.location.reload();
this.open = false;
this.openReport = false;
this.openReportSAP = false;
@ -991,7 +987,7 @@ export default {
createTime: null,
updateTime: null,
updateBy: null,
endReport: "0",
endReport: "0"
};
this.resetForm("form");
this.libTabs = [];

2
src/views/quality/qcInventory/index.vue
Unescape Escape View File

@ -452,7 +452,7 @@ export default {
/** 查询库存检验列表 */
getList() {
this.loading = true;
console.log("--------"+this.queryParams)
if(this.queryParams.incomeTimeArray!=null && this.queryParams.incomeTimeArray.length>0){
this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');

10
src/views/quality/qcWarehousing/index.vue
Unescape Escape View File

@ -523,14 +523,20 @@ export default {
getList() {
this.loading = true;
if(this.queryParams.incomeTimeArray.length>0){
if(this.queryParams.incomeTimeArray != null && this.queryParams.incomeTimeArray.length>0){
this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}else{
this.queryParams.incomeTimeStart = null;
this.queryParams.incomeTimeEnd = null;
}
if(this.queryParams.checkTimeArray.length>0){
if(this.queryParams.checkTimeArray != null && this.queryParams.checkTimeArray.length>0){
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}else{
this.queryParams.checkTimeStart = null;
this.queryParams.checkTimeEnd = null;
}
listWarehousing(this.queryParams).then(response => {

8
src/views/quality/unqualified/index.vue
Unescape Escape View File

@ -85,6 +85,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!--
<el-col :span="1.5">
<el-button
type="success"
@ -95,7 +96,7 @@
@click="handleUpdate"
v-hasPermi="['quality:unqualified:edit']"
>发起OA流程</el-button>
</el-col>
</el-col>-->
<el-col :span="1.5">
<el-button
type="primary"
@ -388,9 +389,12 @@ export default {
getList() {
this.loading = true;
if(this.queryParams.checkTimeArray.length>0){
if(this.queryParams.checkTimeArray != null && this.queryParams.checkTimeArray.length>0){
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}else {
this.queryParams.checkTimeStart = null;
this.queryParams.checkTimeEnd = null;
}
listUnqualified(this.queryParams).then(response => {

3
src/views/system/datasource/index.vue
Unescape Escape View File

@ -172,6 +172,9 @@
<el-form-item label="数据源名称" prop="parkName">
<el-input v-model="form.parkName" placeholder="请输入数据源名称" disabled/>
</el-form-item>
<el-form-item label="数据源名称" prop="parkName">
<el-input v-model="form.poolName" placeholder="请输入数据源标识"/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>

9
src/views/wms/systemFinished/index.vue
Unescape Escape View File

@ -47,9 +47,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="盘点人" prop="userDefined10">
<el-form-item label="盘点人" prop="userDefined2">
<el-input
v-model="queryParams.userDefined10"
v-model="queryParams.userDefined2"
placeholder="请输入用户自定义属性10"
clearable
@keyup.enter.native="handleQuery"
@ -151,9 +151,8 @@
<el-table-column label="盘点仓库" align="center" prop="userDefined1"/>
<el-table-column label="盘点位置" align="center" prop="locCode"/>
<el-table-column label="盘点类型" align="center" prop="userDefined3" />
<!-- <el-table-column label="盘点单状态" align="center" prop="userDefined2"/>-->
<el-table-column label="审核意见" align="center" prop="userDefined4" />
<el-table-column label="盘点人" align="center" prop="userDefined2"/>
<el-table-column label="盘点时间" align="center" prop="userDefined5"/>
<el-table-column label="盘点调整人" align="center" prop="userDefined6"/>
<el-table-column label="盘点调整时间" align="center" prop="userDefined7"/>
@ -567,7 +566,7 @@
const formData = Object.assign({}, this.form);
// 将addoutorderList数组赋值给formData对象
formData.addoutorderList = this.addoutorderList;
formData.odsProductEmbryoInventoryCorrelationList = this.addoutorderList;
// 打印整合后的数据对象
console.log("Merged Data:", formData);

Write Preview
Loading…
Cancel
Save