diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue index 0b5b09e..a2d75bf 100644 --- a/src/views/invoicing/operation_in.vue +++ b/src/views/invoicing/operation_in.vue @@ -345,16 +345,16 @@ export default { this.resetForm = { ...this.queryForm } this.tbShopPurveyorGet() console.log(this.$route.query.consdata) - if (this.$route.query.consdata) { - let arr = this.$route.query.consdata.map(item => { - item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true) - item.stockNumber = 0 - item.costPrice = item.price - item.conInfoId = item.id - return item - }) - this.tableData.list = [...this.tableData.list, ...arr] - } + // if (this.$route.query.consdata) { + // let arr = this.$route.query.consdata.map(item => { + // item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true) + // item.stockNumber = 0 + // item.costPrice = item.price + // item.conInfoId = item.id + // return item + // }) + // this.tableData.list = [...this.tableData.list, ...arr] + // } }, methods: { async querySearchAsync(queryString, cb) {//快捷搜索 diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue index 29de460..6f8d297 100644 --- a/src/views/invoicing/operation_out.vue +++ b/src/views/invoicing/operation_out.vue @@ -40,8 +40,7 @@ - + {{ queryForm.waitAmount }} @@ -120,13 +119,14 @@ @change="consCountTotal($event, scope.row, 'price')">
原价￥ - {{ !scope.row.unit ? - (scope.row.defaultUnit ? - scope.row.defaultUnit== scope.row.conUnitTwo? - ((scope.row.costPrice*scope.row.conUnitTwoConvert).toFixed(2)): scope.row.costPrice:scope.row.costPrice) - : scope.row.unit== scope.row.conUnitTwo? - ((scope.row.costPrice*scope.row.conUnitTwoConvert).toFixed(2)): scope.row.costPrice}} - / + {{ !scope.row.unit ? + (scope.row.defaultUnit ? + scope.row.defaultUnit == scope.row.conUnitTwo ? + ((scope.row.costPrice * scope.row.conUnitTwoConvert).toFixed(2)) : + scope.row.costPrice : scope.row.costPrice) + : scope.row.unit == scope.row.conUnitTwo ? + ((scope.row.costPrice * scope.row.conUnitTwoConvert).toFixed(2)) : scope.row.costPrice }} + / {{ !scope.row.unit ? (scope.row.defaultUnit ? scope.row.defaultUnit : scope.row.conUnit) : scope.row.unit }} @@ -154,13 +154,13 @@
出库前： - {{ !scope.row.unit ? - (scope.row.defaultUnit ? - scope.row.defaultUnit== scope.row.conUnitTwo? - (scope.row.number/scope.row.conUnitTwoConvert): scope.row.number:scope.row.number) - : scope.row.unit== scope.row.conUnitTwo? - (scope.row.number/scope.row.conUnitTwoConvert): scope.row.number}} - + {{ !scope.row.unit ? + (scope.row.defaultUnit ? + scope.row.defaultUnit == scope.row.conUnitTwo ? + (scope.row.number / scope.row.conUnitTwoConvert) : scope.row.number : scope.row.number) + : scope.row.unit == scope.row.conUnitTwo ? + (scope.row.number / scope.row.conUnitTwoConvert) : scope.row.number }} + {{ !scope.row.unit ? (scope.row.defaultUnit ? scope.row.defaultUnit : scope.row.conUnit) : scope.row.unit }}
@@ -208,7 +208,8 @@ @@ -260,7 +261,7 @@ import { tbShopPurveyorGet, tbProductStockOperateOutAndOn, stockInOut, tbConsInf import { formatDecimal } from '@/utils' export default { - name:'operation_out', + name: 'operation_out', components: { shopList, ConsumableList @@ -342,6 +343,18 @@ export default { mounted() { this.resetForm = { ...this.queryForm } this.tbShopPurveyorGet() + if (this.$route.query.consdata) { + this.queryForm.purveyorId = Number(this.$route.query.purveyorId)//供应商id + console.log(this.$route.query.purveyorId) + let arr = this.$route.query.consdata.map(item => { + item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true) + item.stockNumber = 0 + item.costPrice = item.price + item.conInfoId = item.id + return item + }) + this.tableData.list = [...this.tableData.list, ...arr] + } }, methods: { async querySearchAsync(queryString, cb) {//快捷搜索 @@ -562,7 +575,7 @@ export default { }, // 切换类型 changeTypeEnum(index) { - let filterd= this.purveyorList.filter(ele=>ele.id == index) + let filterd = this.purveyorList.filter(ele => ele.id == index) this.queryForm.waitAmount = filterd[0].waitAmount if (this.queryForm.purveyorId) { diff --git a/src/views/invoicing/supplier_manage/purchase_detail.vue b/src/views/invoicing/supplier_manage/purchase_detail.vue index 1711d61..c3a5fb0 100644 --- a/src/views/invoicing/supplier_manage/purchase_detail.vue +++ b/src/views/invoicing/supplier_manage/purchase_detail.vue @@ -210,7 +210,7 @@ gettbConsInfoFlowstock(); }" /> -->
-
转出库单
+
转出库单
@@ -467,26 +467,31 @@ export default { console.log(error) } }, - wstockChange(e) { - this.stockData.page = e - 1; - this.gettbConsInfoFlowstock(); - }, + // wstockChange(e) { + // this.stockData.page = e - 1; + // this.gettbConsInfoFlowstock(); + // }, func() { this.$router.push({ - name: 'operation_in', + name: 'operation_out', query: { - consdata: this.consdata + consdata: this.consdata, + purveyorId:this.stockData.purveyorId } }) }, async gettbConsInfoFlowstock(item) { console.log(item) - if (item) { + if (item.conFlows) { this.stockData.id = item.id + this.stockData.purveyorId = item.purveyorId//供应商id this.consdata = item.cons this.stockData.data = item.conFlows + this.variabilityshow = true + }else{ + this.$message({ message: '暂无数据!' }); } - this.variabilityshow = true + // this.stockData.loading = true; let arr = [] // if (this.query.createdAt.length) { diff --git a/src/views/order_manage/meituan.vue b/src/views/order_manage/meituan.vue new file mode 100644 index 0000000..42baab1 --- /dev/null +++ b/src/views/order_manage/meituan.vue @@ -0,0 +1,204 @@ + + + diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue index 85fa562..6d7a7ec 100644 --- a/src/views/product/add_shop.vue +++ b/src/views/product/add_shop.vue @@ -1049,6 +1049,25 @@ export default { } else { await tbProductPost(this.form); } + // 点击确定之后自动删除上面的导航栏 + try { + let view = this.$store.state.tagsView.visitedViews[this.$store.state.tagsView.visitedViews.findIndex(item => item.name === 'add_shop')] + // 删除导航栏 + this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => { + // 默认保存成功删除上面add_shop导航栏 + const latestView = visitedViews.slice(-1)[0] + if (latestView) { + this.$router.push(latestView) + } else { + if (view.name === 'Dashboard') { + // to reload home page + this.$router.replace({ path: '/redirect' + view.fullPath }) + } else { + this.$router.push('/') + } + } + }) + } catch (error) { } this.$notify({ title: "成功", message: `${this.form.id ? "编辑" : "添加"}成功`, diff --git a/src/views/tool/Instead/components/choose-quan-goods.vue b/src/views/tool/Instead/components/choose-quan-goods.vue index 056bc6b..a3b00e1 100644 --- a/src/views/tool/Instead/components/choose-quan-goods.vue +++ b/src/views/tool/Instead/components/choose-quan-goods.vue @@ -2,28 +2,21 @@
- +
取消 - 确认核销 + 确认核销
- - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/tool/Instead/components/keyboard copy.vue b/src/views/tool/Instead/components/keyboard copy.vue index 8436f1f..7e23b71 100644 --- a/src/views/tool/Instead/components/keyboard copy.vue +++ b/src/views/tool/Instead/components/keyboard copy.vue @@ -27,7 +27,7 @@
- +
0
0
-
- +
+ + fill="#333333" p-id="1468">
@@ -80,7 +66,7 @@ export default { default: false, }, max: { - type: [Number,String], + type: [Number, String], default: Infinity, }, value: { @@ -108,22 +94,23 @@ export default { }, methods: { clearFunction() { - if(this.isFloat){ + if (this.isFloat) { return this.keyboradAdd('.') } - this.$emit("clear", this.number); + // this.$emit("clear", this.number); }, keyboradAdd(n) { - if(n=='.'&& `${this.number}`.includes('.')){ + if (n == '.' && `${this.number}`.includes('.')) { return } if (Number(this.number) == 0) { - return (this.number = n); + if (n == '.') { + return (this.number = 0 + n); + } } const newval = this.number + n; - console.log(newval) - if (newval*1 > this.max*1) { - return this.$message( this.maxTips); + if (newval * 1 > this.max * 1) { + return this.$message(this.maxTips); } this.number = newval; }, @@ -143,7 +130,7 @@ export default { }; -