This commit is contained in:
zhouzy062
parent
6d5c5238d3
commit
0467efb452
|
|
@ -27,7 +27,7 @@ export function ApiSubmitBackApply(query) {
|
|||
})
|
||||
}
|
||||
|
||||
// 详情查看或编辑
|
||||
// 申请页面 详情查看
|
||||
export function getViewByApply(query) {
|
||||
return request({
|
||||
url: '/material/backApply/getViewByApply',
|
||||
|
|
@ -35,7 +35,7 @@ export function getViewByApply(query) {
|
|||
params: query
|
||||
})
|
||||
}
|
||||
// 详情查看或编辑
|
||||
// 审批页面 详情查看或编辑
|
||||
export function getViewByExamine(query) {
|
||||
return request({
|
||||
url: '/material/backApply/getViewByExamine',
|
||||
|
|
@ -104,7 +104,7 @@ export function submitBackApplyApi(data) {
|
|||
})
|
||||
}
|
||||
|
||||
// 退料申请-退料单详情
|
||||
// 退料申请-详情
|
||||
export function materialReturnNoteByApply(query) {
|
||||
return request({
|
||||
url: '/material/backApply/materialReturnNoteByApply',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
// 获取二级库列表
|
||||
export function secondaryWarehouseList(query) {
|
||||
return request({
|
||||
url: '/material/secondaryWarehouse/getList',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -133,6 +133,9 @@
|
|||
<el-button type="text" style="color: #67c23a" v-if="scope.row.taskStatus == '40'">
|
||||
退料完成
|
||||
</el-button>
|
||||
<el-button type="text" style="color: #67c23a" v-if="scope.row.taskStatus == '101'">
|
||||
退料驳回
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true"/>
|
||||
|
|
@ -156,7 +159,7 @@
|
|||
<el-button
|
||||
size="mini"
|
||||
type="info"
|
||||
v-if="scope.row.taskStatus==101&&(scope.row.applyStatus=='2'||scope.row.applyStatus=='4')"
|
||||
v-if="scope.row.taskStatus=='101'"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>驳回提交</el-button>
|
||||
<el-button
|
||||
|
|
@ -625,9 +628,9 @@ export default {
|
|||
pageSize: this.dialogQueryParams.pageSize,
|
||||
}
|
||||
getViewByApply(params).then(res => {
|
||||
// console.log(res)
|
||||
this.loadingList = res.data.rows
|
||||
this.loadingTotal = res.data.total
|
||||
console.log(res)
|
||||
this.loadingList = res.rows
|
||||
this.loadingTotal = res.total
|
||||
})
|
||||
},
|
||||
/** 刷新缓存按钮操作 */
|
||||
|
|
|
|||
|
|
@ -145,13 +145,13 @@
|
|||
<el-table-column label="序号" type="index" min-width="120" />
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
prop="typeCn"
|
||||
prop="typeName"
|
||||
min-width="200"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
prop="guigeCn"
|
||||
prop="typeCode"
|
||||
min-width="200"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
|
@ -237,7 +237,7 @@ import {
|
|||
getUseTypeTreee
|
||||
} from '@/api/claimAndRefund/receive'
|
||||
import { ApiSubmitBackApply } from "@/api/claimAndRefund/return"
|
||||
import { submitBackApplyApi,getViewByApply } from "@/api/claimAndRefund/return.js"
|
||||
import { submitBackApplyApi,materialReturnNoteByApply } from "@/api/claimAndRefund/return.js"
|
||||
import { mapState } from 'vuex'
|
||||
import {
|
||||
getInfo, h
|
||||
|
|
@ -343,8 +343,8 @@ export default {
|
|||
companyId: null,
|
||||
status: 0,
|
||||
typeId: null, // 树结构第4级 规格id
|
||||
typeCn: '', //显示的设备类型
|
||||
guigeCn: '', //显示的设备规格
|
||||
typeName: '', //显示的设备类型
|
||||
typeCode: '', //显示的设备规格
|
||||
unitNames: '', //显示的设备 单位
|
||||
remark: '', //单条备注
|
||||
preNum: 1, //预领数量
|
||||
|
|
@ -488,10 +488,10 @@ export default {
|
|||
|
||||
// 获取 任务详情数据
|
||||
async GetViewByApply(Id) {
|
||||
const res = await getViewByApply({ id:Id })
|
||||
const data = res.data.rows[0]
|
||||
const res = await materialReturnNoteByApply({ id:Id })
|
||||
const data = res.data[0]
|
||||
this.queryParams.unitId = data.unitId
|
||||
this.queryParams.proId = data.projectId
|
||||
this.queryParams.proId = data.proId
|
||||
this.queryParams.phone = data.phone
|
||||
this.queryParams.backPerson = data.backPerson
|
||||
this.queryParams.backTime = data.backTime
|
||||
|
|
@ -499,9 +499,7 @@ export default {
|
|||
this.queryParams.agreementCode = data.agreementCode
|
||||
this.queryParams.remark = data.remark
|
||||
|
||||
this.leaseApplyDetails = res.rows.map(item => {
|
||||
return this.handelEchoData(item)
|
||||
})
|
||||
this.leaseApplyDetails = res.data
|
||||
|
||||
},
|
||||
//生成回显数据
|
||||
|
|
@ -632,31 +630,6 @@ export default {
|
|||
|
||||
/** 保存按钮操作 */
|
||||
handleAdd() {
|
||||
// this.$refs.queryForm.validate(async (valid) => {
|
||||
// if (!valid) {
|
||||
// return false
|
||||
// } else {
|
||||
// console.log("this.queryParams.leaseApplyDetails", this.queryParams.leaseApplyDetails)
|
||||
// if (this.queryParams.leaseApplyDetails.length == 0) {
|
||||
// this.$message.error('请添加并勾选数据');
|
||||
// return
|
||||
// }
|
||||
// this.queryParams.createBy = this.user.name
|
||||
// this.queryParams.companyId = this.user.id
|
||||
// console.log("ApiSubmitBackApplyInfo", this.queryParams)
|
||||
// return
|
||||
// const res = await ApiSubmitBackApply(this.queryParams)
|
||||
// if (res.code == 200) {
|
||||
// this.$message({
|
||||
// type: 'success',
|
||||
// message: '申请成功'
|
||||
// })
|
||||
// setTimeout(() => {
|
||||
// this.$router.back()
|
||||
// }, 1000)
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
this.$refs.queryForm.validate(async (valid) => {
|
||||
if (!valid) {
|
||||
return false
|
||||
|
|
@ -816,8 +789,8 @@ export default {
|
|||
// template.typeId = node.data.id
|
||||
template.unitNames = node.data.unitNames
|
||||
template.preNum = node.data.num
|
||||
template.typeCn = node.pathLabels[2]
|
||||
template.guigeCn = node.pathLabels[3]
|
||||
template.typeName = node.pathLabels[2]
|
||||
template.typeCode = node.pathLabels[3]
|
||||
return template
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@ module.exports = {
|
|||
// target: `http://192.168.0.14:21624`,//线上环境
|
||||
// target: `http://1.12.248.179:23028`,//线上环境-南网
|
||||
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
|
||||
// target: `https://z.csgmall.com.cn/gl`,
|
||||
target: `https://z.csgmall.com.cn`,
|
||||
|
||||
// target: `http://10.40.92.14:8080`,//超
|
||||
// target: `http://10.40.92.4:8080`,//韩
|
||||
target: `http://10.40.92.209:8080`,//川
|
||||
// target: `http://10.40.92.209:8080`,//川
|
||||
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue