diff --git a/src/views/basic/product/basicYbNotCode.vue b/src/views/basic/product/basicYbNotCode.vue
index 4a51f0c4..6fcfb890 100644
--- a/src/views/basic/product/basicYbNotCode.vue
+++ b/src/views/basic/product/basicYbNotCode.vue
@@ -83,7 +83,6 @@
>
-
-
+
-
+
+ 选入
+
-
+
@@ -148,21 +153,90 @@
取消
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选入
+
+
+
+
+
-
+
+
+
@@ -179,7 +253,9 @@ import {
getOrganizationCode
} from '@/api/basic/ybNotCode'
-
+import {
+ getUdiInfos
+} from '@/api/basic/product/udiRelevance'
import { getAdminId, getToken } from '@/utils/auth'
import { executeFuc, getHead } from '@/utils/customConfig'
import Treeselect from '@riophae/vue-treeselect'
@@ -257,7 +333,17 @@ export default {
uploadLoading: false,
action: process.env.VUE_APP_BASE_API + '/udiwms/aliDrug/txtUpload',
fileList: [],
- thrYbData:{}
+ thrYbData:{},
+ productList:[],
+ productMainIds:{},
+ selectProductVisible:false,
+ filterProduct:{
+ productsType: 2,
+ page: 1,
+ limit: 20,
+ addType: 1,
+ },
+ productTotal:0
}
},
methods: {
@@ -420,6 +506,36 @@ export default {
}).catch((error) => {
this.$message.error(error.message)
})
+ },
+ getProductList() {
+ getUdiInfos(this.filterProduct)
+ .then((response) => {
+ this.loading = false
+ this.productList = response.data.list || []
+ this.productTotal = response.data.total || 0
+ })
+ .catch(() => {
+ this.productLoading = false
+ this.productList = []
+ this.productTotal = 0
+ })
+ },
+ closeProductVisible(){
+ this.selectProductVisible = false
+ this.productList = []
+ },
+ handleCurrentChange() {
+ this.getProductList()
+
+ },
+ selectProduct(){
+ this.selectProductVisible = true
+ this.getProductList()
+ },
+ selectOne(row){
+ this.formData.ybbm = row.ybbm
+ this.selectProductVisible = false
+
}
},
filters: {
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index 1b321fc9..40e8c03d 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -22,6 +22,7 @@
{
+ // this.fromInvOptions = response.data || [];
+ // })
+ // .catch(() => {
+ // });
+ // },
+ //获取往来单位候选列表
+ findMethod(query) {
+ this.fromOptions = [];
+ let cQuery = {
+ key: query,
+ corpType: null,
+ page: 1,
+ limit: 20,
+ };
+
+ getBasicUnitMaintains(cQuery)
.then((response) => {
- this.fromInvOptions = response.data || [];
+ this.loading = false;
+ this.fromInvOptions = response.data.list || [];
})
.catch(() => {
+ this.loading = false;
});
},
getResultDetailList() {
@@ -827,7 +850,7 @@ export default {
},
created() {
this.getInvList();
- this.findFromInvList();
+ // this.findFromInvList();
this.getBusType();
this.getList();
},