Merge branch 'master' of http://192.168.30.2:3000/bonus/bonus-material-app

src/pages/repair/equipAssessment/index.vue

@@ -45,6 +45,7 @@
                           <span class="sub-code">{{ `${item.backCode}-${item.level}` }}</span>
                       </div>
                       <div class="title-right">
+                          <uni-tag v-if="item.dataStatus == 3" text="修饰后入库驳回" type="error" style="margin-right: 5px" custom-style="errorStyle"/>
                           <uni-tag v-if="item.status == 0" text="未完成" type="warning" custom-style="warningStyle"/>
                           <uni-tag v-if="item.status == 1" text="已完成" type="success" custom-style="successStyle"/>
                           <uni-tag v-if="item.status == 2" text="已驳回" type="warning" custom-style="warningStyle"/>
@@ -95,6 +96,23 @@
             </view>
         </scroll-view>
     </view>
+
+  <!-- 自定义弹窗 -->
+  <view v-if="showCustomModal" class="custom-modal-mask" @tap="handleCloseModal">
+    <view class="custom-modal-container" @tap.stop>
+      <view class="custom-modal-header">
+        <text class="custom-modal-title">{{ modalTitle }}</text>
+        <text class="custom-modal-close" @tap="handleCloseModal">×</text>
+      </view>
+      <view class="custom-modal-content">
+        {{ modalContent }}
+      </view>
+      <view class="custom-modal-footer">
+        <button class="custom-modal-btn cancel" @tap="handleCancel">转至维修</button>
+        <button class="custom-modal-btn confirm" @tap="handleConfirm">进入定损</button>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
@@ -111,6 +129,10 @@ const dateArray = ref([
     new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
     new Date().toISOString().split('T')[0]
 ]) //            日期范围
