Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/client/customermanagement/customermanagement.vue

@@ -217,13 +217,13 @@ export default {
           btnKey: 'addVehicle',
           btnLabel: '添加车辆'
         },
-        {
-          type: 'danger',
-          size: 'small',
-          icon: 'del',
-          btnKey: 'doDel',
-          btnLabel: '删除'
-        },
+        // {
+        //   type: 'danger',
+        //   size: 'small',
+        //   icon: 'del',
+        //   btnKey: 'doDel',
+        //   btnLabel: '删除'
+        // },
         {
           type: 'success',
           size: 'small',

yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@@ -1066,7 +1066,7 @@ export default {
       this.formobj.customerVehicleSid = value.customerVehicleSid
       // 单据类型为欠款月结时，对接人信息需要从欠款月结客户中获取对应的对接人信息
       if (this.formobj.billTypeKey === '2') {
-        req.getListByCustomerSid({ customerSid: this.formobj.customerSid }).then((res) => {
+        req.getListByCustomerSid({ sid: this.formobj.customerSid }).then((res) => {
           if (res.success) {
             this.people_list = res.data
           }
@@ -1079,7 +1079,7 @@ export default {
         this.formobj.billTypeKey = choose[0].dictKey
         // 针对预约单转成维修单时，单据类型为欠款月结且客户不为空时，对接人信息需要从欠款月结客户中获取对应的对接人信息
         if (this.formobj.billTypeKey === '2' && this.formobj.customerSid !== '') {
-          req.getListByCustomerSid({ customerSid: this.formobj.customerSid }).then((res) => {
+          req.getListByCustomerSid({ sid: this.formobj.customerSid }).then((res) => {
             if (res.success) {
               this.people_list = res.data
             }