angelo
/
web-base-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(global): 全局删除系统类型字段

This commit is contained in:
woody 2025-05-21 15:15:16 +08:00
parent 9470890aa5
commit 10883e2035
6 changed files with 171 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/Delivery/nowdelivery.vue
View File

@ -187,21 +187,7 @@
prop="secondDeliverVal"
:label="'二次发货'"
/>
<el-table-column
align="center"
prop="systemType"
:label="$t('系统类型')"
>
<template slot-scope="scope">
<div
v-for="item in systemTypes"
v-if="scope.row.systemType == item.value"
:key="item.value"
>
{{ item.label }}
</div>
</template>
</el-table-column>
<el-table-column
min-width="180px"
align="center"

15
src/components/Delivery/unhandeled.vue
View File

@ -195,21 +195,6 @@
prop="remark"
:label="'备注'"
/>
<el-table-column
align="center"
prop="systemType"
:label="$t('系统类型')"
>
<template slot-scope="scope">
<div
v-for="item in systemTypes"
v-if="scope.row.systemType == item.value"
:key="item.value"
>
{{ item.label }}
</div>
</template>
</el-table-column>
<el-table-column
min-width="150px"
align="center"

13
src/views/information/member/index.vue
View File

@ -408,18 +408,7 @@
</el-select>
</el-form-item>
</el-col> -->
<!-- <el-col :span="4">
<el-form-item :label="$t('系统类型')">
<el-select v-model="queryParams.systemType" clearable>
<el-option
v-for="item in systemTypes"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item :label="'创建日期'" prop="code">
<el-date-picker

29
src/views/logistics/commodity/ckspdd.vue
View File

@ -118,18 +118,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('系统类型')">
<el-select v-model="queryParams.systemType" clearable>
<el-option
v-for="item in systemTypes"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="支付方式" prop="payType">
<el-select
@ -452,21 +441,7 @@
prop="remark"
:label="'备注'"
/>
<el-table-column
align="center"
prop="systemType"
:label="$t('系统类型')"
>
<template slot-scope="scope">
<div
v-for="item in systemTypes"
v-if="scope.row.systemType == item.value"
:key="item.value"
>
{{ item.label }}
</div>
</template>
</el-table-column>
<el-table-column
align="center"
prop="creationTime"

26
src/views/logistics/delivery/index.vue
View File

@ -252,18 +252,7 @@
/>
</el-form-item>
</el-col>
<!-- <el-col :span="4">-->
<!-- <el-form-item :label="$t('系统类型')">-->
<!-- <el-select clearable v-model="queryParams.systemType">-->
<!-- <el-option-->
<!-- v-for="item in systemTypes"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item :label="'创建日期'" prop="code">
<el-date-picker
@ -568,18 +557,7 @@
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="4">-->
<!-- <el-form-item :label="$t('系统类型')">-->
<!-- <el-select clearable v-model="queryParams.systemType">-->
<!-- <el-option-->
<!-- v-for="item in systemTypes"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="4">
<el-form-item label="批次" prop="dayBatch">
<el-input

346
src/views/logistics/spInvoicing/index.vue
View File

