33

src/views/audit/project/Index.vue

@@ -193,7 +193,7 @@ export default {
           this.tableData = dataList.map(item => {
             return {
               ...item,
-              projClassName: item.projClass === 1 ? "一般项目" : "重点项目",
+              projClassName: item.projClass === "1" ? "一般项目" : "重点项目",
             }
           })
           this.tableData.forEach(e => {

src/views/audit/project/final.vue

@@ -183,7 +183,7 @@ export default {
         { title: '财务专家评分', dataIndex: 'gradeScore2', align: 'center' },
         { title: '最终得分', dataIndex: 'gradeScore', align: 'center' },
         { title: '审核状态', dataIndex: 'auditResultName', align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', width: 120, },
+        { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right',  width: 180, },
       ],
       tableData: [],
       innerColumns: [
@@ -288,7 +288,7 @@ export default {
           this.tableData = dataList;
           this.pagination.total = total;
           this.tableData.forEach(e => {
-            e.projClassName = e.projClass === 1 ? "一般项目" : "重点项目"
+            e.projClassName = e.projClass === "1" ? "一般项目" : "重点项目"
             e.startDate = moment(e.startDate).format('YYYY-MM-DD')
             e.endDate = moment(e.endDate).format('YYYY-MM-DD')
             // 技术专家

src/views/report/project/Index.vue

@@ -35,8 +35,8 @@
       </template>
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" @click="recordClick(record, 'view')">查看</a-button>
-        <a-button type="link" size="small" v-if="((record.projState == -10 || record.projState == 10 || record.projState == 30))" @click="recordClick(record, 'edit')">修改</a-button>
-        <a-popconfirm title="确定要上报吗？" v-if="((record.projState == 10 || record.projState == 30))" ok-text="确定" cancel-text="取消" @confirm="recordClick(record,'report')">
+        <a-button type="link" size="small" v-if="((record.projState == -10 || record.projState == 10 || record.projState == 30 || record.projState == 35))" @click="recordClick(record, 'edit')">修改</a-button>
+        <a-popconfirm title="确定要上报吗？" v-if="((record.projState == 10 || record.projState == 30 || record.projState == 35))" ok-text="确定" cancel-text="取消" @confirm="recordClick(record,'report')">
           <a-button type="link" size="small">上报</a-button>
         </a-popconfirm>
         <a-button type="link" size="small" v-if="record.projState <= 10" @click="recordClick(record,'delete')">删除</a-button>
@@ -73,7 +73,7 @@ import axios from 'axios'
 export default {
   name: 'reportProject',
   components: {
-    projectView, projectCreate,previewFile, knowledgeSelect, personInfoEdit
+    projectView, projectCreate, previewFile, knowledgeSelect, personInfoEdit
   },
   data () {
     return {
@@ -142,7 +142,7 @@ export default {
       this.visibleEdit = true
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description

src/views/report/project/components/projectEdit.vue

@@ -796,7 +796,7 @@ export default {
             var obj = this.getObj(step)
             obj.step = step
             let state = obj.projState
-            if (state != 30 && step == 5)
+            if ((state != 30 || state != 30) && step == 5)
               obj.projState = 10
             let pars = isEmptyParams(obj)
             let par = { ...pars }