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

界面修改

Browse Source
master
anthonywj 3 years ago
parent ffb3f02d09
commit a58ff3b612
15 changed files with 174 additions and 88 deletions
Show Stats Download Patch File Download Diff File

11
src/api/warehouse/code.js
Unescape Escape View File

@ -7,3 +7,14 @@ export function saveCode(query) {
data: query
});
}
export function findByCode(query) {
return axios(
{
url: "/udiwms/basic/findByCode",
method: "get",
params: query
}
);
}

8
src/views/basic/BasicEntrutsRece.vue
Unescape Escape View File

@ -196,11 +196,11 @@ export default {
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入委托验收人仓库！");
this.$message.error("请输入接受委托仓库！");
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入委托验收人！");
this.$message.error("请输入接受委托人！");
return;
}
@ -226,11 +226,11 @@ export default {
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入委托验收人仓库！");
this.$message.error("请输入接受委托仓库！");
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入委托验收人！");
this.$message.error("请输入接受委托人！");
return;
}
insertEntrustRece(this.inputQuery)

40
src/views/basic/BasicEntrutsReceModify.vue
Unescape Escape View File

@ -7,46 +7,48 @@
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>扫码单据类型:&nbsp;</span>
<span>委托仓库:&nbsp;</span>
</div>
<el-select v-model="inputQuery.action" placeholder="请选择" clearable>
<el-select v-model="inputQuery.curInv" placeholder="当前仓库" @change="invChange" clearable>
<el-option
v-for="item in busTypes"
:key="item.localAction"
v-for="item in storageList"
:key="item.code"
:label="item.name"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>委托仓库:&nbsp;</span>
<span>扫码单据类型:&nbsp;</span>
</div>
<el-select v-model="inputQuery.curInv" placeholder="当前仓库" @change="invChange" clearable>
<el-select v-model="inputQuery.action" placeholder="请选择" clearable>
<el-option
v-for="item in storageList"
:key="item.code"
v-for="item in busTypes"
:key="item.localAction"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>委托验收人仓库:&nbsp;</span>
<span>接受委托仓库:&nbsp;</span>
</div>
<el-select v-model="inputQuery.entrustInv" placeholder="委托验收人仓库" @change="entrustInvChange" clearable>
<el-select v-model="inputQuery.entrustInv" placeholder="接受委托仓库" @change="entrustInvChange"
clearable>
<el-option
v-for="item in entrustStorageList"
:key="item.code"
@ -62,9 +64,9 @@
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>委托验收人:&nbsp;</span>
<span>接受委托人:&nbsp;</span>
</div>
<el-select v-model="inputQuery.entrustUser" placeholder="委托验收人" clearable>
<el-select v-model="inputQuery.entrustUser" placeholder="接受委托人" clearable>
<el-option
v-for="item in entrustUserArray"
:key="item.userid"
@ -86,7 +88,7 @@
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>委托生成单据类型:&nbsp;</span>
<span>生成单据类型:&nbsp;</span>
</div>
<el-select v-model="inputQuery.entrustAction" placeholder="单据类型" clearable>
<el-option

29
src/views/basic/BussinessType.vue
Unescape Escape View File

