Browse Source

bug修改

ljb 9 months ago
parent
commit
8b6f6e75b8

+ 1 - 1
src/api/basicResource/technicianRoster.js

@@ -48,7 +48,7 @@ export const getLastMonthData = params => {
   })
 }
 
-// 通过项目周期获取可以人员列表
+// 通过项目开始时间
 export const getListByProDate = (startDate, endDate) => {
   return request({
     url: '/api/kd-scientific/technician/page/date-interval',

+ 1 - 1
src/api/projectManage/implement.js

@@ -3,7 +3,7 @@ import request from '@/router/axios';
 // 实施报告列表
 export const getList = (xmId) => {
   return request({
-    url: `/kd-scientific/xm/jdxbg/list/${xmId}`,
+    url: `/api/kd-scientific/xm/jdxbg/list/${xmId}`,
     method: 'get',
   })
 }

+ 6 - 6
src/option/projectManage/projectList.js

@@ -88,22 +88,22 @@ export default {
       align: 'center',
       display: false,
       children: [{
-        label: '立项报告(份)',
-        prop: 'lxbgCount',
+        label: '立项报告',
+        prop: 'lxbg',
         type: 'number',
         width: 90,
         align: 'center',
         showOverflowTooltip: true,
       }, {
-        label: '阶段性报告(份)',
-        prop: 'jdxbgCount',
+        label: '阶段性报告',
+        prop: 'jdxbg',
         type: 'number',
         width: 105,
         align: 'center',
         showOverflowTooltip: true,
       }, {
-        label: '验收报告(份)',
-        prop: 'ysbgCount',
+        label: '验收报告',
+        prop: 'ysbg',
         type: 'number',
         width: 90,
         align: 'center',

+ 0 - 4
src/views/project-manage/components/apply-form.vue

@@ -31,10 +31,6 @@
             <span style="color: red; padding-right: 3px; font-size: 16px;">*</span>项目申请单位
           </td>
           <td colspan="3">
-            <!-- <el-input
-              v-model="formData.xmsqdw"
-              placeholder="请选择项目申请单位"
-            /> -->
             <second-unit-cascader
               v-model="formData.xmsqdwid"
               :yearAndMonth="yearAndMonth"

+ 22 - 0
src/views/project-manage/project-list.vue

@@ -32,6 +32,21 @@
           <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>
         </div>
       </template>
+
+      <template slot="lxbg" slot-scope="{ row }">
+        <span v-if="row.lxbg === '未提交'" style="color: red;">未提交</span>
+        <span v-if="row.lxbg === '已提交'">已提交</span>
+      </template>
+
+      <template slot="jdxbg" slot-scope="{ row }">
+        <span v-if="row.jdxbg === '未提交'" style="color: red;">未提交</span>
+        <span v-if="row.jdxbg === '已提交'">已提交</span>
+      </template>
+
+      <template slot="ysbg" slot-scope="{ row }">
+        <span v-if="row.ysbg === '未提交'" style="color: red;">未提交</span>
+        <span v-if="row.ysbg === '已提交'">已提交</span>
+      </template>
       
     </avue-crud>
 
@@ -92,6 +107,7 @@ import change from "./change.vue";
 import acceptForm from "./components/accept-form.vue";
 import resultTable from "./result-table.vue";
 import outsourcingDoc from "./components/outsourcing-doc.vue";
+import { Row } from "element-ui";
 
 
 export default window.$crudCommon({
@@ -162,6 +178,12 @@ export default window.$crudCommon({
   // 模块路径
   name: 'projectManage/projectList',
   res: ({ data }) => {
+    data.records = data.records.map(item => {
+      item.lxbg = item.lxbgCount > 0 ? '已提交' : '未提交';
+      item.jdxbg = item.jdxbgCount > 0 ? '已提交' : '未提交';
+      item.ysbg = item.ysbgCount > 0 ? '已提交' : '未提交';
+      return item;
+    });
     return data;
   },
 });