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

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

@ -184,7 +184,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -244,9 +244,9 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="抽样数量" prop="sampleQuality"> <el-form-item label="抽样数量" prop="sampleQuality">
<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量"/> <el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量"/>
</el-form-item> </el-form-item>
@ -265,7 +265,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="仓库编码" prop="supplierCode"> <el-form-item label="仓库编码" prop="supplierCode">
<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/> <el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
</el-form-item> </el-form-item>
@ -284,7 +284,7 @@
<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/> <el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="检测地点" prop="checkLoc"> <el-form-item label="检测地点" prop="checkLoc">
<el-input v-model="form.checkLoc" placeholder="请输入检测地点" /> <el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
</el-form-item> </el-form-item>
@ -388,7 +388,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
checkType:[ checkType:[
{ required: true, message: "检验类型不能为空", trigger: "blur" } { required: true, message: "检验类型不能为空", trigger: "blur" }
], ],
incomeBatchNo: [ incomeBatchNo: [
{ required: true, message: "批次号不能为空", trigger: "blur" } { required: true, message: "批次号不能为空", trigger: "blur" }
@ -452,12 +452,12 @@ export default {
/** 查询库存检验列表 */ /** 查询库存检验列表 */
getList() { getList() {
this.loading = true; this.loading = true;
console.log("--------"+this.queryParams)
if(this.queryParams.incomeTimeArray!=null && 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.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'); this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}else{ }else{
this.queryParams.incomeTimeStart = null; this.queryParams.incomeTimeStart = null;
this.queryParams.incomeTimeEnd = null; this.queryParams.incomeTimeEnd = null;
} }
@ -619,7 +619,7 @@ export default {
this.form.supplierCode = obj.code; this.form.supplierCode = obj.code;
this.form.supplierName = obj.name; this.form.supplierName = obj.name;
}, },
/**人员选择弹出框**/ /**人员选择弹出框**/
handleSelectUser() { handleSelectUser() {
this.$refs.itemSelectUser.showFlag = true; this.$refs.itemSelectUser.showFlag = true;

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

@ -185,7 +185,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -427,7 +427,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
checkType:[ checkType:[
{ required: true, message: "检验类型不能为空", trigger: "blur" } { required: true, message: "检验类型不能为空", trigger: "blur" }
], ],
incomeBatchNo: [ incomeBatchNo: [
{ required: true, message: "批次号不能为空", trigger: "blur" } { required: true, message: "批次号不能为空", trigger: "blur" }
@ -498,7 +498,7 @@ export default {
this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); 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'); this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}else{ }else{
this.queryParams.incomeTimeStart = null; this.queryParams.incomeTimeStart = null;
this.queryParams.incomeTimeEnd = null; this.queryParams.incomeTimeEnd = null;
} }
@ -665,7 +665,7 @@ export default {
this.form.supplierCode = obj.code; this.form.supplierCode = obj.code;
this.form.supplierName = obj.name; this.form.supplierName = obj.name;
}, },
/**人员选择弹出框**/ /**人员选择弹出框**/
handleSelectUser() { handleSelectUser() {
this.$refs.itemSelectUser.showFlag = true; this.$refs.itemSelectUser.showFlag = true;

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

@ -523,15 +523,21 @@ export default {
getList() { getList() {
this.loading = true; 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.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'); 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.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'); 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 => { listWarehousing(this.queryParams).then(response => {
this.warehousingList = response.rows; this.warehousingList = response.rows;

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

@ -85,6 +85,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!--
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -95,7 +96,7 @@
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['quality:unqualified:edit']" v-hasPermi="['quality:unqualified:edit']"
>发起OA流程</el-button> >发起OA流程</el-button>
</el-col> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
@ -388,10 +389,13 @@ export default {
getList() { getList() {
this.loading = true; 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.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'); 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 => { listUnqualified(this.queryParams).then(response => {
this.unqualifiedList = response.rows; this.unqualifiedList = response.rows;

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

@ -128,7 +128,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -172,6 +172,9 @@
<el-form-item label="数据源名称" prop="parkName"> <el-form-item label="数据源名称" prop="parkName">
<el-input v-model="form.parkName" placeholder="请输入数据源名称" disabled/> <el-input v-model="form.parkName" placeholder="请输入数据源名称" disabled/>
</el-form-item> </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-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>

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

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

Write Preview
Loading…
Cancel
Save