|
@@ -14,11 +14,13 @@
|
|
|
@click="editHandle"
|
|
|
type="primary"
|
|
|
style="margin-right: 8px"
|
|
|
+ :loading="saveLoading"
|
|
|
>编 辑</el-button>
|
|
|
<el-dropdown style="margin-right: 8px;">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
+ :loading="saveLoading"
|
|
|
>
|
|
|
审核处理<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
</el-button>
|
|
@@ -34,6 +36,7 @@
|
|
|
<el-button
|
|
|
type="warning"
|
|
|
size="small"
|
|
|
+ :loading="saveLoading"
|
|
|
>
|
|
|
账单处理<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
</el-button>
|
|
@@ -52,6 +55,7 @@
|
|
|
<el-dropdown style="margin-right: 8px;">
|
|
|
<el-button
|
|
|
type="success"
|
|
|
+ :loading="saveLoading"
|
|
|
size="small"
|
|
|
>
|
|
|
业务处理<i class="el-icon-arrow-down el-icon--right"></i>
|
|
@@ -174,13 +178,13 @@
|
|
|
:disabled="item.disabled || detailData.seeDisabled || browse"
|
|
|
v-model.trim="form[item.prop]"
|
|
|
:label="1"
|
|
|
- >含</el-radio>
|
|
|
+ >是</el-radio>
|
|
|
<el-radio
|
|
|
size="small"
|
|
|
:disabled="item.disabled || detailData.seeDisabled || browse"
|
|
|
v-model.trim="form[item.prop]"
|
|
|
:label="0"
|
|
|
- >不含</el-radio>
|
|
|
+ >否</el-radio>
|
|
|
</span>
|
|
|
<el-select v-else-if="item.prop === 'chargeMember'"
|
|
|
v-model="form[item.prop]" placeholder="请选择"
|
|
@@ -188,7 +192,7 @@
|
|
|
size="small"
|
|
|
style="width: 100%;"
|
|
|
:disabled="detailData.seeDisabled || browse">
|
|
|
- <el-option v-for="(item,index) in userList" :key="index" :label="item.realName" :value="item.realName"></el-option>
|
|
|
+ <el-option v-for="(item,index) in userList" :key="index" :label="item.cname" :value="item.cname"></el-option>
|
|
|
</el-select>
|
|
|
<el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled || browse"></el-input>
|
|
|
<el-input type="age" v-else v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled || browse" clearable></el-input>
|
|
@@ -257,6 +261,7 @@
|
|
|
@resetColumn="resetColumn"
|
|
|
:summary-method="summaryMethod"
|
|
|
:table-loading="goodsLoading"
|
|
|
+ :key="index"
|
|
|
>
|
|
|
<template slot="headerSerial">
|
|
|
<span class="order_number">序号</span>
|
|
@@ -428,6 +433,13 @@
|
|
|
size="small"
|
|
|
@click="resetStock"
|
|
|
>库存刷新</el-button>
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ size="small"
|
|
|
+ @click="removeList"
|
|
|
+ :disabled="(selection.length == 0) || detailData.seeDisabled || browse"
|
|
|
+ >删除</el-button>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</basic-container>
|
|
@@ -768,7 +780,8 @@ import {
|
|
|
getlistBankBy,
|
|
|
getProfit,
|
|
|
pleaseCheck,
|
|
|
- repealCancel
|
|
|
+ repealCancel,
|
|
|
+ removeList
|
|
|
} from "@/api/basicData/configuration"
|
|
|
import {getList} from "@/api/basicData/commodityType";
|
|
|
import {getCorpDetail} from "@/api/maintenance/overpayment"
|
|
@@ -808,7 +821,7 @@ import {
|
|
|
IntegerFormat
|
|
|
} from "@/util/validate";
|
|
|
import financialAccount from "../../../components/finance/financialAccount";
|
|
|
-import { gainUser } from "@/api/basicData/customerInquiry";
|
|
|
+import { gainUser, getCharge } from "@/api/basicData/customerInquiry";
|
|
|
import check from "@/components/check/check";
|
|
|
import checkSchedule from "@/components/check/checkSchedule";
|
|
|
import { customerList as feeList } from "@/api/basicData/basicFeesDesc";
|
|
@@ -1439,12 +1452,12 @@ export default {
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
- label: '是否包含标签',
|
|
|
+ label: '是否收取标签费',
|
|
|
prop: 'isLabel',
|
|
|
type: 'radio',
|
|
|
},
|
|
|
{
|
|
|
- label: '是否包含运费',
|
|
|
+ label: '是否包运费',
|
|
|
prop: 'isFreight',
|
|
|
type: 'radio',
|
|
|
},
|
|
@@ -1586,6 +1599,7 @@ export default {
|
|
|
changeApproveVis: false, // 更换审批人弹窗
|
|
|
arrearsCheck: false, // 是否欠款发货审批
|
|
|
shopQualityDisable: false, //质量胎切换禁用
|
|
|
+ index: 0,
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
@@ -1607,7 +1621,6 @@ export default {
|
|
|
//初始化查询
|
|
|
async created() {
|
|
|
this.rowHeight = (window.innerHeight - 130) + 'px'
|
|
|
- // this.customerContact = customerContact
|
|
|
this.customerContact = await this.getColumnData(this.getColumnName(15), customerContact);
|
|
|
this.getWorkDicts("payment_term").then(res => {
|
|
|
this.paymentOption = res.data.data
|
|
@@ -1620,7 +1633,8 @@ export default {
|
|
|
});
|
|
|
// 获取角色
|
|
|
this.roleName = localStorage.getItem('roleName')
|
|
|
- if (this.roleName !== 'admin') {
|
|
|
+ console.log(this.roleName)
|
|
|
+ if (!this.roleName.includes('admin') && !this.roleName.includes('assistant')) {
|
|
|
this.contactInformation.column.forEach(item => {
|
|
|
if (item.prop == 'grossProfitRate' || item.prop == 'grossProfit') item.display = false
|
|
|
})
|
|
@@ -1641,9 +1655,9 @@ export default {
|
|
|
this.checkDisabled = true
|
|
|
this.batchNo = this.detailData.check.batchNo
|
|
|
}
|
|
|
- gainUser().then(res => {
|
|
|
- this.userList = res.data.data;
|
|
|
- });
|
|
|
+ // gainUser().then(res => {
|
|
|
+ // this.userList = res.data.data;
|
|
|
+ // });
|
|
|
feeList().then(res => {
|
|
|
this.feesOption = res.data.data.records
|
|
|
})
|
|
@@ -1659,6 +1673,13 @@ export default {
|
|
|
this.oldForm = Object.assign({}, this.form);
|
|
|
this.customerBuyFree.height = (window.innerHeight - 330) / 2;
|
|
|
this.optionPolicy.height = (window.innerHeight - 330) / 2;
|
|
|
+ this.customerContact.height = window.innerHeight - 240;
|
|
|
+ this.index++;
|
|
|
+ },
|
|
|
+ updated() {
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.crudContact.doLayout();
|
|
|
+ })
|
|
|
},
|
|
|
methods: {
|
|
|
getGoodsRow(event,row) {
|
|
@@ -2229,12 +2250,15 @@ export default {
|
|
|
}, [])
|
|
|
},
|
|
|
async getCorpRow(data) {
|
|
|
+ getCharge('KH', data.id).then(res => {
|
|
|
+ this.userList = res.data.data;
|
|
|
+ })
|
|
|
khDetail(data.id).then(res => {
|
|
|
if (res.data.data.adminProfiles) {
|
|
|
res.data.data.adminProfiles = res.data.data.adminProfiles.split(",");
|
|
|
let arr = [];
|
|
|
res.data.data.adminProfiles.forEach(e => {
|
|
|
- arr.push(this.userList.find(item => item.id == e).realName)
|
|
|
+ arr.push(this.userList.find(item => item.id == e).cname)
|
|
|
})
|
|
|
this.$set(this.form, 'chargeMember', arr[0])
|
|
|
}
|
|
@@ -2764,6 +2788,38 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ // 批量删除
|
|
|
+ removeList() {
|
|
|
+ const isId = this.selection.filter(item => item.id);
|
|
|
+ const noId = this.selection.filter(item => !item.id);
|
|
|
+ const ids = []
|
|
|
+ isId.forEach(e => ids.push(e.id));
|
|
|
+ this.$confirm("确定将选择数据删除?", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(() => {
|
|
|
+ this.goodsLoading = true;
|
|
|
+ if (ids.length > 0) {
|
|
|
+ removeList(ids.join(',')).then(res => {
|
|
|
+ this.selection.forEach(item => {
|
|
|
+ const index = this.goodsShowData.findIndex(e => e == item);
|
|
|
+ this.goodsShowData.splice(index, 1);
|
|
|
+ })
|
|
|
+ this.$message.success('删除成功')
|
|
|
+ }).finally(() => {
|
|
|
+ this.goodsLoading = false;
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.selection.forEach(item => {
|
|
|
+ const index = this.goodsShowData.findIndex(e => e == item);
|
|
|
+ this.goodsShowData.splice(index, 1);
|
|
|
+ })
|
|
|
+ this.$message.success('删除成功')
|
|
|
+ this.goodsLoading = false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
//新增费用明细保存触发
|
|
|
rowSaveProject(row, done, loading) {
|
|
|
// this.advantageProjectData.push(row)
|
|
@@ -2781,6 +2837,9 @@ export default {
|
|
|
//特价促销
|
|
|
if(res.data.data.specialItemList) {
|
|
|
this.dataPolicy = res.data.data.specialItemList
|
|
|
+ this.dataPolicy.forEach(item => {
|
|
|
+ this.$set(item, 'orderQuantity', 1);
|
|
|
+ })
|
|
|
} else {
|
|
|
this.dataPolicy = []
|
|
|
}
|