bug fix

src/hooks/useOptions.js

@@ -2,8 +2,8 @@ import { useRequest } from 'vue-request';
 import { deviceCanOut, deviceCanIn } from '@/api/sop';
 import { ref, watch } from 'vue';
 const apiMap = {
-  deviceCanOut: [deviceCanOut, 'deviceNo', 'deviceModel'],
-  deviceCanIn: [deviceCanIn, 'deviceNo', 'deviceModel'],
+  deviceCanOut: [deviceCanOut, 'deviceNo', 'deviceNo'],
+  deviceCanIn: [deviceCanIn, 'deviceNo', 'deviceNo'],
 };
 
 export default function (key) {
@@ -14,8 +14,8 @@ export default function (key) {
   watch(data, (val) => {
     options.value = val.map((item) => ({
       ...item,
-      value: item[apiMap[key][0]],
-      label: item[apiMap[key][1]],
+      value: item[apiMap[key][1]],
+      label: item[apiMap[key][2]],
     }));
   });
   return { options };

src/views/login/index.vue

@@ -12,18 +12,16 @@
       <div class="title1 flex justify-between items-center">
         <span>{{ forgetStatus ? '忘记密码' : '输入信息' }}</span>
         <t-button
-          variant="outline"
-          theme="primary"
           v-if="forgetStatus"
+          variant="outline"
           @click="forgetStatus = false"
         >
           <template #icon><RollbackIcon /></template>
           返回登录
         </t-button>
         <t-button
-          variant="outline"
-          theme="primary"
           v-else
+          variant="outline"
           @click="loginType = loginType === 'ACCOUNT' ? 'PHONE' : 'ACCOUNT'"
         >
           <template #icon><SwapRightIcon /></template>

src/views/my-workbenches/workbenches/my-waits/waits-list.vue

@@ -57,6 +57,20 @@
       type="fill"
       @confirm="sopStepConfirm"
     ></sop-step-dialog>
+    <!-- PlanChangeDialog -->
+    <plan-change-dialog
+      v-model:visible="showPlanChangeDialog"
+      :sop="curSopData"
+      type="fill"
+      @confirm="sopStepConfirm"
+    ></plan-change-dialog>
+    <!-- QualityIssueDialog -->
+    <quality-issue-dialog
+      v-model:visible="showQualityIssueDialog"
+      :sop="curSopData"
+      type="fill"
+      @confirm="sopStepConfirm"
+    ></quality-issue-dialog>
   </div>
 </template>
 
@@ -64,6 +78,8 @@
 import { ref } from 'vue';
 import { timestampFilter, customerTypeFilter } from '@/utils/filter';
 import SopStepDialog from '@/views/sop/sop-manage/sop-step/sop-step-dialog.vue';
+import PlanChangeDialog from '@/views/sop/sop-manage/plan-change/plan-change-dialog.vue';
+import QualityIssueDialog from '@/views/sop/sop-manage/quality-issue/quality-issue-dialog.vue';
 
 const { tableData, pagination, onChange } = defineProps([
   'tableData',
@@ -73,10 +89,23 @@ const { tableData, pagination, onChange } = defineProps([
 const emit = defineEmits(['success']);
 
 const showSopStepDialog = ref(false);
+const showPlanChangeDialog = ref(false);
+const showQualityIssueDialog = ref(false);
 const curSopData = ref({});
 const editSopFlowHandle = (row) => {
   curSopData.value = row;
-  showSopStepDialog.value = true;
+  if (row.type === 'PROJECT_EXCHANGE_FLOW') {
+    showPlanChangeDialog.value = true;
+    return;
+  }
+  if (row.type === 'QUALITY_PROBLEM_FLOW') {
+    showQualityIssueDialog.value = true;
+    return;
+  }
+  if (row.type === 'OFFICE_SOP_FLOW' || row.type === 'CLOUD_MARK_SOP_FLOW') {
+    showSopStepDialog.value = true;
+    return;
+  }
 };
 const sopStepConfirm = () => {
   emit('success');

src/views/resource-guard/person-guard/person-files/index.vue

@@ -19,7 +19,6 @@
           </template>
           <upload-button
             upload-url="/api/admin/user/archives/import"
-            param-file-name="MultipartFile"
             :format="['xls', 'xlsx']"
           >
             <t-button variant="outline">

src/views/sop/sop-manage/plan-change/index.vue

@@ -16,7 +16,7 @@
             </t-col>
             <t-col :span="3">
               <t-form-item label="派单时间">{{
-                sopInfo.beginTime
+                timestampFilter(sopInfo.beginTime)
               }}</t-form-item>
             </t-col>
             <t-col :span="3">
@@ -36,12 +36,12 @@
             </t-col>
             <t-col :span="3">
               <t-form-item label="考试开始时间" label-width="100px">{{
-                sopInfo.examStartTime
+                timestampFilter(sopInfo.examStartTime)
               }}</t-form-item>
             </t-col>
             <t-col :span="3">
               <t-form-item label="考试结束时间" label-width="100px">{{
-                sopInfo.examEndTime
+                timestampFilter(sopInfo.examEndTime)
               }}</t-form-item>
             </t-col>
             <t-col :span="3">
@@ -86,7 +86,7 @@
             </t-col>
             <t-col :span="4" :offset="1">
               <t-form-item label="报备申请时间">
-                {{ timestampFilter(sopInfo.createTime) }}
+                {{ timestampFilter(sopInfo.createTime || sopInfo.flowTime) }}
               </t-form-item>
             </t-col>
           </template>
@@ -270,7 +270,7 @@ const initData = async () => {
   }
 
   // audit
-  const res = await planChangeDetail(props.sop.id);
+  const res = await planChangeDetail(props.sop.objId);
   sopInfo.value.beginTime = res.crmInfo.crmBeginTime;
   sopInfo.value.customManagerName = res.crmInfo.customManagerName;
   sopInfo.value.customManagerTypeStr = props.sop.customTypeStr;