提交代码

src/assets/css/common.css

@@ -407,9 +407,9 @@ textarea:-ms-input-placeholder {
 .order-model span {
   font-size: 14px;
 }
-.order-model .pay-load {
+/* .order-model .pay-load {
   float: right;
-}
+} */
 .order-model .pay-load .find-btn {
   position: absolute;
   right: 0;
@@ -626,4 +626,16 @@ textarea:-ms-input-placeholder {
 }
 .back-model .back-row {
   margin-bottom: 20px;
+}
+.upload-file .pay-load .ivu-upload-select {
+  display: block;
+}
+.upload-file .pay-load .ivu-upload-list .ivu-upload-list-file {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0;
+}
+.upload-file .pay-load .ivu-upload-list .ivu-upload-list-file span {
+  font-size: 12px;
 }

src/components/uploadFile.vue

@@ -1,7 +1,9 @@
 <template>
     <div class="upload-file">
         <Input type="text" v-model="payHtml" :placeholder="placeholdered" readonly></Input>
+        <Input type="text" v-model="validateVar" style="display:none"></Input>
         <Upload 
+            :multiple="multipled"
             action="/filemanage/upload"
             :before-upload="beforeImgFile"
             :on-success="handleSuccess"
@@ -9,6 +11,8 @@
             :on-error="handleError"
             :show-upload-list="false"
             :accept="accepted"
+            :format="formated"
+            :on-format-error="formatError"
             name="transferAccounts"
             :data="uploadData"
             :max-size="15120"
@@ -26,7 +30,10 @@
         name: "uploadFile",
         props: {
             placeholdered: String,
-            accepted: String
+            accepted: String,
+            formated: Array,
+            multipled: Boolean,
+            validateVar: String
         },
         data() {
             return {
@@ -53,6 +60,18 @@
             handleExceeded() {// 文件超出指定大小限制
                 this.$Notice.warning({title: '上传文件内存应小于14M'})
             },
+            formatError() {// 文件格式验证失败
+                this.$Notice.warning({
+                    title: '上传文件格式错误',
+                    desc: '格式支持',
+                    render: h => {
+                        return h('span', [
+                            '格式仅支持：',
+                            h('p', this.accepted)
+                        ])
+                    }
+                })
+            }
         },
     }
 </script>

src/views/order/components/bigOrder.vue

@@ -141,7 +141,14 @@
                         ></Input>
                     </FormItem>
                     <FormItem label="合同" class="chuan-pay">
-                        <b-upload ref="uploadRef" @fileData="contractFile" :placeholdered="'请上传合同'" :accepted="'.doc,.pdf,.docx,.jpg,.png,.jpeg'"></b-upload>
+                        <b-upload 
+                            ref="uploadRef" 
+                            @fileData="contractFile" 
+                            :placeholdered="'请上传合同'" 
+                            :accepted="'.doc,.pdf,.docx,.rar,.zip,.jpg,.png,.jpeg'"
+                            :formated="['doc','pdf','docx','rar','zip','jpg','png','jpeg']"
+                            :multipled="false"
+                        ></b-upload>
                     </FormItem>
                     <FormItem label="备注">
                         <Input v-model="member.remark" type="text" :maxlength="40" placeholder="请输入备注"></Input>
@@ -949,30 +956,35 @@ export default {
                     comboId: this.combo_id.id,
                     serversId: this.nums == 0?String(serId):'',
                     serversName: this.nums == 0?String(serName):'',
-                    serversArr: serveData
+                    serversArr: serveData,
+                    remark: this.member.remark
                 }
                 this.urlReq('/order/createBigOrder', obj)
             } else if (this.proNums == 2) {// 子账号
                 let obj = {
                     phone: this.member.phone,
                     products: '',// 产品类型不需要传（传空）
+                    salesperson: this.member.salesperson,
                     paySub: this.member.paySub,
                     freeSub: this.member.freeSub,
                     orderMoney: parseInt(this.member.orderMoney * 100),
                     contractUrl: this.member.contractUrl,
                     isAll: this.isAll ? 1 : this.member.contractUrl ? 3 : 2,
-                    payMoney: parseInt(this.member.payMoney * 100)
+                    payMoney: parseInt(this.member.payMoney * 100),
+                    remark: this.member.remark
                 }
                 this.urlReq('/order/createSubOrder', obj)
             } else if (this.proNums == 3) {// 补充包
                 let obj = {
                     phone: this.member.phone,
                     products: '',// 产品类型不需要传（传空）
+                    salesperson: this.member.salesperson,
                     serversArr: serveData,
                     orderMoney: parseInt(this.member.orderMoney * 100),
                     contractUrl: this.member.contractUrl,
                     isAll: this.isAll ? 1 : this.member.contractUrl ? 3 : 2,
-                    payMoney: parseInt(this.member.payMoney * 100)
+                    payMoney: parseInt(this.member.payMoney * 100),
+                    remark: this.member.remark
                 }
                 this.urlReq('/order/createSupplyOrder', obj)
             }

src/views/order/components/detailModel.vue

@@ -72,12 +72,15 @@
                 </FormItem>
               </Col>
             </Row>
-            <FormItem prop="returnVoucherUrl">
+            <FormItem prop="">
               <b-upload 
                 ref="uploadRef1"
                 @fileData="fileData" 
                 :placeholdered="'请上传凭证'"
                 :accepted="'.jpg,.png,.jpeg'"
+                :formated="['jpg','png','jpeg']"
+                :multipled="false"
+                :validateVar="returned.returnVoucherUrl"
               ></b-upload>
             </FormItem>
           </Form>
@@ -90,7 +93,14 @@
     </Modal>
     <!-- 上传合同 -->
     <Modal title="上传合同" v-model="pShow" class-name="order-model contract-model" :mask-closable="false" @on-visible-change="visibleChange">
-      <b-upload ref="uploadRef2" @fileData="contractFile" :placeholdered="'请上传合同'" :accepted="'.doc,.pdf,.docx,.jpg,.png,.jpeg'"></b-upload>
+      <b-upload 
+        ref="uploadRef2" 
+        @fileData="contractFile" 
+        :placeholdered="'请上传合同'" 
+        :accepted="'.doc,.pdf,.docx,.rar,.zip,.jpg,.png,.jpeg'"
+        :formated="['doc','pdf','docx','rar','zip','jpg','png','jpeg']"
+        :multipled="false"
+      ></b-upload>
       <div slot="footer">
           <Button type="primary" size="large" @click="pingSub" :disabled="isDisable">提交</Button>
           <Button size="large" @click="pingCancel">取消</Button>
@@ -413,6 +423,9 @@ export default {
         ],
         returnInvoiceStatus: [
           { required: true, message: '请选择发票状态', trigger: 'change' }
+        ],
+        returnVoucherUrl: [
+          { required: true, message: '请上传凭证', trigger: 'change' }
         ]
       },
       refundRuleValidate: {

src/views/order/components/details.vue

@@ -16,7 +16,9 @@
                             type="text" 
                             placeholder="请输入销售人员姓名" 
                             @on-enter="menBlur"
+                            @on-blur="saleBlur"
                             element-id="inptId"
+                            :readonly="saleReadon"
                         ></Input>
                         <Button type="primary" @click="inptBtn">编辑</Button>
                     </span>
@@ -281,12 +283,20 @@
                     <i v-if="returnResed" style="color:#888">暂无回款交易详情</i>
                     <div v-for="(item,index) in returnRes" :key="item.id" v-else>
                         <p style="font-weight:700">回款 {{index + 1}}. </p>
-                        <span><p>回款时间：</p>{{item.return_time}}</span>
+                        <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><a :href="item.return_voucher_url?item.return_voucher_url:'*'" target="_blank">{{item.return_voucher_url?"点击查看":'--'}}</a></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>
@@ -381,7 +391,7 @@
                 type="success" 
                 size="large" 
                 @click="backHandler"
-                v-if="book.source == 'qmx'"
+                v-if="book.source == 'qmx'&&orDetails.return_status != 1"
             >新增回款信息</Button>
             <Button class="ping-btn" type="success" size="large" disabled v-else>新增回款信息</Button>
             <Button 
@@ -568,7 +578,12 @@ export default {
                 }
             }).get()
         },
