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

Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

Browse Source
szh-new
张同海 3 months ago
parent 1dc9339076 a9f4a0f178
commit ea55a3795e
13 changed files with 9690 additions and 9519 deletions
Show Stats Download Patch File Download Diff File

4
package.json
Unescape Escape View File

@ -35,7 +35,7 @@
"dependencies": {
"@ant-design/colors": "^6.0.0",
"@ant-design/icons-vue": "^6.1.0",
"@handsontable/vue3": "^14.3.0",
"@handsontable/vue3": "^14.5.0",
"@iconify/iconify": "^2.2.1",
"@logicflow/core": "^1.1.13",
"@logicflow/extension": "^1.1.13",
@ -54,7 +54,7 @@
"echarts": "^5.3.2",
"element-plus": "^2.3.12",
"exceljs": "^4.3.0",
"handsontable": "^14.3.0",
"handsontable": "^14.5.0",
"intro.js": "^5.1.0",
"lodash-es": "^4.17.21",
"mitt": "^3.0.1",

6
src/components/Form/src/components/InputTextArea.vue
Unescape Escape View File

@ -133,10 +133,16 @@
tmp = tmp.replace(/\t/gi, ' ')
return tmp
}
const removeTrailingSpaces = (text) => {
return text.replace(/ \s*$/gm, '')
}
// 转换大写
const textareaBlur = () => {
if (cutList.length == 0 || !state.value) return
state.value = ToCDB(state.value).toUpperCase()
// 清除每行最后的空格
state.value = removeTrailingSpaces(state.value)
}
watch(
() => state.value,

9
src/design/ant/table.less
Unescape Escape View File

@ -180,13 +180,4 @@
.hot-red {
background-color: #f5222d;
}
.handsontableInputHolder {
.autocompleteEditor {
.ht_master {
.wtHolder {
min-height: 200px!important;
}
}
}
}
}

21
src/views/baseinfo/ctn/columns.tsx
Unescape Escape View File

@ -157,14 +157,12 @@ export const formSchema: FormSchema[] = [
field: 'teu',
label: 'TEU',
component: 'Input',
colProps: { span: 12 },
},
{
field: 'cnExplain',
label: '中文说明',
component: 'InputTextArea',
colProps: { span: 12 },
componentProps: {
rows: 2,
@ -174,20 +172,16 @@ export const formSchema: FormSchema[] = [
field: 'enExplain',
label: '英文说明',
component: 'InputTextArea',
colProps: { span: 12 },
componentProps: {
rows: 2,
},
},
{
field: 'note',
label: '备注',
component: 'InputTextArea',
field: 'orderNo',
label: '序号',
component: 'Input',
colProps: { span: 12 },
componentProps: {
rows: 2,
},
},
{
field: 'status',
@ -202,4 +196,13 @@ export const formSchema: FormSchema[] = [
],
},
},
{
field: 'note',
label: '备注',
component: 'InputTextArea',
colProps: { span: 24 },
componentProps: {
rows: 2,
},
},
]

2
src/views/baseinfo/goods/index.vue
Unescape Escape View File

