Merge remote-tracking branch 'origin/xiaozy_产品列表'

pull/5/head^2
xiaozhiyong 2 years ago
commit c7a585e69a
  1. 2
      src/components/autocomplete/index.vue
  2. 14
      src/views/customerManagement/companyManagement/components/bank.vue
  3. 24
      src/views/customerManagement/companyManagement/index.vue
  4. 8
      src/views/financialCenter/enterpriseRecharge/index.vue
  5. 70
      src/views/product/index.vue

@ -30,7 +30,7 @@
<template>
<el-option
v-for="(item, index) in list"
:key="item.id + index"
:key="index"
:label="item[config.labelKey]"
:value="item[config.valueKey]"
>

@ -85,13 +85,15 @@
<el-link type="primary" :underline="false" @click="complete(row)"
>完成
</el-link>
<el-link
type="primary"
:underline="false"
<el-popconfirm
v-if="tableData.length > 1"
@click="deleteRow($index, row)"
>删除
</el-link>
title="确定删除吗?"
@confirm="deleteRow($index, row)"
>
<el-link slot="reference" type="primary" :underline="false"
>删除
</el-link>
</el-popconfirm>
</template>
</el-table-column>
</el-table>

@ -62,7 +62,7 @@
clearable
>
<el-option
v-for="(item, index) in companyNatureTypeEnum"
v-for="(item, index) in companyTypeEnum"
:key="index"
:label="item.label"
:value="item.value"
@ -521,6 +521,28 @@ export default {
total: 0,
params: {},
},
companyTypeEnum: [
{
label: "柴油账户",
value: "0",
},
{
label: "汽油账户",
value: "1",
},
{
label: "LNG账户",
value: "2",
},
{
label: "尿素账户",
value: "3",
},
{
label: "油批账户",
value: "4",
},
],
auditMarkEnum: [
{
label: "未提交",

@ -355,13 +355,7 @@ export default {
examine: false,
},
accountStatusEnum: accountStatusEnum,
rechargeTypeEnum: [
{
label: "圈回",
value: "TURN",
},
...rechargeTypeEnum,
],
rechargeTypeEnum: rechargeTypeEnum,
rechargeStatusEnum: rechargeStatusEnum,
auditMarkEnum: [
{

@ -99,17 +99,17 @@
</el-table-column>
<el-table-column prop="refineryLevel" label="成本价" width="70">
<template slot-scope="{ row }">
{{ row.floorPrice|toNumberFixed }}/{{ row.measurement|toNumberFixed }}
{{ row.floorPrice | toNumberFixed }}/{{ row.measurement }}
</template>
</el-table-column>
<el-table-column prop="refineryLevel" label="企业销售价" width="100">
<template slot-scope="{ row }">
{{ row.salePrice2company|toNumberFixed }}/{{ row.measurement|toNumberFixed }}
{{ row.salePrice2company | toNumberFixed }}/{{ row.measurement }}
</template>
</el-table-column>
<el-table-column prop="refineryLevel" label="个人销售价" width="100">
<template slot-scope="{ row }">
{{ row.salePrice2personal|toNumberFixed }}/{{ row.measurement|toNumberFixed }}
{{ row.salePrice2personal | toNumberFixed }}/{{ row.measurement }}
</template>
</el-table-column>
<el-table-column label="时间" width="235">
@ -142,7 +142,12 @@
<el-dropdown-item command="record">调价记录</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span v-show="row.enableMark=='ENABLE'" class="el-dropdown-link" @click="updateCreate(row)">下单</span>
<span
v-show="row.enableMark == 'ENABLE'"
class="el-dropdown-link"
@click="updateCreate(row)"
>下单</span
>
<el-dropdown
@command="
(val) => {
@ -232,12 +237,14 @@ export default {
autocomplete,
generalDetails,
},
filters:{
toNumberFixed(val){
if(val){
return Number(val).toFixed(2)
}else{return '暂无'}
}
filters: {
toNumberFixed(val) {
if (val) {
return Number(val).toFixed(2);
} else {
return "暂无";
}
},
},
data() {
return {
@ -347,19 +354,19 @@ export default {
//
createOrder(row) {
this.controlWindows.addInfo = {}
this.controlWindows.addInfo = {};
this.controlWindows.addInfo.title = "创建订单";
this.controlWindows.create = true;
console.log(this.controlWindows,'新增')
console.log(this.controlWindows, "新增");
},
//
updateCreate(row){
updateCreate(row) {
this.controlWindows.addInfo = {
title: "创建订单",
...row,
};
this.controlWindows.create = true;
console.log('修改')
title: "创建订单",
...row,
};
this.controlWindows.create = true;
console.log("修改");
},
//
detail(row) {
@ -390,17 +397,32 @@ export default {
},
//
switchTrigger(val, row) {
row.enableMark = row.enableMark;
row.enableMark = val === "ENABLE" ? "DISENABLE" : "ENABLE";
// return;
serve
.update({
id: row.id,
enableMark: val,
})
.updateBatchEnable([
{
id: row.id,
enableMark: val,
},
])
.then((res) => {
if (res.code === 20000) {
this.getByPage();
} else this.$message.error(res.msg);
}
// this.$message.success(res.msg);
// this.closeWindow();
});
// serve
// .update({
// id: row.id,
// enableMark: val,
// })
// .then((res) => {
// if (res.code === 20000) {
// this.getByPage();
// } else this.$message.error(res.msg);
// });
},
//
batchHandler() {

Loading…
Cancel
Save