style: 12345

README.md

@@ -182,7 +182,7 @@ If you think this project is helpful to you, you can help the author buy a cup o
 1. /salePersonnel/saleOrderList  售后工程师工单列表
     response 添加字段
         warrantyDate        保修界满日期
-        warrantyType         0保内维修 ，1保内维修-人为损坏 = 保外 ，2保外维修
+        warrantyType         0保内维修 ，1保内维修-人为损坏 = 保外 ，2保外维修， 2保外转保内维修
 2./salePersonnel/orderReceiving  售后工程师接单
     request 删除必填参数
         warrantyType

src/api/spares/model.ts

@@ -85,119 +85,118 @@ export interface InvoiceList {
 }
 
 export interface customer {
-  customerId:	number;
-  repairId:	string;
-  wxOpenId:	null;
-  companyName:	string;
-  customerName:	string;
-  phone:	string;
-  recStatus:	string;
-  createTime:	string;
-  updateTime:	string;
+  customerId: number;
+  repairId: string;
+  wxOpenId: null;
+  companyName: string;
+  customerName: string;
+  phone: string;
+  recStatus: string;
+  createTime: string;
+  updateTime: string;
 }
 export interface customerAddress {
-  addrId:	number;
-  customerId:	number;
-  repairId:	string;
-  getType:	string;
-  getAddress:	string;
-  getAddrName:	string;
-  getAddrPhone:	string;
-  getTrackingNum:	string;
-  sendType:	string;
-  sendTrackingNum:	string;
-  recStatus:	string;
-  createTime:	string;
-  updateTime:	string;
+  addrId: number;
+  customerId: number;
+  repairId: string;
+  getType: string;
+  getAddress: string;
+  getAddrName: string;
+  getAddrPhone: string;
+  getTrackingNum: string;
+  sendType: string;
+  sendTrackingNum: string;
+  recStatus: string;
+  createTime: string;
+  updateTime: string;
 }
 export interface repairerVo {
-  repairId:	string;	
-  cameraSnCode:	string;	
-  cameraType:	number;	
-  faultMsg:	string;	
-  faultImg:	string;	
-  status:	number;	
-  remark:	null;	
-  receiverType:	number;	
-  recStatus:	string;	
-  createTime:	string;	
-  updateTime:	string;	
-  sysUserId:	number;	
+  repairId: string;
+  cameraSnCode: string;
+  cameraType: number;
+  faultMsg: string;
+  faultImg: string;
+  status: number;
+  remark: null;
+  receiverType: number;
+  recStatus: string;
+  createTime: string;
+  updateTime: string;
+  sysUserId: number;
 }
 export interface repairerVo {
-  repairId:	string;	
-  cameraSnCode:	string;	
-  cameraType:	number;	
-  faultMsg:	string;	
-  faultImg:	string;	
-  status:	number;	
-  remark:	null;	
-  receiverType:	number;	
-  recStatus:	string;	
-  createTime:	string;	
-  updateTime:	string;	
-  sysUserId:	number;	
+  repairId: string;
+  cameraSnCode: string;
+  cameraType: number;
+  faultMsg: string;
+  faultImg: string;
+  status: number;
+  remark: null;
+  receiverType: number;
+  recStatus: string;
+  createTime: string;
+  updateTime: string;
+  sysUserId: number;
 }
 export interface orderReceivingVo {
-  orderId:	number;	
-  repairId:	string;	
-  orderFaultMsg:	string;	
-  orderFaultImg:	string;	
-  warrantyType:	number;	
-  warrantyExpirationDate:	string;	
-  sysUserName:	string;	
-  saleId:	number;	
-  repairerId:	number;	
-  supplyAdminId:	number;	
-  testerId:	number;	
-  recStatus:	string;	
-  createTime:	string;	
-  updateTime:	string;	
-
+  orderId: number;
+  repairId: string;
+  orderFaultMsg: string;
+  orderFaultImg: string;
+  warrantyType: number;
+  warrantyExpirationDate: string;
+  sysUserName: string;
+  saleId: number;
+  repairerId: number;
+  supplyAdminId: number;
+  testerId: number;
+  recStatus: string;
+  createTime: string;
+  updateTime: string;
 }
 export interface repairRegisterVo {
-  checkResult:	string;	
-  checkImg:	string;	
-  remark:	string;	
-  status:	string;	
-  sysUserName:	string;	
-  overTime:	string;	
+  checkResult: string;
+  checkImg: string;
+  remark: string;
+  status: string;
+  sysUserName: string;
+  overTime: string;
 }
 export interface RepairTestVo {
-  resultStatus:	string;	
-  resultInfo:	string;	
-  resultImg:	string;	
-  sysUserName:	string;	
-  passTime:	string;	
+  resultStatus: string;
+  resultInfo: string;
+  resultImg: string;
+  sysUserName: string;
+  passTime: string;
 }
 export interface repairPay {
-  payId:	number;	
-  repairId:	string;	
-  payType:	number;	
-  payImg:	string;	
-  recStatus:	string;	
-  createTime:	string;	
-  updateTime:	string;	
-  sysUserId:	number;	
+  payId: number;
+  repairId: string;
+  payType: number;
+  payImg: string;
+  recStatus: string;
+  createTime: string;
+  updateTime: string;
+  sysUserId: number;
 }
 export interface priceListItem {
-  name:	string;	
-  price:	string;	
-  count:	string;	
+  name: string;
+  price: string;
+  count: string;
 }
 export interface detailResult {
-  customer:any;
-  customerAddress:any;
-  repairerVo:any;
-  RepairTestVo:any;
-  repairRegisterVo:any;
-  orderReceivingVo:any;
-  repairPay:any;
-  repairComment:any;
-  priceList:any[];
-  lastRepairId:any;
-  haveButton:any;
-} 
+  customer: any;
+  customerAddress: any;
+  repairerVo: any;
+  RepairTestVo: any;
+  repairRegisterVo: any;
+  orderReceivingVo: any;
+  repairPay: any;
+  repairComment: any;
+  priceList: any[];
+  lastRepairId: any;
+  haveButton: any;
+}
 export type InvoiceListResul = BasicPageParams<InvoiceList>;
 /**
  * @description: Request list return value

src/locales/lang/zh-CN/routes/spares.ts

@@ -26,4 +26,10 @@ export default {
     26: '待测试',
     27: '测试完成',
   },
+  warrantyType: {
+    0: '保内维修',
+    1: '保内转保外',
+    2: '保外维修',
+    3: '保外转保内',
+  },
 };

src/views/spares/detail.vue

@@ -34,13 +34,7 @@
               {{ detailData.customerAddress.sendType ? '前台送修' : '快递寄送' }}
             </DescriptionsItem>
             <DescriptionsItem label="保修类型">
-              {{
-                detailData.customerAddress.warrantyType == 0
-                  ? '保内维修'
-                  : detailData.customerAddress.warrantyType == 1
-                  ? '保内转保外'
-                  : '保外维修'
-              }}
+              {{ t(`routes.spares.warrantyType.${detailData.orderReceivingVo.warrantyType}`)}}
             </DescriptionsItem>
             <DescriptionsItem label="维修单号">
               {{ detailData.orderReceivingVo.repairId }}

src/views/work/checkModel.vue

@@ -204,18 +204,18 @@
         fileFlow.type = data.type;
         fileFlow.cameraType = data.cameraType;
         if (data.status == 20) {
-          let res = await checkRegisterInfo({repairId:data.repairId})
-          console.log('repairId',res)
-          let index = n.value
-          res.partList.map((ele,b) => {
-            backfill[`partId${index+b}`] = ele.partId
-            backfill[`partCount${index+b}`] = ele.partCount
-            add()
-          })
-          backfill.faultIds = res.faultIds
-          backfill.defineDamage = res.defineDamage
-          backfill.checkResult = res.checkResult
-          backfill.checkImg = res.checkImg
+          let res = await checkRegisterInfo({ repairId: data.repairId });
+          console.log('repairId', res);
+          let index = n.value;
+          res.partList.map((ele, b) => {
+            backfill[`partId${index + b}`] = ele.partId;
+            backfill[`partCount${index + b}`] = ele.partCount;
+            add();
+          });
+          backfill.faultIds = res.faultIds;
+          backfill.defineDamage = res.defineDamage;
+          backfill.checkResult = res.checkResult;
+          backfill.checkImg = res.checkImg;
         }
         updateSchema([
           {
@@ -232,9 +232,7 @@
         setFieldsValue({
           ...data,
           ...backfill,
-          warrantyExpirationDateText: `${data.warrantyDate} (${
-            data.warrantyType == 0 ? '保内维修' : data.warrantyType == 1 ? '保内转保外' : '保外维修'
-          })`,
+          warrantyExpirationDateText: data.warrantyDate + '(' + t(`routes.spares.warrantyType.${data.warrantyType}`) + ')',
           deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
         });
       }

src/views/work/detail.vue

@@ -38,13 +38,7 @@
               }}
             </DescriptionsItem>
             <DescriptionsItem label="保修类型">
-              {{
-                detailData.repairerVo.warrantyType == 0
-                  ? '保内维修'
-                  : detailData.repairerVo.warrantyType == 1
-                  ? '保内转保外'
-                  : '保外维修'
-              }}
+              {{ t(`routes.spares.warrantyType.${detailData.orderReceivingVo.warrantyType}`)}}
             </DescriptionsItem>
             <DescriptionsItem label="维修单号">
               {{ repairId }}
@@ -469,7 +463,7 @@
         priceTotal.value = countItem.total?.toFixed(2);
         countItem.total = res.repairerVo.warrantyType == 0 ? '0.00' : priceTotal.value;
         let addItemList = [countItem];
-        if (res.repairerVo.warrantyType == 0) {
+        if (res.repairerVo.warrantyType == 0 || res.repairerVo.warrantyType == 3) {
           addItemList.unshift({
             id: 4,
             price: null,

src/views/work/quoteModel.vue

@@ -203,9 +203,7 @@
         fileFlow.type = data.type;
         setFieldsValue({
           ...data,
-          warrantyExpirationDateText: `${data.warrantyDate} (${
-            data.warrantyType == 0 ? '保内维修' : data.warrantyType == 1 ? '保内转保外' : '保外维修'
-          })`,
+          warrantyExpirationDateText: data.warrantyDate + '(' + t(`routes.spares.warrantyType.${data.warrantyType}`) + ')',
           deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
         });
         updateSchema({

src/views/work/takingOrdersModel.vue

@@ -221,9 +221,7 @@
         resetFields();
         setFieldsValue({
           ...data,
-          warrantyExpirationDateText: `${data.warrantyDate} (${
-            data.warrantyType == 0 ? '保内维修' : data.warrantyType == 1 ? '保内转保外' : '保外维修'
-          })`,
+          warrantyExpirationDateText: data.warrantyDate + '(' + t(`routes.spares.warrantyType.${data.warrantyType}`) + ')',
           deviceType: t(`routes.scene.tableType.${data.cameraType}`) + ' ' + data.cameraSnCode,
         });
         updateSchema({