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

src/api/audit/survey.js

@@ -76,7 +76,7 @@ export function reviewCastTaskInfo(data) {
 // 数据下载
 export function downloadTemplate(data) {
   return request({
-    url: url + '/api/surveyFdTemplateExport/v1/exportExcel',
+    url: url + '/api/surveyTemplateExport/v1/exportExcel',
     method: 'get',
     responseType: 'blob',
     params: data,
@@ -85,7 +85,7 @@ export function downloadTemplate(data) {
 // 导入
 export function importData(data) {
   return request({
-    url: url + '/api/surveyFdTemplateExport/v1/importExcel',
+    url: url + '/api/surveyTemplateExport/v1/importExcel',
     method: 'post',
     data: data,
   })

src/api/auditTaskProcessing.js

@@ -56,7 +56,7 @@ export function sendMessage(data) {
 // 预置模版下载
 export function downloadPresetTemplate(data) {
   return request({
-    url: url + '/api/fdTemplateExport/v1/exportExcel',
+    url: url + '/api/surveyFdTemplateExport/v1/exportExcel',
     method: 'get',
     params: data,
     responseType: 'blob',
@@ -66,7 +66,7 @@ export function downloadPresetTemplate(data) {
 // 预置模版上传
 export function uploadPresetTemplate(data) {
   return request({
-    url: url + '/api/fdTemplateExport/v1/importExcel',
+    url: url + '/api/surveyFdTemplateExport/v1/importExcel',
     method: 'post',
     data: data,
     headers: {

src/api/costVerifyManage.js

@@ -59,7 +59,7 @@ export function listByVerifyTemplateId(params) {
 
 export function exportExcel(params) {
   return request({
-    url: `${url}/api/fdTemplateExport/v1/exportExcel`,
+    url: `${url}/api/surveyFdTemplateExport/v1/exportExcel`,
     method: 'get',
     params,
     responseType: 'arraybuffer',
@@ -68,7 +68,7 @@ export function exportExcel(params) {
 
 export function importExcel(data, params) {
   return request({
-    url: `${url}/api/fdTemplateExport/v1/importExcel`,
+    url: `${url}/api/surveyFdTemplateExport/v1/importExcel`,
     method: 'post',
     data,
     params,

src/views/EntDeclaration/auditTaskManagement/components/CostSurveyTab.vue

@@ -141,7 +141,26 @@
           </span>
         </template>
       </el-table-column>
-
+      <el-table-column label="初审结果" width="100" align="center">
+        <template slot-scope="scope">
+            <span
+              :class="{
+                'result-pending':
+                  !scope.row.auditedStatus || scope.row.auditedStatus === '0',
+                'result-pass': scope.row.auditedStatus === '1',
+                'result-fail': scope.row.auditedStatus === '2',
+              }"
+            >
+              {{
+                !scope.row.auditedStatus || scope.row.auditedStatus === '0'
+                  ? '未审核'
+                  : scope.row.auditedStatus === '1'
+                    ? '通过'
+                    : '不通过'
+              }}
+            </span>
+        </template>
+      </el-table-column>
       <!-- 操作列（根据“表格类型”显示不同按钮） -->
       <el-table-column label="操作" width="320" align="center">
         <template slot-scope="scope">