diff --git a/src/api/thrsys/thrHsfl.js b/src/api/thrsys/thrHsfl.js new file mode 100644 index 0000000..55b0acf --- /dev/null +++ b/src/api/thrsys/thrHsfl.js @@ -0,0 +1,9 @@ +import axios from "@/utils/request"; + +export function getHslbs(query) { + return axios({ + url: "/udiwms/thrsys/getHslbs", + method: "get", + params: query + }); +} diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 448d917..658be07 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -367,7 +367,7 @@ .el-form-item { margin-right: 10px; margin-bottom: 1px; - margin-top: -5px; + margin-top: 1px; } diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index a0fe2fd..f7e5fc2 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -319,6 +319,8 @@ export default { checkExpire: true, //校验过期 checkCertExpire: false, //校验证书过期 editType: 2, + inPreInBack: 1, + }, enableMap: { true: "是", @@ -589,6 +591,7 @@ export default { editType: 2, backPreinType: 1, sortNum: 999, + inPreInBack: 1, }; this.addDialogVisible = true; }, diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index d673c66..47d9e42 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -198,14 +198,23 @@ + + + + + + + + + + + - - @@ -307,6 +316,23 @@ + + + 预验收是否带回 + + + + + + + + + + + 预验收是否带回 + + + diff --git a/src/views/basic/product/SelectDIDetailDialog.vue b/src/views/basic/product/SelectDIDetailDialog.vue index 4f0738d..b23941c 100644 --- a/src/views/basic/product/SelectDIDetailDialog.vue +++ b/src/views/basic/product/SelectDIDetailDialog.vue @@ -499,7 +499,7 @@ export default { created() { //获取产品标识列表 let ttquery = { - uuid: this.editQuery.uuid, + originUuid: this.editQuery.uuid, }; this.getDetailList(ttquery); }, diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index 0553ef8..3c25fa3 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -252,12 +252,26 @@ - + filterable + remote + clearable="true" + reserve-keyword + placeholder="请选择物价类别" + :remote-method="findHsflMethod" + style="width: 80%" + > + + {{ item.hsmc }} + {{ item.hsbm }} + + @@ -578,7 +592,8 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit"; import selectErp from "./udiInfoselectErpUdi"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import Treeselect from "@riophae/vue-treeselect"; -import { getListMenu, getOneName } from '@/api/basic/basicHospType' +import {getListMenu, getOneName} from '@/api/basic/basicHospType' +import {getHslbs} from "@/api/thrsys/thrHsfl"; export default { @@ -637,6 +652,8 @@ export default { measname: null, nameCode: null }, + loading: false, + hsflOptions: [], } }, components: { @@ -655,6 +672,9 @@ export default { id: this.relevanceEdit.id } this.getDetailList(ttquery); + if (this.editQuery.basicPrductRemak8 != null) { + this.findHsflMethod(this.editQuery.basicPrductRemak8); + } }, methods: { diableChange() { @@ -849,11 +869,11 @@ export default { } }, getTreeselect() { - getOneName().then(res =>{ - const menu = {id: res.data.id,code:res.data.code, name: res.data.name, children: []}; + getOneName().then(res => { + const menu = {id: res.data.id, code: res.data.code, name: res.data.name, children: []}; getListMenu({}).then(response => { this.fromDeptOptions = []; - menu.children = this.handleTree(response.data,"code", "parentCode"); + menu.children = this.handleTree(response.data, "code", "parentCode"); console.log(menu) this.fromDeptOptions.push(menu); }); @@ -870,6 +890,24 @@ export default { children: node.children }; }, + findHsflMethod(query) { + this.hsflOptions = []; + let cQuery = { + key: query, + page: 1, + limit: 20 + }; + getHslbs(cQuery) + .then((response) => { + this.loading = false; + this.hsflOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); + } + , + } } diff --git a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue index 8b8e597..e0af7e4 100644 --- a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue +++ b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue @@ -73,7 +73,7 @@ diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue index 0397e29..1135c5c 100644 --- a/src/views/supplier/company/basicCompanyproductEdit.vue +++ b/src/views/supplier/company/basicCompanyproductEdit.vue @@ -162,12 +162,26 @@ - + filterable + remote + clearable="true" + reserve-keyword + placeholder="请选择物价类别" + :remote-method="findHsflMethod" + style="width: 80%" + > + + {{ item.hsmc }} + {{ item.hsbm }} + + @@ -231,6 +245,7 @@ import {updateById} from '@/api/basic/udiRelevance' import {filterByUuid} from '@/api/basic/udiInfo' import selectErp from "./udiInfoselectErpUdi"; import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion' +import {getHslbs} from "@/api/thrsys/thrHsfl"; export default { name: 'productEdit', @@ -277,6 +292,7 @@ export default { }, editSingleDiDialogVisible: false, selectErpDialogVisible: false, //选入ERP产品 + hsflOptions: [], } }, @@ -297,7 +313,14 @@ export default { isDateBy: this.editQuery.isDateBy, relSupId: this.editQuery.id, groupBuy: this.editQuery.groupBuy, - uid: this.editQuery.uid, + basicPrductRemak1: this.editQuery.basicPrductRemak1, + basicPrductRemak2: this.editQuery.basicPrductRemak2, + basicPrductRemak3: this.editQuery.basicPrductRemak3, + basicPrductRemak4: this.editQuery.basicPrductRemak4, + basicPrductRemak5: this.editQuery.basicPrductRemak5, + basicPrductRemak6: this.editQuery.basicPrductRemak6, + basicPrductRemak7: this.editQuery.basicPrductRemak7, + basicPrductRemak8: this.editQuery.basicPrductRemak8, } updateById(data).then(res => { @@ -407,6 +430,25 @@ export default { this.selectVersionVisible = false; this.getThirdSysDetail(); }, + + findHsflMethod(query) { + this.hsflOptions = []; + let cQuery = { + key: query, + page: 1, + limit: 20 + }; + getHslbs(cQuery) + .then((response) => { + this.loading = false; + this.hsflOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); + } + , + }, components: { selectErp @@ -419,6 +461,10 @@ export default { limit: 10, }; this.getDetailList(ttquery); + if (this.editQuery.basicPrductRemak8 != null) { + this.findHsflMethod(this.editQuery.basicPrductRemak8); + } + }, } diff --git a/src/views/supplier/products/selectDIDetailDialog.vue b/src/views/supplier/products/selectDIDetailDialog.vue index e9bff6c..9fa57e1 100644 --- a/src/views/supplier/products/selectDIDetailDialog.vue +++ b/src/views/supplier/products/selectDIDetailDialog.vue @@ -1,501 +1,542 @@ @@ -509,6 +550,7 @@ export default { padding-bottom: 17px; padding-top: 17px; } + .itemTag { float: left; text-align: right; diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue index 2d764d1..c4e9c95 100644 --- a/src/views/supplier/products/supAddDiProductSelectUdi.vue +++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue @@ -257,8 +257,27 @@ - + + + {{ item.hsmc }} + {{ item.hsbm }} + + @@ -291,6 +310,7 @@ import selectDiDetail from './selectDIDetailDialog' import store from '@/store' import {getBasicThirdSys} from '@/api/basic/basicThirdSys' import {finProductSet} from '@/api/param/systemParamConfig' +import {getHslbs} from "@/api/thrsys/thrHsfl"; export default { name: 'closeDialog', @@ -371,8 +391,8 @@ export default { thirdSys: [], curSelectDi: null, selectThirdSys: [], - productRemarkSet: {} - + productRemarkSet: {}, + hsflOptions: [], } }, methods: { @@ -594,7 +614,24 @@ export default { //出错了 } }) + }, + findHsflMethod(query) { + this.hsflOptions = []; + let cQuery = { + key: query, + page: 1, + limit: 20 + }; + getHslbs(cQuery) + .then((response) => { + this.loading = false; + this.hsflOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); } + , }, created() { diff --git a/src/views/supplier/products/supDiProductsCheck.vue b/src/views/supplier/products/supDiProductsCheck.vue index 7d75c94..c36e6fa 100644 --- a/src/views/supplier/products/supDiProductsCheck.vue +++ b/src/views/supplier/products/supDiProductsCheck.vue @@ -303,7 +303,7 @@ export default { } if (row.type == 1) { - let query = {uuid: row.uuid} + let query = {devKey: row.deviceRecordKey} getDiProductDetail(query).then((res) => { if (res.code === 20000) { this.thisData = res.data diff --git a/src/views/supplier/products/supProductsAddDi.vue b/src/views/supplier/products/supProductsAddDi.vue index d8fd7e1..0f89b68 100644 --- a/src/views/supplier/products/supProductsAddDi.vue +++ b/src/views/supplier/products/supProductsAddDi.vue @@ -323,7 +323,7 @@ export default { }, detail(row) { if (row.type == 1) { - let query = { uuid: row.uuid }; + let query = {devKey: row.deviceRecordKey} getDiProductDetail(query).then((res) => { if (res.code === 20000) { this.delect = row; diff --git a/src/views/supplier/products/supProductsDetail.vue b/src/views/supplier/products/supProductsDetail.vue index 4f9f94d..e834dcf 100644 --- a/src/views/supplier/products/supProductsDetail.vue +++ b/src/views/supplier/products/supProductsDetail.vue @@ -4,7 +4,7 @@
- + 通过 不通过