Merge remote-tracking branch 'origin/master'

src/views/article-management/add.vue

@@ -40,19 +40,19 @@
         </el-col>
         <el-col :span="24" style="margin-left:90px;">
 
-          <el-form-item label="公告附件列表" prop=""
+<!--          <el-form-item label="公告附件列表" prop=""-->
-                        style="display: flex;flex-direction: column;justify-content: flex-start;">
+<!--                        style="display: flex;flex-direction: column;justify-content: flex-start;">-->
-            <template #label>
+<!--            <template #label>-->
-              <div style="width: 100%;display: flex;align-items: center;justify-content: flex-start">
+<!--              <div style="width: 100%;display: flex;align-items: center;justify-content: flex-start">-->
-                <el-icon size="16">
+<!--                <el-icon size="16">-->
-                  <Paperclip/>
+<!--                  <Paperclip/>-->
-                </el-icon>
+<!--                </el-icon>-->
-                公告附件列表
+<!--                公告附件列表-->
-              </div>
+<!--              </div>-->
-            </template>
+<!--            </template>-->
             <el-col :span="24" style="margin-left: -15px">
               <div style="display: flex;flex-direction: column">
-                <div v-for="(item,index) in formData.fileList" style="display: flex;align-items: center">
+                <div v-for="(item,index) in formData.fileList" style="display: flex;align-items: center;margin-bottom: 5px">
                   附件{{ index + 1 }}：  <a :href="item.url" style="color: #409eff;" class="a-style" target="_blank">{{ item.originalFileName }}</a>
                   <el-icon size="18" style="margin:0 20px;cursor: pointer" color="#409eff" @click="handleDelete(item,index)">
                     <CircleClose/>
@@ -61,7 +61,7 @@
                 </div>
               </div>
             </el-col>
-          </el-form-item>
+<!--          </el-form-item>-->
         </el-col>
       </el-row>
     </el-form>

src/views/article-management/detail.vue

@@ -10,7 +10,7 @@
       <el-row gutter="20">
         <el-col :span="24">
           <div style="display: flex;flex-direction: column">
-            <div v-for="(item,index) in formData.fileList" style="display: flex;align-items: center">
+            <div v-for="(item,index) in formData.fileList" style="display: flex;align-items: center;margin-bottom: 5px">
               附件{{ index + 1 }}： <a :href="item.url" style="color: #409eff;" class="a-style" target="_blank">{{ item.originalFileName }}</a>
               <el-button type="primary" link @click="handleDownload(item)" style="font-size: 16px;margin-left: 10px">下载</el-button>
             </div>

src/views/expense-management/cost-detail/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 15px"></fvSearchForm>
   <div style="float: left">
     <import-cost-excel   @success="importTheExpenseLedger"/>
   </div>
@@ -30,17 +30,39 @@ const searchConfig = ref([
       checkStrictly: true
     }
   },
-  // {
+  {
-  //   label: '子项目',
+    label: '子项目',
-  //   prop: 'subProjectName',
+    prop: 'subProjectName',
-  //   component: 'el-input',
+    component: 'el-input',
-  //   props: {
+    props: {
-  //     placeholder: '请输入子项目查询',
+      placeholder: '请输入子项目查询',
-  //     clearable: true,
+      clearable: true,
-  //     filterable: true,
+      filterable: true,
-  //     checkStrictly: true
+      checkStrictly: true
-  //   }
+    }
-  // },
+  },
+  {
+    label: '会计凭证记载金额(元)',
+    prop: 'recordedAmount',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入会计凭证记载金额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '归集研发费用金额(元)',
+    prop: 'rdAmount',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入归集研发费用金额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
   // {
   //   label: '项目类型',
   //   prop: 'projectType',
@@ -82,14 +104,20 @@ const tableConfig = reactive({
     //   }
     // },
     {
-      prop: 'paymentYear',
+      prop: 'rdYear',
-      label: '支付年份',
+      label: '年',
       align: 'center',
       width: 80
     },
     {
-      prop: 'paymentMonth',
+      prop: 'rdMonth',
-      label: '支付月份',
+      label: '月',
+      align: 'center',
+      width: 80
+    },
+    {
+      prop: 'rdDay',
+      label: '日',
       align: 'center',
       width: 80
     },
@@ -126,9 +154,10 @@ const tableConfig = reactive({
 
     },
     {
-      prop: 'remarks',
+      prop: 'digest',
       label: '摘要',
       align: 'center',
+      showOverflowTooltip: false,
     },
     {
       prop: 'accountCode',
@@ -141,11 +170,13 @@ const tableConfig = reactive({
       prop: 'accountName',
       label: '科目名称',
       align: 'center',
+      showOverflowTooltip: false,
     },
     {
       prop: 'auxiliaryItem',
       label: '辅助项',
       align: 'center',
+      showOverflowTooltip: false,
     },
     {
       prop: 'recordedAmount',
@@ -160,7 +191,7 @@ const tableConfig = reactive({
       width: 170
     },
   ],
-  api: '/workflow/mosr/payment/list',
+  api: '/workflow/mosr/rd/expense/list',
   params: {},
   btns: [
     {name: '模板下载', key: 'down', color: '#DED0B2'},
@@ -220,7 +251,9 @@ const importTheExpenseLedger = () => {
 }
 </script>
 <style scoped lang="scss">
-
+:deep(.el-form-item__label-wrap){
+  margin-left: 0!important;
+}
 :deep(.el-table__header) {
   .is-leaf:first-child {
     .cell {

src/views/expense-management/expend-detail/index.vue

@@ -27,17 +27,17 @@ const searchConfig = ref(
       checkStrictly: true
     }
   },
-  // {
+  {
-  //   label: '子项目',
+    label: '子项目',
-  //   prop: 'subProjectName',
+    prop: 'subProjectName',
-  //   component: 'el-input',
+    component: 'el-input',
-  //   props: {
+    props: {
-  //     placeholder: '请输入子项目查询',
+      placeholder: '请输入子项目查询',
-  //     clearable: true,
+      clearable: true,
-  //     filterable: true,
+      filterable: true,
-  //     checkStrictly: true
+      checkStrictly: true
-  //   }
+    }
-  // },
+  },
   {
     label: '项目类型',
     prop: 'projectType',

src/views/expense-management/share-detail/index.vue

@@ -88,20 +88,17 @@ const tableConfig = reactive({
       prop: 'masterProjectName',
       label: '主项目',
       align: 'center',
-      width: 120,
     },
 
     {
       prop: 'subProjectName',
       label: '子项目',
       align: 'center',
-      width: 120,
     },
     {
       prop: 'researchPersonnel',
       label: '研发人员',
       align: 'center',
-      width: 120,
       showOverflowTooltip: false,
     },
     {

src/views/project-demand/summary/add.vue

@@ -520,7 +520,11 @@ const disabledDate = (time) => {
 const getProjectList = () => {
   getProjectOption().then(res => {
     if (res.code === 1000) {
-      masterProjectList.value = res.data
+      if(name.value === 'Summary/edit'){
+        masterProjectList.value = res.data.filter(item => item.value!=route.query.projectId)
+      }else{
+        masterProjectList.value = res.data
+      }
     }
   })
 }