Przeglądaj źródła

融资产品,合同,往来帐款bug修改

ch 3 lat temu
rodzic
commit
a15a1e560f

+ 18 - 1
front-vue/src/views/service/bill/addBill.vue

@@ -459,6 +459,8 @@
           action=""
           ref="contractUpload"
           list-type="picture-card"
+          accept=".jpg,.jpeg,.png,.tif"
+          :before-upload="beforeUpload"
           :on-preview="invoicePictureCardPreview"
           :before-remove="beforeRemove"
           :on-remove="handleRemoveContract"
@@ -486,6 +488,8 @@
           action=""
           ref="logisticsUpload"
           list-type="picture-card"
+          accept=".jpg,.jpeg,.png,.tif"
+          :before-upload="beforeUpload"
           :on-preview="invoicePictureCardPreview"
           :before-remove="beforeRemove"
           :on-remove="handleRemoveLogistics"
@@ -513,6 +517,8 @@
           action=""
           ref="otherUpload"
           list-type="picture-card"
+          accept=".jpg,.jpeg,.png,.tif"
+          :before-upload="beforeUpload"
           :on-preview="invoicePictureCardPreview"
           :before-remove="beforeRemove"
           :on-remove="handleRemoveOther"
@@ -827,6 +833,17 @@ export default {
           loading.close();
         });
     },
