Ver Fonte

物料参照中添加物料药品属性展示;
物料子表选择物料带出注册证号

002390 há 2 anos atrás
pai
commit
52c4af7764

+ 8 - 1
src/api/business/purchase/purchase-order.js

@@ -102,9 +102,16 @@ const toNc = (data) => {
 // 付款协议  https://sy.derom.com/apiproxy/service/ssoRegServlet?userCode=000156&busiCenter=001
 const payRequest = (userCode) => {
 
+  
+
   return new Promise(resolve => {
     // 当前 Promise 的状态由传入的 Promise 去决定
-    axios.get(`${process.env.NODE_ENV == "development" ? '/sy-derom' : 'https://sy.derom.com'}/apiproxy/service/ssoRegServlet?userCode=${userCode}&busiCenter=001`)
+    // axios.get(`${process.env.NODE_ENV == "development" ? '/sy-derom' : ''}/apiproxy/service/ssoRegServlet?userCode=${userCode}&busiCenter=001`)
+    let url = process.env.NODE_ENV == "development" ?
+    `/sy-derom/apiproxy/service/ssoRegServlet?userCode=${userCode}&busiCenter=001`
+    : '/pu/order/paymentRequest';
+    
+    axios.get(url)
     .then(res =>{
       if(res.status == 200){
         resolve(res.data)

+ 8 - 0
src/components/popover-select/components/MATERIAL_PARAM.js

@@ -37,4 +37,12 @@ export default [
       return prop.materialMedcine.registrationNo;
     },
   },
+  {
+    key: "isDrug",
+    title: "物料药品属性",
+    type: "ComputedInput",
+    computed: (prop) => {
+      return prop.materialMedcine.isDrug == '0' ? 'Y' : 'N';
+    },
+  },
 ];

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

@@ -452,6 +452,8 @@ export const TabColumns = [
           materialClassifyTwoName:'twoClass',
           materialClassifyThreeName:'threeClass',
           materialClassifyFourName:'fourClass',
+          registration:'registrationNo',
+          isDrug:'isDrug',
         },
         queryParams: () => ({}),
       },
@@ -622,7 +624,8 @@ export const TabColumns = [
         key: "registration",
          title: "注册证号", 
          inputType: "Input", 
-         width: 180 
+         width: 180 ,
+         disabled:true,
         },
 
       { //storageCondition storageConditionName
@@ -753,6 +756,8 @@ export const TabColumns = [
           materialClassifyTwoName:'twoClass',
           materialClassifyThreeName:'threeClass',
           materialClassifyFourName:'fourClass',
+          registration:'registrationNo',
+          isDrug:'isDrug',
         },
         queryParams: () => ({}),
         width: 180

+ 3 - 3
src/views/purchase/purchase-order/add/index.vue

@@ -294,9 +294,9 @@ export default {
         this.handleGetPrice();
       }
 
-      if(type == "MATERIAL_PARAM"){
-        source.isDrug = val.materialMedcine.isDrug  == '0' ? 'Y' : 'N';
-      }
+      // if(type == "MATERIAL_PARAM"){
+      //   source.isDrug = val.materialMedcine.isDrug  == '0' ? 'Y' : 'N';
+      // }
     },
 
     // 子表下拉框改变