|
|
@@ -73,15 +73,15 @@
|
|
|
</template>
|
|
|
|
|
|
<template slot="goodsNum" slot-scope="{ row }">
|
|
|
- <el-input v-if="row.goodsNumtype" size="small" v-model="row.goodsNum" style="width: 100%"></el-input>
|
|
|
+ <el-input v-if="!mingxibaocun" size="small" v-model="row.goodsNum" style="width: 100%"></el-input>
|
|
|
<span v-else>{{ row.goodsNum }}</span>
|
|
|
</template>
|
|
|
<template slot="price" slot-scope="{ row }">
|
|
|
- <el-input v-if="row.pricetype" size="small" v-model="row.price" style="width: 100%"></el-input>
|
|
|
+ <el-input v-if="!mingxibaocun" size="small" v-model="row.price" style="width: 100%"></el-input>
|
|
|
<span v-else>{{ row.price }}</span>
|
|
|
</template>
|
|
|
<template slot="dot" slot-scope="{ row }">
|
|
|
- <el-select v-if="row.dotedittype && row.whether=='1'" v-model="row.dot" allow-create filterable default-first-option >
|
|
|
+ <el-select v-if="!mingxibaocun && row.whether=='1'" v-model="row.dot" allow-create filterable default-first-option >
|
|
|
<el-option v-for="(item, index) in picihaolist" :key="index" :label="item.dot"
|
|
|
:value="item.dot"></el-option>
|
|
|
</el-select>
|
|
|
@@ -89,7 +89,7 @@
|
|
|
</template>
|
|
|
|
|
|
<template slot="remarks" slot-scope="{ row }">
|
|
|
- <el-input v-if="row.pricetype" size="small" v-model="row.remarks" style="width: 100%"></el-input>
|
|
|
+ <el-input v-if="!mingxibaocun" size="small" v-model="row.remarks" style="width: 100%"></el-input>
|
|
|
<span v-else>{{ row.remarks }}</span>
|
|
|
</template>
|
|
|
<!-- <template slot-scope="{scope,row}" slot="goodsNum">
|
|
|
@@ -199,7 +199,7 @@
|
|
|
@input="amountChange(row)" style="width: 100%" />
|
|
|
</template>
|
|
|
<template slot="dot" slot-scope="{row}">
|
|
|
- <el-select v-model="row.dot" allow-create filterable default-first-option @focus="picihaolistfun(row.goodsId)">
|
|
|
+ <el-select v-model="row.dot" allow-create filterable default-first-option @focus="picihaolistfun(row.id)">
|
|
|
<el-option v-for="(item, index) in picihaolist" :key="index" :label="item.dot"
|
|
|
:value="item.dot"></el-option>
|
|
|
</el-select>
|
|
|
@@ -236,7 +236,18 @@
|
|
|
|
|
|
<script>
|
|
|
import { getDetails as getCustom } from "@/api/tirePartsMall/basicData/customerInformation"
|
|
|
-import { getDetails, submit, generateShipTask, tradingBox, delOrderItem, checkOrder, confirmRefund, revokeCheckOrder, revokeGenerateShipTask, goodsListXs } from "@/api/tirePartsMall/salesManagement/saleOrder";
|
|
|
+import {
|
|
|
+ getDetails,
|
|
|
+ submit,
|
|
|
+ generateShipTask,
|
|
|
+ tradingBox,
|
|
|
+ delOrderItem,
|
|
|
+ checkOrder,
|
|
|
+ confirmRefund,
|
|
|
+ revokeCheckOrder,
|
|
|
+ goodsListXs,
|
|
|
+ revokeGenerateShipTask, goodsPageXs
|
|
|
+} from "@/api/tirePartsMall/salesManagement/saleOrder";
|
|
|
import { dotList, goodsDetail } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
|
|
|
import reportDialog from "@/components/report-dialog/main";
|
|
|
import { dateFormat } from "@/util/date";
|
|
|
@@ -248,6 +259,7 @@ import TicketDistribution from "../../../oceanShipping/maritimeExport/components
|
|
|
import M from "minimatch";
|
|
|
import da from "element-ui/src/locale/lang/da";
|
|
|
import { number } from "echarts";
|
|
|
+import {getCorpTypes} from "@/api/tirePartsMall/basicData/commodityInformation";
|
|
|
export default {
|
|
|
name: "detailsPage",
|
|
|
|
|
|
@@ -282,7 +294,7 @@ export default {
|
|
|
size: "small",
|
|
|
props: {
|
|
|
labelText: "标题",
|
|
|
- label: "cname",
|
|
|
+ label: "title",
|
|
|
value: "id",
|
|
|
}
|
|
|
},
|
|
|
@@ -865,6 +877,7 @@ export default {
|
|
|
detailData: Object
|
|
|
},
|
|
|
async created() {
|
|
|
+ console.log(this.detailData.id)
|
|
|
// console.log(this.$route);
|
|
|
// if(this.$route.query.check.actId){
|
|
|
|
|
|
@@ -1093,8 +1106,8 @@ export default {
|
|
|
},
|
|
|
// 获取左侧筛选
|
|
|
getAllWorkDicts(){
|
|
|
- listAll().then(res => {
|
|
|
- console.log(res.data,1050)
|
|
|
+ getCorpTypes().then(res => {
|
|
|
+ // console.log(res.data,1050)
|
|
|
this.treeDataGoods = res.data.data;
|
|
|
});
|
|
|
},
|
|
|
@@ -1102,7 +1115,7 @@ export default {
|
|
|
nodeClick(data) {
|
|
|
this.treeDeptId = data.id;
|
|
|
this.page.currentPage = 1;
|
|
|
- this.onLoadfun(this.page, {brandId:this.treeDeptId});
|
|
|
+ this.onLoadfun(this.page, {goodsTypeId:this.treeDeptId});
|
|
|
},
|
|
|
closeGoods() {
|
|
|
this.treeDataGoods = [];
|
|
|
@@ -1115,34 +1128,6 @@ export default {
|
|
|
this.page.currentPage = 1;
|
|
|
this.onLoadfun(this.page);
|
|
|
},
|
|
|
- // 这个方法是解决 this.onLoad is not a function 的问题 喜欢函数名和变量名用一样的是吧？ 嗯？
|
|
|
- onaloadfun(page, params = { artsVision: this.form.belongToCorpId }) {
|
|
|
- this.loading = true;
|
|
|
- getList({
|
|
|
- ...params,
|
|
|
- current: page.currentPage,
|
|
|
- size: page.pageSize,
|
|
|
- billType:page.billType,
|
|
|
- upAndDownShelves:1,
|
|
|
- }).then(res=>{
|
|
|
- console.log(res,1213)
|
|
|
- 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;
|
|
|
- })
|
|
|
- // 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;
|
|
|
- // });
|
|
|
- },
|
|
|
//选中触发
|
|
|
selectionChange(list) {
|
|
|
this.tableData = list
|
|
|
@@ -1211,111 +1196,81 @@ export default {
|
|
|
}
|
|
|
page.goodsId = item.goodsId
|
|
|
let obj = {}
|
|
|
- goodsDetail({ id: page.goodsId, customId: this.dicUrlWithCustomId, stock: page.storageId ? page.storageId : '' }).then(res=>{
|
|
|
- console.log(res.data.data,1141)
|
|
|
- // 单位
|
|
|
- obj.units = res.data.data.unit
|
|
|
- // 判断批次号是否可以编辑
|
|
|
- obj.whether = res.data.data.whether,
|
|
|
- dotList(page).then(res=>{
|
|
|
- console.log(res.data,'获取到的数据')
|
|
|
- if(res.data.data.length>0){
|
|
|
- // if (item.price) {
|
|
|
- //
|
|
|
- // }
|
|
|
- obj.inventory = res.data.data[0].balanceQuantity,
|
|
|
- obj.pattern = res.data.data[0].brandItem,
|
|
|
- obj.goodsDescription = res.data.data[0].productDescription,
|
|
|
- obj.dot = res.data.data[0].dot,
|
|
|
- // 轮胎编码
|
|
|
- obj.goodsNo = res.data.data[0].code
|
|
|
- // 规格型号
|
|
|
- obj.propertyName = res.data.data[0].typeno,
|
|
|
- // 小计
|
|
|
- obj.subTotalMoney = item.goodsNum * res.data.data[0].inventoryCostPrice
|
|
|
- }
|
|
|
- this.form.orderItemsList.push({
|
|
|
- ...obj,
|
|
|
- price:item.price,
|
|
|
- goodsId:item.goodsId,
|
|
|
- goodsName:item.cname,
|
|
|
- goodsNum:item.goodsNum,
|
|
|
- brandName:item.brandName,
|
|
|
- brandId:item.brandId,
|
|
|
-
|
|
|
- // sendNum:res.data.data[0],
|
|
|
- // 备注
|
|
|
- remarks:item.remarks,
|
|
|
- // 批次号的状态
|
|
|
- dotedittype:false,
|
|
|
- // 价格数量
|
|
|
- goodsNumtype:false,
|
|
|
- // 价格
|
|
|
- pricetype:false,
|
|
|
- // 编辑保存的状态
|
|
|
- mingxibaocun:true
|
|
|
-
|
|
|
- })
|
|
|
- })
|
|
|
+ this.form.orderItemsList.push({
|
|
|
+ goodsId:item.id,
|
|
|
+ price:item.price,
|
|
|
+ goodsName:item.cname,
|
|
|
+ goodsNum:item.goodsNum,
|
|
|
+ brandName:item.brandName,
|
|
|
+ brandId:item.brandId,
|
|
|
+ goodsNo:item.code,
|
|
|
+ propertyName: item.specificationAndModel,
|
|
|
+ inventory:item.inventory,
|
|
|
+ pattern:item.brandItem,
|
|
|
+ goodsDescription:item.goodsDescription,
|
|
|
+ dot:item.dot,
|
|
|
+ whether:item.whether,
|
|
|
+ units:item.unit,
|
|
|
+ // 备注
|
|
|
+ remarks:item.remarks,
|
|
|
+ // 批次号的状态
|
|
|
+ dotedittype:false,
|
|
|
+ // 价格数量
|
|
|
+ goodsNumtype:false,
|
|
|
+ // 价格
|
|
|
+ pricetype:false,
|
|
|
})
|
|
|
-
|
|
|
}
|
|
|
this.dialogVisible = false
|
|
|
},
|
|
|
// 导入
|
|
|
goodsListSaveHandle(){
|
|
|
+ this.tableData = this.goodsListSave
|
|
|
this.tableDataHandle()
|
|
|
},
|
|
|
|
|
|
//导入轮胎弹窗列表查询
|
|
|
onLoadfun(page, params = { artsVision: this.form.belongToCorpId }) {
|
|
|
this.loading = true;
|
|
|
- getList({
|
|
|
+ console.log(params,page,1284)
|
|
|
+ goodsPageXs({
|
|
|
...params,
|
|
|
current: page.currentPage,
|
|
|
size: page.pageSize,
|
|
|
- billType:page.billType,
|
|
|
- upAndDownShelves:1,
|
|
|
+ customId:this.form.customerId,
|
|
|
+ stock:this.form.storageId,
|
|
|
+ enableOrNot:1,
|
|
|
}).then(res=>{
|
|
|
- console.log(res,1213)
|
|
|
+ // console.log(res,1213)
|
|
|
const data = res.data.data;
|
|
|
this.page.total = data.total;
|
|
|
this.pageList.total = data.total
|
|
|
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
|
|
|
- dotList(page).then(res=>{
|
|
|
- // console.log(res.data.data[0].inventoryCostPrice)
|
|
|
- item.price = res.data.data[0].inventoryCostPrice
|
|
|
- // console.log(item)
|
|
|
- })
|
|
|
+ item.goodsNum = item.goodsNum?item.goodsNum:0
|
|
|
}
|
|
|
- // 打开弹窗
|
|
|
- // this.dialogVisible = true
|
|
|
-
|
|
|
+ // // 获取单价数据
|
|
|
+ // for(let item of this.goodsListShow) {
|
|
|
+ // let page = {}
|
|
|
+ // if (this.form.storageId) {
|
|
|
+ // page.storageId = this.form.storageId
|
|
|
+ // }
|
|
|
+ // page.goodsId = item.goodsId
|
|
|
+ // dotList(page).then(res=>{
|
|
|
+ // // console.log(res.data.data[0].inventoryCostPrice)
|
|
|
+ // item.price = res.data.data[0].inventoryCostPrice
|
|
|
+ // // console.log(item)
|
|
|
+ // })
|
|
|
+ // }
|
|
|
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.goodsId)
|
|
|
+ this.picihaolistfun(row.id)
|
|
|
row.dotedittype = true
|
|
|
// 价格数量
|
|
|
row.goodsNumtype = true
|
|
|
@@ -2147,12 +2102,12 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
console.log('新增了', row);
|
|
|
- console.log(this.form.storageId,2038)
|
|
|
- if (this.form.storageId) {
|
|
|
- this.page.billType = 0
|
|
|
- }else {
|
|
|
- this.page.billType = 1
|
|
|
- }
|
|
|
+ // console.log(this.form.storageId,2038)
|
|
|
+ // if (this.form.storageId) {
|
|
|
+ // this.page.billType = 0
|
|
|
+ // }else {
|
|
|
+ // this.page.billType = 1
|
|
|
+ // }
|
|
|
this.getAllWorkDicts()
|
|
|
this.refreshChange()
|
|
|
|
caojunjie