修改问题

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

@@ -8,10 +8,10 @@ export default {
     40:'已取消',
     50:'待备料',
     60:'维修中',
-    70:'待回收',
-    90:'待测试',
-    91:'取消维修',
-    // 9:'待支付',
+    70:'待测试',
+    80:'待支付',
+    90:'待回收',
+    91:'取消维修待回收',
     100:'待发货',
     110:'已发货',
     12:'已评价',

src/views/work/maintenance.vue

@@ -20,12 +20,12 @@
             },
             {
               label: '添加备件',
-              ifShow:getCheckPerm('maintenance_add') && tableType == 1 && record.status == 6,
+              ifShow:getCheckPerm('maintenance_add') && tableType == 1 && record.status == 60,
               onClick: handleAdd.bind(null, record),
             },
             {
               label: '完成维修',
-              ifShow:getCheckPerm('maintenance_finish') && tableType == 1 && record.status == 6,
+              ifShow:getCheckPerm('maintenance_finish') && tableType == 1 && record.status == 60,
               onClick: handleOut.bind(null, record),
             },
             {

src/views/work/partsListModal.vue

@@ -12,7 +12,7 @@
       <div class="form_item"><div class="item_lable">维修单号：</div>{{modelRef.repairId}}</div>
       <div class="form_item"><div class="item_lable">维修工程师：</div>{{modelRef.repairManName}}</div>
       <BasicTable @register="registerTable" />
-      <div class="tips" v-if="modelRef.title == '备件出库'">注：请按备件清单给维修工程师提供备件</div>
+      <div class="tips">{{ modelRef.title == '备件出库'?'注：请按备件清单给维修工程师提供备件':'回收说明：完成维修，请回收废旧备件；取消维修，请回收新的备件 (自动恢复库存)。' }}</div>
     </div>
   </BasicModal>
 </template>
@@ -69,8 +69,8 @@ export default defineComponent({
     });
 
     function onDataReceive(data) {
-      type.value = data.status == 5?0:1
-      modelRef.value.title = data.status == 5?'备件出库':'备件回收';
+      type.value = data.status == 50?0:1
+      modelRef.value.title = data.status == 50?'备件出库':'备件回收';
       repairId.value = data.repairId
       modelRef.value.repairId = data.repairId;
       modelRef.value.repairManName = data.repairManName;

src/views/work/query.vue

@@ -4,16 +4,16 @@
       <a-tabs v-model:activeKey="tableType" @change="changeTable">
         <a-tab-pane :key="null" :tab="t('routes.spares.tableType.-1')" />
         <a-tab-pane :key="0" :tab="t('routes.spares.tableType.0')" />
-        <a-tab-pane :key="1" :tab="t('routes.spares.tableType.1')" />
-        <a-tab-pane :key="2" :tab="t('routes.spares.tableType.2')" />
-        <a-tab-pane :key="3" :tab="t('routes.spares.tableType.3')" />
-        <a-tab-pane :key="4" :tab="t('routes.spares.tableType.4')" />
-        <a-tab-pane :key="5" :tab="t('routes.spares.tableType.5')" />
-        <a-tab-pane :key="6" :tab="t('routes.spares.tableType.6')" />
-        <a-tab-pane :key="7" :tab="t('routes.spares.tableType.7')" />
-        <a-tab-pane :key="8" :tab="t('routes.spares.tableType.8')" />
-        <a-tab-pane :key="9" :tab="t('routes.spares.tableType.9')" />
         <a-tab-pane :key="10" :tab="t('routes.spares.tableType.10')" />
+        <a-tab-pane :key="20" :tab="t('routes.spares.tableType.20')" />
+        <a-tab-pane :key="30" :tab="t('routes.spares.tableType.30')" />
+        <a-tab-pane :key="40" :tab="t('routes.spares.tableType.40')" />
+        <a-tab-pane :key="50" :tab="t('routes.spares.tableType.50')" />
+        <a-tab-pane :key="60" :tab="t('routes.spares.tableType.60')" />
+        <a-tab-pane :key="70" :tab="t('routes.spares.tableType.70')" />
+        <a-tab-pane :key="80" :tab="t('routes.spares.tableType.80')" />
+        <a-tab-pane :key="90" :tab="t('routes.spares.tableType.90')" />
+        <a-tab-pane :key="100" :tab="t('routes.spares.tableType.10')" />
       </a-tabs></template
     >
     <div class="desc-wrap-BasicTable">

src/views/work/quoteModel.vue

@@ -350,6 +350,7 @@
               if(manMade.includes(ele.laborCostId)){
                 priceListsparams.push({
                   count:1,
+                  priceListId:ele.priceListId,
                   laborId:ele.laborCostId,
                   partId:ele.laborCostId,
                   type:1,

src/views/work/repairsparesList.vue

@@ -4,7 +4,7 @@
       <a-tabs v-model:activeKey="tableType" @change="changeTable">
         <a-tab-pane :key="0" :tab="t('routes.spares.tableType.24')" />
         <a-tab-pane :key="1" :tab="t('routes.spares.tableType.25')" />
-        <a-tab-pane :key="2" :tab="t('routes.spares.tableType.7')" />
+        <a-tab-pane :key="2" :tab="t('routes.spares.tableType.70')" />
       </a-tabs></template
     >
     <div class="desc-wrap-BasicTable">