@ -31,17 +31,17 @@
>新增
</el-button
>
<!-- <el-upload-->
<!-- :action="uploadFileUrl"-->
<!-- multiple-->
<!-- :limit="3"-->
<!-- :headers="headers"-->
<!-- :show-file-list="false"-->
<!-- :on-success="handleChange"-->
<!-- :file-list="fileList"-->
<!-- >-->
<!-- <el-button size="mini" type="primary">导入单据类型</el-button>-->
<!-- </el-upload>-->
<!-- <el-upload-->
<!-- :action="uploadFileUrl"-->
<!-- multiple-->
<!-- :limit="3"-->
<!-- :headers="headers"-->
<!-- :show-file-list="false"-->
<!-- :on-success="handleChange"-->
<!-- :file-list="fileList"-->
<!-- >-->
<!-- <el-button size="mini" type="primary">导入单据类型</el-button>-->
<!-- </el-upload>-->
</el-button-group>
</el-form-item>
@ -77,7 +77,6 @@
<el-button
type="text"
size="small"
:disabled="!configParms.typeScan"
@click.native.stop="handleModifyClick(scope.row)"
>编辑
</el-button
@ -106,6 +105,7 @@
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onAddSubmit"
:disabled="!configParms.typeScan"
>提交
</el-button
>
@ -127,6 +127,7 @@
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"
:disabled="!configParms.typeScan"
>提交
</el-button
>
@ -209,7 +210,7 @@ export default {
ullageFill: null,
scanPreIn: null,
vailInv: null,
codeFillCheck:null,
codeFillCheck: null,
},
enableMap: {
true: "是",
@ -354,7 +355,7 @@ export default {
scanPreIn: row.scanPreIn,
vailInv: row.vailInv,
codeFillCheck: row.codeFillCheck,
changeEnable: row.changeEnable
};

11
src/views/basic/BussinessTypeLocl.vue
Unescape Escape View File

@ -50,14 +50,11 @@
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
:disabled="!configParms.typeBus"
@click.native.stop="handleModifyClick(scope.row)"
>编辑
</el-button
@ -85,6 +82,7 @@
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onAddSubmit"
:disabled="!configParms.typeBus"
>提交
</el-button
>
@ -106,6 +104,7 @@
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"
:disabled="!configParms.typeBus"
>提交
</el-button
>
@ -151,7 +150,7 @@ export default {
changeEnable: null,
spUse: null,
prefix: null,
preIn:null,
preIn: null,
},
enableMap: {
true: "是",
@ -244,7 +243,7 @@ export default {
changeEnable: row.changeEnable,
spUse: row.spUse,
prefix: row.prefix,
preIn:row.preIn,
preIn: row.preIn,
};
},
@ -262,7 +261,7 @@ export default {
localAction: null,
changeEnable: null,
prefix: null,
preIn:null,
preIn: null,
};
},

27
src/views/basic/BussinessTypeModify.vue
Unescape Escape View File

