Jelajahi Sumber

1、物料变更单交货周期,业务线,物料分类在物料基础档案修改。
2、申请单编辑批号管理校验处理

shiy 1 tahun lalu
induk
melakukan
95161f7aa4

+ 27 - 27
src/views/material/changeApply/add.vue

@@ -37,11 +37,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="物料分类" prop="materialClassifyId">
-                <el-input readonly :disabled="disable" v-model="basicForm.fourClass">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="chooseFourClass"></el-button>
-                </el-input>
-                <el-input v-show="false" readonly :disabled="disable" v-model="basicForm.materialClassifyId"></el-input>
+              <el-form-item label="生产许可证" prop="remark">
+                <el-input :disabled="disable" v-model="basicForm.productionPermit"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -92,25 +89,28 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="交货周期" prop="leadTime">
-                <el-input type="number" min="0" :disabled="disable" v-model="basicForm.leadTime"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="业务线" prop="businessLine"
-                            :rules="{ required: isOneClass, message: '骨科、介入、检验、普耗、设备类物料产线必须输入对应的业务线', trigger: 'blur' }">
-                <el-select ref="lines" v-model="basicForm.businessLine" placeholder="请选择" clearable :disabled="disable"
-                           @focus="chooseLine">
-                  <el-option v-for="item in lineOptions" :key="item.id" :label="item.name" :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="生产许可证" prop="remark">
-                <el-input :disabled="disable" v-model="basicForm.productionPermit"></el-input>
-              </el-form-item>
-            </el-col>
+            <!--            <el-col :span="8">-->
+            <!--              <el-form-item label="交货周期" prop="leadTime">-->
+            <!--                <el-input type="number" min="0" :disabled="disable" v-model="basicForm.leadTime"></el-input>-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
+            <!--            <el-col :span="8">-->
+            <!--              <el-form-item label="业务线" prop="businessLine"-->
+            <!--                            :rules="{ required: isOneClass, message: '骨科、介入、检验、普耗、设备类物料产线必须输入对应的业务线', trigger: 'blur' }">-->
+            <!--                <el-select ref="lines" v-model="basicForm.businessLine" placeholder="请选择" clearable :disabled="disable"-->
+            <!--                           @focus="chooseLine">-->
+            <!--                  <el-option v-for="item in lineOptions" :key="item.id" :label="item.name" :value="item.id"/>-->
+            <!--                </el-select>-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
+            <!--            <el-col :span="8">-->
+            <!--              <el-form-item label="物料分类" prop="materialClassifyId">-->
+            <!--                <el-input readonly :disabled="disable" v-model="basicForm.fourClass">-->
+            <!--                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="chooseFourClass"></el-button>-->
+            <!--                </el-input>-->
+            <!--                <el-input v-show="false" readonly :disabled="disable" v-model="basicForm.materialClassifyId"></el-input>-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
             <el-col :span="8">
               <el-form-item label="DI码" prop="remark">
                 <el-input :disabled="disable" v-model="basicForm.diCode"></el-input>
@@ -426,13 +426,13 @@
           materialCode: [{required: true, message: '请选择物料编码', trigger: 'blur'}],
           materialName: [{required: true, message: '请填写物料名称', trigger: 'blur'}],
           specification: [{required: true, message: '请填写规格', trigger: 'blur'}],
-          materialClassifyId: [{required: true, message: '请选择物料分类', trigger: 'blur'}],
+          // materialClassifyId: [{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'}],
           // transportCondition: [{required: true, message: '请选择运输条件', trigger: 'blur'}],
-          leadTime: [{required: true, message: '请填写交货周期', trigger: 'blur'}],
+          // leadTime: [{required: true, message: '请填写交货周期', trigger: 'blur'}],
         },
         basicForm2: {
           drug: '',
@@ -681,7 +681,7 @@
             // 物料id
             this.basicForm.materialId = data.id
             // 物料分类Id
-            this.basicForm.materialClassifyId = data.classifyId
+            // this.basicForm.materialClassifyId = data.classifyId
             this.basicForm.materialCode = data.code
             this.basicForm.materialName = data.name
             this.basicForm.medicineMaterial = data.isMedicine

+ 2 - 0
src/views/material/requisition/add.vue

@@ -948,6 +948,8 @@ export default {
       console.log('页面状态', this.pageStu)
       console.log('数据', this.row)
       this.getDetails(this.row)
+      console.log('修改页面-批号库存管理状态', this.row.isInventoryStatus)
+      this.stockControl(this.row.isInventoryStatus)
       // 控制效期单位后面的是否可填写
       if (this.row.expiryDateManagerment == '0') {
         this.isExp = false