去除冗余代码，修改编进入申请单时候，一级二级三级分类不回显问题

src/views/material/changeApply/add.vue

@@ -444,8 +444,8 @@ export default {
         twoClass: [{required: true, message: '请填写二级分类', trigger: 'blur'}],
         threeClass: [{required: true, message: '请填写三级分类', trigger: 'blur'}],
         fourClass: [{required: true, message: '请填写四级分类', trigger: 'blur'}],
-        specification: [{required: true, message: '请填写型号分类', trigger: 'blur'}],
-        model: [{required: true, message: '请填写四级分类', trigger: 'blur'}],
+        specification: [{required: true, message: '请填写规格', trigger: 'blur'}],
+        model: [{required: true, message: '请填写型号', trigger: 'blur'}],
         factory: [{required: true, message: '请选择生产厂家/代理人', trigger: 'blur'}],
         registrant: [{required: true, message: '请填写注册人/上市许可持有人', trigger: 'blur'}],
         storageConditions: [{required: true, message: '请选择存储条件', trigger: 'blur'}],
@@ -667,10 +667,14 @@ export default {
           this.basicForm.fourClass = data.fourClass
           this.basicForm.specification = data.specification
           this.basicForm.model = data.model
+          this.basicForm.factory = data.manufacturerId
           this.basicForm.registrant = data.registrant
           this.basicForm.storageConditions = data.storageCondition
           this.basicForm.transportCondition = data.transportationCondition
           this.basicForm.leadTime = data.deliveryPeriod
+          if(data.manufacturerId) {
+            this.getFactoryDetails(data.manufacturerId)
+          }
           if(data.medcines.length !== 0) {
             this.basicForm2.drug = data.medcines[0].isDrug
             this.basicForm2.registrationNo = data.medcines[0].registrationNo
@@ -714,6 +718,7 @@ export default {
   height: calc(100vh - 84px);
   padding: 12px;
   box-sizing: border-box;
+  overflow-y: auto;
 }
 .btn_group {
   width: 100%;

src/views/material/requisition/add.vue

@@ -158,9 +158,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.originPlace">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -356,9 +353,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.materialRate">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -397,9 +391,6 @@
                       :value="item.code"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.puPersonnelId">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -458,9 +449,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.businessLine">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -645,9 +633,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm2.dosageFrom">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -793,13 +778,6 @@
       </el-col>
     </div>
 
-    <popDialog
-      ref="contractSelect"
-      @doSubmit="selectionsToInput"
-      :selectData="selectData"
-      :single="true"
-    />
-
     <factory
       ref="factory"
       @doSubmit="acceptFactory"
@@ -873,7 +851,6 @@
 </template>
 
 <script>
-import popDialog from '@/components/PopDialog/index.vue'
 import factory from '@/components/PopDialog/productFactory.vue'
 import fourClass from '@/components/PopDialog/fourClass.vue'
 import unit from '@/components/PopDialog/unit.vue'
@@ -897,7 +874,6 @@ export default {
   name: 'requisition_add',
   dicts: ['sys_storage_condition', 'sys_conditions_carriage', 'sys_medicine', 'medical_instruments', 'curing_type', 'period_unit', 'expiry_date'],
   components: {
-    popDialog,
     factory,
     fourClass,
     unit,
@@ -1099,10 +1075,6 @@ export default {
       console.log('页面状态',this.pageStu)
       console.log('数据', this.row)
       this.getDetails(this.row)
-      // 获取树形详情
-      if (this.row.classifyId) {
-        this.getTreeDetails(this.row.classifyId)
-      }
       // 生产厂家代理人用于回显
       if (this.row.manufacturerId) {
         this.getFactoryDetails(this.row.manufacturerId)
@@ -1144,10 +1116,6 @@ export default {
       } else {
         this.isControl = true
       }
-      // 获取树形详情
-      if (this.row.classifyId) {
-        this.getTreeDetails(this.row.classifyId)
-      }
       // 生产厂家代理人用于回显
       if (this.row.manufacturerId) {
         this.getFactoryDetails(this.row.manufacturerId)
@@ -1300,6 +1268,10 @@ export default {
         console.log('res',res)
         if(res.code === 200) {
           this.basicForm = res.data
+          // 获取树形详情
+          if (res.data.classifyId) {
+            this.getTreeDetails(res.data.classifyId)
+          }
           if(res.data.purchasingOrganization) {
             this.basicForm.purchasingOrganization = res.data.purchasingOrganization
             this.getOrgDetails(res.data.purchasingOrganization)
@@ -1421,45 +1393,7 @@ export default {
     //   let params = {...this.basicForm, ...this.basicForm2}
     //   console.log('暂存总表单', params)
     // },
-    // 设置选中
-    selectionsToInput (selections) {
-      console.log('父组件拿到的：', selections)
-      this.selectData = selections
-      this.$emit('getInfo', this.selectData)
-      getMaterialDetails(selections[0].id).then(res => {
-        console.log('res',res)
-        if (res.code === 200) {
-          let data = res.data.data
-          // 物料id
-          this.basicForm.materialId = data.id
-          // 物料分类Id
-          this.basicForm.materialClassifyId = data.classifyId
-          this.basicForm.materialCode = data.code
-          this.basicForm.materialName = data.name
-          this.basicForm.medicineMaterial = data.isMedicine
-          this.basicForm.oneClass = data.oneClass
-          this.basicForm.twoClass = data.twoClass
-          this.basicForm.threeClass = data.threeClass
-          this.basicForm.fourClass = data.fourClass
-          this.basicForm.specification = data.specification
-          this.basicForm.model = data.model
-          this.basicForm.registrant = data.registrant
-          this.basicForm.storageConditions = data.storageCondition
-          this.basicForm.transportCondition = data.transportationCondition
-          this.basicForm.remark = data.deliveryPeriod
-          if(data.medcines.length !== 0) {
-            this.basicForm2.drug = data.medcines[0].isDrug
-            this.basicForm2.registrationNo = data.medcines[0].registrationNo
-            this.basicForm2.medicalDevices = data.medcines[0].medicalInstruments
-            this.basicForm2.maintenanceType = data.medcines[0].curingType
-          }
-        }
-      })
-    },
-    test01() {
-      console.log('测试点击')
-      this.$refs.contractSelect.init()
-    },
+
     // 选择生产厂家/代理人
     acceptFactory (selections) {
       console.log('选择的数据',selections)
@@ -1586,6 +1520,7 @@ export default {
   height: calc(100vh - 84px);
   padding: 12px;
   box-sizing: border-box;
+  overflow-y: auto;
 }
 .btn_group {
   width: 100%;