Эх сурвалжийг харах

当效期管理改为未勾选状态,需将效期单位、有效期、有效期至单位、近效期预警天数的取值置空

002390 2 жил өмнө
parent
commit
853bb6f20f

+ 19 - 19
src/views/material/basicFile/details.vue

@@ -29,7 +29,7 @@
               </el-dropdown-menu>
               </el-dropdown-menu>
             </el-dropdown>
             </el-dropdown>
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              <el-button size="small" @click="handleQuery">查询</el-button> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <el-button size="small" @click="handleQuery">查询</el-button> -->
             <el-button size="small" @click="handleRefresh">刷新</el-button>
             <el-button size="small" @click="handleRefresh">刷新</el-button>
 
 
           </el-button-group>
           </el-button-group>
@@ -47,7 +47,7 @@
               启用
               启用
               <el-dropdown-menu slot="dropdown">
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
                 <el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
-                                                                                            <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item></el-dropdown-menu></el-dropdown> -->
+                                                                                              <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item></el-dropdown-menu></el-dropdown> -->
           </el-button-group>
           </el-button-group>
         </el-col>
         </el-col>
 
 
@@ -56,7 +56,7 @@
           <el-button-group>
           <el-button-group>
             <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
             <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
           </el-button-group>
           </el-button-group>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      </el-col> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </el-col> -->
 
 
         <!-- 导入导出 -->
         <!-- 导入导出 -->
       <!-- <el-col :span="1.5">
       <!-- <el-col :span="1.5">
@@ -64,7 +64,7 @@
             <el-button size="small" @click="handleImport">批量导入</el-button>
             <el-button size="small" @click="handleImport">批量导入</el-button>
             <el-button size="small" @click="handleExport">批量导出</el-button>
             <el-button size="small" @click="handleExport">批量导出</el-button>
           </el-button-group>
           </el-button-group>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </el-col> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          </el-col> -->
 
 
       </el-row>
       </el-row>
 
 
@@ -109,7 +109,7 @@
         <el-col :span="6" style="text-align: right;">
         <el-col :span="6" style="text-align: right;">
           <!-- 附件管理 -->
           <!-- 附件管理 -->
         <!-- <el-button-group>
         <!-- <el-button-group>
-                                                                                        <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button></el-button-group> -->
+                                                                                          <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button></el-button-group> -->
 
 
           <!-- 切换 -->
           <!-- 切换 -->
         <!-- <el-button-group>
         <!-- <el-button-group>
@@ -120,7 +120,7 @@
             <el-button size="small" icon="el-icon-arrow-right" :disabled="!handleBasicEdit"
             <el-button size="small" icon="el-icon-arrow-right" :disabled="!handleBasicEdit"
               @click="handleChangePage('next')" />
               @click="handleChangePage('next')" />
             <el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
             <el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
-                                                                                          @click="handleChangePage('end')" /></el-button-group> -->
+                                                                                            @click="handleChangePage('end')" /></el-button-group> -->
         </el-col>
         </el-col>
       </el-row>
       </el-row>
 
 
@@ -281,8 +281,7 @@
                                 :disabled="!(updateButtonGroup && m.edit && basicData.value.isMedicine == '0')"
                                 :disabled="!(updateButtonGroup && m.edit && basicData.value.isMedicine == '0')"
                                 @focus="m.apiUrl && handleQueryMore(m, '', { name: 'medcineData', prop: m.prop })">
                                 @focus="m.apiUrl && handleQueryMore(m, '', { name: 'medcineData', prop: m.prop })">
 
 
-                              <!-- <el-option v-if="m.dictId" v-for="d in m.dictValue" :key="d.dictValue"
-                                                                                                                                                                                                                                                                                                                                                                    :label="d.dictLabel" :value="d.dictValue"></el-option> -->
+                                <!-- <el-option v-if="m.dictId" v-for="d in m.dictValue" :key="d.dictValue":label="d.dictLabel" :value="d.dictValue"></el-option> -->
 
 
                                 <div slot="empty"></div>
                                 <div slot="empty"></div>
                               </el-select>
                               </el-select>
@@ -434,11 +433,9 @@
               :placeholder="mt.name">
               :placeholder="mt.name">
               <el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
               <el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
                 :value="d.dictValue">
                 :value="d.dictValue">
