浏览代码

兼容node18

ZaiZai 1 年之前
父节点
当前提交
73f204e4b8
共有 2 个文件被更改,包括 8 次插入4 次删除
  1. 0 4
      src/config/index.json
  2. 8 0
      src/views/manager/contractinfo/detail.vue

+ 0 - 4
src/config/index.json

@@ -1,10 +1,6 @@
 {
-<<<<<<< HEAD
-  "target": "http://192.168.1.228:8090",
-=======
   "target": "http://39.108.216.210:8090",
   "target1": "http://192.168.0.109:8090",
->>>>>>> 59d2fb16f543f5348ea80f7eeb96737fb9b4b308
   "dev": {
     "port": 1888
   }

+ 8 - 0
src/views/manager/contractinfo/detail.vue

@@ -280,6 +280,14 @@
 
                   </el-form-item>
                 </el-col>
+                <el-col :span="12" v-if="contractForm.contractType==2 || contractForm.contractType==3">
+                  <el-form-item
+                    label="试验室名称"
+                    prop="laboratoryName"
+                  >
+                    <el-input v-model="contractForm.laboratoryName"></el-input>
+                  </el-form-item>
+                </el-col>
               </el-row>
               <el-row v-if="contractForm.contractType==1">
                 <el-col :span="12">