问题修改

master
jinna 11 months ago
parent 69c32ad96b
commit 6f0457633a
  1. 9
      src/views/customerFeedback/feedback.vue
  2. 12
      src/views/goodsManagement/examineList.vue
  3. 4
      src/views/goodsManagement/reciviceList.vue

@ -65,6 +65,7 @@
:on-remove="handleRemove" :on-remove="handleRemove"
accept=".png,.jpg" accept=".png,.jpg"
:file-list="imgList" :file-list="imgList"
:headers="headers"
:disabled="viewType == 'view'" :disabled="viewType == 'view'"
:class="{ 'hide-upload-btn': viewType == 'view' }"> :class="{ 'hide-upload-btn': viewType == 'view' }">
<i class="el-icon-plus" ></i> <i class="el-icon-plus" ></i>
@ -83,6 +84,8 @@
</template> </template>
<script> <script>
import website from '@/config/website';
import { getToken, removeToken, removeRefreshToken } from '@/util/auth';
import {getFeedList,getDetail,updateFeedback,saveFeedback} from '@/api/feedback/feedback' import {getFeedList,getDetail,updateFeedback,saveFeedback} from '@/api/feedback/feedback'
import {getChildList} from '@/api/system/dictbiz' import {getChildList} from '@/api/system/dictbiz'
export default { export default {
@ -114,6 +117,7 @@ export default {
children: 'children' children: 'children'
} }
}, },
headers:{},
option: { option: {
height: 'auto', height: 'auto',
calcHeight: 80, calcHeight: 80,
@ -223,6 +227,11 @@ export default {
} }
}, },
created() { created() {
this.headers = {
"Authorization": `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`,
'Blade-Auth': 'bearer ' + getToken(),
'Blade-Requested-With': 'BladeHttpRequest'
}
getChildList(1,100,'1850021405049475074').then(res =>{ getChildList(1,100,'1850021405049475074').then(res =>{
this.typeList = res.data.data this.typeList = res.data.data
}) })

@ -387,8 +387,20 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
let query = {
id:this.receiveForm.id,
status:-1,
reason:this.receiveForm.reason
}
approveGoods(query).then(res =>{
if(res.data.code == 200){
this.$message.success('驳回成功') this.$message.success('驳回成功')
this.onLoad()
this.dialogReceive = false this.dialogReceive = false
}
})
// this.$message.success('')
// this.dialogReceive = false
}) })
}, },
// //

@ -22,8 +22,8 @@
</el-tag> </el-tag>
</template> </template>
<template slot-scope="{ row }" slot="status"> <template slot-scope="{ row }" slot="status">
<el-tag :type="row.status == 0 ? '' : row.status == 1 ? 'success' : row.status == 2 ? 'info' : 'warning'"> <el-tag :type="row.status == 0 ? '' : row.status == 1 ? 'success' : row.status == 2 ? 'info' : row.status == -1 ? 'danger' : 'warning'">
{{ row.status == 0 ? '待审批' : row.status == 1 ? '待领取' : row.status == 2 ? '已完成' : row.status == 3 ? '待归还' : '' {{ row.status == 0 ? '待审批' : row.status == 1 ? '待领取' : row.status == 2 ? '已完成' : row.status == 3 ? '待归还' : row.status == -1 ? '已驳回' : ''
}} }}
</el-tag> </el-tag>
</template> </template>

Loading…
Cancel
Save