|
|
@@ -7,14 +7,14 @@
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<div class="add-customer-btn">
|
|
|
- <el-button class="el-button--small-yh" :disabled="isEditButton" style="margin-left: 6px;"
|
|
|
+ <el-button class="el-button--small-yh" style="margin-left: 6px;"
|
|
|
type="primary" size="small" v-if="editButton" @click="confirmEditing">编 辑
|
|
|
</el-button>
|
|
|
<el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
|
|
|
:disabled="isSaveBtn" @click="editCustomer">保 存
|
|
|
</el-button>
|
|
|
<el-button class="el-button--small-yh" style="margin-left: 6px;" :type="buttonColor" size="small"
|
|
|
- :disabled="isDisabledTask || form.status !== '待确认' && form.status !== '待发货'" @click="generateOutbound">
|
|
|
+ :disabled="isDisabledTask || form.status !== '待确认' && form.status !== '待收货'" @click="generateOutbound">
|
|
|
{{ buttonText }}
|
|
|
</el-button>
|
|
|
<el-dropdown style="padding: 0 6px;line-height: 0">
|
|
|
@@ -348,26 +348,33 @@ export default {
|
|
|
dicUrlWithCustomId: '',
|
|
|
sharedCompanyId: 0,
|
|
|
isAddBtn: true,
|
|
|
- isSaveBtn: false,
|
|
|
- viewDisabled: false,
|
|
|
+
|
|
|
+ viewDisabled: false, // 请核和大审批按钮是否禁用
|
|
|
+ isApplySettlement: false, // 请核数据按钮是否禁用
|
|
|
+ isRevocationRequest: true, // 撤销审核
|
|
|
+ isExamineBtn: true, // 审批
|
|
|
isAdd: false,
|
|
|
- editButton: true,
|
|
|
- isEditButton: false,
|
|
|
+ editButton: true, // 编辑按钮和保存按钮的显示隐藏
|
|
|
+ isSaveBtn: false, // 保存的禁用
|
|
|
+ isDisabledTask: false, // 生成，撤销任务按钮是否禁用
|
|
|
+ buttonText: '生成任务',
|
|
|
+ buttonColor: 'success', // 初始颜色为success
|
|
|
+ isContacts: false, // 基础信息插槽禁用
|
|
|
+
|
|
|
goods: [],
|
|
|
isDisabled: false,
|
|
|
- isDisabledTask: false,
|
|
|
+
|
|
|
//地址
|
|
|
recAddressOption: [],
|
|
|
contactsOption: [],
|
|
|
- isContacts: false,
|
|
|
+
|
|
|
checkData: {},
|
|
|
- buttonText: '生成任务',
|
|
|
- buttonColor: 'success', // 初始颜色为success
|
|
|
+
|
|
|
checkScheduleDialog: false,
|
|
|
- isApplySettlement: false,
|
|
|
+
|
|
|
isConfirmRefundBtn: true,
|
|
|
- isExamineBtn: true,
|
|
|
- isRevocationRequest: true,
|
|
|
+
|
|
|
+
|
|
|
checkDialog: false,
|
|
|
checkId: '',
|
|
|
batchNo: '',
|
|
|
@@ -897,13 +904,17 @@ export default {
|
|
|
label: '入库单号',
|
|
|
prop: 'billno'
|
|
|
},
|
|
|
- {
|
|
|
- label: '来源单号',
|
|
|
- prop: 'ordNo'
|
|
|
- }, {
|
|
|
+ // {
|
|
|
+ // label: '来源单号',
|
|
|
+ // prop: 'ordNo'
|
|
|
+ // },
|
|
|
+ {
|
|
|
label: '数量',
|
|
|
prop: 'goodsTotalNum'
|
|
|
}, {
|
|
|
+ label: '实际数量',
|
|
|
+ prop: 'sendTotalNum'
|
|
|
+ }, {
|
|
|
label: '状态',
|
|
|
prop: 'statusName'
|
|
|
}, {
|
|
|
@@ -920,16 +931,8 @@ export default {
|
|
|
},
|
|
|
async created() {
|
|
|
this.findObject(this.optionContactsBack.column, "goodsId").click = ({ value, column }) => {
|
|
|
- console.log('点击了');
|
|
|
- // this.findObject(this.optionContactsBack.column, "goodsId").dicUrl= "/api/blade-sales-part/goodsDesc/goodsListAll?cname=&enableOrNot=1"
|
|
|
this.$refs.formContacts.dicInit()
|
|
|
-
|
|
|
}
|
|
|
- // console.log(this.$route);
|
|
|
- // if(this.$route.query.check.actId){
|
|
|
-
|
|
|
- // this.isExamineBtn = false
|
|
|
- // }
|
|
|
this.findObject(this.optionContactsBack.column, "goodsId").change = ({ value, column }) => {
|
|
|
if (this.formContacts.goodsId !== value) {
|
|
|
goodsDetail({ id: value, customId: this.dicUrlWithCustomId, stock: this.form.storageId ? this.form.storageId : '' }).then(res => {
|
|
|
@@ -977,7 +980,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
this.optionContacts = await this.getColumnData(this.getColumnName(269.1), this.optionContactsBack);
|
|
|
-
|
|
|
this.findObject(this.optionContacts.column, "goodsId").change = ({ value, column }) => {
|
|
|
if (this.formContacts.goodsId !== value) {
|
|
|
goodsDetail({ id: value, customId: this.dicUrlWithCustomId, stock: this.form.storageId ? this.form.storageId : '' }).then(res => {
|
|
|
@@ -1024,6 +1026,7 @@ export default {
|
|
|
this.$set(this.optionForm, 'disabled', true)
|
|
|
this.$set(this.optionContactsBack, 'disabled', true)
|
|
|
this.isContacts = true
|
|
|
+
|
|
|
this.isDisabled = true
|
|
|
//添加删除按钮禁用
|
|
|
this.isAdd = true
|
|
|
@@ -1032,7 +1035,7 @@ export default {
|
|
|
this.refresh(this.onLoad.id, true)
|
|
|
}
|
|
|
if (!this.form.id) {
|
|
|
- console.log(3);
|
|
|
+ this.editButton = false // 第一次录入显示保存按钮
|
|
|
this.optionContactsBack.column.forEach(its => {
|
|
|
if (its.prop == 'goodsId' || its.prop == 'goodsNum' || its.prop == 'price' || its.prop == 'dot' || its.prop == 'remarks') {
|
|
|
its.disabled = false
|
|
|
@@ -1040,22 +1043,16 @@ export default {
|
|
|
its.disabled = true
|
|
|
}
|
|
|
})
|
|
|
- this.isSaveBtn = true;
|
|
|
this.isDisabledTask = true;
|
|
|
- this.viewDisabled = true;
|
|
|
// this.$set(this.optionContactsBack, "addBtn", false)
|
|
|
this['optionContacts'] = this['optionContactsBack'];
|
|
|
this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
|
|
|
}
|
|
|
if (!this.detailData.id) {
|
|
|
- this.editButton = false
|
|
|
this.isAddBtn = false
|
|
|
this.isDisabledTask = false;
|
|
|
- this.isSaveBtn = false
|
|
|
- this.viewDisabled = false;
|
|
|
this.form.businessSource = '内部销售'
|
|
|
}
|
|
|
- console.log(this.detailData.check);
|
|
|
if (this.detailData.check) {
|
|
|
console.log('this.detailData.check', this.detailData.check);
|
|
|
this.isExamineBtn = false
|
|
|
@@ -1070,36 +1067,6 @@ export default {
|
|
|
},
|
|
|
|
|
|
watch: {
|
|
|
- // dicUrlWithCustomId() {
|
|
|
- // console.log(this.form);
|
|
|
- // // this.findObject(this.optionContactsBack.column, "goodsId").dicUrl = `/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}&customId=${this.dicUrlWithCustomId}&enableOrNot=0`
|
|
|
- // goodsListXs(this.dicUrlWithCustomId, this.form.storageId ? this.form.storageId : '').then(res => {
|
|
|
- // this.findObject(this.optionContactsBack.column, "goodsId").dicData = res.data.data
|
|
|
- // })
|
|
|
-
|
|
|
- // },
|
|
|
- // 'form.storageId'(newStorageId, oldStorageId) {
|
|
|
- // goodsListXs(this.dicUrlWithCustomId, this.form.storageId ? this.form.storageId : '').then(res => {
|
|
|
- // this.findObject(this.optionContactsBack.column, "goodsId").dicData = res.data.data
|
|
|
- // })
|
|
|
- // },
|
|
|
- // 'form.orderItemsList.length'(newformContacts, oldformContacts) {
|
|
|
- // console.log(this.formContacts);
|
|
|
- // console.log(this.form.orderItemsList);
|
|
|
- // // for (let i = 0; i < this.form.orderItemsList.length - 1; i++) {
|
|
|
- // // const currentItem = this.form.orderItemsList[i];
|
|
|
- // // const nextItem = this.form.orderItemsList[i + 1];
|
|
|
-
|
|
|
- // // if (currentItem.sharedCompanyId !== nextItem.sharedCompanyId) {
|
|
|
- // // console.log('不能添加');
|
|
|
- // // }
|
|
|
- // // }
|
|
|
- // if (this.form.orderItemsList.length) {
|
|
|
- // this.findObject(this.optionForm.column, 'storageId').disabled = true
|
|
|
- // } else {
|
|
|
- // this.findObject(this.optionForm.column, 'storageId').disabled = false
|
|
|
- // }
|
|
|
- // },
|
|
|
'form.sharedCompanyId'(newSharedCompanyId, oldSharedCompanyId) {
|
|
|
console.log(newSharedCompanyId, oldSharedCompanyId);
|
|
|
if (newSharedCompanyId != oldSharedCompanyId) {
|
|
|
@@ -1156,6 +1123,8 @@ export default {
|
|
|
}).then(res=>{
|
|
|
this.form = res.data.data
|
|
|
this.form.orderItemsList = res.data.data.orderItemsList
|
|
|
+
|
|
|
+ this.editButton = true //显示编辑按钮
|
|
|
})
|
|
|
},
|
|
|
// 获取左侧筛选
|
|
|
@@ -1196,22 +1165,6 @@ export default {
|
|
|
this.data = data.records;
|
|
|
this.goodsListShow = data.records;
|
|
|
|
|
|
- // // 获取单价数据
|
|
|
- // for(let item of this.goodsListShow) {
|
|
|
- // let page = {}
|
|
|
- // if (this.form.storageId) {
|
|
|
- // page.storageId = this.form.storageId
|
|
|
- // }
|
|
|
- // page.goodsId = item.goodsId
|
|
|
- // if (this.form.storageId) {
|
|
|
- // dotList(page).then(res=>{
|
|
|
- // console.log(res.data.data,1206)
|
|
|
- // item.price = res.data.data[0].inventoryCostPrice
|
|
|
- // // console.log(item)
|
|
|
- // })
|
|
|
- // }
|
|
|
- //
|
|
|
- // }
|
|
|
|
|
|
|
|
|
this.loading = false;
|
|
|
@@ -1291,7 +1244,6 @@ export default {
|
|
|
console.log(res.data,'获取到的数据')
|
|
|
let obj = {}
|
|
|
if(res.data.data.length>0){
|
|
|
- // obj.price = res.data.data[0].inventoryCostPrice,
|
|
|
obj.inventory = res.data.data[0].balanceQuantity
|
|
|
if (item.dot) {
|
|
|
obj.dot = item.dot
|
|
|
@@ -1352,7 +1304,6 @@ export default {
|
|
|
current: page.currentPage,
|
|
|
size: page.pageSize
|
|
|
}).then(res=>{
|
|
|
- console.log(res,1213)
|
|
|
const data = res.data.data;
|
|
|
this.page.total = data.total;
|
|
|
this.pageList.total = data.total
|
|
|
@@ -1369,27 +1320,15 @@ export default {
|
|
|
page.goodsId = item.id
|
|
|
if (this.form.storageId) {
|
|
|
dotList(page).then(res=>{
|
|
|
- console.log(res.data.data,1206)
|
|
|
- item.price = res.data.data[0].inventoryCostPrice
|
|
|
- // console.log(item)
|
|
|
+ item.price = res.data.data[0].inventoryCostPrice?res.data.data[0].inventoryCostPrice:0
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
this.loading = false;
|
|
|
})
|
|
|
- // getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId, null).then(res => {
|
|
|
- // const data = res.data.data;
|
|
|
- // this.page.total = data.total;
|
|
|
- // this.pageList.total = data.total
|
|
|
- // this.data = data.records;
|
|
|
- // this.goodsListShow = data.records;
|
|
|
- // this.loading = false;
|
|
|
- // });
|
|
|
},
|
|
|
// 采购明细行编辑
|
|
|
hangeditBtn(row,index){
|
|
|
- console.log(row)
|
|
|
this.picihaolistfun(row.id)
|
|
|
row.dotedittype = true
|
|
|
// 价格数量
|
|
|
@@ -1411,72 +1350,49 @@ export default {
|
|
|
storageId:this.form.storageId,
|
|
|
goodsId: goodsId
|
|
|
}).then(res=>{
|
|
|
- console.log(res.data,1409)
|
|
|
this.picihaolist = res.data.data
|
|
|
- console.log(res.data.data,1282)
|
|
|
})
|
|
|
},
|
|
|
|
|
|
// 编辑
|
|
|
editBtn(row, index) {
|
|
|
- // this.findObject(this.optionContactsBack.column, "goodsId").dicUrl= `/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1`
|
|
|
this.confirmEditing()
|
|
|
- console.log(row);
|
|
|
this.$refs.formContacts.dicInit()
|
|
|
- // this.$refs.formContacts.rowEdit(row, index);
|
|
|
dotList({
|
|
|
storageId: this.form.storageId,
|
|
|
goodsId: this.formContacts.goodsId
|
|
|
}).then(res => {
|
|
|
this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data
|
|
|
})
|
|
|
- // this.findObject(this.optionContactsBack.column, "goodsId").click = ({ value, column }) => {
|
|
|
- // console.log('点击了');
|
|
|
- // this.findObject(this.optionContactsBack.column, "goodsId").dicUrl= "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1"
|
|
|
- // this.$refs.formContacts.dicInit()
|
|
|
- // }
|
|
|
- // goodsListXs(this.dicUrlWithCustomId, this.form.storageId ? this.form.storageId : '').then(res => {
|
|
|
- // this.findObject(this.optionContactsBack.column, "goodsId").dicData = res.data.data
|
|
|
- // })
|
|
|
},
|
|
|
//表头编辑
|
|
|
confirmEditing() {
|
|
|
- this.editButton = false
|
|
|
+ this.editButton = false // 让保存按钮出来
|
|
|
+ this.viewDisabled = true // 请核审批禁用
|
|
|
goodsListXs(this.dicUrlWithCustomId, this.form.storageId ? this.form.storageId : '').then(res => {
|
|
|
this.findObject(this.optionContactsBack.column, "goodsId").dicData = res.data.data
|
|
|
})
|
|
|
- if (this.form.status == '已发货') {
|
|
|
+ if (this.form.status == '已收货') {
|
|
|
this.viewDisabled = false
|
|
|
return
|
|
|
}
|
|
|
if (this.form.status == '审核中') {
|
|
|
- this.isRevocationRequest = false
|
|
|
- this.viewDisabled = false
|
|
|
- return
|
|
|
- }
|
|
|
- if (this.form.status == '退款中') {
|
|
|
- this.viewDisabled = false
|
|
|
- this.isRevocationRequest = true
|
|
|
+ this.$set(this.optionForm, 'disabled', false)
|
|
|
+ this.findObject(this.optionForm.column, "customerId").disabled = true
|
|
|
+ this.findObject(this.optionForm.column, "storageId").disabled = true
|
|
|
+ this.findObject(this.optionForm.column, "businesDate").disabled = true
|
|
|
+ this.findObject(this.optionForm.column, "phone").disabled = true
|
|
|
+ this.findObject(this.optionForm.column, "receivableType").disabled = true
|
|
|
+ this.isRevocationRequest = false // 撤销请核按钮放开
|
|
|
+ this.viewDisabled = false // 请核审批大按钮可点击
|
|
|
return
|
|
|
}
|
|
|
this.isAddBtn = false
|
|
|
- if (this.form.status == '已取消' || this.form.status == '已退款' || this.form.status == '已发货') {
|
|
|
+ if (this.form.status == '已收货') {
|
|
|
return
|
|
|
- // this.$message.error('当前状态不允许编辑')
|
|
|
- // this.optionForm.column.forEach(item=>{
|
|
|
- // if(item.prop= 'contacts'){
|
|
|
- // item.disabled = true
|
|
|
- // }
|
|
|
- // })
|
|
|
}
|
|
|
if (this.form.status == '已取消' || this.form.status == '退款请核') {
|
|
|
this.isAddBtn = true
|
|
|
- // this.$message.error('当前状态不允许编辑')
|
|
|
- // this.optionForm.column.forEach(item=>{
|
|
|
- // if(item.prop= 'contacts'){
|
|
|
- // item.disabled = true
|
|
|
- // }
|
|
|
- // })
|
|
|
}
|
|
|
if (this.form.status == '待发货') {
|
|
|
this.isAddBtn = true
|
|
|
@@ -1489,181 +1405,82 @@ export default {
|
|
|
its.disabled = true
|
|
|
}
|
|
|
})
|
|
|
- this.$set(this.optionForm, 'disabled', false)
|
|
|
- this.$set(this.optionContactsBack, 'disabled', false)
|
|
|
+ // this.$set(this.optionForm, 'disabled', false)
|
|
|
+ // this.$set(this.optionContactsBack, 'disabled', false)
|
|
|
this.isDisabled = false
|
|
|
this.isAdd = false
|
|
|
- if (this.form.businessSource == "外部销售") {
|
|
|
- this.optionForm.column.forEach(its => {
|
|
|
- if (its.prop == 'contacts' || its.prop == 'phone' || its.prop == 'recAddress') {
|
|
|
- this.$set(its, 'disabled', true)
|
|
|
- }
|
|
|
- })
|
|
|
- if (this.form.status == '待发货') {
|
|
|
- this.isSaveBtn = false;
|
|
|
- this.isDisabledTask = false;
|
|
|
- this.viewDisabled = false;
|
|
|
- }
|
|
|
- if (this.form.status == '待确认') {
|
|
|
- const loadings = this.$loading({
|
|
|
- lock: true,
|
|
|
- text: '加载中',
|
|
|
- spinner: 'el-icon-loading',
|
|
|
- background: 'rgba(255,255,255,0.7)'
|
|
|
- });
|
|
|
- console.log('外部销售待确认');
|
|
|
- this.isSaveBtn = false;
|
|
|
- this.isDisabledTask = false;
|
|
|
- this.viewDisabled = false;
|
|
|
- this.optionForm.column.forEach(its => {
|
|
|
- if (its.prop == 'customerId') {
|
|
|
- this.$set(its, 'disabled', true)
|
|
|
- }
|
|
|
- if (its.prop == 'storageId') {
|
|
|
- this.$set(its, 'disabled', false)
|
|
|
- }
|
|
|
- })
|
|
|
- //外部销售都能申请退款
|
|
|
- this.isApplySettlement = false
|
|
|
- //不能录入不能删除
|
|
|
- this.isDisabled = true
|
|
|
- this.isAdd = false
|
|
|
- this.isAddBtn = true
|
|
|
- this.$set(this.form, 'shipType', '物流')
|
|
|
- this.$set(this.form, 'receivableType', '网络支付')
|
|
|
- this.optionContactsBack.column.forEach(item => {
|
|
|
- this.$set(item, 'disabled', true)
|
|
|
- if (item.label == '批次号' || item.label == '备注') {
|
|
|
- item.disabled = false
|
|
|
- }
|
|
|
- })
|
|
|
- loadings.close()
|
|
|
- } else {
|
|
|
- const loadin = this.$loading({
|
|
|
- lock: true,
|
|
|
- text: '加载中',
|
|
|
- spinner: 'el-icon-loading',
|
|
|
- background: 'rgba(255,255,255,0.7)'
|
|
|
- });
|
|
|
- this.isAddBtn = true
|
|
|
- this.isDisabled = true
|
|
|
- this.isSaveBtn = false;
|
|
|
- this.isDisabledTask = false;
|
|
|
- this.viewDisabled = false;
|
|
|
- this.optionForm.column.forEach(its => {
|
|
|
- if (its.prop != 'remarks') {
|
|
|
- its.disabled = true
|
|
|
- } else {
|
|
|
- its.disabled = false
|
|
|
- }
|
|
|
- })
|
|
|
- this.optionContactsBack.column.forEach(its => {
|
|
|
- if (its.prop != 'remarks') {
|
|
|
- its.disabled = true
|
|
|
- } else {
|
|
|
- its.disabled = false
|
|
|
- }
|
|
|
- })
|
|
|
- loadin.close()
|
|
|
- }
|
|
|
|
|
|
- } else {
|
|
|
+ const loading = this.$loading({
|
|
|
+ lock: true,
|
|
|
+ text: '加载中',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(255,255,255,0.7)'
|
|
|
+ });
|
|
|
+ if (this.form.status == '待收货' || this.form.status == '已收货') {
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
text: '加载中',
|
|
|
spinner: 'el-icon-loading',
|
|
|
background: 'rgba(255,255,255,0.7)'
|
|
|
});
|
|
|
- if (this.form.status == '待发货' || this.form.status == '已发货' || this.form.status == '已取消') {
|
|
|
- const loading = this.$loading({
|
|
|
- lock: true,
|
|
|
- text: '加载中',
|
|
|
- spinner: 'el-icon-loading',
|
|
|
- background: 'rgba(255,255,255,0.7)'
|
|
|
- });
|
|
|
- this.optionForm.column.forEach(its => {
|
|
|
- if (its.prop != 'remarks') {
|
|
|
- its.disabled = true
|
|
|
- } else {
|
|
|
- its.disabled = false
|
|
|
- }
|
|
|
- })
|
|
|
- this.optionContactsBack.column.forEach(its => {
|
|
|
- if (its.prop != 'remarks') {
|
|
|
- its.disabled = true
|
|
|
- } else {
|
|
|
- its.disabled = false
|
|
|
- }
|
|
|
- })
|
|
|
- loading.close()
|
|
|
- } else if (this.form.status == '录入') {
|
|
|
- this.isSaveBtn = false;
|
|
|
- this.isDisabledTask = false;
|
|
|
- this.viewDisabled = false;
|
|
|
- // this.$set(this.optionForm, 'disabled', false)
|
|
|
- // this.$set(this.optionContactsBack, 'disabled', false)
|
|
|
- this.$set(this.optionForm, 'disabled', false)
|
|
|
- this.$set(this.optionContactsBack, 'disabled', false)
|
|
|
-
|
|
|
- this.isContacts = false
|
|
|
- //删除按钮
|
|
|
- this.isDisabled = false
|
|
|
- // this.optionForm.column.forEach(item => {
|
|
|
- // item.disabled = false
|
|
|
- // })
|
|
|
- loading.close()
|
|
|
-
|
|
|
- } else if (this.form.status == '待确认') {
|
|
|
- this.isSaveBtn = false;
|
|
|
- this.isDisabledTask = false;
|
|
|
- this.isAddBtn = false;
|
|
|
- this.isAdd = false;
|
|
|
- this.isDisabled = false
|
|
|
- this.viewDisabled = false;
|
|
|
- // this.isDisabled = true
|
|
|
- console.log('待确认');
|
|
|
- // this.optionForm.column.forEach(item => {
|
|
|
- // if (item.label === '仓库' || item.label === '备注' || item.label === '配送方式' || item.label === '物流公司') {
|
|
|
- // this.$set(item, 'disabled', false)
|
|
|
- // } else {
|
|
|
- // this.$set(item, 'disabled', true)
|
|
|
- // }
|
|
|
- // })
|
|
|
- // this.optionContactsBack.column.forEach(its => {
|
|
|
- // if (its.prop == 'remarks' || its.prop == 'dot') {
|
|
|
- // this.$set(its, 'disabled', false)
|
|
|
- // } else {
|
|
|
- // this.$set(its, 'disabled', true)
|
|
|
-
|
|
|
- // }
|
|
|
- // })
|
|
|
- loading.close()
|
|
|
- }
|
|
|
- console.log(this.form.status);
|
|
|
- if (this.form.status == '待发货') {
|
|
|
- this.isSaveBtn = false;
|
|
|
- this.isDisabledTask = false;
|
|
|
- this.viewDisabled = false;
|
|
|
- }
|
|
|
- console.log(this.form.outboundRecordsList);
|
|
|
- this.form.outboundRecordsList.forEach(item => {
|
|
|
- if (item.statusName == '待出库') {
|
|
|
- this.isDisabledTask = true
|
|
|
+ this.optionForm.column.forEach(its => {
|
|
|
+ if (its.prop != 'remarks') {
|
|
|
+ its.disabled = true
|
|
|
+ } else {
|
|
|
+ its.disabled = false
|
|
|
}
|
|
|
})
|
|
|
- if (this.form.checkStatus == '审核完成') {
|
|
|
- console.log('审核完成');
|
|
|
- this.$set(this.optionForm, 'disabled', true)
|
|
|
- this.$set(this.optionContactsBack, 'disabled', true)
|
|
|
- this.isContacts = true
|
|
|
- this.isDisabled = true
|
|
|
- //添加删除按钮禁用
|
|
|
- this.isAdd = true
|
|
|
- this.isAddBtn = true
|
|
|
- }
|
|
|
+ this.optionContactsBack.column.forEach(its => {
|
|
|
+ if (its.prop != 'remarks') {
|
|
|
+ its.disabled = true
|
|
|
+ } else {
|
|
|
+ its.disabled = false
|
|
|
+ }
|
|
|
+ })
|
|
|
+ loading.close()
|
|
|
+ } else if (this.form.status == '录入') {
|
|
|
+ this.isDisabledTask = false;
|
|
|
+ this.viewDisabled = false;
|
|
|
+ this.$set(this.optionForm, 'disabled', false)
|
|
|
+ this.$set(this.optionContactsBack, 'disabled', false)
|
|
|
+ this.isContacts = false
|
|
|
+ //删除按钮
|
|
|
+ this.isDisabled = false
|
|
|
loading.close()
|
|
|
+
|
|
|
+ } else if (this.form.status == '待确认') {
|
|
|
+ this.isDisabledTask = false;
|
|
|
+ this.isAddBtn = false;
|
|
|
+ this.isAdd = false;
|
|
|
+ this.isDisabled = false
|
|
|
+ this.viewDisabled = false;
|
|
|
+ // this.isDisabled = true
|
|
|
+ loading.close()
|
|
|
+ }
|
|
|
+ if (this.form.status == '待收货') {
|
|
|
+ this.isDisabledTask = false;
|
|
|
+ this.viewDisabled = false;
|
|
|
+ }
|
|
|
+ this.form.outboundRecordsList.forEach(item => {
|
|
|
+ if (item.statusName == '待出库') {
|
|
|
+ this.isDisabledTask = true
|
|
|
+ }
|
|
|
+ })
|
|
|
+ if (this.form.checkStatus == '审核完成') {
|
|
|
+ this.$set(this.optionForm, 'disabled', false)
|
|
|
+ this.$set(this.optionContactsBack, 'disabled', true)
|
|
|
+ this.findObject(this.optionForm.column, "customerId").disabled = true
|
|
|
+ this.findObject(this.optionForm.column, "storageId").disabled = true
|
|
|
+ this.findObject(this.optionForm.column, "businesDate").disabled = true
|
|
|
+ this.findObject(this.optionForm.column, "phone").disabled = true
|
|
|
+ this.findObject(this.optionForm.column, "receivableType").disabled = true
|
|
|
+ this.isContacts = true
|
|
|
+ this.isDisabled = true
|
|
|
+ //添加删除按钮禁用
|
|
|
+ this.isAdd = true
|
|
|
+ this.isAddBtn = true
|
|
|
}
|
|
|
- // this.$set(this.form.orderItemsList,'goodsNum',66)
|
|
|
+ loading.close()
|
|
|
|
|
|
},
|
|
|
generateOutbound() {
|
|
|
@@ -1679,16 +1496,6 @@ export default {
|
|
|
this.$set(this.optionContactsBack, 'disabled', true)
|
|
|
this.$refs["form"].validate((valid, done) => {
|
|
|
if (valid) {
|
|
|
- // this.form.orderItemsList.forEach((items) => {
|
|
|
- // let brandName = items.brandId
|
|
|
- // items.brandId = items.brandName
|
|
|
- // items.brandName = brandName
|
|
|
-
|
|
|
- // let goodsName = items.goodsId
|
|
|
- // items.goodsId = items.goodsName
|
|
|
- // items.goodsName = goodsName
|
|
|
-
|
|
|
- // })
|
|
|
this.$refs["form"].validate((valid, done) => {
|
|
|
done();
|
|
|
if (valid) {
|
|
|
@@ -1702,28 +1509,43 @@ export default {
|
|
|
bsType: "CG",
|
|
|
...this.form
|
|
|
}).then(res => {
|
|
|
- console.log(1);
|
|
|
this.refresh(res.data.data.id)
|
|
|
- this.isDisabledTask = false
|
|
|
- generateShipTask(this.form).then(res => {
|
|
|
- console.log(res.data);
|
|
|
- // 将按钮文本更改为"撤销任务"
|
|
|
- this.buttonText = '撤销任务';
|
|
|
- // 将按钮颜色更改为对应的颜色
|
|
|
- this.buttonColor = 'warning'; // 比如改为warning
|
|
|
- this.refresh(res.data.data.id, true)
|
|
|
- this.isContacts = true
|
|
|
- this.isAdd = true
|
|
|
- this.isDisabled = true
|
|
|
- // this.findObject(this.optionForm,'disabled') = true
|
|
|
- // this.findObject(this.optionContactsBack,'disabled') = true
|
|
|
- this.$message.success("生成入库任务成功");
|
|
|
- this.isApplySettlement = false
|
|
|
- loading.close();
|
|
|
-
|
|
|
- }).finally(() => {
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ // this.isDisabledTask = false
|
|
|
+ this.editButton = true
|
|
|
+ this.isDisabledTask = true
|
|
|
+ // 将按钮文本更改为"撤销任务"
|
|
|
+ this.buttonText = '撤销任务';
|
|
|
+ // 将按钮颜色更改为对应的颜色
|
|
|
+ this.buttonColor = 'warning'; // 比如改为warning
|
|
|
+ this.refresh(res.data.data.id, true)
|
|
|
+ this.isContacts = true
|
|
|
+ this.isAdd = true
|
|
|
+ this.isDisabled = true
|
|
|
+ // this.findObject(this.optionForm,'disabled') = true
|
|
|
+ // this.findObject(this.optionContactsBack,'disabled') = true
|
|
|
+ this.$message.success("生成入库任务成功");
|
|
|
+ this.isApplySettlement = false
|
|
|
+ loading.close();
|
|
|
+
|
|
|
+ // generateShipTask(this.form).then(res => {
|
|
|
+ // console.log(res.data);
|
|
|
+ // // 将按钮文本更改为"撤销任务"
|
|
|
+ // this.buttonText = '撤销任务';
|
|
|
+ // // 将按钮颜色更改为对应的颜色
|
|
|
+ // this.buttonColor = 'warning'; // 比如改为warning
|
|
|
+ // this.refresh(res.data.data.id, true)
|
|
|
+ // this.isContacts = true
|
|
|
+ // this.isAdd = true
|
|
|
+ // this.isDisabled = true
|
|
|
+ // // this.findObject(this.optionForm,'disabled') = true
|
|
|
+ // // this.findObject(this.optionContactsBack,'disabled') = true
|
|
|
+ // this.$message.success("生成入库任务成功");
|
|
|
+ // this.isApplySettlement = false
|
|
|
+ // loading.close();
|
|
|
+ //
|
|
|
+ // }).finally(() => {
|
|
|
+ // loading.close();
|
|
|
+ // });
|
|
|
}).finally(() => {
|
|
|
loading.close();
|
|
|
});
|
|
|
@@ -1748,17 +1570,9 @@ export default {
|
|
|
spinner: 'el-icon-loading',
|
|
|
background: 'rgba(255,255,255,0.7)'
|
|
|
});
|
|
|
- // this.form.orderItemsList.forEach((items) => {
|
|
|
- // let brandName = items.brandId
|
|
|
- // items.brandId = items.brandName
|
|
|
- // items.brandName = brandName
|
|
|
-
|
|
|
- // let goodsName = items.goodsId
|
|
|
- // items.goodsId = items.goodsName
|
|
|
- // items.goodsName = goodsName
|
|
|
-
|
|
|
- // })
|
|
|
revokeInboundTask(this.form).then(res => {
|
|
|
+ this.isDisabledTask = true
|
|
|
+ this.editButton = true
|
|
|
// 将按钮文本更改为"生成任务"
|
|
|
this.buttonText = '生成任务';
|
|
|
// 将按钮颜色还原为success
|
|
|
@@ -1834,15 +1648,6 @@ export default {
|
|
|
spinner: 'el-icon-loading',
|
|
|
background: 'rgba(255,255,255,0.7)'
|
|
|
});
|
|
|
- // this.form.orderItemsList.forEach(its => {
|
|
|
- // console.log(its.goodsId);
|
|
|
- // console.log(its.goodsName);
|
|
|
- // its.brandId = its.brandName
|
|
|
- // let goodsName = its.goodsId
|
|
|
- // its.goodsId = its.goodsName
|
|
|
- // its.goodsName = goodsName
|
|
|
-
|
|
|
- // })
|
|
|
|
|
|
submit({
|
|
|
bsType: "CG",
|
|
|
@@ -1851,9 +1656,20 @@ export default {
|
|
|
this.$message.success("保存成功");
|
|
|
this.refresh(res.data.data.id)
|
|
|
this.isDisabledTask = false
|
|
|
- this.editButton = true
|
|
|
|
|
|
- this.editButton = true
|
|
|
+ this.editButton = true // 让编辑按钮出来
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ // this.isDisabledTask = false;
|
|
|
+ // this.viewDisabled = false;
|
|
|
+ this.isAddBtn = true // 表格的添加轮胎禁用
|
|
|
+ this.$set(this.optionForm, 'disabled', true)
|
|
|
+ this.$set(this.optionContactsBack, 'disabled', true)
|
|
|
+ this.isContacts = true // 基础信息联系人 和地址插槽禁用
|
|
|
+ // 表格的删除按钮禁用
|
|
|
+ this.isDisabled = true
|
|
|
+ this.isAdd = true // 表格的编辑和保存按钮禁用
|
|
|
loading.close();
|
|
|
}).finally(() => {
|
|
|
loading.close();
|
|
|
@@ -1914,7 +1730,6 @@ export default {
|
|
|
goodsListAll().then(res=>{
|
|
|
console.log();
|
|
|
})
|
|
|
- console.log(id,1769)
|
|
|
getDetails({ id: id }).then(res => {
|
|
|
this.form = res.data.data
|
|
|
let ordForm = { srcBillNo: this.form.ordNo }
|
|
|
@@ -1923,53 +1738,50 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.formContacts.doLayout()
|
|
|
})
|
|
|
- // getList(1, 50, ordForm).then((res) => {
|
|
|
- // this.dataList = res.data.data.records ? res.data.data.records : [];
|
|
|
+ // if (this.form.status !== '录入' &&
|
|
|
+ // this.form.status !== '退款中' &&
|
|
|
+ // this.form.status !== '已取消' &&
|
|
|
+ // this.form.status !== '退款请核' &&
|
|
|
+ // this.form.status !== '已退款' &&
|
|
|
+ // this.form.status !== '待确认' &&
|
|
|
+ // this.form.status !== '待收货') {
|
|
|
+ // this.isApplySettlement = false;
|
|
|
+ // }
|
|
|
|
|
|
- // })
|
|
|
- if (this.form.status !== '录入' && this.form.status !== '退款中' && this.form.status !== '已取消' && this.form.status !== '退款请核' && this.form.status !== '已退款' && this.form.status !== '待确认' && this.form.status !== '待发货') {
|
|
|
- console.log(1);
|
|
|
+ if (this.form.status == '审核中') {
|
|
|
this.isApplySettlement = false;
|
|
|
+ this.isRevocationRequest = false // 撤销请核能点击
|
|
|
}
|
|
|
- if (
|
|
|
- this.form.status === '已退款' ||
|
|
|
- this.form.status === '已收货' ||
|
|
|
- this.form.status === '已发货' ||
|
|
|
- this.form.status === '已取消'
|
|
|
- ) {
|
|
|
- // 禁用编辑按钮
|
|
|
- console.log('按钮全部禁用');
|
|
|
- this.isEditButton = true;
|
|
|
- this.isSaveBtn = true;
|
|
|
- this.isDisabledTask = true;
|
|
|
- this.viewDisabled = true;
|
|
|
- }
|
|
|
- if (this.form.status === '已发货') {
|
|
|
- this.isDisabledTask = true;
|
|
|
- this.viewDisabled = true;
|
|
|
- this.isEditButton = false;
|
|
|
- }
|
|
|
- // else {
|
|
|
- // this.isSaveBtn = true;
|
|
|
+ // if (this.form.status == '待确认') {
|
|
|
+ // this.isApplySettlement = true;
|
|
|
+ // }
|
|
|
+
|
|
|
+ // if (this.form.status === '已退款' || this.form.status === '已收货' || this.form.status === '已取消') {
|
|
|
+ // // 禁用编辑按钮
|
|
|
+ // console.log('按钮全部禁用');
|
|
|
// this.isDisabledTask = true;
|
|
|
// this.viewDisabled = true;
|
|
|
// }
|
|
|
-
|
|
|
- if (this.form.status == '退款中') {
|
|
|
- this.isConfirmRefundBtn = false;
|
|
|
- }
|
|
|
- if (this.form.status == '已取消') {
|
|
|
- this.isConfirmRefundBtn = true;
|
|
|
- }
|
|
|
-
|
|
|
+ // if (this.form.status === '已收货') {
|
|
|
+ // this.isDisabledTask = true;
|
|
|
+ // this.viewDisabled = true;
|
|
|
+ // }
|
|
|
+ //
|
|
|
+ // if (this.form.status == '退款中') {
|
|
|
+ // this.isConfirmRefundBtn = false;
|
|
|
+ // }
|
|
|
+ // if (this.form.status == '已取消') {
|
|
|
+ // this.isConfirmRefundBtn = true;
|
|
|
+ // }
|
|
|
+ //
|
|
|
if (this.form.generateTask == '已生成') {
|
|
|
this.buttonText = '撤销任务';
|
|
|
// this.isDisabledTask = false;
|
|
|
this.buttonColor = 'warning'
|
|
|
}
|
|
|
- if (this.form.status == '退款请核' || this.form.status == '退款中') {
|
|
|
- this.isRevocationRequest = false;
|
|
|
- }
|
|
|
+ // if (this.form.status == '退款请核' || this.form.status == '退款中') {
|
|
|
+ // this.isRevocationRequest = false;
|
|
|
+ // }
|
|
|
//成本、毛利对销售角色隐藏
|
|
|
this.optionForm.column.forEach(its => {
|
|
|
if (JSON.parse(localStorage.getItem('saber-userInfo')).content.role_name.split(',').includes('销售')) {
|
caojunjie