@ -103,18 +103,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('系统类型')">
<el-select clearable v-model="queryParams.systemType">
<el-option
v-for="item in systemTypes"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'创建日期'" prop="teamCode">
<el-date-picker
@ -151,8 +140,7 @@
<el-col :span="4">
<div class="searchbox">
<el-button class="searchbtn" @click="getSearch">
{{ '搜索' }}</el-button
>
{{ '搜索' }}</el-button>
<el-button @click="reChongzhi"> {{ '重置' }}</el-button>
</div>
</el-col>
@ -168,16 +156,14 @@
<el-dropdown :hide-on-click="false" style="width: 120px">
<span class="el-dropdown-link kuang">
{{ '筛选字段'
}}<i class="el-icon-arrow-down el-icon--right"></i>
}}<i class="el-icon-arrow-down el-icon--right" />
</span>
<el-dropdown-menu slot="dropdown" style="">
<el-dropdown-item v-for="item in dataList" :key="item.id">
<el-checkbox
v-model="item.checked"
@change="getMenu($event, item.id)"
>{{ item.text }}</el-checkbox
></el-dropdown-item
>
>{{ item.text }}</el-checkbox></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@ -185,11 +171,11 @@
<div class="main">
<div class="maintable">
<el-table
:data="tableData"
ref="table"
v-loading="loading"
:data="tableData"
style="width: 100%"
height="660px"
ref="table"
:header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName"
:span-method="objectSpanMethod"
@ -198,146 +184,146 @@
<el-table-column type="selection" />
<el-table-column
v-if="dataList[1].checked == true"
align="center"
min-width="200px"
prop="orderCode"
:label="'订单编号'"
v-if="dataList[1].checked == true"
/>
<el-table-column
v-if="dataList[2].checked == true"
align="center"
prop="orderTypeVal"
:label="'订单类型'"
v-if="dataList[2].checked == true"
/>
<el-table-column
v-if="dataList[3].checked == true"
align="center"
min-width="120px"
prop="memberCode"
:label="'会员编号'"
v-if="dataList[3].checked == true"
/>
<el-table-column
v-if="dataList[4].checked == true"
align="center"
prop="memberName"
:label="'会员姓名'"
v-if="dataList[4].checked == true"
/>
<el-table-column
v-if="dataList[5].checked == true"
align="center"
min-width="120px"
prop="phone"
:label="'联系方式'"
v-if="dataList[5].checked == true"
/>
<el-table-column
v-if="dataList[6].checked == true"
align="center"
prop="recName"
:label="'收货人'"
v-if="dataList[6].checked == true"
/>
<el-table-column
v-if="dataList[7].checked == true"
align="center"
min-width="120px"
prop="recPhone"
:label="'收货电话'"
v-if="dataList[7].checked == true"
/>
<el-table-column
v-if="dataList[8].checked == true"
align="center"
prop="recProvinceName"
:label="'省'"
v-if="dataList[8].checked == true"
/>
<el-table-column
v-if="dataList[9].checked == true"
align="center"
prop="recCityName"
:label="'市'"
v-if="dataList[9].checked == true"
/>
<el-table-column
v-if="dataList[10].checked == true"
align="center"
prop="recCountyName"
:label="'区/县'"
v-if="dataList[10].checked == true"
/>
<el-table-column
v-if="dataList[11].checked == true"
align="center"
min-width="200px"
prop="recAddress"
:label="'详细地址'"
v-if="dataList[11].checked == true"
/>
<el-table-column
v-if="dataList[12].checked == true"
align="center"
min-width="100px"
prop="orderAmount"
:label="`${'订单金额'}(${isLocalSymbol()})`"
v-if="dataList[12].checked == true"
/>
<el-table-column
v-if="dataList[13].checked == true"
align="center"
min-width="100px"
prop="postage"
:label="'订单邮费'"
v-if="dataList[13].checked == true"
/>
<el-table-column
v-if="dataList[14].checked == true"
align="center"
min-width="100px"
prop="payMoney"
:label="$t('实付金额')"
v-if="dataList[14].checked == true"
/>
<el-table-column
v-if="dataList[15].checked == true"
align="center"
min-width="100px"
prop="orderAchieve"
:label="'订单业绩' + '($)'"
v-if="dataList[15].checked == true"
/>
<el-table-column
v-if="dataList[16].checked == true"
align="center"
prop="deliveryWayVal"
:label="'发货方式'"
min-width="100px"
v-if="dataList[16].checked == true"
/>
<el-table-column
v-if="dataList[17].checked == true"
min-width="100px"
align="center"
prop="payTypeVal"
:label="'支付方式'"
v-if="dataList[17].checked == true"
/>
<el-table-column
v-if="dataList[18].checked == true"
min-width="100px"
align="center"
prop="remark"
:label="'备注'"
v-if="dataList[18].checked == true"
/>
<el-table-column
v-if="dataList[19].checked == true"
min-width="100px"
align="center"
prop="remarks"
:label="'开票备注'"
v-if="dataList[19].checked == true"
/>
<el-table-column
v-if="dataList[20].checked == true"
min-width="150px"
align="center"
prop="creationTime"
:label="'创建日期'"
v-if="dataList[20].checked == true"
/>
<el-table-column
v-if="dataList[21].checked == true"
min-width="150px"
align="center"
prop="payTime"
:label="'支付日期'"
v-if="dataList[21].checked == true"
/>
<el-table-column
align="center"
@ -350,8 +336,8 @@
<template slot-scope="scope">
<div>
<el-button
type="text"
v-hasButtons="['CommodityAddRemarks']"
type="text"
size="small"
@click.native.prevent="addRemarks(scope.row, tableData)"
>
@ -383,18 +369,16 @@
<el-col :span="24">
<el-form-item :label="'开票备注'" prop="remarks">
<el-input
v-model="addreForm.remarks"
:rows="2"
type="textarea"
autosize
v-model="addreForm.remarks"
></el-input>
</el-form-item> </el-col
></el-row>
/>
</el-form-item> </el-col></el-row>
</el-form>
<div class="footer" style="text-align: center; margin-top: 20px">
<el-button @click="addReShow = false">
{{ '取消' }}</el-button
>
{{ '取消' }}</el-button>
<el-button type="primary" @click="sureAddRemarks('addreForm')">{{
'确定'
}}</el-button>
@ -405,157 +389,157 @@
</template>
<script>
import topBar from "@/components/topBar";
import * as log from "@/api/logistics";
import * as api from "@/api/site.js";
import { getRoleMenu } from "@/api/notice";
import topBar from '@/components/topBar'
import * as log from '@/api/logistics'
import * as api from '@/api/site.js'
import { getRoleMenu } from '@/api/notice'
export default {
name: "SpInvoicing",
name: 'SpInvoicing',
components: {
topBar,
topBar
},
data() {
return {
moren: "spInvoicing",
moren: 'spInvoicing',
allTxt: {},
dataList: [
{
id: 0,
text: '全选',
checked: false,
checked: false
},
{
id: 1,
prop: "orderCode",
prop: 'orderCode',
checked: true,
text: '订单编号',
text: '订单编号'
},
{
id: 2,
prop: "orderTypeVal",
prop: 'orderTypeVal',
checked: true,
text: '订单类型',
text: '订单类型'
},
{
id: 3,
prop: "memberCode",
prop: 'memberCode',
checked: true,
text: '会员编号',
text: '会员编号'
},
{
id: 4,
prop: "memberName",
prop: 'memberName',
checked: true,
text: '会员姓名',
text: '会员姓名'
},
{
id: 5,
prop: "phone",
prop: 'phone',
checked: true,
text: '联系方式',
text: '联系方式'
},
{
id: 6,
prop: "recName",
prop: 'recName',
checked: true,
text: '收货人',
text: '收货人'
},
{
id: 7,
prop: "recPhone",
prop: 'recPhone',
checked: true,
text: '收货电话',
text: '收货电话'
},
{
id: 8,
prop: "recProvinceName",
prop: 'recProvinceName',
checked: true,
text: '省',
text: '省'
},
{
id: 9,
prop: "recCityName",
prop: 'recCityName',
checked: true,
text: '市',
text: '市'
},
{
id: 10,
prop: "recCountyName",
prop: 'recCountyName',
checked: true,
text: '区/县',
text: '区/县'
},
{
id: 11,
prop: "recAddress",
prop: 'recAddress',
checked: true,
text: '详细地址',
text: '详细地址'
},
{
id: 12,
prop: "orderAmount",
prop: 'orderAmount',
checked: true,
text: '订单金额',
text: '订单金额'
},
{
id: 13,
prop: "postage",
prop: 'postage',
checked: true,
text: '订单邮费',
text: '订单邮费'
},
{
id: 14,
prop: "payMoney",
prop: 'payMoney',
checked: true,
text: this.$t("实付金额"),
text: this.$t('实付金额')
},
{
id: 15,
prop: "orderAchieve",
prop: 'orderAchieve',
checked: true,
text: '订单业绩',
text: '订单业绩'
},
{
id: 16,
prop: "deliveryWayVal",
prop: 'deliveryWayVal',
checked: true,
text: '发货方式',
text: '发货方式'
},
{
id: 17,
prop: "payTypeVal",
prop: 'payTypeVal',
checked: true,
text: '支付方式',
text: '支付方式'
},
{
id: 18,
prop: "remark",
prop: 'remark',
checked: true,
text: '备注',
text: '备注'
},
{
id: 19,
prop: "remarks",
prop: 'remarks',
checked: true,
text: '开票备注',
text: '开票备注'
},
{
id: 20,
prop: "creationTime",
prop: 'creationTime',
checked: true,
text: '创建日期',
text: '创建日期'
},
{
id: 21,
prop: "payTime",
prop: 'payTime',
checked: true,
text: '支付日期',
},
text: '支付日期'
}
],
topList: [
{
name: '订单开票',
path: "spInvoicing",
},
path: 'spInvoicing'
}
],
multipleSelection: [],
@ -563,23 +547,23 @@ export default {
pageNum: 1,
pageSize: 50,
shoppingAddress: [],
orderCode: "", // 订单编号
memberCode: "", // 会员编号
memberName: "", // 会员名称
phone: "", // 电话
orderType: "", // 订单类型
deliveryWay: "", // 发货方式
payType: "", // 支付方式
recName: "", // 收货人
recPhone: "", // 收货电话
recProvince: "",
recCity: "",
recCountry: "",
recAddress: "", // 详细地址
startCreateDate: "",
endCreateDate: "",
startPayDate: "",
endPayDate: "",
orderCode: '', // 订单编号
memberCode: '', // 会员编号
memberName: '', // 会员名称
phone: '', // 电话
orderType: '', // 订单类型
deliveryWay: '', // 发货方式
payType: '', // 支付方式
recName: '', // 收货人
recPhone: '', // 收货电话
recProvince: '',
recCity: '',
recCountry: '',
recAddress: '', // 详细地址
startCreateDate: '',
endCreateDate: '',
startPayDate: '',
endPayDate: ''
},
loading: false,
tableData: [],
@ -587,44 +571,44 @@ export default {
isActive: false,
areaData: [],
regionParams: {
label: "name",
value: "id",
children: "children",
expandTrigger: "hover",
label: 'name',
value: 'id',
children: 'children',
expandTrigger: 'hover'
},
typeList: [],
fhwayList: [],
paywayList: [],
total: 0,
flag: false,
pkOrder: "",
pkOrder: '',
addReShow: false,
addreForm: {
remarks: "",
},
};
remarks: ''
}
}
},
created() {
this.getData();
this.getSearch();
this.getUserRole();
this.getData()
this.getSearch()
this.getUserRole()
},
methods: {
getMenu(e, id) {
if (e && id == 0) {
this.dataList.forEach((item) => {
this.$set(item, "checked", true);
});
this.$set(item, 'checked', true)
})
} else if (!e && id == 0) {
this.dataList.forEach((item) => {
this.$set(item, "checked", false);
});
this.$set(item, 'checked', false)
})
}
},
//开票备注
// 开票备注
addRemarks(row, data) {
this.pkOrder = row.pkOrder;
this.addReShow = true;
this.pkOrder = row.pkOrder
this.addReShow = true
},
sureAddRemarks(formName) {
this.$refs[formName].validate((valid) => {
@ -632,82 +616,82 @@ export default {
log
.updateOrderRemarks({
pkOrder: this.pkOrder,
remarks: this.addreForm.remarks,
remarks: this.addreForm.remarks
})
.then((res) => {
if (res.code == 200) {
this.$message({
message: res.msg,
type: "success",
});
this.addReShow = false;
this.getSearch();
type: 'success'
})
this.addReShow = false
this.getSearch()
}
});
})
}
});
})
},
getUserRole() {
getRoleMenu("Commodity").then((res) => {
let obj = {};
getRoleMenu('Commodity').then((res) => {
const obj = {}
res.data.forEach((item) => {
obj[item] = 1;
});
this.allTxt = obj;
console.log(this.allTxt, "all");
obj[item] = 1
})
this.allTxt = obj
console.log(this.allTxt, 'all')
// this.$nextTick(() => {
// this.$refs.table.doLayout();
// });
});
})
},
getData() {
api.areaList().then((res) => {
this.areaData = res.data;
});
this.areaData = res.data
})
log.getOrderType().then((res) => {
this.typeList = res.data;
});
this.typeList = res.data
})
log.getDeliveryList().then((res) => {
this.fhwayList = res.data;
});
this.fhwayList = res.data
})
log.getOrderPayType().then((res) => {
this.paywayList = res.data;
});
this.paywayList = res.data
})
},
// 展开折叠
changeActive() {
this.isActive = !this.isActive;
this.isActive = !this.isActive
},
changeCjsj(val) {
this.queryParams.startCreateDate = val[0];
this.queryParams.endCreateDate = val[1];
this.queryParams.startCreateDate = val[0]
this.queryParams.endCreateDate = val[1]
},
changeZfsj(val) {
this.queryParams.startPayDate = val[0];
this.queryParams.endPayDate = val[1];
this.queryParams.startPayDate = val[0]
this.queryParams.endPayDate = val[1]
},
getSearch() {
this.loading = true;
this.queryParams.recProvince = this.queryParams.shoppingAddress[0];
this.queryParams.recCity = this.queryParams.shoppingAddress[1];
this.queryParams.recCountry = this.queryParams.shoppingAddress[2];
this.loading = true
this.queryParams.recProvince = this.queryParams.shoppingAddress[0]
this.queryParams.recCity = this.queryParams.shoppingAddress[1]
this.queryParams.recCountry = this.queryParams.shoppingAddress[2]
log.getOrderLists(this.queryParams).then((res) => {
this.tableData = res.rows;
this.total = res.total;
this.loading = false;
});
this.tableData = res.rows
this.total = res.total
this.loading = false
})
},
// 重置
reChongzhi() {
this.queryParams = {
pageNum: 1,
pageSize: 50,
shoppingAddress: [],
};
this.getSearch();
shoppingAddress: []
}
this.getSearch()
},
handleSelectionChange(val) {
this.multipleSelection = val;
this.multipleSelection = val
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
// if (columnIndex === 0) {
@ -726,14 +710,14 @@ export default {
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
return "warning-row";
return 'warning-row'
} else if (rowIndex % 2 == 0) {
return "success-row";
return 'success-row'
}
return "";
},
},
};
return ''
}
}
}
</script>
<style lang="scss" scoped>