Commit bb7a5044 authored by 黄奎's avatar 黄奎

地接总表查询修改

parent bb94df1f
...@@ -314,7 +314,6 @@ export default { ...@@ -314,7 +314,6 @@ export default {
getGoodsTypeManager() { getGoodsTypeManager() {
this.apipost("Shop_post_GetCommodityCategoryList",{Name: "", ParentId: 0},res => { this.apipost("Shop_post_GetCommodityCategoryList",{Name: "", ParentId: 0},res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
console.log(res.data.data)
this.GoodsTypeList = res.data.data; this.GoodsTypeList = res.data.data;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
...@@ -127,13 +127,10 @@ export default { ...@@ -127,13 +127,10 @@ export default {
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log("res",res);
this.Actitylist = res.data.data; this.Actitylist = res.data.data;
if(this.Actitylist.length>0){ if(this.Actitylist.length>0){
this.msg.CouponId=this.Actitylist[0].Id; this.msg.CouponId=this.Actitylist[0].Id;
} }
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
...@@ -149,7 +146,6 @@ export default { ...@@ -149,7 +146,6 @@ export default {
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.list = res.data.data.pageData; this.list = res.data.data.pageData;
this.total=res.data.data.count; this.total=res.data.data.count;
} else { } else {
...@@ -167,9 +163,7 @@ export default { ...@@ -167,9 +163,7 @@ export default {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.currentPage = 1; this.currentPage = 1;
}, },
}, },
mounted() { mounted() {
this.GetActity(); this.GetActity();
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
...@@ -504,22 +504,23 @@ ...@@ -504,22 +504,23 @@
<div class="link"> <div class="link">
<p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p> <p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
<div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''" <div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
class="colorE95252" style="padding-top:5px;">{{$t('op.DJBZTH')}}:{{outItem.PriceCommonList[index].DMCNum}} class="colorE95252" style="padding-top:5px;padding-bottom:4px;">{{$t('op.DJBZTH')}}<span style="font-weight:bold">{{outItem.PriceCommonList[index].DMCNum}}</span>
</div> </div>
<div v-show="outItem.PriceCommonList[index].OPInnerRemark!=''" class="colorE95252" <div v-show="outItem.PriceCommonList[index].OPInnerRemark!=''" class="colorE95252"
style="padding-top:5px;">{{$t('Operation.Op_remark')}}:{{outItem.PriceCommonList[index].OPInnerRemark}}</div> style="padding-top:5px;padding-bottom:4px;">{{$t('Operation.Op_remark')}}{{outItem.PriceCommonList[index].OPInnerRemark}}</div>
<div v-show="outItem.PriceCommonList[index].OPRemark!=''" class="colorE95252" <div v-show="outItem.PriceCommonList[index].OPRemark!=''" class="colorE95252"
style="padding-top:5px;">{{$t('Operation.Op_duiwaiRemark')}}:{{outItem.PriceCommonList[index].OPRemark}}</div> style="padding-top:5px;padding-bottom:4px;">{{$t('Operation.Op_duiwaiRemark')}}{{outItem.PriceCommonList[index].OPRemark}}</div>
<div v-show="outItem.PriceCommonList[0].DMCRemark!=''" class="colorE95252" <div v-show="outItem.PriceCommonList[index].DMCRemark!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;">{{$t('Operation.Op_dijieRemark')}}:{{outItem.PriceCommonList[index].DMCRemark}} style="padding-top:5px;padding-bottom:4px;">{{$t('Operation.Op_dijieRemark')}}{{outItem.PriceCommonList[index].DMCRemark}}
</div> </div>
<div v-show="outItem.PriceCommonList[0].SupplierRemarks!=''" class="colorE95252" <div v-show="outItem.PriceCommonList[index].SupplierRemarks!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;"> style="padding-top:5px;padding-bottom:4px;">
{{$t('ground.gysbeizhu')}}:{{outItem.PriceCommonList[index].SupplierRemarks}} {{$t('ground.gysbeizhu')}}{{outItem.PriceCommonList[index].SupplierRemarks}}
</div> </div>
<div v-show="outItem.PriceCommonList[0].SupplierToDmcRemarks!=''" class="colorE95252" <div v-show="outItem.PriceCommonList[index].SupplierToDmcRemarks!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;"> style="padding-top:5px;padding-bottom:4px;">
{{$t('ground.gysduindibeizhu')}} :{{outItem.PriceCommonList[index].SupplierToDmcRemarks}} {{$t('ground.gysduindibeizhu')}}{{outItem.PriceCommonList[index].SupplierToDmcRemarks}}
</div> </div>
</div> </div>
</td> </td>
......
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