diff --git a/src/api/SalePlan.js b/src/api/SalePlan.js
index e4df728d..e96fec5c 100644
--- a/src/api/SalePlan.js
+++ b/src/api/SalePlan.js
@@ -103,6 +103,7 @@ export function updatesaleplan2(query) {
export function searchEmpCategory(query) {
var params = new URLSearchParams()
params.append('iseffective', 1) // 你要传给后台的参数值 key/value
+ params.append('type', 2) // 你要传给后台的参数值 key/value
// if (query.type !== '' && query.type !== null && query.type !== undefined) {
// params.append('type', query.type)
// }
diff --git a/src/lang/en.js b/src/lang/en.js
index 9550bf77..89e18c68 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -2129,7 +2129,8 @@ export default {
actualMoney: 'actualMoney',
xzmd: 'Enter',
planNum: 'No.',
- trackingStatistics: 'trackingStats'
+ trackingStatistics: 'trackingStats',
+ progress: 'progress'
},
SaleOpportunity: {
title: 'subject',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 7e9c7bde..2d001057 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -2156,7 +2156,8 @@ export default {
actualMoney: '实际金额',
xzmd: '请输入内容',
planNum: '计划编号',
- trackingStatistics: '跟踪统计'
+ trackingStatistics: '跟踪统计',
+ progress: '进度'
},
SaleOpportunity: {
title: '机会主题',
diff --git a/src/views/SalePlan/AddSalePlan.vue b/src/views/SalePlan/AddSalePlan.vue
index 5354c5cb..157a96e9 100644
--- a/src/views/SalePlan/AddSalePlan.vue
+++ b/src/views/SalePlan/AddSalePlan.vue
@@ -186,13 +186,14 @@
-
+
+
@@ -506,9 +507,9 @@ export default {
list3: [],
// 明细列表规则
validRules: {
- address: [{
- required: true, message: 'Please enter a address.', trigger: 'blur'
- }],
+ // address: [{
+ // required: true, message: 'Please enter a address.', trigger: 'blur'
+ // }],
quantity: [{
required: true, message: 'Please enter a quantity.', trigger: ''
}],
@@ -545,7 +546,7 @@ export default {
_that = this
},
methods: {
- // 判断是否可以修改
+ // 判断是否可以修改任务地点
isedit(row) {
console.log('row============>', row)
const flag = row.planTarget
@@ -555,6 +556,16 @@ export default {
return false
}
},
+ // 判断是否可以修改商品类型
+ isedit2(row) {
+ console.log('row============>', row)
+ const flag = row.planTarget
+ if (flag === '1') {
+ return true
+ } else {
+ return false
+ }
+ },
// 判断计划类别
jungleAddress(row, val) {
if (val === '7') {
diff --git a/src/views/SalePlan/SalePlanList.vue b/src/views/SalePlan/SalePlanList.vue
index 2da9ff9b..8d8ee196 100644
--- a/src/views/SalePlan/SalePlanList.vue
+++ b/src/views/SalePlan/SalePlanList.vue
@@ -696,13 +696,13 @@ export default {
},
// 判断审核按钮
isReview(row) {
- // if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
- // const approvalUse = row.approvalUseVos
- // const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
- // if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
- // return true
- // }
- // }
+ if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
+ const approvalUse = row.approvalUseVos
+ const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
+ if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
+ return true
+ }
+ }
return true
},
// 审批操作
diff --git a/src/views/SalePlan/components/DetailList.vue b/src/views/SalePlan/components/DetailList.vue
index 928be6fe..62d317f5 100644
--- a/src/views/SalePlan/components/DetailList.vue
+++ b/src/views/SalePlan/components/DetailList.vue
@@ -76,6 +76,11 @@
style="width: 100%">
+
+
+
+
+
@@ -263,6 +268,7 @@ export default {
},
data() {
return {
+ mystatus: '',
// 树结构数据
data2: [],
defaultProps: {
@@ -312,6 +318,26 @@ export default {
methods: {
handlecancel() {
this.editVisible = false
+ },
+ // 进度条
+ clacProgress(row) {
+ console.log('row==================>', row)
+ const res = ((row.actualQuantity / row.quantity) * 100).toFixed(0)
+ if (res < 50) {
+ this.mystatus = 'exception'
+ } else if (res >= 50 && res < 100) {
+ this.mystatus = 'text'
+ } else {
+ this.mystatus = 'success'
+ }
+ console.log(typeof res)
+ return res > 100 ? 100 : res
+ },
+ _format(row) {
+ this.$nextTick(function() {
+ var dom = this.$refs.myprogress.$el.children[0].children[0].children[0].children[0].innerText = ((row.actualQuantity / row.quantity) * 100).toFixed(0) + '%'
+ console.log('dom=================>', dom)
+ })
}
}
}
diff --git a/src/views/SalePlan/components/MyDialog.vue b/src/views/SalePlan/components/MyDialog.vue
index 89289ff6..66dfe4ed 100644
--- a/src/views/SalePlan/components/MyDialog.vue
+++ b/src/views/SalePlan/components/MyDialog.vue
@@ -175,13 +175,14 @@
-
+
+
@@ -490,6 +491,16 @@ export default {
this.CategoryList = res.data.data.content.list
})
},
+ // 判断是否可以修改商品类型
+ isedit2(row) {
+ console.log('row============>', row)
+ const flag = row.planTarget
+ if (flag === '1') {
+ return true
+ } else {
+ return false
+ }
+ },
// 判断是否可以修改
isedit(row) {
console.log('row============>', row)