'change'

config/index.js

@@ -9,8 +9,8 @@ const servicePath = 'http://wyservice.gzbfdc.com:5008' //葛洲坝
 */
 
 //const servicePath = 'http://wy.ghhn.com' //葛洲坝
-// const servicePath = 'https://ebeitest.wuyeface.com:1188' //云环境
-const servicePath = 'http://172.18.1.253:8082'//aaaa
+const servicePath = 'https://ebeitest.wuyeface.com:1188' //云环境
+// const servicePath = 'http://172.18.1.253:8082'//aaaa
 //const servicePath = 'http://kolottest.laifung-gz.com.cn' //高乐测试
 //const servicePath = 'http://kolot.laifung-gz.com.cn' //高乐测试
 // const servicePath = 'http://wuye.enxiang.net:5906' //恩祥
@@ -62,12 +62,12 @@ module.exports = {
         //      target: 'http://wy.zzldgc.cn/landcrm', //绿都
         //      target: 'http://qiaoxintest.wuyeface.com/landcrm', //侨鑫
         //      target: 'http://rosmart.zhenro.com/landcrm', //正荣
-        // target: servicePath + '/landcrm', //敏捷测试
+        target: servicePath + '/landcrm', //敏捷测试
         // target: 'https://wy.gmtcmpark.com/landcrm', //粤奥测试接口
         // target: 'http://qpi.zhenghongwy.com:8800', //正弘
         // target: 'http://qpi.zhenghongwy.com:8800/landcrm',
         // target: "http://172.18.0.23/landcrm",
-        target: 'https://ebeitest.wuyeface.com:1188/landcrm',
+        // target: 'https://ebeitest.wuyeface.com:1188/landcrm',
         secure: false,
         changeOrigin: true,
         pathRewrite: {

src/page/decorateManage/components/chargeItem.vue

@@ -186,14 +186,9 @@ export default {
           width: 90,
           align: "center",
         },
-        {
-          title: "房屋类型",
-          key: "chargeCategoryTypeDesc",
-          align: "center",
-        },
         {
           title: "费项",
-          key: "fiName",
+          key: "chargeItemDetailName",
           align: "center",
         },
         {
@@ -201,11 +196,6 @@ export default {
           key: "amountWithTax",
           align: "center",
         },
-        {
-          title: "不含税金额",
-          key: "amountWithoutTax",
-          align: "center",
-        },
         {
           title: "结算方式",
           key: "settlementType",

src/page/decorateManage/decorateList.vue

@@ -2118,7 +2118,7 @@
           <span>客户名称：</span>
           {{ bzjForm.user }}
         </p>
-        <p style="margin-bottom: 10px">
+        <!-- <p style="margin-bottom: 10px">
           <span>结算方式：</span>
           <RadioGroup v-model="formItem.settlementType">
             <Radio
@@ -2129,7 +2129,7 @@
               {{ item.Name }}</Radio
             >
           </RadioGroup>
-        </p>
+        </p> -->
         <!-- <h3 style="font-size:16px;margin-bottom:20px">应收费项
           <Button style="float:right;width:80px" type="primary" @click="sfxShow = true">新增</Button>
         </h3> -->
@@ -2460,7 +2460,7 @@
               </Row>
               <Row type="flex" justify="end" align="middle">
                 <Col>
-                  <canvas :id="'ewm' + index" class="ewmBox"></canvas>
+                  <canvas :id="'qrCodeUrl' + index" class="ewmBox"></canvas>
                 </Col>
               </Row>
             </div>
@@ -2548,7 +2548,7 @@
                 </Col>
                 <Col span="24" style="padding: 10px; position: relative">
                   <div style="position: absolute; top: 95px; right: 50px">
-                    <canvas :id="'ewm' + index" class="ewmBox"></canvas>
+                    <canvas :id="'qrCodeUrl' + index" class="ewmBox"></canvas>
                   </div>
                   <p style="font-size: 18px; font-weight: 600">温馨提示：</p>
                   <p style="font-size: 18px; font-weight: 600">
@@ -3092,7 +3092,7 @@ import {
   selectDecorationLeasing,
   addDecorationLeasing,
   generatingBills,
-  saveReceivableRecord
+  saveReceivableRecord,
 } from "../../service/leasing";
 import chargeTable from "./components/chargeItem";
 import chargeDeposit from "./components/ChargeDeposit";
@@ -4398,7 +4398,7 @@ export default {
       sysCodeType: "CHARGE_TYPE",
     }).then((res) => {
       if (res.status == 200) {
-        this.paymentTypeList = [res.data[0]];
+        this.paymentTypeList = [res.data[1]];
         if (this.paymentTypeList.length > 0) {
           this.formItem.settlementType = this.paymentTypeList[0].Id;
         }
@@ -4424,11 +4424,11 @@ export default {
       this.$refs.refChargeTable.chargeDeposit = [];
       this.$refs.refChargeTable.countTableData = [];
       this.$refs.refchargeDeposit.Lists = [];
-      // this.$refs.refChargeTable.projectId = row.projectId;
-      // this.$refs.refchargeDeposit.serialNumber = row.projectId;
+      this.$refs.refChargeTable.projectId = row.projectId;
+      this.$refs.refchargeDeposit.serialNumber = row.projectId;
       this.$refs.refChargeTable.decorationId = row.decorationId;
-      this.$refs.refChargeTable.projectId = "2931117";
-      this.$refs.refchargeDeposit.projectId = "2931117";
+      // this.$refs.refChargeTable.projectId = "2931117";
+      // this.$refs.refchargeDeposit.projectId = "2931117";
       this.bzjForm.room = row.roomName;
       this.bzjForm.user = row.ownerName;
       this.$refs.refChargeTable.listFormFeeItem();
@@ -5249,7 +5249,10 @@ export default {
       this.getTableData();
     },
     createBill(row) {
-      saveReceivableRecord({infoId: row.infoId, decorationId: row.decorationId}).then((res) => {
+      saveReceivableRecord({
+        infoId: row.infoId,
+        decorationId: row.decorationId,
+      }).then((res) => {
         if (res.status == 200) {
           this.$Message.success("生成账单成功");
           this.getTableData();

src/page/dictionary/dictionary.vue

@@ -160,7 +160,7 @@
           list: this.tableData.concat(this.otherTableData).map(item => {
             return {
               ...item,
-              approvalState: item.approvalState ? 1 : 0,
+              approvalState: item.approvalState ? 0 : 1,
             }
           })
         }).then((res) => {