root
/
O1-mobile
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化1

Browse Source
ncszh
jwg 5 days ago
parent 0b9c50a19b
commit 17a31beca2
6 changed files with 77 additions and 44 deletions
Show Stats Download Patch File Download Diff File

30
src/components/MySupplierListCard/index.vue
Unescape Escape View File

@ -58,14 +58,12 @@
}} }}
</div> </div>
<div style="margin-top: 0.3rem; color: #333"> <div style="margin-top: 0.3rem; color: #333">
<div <div style="margin-top: 0.3rem; color: #333">
class="tags" 合同状态:
:style="`border: 1px solid ;color:#05A9FF;width: 6rem;`"
>
{{ {{
getDictDataLabel( getDictDataLabel(
DICT_TYPE.SR_CT_TYPE, DICT_TYPE.BS_EXPENSE_APPLY_STATUS,
itemData.contractType itemData.status
) || '未知' ) || '未知'
}} }}
</div> </div>
@ -127,13 +125,13 @@ export default {
props: { props: {
itemData: { itemData: {
required: true, required: true,
default: () => {}, default: () => {}
}, }
}, },
components: {}, components: {},
data() { data() {
return { return {
jumoStudentId: null, jumoStudentId: null
} }
}, },
activated() { activated() {
@ -145,7 +143,7 @@ export default {
computed: { computed: {
userInfo() { userInfo() {
return JSON.parse(window.localStorage.getItem('userInfo') || { dept: {} }) return JSON.parse(window.localStorage.getItem('userInfo') || { dept: {} })
}, }
}, },
methods: { methods: {
handleMerge(id, status) { handleMerge(id, status) {
@ -160,7 +158,7 @@ export default {
this.jumoStudentId = id this.jumoStudentId = id
this.$router.push({ this.$router.push({
path: '/supplier', path: '/supplier',
query: { id, type: 'edit' }, query: { id, type: 'edit' }
}) })
}, },
handleDel(id, status, creator) { handleDel(id, status, creator) {
@ -169,7 +167,7 @@ export default {
} }
Dialog.confirm({ Dialog.confirm({
title: '提示', title: '提示',
message: '你确定要删除吗?', message: '你确定要删除吗?'
}).then(() => { }).then(() => {
deleteSupplierContract(id).then(() => { deleteSupplierContract(id).then(() => {
this.$emit('onAllRefresh') this.$emit('onAllRefresh')
@ -182,18 +180,18 @@ export default {
this.jumoStudentId = id this.jumoStudentId = id
this.$router.push({ this.$router.push({
path: '/supplier', path: '/supplier',
query: { id, type: 'show' }, query: { id, type: 'show' }
}) })
}, },
dayjs, dayjs,
handleUpdataInfo() { handleUpdataInfo() {
this.jumoStudentId = null this.jumoStudentId = null
this.$emit('onUpdataInfo', this.itemData.id) this.$emit('onUpdataInfo', this.itemData.id)
}, }
}, }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '@/assets/style/common/newList.scss'; @import '@/assets/style/common/newList.scss';
</style> </style>

4
src/components/MysupplierMsgListCard/index.vue
Unescape Escape View File

@ -49,9 +49,9 @@
getDictDataLabel(DICT_TYPE.GYS_LEVEL, itemData.gradeGys) || '' getDictDataLabel(DICT_TYPE.GYS_LEVEL, itemData.gradeGys) || ''
}} }}
</div> </div>
<div style="margin-top: 0.3rem; color: #333"> <!-- <div style="margin-top: 0.3rem; color: #333">
采购员姓名：{{ itemData.purchaserName }} 采购员姓名：{{ itemData.purchaserName }}
</div> </div> -->
</div> </div>
</div> </div>
<div class="box-rt"> <div class="box-rt">

33
src/views/contract/myPayPlan/components/UserList.vue
Unescape Escape View File

@ -10,13 +10,25 @@
clearable clearable
input-align="left" input-align="left"
/> />
<van-field <RePick
v-model="queryForm.supplierId"
titleKey="companyName"
idKey="id"
title="供应商名称"
:name="`supplierId`"
label="供应商名称"
:list="spList"
isCell
clearable
input-align="left"
/>
<!-- <van-field
v-model="queryForm.companyName" v-model="queryForm.companyName"
placeholder="请输入" placeholder="请输入"
label="供应商名称" label="供应商名称"
clearable clearable
input-align="left" input-align="left"
/> /> -->
<div <div
style="display: flex; justify-content: space-around; margin-top: 10px" style="display: flex; justify-content: space-around; margin-top: 10px"
> >
@ -85,6 +97,7 @@
<script> <script>
import { getScrollTop } from '@/utils' import { getScrollTop } from '@/utils'
import { getMyPayPlanPage } from '@/api/bs/myPayPlan' import { getMyPayPlanPage } from '@/api/bs/myPayPlan'
import { getSupplierCompanyPage } from '@/api/bs/supplierMsg'
import { getDictDatas } from '@/utils/dict' import { getDictDatas } from '@/utils/dict'
import { mapState } from 'vuex' import { mapState } from 'vuex'
import dayjs from 'dayjs' import dayjs from 'dayjs'
@ -94,8 +107,8 @@ export default {
}, },
components: { components: {
RMList: () => import('@/components/ReComponents/RMList'), RMList: () => import('@/components/ReComponents/RMList'),
MyPayPlanListCard: () => import('@/components/MyPayPlanListCard') MyPayPlanListCard: () => import('@/components/MyPayPlanListCard'),
// RePick: () => import('@/components/ReComponents/RePick') RePick: () => import('@/components/ReComponents/RePick')
}, },
data() { data() {
return { return {
@ -112,7 +125,7 @@ export default {
// 搜索表单 // 搜索表单
queryForm: { queryForm: {
contractNumber: null, contractNumber: null,
companyName: null supplierId: null
} }
} }
}, },
@ -165,7 +178,7 @@ export default {
rstSearch() { rstSearch() {
this.queryForm = { this.queryForm = {
contractNumber: null, contractNumber: null,
companyName: null supplierId: null
} }
this.handleInit() this.handleInit()
}, },
@ -173,12 +186,10 @@ export default {
history.back() history.back()
}, },
handleInitSpList() { handleInitSpList() {
let queryParams = { getSupplierCompanyPage({
pageNo: 1, pageNo: 1,
pageSize: this.singlePageSize, pageSize: 1000
paymentType: 0 }).then((res) => {
}
getMyPayPlanPage(queryParams).then((res) => {
this.spList = res.data.list || [] this.spList = res.data.list || []
}) })
}, },

24
src/views/contract/supplier/index.vue
Unescape Escape View File

@ -778,6 +778,26 @@ export default {
}, },
handleChange(val, type) { handleChange(val, type) {
if (val) { if (val) {
listUser({
pageNo: 1,
pageSize: 100
}).then((response) => {
this.signatoryList = response.data.list || []
this.signatoryList = this.signatoryList.map((item) => {
return {
...item,
nickname: `${item.nickname} ${
item.userNumber ? `(${item.userNumber})` : ''
}`
}
})
})
} else {
this.signatoryList = []
this.$set(this.form, 'signatoryId', null)
}
/* if (val) {
listUser({ listUser({
pageNo: 1, pageNo: 1,
pageSize: 100, pageSize: 100,
@ -799,7 +819,7 @@ export default {
} else { } else {
this.signatoryList = [] this.signatoryList = []
this.$set(this.form, 'signatoryId', null) this.$set(this.form, 'signatoryId', null)
} } */
}, },
handleClear() { handleClear() {
this.$set(this.form, 'time', null) this.$set(this.form, 'time', null)
@ -973,7 +993,7 @@ export default {
? `${dayjs(this.form.endTime).format('YYYY/MM/DD')}` ? `${dayjs(this.form.endTime).format('YYYY/MM/DD')}`
: '' : ''
) )
res.data.fieldTemplateList.forEach(function (item) { res.data.fieldTemplateList?.forEach(function (item) {
if (item.type == 3) { if (item.type == 3) {
_this.$set( _this.$set(
item, item,

20
src/views/contract/supplierMsg/index.vue
Unescape Escape View File

@ -48,7 +48,7 @@
:disabled="disabled" :disabled="disabled"
label="供应商材料类别" label="供应商材料类别"
label-width="8rem" label-width="8rem"
:list="gysTypeList" :list="getDictDatas(DICT_TYPE.BS_MATERIAL_TYPE)"
isCell isCell
clearable clearable
/> />
@ -63,7 +63,7 @@
<RePick <RePick
v-model="form.companyType" v-model="form.companyType"
titleKey="label" titleKey="label"
idKey="id" idKey="vaule"
title="供应商类别" title="供应商类别"
:name="`companyType`" :name="`companyType`"
:disabled="disabled" :disabled="disabled"
@ -237,7 +237,10 @@ export default {
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 表单参数 // 表单参数
form: {} form: {
materialsType: '',
companyType: ''
}
} }
}, },
computed: { computed: {
@ -251,6 +254,7 @@ export default {
this.$loading(false) this.$loading(false)
this.handleInitForm() this.handleInitForm()
}) })
console.log(this.getDictDatas(this.DICT_TYPE.BS_ENTERPRISEL_TYPE), 'pppp')
}, },
methods: { methods: {
handleInitForm() { handleInitForm() {
@ -258,16 +262,22 @@ export default {
this.typeStr = type this.typeStr = type
if (id) { if (id) {
getSupplierCompany(id).then((res) => { getSupplierCompany(id).then((res) => {
res.data.materialsType = res.data.materialsType
? String(res.data.materialsType)
: ''
res.data.companyType = res.data.companyType
? String(res.data.companyType)
: ''
this.form = { this.form = {
// list: res.data.bankVos, // list: res.data.bankVos,
exitStatus: null, exitStatus: null,
...(res.data || {}), ...(res.data || {}),
logo: res.data.files logo: res.data.files
} }
console.log(this.form.materialsType, 'this.form.materialsType')
this.form.purchaserId = Number(this.form.purchaserId) this.form.purchaserId = Number(this.form.purchaserId)
this.form.gradeGys = String(this.form.gradeGys) this.form.gradeGys = String(this.form.gradeGys)
this.form.materialsType = String(this.form.materialsType) // this.form.companyType = String(this.form.companyType)
this.form.companyType = String(this.form.companyType)
this.form.validTime = this.form.validTime this.form.validTime = this.form.validTime
? `${dayjs(this.form.validTime).format('YYYY/MM/DD')}` ? `${dayjs(this.form.validTime).format('YYYY/MM/DD')}`
: '' : ''

10
src/views/home/index.vue
Unescape Escape View File

@ -203,14 +203,8 @@ export default {
], ],
title: '审批' title: '审批'
}, */ }, */
{ /* {
row: [ row: [
/* {
route: '/mySupplier',
title: '供应商合同审批',
icon: 'friends-o',
show: this.permission_btns.includes('procurement:supplierCt:list')
}, */
{ {
route: '/myCustom', route: '/myCustom',
title: '客户合同审批', title: '客户合同审批',
@ -243,7 +237,7 @@ export default {
} }
], ],
title: '对公' title: '对公'
}, }, */
/* { /* {
row: [ row: [
{ {

Write Preview
Loading…
Cancel
Save