手续费、推广费、非跟单费用提现修改

config/dev.env.js

@@ -4,14 +4,16 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
+
+
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
-  // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
+  BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//

src/http/moudules/menu.js

@@ -114,10 +114,9 @@ export const quotationBatch= (data) => {
         data
     })
 }
-export const findTree= (data) => {
+export const findTree= (id,managementSource) => {
     return axios({
-        url: '/sys/quotation/findTree',
+        url: '/sys/quotation/findTree?deptId='+id+'&managementSource='+managementSource,
         method: 'get',
-        data
     })
 }

src/utils/validate.js

@@ -54,10 +54,10 @@ export function getAgeByIdCard(idCard){
 	const monthNow = myDate.getMonth() + 1
 	const dayNow = myDate.getDate()
 	let age = myDate.getFullYear() - yearBirth
-
-	if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
-		age--
+	if (monthNow > monthBirth || (monthNow == monthBirth && dayNow > dayBirth)) {
+		age++
 	}
+  console.log(monthNow,monthBirth,age,22222);
 
 	// 得到年龄
 	sexAndAge.age = age

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -684,13 +684,13 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="规则起期">
-              <el-date-picker v-model="underwritingRulesForm.rulesStartDate" type="date" placeholder="选择日期">
+              <el-date-picker value-format="yyyy-MM-dd" v-model="underwritingRulesForm.rulesStartDate" type="date" placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="规则止期">
-              <el-date-picker v-model="underwritingRulesForm.rulesEndDate" type="date" @change="rulesEndDateChange"
+              <el-date-picker value-format="yyyy-MM-dd" v-model="underwritingRulesForm.rulesEndDate" type="date" @change="rulesEndDateChange"
                 placeholder="选择日期">
               </el-date-picker>
             </el-form-item>

src/views/FinancialManagement/CarInsurance/DeptSettlement/SettledCommissionList.vue

@@ -56,6 +56,7 @@
           {prop: "deptId",label: "机构代码",},
           {prop: "name",label: "机构名称"},
           {prop: "amount",label: "提现金额"},
+          {prop: "voucherId",label: "凭证号"},
           {prop: "createTime",label: "申请时间"}
         ],
         //------------协议下拉框数据   begin-----------------

src/views/FinancialManagement/WithdrawalManagement/GeneralizationEnd.vue

@@ -73,6 +73,7 @@ export default {
         { prop: "surplusAmount", label: "账户余额" },
         { prop: "bankAccount", label: "开户行" },
         { prop: "bankNumber", label: "账号" },
+        { prop: "voucherId", label: "凭证号" },
         { prop: "createTime", label: "提现时间" }
       ]
     };

src/views/FinancialManagement/WithdrawalManagement/GeneralizationPending.vue

@@ -45,6 +45,26 @@
         button2Name="审核提现"
         @handleButton2="handleButton2"
       ></kt-common-table>
+      <el-dialog
+      :visible.sync="dialogVisibleBatch"
+      width="35%"
+      :before-close="handleCloseBatch">
+      <p >凭证号 ：<el-input style="width: 200px;" v-model="voucherId" placeholder="请输入凭证号"></el-input></p>
+      <div style="display: flex">上传图片：  <el-upload
+                action="#"
+                :auto-upload="false"
+                accept=".png, .jpg, .jpeg"
+                :show-file-list="false"
+                :on-change="drivingupload">
+                <img v-if="qrCodeImage" :src="qrCodeImage"  class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+          </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisibleBatch = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="handleSumbit()">确 定</el-button>
+      </span>
+    </el-dialog>
     </el-main>
   </div>
 </template>
@@ -60,6 +80,11 @@ export default {
   },
   data() {
     return {
+      dialogVisibleBatch:false,
+      voucherId:'',
+      qrCodeImage:'',
+      picId:'',
+      rowlist:{},
       // 右侧列表查询数据Start
       queryForm: {},
       pageResult: {},
@@ -128,17 +153,45 @@ export default {
         })
         .then(data != null ? data.callback : "");
     },
-    handleButton2({ row, index }) {
-      this.$api.task.AmountReview(row).then(res => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: res.msg
-          });
-          this.findPage();
+    handleCloseBatch() {
+      this.dialogVisibleBatch=false
+    },
+    drivingupload(file) {
+      let fileRaw = file.raw;
+      this.qrCodeImage = window.URL.createObjectURL(fileRaw);
+      const params = new FormData(); // 声明formData数据类型
+      params.append("multipartFile", fileRaw);
+      params.append("type", "image");
+      this.$api.letter.uploadFile(params).then(res => {
+        if (res.code == "200") {
+          this.picId=res.data.id
+        } else {
+          this.$message({ message: res.msg, type: "warning" });
         }
       });
     },
