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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	vue.config.js
prod
anthonywj 2 years ago
parent b521965c82 223b145085
commit 13555405e6
7 changed files with 1198 additions and 1004 deletions
Show Stats Download Patch File Download Diff File

8
src/api/basic/busOriginType.js
Unescape Escape View File

@ -44,3 +44,11 @@ export function getOriginJoinBusType(query) {
params: query params: query
}); });
} }
export function selectList(query) {
return axios({
url: "/udiwms/busType/selectList",
method: "get",
params: query
});
}

429
src/views/basic/busType/bussinessType.vue
Unescape Escape View File

@ -1,51 +1,66 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-form-item class="query-form-item" label="单据类型:"> <el-row>
<el-input <el-col :span="6">
v-model="filterQuery.name" <el-form-item class="query-form-item" label="单据类型:">
placeholder="请输入单据类型" <el-input v-model="filterQuery.name" placeholder="请输入单据类型" clearable style="width: 90%"></el-input>
></el-input> </el-form-item>
</el-form-item> </el-col>
<el-form-item class="query-form-item" label="出入库类型:"> <el-col :span="6">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型"> <el-form-item class="query-form-item" label="出入库类型:">
<el-option label="全部" value=""></el-option> <el-select v-model="filterQuery.mainAction" style="width: 90%" placeholder="请选择出入库类型">
<el-option label="入库" value="WareHouseIn"></el-option> <el-option label="全部" value=""></el-option>
<el-option label="出库" value="WareHouseOut"></el-option> <el-option label="入库" value="WareHouseIn"></el-option>
</el-select> <el-option label="出库" value="WareHouseOut"></el-option>
</el-form-item> </el-select>
<el-form-item class="query-form-item" label="是否启用:"> </el-form-item>
<el-select v-model="filterQuery.enable" placeholder="是否启用"> </el-col>
<el-option label="全部" value=""></el-option> <el-col :span="6">
<el-option label="已启用" value=1></el-option> <el-form-item class="query-form-item" label="是否启用:">
<el-option label="未启用" value=0></el-option> <el-select v-model="filterQuery.enable" style="width: 90%" placeholder="是否启用">
</el-select> <el-option label="全部" value=""></el-option>
</el-form-item> <el-option label="已启用" value="1"></el-option>
<el-form-item> <el-option label="未启用" value="0"></el-option>
<el-button-group style="margin-left: 10px;display:flex;"> </el-select>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> </el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">查询</el-button> </el-col>
<el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增 <el-col :span="6">
</el-button <el-form-item class="query-form-item" label="仓库类型:">
> <el-select v-model="filterQuery.actionType" style="width: 90%" placeholder="请选择仓库类型">
<el-button type="primary" icon="el-icon-download" @click="exportJsonFile">导出单据类型</el-button> <el-option label="入账库" :value="1"></el-option>
<el-upload <el-option label="预验收库" :value="2"></el-option>
:action="uploadFileUrl" <el-option label="寄售库" :value="3"></el-option>
multiple </el-select>
:limit="3" </el-form-item>
:headers="headers" </el-col>
:show-file-list="false" </el-row>
:on-success="handleChange"
:file-list="fileList"
>
<el-button icon="el-icon-upload2" type="primary">导入单据类型</el-button>
</el-upload>
</el-button-group>
</el-form-item>
</el-form> </el-form>
<div class="top-right-btn" >
<el-button-group style="width: 600px">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增</el-button>
<el-button type="primary" icon="el-icon-download" @click="exportJsonFile">导出单据类型</el-button>
<el-upload
:action="uploadFileUrl"
multiple
:limit="3"
:headers="headers"
:show-file-list="false"
:on-success="handleChange"
:file-list="fileList"
>
<el-button icon="el-icon-upload2" type="primary">导入单据类型</el-button>
</el-upload>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row> <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="单据类型" prop="name"></el-table-column> <el-table-column label="单据类型" prop="name"></el-table-column>
@ -107,8 +122,9 @@
> >
<modifyDialog :inputQuery="inputQuery"></modifyDialog> <modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<!-- :disabled="!configParams.typeScan"-->
<el-button type="primary" size="small" @click="onAddSubmit" <el-button type="primary" size="small" @click="onAddSubmit"
:disabled="!configParams.typeScan"
>提交 >提交
</el-button </el-button
> >
@ -126,6 +142,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="modifyDialogVisible" v-if="modifyDialogVisible"
:before-close="cancelDialog"
> >
<modifyDialog :inputQuery="inputQuery" :modifySubmit="onModifySubmit"></modifyDialog> <modifyDialog :inputQuery="inputQuery" :modifySubmit="onModifySubmit"></modifyDialog>
<div style="text-align: center;margin-top: 12px"> <div style="text-align: center;margin-top: 12px">
@ -152,12 +169,12 @@
</div> </div>
</template> </template>
<script> <script>
import {getBusTypeList, deleteBusType, updateBusType, insertBusType, exportFile} from "@/api/basic/busType"; import { getBusTypeList, deleteBusType, updateBusType, insertBusType, exportFile } from '@/api/basic/busType'
import modifyDialog from "./bussinessTypeModify"; import modifyDialog from './bussinessTypeModify'
import axios from "axios"; import axios from 'axios'
import store from "@/store"; import store from '@/store'
import {findConfig} from "@/api/sync/spsSyncStatus"; import { findConfig } from '@/api/sync/spsSyncStatus'
import {isBlank} from "@/utils/strUtil"; import { isBlank } from '@/utils/strUtil'
export default { export default {
data() { data() {
@ -165,21 +182,22 @@ export default {
filterQuery: { filterQuery: {
name: null, name: null,
mainAction: null, mainAction: null,
enable: "1", enable: '1',
page: 1, page: 1,
limit: 20, limit: 20
}, },
showSearch:true,
addDialogVisible: false, addDialogVisible: false,
modifyDialogVisible: false, modifyDialogVisible: false,
list: [], list: [],
inputQuery: { inputQuery: {
action: "", action: '',
name: "", name: '',
enable: null, enable: null,
remark: "", remark: '',
mainAction: "", mainAction: '',
thirdSysFk: "", thirdSysFk: '',
id: "", id: '',
checkEnable: false, checkEnable: false,
genUnit: false, genUnit: false,
innerOrder: false, innerOrder: false,
@ -206,15 +224,15 @@ export default {
storageCode: null, storageCode: null,
supplementOrderType: null, supplementOrderType: null,
defaultUnit: null, defaultUnit: null,
useDyCount: null, useDyCount: false,
expireTip: true, expireTip: true,
prefix: null, prefix: null,
outToSpms: null, outToSpms: null,
ullageFill: null, ullageFill: null,
scanPreIn: null, scanPreIn: false,
vailInv: null, vailInv: false,
entrutSpms: null, entrutSpms: null,
codeFillCheck: null, codeFillCheck: true,
defaultInv: null, defaultInv: null,
defaultSubInv: null, defaultSubInv: null,
orderVisibleType: null, orderVisibleType: null,
@ -223,13 +241,12 @@ export default {
originAction: null, originAction: null,
checkBalance: null, checkBalance: null,
secCheckBalance: null, secCheckBalance: null,
preInBack: true, preInBack: false,
vailDispatch: null, vailDispatch: false,
vailGroupBuy: null, vailGroupBuy: 0,
inStock: false, inStock: false,
actionType: 0, actionType: 1,
fillCodeRel: false, fillCodeRel: false,
thrCheckEnable: null, thrCheckEnable: null,
thrCheckWebNew: null, thrCheckWebNew: null,
thrCheckPdaUn: null, thrCheckPdaUn: null,
@ -240,18 +257,19 @@ export default {
thrCheckChange: null, thrCheckChange: null,
thrCheckBalance: null, thrCheckBalance: null,
thrCheckCopy: null, thrCheckCopy: null,
checkVailDate:true, //校验近效期 advancePreIn: false,
checkExpire:true, //校验过期 checkVailDate: 0, //校验近效期
checkCertExpire:true, //校验证书过期 checkExpire: true, //校验过期
checkCertExpire: false //校验证书过期
}, },
enableMap: { enableMap: {
true: "是", true: '是',
false: "否", false: '否'
}, },
mainActionMap: { mainActionMap: {
WareHouseIn: "入库", WareHouseIn: '入库',
WareHouseOut: "出库" WareHouseOut: '出库'
}, },
fileList: [], fileList: [],
total: 0, total: 0,
@ -259,79 +277,96 @@ export default {
uploadFileUrl: null, uploadFileUrl: null,
headers: {}, headers: {},
configParams: {}, configParams: {},
loading: false, loading: false
}; }
}, },
methods: { methods: {
onReset() { onReset() {
this.$router.push({ this.$router.push({
path: "", path: ''
}); })
this.filterQuery = { this.filterQuery = {
name: null, name: null,
mainAction: null, mainAction: null,
enable: "1", enable: '1',
page: 1, page: 1,
limit: 20, limit: 20
}; }
this.getList(); this.getList()
}, },
cancelDialog() { cancelDialog() {
this.modifyDialogVisible = false; this.modifyDialogVisible = false
this.addDialogVisible = false; this.addDialogVisible = false
this.getList(); this.getList()
}, },
search() { search() {
this.filterQuery.page = 1; this.filterQuery.page = 1
this.getList(); this.getList()
},
hideSearch() {
this.showSearch = !this.showSearch;
}, },
getList() { getList() {
this.loading = true; this.loading = true
getBusTypeList(this.filterQuery) getBusTypeList(this.filterQuery)
.then((response) => { .then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.list = response.data.list || []; this.list = response.data.list || []
this.total = response.data.total || 0; this.total = response.data.total || 0
} else { } else {
this.$message.error(response.message); this.$message.error(response.message)
} }
this.loading = false; this.loading = false
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false
this.list = []; this.list = []
this.total = 0; this.total = 0
}); })
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.filterQuery.page = val; this.filterQuery.page = val
this.getList(); this.getList()
}, },
onAddSubmit() { onAddSubmit() {
//默认初始化 //默认初始化
this.inputQuery.corpType = 2; if (this.inputQuery.corpType == null) {
this.inputQuery.corpType = 2
}
if (isBlank(this.inputQuery.name)) { if (isBlank(this.inputQuery.name)) {
this.$message.error("单据类型名称不能为空！"); this.$message.error('单据类型名称不能为空！')
return; return
} }
if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { if (this.inputQuery.mainAction == '' || this.inputQuery.mainAction == null) {
this.$message.error("出入库类型不能为空！"); this.$message.error('出入库类型不能为空！')
return; return
} }
if (isBlank(this.inputQuery.name)) { if (isBlank(this.inputQuery.name)) {
this.$message.error("单据类型名称不能为空！"); this.$message.error('单据类型名称不能为空！')
return; return
} }
// if (isBlank(this.inputQuery.actionType)) { // if (isBlank(this.inputQuery.actionType)) {
// this.$message.error("请选择单据类型！"); // this.$message.error("请选择单据类型！");
// return; // return;
// } // }
if (isBlank(this.inputQuery.inStock)) { if (isBlank(this.inputQuery.inStock)) {
this.$message.error("请选择是否更改库存！"); this.$message.error('请选择是否更改库存！')
return; return
}
if (this.inputQuery.preInBack == 1) {
if (isBlank(this.inputQuery.backPreinType)) {
this.$message.error('请选择预验收剩余库存退库方式！')
return
}
if (isBlank(this.inputQuery.preInBackAction)) {
this.$message.error('请选择预验收退库单据类型！')
return
}
} }
// if (isBlank(this.inputQuery.busType)) { // if (isBlank(this.inputQuery.busType)) {
// this.$message.error("请选择特定页面！"); // this.$message.error("请选择特定页面！");
@ -340,39 +375,39 @@ export default {
insertBusType(this.inputQuery) insertBusType(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.loading = false; this.loading = false
this.cancelDialog(); this.cancelDialog()
this.getList(); this.getList()
} else { } else {
this.$message.error(response.message); this.$message.error(response.message)
} }
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false
}); })
}, },
onModifySubmit() { onModifySubmit() {
if (isBlank(this.inputQuery.name)) { if (isBlank(this.inputQuery.name)) {
this.$message.error("单据类型名称不能为空！"); this.$message.error('单据类型名称不能为空！')
return; return
} }
if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { if (this.inputQuery.mainAction == '' || this.inputQuery.mainAction == null) {
this.$message.error("出入库类型不能为空！"); this.$message.error('出入库类型不能为空！')
return; return
} }
if (isBlank(this.inputQuery.name)) { if (isBlank(this.inputQuery.name)) {
this.$message.error("单据类型名称不能为空！"); this.$message.error('单据类型名称不能为空！')
return; return
} }
// if (isBlank(this.inputQuery.actionType)) { // if (isBlank(this.inputQuery.actionType)) {
// this.$message.error("请选择单据类型！"); // this.$message.error("请选择单据类型！");
// return; // return;
// } // }
if (isBlank(this.inputQuery.inStock)) { if (isBlank(this.inputQuery.inStock)) {
this.$message.error("请选择是否更改库存！"); this.$message.error('请选择是否更改库存！')
return; return
} }
// if (isBlank(this.inputQuery.busType)) { // if (isBlank(this.inputQuery.busType)) {
// this.$message.error("请选择特定页面！"); // this.$message.error("请选择特定页面！");
@ -382,52 +417,52 @@ export default {
updateBusType(this.inputQuery) updateBusType(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.loading = false; this.loading = false
this.cancelDialog(); this.cancelDialog()
this.getList(); this.getList()
} else { } else {
this.$message.error(response.message); this.$message.error(response.message)
} }
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false
this.cancelDialog(); this.cancelDialog()
}); })
}, },
exportJsonFile() { exportJsonFile() {
exportFile().then((response) => { exportFile().then((response) => {
const binaryData = []; const binaryData = []
binaryData.push(response); binaryData.push(response)
let url = window.URL.createObjectURL( let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/json"}) new Blob(binaryData, { type: 'application/json' })
); )
this.loading = false; this.loading = false
const eleLink = document.createElement('a'); const eleLink = document.createElement('a')
// var timestamp = "yyyy-MM-dd_hh:mm"; // var timestamp = "yyyy-MM-dd_hh:mm";
eleLink.download = "扫码单据类型导出" + ".json"; eleLink.download = '扫码单据类型导出' + '.json'
eleLink.style.display = 'none'; eleLink.style.display = 'none'
eleLink.href = url; eleLink.href = url
document.body.appendChild(eleLink) document.body.appendChild(eleLink)
eleLink.click() eleLink.click()
document.body.removeChild(eleLink) document.body.removeChild(eleLink)
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false
}); })
}, },
handleAddClick() { handleAddClick() {
this.inputQuery = { this.inputQuery = {
action: "", action: '',
name: "", name: '',
enable: true, enable: true,
remark: "", remark: '',
mainAction: "", mainAction: 'WareHouseIn',
thirdSysFk: "", thirdSysFk: '',
id: "", id: '',
checkEnable: false, checkEnable: false,
genUnit: false, genUnit: false,
innerOrder: false, innerOrder: false,
spUse: null, spUse: 0,
secCheckEnable: null, secCheckEnable: null,
checkUdims: null, checkUdims: null,
checkPdaEd: null, checkPdaEd: null,
@ -448,30 +483,30 @@ export default {
checkBalance: null, checkBalance: null,
secCheckBalance: null, secCheckBalance: null,
secCheckCopy: null, secCheckCopy: null,
corpType: null, corpType: 2,
storageCode: null, storageCode: null,
supplementOrderType: null, supplementOrderType: null,
defaultUnit: null, defaultUnit: null,
useDyCount: null, useDyCount: false,
expireTip: true, expireTip: true,
prefix: null, prefix: null,
outToSpms: null, outToSpms: null,
ullageFill: null, ullageFill: null,
scanPreIn: null, scanPreIn: false,
vailInv: null, vailInv: false,
entrutSpms: null, entrutSpms: null,
codeFillCheck: null, codeFillCheck: true,
defaultInv: null, defaultInv: null,
defaultSubInv: null, defaultSubInv: null,
orderVisibleType: null, orderVisibleType: null,
advanceType: null, advanceType: null,
preIn: null, preIn: null,
originAction: null, originAction: null,
preInBack: true, preInBack: false,
vailDispatch: null, vailDispatch: false,
vailGroupBuy: null, vailGroupBuy: 0,
inStock: false, inStock: false,
actionType: 0, actionType: 1,
fillCodeRel: false, fillCodeRel: false,
thrCheckEnable: null, thrCheckEnable: null,
thrCheckWebNew: null, thrCheckWebNew: null,
@ -483,94 +518,92 @@ export default {
thrCheckChange: null, thrCheckChange: null,
thrCheckBalance: null, thrCheckBalance: null,
thrCheckCopy: null, thrCheckCopy: null,
advancePreIn: false,
checkVailDate:true, //校验近效期 checkVailDate: 0, //校验近效期
checkExpire:true, //校验过期 checkExpire: 2, //校验过期
checkCertExpire:true, //校验证书过期 checkCertExpire: 0, //校验证书过期
backPreinType: 1,
sortNum: 999
} }
this.addDialogVisible = true; this.addDialogVisible = true
}, },
handleModifyClick(row) { handleModifyClick(row) {
this.inputQuery = row; this.inputQuery = row
this.modifyDialogVisible = true; this.modifyDialogVisible = true
}, },
deleteDialog(rowId) { deleteDialog(rowId) {
this.$confirm("此操作将永久删除该扫码类型信息, 是否继续?", "提示", { this.$confirm('此操作将永久删除该扫码类型信息, 是否继续?', '提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
type: "warning", type: 'warning'
}) })
.then(() => { .then(() => {
this.deleteOrders(rowId); this.deleteOrders(rowId)
}) })
.catch(() => { .catch(() => {
}); })
}, },
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true
let tquery = { let tquery = {
id: data.id + "", id: data.id + ''
}; }
deleteBusType(tquery) deleteBusType(tquery)
.then((response) => { .then((response) => {
this.getList(); this.getList()
if (response.code == 20000) { if (response.code == 20000) {
this.$message({ this.$message({
type: "success", type: 'success',
message: "删除成功！", message: '删除成功！'
}); })
} else { } else {
this.$message.error(response.message); this.$message.error(response.message)
} }
}) })
.catch(() => { .catch(() => {
}); })
}, },
handleChange(response, files, fileList) { handleChange(response, files, fileList) {
if (response.code != 20000) { if (response.code != 20000) {
this.$message.error(response.message); this.$message.error(response.message)
} else { } else {
this.$message.success(response.data); this.$message.success(response.data)
this.getList(); this.getList()
} }
}, },
init() { init() {
axios.get("./config.json").then(res => { this.uploadFileUrl = process.env.VUE_APP_BASE_API + '/udiwms/bussinessType/file/upload'
// 基础地址
let response = res.data.BASE_URL;
this.uploadFileUrl = response + "/udiwms/bussinessType/file/upload";
});
this.headers = { this.headers = {
ADMIN_ID: store.getters.adminId, ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token, ADMIN_TOKEN: store.getters.token
}; }
}, },
getSyncConfig() { getSyncConfig() {
findConfig() findConfig()
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.configParams = response.data; this.configParams = response.data
} }
}) })
.catch(() => { .catch(() => {
}); })
}, }
}, },
components: { components: {
modifyDialog, modifyDialog
}, },
mounted() { mounted() {
}, },
created() { created() {
this.init(); this.init()
this.getSyncConfig(); this.getSyncConfig()
this.getList(); this.getList()
}, }
}; }
</script> </script>
<style scoped> <style scoped>

