Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/client/customermanagement.js

@@ -4,22 +4,31 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/crm/v1/crmcustomertemp/asListPage',
+      url: '/yxtcrm/apiadmin/v1/crmcustomer/asListPage',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
     })
   },
   // 初始化
+  customerInit: function(data) {
+    return request({
+      url: '/yxtcrm/apiadmin/v1/crmcustomer/customerInit',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 回显
   fetchDetailsBySid: function(data) {
     return request({
-      url: '/crm/v1/crmcustomertemp/fetchSid/' + data,
+      url: '/yxtcrm/apiadmin/v1/crmcustomer/fetchSid/' + data,
       method: 'get'
     })
   },
   save: function(data) {
     return request({
-      url: '/crm/v1/crmcustomertemp/save',
+      url: '/yxtcrm/apiadmin/v1/crmcustomer/save',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -27,7 +36,7 @@ export default {
   },
   update: function(data) {
     return request({
-      url: '/crm/v1/crmcustomertemp/update/' + data.sid,
+      url: '/yxtcrm/apiadmin/v1/crmcustomer/update/' + data.sid,
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -44,7 +53,7 @@ export default {
   // 定点企业禁用
   disableState: function(data) {
     return request({
-      url: '/crm/v1/crmcustomertemp/disableState',
+      url: '/yxtcrm/apiadmin/v1/crmcustomer/disableState',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -53,7 +62,7 @@ export default {
   // 定点企业启用
   enable: function(data) {
     return request({
-      url: '/crm/v1/crmcustomertemp/enable',
+      url: '/yxtcrm/apiadmin/v1/crmcustomer/enable',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -61,7 +70,7 @@ export default {
   },
   deleteBySids: function(data) {
     return request({
-      url: '/crm/v1/crmcustomertemp/del/',
+      url: '/yxtcrm/apiadmin/v1/crmcustomer/del/',
       method: 'DELETE',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -121,7 +130,7 @@ export default {
   // 对接人列表
   getListByCustomerSid: function(params) {
     return request({
-      url: '/crm/v1/crmdockingpeople/getListByCustomerSid',
+      url: '/yxtcrm/v1/crmdockingpeople/getListByCustomerSid',
       method: 'get',
       params: params
     })
@@ -129,7 +138,7 @@ export default {
   // 禁用对接人信息
   disableStateByPerson: function(data) {
     return request({
-      url: '/crm/v1/crmdockingpeople/disableState',
+      url: '/yxtcrm/v1/crmdockingpeople/disableState',
       method: 'DELETE',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -138,7 +147,7 @@ export default {
   // 启用对接人信息
   enableByPerson: function(data) {
     return request({
-      url: '/crm/v1/crmdockingpeople/enable',
+      url: '/yxtcrm/v1/crmdockingpeople/enable',
       method: 'DELETE',
       data: data,
       headers: { 'Content-Type': 'application/json' }

yxt-as-ui/src/api/client/maintenanceEnterprise.js

@@ -4,7 +4,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/listPage',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/listPage',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -13,7 +13,7 @@ export default {
   // 初始化
   init(data) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/init',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/init',
       method: 'get',
       params: data
     })
@@ -21,13 +21,13 @@ export default {
   // 编辑回显
   fetchDetailsBySid: function(data) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/fetchDetailsBySid/' + data,
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/fetchDetailsBySid/' + data,
       method: 'get'
     })
   },
   saveOrUpdate: function(data) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/save',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/save',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -35,7 +35,7 @@ export default {
   },
   deleteBySids: function(data) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/delBySids',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/delBySids',
       method: 'DELETE',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -44,7 +44,7 @@ export default {
   // 提交流程
   submit: function(params) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/submit',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/submit',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -53,7 +53,7 @@ export default {
   // 流程审批（同意）
   complete: function(params) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/complete',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/complete',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -62,7 +62,7 @@ export default {
   // 流程审批（加签）
   delegate: function(params) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/delegate',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/delegate',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -71,7 +71,7 @@ export default {
   // 流程审批（驳回）
   reject: function(params) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/reject',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/reject',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -80,7 +80,7 @@ export default {
   // 流程审批（终止）
   breakProcess: function(params) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/breakProcess',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/breakProcess',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -89,7 +89,7 @@ export default {
   // 流程审批（撤回）
   revokeProcess: function(params) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/revokeProcess',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/revokeProcess',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -98,7 +98,7 @@ export default {
   // 审批流程（同意）获取下一环节
   getNextNodesForSubmit: function(data) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/getNextNodesForSubmit',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/getNextNodesForSubmit',
       method: 'get',
       params: data
     })
@@ -106,7 +106,7 @@ export default {
   // 审批流程（驳回）获取上一环节
   getPreviousNodesForReject: function(data) {
     return request({
-      url: '/crm/v1/maintenanceEnterprise/getPreviousNodesForReject',
+      url: '/crm/yxtcrm/v1/maintenanceEnterprise/getPreviousNodesForReject',
       method: 'get',
       params: data
     })

yxt-as-ui/src/api/operation/repairbill.js

@@ -122,7 +122,7 @@ export default {
   // 根据客户sid获取对应的对接人信息
   getListByCustomerSid: function(data) {
     return request({
-      url: '/crm/v1/crmdockingpeople/getListByCustomerSid',
+      url: '/yxtcrm/v1/crmdockingpeople/getListByCustomerSid',
       method: 'get',
       params: data
     })

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

@@ -119,6 +119,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="24">
             <div class="span-sty">客户类型</div>
             <el-form-item>
@@ -128,6 +130,12 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">车架号</div>
+            <el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.vinNo" clearable placeholder="" /></el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="handleConfirm()">确 定</el-button>
@@ -277,7 +285,11 @@ export default {
         visitWayKey: '',
         customerType: '', // 客户类型
         customerTypeKey: '',
-        psid: ''
+        psid: '',
+        vinNo: '',
+        userSid: '',
+        orgPath: '',
+        useOrgSid: ''
       }
     }
   },
@@ -491,7 +503,11 @@ export default {
         visitWayKey: '',
         customerType: '', // 客户类型
         customerTypeKey: '',
-        psid: ''
+        psid: '',
+        vinNo: '',
+        userSid: '',
+        orgPath: '',
+        useOrgSid: ''
       }
     },
     visitWayChange(value) {
@@ -509,8 +525,15 @@ export default {
     },
     handleConfirm() {
       if (this.formobj.customerType !== '' && this.formobj.visitWay !== '') {
+        if (this.formobj.vinNo !== '' && this.formobj.vinNo.length !== 8 && this.formobj.vinNo.length !== 17) {
+          this.$message({ showClose: true, message: '请检查车架号的长度为8位或17位', type: 'error' })
+          return
+        }
         this.dialogVisible = false
         this.viewState = 2
+        this.formobj.userSid = window.sessionStorage.getItem('userSid')
+        this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.formobj.useOrgSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
         this.$refs['divAdd'].showAdd(this.formobj)
       } else {
         this.$message({ showClose: true, message: '请填写联络方式和客户类型', type: 'warning' })

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

@@ -288,26 +288,35 @@ export default {
         this.$refs['form_obj'].clearValidate()
       })
       this.init()
-      this.formobj.isOnRemind = '否'
-      this.formobj.isOnRemindKey = '0'
-      this.formobj.customerType = value.customerType
-      this.formobj.customerTypeKey = value.customerTypeKey
-      this.formobj.visitWay = value.visitWay
-      this.formobj.visitWayKey = value.visitWayKey
-      this.formobj.userSid = window.sessionStorage.getItem('userSid')
-      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-      this.formobj.useOrgSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
-
-      if (this.formobj.customerType === '个人') {
-        this.formobj.certificateType = '身份证'
-        this.formobj.certificateTypeKey = '01'
-      } else {
-        this.formobj.certificateType = '营业执照'
-        this.formobj.certificateTypeKey = '02'
-      }
-      typeValues({ psid: value.psid, type: 'customerClass' }).then((res) => {
+      req.customerInit(value).then((res) => {
         if (res.success) {
-          this.customerClass_list = res.data
+          this.formobj = res.data
+          typeValues({ type: 'customerType' }).then((resp) => {
+            if (resp.success) {
+              this.customerType_list = resp.data
+              this.customerType_list.forEach((e) => {
+                if (e.dictValue === this.formobj.customerType) {
+                  typeValues({ psid: e.sid, type: 'customerClass' }).then((respsone) => {
+                    if (respsone.success) {
+                      this.customerClass_list = respsone.data
+                    }
+                  })
+                }
+              })
+            }
+          })
+          // 该客户为新增客户（数据库中未查到该客户信息的），需要将以下字段进行默认赋值
+          if (res.data.vehState !== '0') {
+            this.formobj.isOnRemind = '否'
+            this.formobj.isOnRemindKey = '0'
+            if (this.formobj.customerType === '个人') {
+              this.formobj.certificateType = '身份证'
+              this.formobj.certificateTypeKey = '01'
+            } else {
+              this.formobj.certificateType = '营业执照'
+              this.formobj.certificateTypeKey = '02'
+            }
+          }
         }
       })
     },

yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue

@@ -191,6 +191,7 @@ export default {
         waitorSid: '',
         waitorName: '',
         reserveEquip: '',
+        customerVehicleSid: '',
         customerSid: '',
         customerName: '',
         mobile: '',
@@ -307,6 +308,7 @@ export default {
       value = JSON.parse(JSON.stringify(value))
       this.formobj.customerName = value.customerName
       this.formobj.customerSid = value.sid
+      this.formobj.customerVehicleSid = value.customerVehicleSid
       this.formobj.mobile = value.mobile
       this.formobj.vehMark = value.vehMark
       this.formobj.vinNo = value.vinNo
@@ -503,6 +505,7 @@ export default {
         waitorSid: '',
         waitorName: '',
         reserveEquip: '',
+        customerVehicleSid: '',
         customerSid: '',
         customerName: '',
         mobile: '',

yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue

@@ -104,6 +104,7 @@ export default {
         waitorSid: '',
         waitorName: '',
         reserveEquip: '',
+        customerVehicleSid: '',
         customerSid: '',
         customerName: '',
         mobile: '',
@@ -152,6 +153,7 @@ export default {
         waitorSid: '',
         waitorName: '',
         reserveEquip: '',
+        customerVehicleSid: '',
         customerSid: '',
         customerName: '',
         mobile: '',

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

@@ -743,6 +743,7 @@ export default {
         mobile: '',
         customerOrg: '',
         customerSource: '',
+        customerVehicleSid: '',
         memberCardSid: '',
         memberCarNumber: '',
         vehMark: '',
@@ -1062,6 +1063,7 @@ export default {
       this.formobj.vinNo = value.vinNo
       this.formobj.vehModel = value.vehModel
       this.formobj.customerSource = value.source
+      this.formobj.customerVehicleSid = value.customerVehicleSid
       // 单据类型为欠款月结时，对接人信息需要从欠款月结客户中获取对应的对接人信息
       if (this.formobj.billTypeKey === '2') {
         req.getListByCustomerSid({ customerSid: this.formobj.customerSid }).then((res) => {
@@ -1767,6 +1769,7 @@ export default {
         mobile: '',
         customerOrg: '',
         customerSource: '',
+        customerVehicleSid: '',
         memberCardSid: '',
         memberCarNumber: '',
         vehMark: '',

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

@@ -378,6 +378,7 @@ export default {
         mobile: '',
         customerOrg: '',
         customerSource: '',
+        customerVehicleSid: '',
         memberCardSid: '',
         memberCarNumber: '',
         vehMark: '',
@@ -527,6 +528,7 @@ export default {
         mobile: '',
         customerOrg: '',
         customerSource: '',
+        customerVehicleSid: '',
         memberCardSid: '',
         memberCarNumber: '',
         vehMark: '',