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

9/14 业务类型增加收货方送货方

Browse Source
yanshishuju
wangwei 7 months ago
parent beac8a2ade
commit 786d678ac3
4 changed files with 144 additions and 42 deletions
Show Stats Download Patch File Download Diff File

134
src/views/basic/workplace/addBusTypeDialog.vue
Unescape Escape View File

@ -127,51 +127,83 @@
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">
<el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型"
@change="corpTypeChange"
<el-form-item label="发货方:" prop="shipper" class="query-form-item">
<el-select v-model="formData.shipper" style="width: 80%" placeholder="选择发货方"
@change="changeShipper" :disabled="formData.shipper == 3"
>
<el-option label="供应商" :value="2"></el-option>
<el-option label="客户" :value="1"></el-option>
<el-option label="特殊往来" :value="4"></el-option>
<el-option label="内部科室" :value="3"></el-option>
<el-option label="填写" :value="5"></el-option>
<el-option label="原始单据的发货方" :value="1" v-if="formData.scanType != 1"></el-option>
<el-option label="原始单据的收货方" :value="2" v-if="formData.scanType != 1"></el-option>
<el-option label="用户所属仓库" :value="3" v-if="formData.scanType == 1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="往来类型标题:" prop="unitTittle" class="query-form-item">
<el-input
v-model="formData.unitTittle" style="width: 80%"
auto-complete="off"
placeholder="请输入往来类型标题"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
<el-select v-model="formData.invCode" placeholder="请选择仓库"
style="width: 80%"
clearable
<el-form-item label="收获方:" prop="consignee" class="query-form-item">
<el-select v-model="formData.consignee" style="width: 80%" placeholder="选择收货方"
@change="changeConsignee"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
<div v-if="formData.shipper != 3">
<el-option label="原始单据的收货方" :value="1"></el-option>
<el-option label="原始单据的发货方" :value="2"></el-option>
</div>
<div v-else>
<el-option label="供应商" :value="3"></el-option>
<el-option label="客户" :value="4"></el-option>
<el-option label="特殊往来" :value="5"></el-option>
<el-option label="内部科室" :value="6"></el-option>
<el-option label="填写" :value="7"></el-option>
</div>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!--<el-divider></el-divider>-->
<!--<el-row :gutter="24" class="el-row">-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">-->
<!-- <el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型"-->
<!-- @change="corpTypeChange"-->
<!-- >-->
<!-- <el-option label="供应商" :value="2"></el-option>-->
<!-- <el-option label="客户" :value="1"></el-option>-->
<!-- <el-option label="特殊往来" :value="4"></el-option>-->
<!-- <el-option label="内部科室" :value="3"></el-option>-->
<!-- <el-option label="填写" :value="5"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="往来类型标题:" prop="unitTittle" class="query-form-item">-->
<!-- <el-input-->
<!-- v-model="formData.unitTittle" style="width: 80%"-->
<!-- auto-complete="off"-->
<!-- placeholder="请输入往来类型标题"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!--</el-row>-->
<!--<el-row :gutter="24" class="el-row">-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="默认仓库:" prop="invCode" class="query-form-item">-->
<!-- <el-select v-model="formData.invCode" placeholder="请选择仓库"-->
<!-- style="width: 80%"-->
<!-- clearable-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in invList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code"-->
<!-- >-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!--</el-row>-->
<el-row :gutter="24" class="el-row">
<el-col class="el-col">
<el-form-item label="备注:" prop="remark" class="query-form-item">
@ -268,6 +300,8 @@ export default {
overCount: 1,
checkBatchInsert: 2,
number: 1,
shipper: 1,
consignee: 1,
},
invList: [],
busTypes: [],
@ -303,6 +337,7 @@ export default {
unitTittle: [
// { required: true, message: '请输入往来类型标题', trigger: 'blur' }
],
consignee: []
}
}
},
@ -440,24 +475,43 @@ export default {
updateFormRules() {
if (this.formData.scanType === 1) {
// 设置校验规则
this.$set(this.formRules.corpType, 0, {required: true, message: '请选择往来单位类型', trigger: 'blur'});
this.$set(this.formRules.unitTittle, 0, {required: true, message: '请输入往来类型标题', trigger: 'blur'});
this.$set(this.formRules.invCode, 0, {required: true, message: '请选择仓库', trigger: 'blur'});
// this.$set(this.formRules.corpType, 0, {required: true, message: '请选择往来单位类型', trigger: 'blur'});
// this.$set(this.formRules.unitTittle, 0, {required: true, message: '请输入往来类型标题', trigger: 'blur'});
// this.$set(this.formRules.invCode, 0, {required: true, message: '请选择仓库', trigger: 'blur'});
this.$set(this.formRules.consignee, 0, {required: true, message: '请选择收收货方', trigger: 'blur'});
} else {
this.$set(this.formRules.corpType, 0, {required: false});
this.$set(this.formRules.unitTittle, 0, {required: false});
this.$set(this.formRules.invCode, 0, {required: false});
// this.$set(this.formRules.corpType, 0, {required: false});
// this.$set(this.formRules.unitTittle, 0, {required: false});
this.$set(this.formRules.consignee, 0, {required: false});
}
}
,
changeCheckInsert() {
this.formData.shipper = ""
this.formData.consignee = ""
if (this.formData.scanType == 1) {
this.formData.checkInsert = 1
this.formData.shipper = 3
} else {
this.formData.consignee = 1
this.formData.shipper = 1
this.formData.checkInsert = 2
}
},
changeShipper(){
if (this.formData.shipper == 1) {
this.formData.consignee = 1
} else {
this.formData.consignee = 2
}
},
changeConsignee(){
if (this.formData.consignee == 1) {
this.formData.shipper = 1
} else if(this.formData.consignee == 2) {
this.formData.shipper = 2
}
}
,
},
watch: {
// 监听scanType的变化，以更新校验规则

24
src/views/basic/workplace/busTypeManage.vue
Unescape Escape View File

@ -84,6 +84,16 @@
<span>{{ isPopulars[scope.row.isPopular] }}</span>
</template>
</el-table-column>
<el-table-column label="发货方" prop="shipper" width="100">
<template slot-scope="scope">
<span>{{ shippers[scope.row.shipper] }}</span>
</template>
</el-table-column>
<el-table-column label="收货方" prop="consignee" width="100">
<template slot-scope="scope">
<span>{{ consignees[scope.row.consignee] }}</span>
</template>
</el-table-column>
<el-table-column label="业务顺号" prop="number" width="100"></el-table-column>
<el-table-column label="备注" prop="remark" width="100"></el-table-column>
<!-- <el-table-column label="往来单位类型" prop="corpType" width="100">-->
@ -307,6 +317,20 @@ export default {
1: '是',
0: '否',
},
shippers: {
1: '原始单据的发货方',
2: '原始单据的收货方',
3: '用户所属仓库',
},
consignees: {
1: '原始单据的收货方',
2: '原始单据的发货方',
3: '供应商',
4: '客户',
5: '特殊往来',
6: '内部科室',
7: '填写',
},
userList: [],
userLoading: false,
rowData: {

26
src/views/basic/workplace/workplaceManage.vue
Unescape Escape View File

@ -251,8 +251,18 @@
<span>{{ isPopulars[scope.row.isPopular] }}</span>
</template>
</el-table-column>
<el-table-column label="发货方" prop="shipper" width="100">
<template slot-scope="scope">
<span>{{ shippers[scope.row.shipper] }}</span>
</template>
</el-table-column>
<el-table-column label="收货方" prop="consignee" width="100">
<template slot-scope="scope">
<span>{{ consignees[scope.row.consignee] }}</span>
</template>
</el-table-column>
<el-table-column label="业务顺号" prop="number" width="100"></el-table-column>
<el-table-column label="备注:" prop="remark" width="100"></el-table-column>
<el-table-column label="备注" prop="remark" width="100"></el-table-column>
<!-- <el-table-column label="往来单位类型" prop="corpType" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ corpTypeMap[scope.row.corpType] }}</span>-->
@ -825,6 +835,20 @@ export default {
1: '是',
0: '否',
},
shippers: {
1: '原始单据的发货方',
2: '原始单据的收货方',
3: '用户所属仓库',
},
consignees: {
1: '原始单据的收货方',
2: '原始单据的发货方',
3: '供应商',
4: '客户',
5: '特殊往来',
6: '内部科室',
7: '填写',
},
userList: [],
userLoading: false,
rowData: {

2
src/views/collect/CollectOrderNew.vue
Unescape Escape View File

@ -10,7 +10,7 @@
:label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc == '搜索' ? '单据号/往来单位/来源系统' : item.columnDesc"
:placeholder="item.columnDesc == '关键字搜索' ? '单据号/往来单位/来源系统' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable

Write Preview
Loading…
Cancel
Save