|
@@ -243,7 +243,6 @@
|
|
|
:trigger-on-focus="false"
|
|
|
:disabled="planForm.county == null ? true : false"
|
|
|
>
|
|
|
- >
|
|
|
</el-autocomplete>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="收货客户电话">
|
|
@@ -564,6 +563,7 @@
|
|
|
<script>
|
|
|
import { getCookie, formatDate } from '@/utils/util.js'
|
|
|
import exportTranPlan from './exportTranPlan.js'
|
|
|
+import { sjTime, isIntegerNumber } from '@/utils/sharedJsFile'
|
|
|
export default {
|
|
|
extends: exportTranPlan,
|
|
|
data() {
|
|
@@ -615,7 +615,7 @@ export default {
|
|
|
startTime: generateStartDate(),
|
|
|
endTime: generateEndDate(),
|
|
|
approvingOptions: {
|
|
|
- requestUrl: '/api/v1/ams/getTransPlan?apiId=533',
|
|
|
+ requestUrl: '',
|
|
|
requestQuery: {
|
|
|
orderStatus: 0,
|
|
|
deleted: 0
|
|
@@ -623,7 +623,7 @@ export default {
|
|
|
selectionType: 'select'
|
|
|
},
|
|
|
approvedOptions: {
|
|
|
- requestUrl: '/api/v1/ams/getTransPlan?apiId=533',
|
|
|
+ requestUrl: '',
|
|
|
requestQuery: {
|
|
|
orderStatus: 4,
|
|
|
deleted: 0
|
|
@@ -784,6 +784,7 @@ export default {
|
|
|
this.getOyeSaleArea()
|
|
|
this.getAllsaleMan()
|
|
|
this.getAllProvince()
|
|
|
+ this.getRequestUrl()
|
|
|
},
|
|
|
watch: {
|
|
|
saleRemark(val) {
|
|
@@ -857,6 +858,9 @@ export default {
|
|
|
if (this.orgCode == 'shouhuokehu') {
|
|
|
queryOp['consigneeName'] = this.userName
|
|
|
}
|
|
|
+ if (this.orgCode == 'xiaoshouyewuyuan') {
|
|
|
+ queryOp['saler'] = this.loginName
|
|
|
+ }
|
|
|
this.approvingOptions.requestQuery = {
|
|
|
orderStatus: 0,
|
|
|
deleted: 0,
|
|
@@ -891,6 +895,7 @@ export default {
|
|
|
this.isNiTui = 0
|
|
|
if (res.data.code == '200') {
|
|
|
var restaurants = res.data.data
|
|
|
+ console.log(restaurants, 'restaurants')
|
|
|
var results = queryString
|
|
|
? restaurants.filter(this.createFilter1(queryString))
|
|
|
: restaurants
|
|
@@ -900,6 +905,14 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
+ createFilter1(queryString) {
|
|
|
+ return restaurants => {
|
|
|
+ return (
|
|
|
+ restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
|
|
|
+ -1
|
|
|
+ )
|
|
|
+ }
|
|
|
+ },
|
|
|
selectionChange(selection) {
|
|
|
console.log(selection, 'selection')
|
|
|
this.materialList1 = []
|
|
@@ -1386,6 +1399,7 @@ export default {
|
|
|
let data = { ...this.planForm }
|
|
|
data.salerId = data.saleMan
|
|
|
data.mapList = this.selectionList
|
|
|
+ data.userName = getCookie('loginName')
|
|
|
this.axios.post('/api/v1/ams/addTransPlan', data).then(res => {
|
|
|
if (res.data.status == 'succeed') {
|
|
|
this.$message.success('添加成功!')
|