+    handleSumbit(){
+      this.$api.task.AmountReview({ ...this.rowlist, status: '1',picId:this.picId,voucherId:this.voucherId }).then(res => {
+          if (res.code == 200) {
+            this.dialogVisibleBatch = false
+            this.findPage(null);
+            this.$message({
+              type: 'success',
+              message:  res.msg
+            });
+          }
+          else {
+            this.$message.error(res.msg)
+          }
+        })
+    },
+    handleButton2({ row, index }) {
+      this.rowlist=row
+      this.dialogVisibleBatch=true
+      this.picId=''
+      this.voucherId=''
+    },
+ 
     handleButton3({ row, index }) {
       let auditid = Cookies.get("user"); // 放置token到Cookie
       let auditname = Cookies.get("name"); // 放置token到Cookie
@@ -197,5 +250,29 @@ export default {
   
   
   <style scoped>
+    .avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 150px;
+  height: 150px;
+  line-height: 150px;
+  text-align: center;
+  border: 1px dashed #d9d9d9;
+}
+.avatar {
+  border: 1px dashed #d9d9d9;
+  padding: 5px;
+  border-radius: 6px;
+  width: 150px;
+  height: 150px;
+  display: block;
+}
 </style>
   

src/views/FinancialManagement/WithdrawalManagement/NonDocumentaryEnd.vue

@@ -73,6 +73,7 @@ export default {
         { prop: "surplusAmount", label: "账户余额" },
         { prop: "bankAccount", label: "开户行" },
         { prop: "bankNumber", label: "账号" },
+        { prop: "voucherId", label: "凭证号" },
         { prop: "createTime", label: "提现时间" }
       ]
     };

src/views/FinancialManagement/WithdrawalManagement/NonDocumentaryPending.vue

@@ -45,6 +45,26 @@
         button2Name="审核提现"
         @handleButton2="handleButton2"
       ></kt-common-table>
+      <el-dialog
+      :visible.sync="dialogVisibleBatch"
+      width="35%"
+      :before-close="handleCloseBatch">
+      <p >凭证号 ：<el-input style="width: 200px;" v-model="voucherId" placeholder="请输入凭证号"></el-input></p>
+      <div style="display: flex">上传图片：  <el-upload
+                action="#"
+                :auto-upload="false"
+                accept=".png, .jpg, .jpeg"
+                :show-file-list="false"
+                :on-change="drivingupload">
+                <img v-if="qrCodeImage" :src="qrCodeImage"  class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+          </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisibleBatch = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="handleSumbit()">确 定</el-button>
+      </span>
+    </el-dialog>
     </el-main>
   </div>
 </template>
@@ -60,6 +80,11 @@ export default {
   },
   data() {
     return {
+      dialogVisibleBatch:false,
+      voucherId:'',
+      qrCodeImage:'',
+      picId:'',
+      rowlist:{},
       // 右侧列表查询数据Start
       queryForm: {},
       pageResult: {},
@@ -128,17 +153,44 @@ export default {
         })
         .then(data != null ? data.callback : "");
     },
-    handleButton2({ row, index }) {
-      this.$api.task.AmountReview(row).then(res => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: res.msg
-          });
-          this.findPage();
+    handleCloseBatch() {
+      this.dialogVisibleBatch=false
+    },
+    drivingupload(file) {
+      let fileRaw = file.raw;
+      this.qrCodeImage = window.URL.createObjectURL(fileRaw);
+      const params = new FormData(); // 声明formData数据类型
+      params.append("multipartFile", fileRaw);
+      params.append("type", "image");
+      this.$api.letter.uploadFile(params).then(res => {
+        if (res.code == "200") {
+          this.picId=res.data.id
+        } else {
+          this.$message({ message: res.msg, type: "warning" });
         }
       });
     },
+    handleSumbit(){
+      this.$api.task.AmountReview({ ...this.rowlist, status: '1',picId:this.picId,voucherId:this.voucherId }).then(res => {
+          if (res.code == 200) {
+            this.dialogVisibleBatch = false
+            this.findPage(null);
+            this.$message({
+              type: 'success',
+              message:  res.msg
+            });
+          }
+          else {
+            this.$message.error(res.msg)
+          }
+        })
+    },
+    handleButton2({ row, index }) {
+      this.rowlist=row
+      this.dialogVisibleBatch=true
+      this.picId=''
+      this.voucherId=''
+    },
     handleButton3({ row, index }) {
       let auditid = Cookies.get("user"); // 放置token到Cookie
       let auditname = Cookies.get("name"); // 放置token到Cookie
@@ -197,5 +249,29 @@ export default {
   
   
   <style scoped>
+  .avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 150px;
+  height: 150px;
+  line-height: 150px;
+  text-align: center;
+  border: 1px dashed #d9d9d9;
+}
+.avatar {
+  border: 1px dashed #d9d9d9;
+  padding: 5px;
+  border-radius: 6px;
+  width: 150px;
+  height: 150px;
+  display: block;
+}
 </style>
   

src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresEnd.vue

@@ -73,6 +73,7 @@ export default {
         { prop: "surplusAmount", label: "账户余额" },
         { prop: "bankAccount", label: "开户行" },
         { prop: "bankNumber", label: "账号" },
+        { prop: "voucherId", label: "凭证号" },
         { prop: "createTime", label: "提现时间" }
       ]
     };

src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresPending.vue