345
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -62,23 +62,15 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11" type="flex">
<el-form-item label="内部单据自动平衡" prop="supplementOrderType"> <el-form-item label="仓库类型" prop="actionType">
<el-select :disabled="inputQuery.corpType !=3 || inputQuery.inStock!= true" <el-select v-model="inputQuery.actionType"
size="small" size="small"
style="width: 90%" style="width: 90%"
v-model="inputQuery.supplementOrderType" placeholder="请选择入库方式">
clearable <el-option label="入账库" :value="1"></el-option>
placeholder="单据类型" <el-option label="预验收库" :value="2"></el-option>
> <el-option label="寄售库" :value="3"></el-option>
<el-option
v-for="item in orderTypeList"
:key="item.name"
:label="item.name"
:value="item.action"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -86,8 +78,9 @@
<el-row type="flex"> <el-row type="flex">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="允许手动输入客户信息" prop="genUnit"> <el-form-item label="允许手动输入客户信息" prop="genUnit">
<el-select v-model="inputQuery.genUnit" :disabled="inputQuery.corpType != 1" style="width: 90%" <el-select v-model="inputQuery.genUnit"
placeholder="是否允许" clearable :disabled="inputQuery.corpType != 1 || inputQuery.mainAction!='WareHouseOut'" style="width: 90%"
placeholder="是否允许"
> >
<el-option label="允许" :value="true"></el-option> <el-option label="允许" :value="true"></el-option>
<el-option label="不允许" :value="false"></el-option> <el-option label="不允许" :value="false"></el-option>
@ -95,81 +88,91 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" type="flex"> <el-col :span="11">
<el-form-item label="采购方式" prop="actionType"> <el-form-item label="内部单据自动平衡" prop="supplementOrderType">
<el-select v-model="inputQuery.actionType" <el-select :disabled="inputQuery.corpType !=3 || inputQuery.inStock!= true"
size="small" size="small"
style="width: 90%" style="width: 90%"
v-model="inputQuery.supplementOrderType"
clearable clearable
:disabled="inputQuery.mainAction!='WareHouseIn' || inputQuery.corpType!=2 " placeholder="单据类型"
placeholder="请选择入库方式"> >
<el-option label="无" :value="0"></el-option> <el-option
<el-option label="带票" :value="1"></el-option> v-for="item in orderTypeList"
<el-option label="预验收" :value="2"></el-option> :key="item.name"
<el-option label="寄售" :value="3"></el-option> :label="item.name"
:value="item.action"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- :disabled="inputQuery.mainAction!='WareHouseIn' || inputQuery.corpType!=2 "-->
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="允许供应商使用" prop="prefix"> <el-form-item label="供应商使用权限" prop="prefix">
<el-select v-model="inputQuery.spUse" <el-select v-model="inputQuery.spUse"
:disabled=" inputQuery.corpType!=2 " style="width: 90%" placeholder="是否允许" >
style="width: 90%" placeholder="是否允许" clearable> <el-option label="无" :value="0"></el-option>
<el-option label="是" :value="1"></el-option> <el-option label="可查看" :value="1"></el-option>
<el-option label="否" :value="0"></el-option> <el-option label="增删改查" :value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="预验收使用结束退回" prop="preInBack"> <el-form-item label="物资近效期处理方式" prop="prefix">
<el-select v-model="inputQuery.preInBack" <el-select v-model="inputQuery.checkVailDate"
:disabled="inputQuery.actionType != 2 || inputQuery.mainAction!='WareHouseIn' || style="width: 90%" placeholder="" >
inputQuery.corpType != 2 " <el-option label="不处理" :value=0></el-option>
<el-option label="弹框提醒" :value=1></el-option>
style="width: 90%" <el-option label="禁止录入" :value=2></el-option>
placeholder="是否退回" clearable
>
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--<el-col :span="11">-->
<!-- <el-form-item label="预验收使用结束退回" prop="preInBack">-->
<!-- <el-select v-model="inputQuery.preInBack"-->
<!-- :disabled="inputQuery.actionType != 2 || inputQuery.mainAction!='WareHouseIn' ||-->
<!-- inputQuery.corpType != 2 || inputQuery.inStock==false "-->
<!-- style="width: 90%"-->
<!-- placeholder="是否退回" -->
<!-- >-->
<!-- <el-option label="是" :value="true"></el-option>-->
<!-- <el-option label="否" :value="false"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="是否检查近效期" prop="prefix"> <el-form-item label="物资过期处理方式" prop="prefix">
<el-select v-model="inputQuery.checkVailDate" <el-select v-model="inputQuery.checkExpire"
style="width: 90%" placeholder="" clearable> style="width: 90%" placeholder="" >
<el-option label="是" :value="true"></el-option> <el-option label="不处理" :value=0></el-option>
<el-option label="否" :value="false"></el-option> <el-option label="弹框提醒" :value=1></el-option>
<el-option label="禁止录入" :value=2></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="是否检查过期" prop="prefix"> <el-form-item label="资质过期处理方式" prop="prefix">
<el-select v-model="inputQuery.checkExpire" <el-select v-model="inputQuery.checkCertExpire"
style="width: 90%" placeholder="" clearable> style="width: 90%" placeholder="" >
<el-option label="是" :value="true"></el-option> <el-option label="不处理" :value=0></el-option>
<el-option label="否" :value="false"></el-option> <el-option label="弹框提醒" :value=1></el-option>
<el-option label="禁止录入" :value=2></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11">
<el-form-item label="是否检查资质过期" prop="prefix">
<el-select v-model="inputQuery.checkCertExpire"
style="width: 90%" placeholder="" clearable>
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="单据前缀" prop="prefix"> <el-form-item label="单据前缀" prop="prefix">
<el-input <el-input
@ -178,13 +181,18 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11">
<el-form-item label="排序" prop="sortNum">
<el-input v-model="inputQuery.sortNum" type="number" size="small" style="width: 90%">
</el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="禁用单据类型" prop="prefix"> <el-form-item label="禁用单据类型" prop="prefix">
<el-select v-model="inputQuery.enable" style="width: 90%" placeholder="状态" clearable> <el-select v-model="inputQuery.enable" style="width: 90%" placeholder="状态" >
<el-option label="否" :value="true"></el-option> <el-option label="否" :value="true"></el-option>
<el-option label="是" :value="false"></el-option> <el-option label="是" :value="false"></el-option>
</el-select> </el-select>
@ -204,7 +212,8 @@
<div style="margin-left: 25px"> <div style="margin-left: 25px">
<el-collapse> <el-collapse>
<el-collapse-item title="供应商送货设置" v-if="inputQuery.corpType==2 && inputQuery.mainAction!= 'WareHouseOut'"> <el-collapse-item title="供应商送货设置"
v-if="inputQuery.corpType==2 && inputQuery.mainAction!= 'WareHouseOut'">
<div style="width: 100%;margin-top: 15px"> <div style="width: 100%;margin-top: 15px">
<el-row> <el-row>
@ -230,7 +239,7 @@
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.codeFillCheck" style="width: 65%" <el-select v-model="inputQuery.codeFillCheck" style="width: 65%"
:disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'" :disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
placeholder="是否启用" clearable> placeholder="是否启用" >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
</el-select> </el-select>
@ -247,7 +256,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.fillCodeRel" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.fillCodeRel" style="width: 65%" placeholder="是否启用"
:disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'" :disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
> >
<el-option label="是" :value="true"></el-option> <el-option label="是" :value="true"></el-option>
@ -266,7 +275,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.vailDispatch" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.vailDispatch" style="width: 65%" placeholder="是否启用"
:disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'" :disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -286,7 +295,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用" clearable> <el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用" >
<el-option label="无需校验" :value=0></el-option> <el-option label="无需校验" :value=0></el-option>
<el-option label="只采集集采产品" :value=1></el-option> <el-option label="只采集集采产品" :value=1></el-option>
<el-option label="只采集非集采产品" :value=2></el-option> <el-option label="只采集非集采产品" :value=2></el-option>
@ -300,7 +309,7 @@
<el-divider></el-divider> <el-divider></el-divider>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="医院使用出库设置" v-if="inputQuery.mainAction!='WareHouseIn'"> <el-collapse-item title="出库单据设置" v-if="inputQuery.mainAction!='WareHouseIn'">
<div style="width: 100%;margin-top: 15px"> <div style="width: 100%;margin-top: 15px">
<el-row> <el-row>
<el-col span="5"> <el-col span="5">
@ -325,8 +334,8 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.scanPreIn" style="width: 65%" <el-select v-model="inputQuery.scanPreIn" style="width: 65%"
:disabled="inputQuery.corpType!=1 || inputQuery.mainAction== 'WareHouseIn'" :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
placeholder="是否启用" clearable> placeholder="是否启用" >
<el-option label="是" :value="true"></el-option> <el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option> <el-option label="否" :value="false"></el-option>
</el-select> </el-select>
@ -338,6 +347,26 @@
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">寄售使用禁止无库存出库</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.advancePreIn" style="width: 65%"
:disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
placeholder="是否启用" >
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">寄售使用禁止无库存出库</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row> <el-row>
<el-col span="5"> <el-col span="5">
<span class="sptext">是否只允许有库存产品出库</span> <span class="sptext">是否只允许有库存产品出库</span>
@ -345,8 +374,8 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.vailInv" style="width: 65%" <el-select v-model="inputQuery.vailInv" style="width: 65%"
:disabled="inputQuery.corpType!=1 || inputQuery.mainAction!= 'WareHouseOut'" :disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
@ -366,8 +395,8 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.useDyCount" style="width: 65%" <el-select v-model="inputQuery.useDyCount" style="width: 65%"
:disabled="inputQuery.corpType!=1 || inputQuery.mainAction!= 'WareHouseOut'" :disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.corpType != 1"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="是" :value="true"></el-option> <el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option> <el-option label="否" :value="false"></el-option>
@ -380,6 +409,69 @@
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">预验收剩余库存自动退库</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.preInBack"
:disabled="inputQuery.scanPreIn ==false " @change="getPreInBack"
style="width: 65%"
placeholder="是否退回"
>
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">预验收剩余库存自动退库</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row v-if="inputQuery.preInBack==true">
<el-col span="5">
<span class="sptext">预验收剩余库存退库方式</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.backPreinType" style="width: 65%" >
<el-option label="按单使用和退库" :value="1"></el-option>
<el-option label="按货位（仓库）使用和退库" :value="2"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">预验收剩余库存退库方式</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row v-if="inputQuery.preInBack==true ">
<el-col span="5">
<span class="sptext">预验收退库单据类型</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.preInBackAction" style="width: 65%" >
<el-option
v-for="item in preInBackList"
:key="item.name"
:label="item.name"
:value="item.action"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">预验收退库单据类型</span>
</el-col>
</el-row>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="是否校验业务单设置"> <el-collapse-item title="是否校验业务单设置">
@ -435,7 +527,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkWebNew" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkWebNew" style="width: 65%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
@ -455,7 +547,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkPdaUn" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkPdaUn" style="width: 65%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
@ -475,7 +567,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkPdaEd" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkPdaEd" style="width: 65%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
@ -495,7 +587,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkUdims" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkUdims" style="width: 65%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
@ -515,7 +607,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkPc" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkPc" style="width: 65%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
@ -535,7 +627,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkSp" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkSp" style="width: 65%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
@ -554,7 +646,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkChange" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkChange" style="width: 65%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
@ -574,7 +666,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 65%" <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 65%"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
@ -593,7 +685,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkCopy" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkCopy" style="width: 65%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" clearable placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="不启用" :value="false"></el-option>
@ -640,7 +732,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.thrCheckWebNew" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.thrCheckWebNew" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckEnable" :disabled="!inputQuery.thrCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -660,7 +752,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.thrCheckPdaUn" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.thrCheckPdaUn" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckEnable" :disabled="!inputQuery.thrCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -680,7 +772,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.thrCheckPdaEd" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.thrCheckPdaEd" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckEnable" :disabled="!inputQuery.thrCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -700,7 +792,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.thrCheckUdims" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.thrCheckUdims" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckEnable" :disabled="!inputQuery.thrCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -720,7 +812,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.thrCheckPc" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.thrCheckPc" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckEnable" :disabled="!inputQuery.thrCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -740,7 +832,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.thrCheckSp" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.thrCheckSp" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckEnable" :disabled="!inputQuery.thrCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -760,7 +852,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.thrCheckChange" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.thrCheckChange" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckEnable" :disabled="!inputQuery.thrCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -780,7 +872,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.thrCheckBalance" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.thrCheckBalance" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckEnable" :disabled="!inputQuery.thrCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -800,7 +892,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.thrCheckCopy" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.thrCheckCopy" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckEnable" :disabled="!inputQuery.thrCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -849,7 +941,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.secCheckWebNew" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.secCheckWebNew" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.secCheckEnable" :disabled="!inputQuery.secCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -869,7 +961,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.secCheckPdaUn" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.secCheckPdaUn" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.secCheckEnable" :disabled="!inputQuery.secCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -889,7 +981,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.secCheckPdaEd" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.secCheckPdaEd" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.secCheckEnable" :disabled="!inputQuery.secCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -909,7 +1001,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.secCheckUdims" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.secCheckUdims" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.secCheckEnable" :disabled="!inputQuery.secCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -929,7 +1021,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.secCheckPc" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.secCheckPc" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.secCheckEnable" :disabled="!inputQuery.secCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -949,7 +1041,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.secCheckSp" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.secCheckSp" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.secCheckEnable" :disabled="!inputQuery.secCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -969,7 +1061,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.secCheckChange" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.secCheckChange" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.secCheckEnable" :disabled="!inputQuery.secCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -989,7 +1081,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.secCheckBalance" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.secCheckBalance" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.secCheckEnable" :disabled="!inputQuery.secCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -1009,7 +1101,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.secCheckCopy" style="width: 65%" placeholder="是否启用" clearable <el-select v-model="inputQuery.secCheckCopy" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.secCheckEnable" :disabled="!inputQuery.secCheckEnable"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="启用" :value="true"></el-option>
@ -1033,7 +1125,7 @@
import {candidateBusType} from '@/api/basic/busType' import {candidateBusType} from '@/api/basic/busType'
import busTypeAdvancedSettings from '@/views/basic/busType/busTypeAdvancedSettings.vue' import busTypeAdvancedSettings from '@/views/basic/busType/busTypeAdvancedSettings.vue'
import {isBlank} from '@/utils/strUtil' import {isBlank} from '@/utils/strUtil'
import {getOriginBusType} from '@/api/basic/busOriginType' import {getOriginBusType,selectList} from '@/api/basic/busOriginType'
import {getBasicUnitMaintains2} from '@/api/basic/basicUnitMaintain' import {getBasicUnitMaintains2} from '@/api/basic/basicUnitMaintain'
export default { export default {
@ -1080,6 +1172,7 @@ export default {
isBuType: true, isBuType: true,
isFilterBind: true isFilterBind: true
}, },
preInBackList: [],
orderTypeList: [], orderTypeList: [],
fromSpecialOptions: [], fromSpecialOptions: [],
originTypes: [], originTypes: [],
@ -1133,6 +1226,7 @@ export default {
}, },
corpTypeChange(type) { corpTypeChange(type) {
debugger
if (type != 2) { if (type != 2) {
this.inputQuery.genUnit = false this.inputQuery.genUnit = false
} }
@ -1155,12 +1249,30 @@ export default {
} }
if (this.inputQuery.corpType != 2) { //往来类型非供应商时，采购方式未无 if (this.inputQuery.corpType != 2) { //往来类型非供应商时，采购方式未无
this.inputQuery.actionType = 0; this.inputQuery.actionType = 1;
this.inputQuery.spUse = 0; this.inputQuery.spUse = 0;
} }
// if (this.inputQuery.corpType == 3) {//往来类型为内部科室
// this.inputQuery.inStock = null;
//
// }
}, },
selectBussinessList(){
selectList().then((res) => {
this.preInBackList=res.data;
})
},
getPreInBack(){
if(this.inputQuery.preInBack==false){
this.inputQuery.preInBackAction=null;
this.inputQuery.backPreinType='';
}else{
this.inputQuery.backPreinType=1;
}
},
//获取单据类型 //获取单据类型
getOrderType() { getOrderType() {
this.orderTypeList = [] this.orderTypeList = []
@ -1169,13 +1281,25 @@ export default {
curAction: this.inputQuery.supplementOrderType curAction: this.inputQuery.supplementOrderType
} }
candidateBusType(query).then((response) => { candidateBusType(query).then((response) => {
this.orderTypeList = response.data || [] let data = response.data || []
if (data != null && data.length > 0) {
for (var i = 0; i < data.length; i++) {
if (data[i].action != this.inputQuery.action) {
this.orderTypeList.push(data[i]);
}
}
}
}).catch(() => { }).catch(() => {
}) })
// if (this.inputQuery.mainAction != 'WareHouseIn') {
// this.inputQuery.actionType = null
// }
if (this.inputQuery.mainAction != 'WareHouseIn') { // 联动修改允许手动输入客户信息值
this.inputQuery.actionType = null if (this.inputQuery.corpType != 1 || this.inputQuery.mainAction != "WarehouseOut") {
this.inputQuery.genUnit = false;
} }
}, },
@ -1229,7 +1353,14 @@ export default {
} }
this.getList() this.getList()
this.findSpecialMethod() this.findSpecialMethod()
this.selectBussinessList()
this.oldData = Object.assign({}, this.inputQuery) this.oldData = Object.assign({}, this.inputQuery)
debugger
if(this.inputQuery.id==null || this.inputQuery.id==''){
this.inputQuery.codeFillCheck=false;
this.inputQuery.preInBack=false;
}
} }
} }

