002390 1 жил өмнө
parent
commit
824f2b9589

+ 7 - 3
src/views/material/basicFile/details.vue

@@ -281,8 +281,11 @@
               <!-- 副信息 -->
               <!-- 副信息 -->
               <div class="md-vice">
               <div class="md-vice">
 
 
-                <dr-tabs v-if="activeMainTab == 'material'" :tabList="basicMessage"
-                         :handleTabClick="handleViceTabClick">
+                <dr-tabs 
+                  v-if="activeMainTab == 'material'" 
+                  :tabList="basicMessage"
+                  :handleTabClick="handleViceTabClick"
+                >
 
 
                   <template #tabContent>
                   <template #tabContent>
 
 
@@ -293,6 +296,7 @@
                       :model="medcineData.value" 
                       :model="medcineData.value" 
                       class="md-vice-content"
                       class="md-vice-content"
                       :rules="medcineRules"
                       :rules="medcineRules"
+                      :key="medcineData.value.id"
                     >
                     >
 
 
                       <el-row :gutter="10">
                       <el-row :gutter="10">
@@ -2466,7 +2470,7 @@
             this.medcineData.value[item.prop] = ''
             this.medcineData.value[item.prop] = ''
           })
           })
           this.medcineData.form = form;
           this.medcineData.form = form;
-          this.medcineData.value = initParams(this.medcineData.form,'prop')
+          this.medcineData.value = initParams(this.medcineData.form,'prop');
           this.medcineRules = initRules(form);
           this.medcineRules = initRules(form);
           this.getMedcineDetails(this.materialId, 'material_medcine');
           this.getMedcineDetails(this.materialId, 'material_medcine');
         })
         })

+ 9 - 1
src/views/purchase/purchase-order/add/column.js

@@ -557,7 +557,7 @@ export const TabColumns = [
           materialManufacturersCode:'manufacturersMaterialCode',
           materialManufacturersCode:'manufacturersMaterialCode',
           specification:'specification',
           specification:'specification',
           model:'model',
           model:'model',
-          isMedcine:'isMedicineValue',
+          isMedcine:'isMedicine',
           manufacturer:'manufacturerId',
           manufacturer:'manufacturerId',
           manufacturerName:'manufacturerIdName',
           manufacturerName:'manufacturerIdName',
           unit:'unitId',
           unit:'unitId',
@@ -1026,4 +1026,12 @@ export const TabColumns = [
   },
   },
 ];
 ];
 
 
+
+// 集采中心
+const PurColumns =[];
+const PurchaseTabColumns =[];
+
+// 事业发展部
+const CauseColumns =[];
+const CauseTabColumns =[];
 // export const initTabColumns = () => tabColumns;
 // export const initTabColumns = () => tabColumns;