Merge remote-tracking branch 'origin/master'

src/api/projectinfo/projectInfo.js

@@ -13,5 +13,5 @@ export const getCaseTaskList = data => createAPI(`caseTask/getCaseTaskList`,'POS
 
 export const caseTaskSave = data => createAPI(`caseTask/save`,'POST',data)
 
-export const manageAuditData = data => createAPI(`projectCase/manageAudit`,'POST',data)
+export const manageAudit = data => createAPI(`projectCase/manageAudit`,'POST',data)
 

src/views/modules/customCase/pro-add-or-update.vue

@@ -283,7 +283,7 @@ export default {
       formData.append('encapsulate',this.dataForm.encapsulate)
       formData.append('description',this.dataForm.description)
       formData.append('status',status)
-      formData.append('xjshow',this.dataForm.manageAudit==='Y'?'N':'Y')
+      formData.append('xjshow',this.dataForm.manageAudit==='Y'?'':'Y')
       //片接文件
       for (let i = 0; i < this.fileList.length; i++) {
         formData.append("file", this.fileList[i].raw)

src/views/modules/customCase/project-case.vue

@@ -77,16 +77,14 @@
              @click="manageAuditButton(scope.row.caseId)">审核</a>
         </template>
       </el-table-column>
-      <el-table-column prop="projectId" header-align="center" align="center" label="项目ID"></el-table-column>
+      <el-table-column prop="caseId" header-align="center" align="center" label="Case ID"></el-table-column>
       <el-table-column prop="projectName" header-align="center" align="center"
                        :label="buttons.projectName||'项目名称'"></el-table-column>
-      <el-table-column prop="projectStatus" header-align="center" align="center"
-                       :label="buttons.projectStatus||'项目状态'"></el-table-column>
       <el-table-column prop="sysName" header-align="center" align="center" label="系统名称"></el-table-column>
       <el-table-column prop="groupName" header-align="center" align="center" label="事业部"></el-table-column>
       <el-table-column prop="type" header-align="center" align="center" label="Case类型"></el-table-column>
       <el-table-column prop="enteredDate" header-align="center" align="center" label="提报日期"></el-table-column>
-      <el-table-column prop="caseId" header-align="center" align="center" label="Case ID"></el-table-column>
+
       <el-table-column prop="functionMenu" header-align="center" align="center" label="功能菜单"></el-table-column>
       <el-table-column prop="encapsulate" header-align="center" align="center" label="需求/问题简述"
                        width="100"></el-table-column>
@@ -97,12 +95,19 @@
           <span>{{statusFrom(scope.row.status) }}</span>
         </template>
       </el-table-column>
+      <el-table-column v-if="manageAudit==='Y'" prop="status" header-align="center" align="center" label="审核状态">
+        <template slot-scope="scope">
+          <span>{{scope.row.xjshow==='Y'?'审核通过':scope.row.xjshow==='N'?'审核不通过':'待审核'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="xjOwner" header-align="center" align="center" label="旭捷负责人"></el-table-column>
       <el-table-column prop="planFinishDate" header-align="center" align="center" label="计划完成日期"
                        width="100"></el-table-column>
       <el-table-column prop="upgradeDate" header-align="center" align="center" label="升级日期"></el-table-column>
       <el-table-column prop="closeDate" header-align="center" align="center" label="关闭日期"></el-table-column>
       <el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
+      <el-table-column prop="projectStatus" header-align="center" align="center"
+                       :label="buttons.projectStatus||'项目状态'"></el-table-column>
     </el-table>
     <el-pagination @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle" :current-page="pageIndex"
@@ -138,7 +143,7 @@
 
 <script>
 import {
-  getCaseList,manageAuditData
+  getCaseList,manageAudit
 } from '@/api/projectinfo/projectInfo.js'
 import {
   searchFunctionButtonList
@@ -294,7 +299,7 @@ export default {
         })
         return false
       }
-      manageAuditData(this.manageAuditResult).then(({data}) => {
+      manageAudit(this.manageAuditResult).then(({data}) => {
         if (data && data.code === 0) {
           this.getDataList()
           this.manageAuditFlag = false

src/views/modules/customCase/xj-case.vue

@@ -147,11 +147,10 @@ export default {
       showAuthCustomerReportFlag: false,
       dataForm: {
         projectName: '',
-        dateRange: ''
+        dateRange: '',
       },
       dataList: [],
       statusList: [
-        {key: 10, value: '草稿'},
         {key: 20, value: '待受理'},
         {key: 30, value: '已受理'},
         {key: 40, value: '进行中'},