tangning 2 yıl önce
ebeveyn
işleme
2f099f15e9

+ 1 - 1
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保外维修, 2保外转保内维修
+        warrantyType         0保内维修 ,1保内维修-人为损坏 = 保外 ,2保外维修, 3保外转保内维修
 2./salePersonnel/orderReceiving  售后工程师接单
     request 删除必填参数
         warrantyType

+ 2 - 2
src/views/Accounting/index.vue

@@ -13,12 +13,12 @@
             :actions="[
               {
                 label: '详情',
-                //ifShow: getCheckPerm('U8Sending_detail'),
+                //ifShow: getCheckPerm('Account_detail'),
                 onClick: handleDetail.bind(null, record),
               },
               {
                 label: '到账登记',
-                //ifShow: getCheckPerm('U8Sending_register') && tableType == 0,
+                ifShow: getCheckPerm('Account_registration'),
                 onClick: handleRecover.bind(null, record),
               },
             ]"

+ 1 - 1
src/views/work/checkModel.vue

@@ -251,7 +251,7 @@
         let parentList: FormSchema[] = [
           {
             field: 'partId' + number,
-            label: '备件' + number,
+            label: '备件',
             component: 'ApiSelect',
             colProps: {
               span: 12,

+ 8 - 1
src/views/work/confirmPriceModal.vue

@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     @register="register"
-    title="维修报价"
+    title="确认报价"
     width="600px"
     @cancel="clearInfo"
     :confirmLoading="loading"
@@ -71,6 +71,12 @@
           },
         },
         {
+          field: 'warrantyExpirationDateText',
+          component: 'Input',
+          slot: 'text',
+          label: '保修届满日期',
+        },
+        {
           field: 'deviceInfo',
           component: 'Input',
           label: '设备信息',
@@ -187,6 +193,7 @@
         })
         setFieldsValue({
           ...data,
+          warrantyExpirationDateText: data.warrantyDate + '(' + t(`routes.spares.warrantyType.${data.warrantyType}`) + ')',
           deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
         });
       }

+ 20 - 1
src/views/work/detail.vue

@@ -288,11 +288,13 @@
     <quoteModel @update="reload" @register="registerQuote" />
     <deliveryModal @update="reload" @register="registerDelivery" />
     <payLogModal @update="reload" @register="registerPayLog" />
+    <payLogU8Modal @update="reload" @register="registerPayU8Log" />
     <partsListModal @update="reload" @register="registerParts" />
     <checkModel @update="reload" @register="registerCheck" />
     <addAccessoryModel @update="reload" @register="registerAdd" />
     <outModal @update="reload" @register="registerOut" />
     <reviewModal @update="reload" @register="registerReview" />
+    <AccountListModal @update="reload" @register="registerAccount" />
   </div>
 </template>
 <script lang="ts">
@@ -306,7 +308,9 @@
   // import recoveryModal from './recoveryModal.vue';//录单
   import quoteModel from './quoteModel.vue';
   import deliveryModal from './deliveryModal.vue';
+  import AccountListModal from '../Accounting/ListModal.vue';
   import payLogModal from './payLogModal.vue';
+  import payLogU8Modal from '../U8Sending/ListModal.vue';
   import takingOrdersModel from './takingOrdersModel.vue';
   import remarksModal from '../spares/remarksModal.vue';
   import checkModel from './checkModel.vue';
@@ -326,7 +330,9 @@
       quoteModel,
       deliveryModal,
       payLogModal,
+      payLogU8Modal,
       takingOrdersModel,
+      AccountListModal,
       remarksModal,
       checkModel,
       partsListModal,
@@ -398,11 +404,13 @@
           20: ['报价'],
           30: ['修改报价'],
           40: ['付款登记'],
+          41: ['发件登记'],
           50: ['备件出库'],
           60: ['添加备件', '完成维修'],
 
           70: ['测试登记'],
           80: ['付款登记'],
+          82: ['到账登记'],
           90: ['备件回收'],
           91: ['备件回收'],
           // 70: ['备件回收'],
@@ -416,12 +424,14 @@
           20: ['work_quotedPrice'],
           30: ['work_setPrice'],
           40: ['work_payments'],
+          41: ['U8Sending_register'],
           50: ['repairspares_out'],
           60: ['maintenance_add', 'maintenance_finish'],
           90: ['repairspares_in'],
           91: ['repairspares_in'],
           70: ['repair_test'],
           80: ['work_payments'],
