3 週間前 · efbe3059e8
--- a/cors.js
+++ b/cors.js
@@ -208,6 +208,6 @@ module.exports = {
 
				   // devModules: ['index', 'entrustedManagement','sampleManager','screeningTests', 'resourceManager']
			
 
				   //devModules: ['reportForm', 'screeningTests', 'index',  'entrustedManagement','measurementDataManagement', 'approveManagement', 'testAnalysis', 'resourceManager', 'taskManagement']
			
 
				   // devModules: ["index", "resourceManager"],
			
 
				-  // devModules: ["all"],
			
 
				-  devModules: ["index", "standardManagement","entrustedManagement"],
			
 
				+  devModules: ["all"],
			
 
				+  // devModules: ["index", "reportForm","approveManagement"],
			
 
				 };
			
--- a/src/views/approveManagement/components/fiveApprove.vue
+++ b/src/views/approveManagement/components/fiveApprove.vue
@@ -287,9 +287,10 @@
 
				                     <el-table-column :prop="col" show-overflow-tooltip min-width="72" align='center' :key="col"
			
 
				                       :label="col">
			
 
				                       <template slot-scope="scope">
			
 
				-                        <span @click.stop="showMaxAndMinVal(scope.row, col)" style="cursor: pointer;">
			
 
				-                          {{ scope.row[col] || scope.row[col] == '0' ? scope.row[col].split('_')[0] : '' }}
			
 
				-                        </span>
			
 
				+                          <span @click.stop="showMaxAndMinVal(scope.row, col)" style="cursor: pointer;"
			
 
				+                            :class="{ 'color-danger': (scope.row[col] && scope.row[col].split('_')[1] == '2') || scope.row[col + 'Flag'] , 'color-warning': scope.row[col] && scope.row[col].split('_')[1] == '1' }">
			
 
				+                            {{ scope.row[col] || scope.row[col] == '0' ? scope.row[col].split('_')[0] : '' }}
			
 
				+                          </span>
			
 
				                       </template>
			
 
				                     </el-table-column>
			
 
				                   </template>
			
--- a/src/views/approveManagement/components/fourApprove.vue
+++ b/src/views/approveManagement/components/fourApprove.vue
@@ -376,13 +376,30 @@
 
				                       <template slot-scope="scope">
			
 
				                         <span @click.stop="
			
 
				                           showDataSource(scope.row, scope.row[col])
			
 
				-                          " style="cursor: pointer">
			
 
				+                          " style="cursor: pointer" :class="{
			
 
				+                            'color-blue': scope.row[col] && !scope.row[col + 'Flag'],
			
 
				+                            'color-danger':
			
 
				+                              (scope.row[col] &&
			
 
				+                              scope.row[col].split('_')[2] &&
			
 
				+                              !scope.row[col].split('_')[3]) || scope.row[col + 'Flag'],
			
 
				+                            'color-warning':
			
 
				+                              scope.row[col] && scope.row[col].split('_')[3],
			
 
				+                          }">
			
 
				                           {{
			
 
				                             scope.row[col] || scope.row[col] == "0"
			
 
				                               ? scope.row[col].split("_")[0]
			
 
				                               : ""
			
 
				                           }}
			
 
				                         </span>
			
 
				+                        <!-- <span @click.stop="
			
 
				+                          showDataSource(scope.row, scope.row[col])
			
 
				+                          " style="cursor: pointer">
			
 
				+                          {{
			
 
				+                            scope.row[col] || scope.row[col] == "0"
			
 
				+                              ? scope.row[col].split("_")[0]
			
 
				+                              : ""
			
 
				+                          }}
			
 
				+                        </span> -->
			
 
				                       </template>
			
 
				                     </el-table-column>
			
 
				                   </template>
			
--- a/src/views/standardManagement/app.html
+++ b/src/views/standardManagement/app.html
@@ -16,7 +16,7 @@
 
				     <script src='../static/lib/XLSX/xlsx.core.min.js' type='text/javascript'></script>
			
 
				     <!--<script src="../static/lib/swiper/js/swiper.min.js" type="text/javascript"></script>-->
			
 
				     <script src="../static/js/common.js" type="text/javascript"></script>
			
 
				-    <script src="http://192.168.3.34:9898/web-apps/apps/api/documents/api.js"></script>
			
 
				+    <!-- <script src="http://192.168.3.34:9898/web-apps/apps/api/documents/api.js"></script> -->
			
 
				 
			
 
				   </head>
			
 
				   <body>