Merge branch 'repair'

src/api/repair/tickets/TicketWares.js

@@ -28,6 +28,14 @@ export function removeTicketWares(id){
   })
 }
 
+// 领料完成
+export function confirmOver(id){
+  return request({
+    url: preUrl + "/confirmOver?id=" + id,
+    method: 'get'
+  })
+}
+
 // 审核
 export function auditTicketWares(data){
   return request({

src/views/repair/orderinfo/index.vue

@@ -87,10 +87,10 @@
       </el-table-column>
       <el-table-column label="操作" width="150" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
-          <el-button v-if="scope.row.orderStatus === '0'" size="mini" type="text" icon="el-icon-edit"
-                     @click="toPay(scope.row)"
-                     v-hasPermi="['repair:order-info:update']">支付
-          </el-button>
+<!--          <el-button v-if="scope.row.orderStatus === '0'" size="mini" type="text" icon="el-icon-edit"-->
+<!--                     @click="toPay(scope.row)"-->
+<!--                     v-hasPermi="['repair:order-info:update']">支付-->
+<!--          </el-button>-->
           <!--          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"-->
           <!--                     v-hasPermi="['repair:order-info:update']">修改-->
           <!--          </el-button>-->

src/views/repair/stockOperate/Components/WaresItem.vue

@@ -108,6 +108,9 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleConfirmOver">
+          申领完成
+        </el-button>
         <el-button type="primary" v-if="type" @click="handlePassBefore"
                    :disabled="allSelectRows.length === 0 || allSelectRows.filter(item => !item.isStock).length !== 0">
           通知领料
@@ -288,7 +291,7 @@
 </template>
 
 <script>
-import {getPage, pass, passBackTicketWares, getByIds, exportData} from "@/api/repair/tickets/TicketWares";
+import {getPage, pass, passBackTicketWares, getByIds, exportData,confirmOver} from "@/api/repair/tickets/TicketWares";
 import {listTwItem} from "@/api/repair/tickets/TWItem";
 import {createUniqueCodeByHead} from "@/utils/createUniqueCode";
 import {parseTime} from "@/utils/ruoyi";
@@ -440,6 +443,17 @@ export default {
       this.images = null
       this.inPhoto = true
     },
+    /** 申领完成 */
+    async handleConfirmOver() {
+      await this.$modal.confirm('确定所有配件均已申领完成？')
+      try {
+        await confirmOver(this.twId);
+        await this.getList();
+        this.dialogVisible = false
+        this.$modal.msgSuccess("操作成功");
+      } catch {
+      }
+    },
     async getTicketStaff() {
       const res = await listByTicketId(this.ticketId)
       this.staffs = res.data

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

@@ -66,11 +66,11 @@
                 维修记录设置
               </el-dropdown-item>
               <!-- 服务顾问才有 -->
-              <el-dropdown-item command="noticeCus" type="text" icon="el-icon-finished" v-if="userRole === 'service_advisor' && scope.row.ticketsWorkStatus === '03'">
+              <el-dropdown-item command="noticeCus" type="text" icon="el-icon-finished" v-if="userRole == 'service_advisor' && scope.row.ticketsStatus == '07'">
                 通知客户取车
               </el-dropdown-item>
               <!-- 服务顾问才有 -->
-              <el-dropdown-item command="carToCus" type="text" icon="el-icon-circle-check" v-if="userRole === 'service_advisor' && scope.row.ticketsStatus === '02' ">
+              <el-dropdown-item command="carToCus" type="text" icon="el-icon-circle-check" v-if="userRole == 'service_advisor' && (scope.row.ticketsStatus == '01' || scope.row.ticketsStatus == '06' || scope.row.ticketsStatus == '02') && scope.row.isHandover == '0'">
                 交车
               </el-dropdown-item>
             </el-dropdown-menu>