+          82: ['Account_registration'],
           100: ['work_dispatched'],
         };
         stepList.value = stepRes;
@@ -461,7 +471,7 @@
         });
         dataSource = newdataSource;
         priceTotal.value = countItem.total?.toFixed(2);
-        countItem.total = res.repairerVo.warrantyType == 0 ? '0.00' : priceTotal.value;
+        countItem.total = (res.repairerVo.warrantyType == 0 || res.repairerVo.warrantyType == 3) ? '0.00' : priceTotal.value;
         let addItemList = [countItem];
         if (res.repairerVo.warrantyType == 0 || res.repairerVo.warrantyType == 3) {
           addItemList.unshift({
@@ -499,11 +509,13 @@
           20: openQuoteModal, //报价
           30: openQuoteModal, //修改报价
           40: openPayLogModal, //付款登记
+          41: openPayLogU8Modal, //付款登记
           50: openPartsModal, //备件出库
           90: openPartsModal, //备件回收
           91: openPartsModal, //备件回收
           70: openReviewModal, //测试登记
           80: openPayLogModal, //付款登记
+          82: registerAccountModal, //付款登记
           100: openDeliveryModal, //发货登记
           61: openAddModal, //添加备件
           62: openOutModal, //完成维修
@@ -520,8 +532,10 @@
           openList[status](true, {
             ...record,
             checkResult: detailData.value.repairRegisterVoList?.[0]?.checkResult,
+            payImgArray: detailData.value.repairPay?.payImg,
             warrantyDate: detailData.value.repairerVo?.warrantyDate,
             warrantyType: detailData.value.repairerVo?.warrantyType,
+            payAmount: detailData.value.payAmount,
             repairManName: detailData.value.repairRegisterVo?.sysUserName,
           });
         }
@@ -552,10 +566,12 @@
       }
       const [registerParts, { openModal: openPartsModal }] = useModal();
       const [registerReview, { openModal: openReviewModal }] = useModal();
+      const [registerAccount, { openModal: registerAccountModal }] = useModal();
       const [registerRecovery, { openModal }] = useModal();
       const [registerCheck, { openModal: openCheckModal }] = useModal();
       const [registerQuote, { openModal: openQuoteModal }] = useModal();
       const [registerPayLog, { openModal: openPayLogModal }] = useModal();
+      const [registerPayU8Log, { openModal: openPayLogU8Modal }] = useModal();
       const [registerDelivery, { openModal: openDeliveryModal }] = useModal();
       const [registerTakingOrders, { openModal: openTakingOrders }] = useModal();
       const [registerRemarks, { openModal: openRemarksModal }] = useModal();
@@ -579,6 +595,9 @@
         registerRecovery,
         registerQuote,
         registerPayLog,
+        registerPayU8Log,
+        registerAccount,
+        registerAccountModal,
         registerDelivery,
         registerTakingOrders,
         registerRemarks,

+ 1 - 1
src/views/work/partsListModal.vue

@@ -70,7 +70,7 @@
         {
           field: 'deviceInfo',
           component: 'Input',
-          label: '设备信息',
+          label: '维修工程师',
           slot: 'text',
           colProps: {
             span: 18,

+ 3 - 3
src/views/work/quoteModel.vue

@@ -208,7 +208,7 @@
         });
         updateSchema({
           field: 'convertWarranty',
-          ifShow: data.warrantyType == 2,
+          ifShow: data.warrantyType == 2 || data.warrantyType == 1,
         });
       }
       function del(field) {
@@ -293,7 +293,7 @@
                 label: '数量', //`${ele.type == 0?'备件':'人工'}:  ${ele.name} ${ele.price} 元/次`,
                 // suffix:'数量',
                 component: 'InputNumber',
-                defaultValue: ele.count || 0,
+                defaultValue: ele.count || 1,
                 labelWidth: 50,
                 // labelWidth:300,
                 // subLabel:"数量",
@@ -303,7 +303,7 @@
                 required: true,
                 componentProps: {
                   disabled: ele.status == 1,
-                  min: 0,
+                  min: 1,
                   max: 999,
                   maxLength: 15,
                   onChange: (val) => {

+ 1 - 1
src/views/work/takingOrdersModel.vue

@@ -226,7 +226,7 @@
         });
         updateSchema({
           field: 'convertWarranty',
-          ifShow: data.warrantyType == 2,
+          ifShow: data.warrantyType == 2 || data.warrantyType == 1,
         });
       }