+    beforeUpload(files){
+      var testmsg=files.name.substring(files.name.lastIndexOf('.')+1);                     
+      const extension = testmsg === 'jpg';            
+      const extension2 = testmsg === 'jpeg';
+      const extension3 = testmsg === 'png';
+      const extension4 = testmsg === 'tif';
+      if(!extension && !extension2 && !extension3 && !extension4){
+        this.$message.warning(`请选择图片`);
+      }
+      return extension || extension2 || extension3 || extension4;
+    },
     //上传合同
     submitUploadContract() {
       this.$refs.contractUpload.submit();
@@ -1056,7 +1073,7 @@ export default {
       for (let i in this.fileList) {
         strarr.push(this.fileList[i]["ziiAmount"]);
       }
-      return eval(strarr.join("+")); //结果
+      return (Math.floor(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
     },
     // 提交
     submit() {

+ 18 - 1
front-vue/src/views/service/bill/billAdd.vue

@@ -459,6 +459,8 @@
           action=""
           ref="contractUpload"
           list-type="picture-card"
+          accept=".jpg,.jpeg,.png,.tif"
+          :before-upload="beforeUpload"
           :on-preview="invoicePictureCardPreview"
           :before-remove="beforeRemove"
           :on-remove="handleRemoveContract"
@@ -486,6 +488,8 @@
           action=""
           ref="logisticsUpload"
           list-type="picture-card"
+          accept=".jpg,.jpeg,.png,.tif"
+          :before-upload="beforeUpload"
           :on-preview="invoicePictureCardPreview"
           :before-remove="beforeRemove"
           :on-remove="handleRemoveLogistics"
@@ -513,6 +517,8 @@
           action=""
           ref="otherUpload"
           list-type="picture-card"
+          accept=".jpg,.jpeg,.png,.tif"
+          :before-upload="beforeUpload"
           :on-preview="invoicePictureCardPreview"
           :before-remove="beforeRemove"
           :on-remove="handleRemoveOther"
@@ -820,6 +826,17 @@ export default {
           loading.close();
         });
     },
+     beforeUpload(files){
+      var testmsg=files.name.substring(files.name.lastIndexOf('.')+1);                     
+      const extension = testmsg === 'jpg';            
+      const extension2 = testmsg === 'jpeg';
+      const extension3 = testmsg === 'png';
+      const extension4 = testmsg === 'tif';
+      if(!extension && !extension2 && !extension3 && !extension4){
+        this.$message.warning(`请选择图片格式文件`);
+      }
+      return extension || extension2 || extension3 || extension4;
+    },
     //上传合同
     submitUploadContract() {
       this.$refs.contractUpload.submit();
@@ -1049,7 +1066,7 @@ export default {
       for (let i in this.fileList) {
         strarr.push(this.fileList[i]["ziiAmount"]);
       }
-      return eval(strarr.join("+")); //结果
+      return (Math.floor(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
     },
     // 提交
     submit() {

+ 1 - 1
front-vue/src/views/service/bill/billDetail.vue

@@ -413,7 +413,7 @@ export default {
       for (let i in this.fileList) {
         strarr.push(this.fileList[i]["ziiAmount"]);
       }
-      return Math.floor(eval(strarr.join("+")) * 100) / 100; //结果
+      return (Math.floor(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
       // return this.handleInput(eval(strarr.join("+"))); //结果
     },
     // 结束

+ 19 - 2
front-vue/src/views/service/bill/billEdit.vue

@@ -505,6 +505,8 @@
           action=""
           ref="contractUpload"
           list-type="picture-card"
+          accept=".jpg,.jpeg,.png,.tif"
+          :before-upload="beforeUpload"
           :on-preview="invoicePictureCardPreview"
           :before-remove="beforeRemove"
           :on-remove="handleRemoveContract"
@@ -532,6 +534,8 @@
           action=""
           ref="logisticsUpload"
           list-type="picture-card"
+          accept=".jpg,.jpeg,.png,.tif"
+          :before-upload="beforeUpload"
           :on-preview="invoicePictureCardPreview"
           :before-remove="beforeRemove"
           :on-remove="handleRemoveLogistics"
@@ -559,6 +563,8 @@
           action=""
           ref="otherUpload"
           list-type="picture-card"
+          accept=".jpg,.jpeg,.png,.tif"
+          :before-upload="beforeUpload"
           :on-preview="invoicePictureCardPreview"
           :before-remove="beforeRemove"
           :on-remove="handleRemoveOther"
@@ -901,6 +907,17 @@ export default {
           loading.close();
         });
     },
+    beforeUpload(files){
+      var testmsg=files.name.substring(files.name.lastIndexOf('.')+1);                     
+      const extension = testmsg === 'jpg';            
+      const extension2 = testmsg === 'jpeg';
+      const extension3 = testmsg === 'png';
+      const extension4 = testmsg === 'tif';
+      if(!extension && !extension2 && !extension3 && !extension4){
+        this.$message.warning(`请选择图片格式文件`);
+      }
+      return extension || extension2 || extension3 || extension4;
+    },
     //上传合同
     submitUploadContract() {
       this.$refs.contractUpload.submit();
@@ -1125,11 +1142,11 @@ export default {
     },
     //发票合计
     allAmount() {
-      var strarr = [0.0];
+      var strarr = [0.00];
       for (let i in this.fileList) {
         strarr.push(this.fileList[i]["ziiAmount"]);
       }
-      return Math.floor(eval(strarr.join("+")) * 100) / 100; //结果
+      return (Math.floor(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
       // return this.handleInput(eval(strarr.join("+"))); //结果
     },
     // 结束

+ 4 - 5
front-vue/src/views/service/contract/addContract.vue

@@ -151,7 +151,7 @@
           action=""
           :http-request="httpRequest"
           :before-remove="beforeRemove"
-          accept=".doc,.docx"
+          accept=".docx"
           multiple
           :limit="1"
           :on-exceed="handleExceed"
@@ -332,13 +332,12 @@ export default {
       this.$message.warning(`当前限制选择 1 个文件`);
     },
     beforeUpload(files){
-      var testmsg=files.name.substring(files.name.lastIndexOf('.')+1);                     
-      const extension = testmsg === 'doc';            
+      var testmsg=files.name.substring(files.name.lastIndexOf('.')+1);                            
       const extension2 = testmsg === 'docx'
-      if(!extension && !extension2){
+      if(!extension2){
         this.$message.warning(`请选择word文档`);
       }
-      return extension || extension2;
+      return extension2;
     },
     //手动上传文件触发
     httpRequest(param) {

+ 4 - 5
front-vue/src/views/service/contract/editContract.vue

@@ -152,7 +152,7 @@
           :http-request="httpRequest"
           :before-remove="beforeRemove"
           :on-preview="handleFileDownload"
-          accept=".doc,.docx"
+          accept=".docx"
           multiple
           :limit="1"
           :on-exceed="handleExceed"
@@ -370,13 +370,12 @@ export default {
       this.$message.warning(`当前限制选择 1 个文件`);
     },
     beforeUpload(files){
-      var testmsg=files.name.substring(files.name.lastIndexOf('.')+1);                     
-      const extension = testmsg === 'doc';            
+      var testmsg=files.name.substring(files.name.lastIndexOf('.')+1);                               
       const extension2 = testmsg === 'docx'
-      if(!extension && !extension2){
+      if(!extension2){
         this.$message.warning(`请选择word文档`);
       }
-      return extension || extension2;
+      return extension2;
     },
     //手动上传文件触发
     httpRequest(param) {

+ 11 - 2
front-vue/src/views/service/financeProduct/addFinanceProduct.vue

@@ -90,7 +90,7 @@
           <el-radio v-model="form.zfpPart" label="1">是</el-radio>
         </el-form-item>
         <el-form-item label="资方融资费率(%):" prop="zfpRate" style="margin-left: 5%">
-          <el-input v-model="form.zfpRate" @input.native="inputRate($event,form.zfpRate)" placeholder="请输入资方融资费率" maxlength="5"/>
+          <el-input v-model="form.zfpRate" @input.native="inputRate($event,form.zfpRate)" @change="changeVal(form.zfpRate)"  placeholder="请输入资方融资费率" maxlength="5"/>
         </el-form-item>
         <el-form-item label="融资到期方式:" prop="zfpExpire" style="margin-left: 5%">
           <el-select
@@ -124,7 +124,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="资方返佣费率(%):" prop="zfpProfitRate" style="margin-left: 5%" v-if="form.zfpProfit== '1'">
-          <el-input v-model="form.zfpProfitRate" @input.native="inputRates($event,form.zfpProfitRate)" placeholder="请输入资方返佣费率"  maxlength="5"/>
+          <el-input v-model="form.zfpProfitRate" @input.native="inputRates($event,form.zfpProfitRate)" @change="changeVal(form.zfpProfitRate)" placeholder="请输入资方返佣费率"  maxlength="5"/>
         </el-form-item>
         <el-form-item label="是否需平台审批:" style="margin-left: 5%">
           <el-radio v-model="form.zfpPlatform" label="0">否</el-radio>
@@ -519,6 +519,15 @@ export default {
         this.$refs.tableContract.clearSelection()
       }
     },
+    changeVal(val){
+      if(val>100){
+          this.val="";
+          this.$message({
+          message: '请输入正确的费率',
+          type: 'warning'
+        });
+      }
+    },
     changeRate(e,input){
       e.target.value=(e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
       this.input=e.target.value

+ 11 - 2
front-vue/src/views/service/financeProduct/editFinanceProduct.vue

@@ -100,7 +100,7 @@
           <el-radio v-model="form.zfpPart" label="1">是</el-radio>
         </el-form-item>
         <el-form-item label="资方融资费率(%):" prop="zfpRate" style="margin-left: 11%">
-          <el-input v-model="form.zfpRate" @input.native="inputRate($event,form.zfpRate)" placeholder="请输入资方融资费率" maxlength="5"/>
+          <el-input v-model="form.zfpRate" @input.native="inputRate($event,form.zfpRate)" @change="changeVal(form.zfpRate)" placeholder="请输入资方融资费率" maxlength="5"/>
         </el-form-item>
         <el-form-item label="融资到期方式:" prop="zfpExpire" style="margin-left: 6%">
           <el-select
@@ -133,7 +133,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="资方返佣费率(%):" prop="zfpProfitRate" style="margin-left: 5%" v-if="form.zfpProfit== '1' ">
-          <el-input v-model="form.zfpProfitRate" @input.native="inputRates($event,form.zfpProfitRate)" placeholder="请输入资方返佣费率" maxlength="5" />
+          <el-input v-model="form.zfpProfitRate" @input.native="inputRates($event,form.zfpProfitRate)" @change="changeVal(form.zfpProfitRate)" placeholder="请输入资方返佣费率" maxlength="5" />
         </el-form-item>
         <el-form-item label="是否需平台审批:" style="margin-left: 5%">
           <el-radio v-model="form.zfpPlatform" label="0">否</el-radio>
@@ -575,6 +575,15 @@ export default {
       this.$router.go(-1);
       this.open = false;
     },
+    changeVal(val){
+      if(val>100){
+          this.val="";
+          this.$message({
+          message: '请输入正确的费率',
+          type: 'warning'
+        });
+      }
+    },
     changeRate(e,input){
       e.target.value=(e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
       this.input=e.target.value