Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/dev.env.js

@@ -5,12 +5,13 @@ 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://test.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.253:8082/"',//田智
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
-  // BASE_URL: '"http:///192.168.0.36:8080/"',//靖燕龙
+  BASE_URL: '"http://192.168.0.36:8080/"',//靖燕龙
+  // BASE_URL: '"http://192.168.0.106:8080/"',//屈晨
 })
 
 

src/views/DistributionManage/CarInsurance/DistributionManage.vue

@@ -326,33 +326,50 @@ export default {
     /**Split 结束 */
     getDictItems(typeName) {
       //--数据字典--
-      this.$api.dict.findByLableName(typeName).then((response) => {
-        this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
-      }).catch((error) => {
-        this[typeName + "options"] = [];
-      })
-    },
-    //--left tree begin-------
-    findLeftTreeData: function () {
-      // 获取数据
-      this.$api.dept.findLeftDeptTree(this.peopledeptid).then(res => {
-        this.ztreeNodes = res.data;
-      });
-    },
-    onZTreeCreated: function (ztreeObj) {
-      this.ztreeObj = ztreeObj;
-      // onCreated 中操作ztreeObj对象展开第一个节点
-      ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
-      this.currentTreeNode = ztreeObj.getNodes()[0];
-    },
-    onZTreeClick: function (evt, treeId, treeNode) {
-      // 点击事件
-      console.log(evt.type, treeNode);
-      this.currentTreeNode = treeNode;
-      this.pageRequest.columnFilters.deptid.value = this.currentTreeNode.id;
-      this.findPage();
-    },
-    //--left tree start-------
+        this.$api.dict.findByLableName(typeName).then((response)=>{
+          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
+        }).catch((error)=>{
+          this[typeName + "options"] = [];
+        })
+      },
+      //--left tree begin-------
+      findLeftTreeData: function() {
+        // 获取数据
+        this.$api.dept.findTree().then((res) => {
+          this.treeDataRecursion(res.data, 2);
+          this.ztreeNodes = res.data;
+        });
+        this.$api.dept.findTree().then(res => {
+          this.ztreeNodes = res.data;
+        });
+      },
+      //树过滤五级机构递归
+      treeDataRecursion(data, num, one) {
+        data = data || this.ztreeNodes;
+        one = one || 0;
+        one++;
+        for (let i = 0; i < data.length; i++) {
+          if (data[i].comlevel == 5 && (data[i].managementSource != num)) {
+            data.splice(i, 1);
+            i = i - 1;
+          } else {
+            this.treeDataRecursion(data[i].children, num, one);
+          }
+        }
+      },
+      onZTreeCreated: function(ztreeObj) {
+        this.ztreeObj = ztreeObj;
+        // onCreated 中操作ztreeObj对象展开第一个节点
+        ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
+        this.currentTreeNode=ztreeObj.getNodes()[0];
+      },
+      onZTreeClick: function(evt, treeId, treeNode) {
+        // 点击事件
+        this.currentTreeNode = treeNode;
+        this.pageRequest.columnFilters.deptid.value = this.currentTreeNode.id;
+        this.findPage();
+      },
+      //--left tree start-------
 
     // 查询Start
     queryInfo(val) {
@@ -363,20 +380,65 @@ export default {
     // 查询End
 
 
-    // 右侧工具方法Start
-    handleAddButton() {
-      if (this.currentTreeNode == null) {
-        return this.$message.info("请选择门店下团队");
-      }
-      this.activeTabs = 'first'
-      // 查询机构信息
-      this.$api.dept.getDeptById(this.currentTreeNode.id).then(res => {
-        console.log(res.data);
-        if ((res.data.deptType == 'D') && (res.data.id.indexOf('M') >= 0)) {
-          this.$api.dept.getDeptById(res.data.parentId).then(result => {
-            this.deptInfo = result.data;
-            this.deptInfo.teamid = res.data.id;
-            this.deptInfo.teamname = res.data.name;
+      // 右侧工具方法Start
+      handleAddButton(){
+          if(this.currentTreeNode == null ){
+            return this.$message.info("请选择门店下团队");
+          }
+          this.activeTabs = 'first'
+          // 查询机构信息
+          this.$api.dept.getDeptById(this.currentTreeNode.id).then(res => {
+            if((res.data.deptType =='D') && (res.data.id.indexOf('M')>=0)){
+              this.$api.dept.getDeptById(res.data.parentId).then(result => {
+                this.deptInfo = result.data;
+                this.deptInfo.teamid = res.data.id;
+                this.deptInfo.teamname = res.data.name;
+                this.dialogVisible = true;
+              })
+            }else{
+              return this.$message.info("请选择门店下团队");
+            }
+          })
+      },
+      handleDialogBefore(done) {
+        // 退出对话框之前确认提示
+        var that = this;
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      // 右侧工具方法End
+
+      // 右侧列表的方法Start
+      findPage(data) {
+        // 获取分页数据
+        if(data && data.pageRequest){
+          this.pageRequest.pageNum = data.pageRequest.pageNum;
+          this.pageRequest.pageSize = data.pageRequest.pageSize;
+        }
+        this.$api.retail.findPage(this.pageRequest).then((res) => {
+          this.pageResult = res.data;
+        }).then(data != null ? data.callback : '')
+      },
+      //编辑
+      handleTableEdit(data) {
+        var deptid = data.row.deptid.split('D')[0];
+        this.$api.dept.getDeptById(deptid).then(res => {
+          if(res.code = 200){
+            this.deptInfo = res.data;
+            this.deptInfo.teamid = data.row.deptid;
+            this.deptInfo.teamname = data.row.deptname;
+            this.distributionForm = data.row;
+            // this.distributionForm.paytype = data.row.paytype.split(',');
+            this.retailSettingForm=[];
+            for(let i=0;i<data.row.retailtype;i++){
+              this.retailSettingForm.push({
+                retailLevel:(i+1),
+                retailRate:data.row['disrate'+(i+1)]
+              })
+            }
             this.dialogVisible = true;
           })
         } else {
@@ -523,10 +585,24 @@ export default {
       param.disrate2 = '';
       param.disrate3 = '';
 
-      for (let i = 0; i < this.retailSettingForm.length; i++) {
-        console.log('disrate' + this.retailSettingForm[i].retailLevel)
-        param['disrate' + this.retailSettingForm[i].retailLevel] = this.retailSettingForm[i].retailRate;
-      }
+         for(let i=0;i<this.retailSettingForm.length;i++){
+           param['disrate'+this.retailSettingForm[i].retailLevel] = this.retailSettingForm[i].retailRate;
+         }
+
+         this.$api.retail.saveRetail(param).then(res => {
+           if(res.code == 200){
+             this.$message.success("操作成功");
+             this.findPage()
+             this.dialogVisible = false;
+           }else{
+             this.$message.info("操作失败 "+res.msg);
+           }
+
+         }).catch(err=>{
+           this.$message.error("操作失败")
+         })
+       }
+      // 新增分销End
 
       this.$api.retail.saveRetail(param).then(res => {
         if (res.code == 200) {

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -871,7 +871,7 @@ export default {
           // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
           let a = document.createElement("a");
           a.href = url;
-          a.download = "导出订单.xlsx";
+          a.download = "导出文件.xlsx";
           a.click();
           // 5.释放这个临时的对象url
           window.URL.revokeObjectURL(url);

src/views/FinancialManagement/ReconciliationSystem/ReceivablePayableCollection/ReceivablePayableCollection.vue

@@ -184,6 +184,22 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="应收导入日期">
+              <el-date-picker
+                v-model="revenueTime"
+                type="daterange"
+                @change="revenueTimeChange"
+                start-placeholder="开始日期"  
+                end-placeholder="结束日期"
+                class="widths"
+                value-format="yyyy-MM-dd"
+                style="width: 220px"
+                clearable
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="flex j-end" style="margin-right: 100px">
@@ -231,6 +247,7 @@ export default {
     return {
       clearingTime: [],
       signDateTime: [],
+      revenueTime: [],//导入日期
       pageRequest: {
         //查询的默认条件
         pageNum: 1,
@@ -253,6 +270,7 @@ export default {
         jqPolicyId: "",
         syPolicyId: "",
         nonCarPolicyId: "",
+        revenueTime:"",//导入日期
       },
       // 右侧列表查询数据Start
       pageResult: [],
@@ -261,6 +279,7 @@ export default {
         { prop: "operationsTeam", label: "运营团队", minWidth: 100 },
         { prop: "channelClassification", label: "渠道分类", minWidth: 100 },
         { prop: "signDate", label: "签单日期", minWidth: 160 },
+        { prop: "revenueTime", label: "应收导入日期", minWidth: 160 },
         { prop: "channel", label: "渠道", minWidth: 100 },
         { prop: "licenseNo", label: "车牌号", minWidth: 100 },
         { prop: "insuredName", label: "被保险人", minWidth: 160 },
@@ -341,6 +360,14 @@ export default {
   },
   mounted() {},
   methods: {
+    //接口传值处理
+    revenueTimeChange(e) {
+      if (e == null) {
+        this.pageRequest.revenueTime = "";
+      } else {
+        this.pageRequest.revenueTime = e.toString();
+      }
+    },
     clearingTimeChange(e) {
       if (e == null) {
         this.pageRequest.agencySettlementTimeStartTime = "";

src/views/FinancialManagement/ReconciliationSystem/ReceivablePayableCollection/Source.vue

@@ -77,6 +77,13 @@
               <el-input v-model="pageRequest.nonCarPolicyId" placeholder="请输入非车保单号" class="widths" clearable></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="导入日期">
+              <el-date-picker v-model="revenueTime" type="daterange" @change="revenueTimeChange"
+                start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" clearable style="width: 250px">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="flex j-end" style="margin-right: 100px">
@@ -302,6 +309,7 @@ export default {
       insuranceClearingState: "",
       clearingTime: [],
       signingTime: [],
+      revenueTime: [],//导入日期
       pageRequest: {
         //查询的默认条件
         pageNum: 1,
@@ -312,6 +320,7 @@ export default {
         insuredName: "", //被保险人
         clearingTime: "", //结算日期
         signingTime: "", //出单日期
+        revenueTime: "", //导入日期
         jqPolicyId: "", //交强保单号
         syPolicyId: "", //商业保单号
         nonCarPolicyId: "", //非车保单号
@@ -396,6 +405,8 @@ export default {
         { prop: "licenseno", label: "车牌号", minWidth: 120 },
         { prop: "signingTime", label: "出单日期", minWidth: 160 },
         { prop: "clearingTime", label: "结算日期", minWidth: 160 },
+        { prop: "revenueTime", label: "导入日期", minWidth: 160 },
+        { prop: "revenueName", label: "导入人", minWidth: 160 },
         { prop: "taxamount", label: "车船税", minWidth: 140 },
         { prop: "jqReceivableRatio", label: "交强应收比例", minWidth: 140 },
         { prop: "jqPremiumRatio", label: "交强手续费比例", minWidth: 140 },
@@ -495,6 +506,14 @@ export default {
       this.createOrUpdateForm.insuranceName = selectedLabel;
     },
     //接口传值处理
+    revenueTimeChange(e) {
+      if (e == null) {
+        this.pageRequest.revenueTime = "";
+      } else {
+        this.pageRequest.revenueTime = e.toString();
+      }
+    },
+    //接口传值处理
     clearingTimeChange(e) {
       if (e == null) {
         this.pageRequest.clearingTime = "";

src/views/Letter/Letter.vue

@@ -3491,6 +3491,18 @@ export default {
         callback();
       }
     };
+    var carPhoneValid = (rule, value, callback) => {
+       const plateNumber = /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1})$/
+       if (!value) {
+        callback(new Error("请输入车牌号"));
+      }
+       else if (plateNumber.test(value)) {
+           callback()
+       } else {
+           callback(new Error('请输入正确的车牌号'))
+       }
+       
+    }
     return {
       packageValue:'',
       packageOptions:[],
@@ -3864,7 +3876,8 @@ export default {
           { required: true, message: "请填写品牌型号", trigger: "blur" }
         ],
         licenseNo: [{ max: 8, message: "最多八个字符", trigger: "blur" },
-        { required: true, message: "请输入车牌号", trigger: "blur" }],
+        { required: true,validator:carPhoneValid,trigger: "blur" }],
+
         frameNo: [{ validator: checkframeNo, trigger: "blur" }],
         engineNo: [
           { required: true, message: "请填写发动机号", trigger: "blur" }