This commit is contained in:
KangKang0928 2024-08-22 17:40:02 +08:00
parent 5d4ce160ea
commit 9931ae862f
4 changed files with 215 additions and 182 deletions

View File

@ -54,7 +54,7 @@
"jsencrypt": "3.0.0-rc.1", "jsencrypt": "3.0.0-rc.1",
"mockjs": "^1.1.0", "mockjs": "^1.1.0",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"obj-modal": "^1.2.0", "obj-modal": "^1.2.2",
"obj-table-plus": "^2.4.0", "obj-table-plus": "^2.4.0",
"quill": "1.3.7", "quill": "1.3.7",
"screenfull": "5.0.2", "screenfull": "5.0.2",

View File

@ -16,6 +16,7 @@ module.exports = {
"checkbox-config": { labelField: "", checkRowKeys: [10053, 23666] }, "checkbox-config": { labelField: "", checkRowKeys: [10053, 23666] },
"highlight-current-row": true, "highlight-current-row": true,
"show-overflow": true, "show-overflow": true,
"scroll-y":{enabled:true},
"tree-config": { childrenField: "children" }, "tree-config": { childrenField: "children" },
"header-cell-class-name":"obj-table-header-cell" "header-cell-class-name":"obj-table-header-cell"
}, },

View File

@ -177,7 +177,8 @@ export default {
// //
const openPreview = (str) => { const openPreview = (str) => {
this.$confirm(str, "详情", { this.$confirm(str, "详情", {
showCancel: false, showCancelButton: false,
confirmButtonText:"好的"
}); });
}; };
return ( return (

View File

@ -9,13 +9,6 @@
:modalData="modalData" :modalData="modalData"
:modalHandles="modalHandles" :modalHandles="modalHandles"
> >
<template slot="dialog__before">
<!-- <el-tabs v-model="currentPanel">
<el-tab-pane label="基础信息" name="基础信息"></el-tab-pane>
<el-tab-pane label="销售信息" name="销售信息"></el-tab-pane>
<el-tab-pane label="其他信息" name="其他信息"></el-tab-pane>
</el-tabs> -->
</template>
</obj-modal> </obj-modal>
</div> </div>
</template> </template>
@ -70,6 +63,16 @@ export default {
return "还有未保存的数据,确定离开此页吗?"; return "还有未保存的数据,确定离开此页吗?";
}; };
}, },
watch: {
"modalConfig.show"(newVal) {
if (newVal) {
//
setTimeout(() => {
this.$refs.modal.clearValidate();
});
}
},
},
methods: { methods: {
computedCityOptions() { computedCityOptions() {
function filterTree(tree, filterArray) { function filterTree(tree, filterArray) {
@ -217,8 +220,12 @@ export default {
render: () => { render: () => {
return ( return (
<el-radio-group v-model={this.modalData.calculateMethod}> <el-radio-group v-model={this.modalData.calculateMethod}>
<el-radio label="按重量">按重量</el-radio> <el-radio border label="按重量">
<el-radio label="按件数">按件数</el-radio> 按重量
</el-radio>
<el-radio border label="按件数">
按件数
</el-radio>
</el-radio-group> </el-radio-group>
); );
}, },
@ -236,8 +243,12 @@ export default {
render: () => { render: () => {
return ( return (
<el-radio-group v-model={this.modalData.fareConfig}> <el-radio-group v-model={this.modalData.fareConfig}>
<el-radio label="全国包邮">全国包邮</el-radio> <el-radio border label="全国包邮">
<el-radio label="自定义运费">自定义运费</el-radio> 全国包邮
</el-radio>
<el-radio border label="自定义运费">
自定义运费
</el-radio>
</el-radio-group> </el-radio-group>
); );
}, },
@ -436,6 +447,7 @@ export default {
}); });
}; };
return ( return (
<transition name="el-fade-in">
<div> <div>
<div class="d-flex no-warp justify-start items-center"> <div class="d-flex no-warp justify-start items-center">
<el-form-item <el-form-item
@ -477,7 +489,8 @@ export default {
> >
<el-input-number <el-input-number
v-model={ v-model={
this.modalData.shippingTemplatesRegionList[0].firstPrice this.modalData.shippingTemplatesRegionList[0]
.firstPrice
} }
min={0} min={0}
controls={false} controls={false}
@ -526,7 +539,8 @@ export default {
<el-input-number <el-input-number
min={0} min={0}
max={Number( max={Number(
this.modalData.shippingTemplatesRegionList[0].firstPrice this.modalData.shippingTemplatesRegionList[0]
.firstPrice
)} )}
controls={false} controls={false}
precision={2} precision={2}
@ -544,10 +558,10 @@ export default {
<obj-table-plus <obj-table-plus
tableProp={{ tableProp={{
"scroll-y": { "scroll-y": {
enabled: true, enabled: true
gt: 5,
}, },
"show-overflow": true, "show-overflow": true,
height:"auto"
}} }}
style="height:50vh;" style="height:50vh;"
enable-auto-query={false} enable-auto-query={false}
@ -567,6 +581,7 @@ export default {
</obj-table-plus> </obj-table-plus>
</div> </div>
</div> </div>
</transition>
); );
}, },
}, },
@ -583,17 +598,30 @@ export default {
width: "300px", width: "300px",
field: "cityCodes", field: "cityCodes",
type: "jsx", type: "jsx",
render: ({ row }) => { render: ({ row, $rowIndex }) => {
const change = (e) => { const change = (e) => {
console.log(e); console.log(e);
}; };
return ( return (
<el-form-item
label-width="0"
prop={
"shippingTemplatesConditionList." +
$rowIndex +
".cityCodes"
}
rules={{
required: true,
message: "请选择运送城市",
}}
>
<el-cascader <el-cascader
style="width:100%;" style="width:100%;"
v-model={row.cityCodes} v-model={row.cityCodes}
onChange={change} onChange={change}
options={this.$api.mer_admin.getCityOptions()} options={this.$api.mer_admin.getCityOptions()}
show-all-levels={false} show-all-levels={false}
placeholder="点击选择运送城市"
collapse-tags={true} collapse-tags={true}
props={{ props={{
props: { props: {
@ -607,6 +635,7 @@ export default {
clearable clearable
filterable filterable
></el-cascader> ></el-cascader>
</el-form-item>
); );
}, },
}, },
@ -727,6 +756,7 @@ export default {
}); });
}; };
return ( return (
<transition name="el-fade-in">
<obj-table-plus <obj-table-plus
class="mt-5" class="mt-5"
style="height:50vh;" style="height:50vh;"
@ -745,6 +775,7 @@ export default {
</el-button> </el-button>
</template> </template>
</obj-table-plus> </obj-table-plus>
</transition>
); );
}, },
}, },