@ -127,7 +127,7 @@
width: 60,
},
canResize: true,
resizeHeightOffset: 35,
resizeHeightOffset: 15,
immediate: true,
actionColumn: {
width: 80,

2
src/views/operation/seaexport/detail/index.vue
Unescape Escape View File

@ -59,7 +59,7 @@
<Divider type="horizontal" />
<!-- 货物信息 -->
<div>
<cargoInfo ref="RefcargoInfo"></cargoInfo>
<cargoInfo ref="RefcargoInfo" :details="bookingDetails"></cargoInfo>
<div class="line"></div>
<goodsTable
ref="RefgoodsTable"

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

@ -420,6 +420,12 @@ export const basicInfoFormSchema: FormSchema[] = [
// mailingInfo表单
export const mailingInfoFormSchemaL: FormSchema[] = [
{
label: '',
field: 'wtdwId',
component: 'Input',
show: false,
},
{
label: '',
field: 'shipperId',
@ -437,7 +443,7 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
componentProps: ({ formModel }) => {
return {
api: GetShippingBillTemplateSelectList,
params: { type: 2 },
params: { type: 2, id: formModel.wtdwId },
labelField: 'templateName',
valueField: 'templateName',
immediate: false,
@ -477,7 +483,7 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
componentProps: ({ formModel }) => {
return {
api: GetShippingBillTemplateSelectList,
params: { type: 1 },
params: { type: 1, id: formModel.wtdwId },
labelField: 'templateName',
valueField: 'templateName',
resultField: 'data',
@ -518,11 +524,12 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
componentProps: ({ formModel }) => {
return {
api: GetShippingBillTemplateSelectList,
params: { type: 3 },
params: { type: 3, id: formModel.wtdwId },
labelField: 'templateName',
valueField: 'templateName',
resultField: 'data',
immediate: false,
alwaysLoad: false,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
@ -2230,7 +2237,7 @@ export const otherInfoFormSchema: FormSchema[] = [
colProps: { span: 12 },
componentProps: ({ formModel }) => {
return {
api: GetSaleList,
api: GetCustomerServiceList,
labelField: 'pinYinCode',
valueField: 'userName',
showName: 'userName',

17
src/views/operation/seaexport/detail/modules/cargoInfo.vue
Unescape Escape View File

@ -73,7 +73,7 @@
<a-input-number v-model:value="item.floorPrice" size="small" :min="0" :max="999999999" placeholder="底价" />
</div>
<span v-show="model.ctnPriceInfo.length > 1" @click="deleteCtnPrice(model.ctnPriceInfo, index, item)" class="iconfont icon-del"></span>
<span v-show="model.ctnPriceInfo.length != 2" @click="model.ctnPriceInfo.push({})" class="iconfont icon-zengjiatianjiajiajian"></span>
<span v-show="model.ctnPriceInfo.length != 3" @click="model.ctnPriceInfo.push({})" class="iconfont icon-zengjiatianjiajiajian"></span>
</div>
</div>
</a-form-item-rest>
@ -81,16 +81,17 @@
</BasicForm>
</a-col>
</a-row>
<!-- <a-modal
<a-modal
:visible="visible"
:maskClosable="false"
title="品名维护"
width="80%"
:closable="false"
:closable="true"
@cancel="visible = false"
>
<GoodsTable source="modal"></GoodsTable>
</a-modal> -->
<template #footer></template>
</a-modal>
</div>
</template>
<script lang="ts" setup>
@ -141,7 +142,6 @@
}
// 切换货物标识
const toggleCargo = (v) => {
console.log(v)
cargoId.value = v
setFieldsValue3({
cargoId: v,
@ -347,7 +347,6 @@
strKind = data.kindPkgsName ? data.kindPkgsName : ''
enCapital = ToEn(num).toUpperCase() + ' ' + strKind + ' ONLY.'
}
console.log(strKind, 1)
} else {
const strNum: any = GetStringNum(SS)
strKind = SS.substring(strNum.length) ? SS.substring(strNum.length) : ''
@ -357,7 +356,6 @@
strKind = data.kindPkgsName ? data.kindPkgsName : ''
enCapital = 'SAY:' + ToEn(strNum).toUpperCase() + ' ' + strKind + ' ONLY.'
}
console.log(strKind, 2)
}
setFieldsValue4({ totalNo: enCapital })
} else {
@ -383,7 +381,7 @@
})
watch(
() => props.details,
async (nval) => {
(nval) => {
if (Object.keys(nval).length) {
setFieldsValue1({ marks: nval.marks, description: nval.description })
setFieldsValue2(nval)
@ -392,7 +390,7 @@
if (nval.cargoId) cargoId.value = nval.cargoId
}
},
{ deep: true },
{ deep: true }
)
const id = ref()
watch(
@ -463,6 +461,7 @@
}
// 选择箱型触发
const ctnChange = (v, item) => {
console.log(item)
optionsStore.getOptionsByCode('GetCtnSelectList').forEach(row => {
if (row.id == v) {
item.ctn = row.ctnName

2
src/views/operation/seaexport/detail/modules/goodsTable.vue
Unescape Escape View File

@ -2021,7 +2021,7 @@
.handsontable {
.wtHider {
max-height: 240px!important;
min-height: 130px;
min-height: 160px;
}
.htCheckboxRendererInput {
position: relative;

8
src/views/operation/seaexport/detail/modules/mailingInfo.vue
Unescape Escape View File

@ -6,17 +6,17 @@
<!-- 发货人 -->
<template #shipper="{ model }">
<span title="复制(copy)" class="iconfont icon-fuzhi3 copy-btn" style="font-size: 13px;" @click="copy(model.shipperContent, 'shipper')"></span>
<span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn" @click="save(model, 'shipper')"></span>
<span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn" @click="save(model, '2')"></span>
</template>
<!-- 收货人 -->
<template #consignee="{ model }">
<span title="复制(copy)" class="iconfont icon-fuzhi3 copy-btn" style="font-size: 13px;" @click="copy(model.consigneeContent, 'consignee')"></span>
<span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn" @click="save(model, 'consignee')"></span>
<span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn" @click="save(model, '1')"></span>
</template>
<!-- 通知人 -->
<template #notifyParty="{ model }">
<span title="复制(copy)" class="iconfont icon-fuzhi3 copy-btn" style="font-size: 13px;" @click="copy(model.notifyPartyContent, 'notifyParty')"></span>
<span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn" @click="save(model, 'notifyParty')"></span>
<span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn" @click="save(model, '3')"></span>
<span title="第二通知人" class="iconfont icon-zengjia copy-btn" @click="openContactModal"></span>
<a-modal
class="ds-modal-small"
@ -236,6 +236,7 @@
}).then(res => {
if (res.succeeded) {
createMessage.success('新增模版成功！')
updateSchemaL()
temFlag.value = false
}
})
@ -268,6 +269,7 @@
(nval) => {
if (nval) {
setFieldsValueL({
wtdwId: nval.customerId,
...nval
})
setFieldsValueR({

6
src/views/operation/seaexport/detail/modules/operationArea.vue
Unescape Escape View File

@ -1200,7 +1200,6 @@
// 订阅运踪
function traceSend() {
traceRef.value.validate().then(() => {
console.log(props.details.yardId)
if (traceForm.traceValue.includes('1') && !props.details.yardId) {
return createMessage.warning('请选择场站！')
}
@ -1211,10 +1210,11 @@
businessId: props.id,
mblno: props.details.mblno,
yard: traceForm.traceValue.includes('1') ? props.details.yard : '',
yardCode: traceForm.traceValue.includes('1') ? props.details.yardId : '',
yardId: traceForm.traceValue.includes('1') ? props.details.yardId : '',
carrierId: traceForm.traceValue.includes('2') ? props.details.carrierId : '',
carrier: traceForm.traceValue.includes('2') ? props.details.carrier : '',
isBook: !!traceForm.traceValue.includes('2')
isBook: !!traceForm.traceValue.includes('2'),
isFrontPort: !!traceForm.traceValue.includes('1')
}
tloading.value = true
SendTrace([query]).then((res) => {

1
src/views/operation/seaexport/detail/modules/otherInfo.vue
Unescape Escape View File

@ -138,6 +138,7 @@
}
})
emitter.on('customerBack', (v) => {
console.log(v)
if (v.saleOrgIdList && v.saleOrgIdList.length) v['saleOrgId'] = v.saleOrgIdList[0]
setFieldsValue({
...v

19116
yarn.lock
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save