@@ -979,14 +1220,16 @@
splaceholder="请输入内容"
v-model="editQuery.versionNumber"
>
- 切换版本
+ 切换版本
-
@@ -1012,12 +1255,20 @@
@closePre="closeUdi"
>
-
-
提交
+
+ 提交
- 取消
+ 取消
@@ -1033,12 +1284,20 @@
:editQuery="editSingleFormat"
>
-
-
提交
+
+ 提交
- 取消
+ 取消
@@ -1050,7 +1309,10 @@
width="85%"
v-if="selectUdiDialogVisible"
>
-
+
-
-
@@ -1171,10 +1431,18 @@ import {
updateErpProduct,
uploadSmp,
thirdSysDetail,
- removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi
+ removeRl,
+ sysFilter,
+ spcombie,
+ lockStatus,
+ removeDiRl,
+ disableUdi,
} from "@/api/basic/product/udiRelevance";
-import {selectSysParamByKey, finProductSet} from "@/api/param/systemParamConfig";
-import {filterByUuid} from "@/api/basic/product/udiInfo";
+import {
+ selectSysParamByKey,
+ finProductSet,
+} from "@/api/param/systemParamConfig";
+import { filterByUuid } from "@/api/basic/product/udiInfo";
import selectUdi from "./UdiInfoSelectRel.vue";
import selectErp from "./udiInfoselectErpUdi";
@@ -1182,11 +1450,10 @@ import selectLocalUdi from "./UdiInfoSelectLocalUdi";
import selectUdiVersion from "./UdiinfoSelectVersion";
import ProductEdit from "@/views/basic/product/productEdit";
import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
-import productUdiType from "@/views/basic/product/productUdiType"
+import productUdiType from "@/views/basic/product/productUdiType";
import selectHospProduct from "@/views/basic/product/bindHospProduct";
import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
-import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
-
+import { getBasicHospType, getListTree } from "@/api/basic/basicHospType";
export default {
data() {
@@ -1223,15 +1490,15 @@ export default {
sptm: null,
packUnit: null,
measname: null,
- nameCode: null
+ nameCode: null,
},
groupBuyMap: {
true: "集采",
- false: "非集采"
+ false: "非集采",
},
dispatchMap: {
true: "可配送",
- false: "不可配送"
+ false: "不可配送",
},
pId: 0,
productRemarkSet: {},
@@ -1270,24 +1537,23 @@ export default {
thisData: {
nameCode: null,
cpmctymc: null,
- ggxh: null
+ ggxh: null,
},
multipleSelection: [],
- editDialogVisible: false, //详情
+ editDialogVisible: false, //详情
editDiDialogVisible: false,
editSingleDiDialogVisible: false,
- selectUdiDialogVisible: false, //关联选入
- selectErpDialogVisible: false, //选入ERP产品
+ selectUdiDialogVisible: false, //关联选入
+ selectErpDialogVisible: false, //选入ERP产品
selectVersionVisible: false,
- selectLocalVisible: false, //关联UDI
+ selectLocalVisible: false, //关联UDI
isUseDyCheck: false,
- lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
- activeNames: ['1'],
+ lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" },
+ activeNames: ["1"],
useNumEnable: true,
};
},
filters: {
-
statusFilterType(status) {
const statusMap = {
false: "warning",
@@ -1307,12 +1573,13 @@ export default {
unionCode: null,
udiCode: null,
ylqxzcrbarmc: "",
- cpmctymc: "", thrPiId: null,
+ cpmctymc: "",
+ thrPiId: null,
nameCode: "",
ggxh: null,
page: 1,
limit: 20,
- addType: 1
+ addType: 1,
};
this.getList();
},
@@ -1411,8 +1678,7 @@ export default {
this.$message.error(response.message);
}
})
- .catch(() => {
- });
+ .catch(() => {});
},
deleteDialog(rowId) {
@@ -1424,8 +1690,7 @@ export default {
.then(() => {
this.deleteOrders(rowId);
})
- .catch(() => {
- });
+ .catch(() => {});
},
intentDetail() {
@@ -1447,7 +1712,7 @@ export default {
.then(() => {
let query = {
relId: this.pId,
- thirdSys: row.sysId
+ thirdSys: row.sysId,
};
removeRl(query)
.then((response) => {
@@ -1463,14 +1728,11 @@ export default {
this.$message.error(response.message);
}
})
- .catch(() => {
- });
+ .catch(() => {});
})
- .catch(() => {
- });
+ .catch(() => {});
},
-
removeDi() {
this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
confirmButtonText: "确定",
@@ -1495,11 +1757,9 @@ export default {
this.$message.error(response.message);
}
})
- .catch(() => {
- });
+ .catch(() => {});
})
- .catch(() => {
- });
+ .catch(() => {});
},
intentSelectErp(val) {
@@ -1556,20 +1816,18 @@ export default {
this.selectLocalVisible = true;
},
-
intentImportUdi() {
this.relId = null;
this.thisData = {
nameCode: null,
cpmctymc: null,
ggxh: null,
- ylqxzcrbarmc: null
+ ylqxzcrbarmc: null,
};
this.isImport = false;
this.selectLocalVisible = true;
},
-
handleSelectionChange(val) {
this.multipleSelection = val;
},
@@ -1600,7 +1858,6 @@ export default {
};
this.checked = row.isUseDy == 1;
-
this.editQuery = row;
//获取产品标识列表
let ttquery = {
@@ -1611,13 +1868,12 @@ export default {
this.getThirdSysDetail();
},
-
lockProducts(status) {
let selectData = this.multipleSelection;
let postQuery = {
ids: [],
lockStatus: status,
- }
+ };
selectData.forEach((row) => {
postQuery.ids.push(row.id);
});
@@ -1630,7 +1886,6 @@ export default {
} else {
this.$message.error(response.message);
}
-
})
.catch(() => {
this.loading = false;
@@ -1659,7 +1914,6 @@ export default {
this.loading = false;
this.filterList = [];
});
-
},
singleDiEdit() {
let temp = JSON.parse(JSON.stringify(this.editQuery));
@@ -1696,7 +1950,7 @@ export default {
},
onAddSubmit(relSubmit) {
this.editFormat.relSubmit = relSubmit;
- console.log(this.editFormat)
+ console.log(this.editFormat);
updatetUdiInfos(this.editFormat)
.then((response) => {
if (response.code == 20000) {
@@ -1728,11 +1982,9 @@ export default {
});
},
-
findBasicProductSet() {
finProductSet().then((response) => {
if (response.code == 20000) {
-
this.productRemarkSet = response.data;
} else {
//出错了
@@ -1793,40 +2045,38 @@ export default {
var invlist = response.data || [];
this.treeList = this.handleTree(invlist, "code", "parentCode");
})
- .catch(() => {
- });
+ .catch(() => {});
},
addHospProduct(data) {
- this.rId = data.code
+ this.rId = data.code;
if (data.code != 10000) {
- this.filterQuery.relCode = data.code
+ this.filterQuery.relCode = data.code;
} else {
this.filterQuery.relCode = null;
}
this.selectHospProductVisible = true;
},
removeHospProduct(data) {
- this.rId = data.code
+ this.rId = data.code;
if (data.code != 10000) {
- this.filterQuery.relCode = data.code
+ this.filterQuery.relCode = data.code;
} else {
this.filterQuery.relCode = null;
}
this.selectUnBindHospProductVisible = true;
},
handleNodeClick(data) {
- this.rId = data.code
+ this.rId = data.code;
if (data.code != 10000) {
- this.filterQuery.relCode = data.code
+ this.filterQuery.relCode = data.code;
} else {
this.filterQuery.relCode = null;
}
this.getList();
- }
- },
- mounted() {
+ },
},
+ mounted() {},
components: {
ProductSingleEdit,
ProductEdit,
@@ -1836,7 +2086,7 @@ export default {
selectUdiVersion,
productUdiType,
selectHospProduct,
- selectUnBindHospProduct
+ selectUnBindHospProduct,
},
created() {
this.findBasicProductSet();
@@ -1847,7 +2097,16 @@ export default {
},
};
-
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index 935734e..a10e42e 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -647,7 +647,7 @@ export default {
}
,
created() {
- // this.getList();
+ this.getList();
this.selectSysParam();
this.getSysFilter();
this.findMethod();
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index cd93277..c9d3ab8 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -18,6 +18,12 @@
>立即提交
+
+
未配货提交
+
+
@@ -232,7 +238,7 @@
+
+
+
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index 1c33e53..a0e5fe9 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -88,6 +88,7 @@
:loading="corpLoading"
@change="corpChange"
style="width: 90%"
+ @clear="clear"
>
import {getResultDetailList, getResultOrderList} from '@/api/inout/orderDetailResult'
+import {isBlank} from "@/utils/strUtil";
export default {
name: "supInoutSearchOrder",
@@ -190,7 +191,7 @@ export default {
limit: 10,
startAduditTime: null,
endAduditTime: null,
- actionType: "norDetail",
+ actionType: this.actionType,
};
this.actDateRange = [];
this.getList();
@@ -216,6 +217,9 @@ export default {
getList() {
this.loading = true;
this.filterQuery.actionType = this.actionType;
+ if (isBlank(this.filterQuery.actionType)) {
+ this.filterQuery.actionType = "norDetail";
+ }
getResultOrderList(this.filterQuery)
.then((response) => {
if (response.code === 20000) {
diff --git a/src/views/remind/supCertRemindMsg.vue b/src/views/remind/supCertRemindMsg.vue
index cf48fad..e2d0d60 100644
--- a/src/views/remind/supCertRemindMsg.vue
+++ b/src/views/remind/supCertRemindMsg.vue
@@ -3,9 +3,17 @@
+
+
+
+
+
+
-
-
+
@@ -52,6 +60,7 @@
+
@@ -217,11 +226,13 @@ export default {
type: 1,
page: 1,
limit: 20,
+ certName:null
},
list: [],
total: 0,
loading: true,
index: null,
+ ckeck:null,
statusMap: {
1: "未确认",
2: "已确认"
@@ -342,6 +353,9 @@ export default {
created() {
// 加载表格数据
this.getList();
+ if(this.$store.getters.customerId == 110){
+ this.ckeck=true;
+ }
},
};
diff --git a/src/views/supplier/products/supDiProductsCheck.vue b/src/views/supplier/products/supDiProductsCheck.vue
index 5d337ab..42011ae 100644
--- a/src/views/supplier/products/supDiProductsCheck.vue
+++ b/src/views/supplier/products/supDiProductsCheck.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index 8ff2646..c135110 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -5,8 +5,8 @@
- 保存
+ 保存
@@ -14,6 +14,7 @@
@@ -22,7 +23,7 @@
说明: 修改同步参数时,请关闭数据同步服务
+ >说明: 修改同步参数时,请关闭数据同步服务
@@ -40,7 +41,7 @@
style="width: 50%"
size="small"
v-model="configQuery.syncIp"
- :disabled="configQuery.downstreamEnable"
+ disabled
splaceholder="请输入内容"
>
测试连通
+ >测试连通
@@ -399,9 +401,9 @@
添加扫码单据类型
+ >添加扫码单据类型