product_platform/wms-ui-admin
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善基础信息

Browse Source
This commit is contained in:
guoxing
2024-08-07 10:25:51 +08:00
parent aef23adc1c
commit c1ed92ef89
7 changed files with 165 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/views/baseInfo/supplier/supplier/relation/openingbank.vue
View File

@@ -13,23 +13,27 @@
<el-row style="border-top: 1px solid #e0e3eb"> <el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="12"> <el-col :span="12">
<div class="span-sty"><span class="icon">*</span>开户银行</div> <div class="span-sty"><span class="icon">*</span>开户银行</div>
<el-form-item prop="bankName"><el-input class="addinputInfo addinputw" v-model="formobj.bankName" clearable placeholder="" /></el-form-item> <el-form-item prop="bankName"><el-input class="addinputInfo addinputw" v-model="formobj.bankName"
clearable placeholder="" /></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty"><span class="icon">*</span>银行账号</div> <div class="span-sty"><span class="icon">*</span>银行账号</div>
<el-form-item prop="bankAccount"><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item> <el-form-item prop="bankAccount"><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount"
clearable placeholder="" /></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty"><span class="icon">*</span>账号名称</div> <div class="span-sty"><span class="icon">*</span>账号名称</div>
<el-form-item prop="accountName"><el-input class="addinputInfo addinputw" v-model="formobj.accountName" clearable placeholder="" /></el-form-item> <el-form-item prop="accountName"><el-input class="addinputInfo addinputw" v-model="formobj.accountName"
clearable placeholder="" /></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty"><span class="icon">*</span>账号类型</div> <div class="span-sty"><span class="icon">*</span>账号类型</div>
<el-form-item prop="dueBankKey"> <el-form-item prop="dueBankKey">
<el-select v-model="formobj.dueBankKey" class="addinputInfo" placeholder="" @change="dueBankChange"> <el-select v-model="formobj.dueBankKey" class="addinputInfo" placeholder="" @change="dueBankChange">
<el-option v-for="item in dueBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/> <el-option v-for="item in dueBank_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -37,27 +41,32 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">开户行地址</div> <div class="span-sty">开户行地址</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAddress" clearable placeholder="" /></el-form-item> <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAddress" clearable
placeholder="" /></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty">银行网点</div> <div class="span-sty">银行网点</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankingOutlets" clearable placeholder="" /></el-form-item> <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankingOutlets" clearable
placeholder="" /></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty">联行号</div> <div class="span-sty">联行号</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.paymentLines" clearable placeholder="" /></el-form-item> <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.paymentLines" clearable
placeholder="" /></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty">swiftCode(银行代码)</div> <div class="span-sty">swiftCode(银行代码)</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.swiftCode" clearable placeholder="" /></el-form-item> <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.swiftCode" clearable
placeholder="" /></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty">币种</div> <div class="span-sty">币种</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.currency" clearable placeholder="" /></el-form-item> <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.currency" clearable
placeholder="" /></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@@ -67,7 +76,9 @@
</template> </template>
<script> <script>
import { typeValues } from '@/api/Common/dictcommons' import {
typeValues
} from '@/api/Common/dictcommons'
export default { export default {
name: 'OpeningBank', name: 'OpeningBank',
@@ -92,16 +103,34 @@ export default {
}, },
index: '', index: '',
rules: { rules: {
bankName: [{ required: true, message: '开户银行不能为空', trigger: 'blur' }], bankName: [{
bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }], required: true,
accountName: [{ required: true, message: '账号名称不能为空', trigger: 'blur' }], message: '开户银行不能为空',
dueBankKey: [{ required: true, message: '账号类型不能为空', trigger: 'change' }] trigger: 'blur'
}],
bankAccount: [{
required: true,
message: '银行账号不能为空',
trigger: 'blur'
}],
accountName: [{
required: true,
message: '账号名称不能为空',
trigger: 'blur'
}],
dueBankKey: [{
required: true,
message: '账号类型不能为空',
trigger: 'change'
}]
} }
} }
}, },
methods: { methods: {
init() { init() {
typeValues({ type: 'dueBank' }).then((res) => { typeValues({
type: 'accountType'
}).then((res) => {
if (res.success) { if (res.success) {
this.dueBank_list = res.data this.dueBank_list = res.data
} }
@@ -165,9 +194,11 @@ export default {
.span-sty { .span-sty {
width: 140px !important; width: 140px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 130px !important; margin-left: 130px !important;
} }
/deep/ .el-form-item__error { /deep/ .el-form-item__error {
margin-left: 120px !important; margin-left: 120px !important;
} }

33
src/views/baseInfo/supplier/supplier/supplierAdd.vue
View File

@@ -407,22 +407,24 @@
}, },
backData(value, index) { backData(value, index) {
this.viewState = 1 this.viewState = 1
value = JSON.parse(JSON.stringify(value))
if (index !== '' && index !== null) { if (index !== '' && index !== null) {
this.formobj.baseSupplierBankList[index] = { // this.formobj.baseSupplierBankList[index] = {
sid: value.sid, // sid: value.sid,
supplierSid: value.supplierSid, // supplierSid: value.supplierSid,
bankName: value.bankName, // bankName: value.bankName,
bankAccount: value.bankAccount, // bankAccount: value.bankAccount,
accountName: value.accountName, // accountName: value.accountName,
dueBankKey: value.dueBankKey, // dueBankKey: value.dueBankKey,
dueBankValue: value.dueBankValue, // dueBankValue: value.dueBankValue,
bankingOutlets: value.bankingOutlets, // bankingOutlets: value.bankingOutlets,
bankAddress: value.bankAddress, // bankAddress: value.bankAddress,
paymentLines: value.paymentLines, // paymentLines: value.paymentLines,
swiftCode: value.swiftCode, // swiftCode: value.swiftCode,
currency: value.currency // currency: value.currency
} // }
this.$set(this.formobj.baseSupplierBankList, index, value)
} else { } else {
this.formobj.baseSupplierBankList.push({ this.formobj.baseSupplierBankList.push({
sid: '', sid: '',
@@ -439,6 +441,7 @@
currency: value.currency currency: value.currency
}) })
} }
}, },
resetState() { resetState() {
this.viewState = 1 this.viewState = 1

2
src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue
View File

@@ -108,7 +108,7 @@
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'warning', type: 'warning',
message: '所属仓区不能为空' message: '所属库区不能为空'
}) })
return return
} }

14
src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
View File

@@ -62,8 +62,8 @@
<div class="item"> <div class="item">
<span class="item_text"><span class="must">*</span> 使用状态：</span> <span class="item_text"><span class="must">*</span> 使用状态：</span>
<el-radio-group v-model="formobj.usageStatus" size="small" @change="changeTheme" class="item_input"> <el-radio-group v-model="formobj.usageStatus" size="small" @change="changeTheme" class="item_input">
<el-radio :label="'1'">正常</el-radio> <el-radio :label="1">正常</el-radio>
<el-radio :label="'0'">停用</el-radio> <el-radio :label="0">停用</el-radio>
</el-radio-group> </el-radio-group>
<!-- <el-input v-model="formobj.usageStatus" placeholder="仓库排序" class="item_input" clearable /> --> <!-- <el-input v-model="formobj.usageStatus" placeholder="仓库排序" class="item_input" clearable /> -->
</div> </div>
@@ -100,7 +100,7 @@
manager: '', manager: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "1", usageStatus: 1,
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
@@ -148,14 +148,6 @@
return return
} }
if (this.formobj.usageStatus == '') {
this.$message({
showClose: true,
type: 'warning',
message: '使用状态不能为空'
})
return
}
if (this.formobj.sortNo == '') { if (this.formobj.sortNo == '') {
this.$message({ this.$message({

2
src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue
View File

@@ -124,7 +124,7 @@
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'warning', type: 'warning',
message: '仓区名称不能为空' message: '库区名称不能为空'
}) })
return return
} }

7
src/views/system/userManage/userManageAdd.vue
View File

@@ -18,7 +18,8 @@
<div style="display: flex;flex-direction: row;width: 100%;margin-top: 10px;"> <div style="display: flex;flex-direction: row;width: 100%;margin-top: 10px;">
<div style="display: flex;flex-direction: row;flex: 1 ; align-items: center;"> <div style="display: flex;flex-direction: row;flex: 1 ; align-items: center;">
<span style="width: 80px;text-align: right;"><span class="must">*</span> 部门：</span> <span style="width: 80px;text-align: right;"><span class="must">*</span> 部门：</span>
<el-select v-model="form.sysStaffOrg.orgName" placeholder="请选择" style="margin-left: 10px; flex: 0.8;"> <el-select ref="treeSelect" v-model="form.sysStaffOrg.orgName" placeholder="请选择"
style="margin-left: 10px; flex: 0.8;">
<el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName" <el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName"
:value="form.sysStaffOrg.orgName"></el-option> :value="form.sysStaffOrg.orgName"></el-option>
<el-tree :data="treedata" ref="Tree" accordion node-key="sid" :default-checked-keys="checkedId" <el-tree :data="treedata" ref="Tree" accordion node-key="sid" :default-checked-keys="checkedId"
@@ -130,6 +131,8 @@
this.form.accountType = val ? "2" : "3" this.form.accountType = val ? "2" : "3"
}, },
manageTypeChange(val) { manageTypeChange(val) {
console.log("manageTypeChange", val); console.log("manageTypeChange", val);
@@ -190,7 +193,7 @@
this.form.sysStaffOrg.orgSid = val.sid this.form.sysStaffOrg.orgSid = val.sid
this.form.sysStaffOrg.orgName = val.name this.form.sysStaffOrg.orgName = val.name
this.form.sysStaffOrg.orgCode = val.orgCode this.form.sysStaffOrg.orgCode = val.orgCode
this.$refs.Tree.visible = false this.$refs.treeSelect.visible = false
}, },
checkchange(data, checked, indeterminate) { checkchange(data, checked, indeterminate) {

6
src/views/system/userManage/userManageList.vue
View File

@@ -129,7 +129,8 @@
<div style="display: flex;flex-direction: row;width: 100%;margin-top: 10px;"> <div style="display: flex;flex-direction: row;width: 100%;margin-top: 10px;">
<div style="display: flex;flex-direction: row;flex: 1 ; align-items: center;"> <div style="display: flex;flex-direction: row;flex: 1 ; align-items: center;">
<span style="width: 80px;text-align: right;"><span class="must">*</span> 部门：</span> <span style="width: 80px;text-align: right;"><span class="must">*</span> 部门：</span>
<el-select v-model="form.sysStaffOrg.orgName" placeholder="请选择" style="margin-left: 10px; flex: 0.8;"> <el-select ref="treeSelect" v-model="form.sysStaffOrg.orgName" placeholder="请选择"
style="margin-left: 10px; flex: 0.8;">
<el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName" <el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName"
:value="form.sysStaffOrg.orgName"></el-option> :value="form.sysStaffOrg.orgName"></el-option>
<el-tree :data="treedata" ref="Tree" @node-click="nodeClick" accordion node-key="sid" <el-tree :data="treedata" ref="Tree" @node-click="nodeClick" accordion node-key="sid"
@@ -146,7 +147,6 @@
@change="roleChange"> @change="roleChange">
<el-option v-for="(item,i) in roleListAll" :key="i" :label="item.name" :value="item.sid"></el-option> <el-option v-for="(item,i) in roleListAll" :key="i" :label="item.name" :value="item.sid"></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
@@ -349,7 +349,7 @@
this.form.sysStaffOrg.orgSid = val.sid this.form.sysStaffOrg.orgSid = val.sid
this.form.sysStaffOrg.orgName = val.name this.form.sysStaffOrg.orgName = val.name
this.form.sysStaffOrg.orgCode = val.orgCode this.form.sysStaffOrg.orgCode = val.orgCode
this.$refs.Tree.visible = false this.$refs.treeSelect.visible = false
}, },
checkchange(data, checked, indeterminate) { checkchange(data, checked, indeterminate) {