1239
src/views/sync/SysUdimsConfig.vue
View File

File diff suppressed because it is too large Load Diff

13
src/views/thirdSys/api/BasicThirdSysDetailModify.vue
Unescape Escape View File

@ -41,6 +41,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="inputDetailQuery.fromType === 3" :gutter="20" class="el-row" type="flex" align="middle">
<el-col :span="24" class="el-col">
<el-form-item label-width="100px" label="请求时间">
<el-input
style="width: 80%"
splaceholder="请输入请求时间 单位：分钟"
type="number"
min="0"
v-model="inputDetailQuery.time"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex" align="middle"> <el-row :gutter="20" class="el-row" type="flex" align="middle">
<el-col :span="24" class="el-col"> <el-col :span="24" class="el-col">

11
src/views/thirdSys/api/index.vue
Unescape Escape View File

@ -460,6 +460,17 @@ export default {
}); });
}, },
onDetailModifySubmit() { onDetailModifySubmit() {
if (this.inputDetailQuery.fromType === 3) {
if (isBlank(this.inputDetailQuery.time)) {
this.$message.error("接口请求时间不能为空");
return;
}
if (this.inputDetailQuery.time < 0) {
this.$message.error("接口请求时间不能小于0");
return;
}
}
updateDetailBasicThirdSys(this.inputDetailQuery) updateDetailBasicThirdSys(this.inputDetailQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {

157
vue.config.js
Unescape Escape View File

@ -1,15 +1,15 @@
'use strict' "use strict";
const path = require('path') const path = require("path");
function resolve(dir) { function resolve(dir) {
return path.join(__dirname, dir) return path.join(__dirname, dir);
} }
const CompressionPlugin = require('compression-webpack-plugin') const CompressionPlugin = require("compression-webpack-plugin");
const name = process.env.VUE_APP_TITLE || 'UDI管理系统' // 网页标题 const name = process.env.VUE_APP_TITLE || "UDI管理系统"; // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80; // 端口
// vue.config.js 配置说明 // vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@ -20,16 +20,16 @@ module.exports = {
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
publicPath: process.env.VUE_APP_CONTEXT_PATH, publicPath: process.env.VUE_APP_CONTEXT_PATH,
// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
outputDir: 'UDI_WMS_NEW', outputDir: "UDI_WMS_NEW",
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
assetsDir: 'static', assetsDir: "static",
// 是否开启eslint保存检测，有效值：ture | false | 'error' // 是否开启eslint保存检测，有效值：ture | false | 'error'
lintOnSave: process.env.NODE_ENV === 'development', lintOnSave: process.env.NODE_ENV === "development",
// 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
productionSourceMap: false, productionSourceMap: false,
// webpack-dev-server 相关配置 // webpack-dev-server 相关配置
devServer: { devServer: {
host: '0.0.0.0', host: "0.0.0.0",
port: port, port: port,
open: false, open: false,
proxy: { proxy: {
@ -38,99 +38,94 @@ module.exports = {
target: `http://192.168.0.166:9991/`, target: `http://192.168.0.166:9991/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ["^" + process.env.VUE_APP_BASE_API]: "",
} },
} },
}, },
disableHostCheck: true disableHostCheck: true,
}, },
css: { css: {
loaderOptions: { loaderOptions: {
sass: { sass: {
sassOptions: { outputStyle: "expanded" } sassOptions: { outputStyle: "expanded" },
} },
} },
}, },
configureWebpack: { configureWebpack: {
name: name, name: name,
resolve: { resolve: {
alias: { alias: {
'@': resolve('src') "@": resolve("src"),
} },
}, },
plugins: [ plugins: [
// http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
new CompressionPlugin({ new CompressionPlugin({
cache: false, // 不启用文件缓存 cache: false, // 不启用文件缓存
test: /\.(js|css|html)?$/i, // 压缩文件格式 test: /\.(js|css|html)?$/i, // 压缩文件格式
filename: '[path].gz[query]', // 压缩后的文件名 filename: "[path].gz[query]", // 压缩后的文件名
algorithm: 'gzip', // 使用gzip压缩 algorithm: "gzip", // 使用gzip压缩
minRatio: 0.8 // 压缩率小于1才会压缩 minRatio: 0.8, // 压缩率小于1才会压缩
}) }),
], ],
}, },
chainWebpack(config) { chainWebpack(config) {
config.plugins.delete('preload') // TODO: need test config.plugins.delete("preload"); // TODO: need test
config.plugins.delete('prefetch') // TODO: need test config.plugins.delete("prefetch"); // TODO: need test
// set svg-sprite-loader // set svg-sprite-loader
config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end();
config.module config.module
.rule('svg') .rule("icons")
.exclude.add(resolve('src/assets/icons'))
.end()
config.module
.rule('icons')
.test(/\.svg$/) .test(/\.svg$/)
.include.add(resolve('src/assets/icons')) .include.add(resolve("src/assets/icons"))
.end() .end()
.use('svg-sprite-loader') .use("svg-sprite-loader")
.loader('svg-sprite-loader') .loader("svg-sprite-loader")
.options({ .options({
symbolId: 'icon-[name]' symbolId: "icon-[name]",
}) })
.end() .end();
config config.when(process.env.NODE_ENV !== "development", (config) => {
.when(process.env.NODE_ENV !== 'development', config
config => { .plugin("ScriptExtHtmlWebpackPlugin")
config .after("html")
.plugin('ScriptExtHtmlWebpackPlugin') .use("script-ext-html-webpack-plugin", [
.after('html') {
.use('script-ext-html-webpack-plugin', [{ // `runtime` must same as runtimeChunk name. default is `runtime`
// `runtime` must same as runtimeChunk name. default is `runtime` inline: /runtime\..*\.js$/,
inline: /runtime\..*\.js$/ },
}]) ])
.end() .end();
config config.optimization.splitChunks({
.optimization.splitChunks({ chunks: "all",
chunks: 'all', cacheGroups: {
cacheGroups: { libs: {
libs: { name: "chunk-libs",
name: 'chunk-libs', test: /[\\/]node_modules[\\/]/,
test: /[\\/]node_modules[\\/]/, priority: 10,
priority: 10, chunks: "initial", // only package third parties that are initially dependent
chunks: 'initial' // only package third parties that are initially dependent },
}, elementUI: {
elementUI: { name: "chunk-elementUI", // split elementUI into a single package
name: 'chunk-elementUI', // split elementUI into a single package priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm },
}, commons: {
commons: { name: "chunk-commons",
name: 'chunk-commons', test: resolve("src/components"), // can customize your rules
test: resolve('src/components'), // can customize your rules minChunks: 3, // minimum common number
minChunks: 3, // minimum common number priority: 5,
priority: 5, reuseExistingChunk: true,
reuseExistingChunk: true },
} },
} });
}) config.optimization.runtimeChunk("single"),
config.optimization.runtimeChunk('single'), {
{ from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 to: "./", //到根目录下
to: './' //到根目录下 };
} });
} },
) };
}
}

Write Preview
Loading…
Cancel
Save