Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web

# Conflicts:
#	src/views/task/content/Content.vue

src/views/task/aside/ListItem.vue

@@ -33,7 +33,7 @@ const svgName = computed(() => {
     </div>
     <ul class="list-item-detail">
       <li>审批状态：<span class="list-item-status">{{ listItem.statshis }}</span></li>
-      <li>审批节点：{{ listItem.taskname }}</li>
+      <li>审批节点：{{ listItem.tasknamehis }}</li>
       <li>提交时间：{{ format(new Date(), 'yyyy-MM-dd HH:mm:ss') }}</li>
       <li>提报人：{{ listItem.fromuserid }}</li>
 

src/views/task/content/TaskTable.vue

@@ -4,52 +4,20 @@ defineProps({
     type: Object as PropType<any>,
     required: true,
   },
-})
+  taskTableData: {
+    type: Array,
+    default: () => [[]],
+  },
+});
 </script>
 
 <template>
   <table class="description">
-    <tr>
+    <tr v-for="(item, index) in taskTableData" :key="index">
-      <th>拜访终端名称</th>
+      <th>{{ item[0]["label"] }}</th>
-      <td class="blue">
+      <td>{{ item[0]["value"] }}</td>
-        {{ data?.ocrPicture?.field3 }}
+      <th v-if="item.length>1">{{ item[1]["label"] }}</th>
-      </td>
+      <td v-if="item.length>1">{{ item[1]["value"] }}</td>
-      <th>定位信息</th>
-      <td class="blue">
-        {{ data?.ocrPicture?.field10 }}
-      </td>
-    </tr>
-    <tr>
-      <th>拜访日期</th>
-      <td> {{ data?.ocrPicture?.field1 }}</td>
-      <th>定位距离</th>
-      <td> {{ data?.ocrPicture?.field12 }}</td>
-    </tr>
-    <tr>
-      <th>拜访小结</th>
-      <td> {{ data?.ocrPicture?.field8 }}</td>
-      <th>拜访项目类别</th>
-      <td> {{ data?.ocrPicture?.field17 }}</td>
-    </tr>
-    <tr>
-      <th>科室名称</th>
-      <td> {{ data?.ocrPicture?.field7 }}</td>
-      <th>病例号</th>
-      <td></td>
-    </tr>
-    <tr>
-      <th>拜访级别</th>
-      <td> {{ data?.ocrPicture?.field6 }}</td>
-      <th>下阶段计划</th>
-      <td></td>
-    </tr>
-    <tr>
-      <th>是否为重复图片</th>
-      <td> {{ data?.ocrPicture?.field14 }}</td>
-      <th>附件信息</th>
-      <td>
-        <a href="data?.fileannex" download></a>
-      </td>
     </tr>
   </table>
 </template>

src/views/task/modal/CustomSettingModal.vue

@@ -104,6 +104,7 @@ async function handleSumbit(e: MouseEvent) {
       userField += `${v.id},`;
     }
   });
+  userField = userField.slice(0,userField.length-1);
   savefield(props.reviewType, userInfo.id, userField);
   e.preventDefault();
   closeModal();

src/views/worksheet/modal/CustomFieldModal.vue

@@ -104,6 +104,7 @@ async function handleSumbit(e: MouseEvent) {
   onList.value.map((v) => {
     userField += `${v.id},`;
   });
+  userField = userField.slice(0,userField.length-1);
   savefield(props.reviewType, userInfo.id, userField);
   e.preventDefault();
   closeModal();