Explorar o código

fix: 修改bug

tangning %!s(int64=2) %!d(string=hai) anos
pai
achega
f6b19765fa

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

@@ -6,7 +6,7 @@ export default {
     20: '待报价',
     30: '待确认',
     40: '已取消',
-    41: 'u8发货',
+    41: '待发件',
     50: '待备料',
     60: '维修中',
     70: '待测试',

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

@@ -14,7 +14,7 @@
           {{ model[field] }}
         </template>
         <template #add>
-          <Button @click="add">添加备件</Button>
+          <a-button type="primary" @click="add">添加备件</a-button>
         </template>
         <template #del="{ field }">
           <Button @click="del(field)">删除</Button>

+ 3 - 2
src/views/work/aftermarket.vue

@@ -6,10 +6,11 @@
       >
     </template>
     <template #href="{ record }">
-          <a v-if="record.repairId" :href="`/#/work/detail/${record.repairId}`">{{record.repairId}}</a>
+          <router-link :to="`/work/detail/${ record.repairId }`">{{ record.repairId }}</router-link>
+          <!-- <router-link :to="`/#/work/detail/${ record.repairId }`"> <a>{{record.repairId}}</a> <router-link/> -->
           <!-- <span v-else-if="record.sceneName">{{record.sceneName}}</span>
           <span v-else>-</span> -->
-        </template>
+    </template>
   </BasicTable>
 </template>
 <script lang="ts">

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

@@ -14,7 +14,7 @@
           {{ model[field] }}
         </template>
         <template #add>
-          <Button @click="add">添加备件</Button>
+          <a-button type="primary" @click="add">添加备件</a-button>
         </template>
         <template #del="{ field }">
           <Button @click="del(field)">删除</Button>
@@ -201,8 +201,10 @@
           checkResult: '',
           checkImg: [],
         };
+        fileFlow.type = data.type;
+        fileFlow.cameraType = data.cameraType;
         if (data.status == 20) {
-          let res = await checkRegisterInfo({repairId:'20230506152208120'||data.repairId})
+          let res = await checkRegisterInfo({repairId:data.repairId})
           console.log('repairId',res)
           let index = n.value
           res.partList.map((ele,b) => {
@@ -227,8 +229,6 @@
             ifShow: data.warrantyType == 0,
           },
         ]);
-        fileFlow.type = data.type;
-        fileFlow.cameraType = data.cameraType;
         setFieldsValue({
           ...data,
           ...backfill,

+ 3 - 0
src/views/work/detail.vue

@@ -90,6 +90,9 @@
             <DescriptionsItem label="接单日期">
               {{ detailData.orderReceivingVo?.createTime }}
             </DescriptionsItem>
+            <DescriptionsItem label="附件、附带物品">
+              {{ detailData.orderReceivingVo?.annex }}
+            </DescriptionsItem>
           </Descriptions>
           <!-- <Descriptions title="" :column="3">
             <DescriptionsItem label="备注内容">

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

@@ -14,7 +14,7 @@
           {{ model[field] }}
         </template>
         <template #add>
-          <Button @click="add">添加备件</Button>
+          <a-button type="primary" @click="add">添加备件</a-button>
         </template>
         <template #del="{ field }">
           <Button @click="del(field)">删除</Button>

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

@@ -15,8 +15,8 @@
         </template>
         <template #add>
           <div>
-            <Button @click="updataRepairInfo">重置</Button>
-            <Button  @click="add" style="margin-left:20px">添加明细</Button>
+            <a-button type="primary" @click="updataRepairInfo">重置</a-button>
+            <a-button type="primary" @click="add" style="margin-left:20px">添加明细</a-button>
           </div>
         </template>
         <template #del="{ field }">

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

@@ -239,7 +239,7 @@
         //   content: '删除设备后需要重新入库<br/>确定删除吗?',
         //   onOk: async () => {
         const params = await validate();
-        const res = await orderReceiving(params);
+        const res = await orderReceiving({...params, convertWarranty: params.convertWarranty ? 1 : 0,});
         console.log('validate', params, res);
         createMessage.success(t('common.optSuccess'));
         closeModal();