Merge remote-tracking branch 'origin/mall_master' into mall_master

src/views/SnapshotCluster/ClusterResult/ClusterResult.vue

@@ -149,6 +149,14 @@
             </a-popconfirm> -->
             </a-popconfirm> -->
 						<el-button type="text" :disabled="!isMultipleOperation" @click="deletePersonRecord(person)">剔除</el-button>
 						<el-button type="text" :disabled="!isMultipleOperation" @click="deletePersonRecord(person)">剔除</el-button>
 						<a-popconfirm
 						<a-popconfirm
+						    title="是否添加至店员库"
+						    ok-text="是"
+						    cancel-text="否"
+						    @confirm="addShopkeeper(person)"
+						>
+						  <el-button type="text" :disabled="!isMultipleOperation">添加店员库</el-button>
+						</a-popconfirm>
+            <a-popconfirm
                 title="将彻底删除，您确认吗？"
                 title="将彻底删除，您确认吗？"
                 ok-text="是"
                 ok-text="是"
                 cancel-text="否"
                 cancel-text="否"
@@ -813,6 +821,43 @@ export default {
               }
               }
           )
           )
         }
         }
+				// 添加店员库
+				const addShopkeeper = () => {
+				  console.log('addShopkeeper', selectedPersonList)
+				  if (selectedPersonList.value.length < 1) {
+				    ElMessage({
+				      message: `至少选择一条数据`,
+				      type: 'error'
+				    })
+				    return
+				  }
+					
+				  const strIdList = selectedPersonList.value.map(item => item.unid)
+					const rawData = toRaw(queryForm)
+				  const params = {
+				    unids: strIdList,
+						mallId:selectedPersonList.value[0].mall_id,
+						countdate:formatDate(rawData.date) + ' 00:00:00',
+				  }
+				  clusterResultApi.addDataToShopkeeper(params).then(
+				      (r) => {
+				        if(r.msg_code==200){
+				          ElMessage({
+				            message: `添加成功`,
+				            type: 'success'
+				          })
+				          selectedPersonList.value = []
+				          // 刷新列表
+				          handleRefresh()
+				        } else {
+				          ElMessage({
+				            message: `添加失败`,
+				            type: 'error'
+				          })
+				        }
+				      }
+				  )
+				}
         // 移动人员
         // 移动人员
         const personGroupMoverRef = ref();
         const personGroupMoverRef = ref();
         const movePersonRecord = () => {
         const movePersonRecord = () => {
@@ -1095,7 +1140,7 @@ export default {
           handleMutipleOperation,
           handleMutipleOperation,
           mutipleOperationText,
           mutipleOperationText,
           deleteRealPersonRecord,
           deleteRealPersonRecord,
-
+					addShopkeeper,
           childAdultOptions,
           childAdultOptions,
           formatChildAdult
           formatChildAdult
         }
         }

src/views/SnapshotCluster/ClusterResult/ClusterResultApi.js

@@ -123,6 +123,16 @@ class ClusterResultApi {
             }
             }
         )
         )
     }
     }
+		// 添加店员库
+		addDataToShopkeeper(data) {
+		    return axiosInstance.request(
+		        {
+		            method: 'POST',
+		            url: `/faceRecognitions/addStaff`,
+		            data: data
+		        }
+		    )
+		}
     // 剔除或移动
     // 剔除或移动
     updateRecognition(data) {
     updateRecognition(data) {
         return axiosInstance.request(
         return axiosInstance.request(