Prechádzať zdrojové kódy

Merge branch 'master' into dev2.3.9

lianbingjie 3 rokov pred
rodič
commit
7dc422f921

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
qmx_page/css/app.c48f5fe2.css


+ 1 - 1
qmx_page/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.900f366b.css rel=preload as=style><link href=/css/chunk-vendors.146ef057.css rel=preload as=style><link href=/js/app.bd7e19e6.js rel=preload as=script><link href=/js/chunk-vendors.dbdfae2e.js rel=preload as=script><link href=/css/chunk-vendors.146ef057.css rel=stylesheet><link href=/css/app.900f366b.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.dbdfae2e.js></script><script src=/js/app.bd7e19e6.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.c48f5fe2.css rel=preload as=style><link href=/css/chunk-vendors.146ef057.css rel=preload as=style><link href=/js/app.cfae53ce.js rel=preload as=script><link href=/js/chunk-vendors.dbdfae2e.js rel=preload as=script><link href=/css/chunk-vendors.146ef057.css rel=stylesheet><link href=/css/app.c48f5fe2.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.dbdfae2e.js></script><script src=/js/app.cfae53ce.js></script></body></html>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
qmx_page/js/app.bd7e19e6.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
qmx_page/js/app.cfae53ce.js


+ 10 - 9
src/views/order/components/detailModel.vue

@@ -2,11 +2,12 @@
   <div class="detail-model">
     <!-- 线下开发票 -->
     <Modal title="线下开发票" v-model="iShow" class-name="order-model piao-model" :mask-closable="false" @on-visible-change="visibleChange">
-      <Select placeholder="请选择发票类型" v-model="invoice.type" style="width:100%;margin: 20px 0">
+      <!-- <Select placeholder="请选择发票类型" v-model="invoice.type" style="width:100%;margin: 20px 0">
           <Option v-for="item in invoType" :value="item.n" :key="item.v">{{ item.n }}</Option>
-      </Select>
+      </Select> -->
+      <p style="text-align:center;margin:16px 0;font-size:15px">确定线下开发票吗?如若确定,则会关闭用户线上开票入口。</p>
       <div slot="footer">
-          <Button type="primary" size="large" @click="invoSave" :disabled="isDisable">提交</Button>
+          <Button type="primary" size="large" @click="invoSave" :disabled="isDisable">确定</Button>
           <Button size="large" @click="iShow = false">取消</Button>
       </div>
     </Modal>
@@ -190,15 +191,15 @@ export default {
       }
     },
     invoSave() {// 线下开发票 
-      if (this.invoice.type == '') {
-        this.$Message.warning('请选择发票类型')
-        return
-      }
+      // if (this.invoice.type == '') {
+      //   this.$Message.warning('请选择发票类型')
+      //   return
+      // }
       this.isDisable = true
       this.$request('/order/openInvoice').data({
         orderCode: this.orderDetail.order_code,
-        invoiceType: this.invoice.type,
-        userId: this.orderDetail.user_id
+        // invoiceType: this.invoice.type,
+        // userId: this.orderDetail.user_id
       }).showSuccessTip().success(() => {
         this.$parent.ordered()
         this.iShow = false

+ 2 - 2
src/views/order/components/details.vue

@@ -523,14 +523,14 @@
                 @click="relation"
                 v-else
             >批量回款</Button> -->
-            <!-- <Button 
+            <Button 
                 class="ping-btn" 
                 type="success" 
                 size="large"
                 disabled
                 v-if="orDetails.applybill_status == '已开具' || orDetails.order_status == '已取消' || orDetails.order_status == '待付款' || orDetails.order_status == '未支付'"
             >线下开发票</Button>
-            <Button class="ping-btn" type="success" size="large" @click="pushInvo" v-else>线下开发票</Button> -->
+            <Button class="ping-btn" type="success" size="large" @click="pushInvo" v-else>线下开发票</Button>
             <Button 
                 class="ping-btn" 
                 type="success" 

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov