lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11.15禅道

Browse Source
zth
lijingjia 2 weeks ago
parent 6088fd5361
commit a02b4d95cf
7 changed files with 60 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
package.json
Unescape Escape View File

@ -83,7 +83,7 @@
"vue-types": "^4.1.1", "vue-types": "^4.1.1",
"vuedraggable": "^4.1.0", "vuedraggable": "^4.1.0",
"vuex": "^4.1.0", "vuex": "^4.1.0",
"vxe-table": "^4.5.21", "vxe-table": "^4.8.14",
"vxe-table-plugin-export-xlsx": "^3.0.4", "vxe-table-plugin-export-xlsx": "^3.0.4",
"xe-utils": "^3.5.7", "xe-utils": "^3.5.7",
"xlsx": "^0.18.5", "xlsx": "^0.18.5",

22
src/components/CostEntry/actionBar.vue
Unescape Escape View File

@ -546,6 +546,28 @@
} }
// 批量修改结算对象 // 批量修改结算对象
const editCustomer = () => { const editCustomer = () => {
let flag = false
const arr = []
props.data.forEach((item, index) => {
if (item?.selected) {
flag = true
if (/^1|2|6$/.test(item.feeStatus)) {
arr.push(index)
}
}
})
for (let i = 0; i < props.data.length; i++) {
if (props.data[i]?.selected) {
flag = true
if (!(/^1|2|6$/.test(item.feeStatus))) {
return createMessage.warning('仅支持修改录入、提交审核、提交驳回状态的费用结算对象！')
} else {
arr.push(i)
}
}
}
if (!flag) return createMessage.warning('请勾选要修改结算对象的费用！')
} }
// 整票提交 // 整票提交

2
src/views/baseinfo/infoclient/custTemplateDetail/columns.tsx
Unescape Escape View File

