Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/customerFundManagement/customerFundAdd.vue

@@ -70,7 +70,7 @@
               :disabled="disabled"
             />
           </ws-form-item>
-          <ws-form-item label="定金" span="1" prop="totalDeposit">
+          <ws-form-item label="定金（元）" span="1" prop="totalDeposit">
             <ws-input
               type="number"
               @mousewheel.native.prevent
@@ -81,7 +81,7 @@
               :disabled="disabled"
             />
           </ws-form-item>
-          <ws-form-item label="预付金" span="1" prop="advancePayment">
+          <ws-form-item label="预付金（元）" span="1" prop="advancePayment">
             <ws-input
               type="number"
               @mousewheel.native.prevent
@@ -92,7 +92,7 @@
               :disabled="disabled"
             />
           </ws-form-item>
-          <ws-form-item label="保证金" span="1" prop="securityDeposit">
+          <ws-form-item label="保证金（元）" span="1" prop="securityDeposit">
             <ws-input
               type="number"
               @mousewheel.native.prevent

src/views/customerFundManagement/customerFundEdit.vue

@@ -70,7 +70,7 @@
               :disabled="disabled"
             />
           </ws-form-item>
-          <ws-form-item label="定金" span="1" prop="totalDeposit">
+          <ws-form-item label="定金（元）" span="1" prop="totalDeposit">
             <ws-input
               type="number"
               @mousewheel.native.prevent
@@ -81,7 +81,7 @@
               :disabled="disabled"
             />
           </ws-form-item>
-          <ws-form-item label="预付金" span="1" prop="advancePayment">
+          <ws-form-item label="预付金（元）" span="1" prop="advancePayment">
             <ws-input
               type="number"
               @mousewheel.native.prevent
@@ -92,7 +92,7 @@
               :disabled="disabled"
             />
           </ws-form-item>
-          <ws-form-item label="保证金" span="1" prop="securityDeposit">
+          <ws-form-item label="保证金（元）" span="1" prop="securityDeposit">
             <ws-input
               type="number"
               @mousewheel.native.prevent

src/views/customerFundManagement/customerFundList.vue

@@ -61,9 +61,9 @@
         <el-table-column prop="compName" label="企业名称" width="200"></el-table-column>
         <el-table-column prop="customerName" label="客户姓名" width="120"></el-table-column>
         <el-table-column prop="customerPhone" label="电话" width="100"> </el-table-column>
-        <el-table-column prop="totalDeposit" label="定金(元)" width="110"></el-table-column>
-        <el-table-column prop="advancePayment" label="预付金(元)" width="110"></el-table-column>
-        <el-table-column prop="securityDeposit" label="保证金(元)" width="110"></el-table-column>
+        <el-table-column prop="totalDeposit" label="定金（元）" width="110"></el-table-column>
+        <el-table-column prop="advancePayment" label="预付金（元）" width="110"></el-table-column>
+        <el-table-column prop="securityDeposit" label="保证金（元）" width="110"></el-table-column>
         <el-table-column prop="bankCard" label="账号" width="200"> </el-table-column>
         <el-table-column prop="bankDeposit" label="开户行" width="280">
           <template slot-scope="scope">

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -123,17 +123,17 @@
     watch: {},
     data() {
       return {
-        imageUrl1: "",
-        imageUrl2: "",
-        imageUrl3: "",
-        imageUrl4: "",
+        imageUrl1: '',
+        imageUrl2: '',
+        imageUrl3: '',
+        imageUrl4: '',
         dialogImageUrl: '',
         dialogVisible: false,
         customerList: {
-          customerName: "",
-          customerNumberCard: "",
-          bankCard: "",
-          bankDeposit: "",
+          customerName: '',
+          customerNumberCard: '',
+          bankCard: '',
+          bankDeposit: '',
         },
         disabledFlag: true,
         disabled: false,
@@ -159,20 +159,20 @@
         bankLows: 'bankLow',
         sendText: '60S后重发',
         sendDisabled: false,
-        verifyCode: "",
+        verifyCode: '',
         bankList:[],
         bankInput:false,
-        bankText:"手动填写"
+        bankText:'手动填写'
       }
     },
     activated() {
       this.switchType = this.$route.query.types
       if (this.$route.query.types == null) {
         this.switchType = 1
-        this.imageUrl1 = ""
-        this.imageUrl2 = ""
-        this.imageUrl3 = ""
-        this.imageUrl4 = ""
+        this.imageUrl1 = ''
+        this.imageUrl2 = ''
+        this.imageUrl3 = ''
+        this.imageUrl4 = ''
         this.customerList = {}
       }
       let id = this.$route.query.id
@@ -190,10 +190,10 @@
       bankInputChange(){
         this.bankInput = !this.bankInput
         if(this.bankInput){
-          this.bankText = "自动识别"
+          this.bankText = '自动识别'
         }
         else{
-          this.bankText = "手动填写"
+          this.bankText = '手动填写'
         }
       },
       handleRemove(file, index) {
@@ -257,7 +257,7 @@
                   that.sendText = sec + 'S后重发'
                   if (sec <= 0) {
                     that.sendDisabled = false
-                    that.sendText = "获取验证码"
+                    that.sendText = '获取验证码'
                     clearInterval(interval)
                   }
                 }, 1000)