@ -228,15 +228,19 @@
</el-col>
</el-row>
<el-divider></el-divider>
<span>单据默认选项：</span>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<div class="text item" style="margin-top: 6px">
<el-checkbox v-model="inputQuery.ullageFill">允许出库自动缺量补单</el-checkbox>
<el-checkbox v-model="inputQuery.scanPreIn">是否只采集预验收产品
<div class="text item" style="margin-top: 12px">
<el-checkbox v-model="inputQuery.ullageFill" :disabled="!inputQuery.changeEnable">单据默认勾选缺量补单
</el-checkbox>
<el-checkbox v-model="inputQuery.vailInv">是否访问库存
<el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出入库是必须校验预验收库
</el-checkbox>
<el-checkbox v-model="inputQuery.codeFillCheck">是否三期校验
<el-checkbox v-model="inputQuery.vailInv">出入库时是否查询库存
</el-checkbox>
<el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验
</el-checkbox>
</div>
</el-col>
@ -377,6 +381,7 @@ import {
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {getCandidateBussinessType} from "../../api/receipts/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {findConfig} from "@/api/thrsys/spsSyncStatus";
export default {
name: "inputQuery",
@ -414,6 +419,7 @@ export default {
label: '特殊往来'
}],
twoCheck: false,
configParms: {},
}
},
@ -485,6 +491,16 @@ export default {
})
},
getSyncConfig() {
findConfig()
.then((response) => {
if (response.code == 20000) {
this.configParms = response.data;
}
})
.catch(() => {
});
},
},
computed: {
corpType() {
@ -506,6 +522,7 @@ export default {
if (this.inputQuery.mainAction != null && this.inputQuery.mainAction != "") {
this.getOrderType();
}
this.getSyncConfig();
this.getList();
this.getStorage();
this.findSpecialMethod();

5
src/views/basic/BussinessTypeThird.vue
Unescape Escape View File

@ -33,7 +33,7 @@
>新增
</el-button
>
<!-- <el-button type="primary" icon="search" @click="updateDownload">更新下载</el-button>-->
<!-- <el-button type="primary" icon="search" @click="updateDownload">更新下载</el-button>-->
</el-button-group>
</el-form-item>
@ -51,7 +51,6 @@
<el-button
type="text"
size="small"
:disabled="!configParms.typeBus"
@click.native.stop="handleModifyClick(scope.row)"
>编辑
</el-button
@ -79,6 +78,7 @@
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onAddSubmit"
:disabled="!configParms.typeBus"
>提交
</el-button
>
@ -100,6 +100,7 @@
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"
:disabled="!configParms.typeBus"
>提交
</el-button
>

11
src/views/basic/CorpMaintain.vue
Unescape Escape View File

@ -33,7 +33,7 @@
>新增
</el-button
>
<el-button type="primary" icon="search" @click="intentDetail"
<el-button type="primary" icon="search" @click="intentDetail" :disabled="!configParms.basicCorp"
>选入往来单位信息
</el-button
>
@ -86,7 +86,6 @@
<el-button
type="text"
size="small"
:disabled="!configParms.basicCorp"
@click.native="handleForm(scope.$index, scope.row)"
>编辑
</el-button
@ -173,12 +172,12 @@
<el-button
type="text"
size="small"
@click="intentSelect(scope.row)"
@click="intentSelect(scope.row)" :disabled="!configParms.basicCorp"
>关联
</el-button
>
<el-button type="text" size="small" @click.native.stop="removeErp(scope.row)"
:disabled="scope.row.thirdId=='' ||scope.row.thirdId==null"
:disabled="scope.row.thirdId=='' ||scope.row.thirdId==null || !configParms.basicCorp"
>解绑
</el-button>
</template>
@ -303,7 +302,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
<el-button type="primary" @click.native="formSubmit()" :loading="formLoading">提交</el-button>
<el-button type="primary" @click.native="formSubmit()" :loading="formLoading"
:disabled="!configParms.basicCorp">提交
</el-button>
</div>
</el-dialog>
</div>

13
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -45,9 +45,11 @@
>
<el-button size="mini" type="primary" :disabled="!configParms.basicInv">导入</el-button>
</el-upload>
<el-button type="primary" icon="search" @click="exportInvwarehouse" :disabled="!configParms.basicInv">导出</el-button>
<el-button type="primary" icon="search" @click="exportInvwarehouse"
:disabled="!configParms.basicInv">导出
</el-button>
<!-- <el-button type="primary" icon="search" @click="uploadInvwarehouse">同步至UDI管理系统</el-button>-->
<!-- <el-button type="primary" icon="search" @click="uploadInvwarehouse">同步至UDI管理系统</el-button>-->
</el-button-group>
</el-form-item>
@ -116,7 +118,6 @@
<el-button
type="text"
size="small"
:disabled="!configParms.basicInv"
@click.native.stop="handleForm(node, scope.row, 'edit')"
>编辑
</el-button
@ -389,12 +390,13 @@
<el-button
type="text"
size="small"
:disabled="!configParms.basicInv"
@click="intentSelect(scope.row)"
>关联
</el-button
>
<el-button type="text" size="small" @click.native.stop="unbindThrWarehouse(scope.row)"
:disabled="scope.row.thirdId=='' ||scope.row.thirdId==null"
:disabled="scope.row.thirdId=='' ||scope.row.thirdId==null ||!configParms.basicInv"
>解绑
</el-button>
</template>
@ -499,6 +501,7 @@
<el-button @click.native="hideForm">取消</el-button>
<el-button
type="primary"
:disabled="!configParms.basicInv"
@click.native="formSubmit()"
:loading="formLoading"
>提交
@ -686,7 +689,7 @@ export default {
thirdSysVisible: false,
total: 0,
thirdQuery: {
key:null,
key: null,
page: 1,
limit: 10
, thirdSysFk: "thirdId",

40
src/views/thrsys/SysUdimsConfig.vue
Unescape Escape View File

@ -50,16 +50,16 @@
></el-input>
</div>
</el-col>
<el-col :span="8" class="el-col">
<div>
<span>开始时间:&nbsp;</span>
<el-time-picker
:disabled="configQuery.downstreamEnable"
v-model="configQuery.basicSyncStart"
placeholder="开始时间">
</el-time-picker>
</div>
</el-col>
<!-- <el-col :span="8" class="el-col">-->
<!-- <div>-->
<!-- <span>开始时间:&nbsp;</span>-->
<!-- <el-time-picker-->
<!-- :disabled="configQuery.downstreamEnable"-->
<!-- v-model="configQuery.basicSyncStart"-->
<!-- placeholder="开始时间">-->
<!-- </el-time-picker>-->
<!-- </div>-->
<!-- </el-col>-->
</el-row>
</el-descriptions-item>
@ -135,16 +135,16 @@
></el-input>
</div>
</el-col>
<el-col :span="8" class="el-col">
<div>
<span>开始时间:&nbsp;</span>
<el-time-picker
:disabled="configQuery.downstreamEnable"
v-model="configQuery.orderSyncStart"
placeholder="开始时间">
</el-time-picker>
</div>
</el-col>
<!-- <el-col :span="8" class="el-col">-->
<!-- <div>-->
<!-- <span>开始时间:&nbsp;</span>-->
<!-- <el-time-picker-->
<!-- :disabled="configQuery.downstreamEnable"-->
<!-- v-model="configQuery.orderSyncStart"-->
<!-- placeholder="开始时间">-->
<!-- </el-time-picker>-->
<!-- </div>-->
<!-- </el-col>-->
</el-row>
</el-descriptions-item>

2
src/views/thrsys/SysUdimsData.vue
Unescape Escape View File

@ -160,7 +160,7 @@ export default {
return {
filterQuery: {
id: null,
status: "1",
status: "0",
page: 1,
limit: 10,
syncTime: null,

1
src/views/userManage/admin/authAdmin.vue
Unescape Escape View File

@ -70,7 +70,6 @@
<el-button
type="text"
size="small"
:disabled="!configParms.sysUser"
@click.native="handleForm(scope.$index, scope.row)"
>编辑
</el-button>

33
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -164,22 +164,34 @@
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item" style="margin-top: 6px">
</el-row>
<el-row :gutter="20">
<el-col :span="20" class="el-col">
<div class="text item">
<el-checkbox v-model="formData.outChangeEnable"
:disabled="!curAction.changeEnable || corpOrderIdDisabled">允许出库自动缺量补单
</el-checkbox>
<el-checkbox v-model="formData.preCheck"
:disabled="corpOrderIdDisabled || curAction.corpType !=2"
>是否只采集预验收产品
>出入库是必须校验预验收库
</el-checkbox>
<el-checkbox v-model="formData.vailInv"
:disabled="corpOrderIdDisabled"
>是否查询库存
</el-checkbox>
<el-checkbox v-model="formData.codeFillCheck"
:disabled="corpOrderIdDisabled"
>采集UDI码时进行三期校验
</el-checkbox>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-row :gutter="20" style="margin-top: 12px">
<el-col :span="2">
<div class="ao-text">
<el-link
@ -902,6 +914,17 @@ export default {
actionChange(item) {
this.curAction = this.getActionItem(item);
this.findMethod();
this.$set(this.formData, "vailIn", this.curAction.vailInv);
this.$set(this.formData, "preCheck", this.curAction.scanPreIn);
this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill);
this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
// this.formData.vailIn = this.curAction.vailInv;
// this.formData.preCheck = this.curAction.scanPreIn;
// this.formData.outChangeEnable = this.curAction.ullageFill;
// this.formData.codeFillCheck = this.curAction.codeFillCheck;
},
//绑定数据

13
src/views/warehouse/addOrder.vue
Unescape Escape View File

@ -105,7 +105,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<el-checkbox v-model="formData.codeFillCheck"
:disabled="corpOrderIdDisabled"
>采集UDI码时进行三期校验
</el-checkbox>
</div>
</el-col>
</el-row>
</el-card>
<el-card>
<el-row :gutter="20">
@ -753,6 +764,8 @@ export default {
},
actionChange(item) {
this.curAction = this.getActionItem(item);
console.log( this.curAction.codeFillCheck)
this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
// this.formData.locStorageCode = this.curAction.storageCode;
},
//绑定数据

18
src/views/warehouse/editCode.vue
Unescape Escape View File

@ -85,6 +85,7 @@
<script>
import {
findByCode,
saveCode
} from "../../api/warehouse/code";
@ -129,8 +130,23 @@ export default {
},
cancelDialog() {
this.closeCodeDialog();
},
findByCode() {
let query = {udiCode: this.codeDetail.code};
findByCode(query)
.then((response) => {
if (response.code === 20000) {
} else {
}
this.loading = false;
});
}
}
},
created() {
},
}
</script>

Write Preview
Loading…
Cancel
Save