Redeem 2 tygodni temu
rodzic
commit
5eccb4cd9b

+ 15 - 15
cors.js

@@ -89,23 +89,23 @@ module.exports = {
         "^/icore-api": "/",
       },
     },
-    // "/icore.icp.web/pass/testManagement/v1": {
-    //   //  target: 'http://172.22.4.6:9006/v1', // 加https
-    //   //  target: 'http://prod-lims-test/v1', //
-    //   //  target: 'http://localhost:9001/v1', //加http
-    //   target: "http://172.16.4.162", // 加https
-    //   // target: 'https://lims-bnusiness-dev.steerinfo.com/v1', //加https
-    //   changeOrigin: true,
-    // },
     "/icore.icp.web/pass/testManagement/v1": {
-      // target: 'http://127.0.0.1:9001/v1', // 加https
-      target: "http://localhost:9001/v1", // 正式
+      //  target: 'http://172.22.4.6:9006/v1', // 加https
+      //  target: 'http://prod-lims-test/v1', //
+      //  target: 'http://localhost:9001/v1', //加http
+      target: "http://172.16.4.162", // 加https
+      // target: 'https://lims-bnusiness-dev.steerinfo.com/v1', //加https
       changeOrigin: true,
-      pathRewrite: {
-        "^/icore.icp.web/pass/testManagement/v1": "/", // 这里理解成用‘/api’代替target里面的地址,组件中我们调接口时直接用/api代替
-        // 比如我要调用'https://0.0:300/user/add',直接写‘/api/user/add’即可 代理后地址栏显示/
-      },
     },
+    // "/icore.icp.web/pass/testManagement/v1": {
+    //   // target: 'http://127.0.0.1:9001/v1', // 加https
+    //   target: "http://localhost:9001/v1", // 正式
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     "^/icore.icp.web/pass/testManagement/v1": "/", // 这里理解成用‘/api’代替target里面的地址,组件中我们调接口时直接用/api代替
+    //     // 比如我要调用'https://0.0:300/user/add',直接写‘/api/user/add’即可 代理后地址栏显示/
+    //   },
+    // },
     // '/icore.icp.web/pass/mqtt/v1': {
     //   // target: 'http://172.22.4.6:9006/v1', // 加https
     //   // target: 'http://prod-lims-test/v1', // 加https
@@ -209,5 +209,5 @@ module.exports = {
   //devModules: ['reportForm', 'screeningTests', 'index',  'entrustedManagement','measurementDataManagement', 'approveManagement', 'testAnalysis', 'resourceManager', 'taskManagement']
   devModules: ["all"],
   //  devModules:['index']
-  // devModules: ["index", "standardManagement"],
+  // devModules: ["index", "screeningTests"],
 };

+ 2 - 2
src/views/screeningTests/components/materialConfiguration/alertComponents.vue

@@ -30,7 +30,7 @@
             <el-col :span="12">
               <!-- 是否要 -->
               <el-form-item prop="matNo" label="物料编码">
-                <el-input v-model="baseData.matNo"  size="small"  @blur="myBlur" disabled></el-input>
+                <el-input v-model="baseData.matNo"  size="small"  @blur="myBlur" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -128,7 +128,7 @@ export default {
             stdNameType: [],
             isTestType: [
               {id: '1', isTest: '是'},
-              {id: '0', isTest: '否'} 
+              {id: '0', isTest: '否'}
             ],
             isBatchType: [
               {id: 1, isBatch: '是'},

+ 3 - 30
src/views/screeningTests/components/materialConfiguration/materialConfiguration.vue

@@ -89,10 +89,7 @@
       </el-col>
       <el-col :span="17">
         <el-row>
-          <el-collapse v-model="activeCollapse1">
-            <el-collapse-item name="1">
-              <template slot="title"
-                ><div class="common-title-div" style="align-items: center">
+          <div class="common-title-div" style="align-items: center">
                   <div
                     class="common-title-name"
                     style="align-items: center; display: flex"
@@ -134,6 +131,8 @@
                     >
                   </div>
                 </div>
+              <template slot="title"
+                >
               </template>
 
               <div>
@@ -294,16 +293,11 @@
                 >
                 </el-pagination>
               </div>
-            </el-collapse-item>
-          </el-collapse>
         </el-row>
 
         <el-row>
           <el-tabs v-model="activeName" type="card">
             <el-tab-pane label="规格配置" name="first">
-              <el-collapse v-model="activeCollapse2">
-                <el-collapse-item name="1">
-                  <template slot="title">
                     <div class="common-title-div" style="align-items: center">
                       <div
                         class="common-title-name"
@@ -332,8 +326,6 @@
                         >
                       </div>
                     </div>
-                  </template>
-
                   <div>
                     <el-table
                       v-loading="dataLoading3"
@@ -449,13 +441,8 @@
                     >
                     </el-pagination>
                   </div>
-                </el-collapse-item>
-              </el-collapse>
             </el-tab-pane>
             <el-tab-pane label="物料对照" name="second">
-              <el-collapse v-model="activeCollapse3">
-                <el-collapse-item name="1">
-                  <template slot="title">
                     <div class="common-title-div" style="align-items: center">
                       <div
                         class="common-title-name"
@@ -498,8 +485,6 @@
                         >
                       </div>
                     </div>
-                  </template>
-
                   <div>
                     <el-table
                       v-loading="dataLoading"
@@ -633,16 +618,11 @@
                     >
                     </el-pagination>
                   </div>
-                </el-collapse-item>
-              </el-collapse>
             </el-tab-pane>
           </el-tabs>
         </el-row>
         <!-- 样品权限配置 -->
         <el-row v-if="userId === 'admin'">
-          <el-collapse v-model="activeCollapse4">
-            <el-collapse-item name="1">
-              <template slot="title">
                 <div class="common-title-div" style="align-items: center">
                   <div
                     class="common-title-name"
@@ -678,7 +658,6 @@
                     >
                   </div>
                 </div>
-              </template>
               <div>
                 <el-table
                   v-loading="dataLoading4"
@@ -770,8 +749,6 @@
                 >
                 </el-pagination>
               </div>
-            </el-collapse-item>
-          </el-collapse>
         </el-row>
       </el-col>
     </el-row>
@@ -971,10 +948,6 @@ export default {
         ],
       },
       userId,
-      activeCollapse1: ["1"],
-      activeCollapse2: ["1"],
-      activeCollapse3: ["1"],
-      activeCollapse4: ["1"],
     };
   },
   created() {