Merge branch 'master' of http://192.168.2.241:3000/hdc/java-collect-fees-front

src/views/mis/common/api/feesApi.js

@@ -62,7 +62,7 @@ const feesApi = {
     ,
     chargeCh(requestParams) {
         return request({
-            url: '/fees/api/feesmgt/sfcharge/ChargeCh',
+            url: '/fees-api/yysspjxx/pjch',
             method: 'post',
             data: requestParams
         })

src/views/mis/customerManagement/customerGh-index.vue

@@ -179,7 +179,7 @@ export default {
         },
         {
           label: "用户状态",
-          prop: "yhdz",
+          prop: "yhzt",
           align: "center",
           formatter: function (row, column, value, index) {
             if (value == "作废用户") {

src/views/mis/customerManagement/customerHfys-index.vue

@@ -283,6 +283,7 @@ export default {
       params.czrybm = this.$store.state.user.userId;
       params.czryxm = this.$store.state.user.realName;
       params.czrq = DateHelper.getNowFormatDate(true);
+      params.cbkid=this.selectedRow.cbkid;
 
       //console.log(JSON.stringify(params));
       CustomerHfys.save(params, { yzqf: this.detailData.yzqf })

src/views/mis/customerManagement/customerRelationship-index.vue

@@ -437,8 +437,9 @@ export default {
     };
   },
   mounted() {
-    this.bindList_zfb();
-    this.bindList_ffgx();
+    // this.bindList_zfb();
+    // this.bindList_ffgx();
+    this.bindList();
   },
   methods: {
     /* ----- 方法 ----- */

src/views/mis/feesManage/chargeInvoce.vue

@@ -326,7 +326,7 @@ export default {
           let data = {
             yhbh: this.selectModel.yhbh,
             sflsbh: this.selectModel.sflsbh,
-            sszje: this.selectModel.sszje,
+            // sszje: this.selectModel.sszje,
           };
           const params = Object.assign({}, data);
           feesApi