药品通用 最小包装数量bug 特殊性 手术级别显示 未设置

src/components/cdssManage/knowledge/AddKnowledge.vue

@@ -37,7 +37,12 @@
               ></el-input>
             </el-form-item>
             <el-form-item label="术语拼音" prop="pycode">
-              <el-input v-model.trim="form.pycode" placeholder="请输入术语拼音" ref="pycode"></el-input>
+              <el-input
+                v-model.trim="form.pycode"
+                placeholder="请输入术语拼音"
+                ref="pycode"
+                maxlength="100"
+              ></el-input>
             </el-form-item>
             <!-- 诊断 -->
             <DiseaseForm v-if="form.labelType==='医保疾病名称'" :data="form" @handleInput="handleInput"></DiseaseForm>
@@ -141,7 +146,7 @@ export default {
     CommonForm
   },
   data() {
-    let reg = /^[a-zA-Z0-9:.,?!@]{0,100}[#$^]?$/;
+    let reg = /^[a-zA-Z0-9:.,?!@/();，)(-]{0,10000}[#$^]?$/;
     let checkFrequency = (rule, value, callback) => {
       let pycode = this.$refs.pycode.value;
       if (!reg.test(pycode && pycode.trim())) {
@@ -177,7 +182,7 @@ export default {
         special: '否', //特殊标志（化验细项及结果属性：是）
         status: 1, //状态（0-禁用，1-启用，默认1）
         unit: '', //单位（实验室检查名称、实验室检查、体征、实验室检查危急值）
-        min_pack_num: '', //最小包装数量（药品代码通用名属性）
+        min_pack_num: null, //最小包装数量（药品代码通用名属性）
         reg_JiXin: '', //注册剂型（药品代码通用名属性）
         benWei_Code: '', //药品本位码（药品代码通用名属性）
         min_pack_unit: '', //最小包装单位（药品代码通用名属性）
@@ -365,6 +370,7 @@ export default {
         min_prod_unit, //最小制剂单位（药品代码通用名属性）
         stand_reg_JiXin //标准注册剂型（药品代码通用名属性）
       };
+      console.log(params.min_pack_num, 'min_pack_num');
       if (this.isEdit) {
         params = { ...params, id: this.id };
       }
@@ -470,7 +476,7 @@ export default {
     // 处理拼音转换&验证唯一性
     handlePinyin(e) {
       if (this.nameFlag === e.target.value) {
-        this.isTrans = true
+        this.isTrans = true;
         this.isValidate = true; // 校验通过
         this.form.pycode = pinyin.getCamelChars(e.target.value);
       } else {

src/components/cdssManage/knowledge/AssayForm.vue

@@ -6,12 +6,11 @@
         ref="assayForm"
         class="sub-form"
         :validate-on-rule-change="false"
-        :rules="rules"
       >
-        <el-form-item label="特殊" label-width="110px">
+        <el-form-item label="特殊性" label-width="110px">
           <el-select
             v-model="assayForm.special"
-            placeholder="请选择特殊"
+            placeholder="请选择特殊性"
             clearable
             @change="handleValue('special')"
             style="width: 100%"

src/components/cdssManage/knowledge/DrugGeneNameForm.vue

@@ -8,13 +8,6 @@
         :validate-on-rule-change="false"
         :rules="rules"
       >
-        <el-form-item label="最小包装数量" label-width="110px" prop="min_pack_num">
-          <el-input
-            v-model.number="drugGeneNameForm.min_pack_num"
-            placeholder="请输入最小包装数量"
-            @blur="handleValue('min_pack_num')"
-          ></el-input>
-        </el-form-item>
         <el-form-item label="注册剂型" label-width="110px" prop="reg_JiXin">
           <el-input
             v-model.trim="drugGeneNameForm.reg_JiXin"
@@ -23,18 +16,11 @@
             @blur="handleValue('reg_JiXin')"
           ></el-input>
         </el-form-item>
-        <el-form-item label="药品本位码" label-width="110px" prop="benWei_Code">
-          <el-input
-            v-model.trim="drugGeneNameForm.benWei_Code"
-            placeholder="请输入药品本位码"
-            @blur="handleValue('benWei_Code')"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="最小包装单位" label-width="110px" prop="min_pack_unit">
+        <el-form-item label="标准注册剂型" label-width="110px" prop="stand_reg_JiXin">
           <el-input
-            v-model.trim="drugGeneNameForm.min_pack_unit"
-            placeholder="请输入最小包装单位"
-            @blur="handleValue('min_pack_unit')"
+            v-model.trim="drugGeneNameForm.stand_reg_JiXin"
+            placeholder="请输入标准注册剂型"
+            @blur="handleValue('stand_reg_JiXin')"
           ></el-input>
         </el-form-item>
         <el-form-item label="注册规格" label-width="110px" prop="reg_GuiGe">
@@ -51,6 +37,27 @@
             @blur="handleValue('pack_CaiLiao')"
           ></el-input>
         </el-form-item>
+        <el-form-item label="最小包装数量" label-width="110px" prop="min_pack_num">
+          <el-input
+            v-model.number="drugGeneNameForm.min_pack_num"
+            placeholder="请输入最小包装数量"
+            @blur="handleValue('min_pack_num')"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="最小制剂单位" label-width="110px" prop="min_prod_unit">
+          <el-input
+            v-model.trim="drugGeneNameForm.min_prod_unit"
+            placeholder="请输入最小制剂单位"
+            @blur="handleValue('min_prod_unit')"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="最小包装单位" label-width="110px" prop="min_pack_unit">
+          <el-input
+            v-model.trim="drugGeneNameForm.min_pack_unit"
+            placeholder="请输入最小包装单位"
+            @blur="handleValue('min_pack_unit')"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="药品企业" label-width="110px" prop="producer">
           <el-input
             v-model.trim="drugGeneNameForm.producer"
@@ -65,18 +72,11 @@
             @blur="handleValue('license_num')"
           ></el-input>
         </el-form-item>
-        <el-form-item label="最小制剂单位" label-width="110px" prop="min_prod_unit">
-          <el-input
-            v-model.trim="drugGeneNameForm.min_prod_unit"
-            placeholder="请输入最小制剂单位"
-            @blur="handleValue('min_prod_unit')"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="标准注册剂型" label-width="110px" prop="stand_reg_JiXin">
+        <el-form-item label="药品本位码" label-width="110px" prop="benWei_Code">
           <el-input
-            v-model.trim="drugGeneNameForm.stand_reg_JiXin"
-            placeholder="请输入标准注册剂型"
-            @blur="handleValue('stand_reg_JiXin')"
+            v-model.trim="drugGeneNameForm.benWei_Code"
+            placeholder="请输入药品本位码"
+            @blur="handleValue('benWei_Code')"
           ></el-input>
         </el-form-item>
       </el-form>
@@ -100,7 +100,7 @@ export default {
 
     return {
       drugGeneNameForm: {
-        min_pack_num: '', //最小包装数量（药品代码通用名属性）
+        min_pack_num: null, //最小包装数量（药品代码通用名属性）
         reg_JiXin: '', //注册剂型（药品代码通用名属性）
         benWei_Code: '', //药品本位码（药品代码通用名属性）
         min_pack_unit: '', //最小包装单位（药品代码通用名属性）

src/components/cdssManage/knowledge/OperationForm.vue

@@ -24,14 +24,10 @@
             <el-option label="4" value="4"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="高危条件"
-          label-width="110px"
-          v-if="operationForm.opgrade == 2"
-        >
+        <el-form-item label="高危条件" label-width="110px" v-if="operationForm.opgrade == 2">
           <span
             style="paddingLeft: 12px; color: #606266"
-          >{{operationForm.highriskcond === ''? '未设置': '已设置'}}</span>
+          >{{(operationForm.highriskcond === '' || operationForm.highriskcond === null)? '未设置': '已设置'}}</span>
         </el-form-item>
       </el-form>
     </el-col>
@@ -65,8 +61,7 @@ export default {
             trigger: ['blur', 'change']
           }
         ]
-      },
-     
+      }
     };
   },
   computed: {},
@@ -76,14 +71,12 @@ export default {
   mounted() {},
   methods: {
     _initData() {
-      // console.log(this.data);
+      console.log(this.data, '===========');
       this.operationForm.opgrade = this.data.opgrade;
       this.operationForm.highriskcond = this.data.highriskcond;
     },
     // 传值
     handleValue(from) {
-      console.log(from,'from');
-      console.log(this.operationForm[from],'this.operationForm[from]');
       this.$emit('handleInput', {
         type: from,
         value: this.operationForm[from]