Commit 8d7848c2 authored by 罗超's avatar 罗超

no message

parent 7a0c7fb0
...@@ -629,7 +629,7 @@ import { ...@@ -629,7 +629,7 @@ import {
SchoolId:item.SchoolId, SchoolId:item.SchoolId,
ClassName:'', ClassName:'',
ClassId:'', ClassId:'',
CourseName:item.CourseName, CourseName:'',
SuppliesId:item.Id, SuppliesId:item.Id,
Number:item.Number Number:item.Number
} }
......
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
<div class="row " style="align-items: center;margin: 20px 0;" v-if="saveObj.OrderType==2 || saveObj.ClassScrollType == 2"> <div class="row " style="align-items: center;margin: 20px 0;" v-if="saveObj.OrderType==2 || saveObj.ClassScrollType == 2">
<div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>成本单 <div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>成本单
</div> </div>
<q-table v-if="saveObj.OrderType==2 || saveObj.ClassScrollType == 2" :pagination="financiaMsg" style="padding-bottom:80px;" :loading="floading" no-data-label="暂无相关数据" flat <q-table v-if="saveObj.OrderType==2 || saveObj.OrderType===1 || saveObj.ClassScrollType == 2" :pagination="financiaMsg" style="padding-bottom:80px;" :loading="floading" no-data-label="暂无相关数据" flat
class="sticky-tow-column-table" :hide-pagination="true" :data="dataListCB" :columns="receiptColumns" class="sticky-tow-column-table" :hide-pagination="true" :data="dataListCB" :columns="receiptColumns"
row-key="name"> row-key="name">
<template v-slot:body-cell-FrID="props"> <template v-slot:body-cell-FrID="props">
...@@ -832,7 +832,7 @@ ...@@ -832,7 +832,7 @@
this.dataListCB = [] this.dataListCB = []
this.dataListP = [] this.dataListP = []
data.forEach(x=>{ data.forEach(x=>{
if(x.OtherType==45){ if(x.OtherType==45||x.OtherType==33){
this.dataListCB.push(x) this.dataListCB.push(x)
}else{ }else{
this.dataListP.push(x) this.dataListP.push(x)
......
...@@ -764,7 +764,7 @@ ...@@ -764,7 +764,7 @@
</template> </template>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType != 45||x.OtherType != 33" :key="j" <div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType != 45&&x.OtherType != 33" :key="j"
:style="{ :style="{
background: background:
x.ColorState == 1 x.ColorState == 1
...@@ -827,7 +827,7 @@ ...@@ -827,7 +827,7 @@
</template> </template>
</div> </div>
<div class="row wrap" v-if="item.OrderType == 2 || item.ClassScrollType == 2"> <div class="row wrap" v-if="item.OrderType == 2 || item.ClassScrollType == 2">
<div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType == 45" :key="j" <div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType == 45||x.OtherType == 33" :key="j"
:style="{ :style="{
background: background:
x.ColorState == 1 x.ColorState == 1
...@@ -1640,6 +1640,7 @@ ...@@ -1640,6 +1640,7 @@
item.tab = tab; item.tab = tab;
this.myorderObjOption = item; this.myorderObjOption = item;
this.isShowmyorderForm = true; this.isShowmyorderForm = true;
console.log(this.myorderObjOption,'====')
}, },
//关闭订单详情 //关闭订单详情
closeMOSaveForm() { closeMOSaveForm() {
......
...@@ -81,9 +81,9 @@ export default { ...@@ -81,9 +81,9 @@ export default {
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = 'http://192.168.10.65:8083'; let domainUrl = 'http://192.168.10.2:8083';
let viewFileUrl = 'http://192.168.10.214:8120'; let viewFileUrl = 'http://192.168.10.214:8120';
let mallUrl = "http://192.168.10.46:8200"; let mallUrl = "http://192.168.10.2:8088";
let vtUploadUrl = "http://upload.oytour.com"; let vtUploadUrl = "http://upload.oytour.com";
let vtViewUrl = "http://192.168.10.214:8130"; let vtViewUrl = "http://192.168.10.214:8130";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment