bug fix

src/views/resource-guard/person-guard/person-allocate/person-deploy-dialog.vue

@@ -241,8 +241,14 @@ const getDetail = async () => {
           roleType: item.type,
         };
       });
-
-    formData.roleConfigInfo = [...singleList, ...Object.values(roleConfigMap)];
+    console.log('singleList:', singleList);
+    console.log('roleConfigMap:', roleConfigMap);
+    let arr = Object.values(roleConfigMap);
+    let rId = singleList[0]?.roleId;
+    formData.roleConfigInfo = [
+      ...(arr.find((item) => item.roleId == rId) ? [] : singleList),
+      ...arr,
+    ];
   } else {
     const validRoleTypes = Object.keys(roleQuota).filter(
       (item) => roleQuota[item]

src/views/sop/components/dynamic-form-item/RADIO.vue

@@ -7,9 +7,19 @@
       style="min-height: 32px; width: 100%"
       @change="emitChange"
     >
-      <t-radio v-for="item in options" :key="item.value" :value="item.value">{{
-        item.label
-      }}</t-radio>
+      <t-radio v-for="item in options" :key="item.value" :value="item.value"
+        >{{ item.label }}
+        <span v-if="item.remark && item.remark?.length">
+          <span>{{ '(' }}</span>
+          <span
+            v-for="(v, i) in item.remark"
+            :key="i"
+            :style="{ color: v.color }"
+            >{{ (i > 0 ? '、' : '') + v.content }}</span
+          >
+          <span>{{ ')' }}</span>
+        </span>
+      </t-radio>
       <div
         v-if="needDefineBtnFormNames.includes(config?.formName)"
         class="define-btn flex items-center"

src/views/sop/sop-manage/office-sop/index.vue

@@ -112,6 +112,10 @@
             :content="row[col.colKey]"
             @action="editSopFlowHandle(row, 'view')"
           ></more-content>
+          <span v-else-if="col.colKey === 'status'">{{ row.statusStr }}</span>
+          <span v-else-if="col.colKey === 'customManagerType'">{{
+            row.customManagerTypeStr
+          }}</span>
           <metadata-content
             v-else
             :value="row[col.colKey]"

src/views/sop/sop-manage/sop-step/index.vue

@@ -391,7 +391,9 @@ const initFill = async () => {
       res.currFlowTaskResult.formProperty.map((item) => {
         //设备出库时间和设备入库时间，赋予默认值为当前时间
         if (
-          ['device_out_time_4', 'device_in_time_10'].includes(item.formName) &&
+          // ['device_out_time_4', 'device_in_time_10'].includes(item.formName) &&
+          (item.formName.startsWith('device_out_time') ||
+            item.formName.startsWith('device_in_time')) &&
           !item.value
         ) {
           let now = Date.now();