Browse Source

Merge branch 'master' of http://116.204.116.5:3000/zzw/cbjsxt-front-master

shiyanyu 1 month ago
parent
commit
b9ddadd289

+ 6 - 6
public/config.js

@@ -2,11 +2,11 @@
 // 当前后端不在同一个服务器时,需要指定host地址
 // var host = 'http://10.7.13.26' // 以前
 // var host = 'http://116.204.117.33' //基本用这个
-var host = 'http://116.204.117.33' // 测试
+//var host = 'http://116.204.117.33' // 测试
 // var host = 'http://b463f4b7.natappfree.cc' // 后端服务海鹏
 // var host = 'http://5jrgep.ipx.wanziwk.cn' // 后端服务译文
 // var host = 'http://192.168.1.144' // 后端服务译文
-// var host = 'http://5jrgep.ipx.wanziwk.cn'
+var host = 'http://5jrgep.ipx.wanziwk.cn'
 // combine为true时五合一部署, 为false时分五个服务部署
 var combine = true
 // var gateway = '8280/stage-api'
@@ -23,14 +23,14 @@ var defaultModulePortMap = {
 window.getModuleRootUrl = function (module) {
   // 默认是全部服务合一的端口
   //var modulePort = '8089' // 以前
-  var modulePort = '9506' // 基本用这个
+  //var modulePort = '9506' // 基本用这个
   // var modulePort = '8088' //测试
-  // var modulePort = ''
+  var modulePort = ''
   if (!combine) {
     modulePort = defaultModulePortMap[module]
   }
-  // return "http://5jrgep.ipx.wanziwk.cn";
-  return host + ':' + modulePort
+  return "http://5jrgep.ipx.wanziwk.cn";
+  //return host + ':' + modulePort
   // return host + modulePort
 }
 window.context = {

+ 26 - 6
src/views/costAudit/auditInfo/auditManage/details.vue

@@ -20,31 +20,51 @@
       <!-- 标签页面 -->
       <el-tabs v-model="activeTab" type="card" class="audit-tabs">
         <el-tab-pane label="报送资料" name="submitData">
-          <submit-data :id="id" />
+          <submit-data
+            :id="id"
+            :current-node="currentNode"
+            :current-status="currentStatus"
+          />
         </el-tab-pane>
         <el-tab-pane label="成本调查表" name="costSurvey">
-          <cost-survey :id="id" />
+          <cost-survey
+            :id="id"
+            :current-node="currentNode"
+            :current-status="currentStatus"
+          />
         </el-tab-pane>
         <el-tab-pane
           v-if="currentNode !== 'clcs'"
           label="成本审核"
           name="costAudit"
         >
-          <cost-audit :id="id" />
+          <cost-audit
+            :id="id"
+            :current-node="currentNode"
+            :current-status="currentStatus"
+          />
         </el-tab-pane>
         <el-tab-pane
           v-if="currentNode !== 'clcs'"
           label="工作底稿"
           name="workDraft"
         >
-          <work-draft :id="id" />
+          <work-draft
+            :id="id"
+            :current-node="currentNode"
+            :current-status="currentStatus"
+          />
         </el-tab-pane>
         <el-tab-pane
           v-if="currentNode !== 'clcs'"
           label="提取材料登记"
           name="extractMaterial"
         >
-          <extract-material :id="id" />
+          <extract-material
+            :id="id"
+            :current-node="currentNode"
+            :current-status="currentStatus"
+          />
         </el-tab-pane>
         <el-tab-pane
           v-if="currentNode !== 'clcs' && currentNode !== 'sdsh'"
@@ -54,7 +74,7 @@
           <audit-opinion
             :id="id"
             :current-node="currentNode"
-            :status="currentStatus"
+            :current-status="currentStatus"
             @refresh="handleAuditOpinionRefresh"
             @close="handleClose"
           />

+ 24 - 21
src/views/costAudit/auditInfo/auditManage/submitData.vue

@@ -82,27 +82,26 @@
           </template>
         </el-table-column>
         <el-table-column label="操作" width="200" align="center">
-          <template slot-scope="scope">
-            <template v-if="scope.row.isUpload === '1'">
-              <el-button
-                v-if="
-                  scope.row.auditedStatus === '0' &&
-                  scope.row.currentNode === 'clcs'
-                "
-                type="text"
-                size="small"
-                @click="handleAuditMaterial(scope.row)"
-              >
-                审核
-              </el-button>
-              <el-button
-                type="text"
-                size="small"
-                @click="handleViewDownload(scope.row)"
-              >
-                查看
-              </el-button>
-            </template>
+          <template v-if="scope.row.isUpload === '1'" slot-scope="scope">
+            <el-button
+              v-if="
+                scope.row.auditedStatus == '0' &&
+                currentStatus === '审核中' &&
+                currentNode === 'clcs'
+              "
+              type="text"
+              size="small"
+              @click="handleAuditMaterial(scope.row)"
+            >
+              审核
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="handleViewDownload(scope.row)"
+            >
+              查看
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -176,6 +175,10 @@
         type: String,
         default: '',
       },
+      currentStatus: {
+        type: String,
+        default: '',
+      },
     },
     data() {
       return {