Merge branch 'dev1.8'

src/components/uploadFile.vue

@@ -15,7 +15,7 @@
             :on-format-error="formatError"
             name="transferAccounts"
             :data="uploadData"
-            :max-size="15120"
+            :max-size="10240"
             class="pay-load"
         >
             <Button class="find-btn">浏览</Button>
@@ -58,7 +58,7 @@
                 this.$Notice.error({title: '上传失败'})
             },
             handleExceeded() {// 文件超出指定大小限制
-                this.$Notice.warning({title: '上传文件内存应小于14M'})
+                this.$Notice.warning({title: '上传文件内存应小于10M'})
             },
             formatError() {// 文件格式验证失败
                 this.$Notice.warning({

src/views/order/components/bigOrder.vue

@@ -51,7 +51,15 @@
 
                     <div v-if="creAuth !== '3'">
                         <FormItem label="付费子账号数量">
-                            <Input v-model="member.paySub" type="tel" placeholder="请填写付费子账号数量" maxlength="4" @on-keyup="payHandler" @on-blur="payBlur"></Input>
+                            <Input 
+                                v-model="member.paySub" 
+                                type="tel" 
+                                placeholder="请填写付费子账号数量" 
+                                maxlength="4" 
+                                @on-keyup="payHandler" 
+                                @on-change="payChange" 
+                                @on-blur="payBlur"
+                            ></Input>
                         </FormItem>
                         <FormItem label="免费子账号数量">
                             <Input v-model="member.freeSub" type="tel" maxlength="4" @on-keyup="freeHandler" placeholder="请填写免费子账号数量"></Input>
@@ -675,10 +683,12 @@ export default {
             }
         },
         payHandler() {// 子账号金额
+            this.member.paySub=this.member.paySub.replace(/[^\d]+/g,'')
+        },
+        payChange() {
             if (this.creAuth == 2) {
                 this.member.orderMoney = parseInt(this.member.paySub==''?0:this.member.paySub) * 2000
             }
-            this.member.paySub=this.member.paySub.replace(/[^\d]+/g,'')
             this.member.subMoney = parseInt(this.member.paySub==''?0:this.member.paySub) * 2000
             if (this.member.subMoney == 0) {
                 this.subDis = true

src/views/order/components/detailModel.vue

@@ -56,7 +56,7 @@
                 </FormItem>
               </Col>
               <Col span="8">
-                <FormItem prop="returnCode">
+                <FormItem prop="">
                   <Input 
                     v-model="returned.returnCode" 
                     type="text" 
@@ -117,12 +117,12 @@
         </div>
     </Modal>
     <!-- 退款登记 -->
-    <Modal title="退款登记" v-model="tShow" class-name="order-model tui-model" @on-visible-change="visibleChange">
+    <Modal title="退款登记" v-model="tShow" class-name="order-model tui-model" :mask-closable="false" @on-visible-change="visibleChange">
       <Form ref="models" :model="models" :rules="refundRuleValidate" :label-width="110">
         <FormItem label="退款金额" prop="refundMoney">
             <Input v-model="models.refundMoney" type="text" :maxlength="9" placeholder="请输入退款金额" @on-keyup="models.refundMoney=inptReg(models.refundMoney)"></Input>
         </FormItem>
-        <FormItem label="退款原因" prop="refundReason">
+        <FormItem label="退款原因" prop="">
           <Input v-model="models.refundReason" type="textarea" size="large" :autosize="{minRows: 2,maxRows: 5}" placeholder="请填写退款原因"></Input>
         </FormItem>
       </Form>
@@ -314,21 +314,30 @@ export default {
     defeated() {// 订单审核失败
         this.audFunc(3)
     },
+    qmxed() {
+      if (this.isStatus == 'qmx') {
+        return this.returnInfo.money == this.models.refundMoney * 100 ? 1 : 2
+      } else {
+        return this.models.refundMoney * 100 > this.payMoney || this.models.refundMoney * 100 == this.payMoney ? 1 : 2
+      }
+    },
     subSave (name) {// 退款
       let sums = 0
-      this.returnRes.forEach(v => {
-        sums = sums + v.return_money
-      })
-      if (parseInt(this.models.refundMoney) > sums / 100) {
-        this.$Message.warning('退款金额不能大于实收金额')
-        return
+      if (this.isStatus == 'qmx') {
+        this.returnRes.forEach(v => {
+          sums = sums + v.return_money
+        })
+        if (parseInt(this.models.refundMoney) > sums / 100) {
+          this.$Message.warning('退款金额不能大于实收金额')
+          return
+        }
       }
       let obj = {
         orderCode: this.orderDetail.order_code,
         refundMoney: parseInt(this.models.refundMoney * 100),
         refundReason: this.models.refundReason,
         isOffline: this.isStatus == 'qmx'? 1 : 0,
-        refundStatus: this.payMoney == this.models.refundMoney ? 1 : 2
+        refundStatus: this.qmxed()
       }
       this.$refs[name].validate((valid) => {
         if (valid) {

src/views/order/components/details.vue

@@ -8,7 +8,7 @@
                     <span><p>订单编号：</p> {{orDetails?orDetails.order_code:'--'}}</span>
                     <span v-if="orDetails.product_type == '大会员-AI中标预测包'||orDetails.product_type == '大会员-招标文件解读'"><p>产品类型：</p>大会员-补充包</span>
                     <span v-else><p>产品类型：</p>{{orDetails?orDetails.product_type:'--'}}</span>
-                    <span v-if="book.source == 'qmx'">
+                    <span v-if="book.source == 'qmx'||orderType == 3||orderType == 6||orderType == 7||orderType == 8||orderType == 9||orderType == 10">
                         <p>销售人员：</p>
                         <Input 
                             class="sale-inpt"
@@ -203,7 +203,7 @@
             <Divider />
         </div>
         <!-- 支付信息 -->
-        <div class="infor-card" v-if="orderType != 7&&orderType != 9&&orderType != 10&&orderType != 13&&orderType != 14">
+        <div class="infor-card" v-if="book.source != 'qmx'">
             <div class="cont">
                 <div class="tit">支付信息</div>
                 <div class="classfity">
@@ -255,7 +255,7 @@
             <div class="cont">
                 <div class="tit">退款信息</div>
                 <div class="classfity">
-                    <span><p>退款状态：</p><i v-if="orDetails">{{orDetails.refund_status?refundStatus(orDetails.refund_status):'--'}}</i></span>
+                    <span><p>退款状态：</p><i v-if="orDetails">{{orDetails?refundStatus(orDetails.refund_status):'--'}}</i></span>
                     <span><p>退款时间：</p><i>{{refundDis?refundRes.refund_time:'--'}}</i></span>
                     <span><p>退款金额：</p><i>{{refundDis?localed(refundRes.refund_money/100):localed(0)}}</i></span>
                     <span><p>退款原因：</p><i>{{refundRes.refund_reason?refundRes.refund_reason:'--'}}</i></span>
@@ -268,7 +268,7 @@
             <div class="cont">
                 <div class="tit">回款信息</div>
                 <div class="classfity">
-                    <span><p>回款状态：</p><i v-if="orDetails">{{orDetails.return_status?returnStatus(orDetails.return_status):'--'}}</i></span>
+                    <span><p>回款状态：</p><i v-if="orDetails">{{orDetails?returnStatus(orDetails.return_status):'--'}}</i></span>
                     <span><p>回款次数：</p><i v-if="returnInfo">{{returnInfo.count?returnInfo.count+'次':'--'}}</i></span>
                     <span><p>实收金额：</p><i v-if="returnInfo">{{returnInfo.money?localed(returnInfo.money/100):'--'}}</i></span>
                 </div>
@@ -286,20 +286,19 @@
                         <span><p>回款时间：</p>{{item.return_time.split(':')[0].split(' ')[0]}}</span>
                         <span><p>回款金额：</p>{{item.return_money?localed(item.return_money/100):localed(0)}}</span>
                         <span><p>回款说明：</p>{{item.return_remark?item.return_remark:'--'}}</span>
-                        <span><p>支付方式：</p>{{item.return_type | backpayType}}</span>
-                        <span><p>支付单号：</p>{{item.return_code}}</span>
+                        <span><p>支付方式：</p>{{item.return_type?backpayType(item.return_type):'--'}}</span>
+                        <span><p>支付单号：</p>{{item.return_code?item.return_code:'--'}}</span>
                         <span><p>支付凭证：</p>
                             <a 
                                 :href="item.return_voucher_url?item.return_voucher_url:'*'" 
                                 target="_blank" 
                                 v-if="item.return_voucher_url"
-                                :download="item.return_voucher_name"
                             >点击查看</a>
                             <i v-else>--</i>
                         </span>
-                        <span><p>发票状态：</p>{{item.return_invoice_status | backInvoiceStatus}}</span>
-                        <span><p>操作人员：</p>{{item.operate_person}}</span>
-                        <span><p>操作时间：</p>{{item.operate_time}}</span>
+                        <span><p>发票状态：</p>{{item?backInvoiceStatus(item.return_invoice_status):'--'}}</span>
+                        <span><p>操作人员：</p>{{item.operate_person?item.operate_person:'--'}}</span>
+                        <span><p>操作时间：</p>{{item.operate_time?item.operate_time:'--'}}</span>
                     </div>
                 </div>
             </div>
@@ -310,7 +309,7 @@
                 <div class="tit">发票信息</div>
                 <div class="classfity">
                     <span><p>发票类型：</p>
-                        <i v-if="orDetails">{{orDetails.applybill_status == '已开具'?orDetails.invoice.invoice_type?orDetails.invoice.invoice_type:'--':'--'}}</i>
+                        <i v-if="orDetails">{{orDetails.applybill_status == '已开具'?orDetails.invoice?orDetails.invoice.invoice_type:'--':'--'}}</i>
                         <i v-else>--</i>
                     </span>
                     <span><p>发票内容：</p>
@@ -340,10 +339,10 @@
                         <i v-else>--</i>
                     </span>
                     <span v-if="orDetails.applybill_status == '已开具'"><p>操作人员：</p>
-                        <i>{{orDetails.invoice.operator?orDetails.invoice.operator:'--'}}</i>
+                        <i>{{orDetails.invoice?orDetails.invoice.operator:'--'}}</i>
                     </span>
                     <span v-if="orDetails.applybill_status == '已开具'"><p>操作时间：</p>
-                        <i>{{orDetails.invoice.operable_time?orDetails.invoice.operable_time:'--'}}</i>
+                        <i>{{orDetails.invoice?orDetails.invoice.operable_time:'--'}}</i>
                     </span>
                 </div>
             </div>
@@ -354,12 +353,12 @@
             <div class="cont">
                 <div class="tit">合同信息</div>
                 <div class="classfity">
-                    <span><p>合同金额：</p> {{contractData.contract_money?localed(contractData.contract_money/100):localed(0)}}</span>
+                    <span><p>合同金额：</p> {{contractData.contract_money?localed(contractData.contract_money/100):'--'}}</span>
                     <span><p>手机号：</p> {{orDetails.user_phone?orDetails.user_phone:'--'}}</span>
                     <span><p>客户名称：</p>{{contractData.customer_name?contractData.customer_name:'--'}}</span>
                     <span><p>协议签订时间：</p>{{contractData.contract_time?contractData.contract_time:'--'}}</span>
                     <span><p>协议编号：</p>{{contractData.contract_code?contractData.contract_code:'--'}}</span>
-                    <span><p>协议状态：</p>{{contractData?contractData.contract_status==1?'已签协议':'不签协议':'--'}}</span>
+                    <span><p>协议状态：</p>{{contractData?contractData.contract_status==1?'已签协议':contractData.contract_status==0?'不签协议':'--':'--'}}</span>
                 </div>
             </div>
             <Divider />
@@ -423,7 +422,7 @@
             :returnRes="returnRes"
             :returnInfo="returnInfo"
             :isStatus="book.source"
-            :payMoney="orDetails.pay_money / 100"
+            :payMoney="orDetails.pay_money"
         ></d-model>
     </div>
 </template>
@@ -431,6 +430,7 @@
 <script>
 import dModel from './detailModel'
 import { ChangeDate, ChangeDate1 } from '../../../assets/js/date.js'
+import { forgetHandleSet } from '../../../../../app/app/jg_app/src/api/getData'
 export default {
     props:{
         orderType: String
@@ -452,8 +452,10 @@ export default {
         },
         orderComp:function() {
             if (this.orDetails.order_status == '1' || this.orDetails.order_status == '已支付') {
-                if (this.orDetails.refund_status == '0' || this.orDetails.refund_status == null) {// 未退款
-                    if ($.isEmptyObject(this.returnRes)==true) {
+                if (this.book.source !== 'qmx'&&this.orDetails.refund_status == null) {
+                    return true
+                } else if (this.orDetails.refund_status == '0') {// 未退款
+                    if ($.isEmptyObject(this.returnRes) == true) {
                         return false
                     } else {
                         return true
@@ -498,7 +500,7 @@ export default {
             if (val == 0) {
                 return '未回款'
             } else if (val == 1) {
-                return '全部回款'
+                return '全额回款'
             } else if (val == 2) {
                 return '部分回款'
             }
@@ -527,6 +529,24 @@ export default {
             const intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')
             return intPartFormat
         },
+        backpayType(val) {
+            if (val == 1) {
+                return '微信'
+            } else if (val == 2) {
+                return '支付宝'
+            } else if (val == 3) {
+                return '对公转账'
+            }
+        },
+        backInvoiceStatus(val) {
+            if (val == 0) {
+                return '未申请'
+            } else if (val == 1) {
+                return '已申请'
+            } else if (val == 2) {
+                return '已开具'
+            }
+        },
         timeChange(val) {
             if (val == 12) {
                 return '1年'
@@ -580,7 +600,11 @@ export default {
         },
         saleBlur() {
             this.saleReadon = true
-            this.salesMen = this.orDetails.salesperson
+            if (this.salesMen == '--') {
+                this.salesMen = '--'
+            } else {
+                this.salesMen = this.orDetails.salesperson
+            }
         },
         inptBtn() {
             this.saleReadon = false
@@ -605,12 +629,6 @@ export default {
                 this.ordered()
             }).post()
         },
-        saveBtn() {
-            // setTimeout(() => {
-                document.getElementById("inptId").focus()
-            // }, 100)
-            this.menBlur()
-        },
         pushInvo() {
             this.$refs.backRef.iShow = true
         },
@@ -629,32 +647,16 @@ export default {
         downContract() {
             this.$Modal.confirm({
                 title: "确定下载该合同吗？",
-                onOk: () => {
-                    window.open(this.contractData.contract_file_url, 'download')
-                    this.ordered()
+                onOk: () => {// 文件下载
+                    const a1 = document.createElement('a')
+                    a1.download = this.contractData.contract_file_name
+                    a1.href = this.contractData.contract_file_url
+                    a1.click()
                 }
             })
         }
     },
     filters: {
-        backpayType(val) {
-            if (val == 1) {
-                return '微信'
-            } else if (val == 2) {
-                return '支付宝'
-            } else if (val == 3) {
-                return '对公转账'
-            }
-        },
-        backInvoiceStatus(val) {
-            if (val == 0) {
-                return '未申请'
-            } else if (val == 1) {
-                return '已申请'
-            } else if (val == 2) {
-                return '已开具'
-            }
-        },
         coursed(val) {
             if (val == 2) {
                 return '未审核'
@@ -728,6 +730,8 @@ export default {
                 return 'color2'
             } else if (val == 1) {
                 return 'color3'
+            } else if (val == 2) {
+                return 'color3'
             }
         },
         orderWord(val) {