-              </el-option>
-                                                                                                                                                                                                                                                                                                                                                                                      </el-select> -->
+                </el-option></el-select> -->
 
 
             <!-- 其他类型 -->
             <!-- 其他类型 -->
-
             <el-input v-else size="small" v-model="scope.row[mt.prop]" :readonly="!(materialType.isEdit && mt.edit)"
             <el-input v-else size="small" v-model="scope.row[mt.prop]" :readonly="!(materialType.isEdit && mt.edit)"
               :placeholder="mt.name" />
               :placeholder="mt.name" />
           </template>
           </template>
@@ -486,8 +483,6 @@
 
 
           <el-collapse-item title="物料基本信息" name="basic">
           <el-collapse-item title="物料基本信息" name="basic">
             <el-form :inline="true" label-position="right" :model="basicData.value">
             <el-form :inline="true" label-position="right" :model="basicData.value">
-            <!-- <el-form-item label="所属组织">
-                                                                                                                                                                                                                                                                                                                                                                                                                                              <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
               <el-form-item label="物料编码">
               <el-form-item label="物料编码">
                 <el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
                 <el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
               </el-form-item>
               </el-form-item>
@@ -497,8 +492,6 @@
               <el-form-item label="英文名称">
               <el-form-item label="英文名称">
                 <el-input v-model="basicData.value.enName" size="small" readonly placeholder="英文名称"></el-input>
                 <el-input v-model="basicData.value.enName" size="small" readonly placeholder="英文名称"></el-input>
               </el-form-item>
               </el-form-item>
-            <!-- <el-form-item label="版本号">
-                                                                                                                                                                                                                                                                                                                                                                                                                                            <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input></el-form-item> -->
 
 
             </el-form>
             </el-form>
           </el-collapse-item>
           </el-collapse-item>
@@ -775,8 +768,8 @@ export default {
       // 批号及库存状态管理(isInventoryStatus) 控制 效期管理是否展示(expiryDateManagerment)
       // 批号及库存状态管理(isInventoryStatus) 控制 效期管理是否展示(expiryDateManagerment)
       if (attribute.prop == 'expiryDateManagerment') {
       if (attribute.prop == 'expiryDateManagerment') {
 
 
-        if (this.basicData.value['isInventoryStatus'] == '2')  this.basicData.value['expiryDateManagerment'] = '2';
-        
+        if (this.basicData.value['isInventoryStatus'] == '2') this.basicData.value['expiryDateManagerment'] = '2';
+
         return !(this.updateButtonGroup && attribute.edit && this.basicData.value['isInventoryStatus'] == '0');
         return !(this.updateButtonGroup && attribute.edit && this.basicData.value['isInventoryStatus'] == '0');
       }
       }
       else if (attribute.prop == 'expiryUnitId'
       else if (attribute.prop == 'expiryUnitId'
@@ -785,8 +778,15 @@ export default {
         || attribute.prop == 'recentWarningPeriod'
         || attribute.prop == 'recentWarningPeriod'
       ) {
       ) {
         // 效期管理(expiryDateManagerment):控制一下几个是否可编辑
         // 效期管理(expiryDateManagerment):控制一下几个是否可编辑
-        // expiryUnitId 效期单位  usefulLife 有效期 usefulLifeUnitId 有效期至单位   近效期预警天数 "recentWarningPeriod"
-        // !(updateButtonGroup && f.edit)
+        // expiryUnitId 效期单位  usefulLife 有效期 usefulLifeUnitId 有效期至单位  "recentWarningPeriod" 近效期预警天数
+        if (this.basicData.value['expiryDateManagerment'] == '2') {
+
+          this.basicData.value['expiryUnitId'] = '';
+          this.basicData.value['usefulLife'] = '';
+          this.basicData.value['usefulLifeUnitId'] = '';
+          this.basicData.value['recentWarningPeriod'] = '';
+        }
+
         return !(this.updateButtonGroup && attribute.edit && this.basicData.value['expiryDateManagerment'] == '0');
         return !(this.updateButtonGroup && attribute.edit && this.basicData.value['expiryDateManagerment'] == '0');
       } else {
       } else {
         // 其他属性是否可编辑
         // 其他属性是否可编辑