Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/Common/dictcommons.js

@@ -159,9 +159,9 @@ export function getServiceItemListPage(data) {
 }
 
 // 查询分页列表 -- 客户列表
-export function customerListPage(params) {
+export function customerList(params) {
   return request({
-    url: '/yxtcrm/apiadmin/v1/crmcustomer/customerListPage',
+    url: '/as/v1/ascustomervehicle/customerList',
     method: 'post',
     data: params,
     headers: {

yxt-as-ui/src/views/operation/preregistration/relation/customer.vue → yxt-as-ui/src/components/publicPage/selectCustomer.vue

@@ -10,7 +10,7 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
               <el-form-item label="客户名称">
-                <el-input v-model="listQuery.params.name" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="车牌号">
                 <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
@@ -21,8 +21,10 @@
               <el-form-item label="联系电话">
                 <el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="客户单位">
-                <el-input v-model="listQuery.params.orgName" placeholder="" clearable/>
+              <el-form-item label="客户类型">
+                <el-select v-model="listQuery.params.customerTypeKey" class="addinputw" placeholder="请选择">
+                  <el-option v-for="(item, index) in merType" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -45,11 +47,12 @@
                 <el-button type="primary" size="small" @click="handleConfirm(scope.row)">确认</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="客户名称" width="120" align="center"/>
+            <el-table-column prop="customerName" label="客户名称" width="120" align="center"/>
+            <el-table-column prop="customerType" label="客户类型" width="120" align="center"/>
             <el-table-column prop="vehMark" label="车牌号" width="120" align="center" />
             <el-table-column prop="vinNo" label="车架号" width="120" align="center" />
             <el-table-column prop="mobile" label="联系电话" width="120" align="center" />
-            <el-table-column prop="orgName" label="客户单位" min-width="120" align="center" />
+            <el-table-column prop="salesCompany" label="销售公司" min-width="120" align="center" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
@@ -68,7 +71,7 @@
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { customerListPage } from '@/api/Common/dictcommons'
+import { customerList, typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'Customer',
@@ -95,6 +98,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
+      merType: [],
       FormLoading: false,
       listLoading: false,
       // 翻页
@@ -103,12 +107,13 @@ export default {
         size: 5,
         total: 0,
         params: {
-          orgPath: '',
-          name: '',
+          customerName: '',
           vehMark: '',
+          vinNo: '',
           mobile: '',
-          orgName: '',
-          vinNo: ''
+          customerTypeKey: '',
+          billType: '',
+          useOrgSid: ''
         }
       }
     }
@@ -117,6 +122,13 @@ export default {
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    init() {
+      typeValues({ type: 'customerType' }).then((res) => {
+        if (res.success) {
+          this.merType = res.data
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -142,11 +154,16 @@ export default {
       var pageindex = index + 1 + pagestart
       return pageindex
     },
+    showData(deptSid, type) {
+      this.init()
+      this.listQuery.params.useOrgSid = deptSid
+      this.listQuery.params.billType = type // type工单类型
+      this.getList()
+    },
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-      customerListPage(this.listQuery).then(response => {
+      customerList(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.success) {
           this.list = response.data.records
@@ -164,19 +181,14 @@ export default {
     },
     // 点击重置
     handleReset() {
-      this.listQuery = {
-        current: 1,
-        size: 5,
-        total: 0,
-        params: {
-          orgPath: '',
-          name: '',
-          vehMark: '',
-          mobile: '',
-          orgName: '',
-          vinNo: ''
-        }
-      }
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
+      this.listQuery.params.customerName = ''
+      this.listQuery.params.vehMark = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.mobile = ''
+      this.listQuery.params.customerTypeKey = ''
       this.getList()
     },
     handleConfirm(row) {

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

@@ -141,19 +141,19 @@
       </div>
     </div>
     <!-- 选择客户 -->
-    <customer v-show="viewState == 2" ref="divCus" @backData="backData" @doback="resetState"/>
+    <selectCustomer v-show="viewState == 2" ref="divCus" @backData="backData" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import req from '@/api/operation/preregistration'
 import { selAllByOrgSidPath, selSubjectInfo, getServiceItemListPage } from '@/api/Common/dictcommons'
-import customer from './relation/customer'
+import selectCustomer from '@/components/publicPage/selectCustomer'
 
 export default {
   name: 'PreregistrationAdd',
   components: {
-    customer
+    selectCustomer
   },
   data() {
     return {
@@ -297,7 +297,7 @@ export default {
     },
     selectCustomer() {
       this.viewState = 2
-      this.$refs['divCus'].getList()
+      this.$refs['divCus'].showData(this.formobj.deptSid, '')
     },
     backData(value) {
       this.viewState = 1

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

@@ -472,7 +472,7 @@
       </div>
     </div>
     <!-- 选择客户 -->
-    <customer v-show="viewState == 2" ref="divCus" @backData="backData" @doback="resetState"/>
+    <selectCustomer v-show="viewState == 2" ref="divCus" @backData="backData" @doback="resetState"/>
     <!-- 结算 -->
     <el-dialog :visible.sync="settleVisible" width="70%">
       <el-form ref="formobj" :model="formobj" :rules="rules" class="formaddcopy02">
@@ -545,13 +545,13 @@
 import req from '@/api/operation/repairbill'
 import additionitem from '@/api/basicinformation/additionitem'
 import { selAllByOrgSidPath, selSubjectInfo, getGroupList, typeValues, getListByUseOrgSid, getServiceItemListPage } from '@/api/Common/dictcommons'
-import customer from '../../operation/preregistration/relation/customer'
+import selectCustomer from '@/components/publicPage/selectCustomer'
 import { getStorage } from '@/utils/auth'
 
 export default {
   name: 'RepairBillAdd',
   components: {
-    customer
+    selectCustomer
   },
   data() {
     return {
@@ -928,7 +928,7 @@ export default {
     },
     selectCustomer() {
       this.viewState = 2
-      this.$refs['divCus'].getList()
+      this.$refs['divCus'].showData(this.formobj.deptSid, this.formobj.billType)
     },
     backData(value) {
       this.viewState = 1
@@ -938,7 +938,6 @@ export default {
       this.formobj.mobile = value.mobile
       this.formobj.vehMark = value.vehMark
       this.formobj.vinNo = value.vinNo
-      this.formobj.customerOrg = value.orgName
       this.formobj.vehModel = value.vehModel
     },
     billTypeChange(value) {

yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue

@@ -76,12 +76,6 @@
                   <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <div class="span-sty">客户单位</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
-                </el-col>
-              </el-row>
             </el-collapse-item>
             <el-collapse-item title="发票信息" name="2">
               <el-row style="border-top: 1px solid #e0e3eb">
@@ -228,7 +222,7 @@
       </div>
     </div>
     <!-- 选择客户 -->
-    <customer v-show="viewState == 2" ref="divCus" @backData="backData" @doback="resetState"/>
+    <selectCustomer v-show="viewState == 2" ref="divCus" @backData="backData" @doback="resetState"/>
     <!-- 结算 -->
     <el-dialog :visible.sync="settleVisible" width="70%">
       <el-form ref="formobj" :model="formobj" :rules="rules" class="formaddcopy02">
@@ -301,12 +295,12 @@
 import req from '@/api/operation/salesticket'
 import additionitem from '@/api/basicinformation/additionitem'
 import { selAllByOrgSidPath, selSubjectInfo, typeValues, listPageSales, getOrgSidByPath } from '@/api/Common/dictcommons'
-import customer from '../preregistration/relation/customer'
+import selectCustomer from '@/components/publicPage/selectCustomer'
 
 export default {
   name: 'SalesTicketAdd',
   components: {
-    customer
+    selectCustomer
   },
   data() {
     return {
@@ -538,7 +532,7 @@ export default {
     },
     selectCustomer() {
       this.viewState = 2
-      this.$refs['divCus'].getList()
+      this.$refs['divCus'].showData(this.formobj.deptSid, '')
     },
     backData(value) {
       this.viewState = 1
@@ -548,7 +542,6 @@ export default {
       this.formobj.mobile = value.mobile
       this.formobj.vehMark = value.vehMark
       this.formobj.vinNo = value.vinNo
-      this.formobj.customerOrg = value.orgName
     },
     changeSubject(value) {
       const choose = this.subject_list.filter((item) => item.subject === value)

yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue

@@ -65,12 +65,6 @@
                   <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <div class="span-sty">客户单位</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
-                </el-col>
-              </el-row>
             </el-collapse-item>
             <el-collapse-item title="发票信息" name="2">
               <el-row style="border-top: 1px solid #e0e3eb">