优化

src/pages/toolsLease/codeOut.vue

@@ -49,10 +49,20 @@
               </uni-col>
            -->
           <uni-col :span="6">
-            <button style="width: 100px" size="mini" type="primary" @click="scanStart">
+            <button style="width: 100px" type="primary" @click="scanStart">
               二维码出库
             </button>
           </uni-col>
+          <uni-col :span="6">
+            <button style="width: 100px" type="primary" @click="">
+              RFID识别
+            </button>
+          </uni-col>
+          <uni-col :span="6">
+            <button style="width: 100px" type="primary" @click="">
+              OCR识别
+            </button>
+          </uni-col>
         </uni-row>
       </view>
       <ScanQrCode
@@ -83,7 +93,7 @@
               <view class="cont">{{ item.materialName }}</view>
             </uni-col>
             <uni-col :span="4">
-              <div class="btn-del" @click="() => codeDeviceList.splice(index, 1)">删除</div>
+              <div class="btn-del" @click="delMaterial(item, index)">移除</div>
             </uni-col>
           </uni-row>
           <uni-row :gutter="24">
@@ -147,7 +157,7 @@ const boxInfo = ref({})
 // 编码设备列表查询参数
 const queryCodeParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 9999,
   typeId: '',
   maStatus: 1,
   maCode: '',
@@ -178,6 +188,15 @@ onShow(() => {
   console.log(queryParams.value)
   // getCodeDetailData(queryParams.value.id, queryParams.value.publishTask, queryParams.value.typeId) //获取详情
 })
+
+const delMaterial = (item, index) => {
+  codeDeviceList.value.splice(index, 1)
+  // 提示
+   uni.showToast({
+    title: `${item.maCode} 移除成功`,
+    icon: 'none',
+  })
+}
 // 获取编码列表
 const getCodeDetailData = async (id, publishTask, typeId) => {
   console.log('yyyyyyyyyy', id, publishTask, typeId)

src/pages/toolsLease/toolsLease.vue

@@ -17,8 +17,8 @@
       <uni-datetime-picker
         v-model="queryParams.range"
         type="daterange"
-        start-placeholder="开始"
+        start-placeholder="开始时间"
-        end-placeholder="结束"
+        end-placeholder="结束时间"
       />
       <uni-easyinput
         errorMessage
@@ -58,7 +58,7 @@
               <div>领料工器具: {{ item.maTypeNames }}</div>
               <div>领料班组: {{ item.teamName }}</div>
               <div>领料工程: {{ item.projectName }}</div>
-              <div>领料人: {{ item.leasePerson }}</div>
+              <div>班组长: {{ item.leasePerson }}</div>
               <div>预领数量: {{ item.preCountNum || 0 }}</div>
               <div>已领数量: {{ item.alNum || 0 }}</div>
               <div>待领数量: {{ item.waitCountNum || 0 }}</div>
@@ -208,10 +208,10 @@ const leaseOut = (item) => {
       url: `/pages/toolsLease/toolsLeaseOut?params=${params}`,
     })
   } else {
-    // uni.showToast({
+    uni.showToast({
-    //   title: '已完成出库',
+      title: '已完成出库',
-    //   icon: 'none',
+      icon: 'none',
-    // })
+    })
   }
 }
 

src/pages/toolsLease/toolsLeaseAdd.vue

@@ -38,7 +38,7 @@
         ></eselect>
         <uni-easyinput v-else v-model="formData.projectName" disabled></uni-easyinput>
       </uni-forms-item>
-      <uni-forms-item label="领料人" required name="leasePerson" v-if="opts.isNew != 0">
+      <uni-forms-item label="班组长" required name="leasePerson" v-if="opts.isNew != 0">
         <uni-easyinput v-model="formData.leasePerson" placeholder="请输入内容"></uni-easyinput>
       </uni-forms-item>
       <uni-forms-item label="联系电话" required name="phone" v-if="opts.isNew != 0">