Merge remote-tracking branch 'origin/master'

src/views/udi/trace/search/index.vue

@@ -670,8 +670,64 @@
           </el-col>
         </el-row>
         <el-row type="flex">
-
+          <el-col :span="11" type="flex">
-
+            <el-form-item label="产品名称" prop="cpmctymc" show-overflow-tooltip>
+              <el-input v-model="formView.cpmctymc" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="规格型号" prop="ggxh" show-overflow-tooltip>
+              <el-input v-model="formView.ggxh" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="备案号" prop="cpmctymc" show-overflow-tooltip>
+              <el-input v-model="formView.zczbhhzbapzbh" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="批次号" prop="ggxh" show-overflow-tooltip>
+              <el-input v-model="formView.batchNo" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="生产日期" prop="produceDate" show-overflow-tooltip>
+              <el-input v-model="formView.produceDate" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="失效日期" prop="expireDate" show-overflow-tooltip>
+              <el-input v-model="formView.expireDate" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip>
+              <el-input v-model="formView.ylqxzcrbarmc" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="序列号" prop="serialNo" show-overflow-tooltip>
+              <el-input v-model="formView.serialNo" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="11" type="flex">

src/views/udi/trace/searchLive/index.vue

@@ -670,8 +670,64 @@
           </el-col>
         </el-row>
         <el-row type="flex">
-
+          <el-col :span="11" type="flex">
-
+            <el-form-item label="产品名称" prop="cpmctymc" show-overflow-tooltip>
+              <el-input v-model="formView.cpmctymc" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="规格型号" prop="ggxh" show-overflow-tooltip>
+              <el-input v-model="formView.ggxh" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="备案号" prop="cpmctymc" show-overflow-tooltip>
+              <el-input v-model="formView.zczbhhzbapzbh" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="批次号" prop="ggxh" show-overflow-tooltip>
+              <el-input v-model="formView.batchNo" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="生产日期" prop="produceDate" show-overflow-tooltip>
+              <el-input v-model="formView.produceDate" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="失效日期" prop="expireDate" show-overflow-tooltip>
+              <el-input v-model="formView.expireDate" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip>
+              <el-input v-model="formView.ylqxzcrbarmc" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="序列号" prop="serialNo" show-overflow-tooltip>
+              <el-input v-model="formView.serialNo" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="11" type="flex">