@@ -269,7 +269,7 @@
       },
       cancel() {
         this.customerList = {}
-        this.verifyCode = ""
+        this.verifyCode = ''
         this.$router.push({
           path: 'customerManagement'
         })
@@ -291,6 +291,9 @@
               this.$set( this.customerList,'customerNumberCard',response.recPersonNo)
                this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
             }
+            if (response.recPersonAddr ) {
+              this.$set( this.customerList,'compAddress',response.recPersonAddr)
+            }
           })
       },
       upLoadSuccess2(e) {
@@ -312,6 +315,9 @@
                this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
             }
             
+            if (response.recPersonAddr ) {
+              this.$set( this.customerList,'compAddress',response.recPersonAddr)
+            }
           })
       },
       bankSuccess1(e) {
@@ -442,7 +448,7 @@
                     .then((response) => {
                       this.$message.success('添加成功')
                       this.customerList = {}
-                      this.verifyCode = ""
+                      this.verifyCode = ''
                       this.$router.go(-1)
                     })
                 })
@@ -461,7 +467,7 @@
                     .then((response) => {
                       this.$message.success('修改成功')
                          this.customerList = {}
-                         this.verifyCode = ""
+                         this.verifyCode = ''
                       this.$router.push({
                         path: 'customerManagement'
                       })

src/views/houseSelfCollect/paymentManagement.vue

@@ -61,7 +61,7 @@
         <ws-button type="primary" @click="reject">驳回</ws-button>
         <ws-button type="primary" @click="adopt">通过</ws-button>
         <ws-button type="primary" @click="invoicingClick"
-          v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
+          v-hasPermission="`acquisitionManagement.acquisitionPay.finace`" >开票</ws-button>
         <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出
         </ws-button>
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
@@ -482,10 +482,17 @@ import download from '../../components/WsDownload/download'
         //   .then(response => {
         //     console.log(response)
         //   })
+        
         let data = {
           paymentManagementList: this.modification
         }
         console.log('开票', data)
+        for(let i=0;i<this.modification.length;i++){
+          if(this.modification[i].status!='全部付款'&&this.modification[i].status!='部分付款') {
+            this.$message.error('开票只能选择全部付款或部分付款！');
+              return
+          }
+        }
         //开票
         invoicing(data)
           .toPromise()
@@ -495,54 +502,11 @@ import download from '../../components/WsDownload/download'
               
               var arr=[]
               for (let i = 0; i < response.length; i++) {
+                debugger
                 arr.push({fileUrl:response[i],renameFileName:'发票'+i+'.xml'})
-                //创建标签下载文件
-                // window.open(response[i],)
-                // let a = document.createElement('a');
-                // // a.href = response[i];
-                // a.setAttribute('target', 'blank');
-                // a.setAttribute('download', response[i]);
-                // a.setAttribute('href', response[i]);
-                // a.click();
-                // a.remove();
-                // let b = document.createElement('a');
-                // // b.href = response[i];
-                // b.setAttribute('target', 'blank');
-                // b.setAttribute('download', response[i]);
-                // b.setAttribute('href', response[i]);
-                // b.click();
-                // b.remove();
               }
               this.filesToRar(arr, '开票XML文件')
             }
-            //未完成，接口调通后替换假数据
-            // response = {
-
-            // }
-            // response.data.imgList = [{
-            //     name: 'xml1',
-            //     src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
-            //   },
-            //   {
-            //     name: 'xml2',
-            //     src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
-            //   }, {
-            //     name: 'xml3',
-            //     src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
-            //   }
-            // ]
-            // this.invoicingImgList = response.data.imgList
-            // if (response.data.imgList.length > 0) {
-            //   for (let i = 0; i < response.data.imgList.length; i++) {
-            //     //创建标签下载文件
-            //     let a = document.createElement('a');
-            //     a.href = response.data.imgList[i].src;
-            //     let urlArr = a.href.split('.');
-            //     a.setAttribute('download', response.data.imgList[i].name + '.xml');
-            //     a.click();
-            //     a.remove();
-            //   }
-            // }
           })
           .catch(() => {})
       },