Quellcode durchsuchen

fix: 样品库存

32197351@qq.com vor 1 Jahr
Ursprung
Commit
ebc17a528b

+ 1 - 1
itdmWeb/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://10.10.0.106:8082/itdmServer
+VUE_APP_API_BASE_URL=http://127.0.0.1:8081/itdmServer
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

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

@@ -140,20 +140,20 @@ export default {
           align: 'center',
           dataIndex: 'batchNumber'
         },
-        {
-          title: '样品分类',
-          align: 'center',
-          dataIndex: 'sampleClassifications'
-        },
+        // {
+        //   title: '样品分类',
+        //   align: 'center',
+        //   dataIndex: 'sampleClassifications'
+        // },
         {
           title: '样品单位',
           align: 'center',
           dataIndex: 'sampleUnit'
         },
         {
-          title: '样品状态(是否损坏)',
+          title: '样品状态',
           align: 'center',
-          dataIndex: 'sampleStatus'
+          dataIndex: 'sampleStatus_dictText'
         },
 
         {

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

@@ -19,19 +19,19 @@
             </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">-->
+<!--              <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="sampleUnit">
               <a-input v-model="model.sampleUnit" placeholder="请输入样品单位"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="样品状态(是否损坏)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sampleStatus">
-              <a-input v-model="model.sampleStatus" placeholder="请输入样品状态(是否损坏)"  ></a-input>
+            <a-form-model-item label="样品状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sampleStatus">
+              <j-search-select-tag v-model="model.sampleStatus" dict="sample_status	"  />
             </a-form-model-item>
           </a-col>