Prechádzať zdrojové kódy

feat:发票信息展示逻辑调整

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>
tangshizhe 1 rok pred
rodič
commit
0f7fa73402

+ 1 - 1
src/web/templates/pc/check_invoice.html

@@ -75,7 +75,7 @@
         </div>
         <div class="w step clearfix" v-if="selectinvoice.invoice_status !== -1">
             <!-- 进行中 类名为 active  已完成 类名为 finish  未完成默认颜色-->
-            <div id="l" class="pro l" :class="{'active': selectinvoice.invoice_status === 0 || selectinvoice.invoice_status === 1}">已完成</div>
+            <div id="l" class="pro l" :class="{'active': selectinvoice.invoice_status === 0 || selectinvoice.invoice_status === 1}">已提交</div>
             <div id="c" class="pro c" :class="{'active': selectinvoice.invoice_status === 0 || selectinvoice.invoice_status === 1}">财务处理</div>
             <div id="r" class="pro r" :class="{'active': selectinvoice.invoice_status === 0 || selectinvoice.invoice_status === 1, 'finish': selectinvoice.invoice_status === 1}">发票开具</div>
             <div class="rules" data-toggle="modal" data-target="#ruleModal">开票规则</div>

+ 3 - 4
src/web/templates/pc/invoice.html

@@ -186,11 +186,10 @@
 	{{include "/common/pcbottom.html"}}
 	{{include "/common/baiducc.html"}}
     <!-- footer -->
-    <script src="{{Msg "seo" "cdn"}}/common-module/public/js/city-picker.data.js"></script>
-    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/city/city-picker.js"></script>
+    <!-- <script src="{{Msg "seo" "cdn"}}/common-module/public/js/city-picker.data.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/city/city-picker.js"></script> -->
     <!-- custom_select.js 为封装select控件 修改原生select样式 -->
-    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/custom_select.js"></script>
-    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/invoice.js?v={{Msg "seo" "version"}}"></script>
+    <!-- <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/custom_select.js"></script> -->
 	<script>
 		  $(function(){
         var order_code = {{.T.order_code}};

+ 1 - 1
src/web/templates/pc/myOrder.html

@@ -572,7 +572,7 @@
                       <p><a class="go_pay" data-jy-track="click-hover" @click="goPay(item)">去支付</a></p>
                       <p><a data-jy-track="click-hover" @click="goCancel(item)">取消订单</a></p>
                     </div>
-                    <div v-if="item.order_status === 1 && (item.filter.source || '') === ''&& item.filter.badge!='exchange'">
+                    <div v-if="item.order_status === 1 && item.filter.badge!='exchange'">
                       <!--                                        <div v-if="(item.filter.canInvoice !=undefined  && !item.filter.canInvoice)">-->
                       <p><a v-if="item.is_can_invoice" data-jy-track="click-hover"
                           @click="goInvoice(item)">开发票</a></p>