@@ -45,6 +45,26 @@
         button2Name="审核提现"
         @handleButton2="handleButton2"
       ></kt-common-table>
+      <el-dialog
+      :visible.sync="dialogVisibleBatch"
+      width="35%"
+      :before-close="handleCloseBatch">
+      <p >凭证号 ：<el-input style="width: 200px;" v-model="voucherId" placeholder="请输入凭证号"></el-input></p>
+      <div style="display: flex">上传图片：  <el-upload
+                action="#"
+                :auto-upload="false"
+                accept=".png, .jpg, .jpeg"
+                :show-file-list="false"
+                :on-change="drivingupload">
+                <img v-if="qrCodeImage" :src="qrCodeImage"  class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+          </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisibleBatch = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="handleSumbit()">确 定</el-button>
+      </span>
+    </el-dialog>
     </el-main>
   </div>
 </template>
@@ -60,6 +80,11 @@ export default {
   },
   data() {
     return {
+      dialogVisibleBatch:false,
+      voucherId:'',
+      qrCodeImage:'',
+      picId:'',
+      rowlist:{},
       // 右侧列表查询数据Start
       queryForm: {},
       pageResult: {},
@@ -128,17 +153,50 @@ export default {
         })
         .then(data != null ? data.callback : "");
     },
-    handleButton2({ row, index }) {
-      this.$api.task.AmountReview(row).then(res => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: res.msg
-          });
-          this.findPage();
+    drivingupload(file) {
+      let fileRaw = file.raw;
+      this.qrCodeImage = window.URL.createObjectURL(fileRaw);
+      const params = new FormData(); // 声明formData数据类型
+      params.append("multipartFile", fileRaw);
+      params.append("type", "image");
+      this.$api.letter.uploadFile(params).then(res => {
+        if (res.code == "200") {
+          this.picId=res.data.id
+        } else {
+          this.$message({ message: res.msg, type: "warning" });
         }
       });
     },
+    handleSumbit(){
+      this.$api.task.AmountReview({ ...this.rowlist, status: '1',picId:this.picId,voucherId:this.voucherId }).then(res => {
+          if (res.code == 200) {
+            this.dialogVisibleBatch = false
+            this.findPage();
+            this.$message({
+              type: "success",
+              message: res.msg
+            });
+          }
+          else {
+            this.$message.error(res.msg)
+          }
+        })
+    },
+    handleButton2({ row, index }) {
+      this.dialogVisibleBatch=true
+      this.rowlist=row
+      this.picId=''
+      this.voucherId=''
+      // this.$api.task.AmountReview(row).then(res => {
+      //   if (res.code == 200) {
+      //     this.$message({
+      //       type: "success",
+      //       message: res.msg
+      //     });
+      //     this.findPage();
+      //   }
+      // });
+    },
     handleButton3({ row, index }) {
       let auditid = Cookies.get("user"); // 放置token到Cookie
       let auditname = Cookies.get("name"); // 放置token到Cookie
@@ -197,5 +255,29 @@ export default {
   
   
   <style scoped>
+  .avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 150px;
+  height: 150px;
+  line-height: 150px;
+  text-align: center;
+  border: 1px dashed #d9d9d9;
+}
+.avatar {
+  border: 1px dashed #d9d9d9;
+  padding: 5px;
+  border-radius: 6px;
+  width: 150px;
+  height: 150px;
+  display: block;
+}
 </style>
   

src/views/Sys/QuotationAuthorization.vue

@@ -29,7 +29,7 @@
                         background: '#F2F7FC',
                         fontWeight: '900',
                         color: '#606266',
-                    }" size="small" ref="expandTable"   @row-click="rowClick"  @select="handleSelectionChange">
+                    }" size="small" ref="expandTable"   @row-click="rowClick"  @select="handleSelectionChange"  @select-all="handleSelectionChangeAll">
                     <el-table-column type="selection" width="50"  align="center" />
                     <el-table-column prop="name" label="部门管理" width="300">
                     </el-table-column>
@@ -153,7 +153,8 @@ export default {
             expanded: false, // 在这里定义了展开与否的标志
             // 部门DialogEnd
             ztreeNodes:[],
-            organizationId:''
+            organizationId:'',
+            checkedKeys:false
         };
     },
     methods: {
@@ -254,6 +255,7 @@ export default {
             });
         },
         handleSelectionChange(select, row) {
+
             if (!row.children) {
             return false;
             }
@@ -263,6 +265,10 @@ export default {
             this.checkRow(row.children, false);
             }
         },
+        handleSelectionChangeAll(selection){
+            this.checkedKeys = !this.checkedKeys;
+            this.checkRow(this.ztreeNodes, this.checkedKeys);
+        },
         //选中递归
         checkRow(data, bool) {
             data.forEach((item) => {

src/views/Sys/QuotationManagement.vue

@@ -263,6 +263,7 @@ export default {
       this.dialogTitle = "新增";
       this.dialogVisible = true;
       this.form={}
+      this.id=''
       this.quotationImage=''
       this.qrCodeImage=''
     },