Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev

src/views/repair/Components/UserChoose.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-select v-model="userSelected" clearable filterable >
+  <el-select v-model="userSelected" clearable filterable :filter-method="handleQuery">
-    <el-option v-for="user in userList" :key="user.id" :label="user.cusName + ' ' + user.phoneNumber" :value="user.id" />
+    <el-option v-for="user in userList" :key="user.id" :label="user.cusName + ' ' + user.phoneNumber" :value="user.id"/>
   </el-select>
 </template>
 
@@ -10,11 +10,11 @@ import {getCustomerMainPage} from "@/api/base/customer";
 
 export default {
   name: "UserChoose",
-  props:{
+  props: {
-    value:{
+    value: {
       type: Object,
     },
-    inList:{
+    inList: {
       type: Object,
       default: null,
       required: false
@@ -24,28 +24,30 @@ export default {
     return {
       userList: [],
       userSelected: undefined,
-      queryParams:{
+      queryParams: {
         pageNo: 1,
-        pageSize: 10
+        pageSize: 10,
+        cusName: null,
+        phoneNumber: null,
       },
       total: 0
     }
   },
-  watch:{
+  watch: {
-    userSelected(val){
+    userSelected(val) {
-      if (val){
+      if (val) {
         const user = this.userList.find(item => item.id === val)
         this.$emit("input", user)
       }
     },
-    value(val){
+    value(val) {
       this.userSelected = val ? val.id : null
     },
-    inList(val){
+    inList(val) {
-      if (val){
+      if (val) {
         // 不存在才添加
         const flag = this.userList.findIndex(item => item.id === val.id)
-        if (flag > 0){
+        if (flag > 0) {
           this.userList.splice(flag, 1)
         }
         this.userList.unshift(val)
@@ -57,10 +59,18 @@ export default {
     this.listCustomer()
   },
   methods: {
-    async listCustomer(){
+    async listCustomer() {
       const res = await getCustomerMainPage(this.queryParams)
       this.userList = res.data.records
       this.total = res.data.total
+    },
+    handleQuery(data) {
+      if (/^\d+$/.test(data)) {
+        this.queryParams.phoneNumber = data
+      } else {
+        this.queryParams.cusName = data
+      }
+      this.listCustomer()
     }
   }
 }

src/views/repair/tickets/Components/TicketManagerItem.vue

@@ -77,6 +77,9 @@
                      v-if="(userRole === 'repair_staff' ? (leader ? !isFinish : false) : false) && !(scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish)">
             重新指派
           </el-button>
+          <el-button v-if="userRole === 'repair_staff' && !isFinish && scope.row.ticketsWorkStatus === '01' && !(nowUser.id === scope.row.nowRepairId)" @click="handleGet(scope.row)" size="mini" type="text" icon="el-icon-document-add">
+            申请配件
+          </el-button>
           <el-dropdown
             v-if="(scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)) || (userRole === 'repair_staff' && !isFinish && scope.row.ticketsWorkStatus !== '01')"
             @command="(command) => handleCommand(command, scope.$index, scope.row)">

src/views/repair/tickets/form/UserAndCarForm.vue

@@ -308,7 +308,10 @@ export default {
       formRules: {
         'userInfo.cusName':[{required: true, message: "客户名称不能为空", trigger: 'blur'}],
         'userInfo.phoneNumber': [{required: true, message: "联系方式不能为空", trigger: 'blur'}],
-        'carInfo.licenseNumber': [{required: true, message: "车牌号不能为空", trigger: 'blur'}]
+        'carInfo.licenseNumber': [{required: true, message: "车牌号不能为空", trigger: 'blur'}],
+        'carInfo.brandAndModel': [{required: true, message: "品牌型号不能为空", trigger: 'blur'}],
+        'carInfo.carCategory': [{required: true, message: '车辆类别不能为空', trigger: 'blur'}],
+        'carInfo.carNature': [{required: true, message: '车辆性质不能为空', trigger: 'blur'}]
       },
       formLoading: false,
       //折叠面板默认展开
@@ -369,9 +372,11 @@ export default {
         await updateCustomerAndCar(this.formData)
         this.$modal.msgSuccess(this.formData?.userInfo?.id ? "修改成功" : "新增成功")
         this.$emit("success", this.formData)
-      }finally {
         this.formLoading = false
         this.dialogVisible = false
+      }catch {}
+      finally {
+        this.formLoading = false
       }
     },
     reset(){