@ -227,7 +227,7 @@ export const formSchema: FormSchema[] = [
// required: true, // required: true,
// colProps: { span: 12 }, // colProps: { span: 12 },
// componentProps: ({ formActionType }) => { // componentProps: ({ formActionType }) => {
// getDictOption('djy_cust_prop').then((data) => { // getDictOption('infoclient-ArrclientTag').then((data) => {
// customTypeDict.value = data // customTypeDict.value = data
// }) // })
// return { // return {

8
src/views/operation/paidApply/detail/components/businessTable.vue
Unescape Escape View File

@ -148,8 +148,8 @@
item['unBilledUSD'] = numberThousandFormat(item['unBilledUSD'], 2, false) item['unBilledUSD'] = numberThousandFormat(item['unBilledUSD'], 2, false)
item['unreceivedTotal'] = numberThousandFormat(item['unreceivedTotal'], 2, false) item['unreceivedTotal'] = numberThousandFormat(item['unreceivedTotal'], 2, false)
}) })
if (res?.data?.length) state.historyRowKeys = [res.data[0].id + 0] // if (res?.data?.length) state.historyRowKeys = [res.data[0].id + 0]
setSelectedRows([res.data[0]]) // setSelectedRows([res.data[0]])
return new Promise((resolve) => { return new Promise((resolve) => {
resolve({ data: [...res.data], total: res.count }) resolve({ data: [...res.data], total: res.count })
}) })
@ -528,10 +528,10 @@
dynamicDisabled: true dynamicDisabled: true
}) })
//初始化 //初始化
reload() // reload()
} else { } else {
//初始化 //初始化
reload() // reload()
} }
}) })
defineExpose({ defineExpose({

2
src/views/operation/seaexport/detail/modules/baseInfo.tsx
Unescape Escape View File

@ -2995,7 +2995,7 @@ export const otherInfoFormSchema: FormSchema[] = [
// 客户类别下拉框数据 // 客户类别下拉框数据
const customTypeDict = ref([]) const customTypeDict = ref([])
const personList = ref([]) const personList = ref([])
getDictOption('djy_cust_prop').then((data) => { getDictOption('infoclient-ArrclientTag').then((data) => {
customTypeDict.value = data customTypeDict.value = data
}) })
// 关系人表单 // 关系人表单

4
src/views/system/CodeDataRuleTemplate/feeField.vue
Unescape Escape View File

@ -390,7 +390,7 @@
// data: 'customerTypeText', // data: 'customerTypeText',
// type: 'dropdown', // type: 'dropdown',
// source: async (query, process) => { // source: async (query, process) => {
// const results = await getDictOption('djy_cust_prop') // const results = await getDictOption('infoclient-ArrclientTag')
// const dict = results.map((item) => { // const dict = results.map((item) => {
// return item.value + '-' + item.name // return item.value + '-' + item.name
// }) // })
@ -651,7 +651,7 @@
// // 修改客户类别 // // 修改客户类别
// if (changes[0][1] === 'customerTypeText') { // if (changes[0][1] === 'customerTypeText') {
// getDictOption('djy_cust_prop').then((res) => { // getDictOption('infoclient-ArrclientTag').then((res) => {
// const item = res.filter((item) => { // const item = res.filter((item) => {
// return changes[0][3].includes(item.name) // return changes[0][3].includes(item.name)
// }) // })

44
yarn.lock
Unescape Escape View File

@ -2577,6 +2577,14 @@
dependencies: dependencies:
"vue-demi" "*" "vue-demi" "*"
"@vxe-ui/core@^4.0.16":
"integrity" "sha512-7d8485RYAv3tgr5+ckz5iK+Tt3yPjcXBaWcRdxRrxnDJNYVq6A4jAFT+Z9eHoFxqx60ASTOVCqnS8Tav/oPutA=="
"resolved" "https://registry.npmjs.org/@vxe-ui/core/-/core-4.0.16.tgz"
"version" "4.0.16"
dependencies:
"dom-zindex" "^1.0.6"
"xe-utils" "^3.5.31"
"@windicss/config@1.8.6": "@windicss/config@1.8.6":
"integrity" "sha512-WVS41qUJtd44g2iWzTAE8tpgk8gD0yAr1RwwaWi7FAECKm3LVNMLOoToum9R/QKFE2n64EUVJpIvSUNby8rlhg==" "integrity" "sha512-WVS41qUJtd44g2iWzTAE8tpgk8gD0yAr1RwwaWi7FAECKm3LVNMLOoToum9R/QKFE2n64EUVJpIvSUNby8rlhg=="
"resolved" "https://registry.npmmirror.com/@windicss/config/-/config-1.8.6.tgz" "resolved" "https://registry.npmmirror.com/@windicss/config/-/config-1.8.6.tgz"
@ -4415,10 +4423,10 @@
"domelementtype" "^2.0.1" "domelementtype" "^2.0.1"
"entities" "^2.0.0" "entities" "^2.0.0"
"dom-zindex@^1.0.1": "dom-zindex@^1.0.6":
"integrity" "sha512-M/MERVDZ8hguvjl6MAlLWSLYLS7PzEyXaTb5gEeJ+SF+e9iUC0sdvlzqe91MMDHBoy+nqw7wKcUOrDSyvMCrRg==" "integrity" "sha512-FKWIhiU96bi3xpP9ewRMgANsoVmMUBnMnmpCT6dPMZOunVYJQmJhSRruoI0XSPoHeIif3kyEuiHbFrOJwEJaEA=="
"resolved" "https://registry.npmjs.org/dom-zindex/-/dom-zindex-1.0.1.tgz" "resolved" "https://registry.npmjs.org/dom-zindex/-/dom-zindex-1.0.6.tgz"
"version" "1.0.1" "version" "1.0.6"
"domelementtype@^1.3.1", "domelementtype@1": "domelementtype@^1.3.1", "domelementtype@1":
"integrity" "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" "integrity" "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
@ -10879,7 +10887,7 @@
dependencies: dependencies:
"is-plain-object" "5.0.0" "is-plain-object" "5.0.0"
"vue@^2.0.0 || ^3.0.0", "vue@^2.6.0 || ^3.2.0", "vue@^2.6.14 || ^3.2.0", "vue@^3.0.0", "vue@^3.0.0-0 || ^2.6.0", "vue@^3.0.1", "vue@^3.2.0", "vue@^3.2.10", "vue@^3.2.22", "vue@^3.2.25", "vue@^3.2.28", "vue@^3.2.34", "vue@>=2.7 || >=3", "vue@>=3.0.0", "vue@>=3.0.3", "vue@>=3.2.0", "vue@2 || 3", "vue@3.3.4": "vue@^2.0.0 || ^3.0.0", "vue@^2.6.0 || ^3.2.0", "vue@^2.6.14 || ^3.2.0", "vue@^3.0.0", "vue@^3.0.0-0 || ^2.6.0", "vue@^3.0.1", "vue@^3.2.0", "vue@^3.2.10", "vue@^3.2.22", "vue@^3.2.25", "vue@^3.2.34", "vue@>=2.7 || >=3", "vue@>=3.0.0", "vue@>=3.0.3", "vue@>=3.2.0", "vue@2 || 3", "vue@3.3.4":
"integrity" "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==" "integrity" "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw=="
"resolved" "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz" "resolved" "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz"
"version" "3.3.4" "version" "3.3.4"
@ -10912,18 +10920,24 @@
dependencies: dependencies:
"@vue/devtools-api" "^6.0.0-beta.11" "@vue/devtools-api" "^6.0.0-beta.11"
"vxe-pc-ui@^4.2.53":
"integrity" "sha512-f03f5rcLYmMtiaTt1qYDO6zm3YdqB1Q83IK71Ex82tnM1aFcXyhMWqB28RnbeGuiyBEFfO0Thgml6guNB0gfIQ=="
"resolved" "https://registry.npmjs.org/vxe-pc-ui/-/vxe-pc-ui-4.2.53.tgz"
"version" "4.2.53"
dependencies:
"@vxe-ui/core" "^4.0.16"
"vxe-table-plugin-export-xlsx@^3.0.4": "vxe-table-plugin-export-xlsx@^3.0.4":
"integrity" "sha512-Og/NbXRIb+BS6sJ48oDNVrZnlkcpaCd/zS8JBAZjHLgioWr1Xoob6FEpaeXBebGPPgTumZNUrrBO57JhhYAerA==" "integrity" "sha512-Og/NbXRIb+BS6sJ48oDNVrZnlkcpaCd/zS8JBAZjHLgioWr1Xoob6FEpaeXBebGPPgTumZNUrrBO57JhhYAerA=="
"resolved" "https://registry.npmjs.org/vxe-table-plugin-export-xlsx/-/vxe-table-plugin-export-xlsx-3.0.4.tgz" "resolved" "https://registry.npmjs.org/vxe-table-plugin-export-xlsx/-/vxe-table-plugin-export-xlsx-3.0.4.tgz"
"version" "3.0.4" "version" "3.0.4"
"vxe-table@^4.0.27", "vxe-table@^4.5.21": "vxe-table@^4.0.27", "vxe-table@^4.8.14":
"integrity" "sha512-bUmn6KSL9FE0Dfrsw7VjJAS8tratL1OBIDVzt1djgijU6WAwyp3697POkMR9TZ4HHvV6uGDSCuGzUUXGFodvVQ==" "integrity" "sha512-sw6HbjSy3qJ3yHbOGPfvWSbdXnPd/fxFqk/ydZrqPHr2lnd3LJamZEmrqBegpYJ1Wm6WC/BijZHRxslOYwPeyA=="
"resolved" "https://registry.npmjs.org/vxe-table/-/vxe-table-4.5.22.tgz" "resolved" "https://registry.npmjs.org/vxe-table/-/vxe-table-4.8.15.tgz"
"version" "4.5.22" "version" "4.8.15"
dependencies: dependencies:
"dom-zindex" "^1.0.1" "vxe-pc-ui" "^4.2.53"
"xe-utils" "^3.5.24"
"w3c-xmlserializer@^5.0.0": "w3c-xmlserializer@^5.0.0":
"integrity" "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==" "integrity" "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA=="
@ -11259,10 +11273,10 @@
"resolved" "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz" "resolved" "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz"
"version" "8.16.0" "version" "8.16.0"
"xe-utils@^3.5.24", "xe-utils@^3.5.7": "xe-utils@^3.5.31", "xe-utils@^3.5.7":
"integrity" "sha512-22TRz/qaRNcPTQi2SHNU19FqHogctQvVkFu09/smPdbkwOXNS9tUZ4EwA2bJ7HFkdWtnELrxFpCt58LS2HCojA==" "integrity" "sha512-oS4yv8qktvlE0wc9yYkitDidEmThc5qN0UTRvKCvrWnejxbTyIxbwfrdZmPKdKGZtB+/U8cEAMFywLJjHtD11A=="
"resolved" "https://registry.npmjs.org/xe-utils/-/xe-utils-3.5.24.tgz" "resolved" "https://registry.npmjs.org/xe-utils/-/xe-utils-3.5.31.tgz"
"version" "3.5.24" "version" "3.5.31"
"xlsx@^0.18.5": "xlsx@^0.18.5":
"integrity" "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==" "integrity" "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ=="

Write Preview
Loading…
Cancel
Save