+        saleBlur() {
+            this.saleReadon = true
+            this.salesMen = this.orDetails.salesperson
+        },
         inptBtn() {
+            this.saleReadon = false
             setTimeout(() => {
                 document.getElementById("inptId").focus()
             }, 100)
@@ -583,9 +598,19 @@ export default {
                 salesperson: this.salesMen
             }).success((r) => {
                 this.$Message.success('修改成功')
+                this.saleReadon = true
+                setTimeout(() => {
+                    document.getElementById("inptId").blur()
+                }, 100)
                 this.ordered()
             }).post()
         },
+        saveBtn() {
+            // setTimeout(() => {
+                document.getElementById("inptId").focus()
+            // }, 100)
+            this.menBlur()
+        },
         pushInvo() {
             this.$refs.backRef.iShow = true
         },
@@ -725,6 +750,7 @@ export default {
     },
     data () {
         return {
+            saleReadon: true,
             contractData: [],
             returnInfo: [],
             returnRes: [],

src/views/order/components/otherOrder.vue

@@ -52,7 +52,14 @@
                   @on-keyup="others.contractMoney=conHandler(others.contractMoney)"></Input>
               </FormItem>
               <FormItem label="合同" class="chuan-pay">
-                <b-upload ref="uploadRef" @fileData="contractFile" :placeholdered="'请上传合同'" :accepted="'.doc,.pdf,.docx,.jpg,.png,.jpeg'"></b-upload>
+                <b-upload 
+                  ref="uploadRef" 
+                  @fileData="contractFile" 
+                  :placeholdered="'请上传合同'" 
+                  :accepted="'.doc,.pdf,.docx,.rar,.zip,.jpg,.png,.jpeg'"
+                  :formated="['doc','pdf','docx','rar','zip','jpg','png','jpeg']"
+                  :multipled="false"
+                ></b-upload>
               </FormItem>
               <FormItem label="备注">
                   <Input v-model="others.remark" type="text" :maxlength="40" placeholder="请输入备注"></Input>
@@ -197,7 +204,6 @@ export default {
               ],
               salesPerson: [
                 { required: true, message: '销售人员姓名不能为空', trigger: 'blur' },
-                // { pattern: /^[^a-zA-Z0-9\u4E00-\u9FA5\uF900-\uFA2D]$/, message: "长度限制12位，支持输入汉字、字母、数字、标点符号、特殊字符", trigger: "blur" }
               ],
               contractStatus: [
                 { required: true, message: '请选择协议状态', trigger: 'blur' }

src/views/order/orderList.vue

@@ -272,7 +272,11 @@ export default {
                 level: this.filter.level,
                 payType: this.filter.payType,
                 dataType: this.filter.dataType,
-                invoiceType: this.filter.invoiceType
+                invoiceType: this.filter.invoiceType,
+                returnStatus: this.filter.returnStatus,
+                refundStatus: this.filter.refundStatus,
+                contractStatus: this.filter.contractStatus,
+                phone: this.filter.phone
             }
             this.$Modal.confirm({
                 title: "确定导出结果吗？",