Browse Source

fix: bug

master
yxhc 2 weeks ago
parent
commit
e020800639
5 changed files with 35 additions and 2 deletions
  1. +14
    -0
      .prettierignore
  2. +13
    -0
      .prettierrc
  3. +6
    -1
      src/pages/projectStoreManage/projectStore/projectDetail/components/flowRecordDialog.vue
  4. +1
    -0
      src/pages/projectStoreManage/projectStore/projectDetail/index.vue
  5. +1
    -1
      src/pages/toDoCenter/components/flowRecord.vue

+ 14
- 0
.prettierignore View File

@@ -0,0 +1,14 @@
node_modules
dist
pnpm-lock.yaml
CHANGELOG.en-US.md
docs/components.d.ts
coverage
play
ssr-testing/cases/*
docs/.vitepress/i18n/*
docs/.vitepress/cache/*

docs/.vitepress/crowdin/*
!docs/.vitepress/crowdin/en-US
!.*

+ 13
- 0
.prettierrc View File

@@ -0,0 +1,13 @@
{
"semi": false,
"singleQuote": true,
"endOfLine": "lf",
"overrides": [
{
"files": ".prettierrc",
"options": {
"parser": "json"
}
}
]
}

+ 6
- 1
src/pages/projectStoreManage/projectStore/projectDetail/components/flowRecordDialog.vue View File

@@ -16,6 +16,10 @@ const
sjFlowData: { sjFlowData: {
type: String, type: String,
default: undefined default: undefined
},
detail: {
type: Object,
default: undefined
} }
}), }),
emits = defineEmits(['close']), emits = defineEmits(['close']),
@@ -23,6 +27,7 @@ const
watch( watch(
() => props.visible, () => props.visible,
async val => { async val => {
console.log(props.flowData)
flowTabActiveName.value = props.sjFlowData ? '2' : '1' flowTabActiveName.value = props.sjFlowData ? '2' : '1'
} }
) )
@@ -40,7 +45,7 @@ watch(
<el-tab-pane label="省级部门联审流程记录" name="2" /> <el-tab-pane label="省级部门联审流程记录" name="2" />
<el-tab-pane label="联审确认流程记录" name="1" /> <el-tab-pane label="联审确认流程记录" name="1" />
</el-tabs> </el-tabs>
<flow-record v-if="flowTabActiveName==='1'" :flow-data="props.flowData||[]" />
<flow-record v-if="flowTabActiveName==='1'" :flow-data="props.flowData||[]" :detail="detail" />
<sj-flow-record v-if="flowTabActiveName==='2'" :flow-data="props.sjFlowData&&JSON.parse(props.sjFlowData)||[]" /> <sj-flow-record v-if="flowTabActiveName==='2'" :flow-data="props.sjFlowData&&JSON.parse(props.sjFlowData)||[]" />
</el-dialog> </el-dialog>
</template> </template>

+ 1
- 0
src/pages/projectStoreManage/projectStore/projectDetail/index.vue View File

@@ -212,6 +212,7 @@ onMounted(async () => {
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<flow-record-dialog <flow-record-dialog
:detail="detailData"
:visible="flowRecordDialogData.visible" :visible="flowRecordDialogData.visible"
:flow-data="flowRecordDialogData.flowData" :flow-data="flowRecordDialogData.flowData"
:sj-flow-data="flowRecordDialogData.sjFlowData" :sj-flow-data="flowRecordDialogData.sjFlowData"


+ 1
- 1
src/pages/toDoCenter/components/flowRecord.vue View File

@@ -113,7 +113,7 @@ const
</div> </div>
</div> </div>


<div v-if="detail.opinions&&detail.opinions?.length" class="flex text-info mt-5">
<div v-if="detail&&detail.opinions&&detail.opinions?.length" class="flex text-info mt-5">
<span>终验意见:</span> <span>终验意见:</span>
<div> <div>
<p v-for="(file,fileIndex) in detail.opinions" :key="fileIndex" class="mb-4"> <p v-for="(file,fileIndex) in detail.opinions" :key="fileIndex" class="mb-4">


Loading…
Cancel
Save