+const showCustomModal = ref(false)
+const currentItem = ref(null)
+const modalTitle = ref('提示')
+const modalContent = ref('是否确认进行定损？')
 // 查询参数
 const queryParams = ref({
     startTime: dateArray.value[0] || '',
@@ -254,20 +276,62 @@ const changeTab = (index) => {
 // 点击跳转详情
 const handleItem = (item) => {
 	console.log(item)
+  currentItem.value = item
   if(item.repairStatusCode == "0") {
-            // 弹出确认弹窗
+    // 使用自定义弹窗
-    uni.showModal({
+    showCustomModal.value = true
-      title: '提示',
+  } else {
-      content: '是否确认进行定损？',
+    uni.navigateTo({ url: `/pages/repair/equipAssessment/view?taskId=${item.taskId}` })
-      confirmText: '进入定损', 
+  }
-      cancelText: '转至维修',
+
-      success: async (res) => {
+
-        if (res.confirm) {
+
-          // 用户点击确认，进行页面跳转
+	// if(item.repairStatusCode=="0"){
-          uni.navigateTo({ url: `/pages/repair/equipAssessment/details?taskId=${item.taskId}` })
+  //           // 弹出确认弹窗
-        } else if (res.cancel) {
+  //   uni.showModal({
-            //直接进行维修
+  //     title: '提示',
-             const res = await updateRepairStatusAPI({taskId: item.taskId})
+  //     content: '是否确认进行定损？',
+  //     confirmText: '进入定损',
+  //     cancelText: '转至维修',
+  //     success: async (res) => {
+  //       if (res.confirm) {
+  //         // 用户点击确认，进行页面跳转
+  //         uni.navigateTo({ url: `/pages/repair/equipAssessment/details?taskId=${item.taskId}` })
+  //       } else if (res.cancel) {
+  //           //直接进行维修
+  //            const res = await updateRepairStatusAPI({taskId: item.taskId})
+  //            if(res.code==200){
+  //               uni.showToast({
+  //                   title: '成功转至维修',
+  //                   icon: 'none',
+  //               })
+  //               setTimeout(() => {
+  //                   queryParams.value.pageNum = 1
+  //                   tableList.value = []
+  //                   getTableList(true)
+	// 	        }, 1000)
+  //
+  //            }
+  //       }
+  //     }
+  //   })
+	// 	// uni.navigateTo({ url: `/pages/repair/equipAssessment/details?taskId=${item.taskId}` })
+	// }else{
+	// 	uni.navigateTo({ url: `/pages/repair/equipAssessment/view?taskId=${item.taskId}` })
+	// }
+    
+}
+
+// 自定义弹窗确认事件
+const handleConfirm = () => {
+  showCustomModal.value = false
+  uni.navigateTo({ url: `/pages/repair/equipAssessment/details?taskId=${currentItem.value.taskId}` })
+}
+
+// 自定义弹窗取消事件
+const handleCancel = async () => {
+  showCustomModal.value = false
+  const res = await updateRepairStatusAPI({taskId: currentItem.value.taskId})
   if(res.code == 200) {
     uni.showToast({
       title: '成功转至维修',
@@ -278,16 +342,12 @@ const handleItem = (item) => {
       tableList.value = []
       getTableList(true)
     }, 1000)
-                
   }
 }
-      }
-    })
-		// uni.navigateTo({ url: `/pages/repair/equipAssessment/details?taskId=${item.taskId}` })
-	}else{
-		uni.navigateTo({ url: `/pages/repair/equipAssessment/view?taskId=${item.taskId}` })
-	}
 
+// 关闭弹窗
+const handleCloseModal = () => {
+  showCustomModal.value = false
 }
 
 // 判断数据是否加载完毕
@@ -314,6 +374,82 @@ const maskClick = () => {}
 </script>
 
 <style lang="scss" scoped>
+/* 在style部分添加以下样式 */
+.custom-modal-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
+}
+
+.custom-modal-container {
+  width: 600rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+}
+
+.custom-modal-header {
+  margin-left: 10px;
+  margin-right: 10px;
+  padding: 10rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1rpx solid #eee;
+}
+
+.custom-modal-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.custom-modal-close {
+  font-size: 40rpx;
+  color: #999;
+  padding: 10rpx;
+}
+
+.custom-modal-content {
+  padding: 40rpx 30rpx;
+  font-size: 28rpx;
+  color: #666;
+  text-align: center;
+}
+
+.custom-modal-footer {
+  display: flex;
+  border-top: 1rpx solid #eee;
+}
+
+.custom-modal-btn {
+  flex: 1;
+  margin: 0;
+  border-radius: 0;
+  border: none;
+  background: none;
+  line-height: 90rpx;
+  font-size: 28rpx;
+}
+
+.custom-modal-btn.cancel {
+  color: #666;
+  border-right: 1rpx solid #eee;
+}
+
+.custom-modal-btn.confirm {
+  color: #3784fb;
+  font-weight: bold;
+}
+
+
 	.title-left {
 	    display: flex;
 	    flex-direction: column;

src/pages/repair/fieldMaintenance/added.vue

@@ -1,5 +1,12 @@
 <template>
     <view class="accept page-common">
+        <div class="card">
+            <uni-row :gutter="24">
+                <uni-col :span="6">
+                    <view class="coding-btn" @tap="codeScan">二维码识别</view>
+                </uni-col>
+            </uni-row>
+        </div>
         <div class="card">
             <uni-forms :modelValue="formData" label-width="170rpx" :border="true">
                 <uni-forms-item label="单位名称：" name="unitId" required>
@@ -33,6 +40,11 @@
             <button class="btn-cont" @click="clearForm">清空</button>
             <button class="btn-cont" @click="confirmAdd">确认</button>
         </div>
+        <ScanQrCode
+            ref="scanQrCodeRef"
+            @scanSuccess="handleScanSuccess"
+            @scanError="handleScanError"
+        />
     </view>
 </template>
 
@@ -45,7 +57,11 @@ import {
     insert,
     getAgreementInfoById,
 } from '@/services/fieldMaintenance/fieldMaintenance.js'
+import { getMachineByQrCodeApi } from '../../../services/back.js'
 import eselect from '@/components/tree-select/eselect.vue'
+import ScanQrCode from '@/pages/devicesSearch/ScanQrCode.vue'
+
+const scanQrCodeRef = ref(null)
 const treeSelect = ref(null)
 const treeSelect2 = ref(null)
 const unitId = ref('')
@@ -55,7 +71,49 @@ const unitList = ref([])
 const proList = ref([])
 const fieldPerson = ref('')
 const phone = ref('')
+const qrCode = ref('')
+const maInfo = ref({}) //二维码
+// 处理扫描成功事件
+const handleScanSuccess = (result) => {
+    qrCode.value = result?.data?.split('?qrcode=')[1] || result?.data
+    if (qrCode.value === '') {
+        uni.showToast({ title: '扫码识别失败', icon: 'none' })
+    } else {
+        getMaInfoScan()
+    }
+}
+// 处理扫描失败事件
+const handleScanError = (error) => {
+    console.error('扫描出错:', error.message)
+    uni.showToast({ title: error.message, icon: 'none' })
+}
 
+//查看是否是该规格型号
+const getMaInfoScan = async () => {
+    let param = {
+        qrCode: qrCode.value,
+    }
+    //通过二维码获取相绑定的设备编码
+    const res = await getMachineByQrCodeApi(param)
+    console.log(res)
+    if (res.code == 200) {
+        if (res.data.length > 0) {
+            unitId.value = res.data[0].unitId
+            proId.value = res.data[0].proId
+        } else {
+            uni.showToast({ title: '扫码二维码未绑定设备编码！', icon: 'none' })
+        }
+    } else {
+        uni.showToast({ title: res.data.msg, icon: 'none' })
+    }
+}
+const codeScan = async () => {
+    qrCode.value = ''
+
+    if (scanQrCodeRef.value) {
+        scanQrCodeRef.value.scanQrCode()
+    }
+}
 //单位
 const getUnit = () => {
     // proId.value=e.id;
@@ -213,6 +271,25 @@ onLoad((options) => {
         margin-bottom: 24rpx;
         height: auto;
 
+        .coding-btn {
+            height: 70rpx;
+            line-height: 70rpx;
+            background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
+            border-radius: 12rpx;
+            text-align: center;
+            color: #fff;
+            font-size: 24rpx;
+            font-weight: 600;
+            box-shadow: 0 6rpx 20rpx rgba(55, 132, 251, 0.2);
+            transition: all 0.3s ease;
+
+            &:active {
+                transform: scale(0.98);
+                opacity: 0.9;
+                box-shadow: 0 2rpx 8rpx rgba(55, 132, 251, 0.2);
+            }
+        }
+
         // 表单样式
         :deep(.uni-forms) {
             .uni-forms-item {

src/services/repair/repair.js

@@ -55,7 +55,7 @@ export const repairRejectAPI = (id) => {
 export const partTypeTreeList = (data) => {
     return http({
         method: 'GET',
-        url: '/material/ma_part_type/list',
+        url: '/material/ma_part_type/partList',
         data,
     })
 }