Browse Source

fix: 样品库存

32197351@qq.com 1 year ago
parent
commit
1ad1682e99

+ 5 - 5
itdmWeb/src/views/module-iTDM/inventory/ItdmSampleInventoryList.vue

@@ -140,11 +140,11 @@ export default {
           align: 'center',
           dataIndex: 'batchNumber'
         },
-        // {
-        //   title: '样品分类',
-        //   align: 'center',
-        //   dataIndex: 'sampleClassifications'
-        // },
+        {
+          title: '样品分类',
+          align: 'center',
+          dataIndex: 'sampleClassifications_dictText'
+        },
         {
           title: '样品单位',
           align: 'center',

+ 16 - 5
itdmWeb/src/views/module-iTDM/inventory/modules/ItdmSampleInventoryForm.vue

@@ -19,11 +19,22 @@
             </a-form-model-item>
           </a-col>
 
-<!--          <a-col :span="24">-->
-<!--            <a-form-model-item label="样品分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sampleClassifications">-->
-<!--              <a-input v-model="model.sampleClassifications" placeholder="请输入样品分类"  ></a-input>-->
-<!--            </a-form-model-item>-->
-<!--          </a-col>-->
+
+          <a-col :span="24">
+            <a-form-model-item label="样品分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sampleClassifications">
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择样品分类"
+                v-model="model.sampleClassifications"
+                dict="itdm_sample_classification,name,id"
+                pidField="pid"
+                pidValue="0"
+
+              >
+              </j-tree-select>
+            </a-form-model-item>
+          </a-col>
+
           <a-col :span="24">
             <a-form-model-item label="样品单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sampleUnit">
               <a-input v-model="model.sampleUnit" placeholder="请输入样品单位"  ></a-input>