Skip to content

Y
yn-science-front
Commit cd7c518c authored by 徐俊's avatar 徐俊
Browse files
Options

Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

parents b3c8156b b56e34b2
Hide whitespace changes
Inline Side-by-side
Showing with 874 additions and 171 deletions
src/views/conclusion/components/conclusionEdit.vue
View file @ cd7c518c
......@@ -173,7 +173,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="6" class="bg-gray">
<div class="special-middle">
<div class="required">论文名称</div>
......@@ -210,7 +210,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(thesis, index) in formData.thesisList" :key="'thesisList'+index" type="flex" class="item_inner">
<a-row v-for="(thesis, index) in formData.thesisList" :key="'thesisList'+index" type="flex" class="row_center">
<a-col :span="6">
<a-form-model-item :prop="'thesisList.' + index + '.name'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input v-model="thesis.name" :maxLength="50" placeholder="论文名称" style="width:85%" />
......@@ -278,7 +278,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>序号</div>
......@@ -295,7 +295,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(catalog, index) in formData.catalogList" :key="'catalogList'+index+''" type="flex" class="item_inner">
<a-row v-for="(catalog, index) in formData.catalogList" :key="'catalogList'+index+''" type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>{{index+1}}</div>
......@@ -331,7 +331,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">姓名</div>
......@@ -363,7 +363,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(researcher, index) in formData.researchersList" :key="'researcher'+index+''" type="flex" class="item_inner">
<a-row v-for="(researcher, index) in formData.researchersList" :key="'researcher'+index+''" type="flex" class="row_center">
<a-col :span="4">
<a-form-model-item :prop="'researchersList.' + index + '.name'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input v-model="researcher.name" :maxLength="25" placeholder="姓名" style="width:85%" />
......@@ -494,7 +494,7 @@
</a-row>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="6" class="bg-gray">
<div class="special-middle">
<div class="required">主要支出项目</div>
......@@ -511,7 +511,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(spending, index) in formData.spending" :key="'spending'+index" type="flex" class="item_inner">
<a-row v-for="(spending, index) in formData.spending" :key="'spending'+index" type="flex" class="row_center">
<a-col :span="6">
<a-form-model-item :prop="'spending.' + index + '.name'">
<a-input v-model="spending.name" :maxLength="50" :disabled="index==6" />
......@@ -528,7 +528,7 @@
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="6">
<div class="special-middle">
<div>合计</div>
......@@ -541,7 +541,7 @@
</a-col>
<a-col :span="14"></a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="6" class="bg-gray">
<div class="special-middle">
<div class="required">结余</div>
......@@ -611,7 +611,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>材料类型</div>
......
src/views/conclusion/components/conclusionInfo.vue
View file @ cd7c518c
......@@ -152,7 +152,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>序号</div>
......@@ -189,7 +189,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(thesis, index) in value.thesisList" :key="index" type="flex" class="item_inner">
<a-row v-for="(thesis, index) in value.thesisList" :key="index" type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>{{index+1}}</div>
......@@ -237,7 +237,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>序号</div>
......@@ -269,7 +269,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(researcher, index) in value.researchersList" :key="'researcher'+index+''" type="flex" class="item_inner">
<a-row v-for="(researcher, index) in value.researchersList" :key="'researcher'+index+''" type="flex" class="row_center">
<a-col :span="2">
{{index+1}}
</a-col>
......@@ -304,7 +304,7 @@
</div>
</a-col>
<a-col :span="20" class="inner_from">
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col v-for="(grant, index) in value.grant" :key="'year'+index" :span="4">
<div class="special-middle">
<div>{{grant.year}}年</div>
......@@ -316,7 +316,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col v-for="(grant, index) in value.grant" :key="'amount'+index" :span="4">
<div class="special-middle">
<div><span>{{grant.amount}}</span></div>
......@@ -337,7 +337,7 @@
</div>
</a-col>
<a-col :span="20" class="inner_from">
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col v-for="(finance, index) in value.finance" :key="'finance_year'+index" :span="4">
<div class="special-middle">
<div><span>{{finance.year}}年</span></div>
......@@ -349,7 +349,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col v-for="(finance, index) in value.finance" :key="'finance_amount'+index" :span="4">
<div class="special-middle">
<div><span>{{finance.amount}}</span></div>
......@@ -363,7 +363,7 @@
</a-row>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="6" class="bg-gray">
<div class="special-middle">
<div>主要支出项目</div>
......@@ -380,7 +380,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(spending, index) in value.spending" :key="'spending'+index" type="flex" class="item_inner">
<a-row v-for="(spending, index) in value.spending" :key="'spending'+index" type="flex" class="row_center">
<a-col :span="6">
<div class="special-middle">
<div>{{spending.name}}</div>
......@@ -397,7 +397,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="6">
<div class="special-middle">
<div>合计</div>
......@@ -410,7 +410,7 @@
</a-col>
<a-col :span="14"></a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="6" class="bg-gray">
<div class="special-middle">
<div>结余</div>
......@@ -473,7 +473,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>序号</div>
......@@ -485,7 +485,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(catalog, index) in value.catalogList" :key="'catalogList'+index+''" type="flex" class="item_inner">
<a-row v-for="(catalog, index) in value.catalogList" :key="'catalogList'+index+''" type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>{{index+1}}</div>
......@@ -505,7 +505,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>序号</div>
......@@ -527,7 +527,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in value.fileList" :key="'fileList' + index" type="flex" class="item_inner">
<a-row v-for="(item, index) in value.fileList" :key="'fileList' + index" type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>{{index+1}}</div>
......
src/views/conclusion/components/thesis/thesisEdit.vue
View file @ cd7c518c
......@@ -82,7 +82,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="6" class="bg-gray">
<div class="special-middle">
<div class="required">论文名称</div>
......@@ -119,7 +119,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(thesis, index) in formData.thesisList" :key="'thesisList'+index" type="flex" class="item_inner">
<a-row v-for="(thesis, index) in formData.thesisList" :key="'thesisList'+index" type="flex" class="row_center">
<a-col :span="6">
<a-form-model-item :prop="'thesisList.' + index + '.name'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input v-model="thesis.name" :maxLength="50" placeholder="论文名称" style="width:85%" />
......
src/views/conclusion/components/thesis/thesisInfo.vue
View file @ cd7c518c
......@@ -73,7 +73,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>序号</div>
......@@ -110,7 +110,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(thesis, index) in value.thesisList" :key="index" type="flex" class="item_inner">
<a-row v-for="(thesis, index) in value.thesisList" :key="index" type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>{{index+1}}</div>
......
src/views/evaluation/components/projectInfo.vue
View file @ cd7c518c
......@@ -131,7 +131,7 @@
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray flex-gray">
<div class="special-middle">
<div>总人数</div>
......@@ -179,7 +179,7 @@
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>{{value.memCount}}</div>
......@@ -276,7 +276,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>分类</div>
......@@ -308,7 +308,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4">
<div class="special-middle">
<div>人民币（万元）</div>
......@@ -341,7 +341,7 @@
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>支出科目</div>
......@@ -359,7 +359,7 @@
</a-col>
</a-row>
<div v-for="(item, index) in value.budget">
<a-row :key="'budget' + index" type="flex" class="item_inner">
<a-row :key="'budget' + index" type="flex" class="row_center">
<a-col :span="4">
<div class="special-middle">
<div>{{item.budgetName}}</div>
......@@ -378,7 +378,7 @@
</a-row>
</div>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>设备仪器名称</div>
......@@ -407,7 +407,7 @@
</a-row>
<div v-for="(item, index) in value.equipments">
<a-row :key="'equipments' + index" type="flex" class="item_inner">
<a-row :key="'equipments' + index" type="flex" class="row_center">
<a-col :span="4">
<div class="special-middle">
<div>{{item.name}}</div>
......@@ -586,7 +586,7 @@
</a-col>
</a-row>
<!-- <a-row type="flex" class="item_inner">
<!-- <a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray" style="text-align: center;">
<div class="special-middle">
<div>序号</div>
......@@ -608,7 +608,7 @@
</div>
</a-col>
</a-row> -->
<!-- <a-row v-for="(item, index) in value.fileList" :key="'appendix' + index" type="flex" class="item_inner">
<!-- <a-row v-for="(item, index) in value.fileList" :key="'appendix' + index" type="flex" class="row_center">
<a-col :span="2" style="text-align: center;">
<div class="special-middle">
<div>{{index + 1}}</div>
......
src/views/evaluation/components/score.vue
View file @ cd7c518c
......@@ -10,7 +10,7 @@
<div v-show="tabsActive==='1'" style="height:100%;">
<div style="height:calc(100% - 40px);overflow: auto;">
<a-form-model ref="form" :model="formData" :rules="rules" class="from-table font-line-space">
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>评审指标</div>
......@@ -53,7 +53,7 @@
</a-col>
</a-row>
<a-row v-for="(tab, index) in tableData" :key="index" type="flex" class="item_inner">
<a-row v-for="(tab, index) in tableData" :key="index" type="flex" class="row_center">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>
......
src/views/evaluation/components/scoreView.vue
View file @ cd7c518c
......@@ -38,7 +38,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>评审指标</div>
......@@ -81,7 +81,7 @@
</a-col>
</a-row>
<a-row v-for="(tab, index) in tableData" :key="index" type="flex" class="item_inner">
<a-row v-for="(tab, index) in tableData" :key="index" type="flex" class="row_center">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>
......
src/views/report/project/components/cooperativeUnits.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">单位名称</div>
......@@ -39,7 +39,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in cooperativeUnits" :key="'cooperativeUnits'+index" type="flex" class="item_inner">
<a-row v-for="(item, index) in cooperativeUnits" :key="'cooperativeUnits'+index" type="flex" class="row_center">
<a-col :span="4">
<div class="special-middle">
<div>
......
src/views/report/project/components/fileEdit.vue
View file @ cd7c518c
......@@ -19,7 +19,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>序号</div>
......
src/views/report/project/components/keyProject/budgetEdit.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>概算科目名称</div>
......@@ -35,7 +35,7 @@
</a-col>
</a-row>
<a-row v-for="(item, index) in budget" :key="index" type="flex" class="item_inner">
<a-row v-for="(item, index) in budget" :key="index" type="flex" class="row_center">
<a-col :span="4" style="text-align: left;">
{{item.budgetName}}
</a-col>
......
src/views/report/project/components/keyProject/budgetInfo.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>概算科目名称</div>
......@@ -34,7 +34,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in budget" :key="index" type="flex" class="item_inner">
<a-row v-for="(item, index) in budget" :key="index" type="flex" class="row_center">
<a-col :span="4" style="text-align: left;">
{{item.budgetName}}
</a-col>
......
src/views/report/project/components/keyProject/cooperativeInfo.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>序号</div>
......@@ -19,7 +19,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in cooperativeUnits" :key="'cooperative'+index" type="flex" class="item_inner">
<a-row v-for="(item, index) in cooperativeUnits" :key="'cooperative'+index" type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>
......
src/views/report/project/components/keyProject/cooperativeUnits.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>序号</div>
......@@ -24,7 +24,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in cooperativeUnits" :key="'cooperativeUnits'+index" type="flex" class="item_inner">
<a-row v-for="(item, index) in cooperativeUnits" :key="'cooperativeUnits'+index" type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>
......
src/views/report/project/components/keyProject/fileEdit.vue
View file @ cd7c518c
......@@ -19,7 +19,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2">
<div class="special-middle">
<div>序号</div>
......
src/views/report/project/components/keyProject/fileInfo.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray" style="text-align: center;">
<div class="special-middle">
<div>序号</div>
......@@ -29,7 +29,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in fileList" :key="'appendix' + index" type="flex" class="item_inner">
<a-row v-for="(item, index) in fileList" :key="'appendix' + index" type="flex" class="row_center">
<a-col :span="2" style="text-align: center;">
<div class="special-middle">
<div>{{index + 1}}</div>
......
src/views/report/project/components/keyProject/projFundComposition.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div class="required">年度</div>
......@@ -49,7 +49,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in fundCompositions" :key="'projFundComposition' + index" type="flex" class="item_inner">
<a-row v-for="(item, index) in fundCompositions" :key="'projFundComposition' + index" type="flex" class="row_center">
<a-col :span="3">
<div class="special-middle">
<a-form-model-item :prop="'fundCompositions.' + index + '.year'" :rules="{ required: true, message: '*' }">
......
src/views/report/project/components/keyProject/projFundCompositionInfo.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div >年度</div>
......@@ -44,7 +44,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in fundCompositions" :key="'projFundComposition' + index" type="flex" class="item_inner">
<a-row v-for="(item, index) in fundCompositions" :key="'projFundComposition' + index" type="flex" class="row_center">
<a-col :span="3">
<div class="special-middle">
<div>{{ item.year }}</div>
......
src/views/report/project/components/keyProject/projGroupMember.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>序号</div>
......@@ -55,7 +55,7 @@
</a-col>
</a-row>
<a-row v-for="(item, index) in members" :key="'members'+index" type="flex" class="item_inner">
<a-row v-for="(item, index) in members" :key="'members'+index" type="flex" class="row_center">
<a-col :span="1">
<div class="special-middle">
<div>
......
src/views/report/project/components/keyProject/projGroupMemberInfo.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>序号</div>
......@@ -50,7 +50,7 @@
</a-col>
</a-row>
<a-row v-for="(item, index) in members" :key="'members'+index" type="flex" class="item_inner">
<a-row v-for="(item, index) in members" :key="'members'+index" type="flex" class="row_center">
<a-col :span="1">
<div class="special-middle">
<div>{{ index + 1 }}</div>
......
src/views/report/project/components/keyProject/projStageGoals.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">完成时限</div>
......@@ -29,7 +29,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in stageGoals" :key="'stageGoals' + index" type="flex" class="item_inner">
<a-row v-for="(item, index) in stageGoals" :key="'stageGoals' + index" type="flex" class="row_center">
<a-col :span="4">
<div class="special-middle">
<a-form-model-item :prop="'stageGoals.' + index + '.startTime'" :rules="{ required: true, message: '*' }" style="flex-basis: 45%;">
......
src/views/report/project/components/keyProject/projStageGoalsInfo.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="8" class="bg-gray">
<div class="special-middle">
<div>完成时限</div>
......@@ -24,7 +24,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in stageGoals" :key="'stageGoals' + index" type="flex" class="item_inner">
<a-row v-for="(item, index) in stageGoals" :key="'stageGoals' + index" type="flex" class="row_center">
<a-col :span="8">
<div class="special-middle">
{{ moment(item.startTime).format("YYYY-MM-DD HH:mm:ss") }} 至 {{ moment(item.endTime).format("YYYY-MM-DD HH:mm:ss") }}
......
src/views/report/project/components/managementRuleEdit.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">单位政策名称</div>
......@@ -44,7 +44,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in managementRuleList" :key="'managementRuleList'+index" type="flex" class="item_inner">
<a-row v-for="(item, index) in managementRuleList" :key="'managementRuleList'+index" type="flex" class="row_center">
<a-col :span="4">
<a-form-model-item :prop="'managementRuleList.' + index + '.policyName'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input v-model="item.policyName" :maxLength="100" placeholder="单位政策名称" style="width:85%" />
......
src/views/report/project/components/memberEdit.vue 0 → 100644
View file @ cd7c518c
<template>
<div class="app-content" style="height: 50vh;overflow: auto;">
<a-spin :spinning="loading" style="width: 100%;height: 100%;">
<div class="page-content">
<a-form-model ref="form" :model="formData" :rules="rules" style="border-top: 0px" class="from-table font-line-space">
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">姓名</div>
</div>
</a-col>
<a-col :span="20">
<a-form-model-item prop="name">
<a-input v-model="formData.name" :maxLength="20" placeholder="姓名" style="width: 40%" />
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">证件类型</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="certificateType">
<para-select v-model="formData.certificateType" :typeId="49" :width="120" />
</a-form-model-item>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">证件号码</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="certId">
<a-input v-model="formData.certId" :maxLength="20" placeholder="证件号" style="width: 60%" />
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">性别</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="sex">
<base-select v-model="formData.sex" :type="16" :isAll="true" :width="120" />
</a-form-model-item>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">出生年月</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="birthday">
<a-date-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD HH:mm:ss" v-model="formData.birthday" style="width: 60%" />
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">民族</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="nation">
<para-select v-model="formData.nation" :typeId="11" :width="120" />
</a-form-model-item>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">国别或地区</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="country">
<a-input v-model="formData.country" :maxLength="50" placeholder="国别或地区" style="width: 60%" />
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">工作单位</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="workUnit">
<a-input v-model="formData.workUnit" :maxLength="50" placeholder="工作单位" style="width: 60%" />
</a-form-model-item>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">最高学位</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="degree">
<para-select v-model="formData.degree" :typeId="9" :width="120" />
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">从事专业</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="spec">
<para-multi-select v-model="formData.spec" :typeId="42" :width="120" />
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">职称</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="title">
<para-multi-select v-model="formData.title" :typeId="7" :width="120" />
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">电子邮箱</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="email">
<a-input v-model="formData.email" :maxLength="50" placeholder="电子邮箱" style="width: 60%" />
</a-form-model-item>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">手机</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="mobile">
<a-input v-model="formData.mobile" :maxLength="20" placeholder="手机" style="width: 60%" />
</a-form-model-item>
</a-col>
</a-row>
<!-- <a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">电话</div>
</div>
</a-col>
<a-col :span="20">
<a-form-model-item prop="telephone">
<a-input v-model="formData.telephone" :maxLength="20" placeholder="电话号码" style="width: 60%" />
</a-form-model-item>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">传真</div>
</div>
</a-col>
<a-col :span="20">
<a-form-model-item prop="fax">
<a-input v-model="formData.fax" :maxLength="20" placeholder="传真" style="width: 60%" />
</a-form-model-item>
</a-col>
</a-row> -->
<a-row type="flex">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">项目分工</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="projWork">
<a-input v-model="formData.projWork" :maxLength="20" placeholder="项目分工" style="width: 60%" />
</a-form-model-item>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">每年工作（月）</div>
</div>
</a-col>
<a-col :span="8">
<a-form-model-item prop="forMonths">
<a-input-number v-model="formData.forMonths" :min="0" :step="0.1" style="width: 60%" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</div>
<div class="page-footer">
<a-button style="margin-left: 10px" type="primary" @click="submit">保存</a-button>
</div>
</a-spin>
</div>
</template>
<script>
import { getType } from '@/views/utils/auth'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
export default {
name: "memberEdit",
components: {
paraMultiSelect, paraSelect, baseSelect
},
data () {
return {
formData1: {
name: null,
sex: null,
birthday: null,
certificateType: null,
certId: null,
nation: null,
country: null,
workUnit: null,
title: null,
degree: null,
email: null,
mobile: null,
telephone: null,
fax: null,
projWork: null,
forMonths: null,
spec: null
},
rules: {
name: [{ required: true, message: '*', trigger: 'blur' },],
sex: [{ required: true, message: '*', trigger: 'change' },],
birthday: [{ required: true, message: '*', trigger: 'change' },],
certificateType: [{ required: true, message: '*', trigger: 'change' },],
certId: [{ required: true, message: '*', trigger: 'blur' },],
nation: [{ required: true, message: '*', trigger: 'change' },],
country: [{ required: true, message: '*', trigger: 'blur' },],
workUnit: [{ required: true, message: '*', trigger: 'blur' },],
title: [{ required: true, message: '*', trigger: 'change' },],
degree: [{ required: true, message: '*', trigger: 'change' },],
email: [{ required: true, message: '*', trigger: 'blur' },],
mobile: [{ required: true, message: '*', trigger: 'blur' },],
telephone: [{ required: true, message: '*', trigger: 'blur' },],
fax: [{ required: true, message: '*', trigger: 'blur' },],
projWork: [{ required: true, message: '*', trigger: 'blur' },],
forMonths: [{ required: true, message: '*', trigger: 'blur' },],
spec: [{ required: true, message: '*', trigger: 'change' },],
},
loading: false,
}
},
props: {
members: {
type: Array,
default: () => {
return []
}
},
formData: {
type: Object,
default: () => {
return {}
}
},
},
created () {
},
methods: {
submit () {
this.$refs.form.validate(valid => {
if (valid) {
this.$emit('close', 'value')
} else {
this.$message.error('项目信息未填写完全！')
return false
}
})
},
},
}
</script>
<style scoped lang="less">
::v-deep .ant-spin-container {
width: 100%;
height: 100%;
}
.page-content {
width: 100%;
height: calc(100% - 40px);
overflow: auto;
}
.page-footer {
width: 100%;
height: 40px;
line-height: 40px;
background: rgb(248, 248, 248);
text-align: center;
}
</style>
src/views/report/project/components/projectEdit.vue
View file @ cd7c518c
......@@ -476,7 +476,7 @@
<cooperative-units :cooperativeUnits.sync="formData.cooperativeUnits" />
<!-- 项目组成员 -->
<proj-group-member :members.sync="formData.members" />
<project-member-edit :members.sync="formData.members" />
<a-row>
<a-col :span="24" style="border-top: 0px">
......@@ -620,7 +620,7 @@ import { getType } from '@/views/utils/auth'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import ProjGroupMember from '@/views/report/project/components/projGroupMember'
import projectMemberEdit from '@/views/report/project/components/projectMemberEdit'
import cooperativeUnits from '@/views/report/project/components/cooperativeUnits'
import budgetEdit from '@/views/report/project/components/budgetEdit'
import fundPlanEdit from '@/views/report/project/components/fundPlanEdit'
......@@ -641,7 +641,7 @@ const File = { fileName: '', downloadUrl: '', fileExplain: '', downloadId: '' }
export default {
name: 'projectEdit',
components: {
paraMultiSelect, paraSelect, baseSelect, ProjGroupMember, cooperativeUnits, budgetEdit, fundPlanEdit, equipmentsEdit, projectSubEdit, managementRuleEdit, fileEdit
paraMultiSelect, paraSelect, baseSelect, projectMemberEdit, cooperativeUnits, budgetEdit, fundPlanEdit, equipmentsEdit, projectSubEdit, managementRuleEdit, fileEdit
},
props: {
value: {
......
src/views/report/project/components/projectMemberEdit.vue 0 → 100644
View file @ cd7c518c
<template>
<div>
<a-row>
<a-col :span="24">
<div class="tb-title">
<span>项目组成员 <strong>(注：项目负责人填写到第一行)</strong><a-button type="primary" size="small" style="margin-left:18px;" @click="addMember">添加成员</a-button></span>
</div>
</a-col>
</a-row>
<a-row type="flex" class="row_center">
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>序号</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>姓名</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>性别</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>出生年月</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>证件类型</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>证件号码</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>民族</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>国别或地区</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>工作单位</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>职称</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>最高学位</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>电子邮箱</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>手机</div>
</div>
</a-col>
<!-- <a-col :span="1" class="bg-gray">
<div class="special-middle">
<div >电话</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div >传真</div>
</div>
</a-col> -->
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>项目分工</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>每年工作（月）</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>从事专业</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>操作</div>
</div>
</a-col>
</a-row>
<a-row v-for="(member, index) in members" :key="index" type="flex" class="row_center">
<a-col :span="1">
<div class="special-middle">
<div>
{{ index + 1 }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ member.name }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ member.sex }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ member.birthday }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ member.certificateTypeName }}
</div>
</div>
</a-col>
<a-col :span="2">
<div class="special-middle">
<div>
{{ member.certId }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ member.nation }}
</div>
</div>
</a-col>
<a-col :span="2">
<div class="special-middle">
<div>
{{ member.country }}
</div>
</div>
</a-col>
<a-col :span="2">
<div class="special-middle">
<div>
{{ member.workUnit }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ member.titleName }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ member.degreeName }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ member.email }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ member.mobile }}
</div>
</div>
</a-col>
<!-- <a-col :span="1">
<div class="special-middle">
<div>
{{ member.telephone }}
</div>
</div>
</a-col>
<a-col :span="1">
<div class="special-middle">
<div>
{{ member.fax }}
</div>
</div>
</a-col> -->
<a-col :span="2">
<div class="special-middle">
<div>
{{ member.projWork }}
</div>
</div>
</a-col>
<a-col :span="2">
<div class="special-middle">
<div>
{{ member.forMonths }}
</div>
</div>
</a-col>
<a-col :span="2">
<div class="special-middle">
<div>
{{ member.specName }}
</div>
</div>
</a-col>
<a-col :span="2">
<div class="special-middle">
<div>
<a-button icon="arrow-up" type="primary" shape="circle" size="small" :disabled="index == 0" @click="memberUp(index)"></a-button>
<a-button icon="arrow-down" type="primary" shape="circle" size="small" style="margin-left:5px;" :disabled="members.length == index + 1" @click="menberDown(index)"></a-button>
<a-popconfirm title="确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="removeMembers(member)">
<a-button type="link" size="small">删除</a-button>
</a-popconfirm>
</div>
</div>
</a-col>
</a-row>
<a-modal v-model="visibleEdit" v-if="visibleEdit" title="项目组成员（添加/修改）" width="60%" :footer="null" :dialog-style="{ top: '20%' }" destroyOnClose :maskClosable="false">
<member-edit :members.sync="members" :formData.sync="memObject" @close="closeWindow" />
</a-modal>
</div>
</template>
<script>
//用法 <proj-group-member :members.sync="formData.members" />
import memberEdit from '@/views/report/project/components/memberEdit'
const Member = { name: null, sex: null, birthday: null, certificateType: null, certId: null, nation: null, country: null, workUnit: null, title: null, degree: null, email: null, mobile: null, telephone: null, fax: null, projWork: null, forMonths: null, spec: null }
export default {
name: 'projectMemberEdit',
data () {
return {
memObject: {},
visibleEdit: false
}
},
props: {
members: {
type: Array,
default: () => {
return [{ ...Member }]
}
},
},
components: {
memberEdit
},
created () {
},
methods: {
closeWindow (value) {
this.memObject = {}
this.visibleEdit = false
},
addMember () {//添加成员
this.memObject = { ...Member }
this.visibleEdit = true
},
removeMembers (item) {//移除成员
let index = this.members.indexOf(item)
if (index !== -1) {
this.members.splice(index, 1)
}
},
memberToTop (item) {//成员置顶
let index = this.members.indexOf(item)
if (index !== -1) {
this.members.splice(index, 1)
this.members.unshift({ ...item })
}
},
memberUp (index) {
let arr = this.members
arr.splice(index - 1, 1, ...arr.splice(index, 1, arr[index - 1]))
},
menberDown (index) {
let arr = this.members
arr.splice(index, 1, ...arr.splice(index + 1, 1, arr[index]))
}
}
}
</script>
<style scoped lang="less">
::v-deep .table_list {
.ant-col {
padding: 0px 0px;
text-align: left;
}
.ant-form-item-control {
line-height: 4px;
}
.ant-select {
font-size: 12px;
}
.ant-select .ant-select-selection--single {
height: 24px !important;
}
.ant-select .ant-select-selection__rendered {
line-height: 22px !important;
margin-right: 6px !important;
margin-left: 6px !important;
}
.ant-select .ant-select-selection__rendered .ant-form-item-control {
line-height: 26px !important;
}
.ant-col .ant-form-item .ant-col {
padding: 0px;
}
.from-table .row_center .ant-col {
text-align: left !important;
}
.special-pum-select .ant-form-item-control-wrapper {
display: flex;
justify-content: center;
align-content: center;
}
.special-pum-select .ant-form-item-children {
display: block;
}
.special-pum-select .ant-form-item-control {
line-height: 26px;
}
input[type="text"],
input[type="password"],
input[type="number"],
textarea {
box-sizing: border-box;
margin: 0;
padding: 0;
width: 100%;
height: 24px;
padding: 2px 6px;
color: rgba(0, 0, 0, 0.65);
font-size: 12px;
border-radius: 2px;
}
.ant-input {
height: 24px !important;
}
.ant-input-number-input {
height: 24px !important;
}
}
</style>
src/views/report/project/components/projGroupMember.vue → src/views/report/project/components/projectMemberInfo.vue
View file @ cd7c518c
......@@ -7,13 +7,12 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-col :span="1" class="bg-gray">
<a-row type="flex" class="row_center">
<!-- <a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>序号</div>
</div>
</a-col>
</a-col> -->
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div class="required">姓名</div>
......@@ -29,17 +28,17 @@
<div class="required">出生年月</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div class="required">证件类型</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div class="required">证件号码</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div class="required">民族</div>
</div>
......@@ -54,12 +53,12 @@
<div class="required">工作单位</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div class="required">职称</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div class="required">最高学位</div>
</div>
......@@ -74,7 +73,7 @@
<div class="required">手机</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<!-- <a-col :span="1" class="bg-gray">
<div class="special-middle">
<div class="required">电话</div>
</div>
......@@ -83,7 +82,7 @@
<div class="special-middle">
<div class="required">传真</div>
</div>
</a-col>
</a-col> -->
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div class="required">项目分工</div>
......@@ -94,31 +93,30 @@
<div class="required">每年工作（月）</div>
</div>
</a-col>
<a-col :span="1" class="bg-gray">
<a-col :span="3" class="bg-gray">
<div class="special-middle">
<div class="required">从事专业</div>
</div>
</a-col>
<a-col :span="6" class="bg-gray">
<a-col :span="1" class="bg-gray">
<div class="special-middle">
<div>操作</div>
</div>
</a-col>
</a-row>
<a-row v-for="(member, index) in members" :key="index" type="flex" class="item_inner">
<a-col :span="1">
<a-row v-for="(member, index) in members" :key="index" type="flex" class="row_center table_list">
<!-- <a-col :span="1">
<div class="special-middle">
<div>
{{ index + 1 }}
</div>
</div>
</a-col>
</a-col> -->
<a-col :span="1">
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.name'" :rules="{required: true,message: '*',trigger: 'blur',}">
<a-input v-model="member.name" :maxLength="20" placeholder="姓名" style="width: 80%" />
<a-input v-model="member.name" :maxLength="20" placeholder="姓名" style="width: 100%" />
</a-form-model-item>
</div>
</div>
......@@ -127,7 +125,7 @@
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.sex'" :rules="{required: true,message: '*',trigger: 'change',}">
<base-select v-model="member.sex" :type="16" :isAll="true" />
<base-select v-model="member.sex" :type="16" :isAll="true" style="width: 100%" />
</a-form-model-item>
</div>
</div>
......@@ -136,34 +134,34 @@
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.birthday'" :rules="{required: true,message: '*',trigger: 'change',}">
<a-date-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD HH:mm:ss" v-model="member.birthday" style="width: 150px" />
<a-date-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD HH:mm:ss" v-model="member.birthday" style="width: 100%" />
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="1">
<a-col :span="2">
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.certificateType'" :rules="{required: true,message: '*',trigger: 'blur',}">
<para-select v-model="member.certificateType" :typeId="49" />
<para-select v-model="member.certificateType" :typeId="49" style="width: 100%" />
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="1">
<a-col :span="2">
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.certId'" :rules="{required: true,message: '*',trigger: 'blur',}">
<a-input v-model="member.certId" :maxLength="20" placeholder="证件号" style="width: 80%" />
<a-input v-model="member.certId" :maxLength="20" placeholder="证件号" style="width: 100%" />
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="1">
<a-col :span="2">
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.nation'" :rules="{required: true,message: '*',trigger: 'change',}">
<para-select v-model="member.nation" :typeId="11" />
<para-select v-model="member.nation" :typeId="11" style="width: 100%" />
</a-form-model-item>
</div>
</div>
......@@ -172,7 +170,7 @@
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.country'" :rules="{required: true,message: '*',trigger: 'blur',}">
<a-input v-model="member.country" :maxLength="50" placeholder="国别或地区" style="width: 80%" />
<a-input v-model="member.country" :maxLength="50" placeholder="国别或地区" style="width: 100%" />
</a-form-model-item>
</div>
</div>
......@@ -181,25 +179,25 @@
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.workUnit'" :rules="{required: true,message: '*',trigger: 'blur',}">
<a-input v-model="member.workUnit" :maxLength="50" placeholder="工作单位" style="width: 80%" />
<a-input v-model="member.workUnit" :maxLength="50" placeholder="工作单位" style="width: 100%" />
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="1">
<a-col :span="3">
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.title'" :rules="{required: true,message: '*',trigger: 'change',}">
<para-multi-select v-model="member.title" :width="105" :typeId="42" />
<para-multi-select v-model="member.title" :width="105" :typeId="7" style="width: 100%" />
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="1">
<a-col :span="2">
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.degree'" :rules="{required: true,message: '*',trigger: 'change',}">
<para-select v-model="member.degree" :typeId="9" />
<para-select v-model="member.degree" :typeId="9" style="width: 100%" />
</a-form-model-item>
</div>
</div>
......@@ -208,7 +206,7 @@
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.email'" :rules="{required: true,message: '*',trigger: 'blur',}">
<a-input v-model="member.email" :maxLength="50" placeholder="电子邮箱" style="width: 80%" />
<a-input v-model="member.email" :maxLength="50" placeholder="电子邮箱" style="width: 100%" />
</a-form-model-item>
</div>
</div>
......@@ -217,12 +215,12 @@
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.mobile'" :rules="{required: true,message: '*',trigger: 'blur',}">
<a-input v-model="member.mobile" :maxLength="20" placeholder="手机" style="width: 80%" />
<a-input v-model="member.mobile" :maxLength="20" placeholder="手机" style="width: 100%" />
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="1">
<!-- <a-col :span="1">
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.telephone'" :rules="{required: true,message: '*',trigger: 'blur',}">
......@@ -239,12 +237,12 @@
</a-form-model-item>
</div>
</div>
</a-col>
</a-col> -->
<a-col :span="1">
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.projWork'" :rules="{required: true,message: '*',trigger: 'blur',}">
<a-input v-model="member.projWork" :maxLength="20" placeholder="项目分工" style="width: 80%" />
<a-input v-model="member.projWork" :maxLength="20" placeholder="项目分工" style="width: 100%" />
</a-form-model-item>
</div>
</div>
......@@ -253,25 +251,25 @@
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.forMonths'" :rules="{required: true,message: '*',trigger: 'blur',}">
<a-input-number v-model="member.forMonths" :min="0" :step="0.1" style="width: 80%" />
<a-input-number v-model="member.forMonths" :min="0" :step="0.1" style="width: 100%" />
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="1">
<a-col :span="3">
<div class="special-middle">
<div>
<a-form-model-item :prop="'members.' + index + '.spec'" :rules="{required: true,message: '*',trigger: 'change',}">
<para-multi-select v-model="member.spec" :width="105" :typeId="42" />
<para-multi-select v-model="member.spec" :width="105" :typeId="42" style="width: 100%" />
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="6">
<a-col :span="1">
<div class="special-middle">
<div>
<a-button icon="arrow-up" type="primary" shape="circle" size="small" :disabled="index == 0" @click="memberUp(index)"></a-button>
<a-button icon="arrow-down" type="primary" shape="circle" size="small" style="margin-left:5px;" :disabled="members.length == index + 1" @click="menberDown(index)"></a-button>
<!-- <a-button icon="arrow-up" type="primary" shape="circle" size="small" :disabled="index == 0" @click="memberUp(index)"></a-button>
<a-button icon="arrow-down" type="primary" shape="circle" size="small" style="margin-left:5px;" :disabled="members.length == index + 1" @click="menberDown(index)"></a-button> -->
<a-popconfirm title="确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="removeMembers(member)">
<a-button type="link" size="small">删除</a-button>
</a-popconfirm>
......@@ -300,7 +298,7 @@ import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
const Member = {name: null,sex: null,birthday: null,certificateType: null,certId: null,nation: null,country: null,workUnit: null,title: null,degree: null,email: null,mobile: null,telephone: null,fax: null,projWork: null,forMonths: null,spec: null}
const Member = { name: null, sex: null, birthday: null, certificateType: null, certId: null, nation: null, country: null, workUnit: null, title: null, degree: null, email: null, mobile: null, telephone: null, fax: null, projWork: null, forMonths: null, spec: null }
export default {
name: 'ProjGroupMember',
......@@ -318,7 +316,7 @@ export default {
},
},
components: {
paraMultiSelect,paraSelect,baseSelect
paraMultiSelect, paraSelect, baseSelect
},
created () {
......@@ -353,49 +351,64 @@ export default {
}
</script>
<style scoped lang="less">
input[type="text"],
input[type="password"],
input[type="number"],
textarea {
box-sizing: border-box;
margin: 0;
padding: 0;
width: 100%;
height: 24px;
padding: 2px 6px;
color: rgba(0, 0, 0, 0.65);
font-size: 12px;
border-radius: 2px;
}
::v-deep .ant-select {
font-size: 12px;
}
::v-deep .ant-select .ant-select-selection--single {
height: 24px !important;
}
::v-deep .ant-select .ant-select-selection__rendered {
line-height: 22px !important;
margin-right: 6px !important;
margin-left: 6px !important;
}
::v-deep .ant-select .ant-select-selection__rendered .ant-form-item-control {
line-height: 26px !important;
}
::v-deep .ant-col .ant-form-item .ant-col {
padding: 0px;
}
::v-deep .from-table .item_inner .ant-col {
text-align: left !important;
}
::v-deep .special-pum-select .ant-form-item-control-wrapper {
display: flex;
justify-content: center;
align-content: center;
}
::v-deep .special-pum-select .ant-form-item-children {
display: block;
}
::v-deep .special-pum-select .ant-form-item-control {
line-height: 26px;
::v-deep .table_list {
.ant-col {
padding: 0px 0px;
text-align: left;
}
.ant-form-item-control {
line-height: 4px;
}
.ant-select {
font-size: 12px;
}
.ant-select .ant-select-selection--single {
height: 24px !important;
}
.ant-select .ant-select-selection__rendered {
line-height: 22px !important;
margin-right: 6px !important;
margin-left: 6px !important;
}
.ant-select .ant-select-selection__rendered .ant-form-item-control {
line-height: 26px !important;
}
.ant-col .ant-form-item .ant-col {
padding: 0px;
}
.from-table .row_center .ant-col {
text-align: left !important;
}
.special-pum-select .ant-form-item-control-wrapper {
display: flex;
justify-content: center;
align-content: center;
}
.special-pum-select .ant-form-item-children {
display: block;
}
.special-pum-select .ant-form-item-control {
line-height: 26px;
}
input[type="text"],
input[type="password"],
input[type="number"],
textarea {
box-sizing: border-box;
margin: 0;
padding: 0;
width: 100%;
height: 24px;
padding: 2px 6px;
color: rgba(0, 0, 0, 0.65);
font-size: 12px;
border-radius: 2px;
}
.ant-input {
height: 24px !important;
}
.ant-input-number-input {
height: 24px !important;
}
}
</style>
src/views/report/project/components/projectSubEdit.vue
View file @ cd7c518c
......@@ -7,7 +7,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div class="required">课题名称</div>
......@@ -59,7 +59,7 @@
</div>
</a-col>
</a-row>
<a-row v-for="(item, index) in projectSubList" :key="'projectSubList'+index" type="flex" class="item_inner">
<a-row v-for="(item, index) in projectSubList" :key="'projectSubList'+index" type="flex" class="row_center">
<a-col :span="2">
<a-form-model-item :prop="'projectSubList.' + index + '.projName'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input v-model="item.projName" :maxLength="100" placeholder="课题名称" style="width:85%" />
......
src/views/report/task/components/taskEdit.vue
View file @ cd7c518c
......@@ -456,7 +456,7 @@
</template>
<script>
import ProjGroupMember from "@/views/report/project/components/projGroupMember"
import ProjGroupMember from "@/views/report/project/components/projectMemberEdit"
import BudgetEdit from '@/views/report/project/components/budgetEdit'
import { isEmptyParams } from "@/views/utils/common"
......
src/views/report/task/components/taskFileEdit.vue
View file @ cd7c518c
......@@ -74,7 +74,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="8" class="bg-gray">
<div class="special-middle">
<div>附件名称</div>
......
src/views/report/task/components/taskFileInfo.vue
View file @ cd7c518c
......@@ -74,7 +74,7 @@
</div>
</a-col>
</a-row>
<a-row type="flex" class="item_inner">
<a-row type="flex" class="row_center">
<a-col :span="8" class="bg-gray">
<div class="special-middle">
<div>附件名称</div>
......
static/css/common.less
View file @ cd7c518c
......@@ -135,7 +135,7 @@
background-color: #f8fafc;
}
.item_inner .ant-col {
.row_center .ant-col {
text-align: center;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment