From bc44c8e3c9d85691ce3fa73ef1300a6fae46e365 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:07:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/business/inspectionOrder/index.vue | 964 +++++++++++++++++---------------------------------------
1 files changed, 292 insertions(+), 672 deletions(-)
diff --git a/src/views/business/inspectionOrder/index.vue b/src/views/business/inspectionOrder/index.vue
index 01efcc4..206fe23 100644
--- a/src/views/business/inspectionOrder/index.vue
+++ b/src/views/business/inspectionOrder/index.vue
@@ -238,7 +238,7 @@
>
<p style="font-size: 16px; color: #333333" v-if="!isQuash">
濮旀墭缂栧彿<span style="color: #34bd66">{{
- this.insOrderRow.entrustCode
+ this.insOrderRow.outEntrustCode
}}</span
>鐨勪俊鎭槸鍚︽挙閿�
</p>
@@ -258,14 +258,10 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-row v-if="!isQuash">
- <el-button @click="handleClose">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm" :loading="upLoad"
- >纭� 瀹�</el-button
- >
- </el-row>
- <el-row v-else>
- <el-button @click="handleClose">杩� 鍥�</el-button>
+ <el-row>
+ <el-button @click="handleClose">{{
+ isQuash ? "杩� 鍥�" : "鍙� 娑�"
+ }}</el-button>
<el-button type="primary" @click="submitForm" :loading="upLoad"
>纭� 瀹�</el-button
>
@@ -376,9 +372,9 @@
>
<lims-table
highlightCurrentRow
- :heigt="'80vh'"
+ :height="'80vh'"
:tableData="dataLooktableData"
- :column="dataLookcolumn"
+ :column="dataLookColumn"
:tableLoading="dataLookTableLoading"
></lims-table>
</el-dialog>
@@ -390,18 +386,6 @@
width="80%"
>
<div class="table-container" v-if="deleteDialogVisible">
- <!-- <ValueTable
- ref="ValueTableDataDelete"
- :url="
- $api.insOrder.selectNoProducts +
- '?orderId=' +
- orderId +
- '&ids=' +
- this.revocationInsProductIds
- "
- :componentData="componentDataDelete"
- :isColumnWidth="true"
- /> -->
<el-table
height="500px"
ref="revokeTable"
@@ -822,28 +806,39 @@
</template>
<script>
-import limsTable from "@/components/Table/lims-table.vue";
import {
selectInsOrderParameter,
labelPrinting,
exportChecked,
selectSampleAndProductByOrderId,
- hasSendUrgentOrder,
- delCustomById,
- upCustom,
+ selectSampleByOrderId,
+ selectProductsBySampleId,
+ revoke,
+ viewDetails,
+ downReport,
+ selectTemperatureByProductId,
+ selectTemperatureNumberByProductId,
+ revokeReviewTemperatureByProductId,
+ revokeReviewConsistentByProductId,
+ revokeReviewProduct,
+ revokeReviewSample,
+ updateStatus,
+ updateInspected,
+ revocationPassed,
+ revocationCancel,
} from "@/api/business/inspectionOrder";
+import { upPlanUser2 } from "@/api/business/inspectionTask";
import { getDicts } from "@/api/system/dict/data";
import vueQr from "vue-qr";
import getLodop from "@/utils/lodop";
import Add from "./add.vue";
import { mapGetters } from "vuex";
-import LimsTable from "@/components/Table/lims-table.vue";
+import limsTable from "@/components/Table/lims-table.vue";
export default {
components: {
limsTable,
Add,
vueQr,
- LimsTable,
},
computed: {
...mapGetters(["permissions"]),
@@ -998,25 +993,29 @@
width: "120px",
},
{
+ label: "鎿嶄綔",
dataType: "action",
fixed: "right",
- label: "鎿嶄綔",
operation: [
{
name: "鏁版嵁鏌ョ湅",
type: "text",
- clickFun: (row) => {},
disabled: (row) => {
return row.state != 1 && row.state != 4;
},
clickFun: (row) => {
this.handleDataLook(row);
},
+ showHide: () => {
+ return true;
+ },
},
{
name: "鎶ュ憡涓嬭浇",
type: "text",
- clickFun: (row) => {},
+ clickFun: (row) => {
+ this.download(row);
+ },
disabled: (row, index) => {
return row.state != 4 || row.isRatify != 1;
},
@@ -1024,7 +1023,9 @@
{
name: "瀹℃牳",
type: "text",
- clickFun: (row) => {},
+ clickFun: (row) => {
+ this.handleVerify(row);
+ },
disabled: (row, index) => {
return row.state != 0;
},
@@ -1032,7 +1033,9 @@
{
name: "鎾ら攢",
type: "text",
- clickFun: (row) => {},
+ clickFun: (row) => {
+ this.handlEquash(row);
+ },
disabled: (row, index) => {
return row.state != 1 && row.state != 0;
},
@@ -1040,7 +1043,9 @@
{
name: "鎾ら攢瀹℃牳",
type: "text",
- clickFun: (row) => {},
+ clickFun: (row) => {
+ this.handlEquashCheck(row);
+ },
disabled: (row, index) => {
return (
(row.state != 1 && row.state != 0) ||
@@ -1065,8 +1070,7 @@
],
},
],
- dataLookTableLoading: false,
- dataLookcolumn: [
+ dataLookColumn: [
{
label: "濮旀墭缂栧彿",
prop: "entrustCode",
@@ -1082,20 +1086,20 @@
{
label: "绠″鑹叉爣",
prop: "bushColor",
- minWidth: "160px",
- width: "160px",
+ minWidth: "100px",
+ width: "100px",
},
{
label: "鍏夌氦甯︾紪鍙�",
prop: "code",
- minWidth: "160px",
- width: "160px",
+ minWidth: "120px",
+ width: "120px",
},
{
label: "鍏夌氦鑹叉爣",
prop: "color",
- minWidth: "160px",
- width: "160px",
+ minWidth: "100px",
+ width: "100px",
},
{
label: "妫�楠岄」",
@@ -1122,21 +1126,21 @@
width: "100px",
dataType: "tag",
formatData: (params) => {
- let index = this.urgencyDictList.findIndex(
- (item) => item.dictValue == params
+ let index = this.insResultList.findIndex(
+ (item) => item.value == params
);
if (index > -1) {
- return this.urgencyDictList[index].dictLabel;
+ return this.insResultList[index].label;
} else {
return null;
}
},
formatType: (params) => {
- let index = this.urgencyDictList.findIndex(
- (item) => item.dictValue == params
+ let index = this.insResultList.findIndex(
+ (item) => item.value == params
);
if (index > -1) {
- return this.urgencyDictList[index].listClass;
+ return this.insResultList[index].type;
} else {
return null;
}
@@ -1163,8 +1167,8 @@
{
label: "妫�楠屾棩鏈�",
prop: "checkTime",
- minWidth: "120px",
- width: "120px",
+ minWidth: "140px",
+ width: "140px",
},
{
label: "鏍峰搧鍚嶇О",
@@ -1186,16 +1190,16 @@
},
{
dataType: "action",
- fixed: "right",
label: "鎿嶄綔",
+ fixed: "right",
operation: [
{
name: "鏌ョ湅",
type: "text",
- clickFun: (row) => {},
+ clickFun: (row) => {
+ this.viewDetails(row);
+ },
showHide: (row) => {
- console.log(row);
- console.log(row.inspectionItem);
return (
row.inspectionItem == "鍗曟牴鍨傜洿鐕冪儳" ||
row.inspectionItem.includes("鏉惧绠�") ||
@@ -1212,7 +1216,56 @@
],
},
],
+ dataLookTableLoading: false,
dataLooktableData: [],
+ qrData: [],
+ multipleSelection: [],
+ sonLaboratoryList: [],
+ urgencyDictList: [],
+ tableHeight: 0,
+ tabList: [
+ {
+ label: "寰呭鏍�",
+ value: 0,
+ },
+ {
+ label: "寰呮楠�",
+ value: 1,
+ },
+ {
+ label: "宸叉楠�",
+ value: 4,
+ },
+ {
+ label: "閫�鍥�",
+ value: 2,
+ },
+ {
+ label: "鎾ら攢",
+ value: 3,
+ },
+ ],
+ insResultList: [
+ {
+ value: 1,
+ label: "鍚堟牸",
+ type: "success",
+ },
+ {
+ value: 0,
+ label: "涓嶅悎鏍�",
+ type: "danger",
+ },
+ {
+ value: 3,
+ label: "涓嶅垽瀹�",
+ type: "",
+ },
+ ],
+ tabIndex: 0,
+ active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
+ currentId: null,
+ more: false,
//old
tableHeader: [],
@@ -1255,292 +1308,11 @@
// 浜哄憳鍒楄〃
personList: [],
currentTableData: [],
- // componentData: {
- // entity: {
- // entrustCode: null,
- // sample: null,
- // sampleName: null,
- // sampleModel: null,
- // sampleCode: null,
- // outEntrustCode: null,
- // state: 0,
- // name: null,
- // engineering: null,
- // production: null,
- // startAndEndTime: [],
- // // orderBy: {
- // // field: '',
- // // order: ''
- // // }
- // },
- // isIndex: true,
- // showSelect: true,
- // select: true,
- // selectMethod: "selectMethod",
- // do: [
- // {
- // id: "dataLook",
- // font: "鏁版嵁鏌ョ湅",
- // type: "text",
- // method: "handleDataLook",
- // disabFun: (row, index) => {
- // return row.state != 1 && row.state != 4;
- // },
- // },
- // {
- // id: "download",
- // font: "鎶ュ憡涓嬭浇",
- // type: "text",
- // method: "download",
- // disabFun: (row, index) => {
- // return row.state != 4 || row.isRatify != 1;
- // },
- // },
- // {
- // id: "verify",
- // font: "瀹℃牳",
- // type: "text",
- // method: "handleVerify",
- // disabFun: (row, index) => {
- // return row.state != 0;
- // },
- // },
- // {
- // id: "quash",
- // font: "鎾ら攢",
- // type: "text",
- // method: "handlEquash",
- // disabFun: (row, index) => {
- // return row.state != 1 && row.state != 0;
- // },
- // },
- // {
- // id: "quashCheck",
- // font: "鎾ら攢瀹℃牳",
- // type: "text",
- // method: "handlEquashCheck",
- // disabFun: (row, index) => {
- // return (
- // (row.state != 1 && row.state != 0) ||
- // this.tabIndex != 1 ||
- // row.isRevocation != 1
- // );
- // },
- // },
- // {
- // font: "鍒嗛厤",
- // type: "text",
- // method: "handleIssued",
- // disabFun: (row, index) => {
- // return (
- // row.state != 1 ||
- // (row.entrustCode != null &&
- // Number(row.assign) > 0 &&
- // row.inspectId != null)
- // );
- // },
- // },
- // ],
- // linkEvent: {
- // sampleName: {
- // method: "selectAllByOne",
- // },
- // },
- // tagField: {
- // type: {
- // select: [],
- // },
- // createUser: {
- // select: [],
- // },
- // orderType: {
- // select: [],
- // },
- // processing: {
- // select: [
- // {
- // value: 1,
- // label: "瀹為獙瀹ゅ鐞�",
- // },
- // {
- // value: 0,
- // label: "濮旀墭鍗曚綅鍙栧洖",
- // },
- // ],
- // },
- // isLeave: {
- // select: [
- // {
- // value: 1,
- // label: "鐣欐牱",
- // },
- // {
- // value: 0,
- // label: "涓嶇暀鏍�",
- // },
- // ],
- // },
- // send: {
- // select: [
- // {
- // value: 1,
- // label: "鑷彇",
- // },
- // {
- // value: 0,
- // label: "鍏朵粬",
- // },
- // ],
- // },
- // },
- // selectField: {},
- // requiredAdd: [],
- // requiredUp: [],
- // needSort: ["createTime", "sendTime", "type", "appointed"],
- // },
orderId: "",
revocationInsProductIds: "",
- // componentDataDataLook: {
- // isPage: false,
- // entity: {
- // id: 0,
- // orderBy: {
- // field: "sampleCode",
- // order: "asc",
- // },
- // },
- // isIndex: false,
- // showSelect: false,
- // select: false,
- // do: [
- // {
- // id: "",
- // font: "鏌ョ湅",
- // type: "text",
- // method: "viewDetails",
- // showFun: (row, index) => {
- // return (
- // row.inspectionItem == "鍗曟牴鍨傜洿鐕冪儳" ||
- // row.inspectionItem.includes("鏉惧绠�") ||
- // row.inspectionItemSubclass.includes("鏉惧绠�") ||
- // (row.inspectionItem == "鎶楁媺寮哄害" &&
- // (row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍓�" ||
- // row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍚�")) ||
- // (row.inspectionItem == "鏂浼搁暱鐜�" &&
- // (row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍓�" ||
- // row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍚�"))
- // );
- // },
- // },
- // ],
- // tagField: {
- // insState: {
- // select: [],
- // },
- // insResult: {
- // select: [
- // {
- // value: 1,
- // label: "鍚堟牸",
- // type: "success",
- // },
- // {
- // value: 0,
- // label: "涓嶅悎鏍�",
- // type: "danger",
- // },
- // {
- // value: 3,
- // label: "涓嶅垽瀹�",
- // type: "",
- // },
- // ],
- // },
- // },
- // selectField: {},
- // spanConfig: {
- // rows: [
- // // {
- // // name: "entrustCode",
- // // index: 0,
- // // },
- // // {
- // // name: "sampleCode",
- // // index: 1,
- // // },
- // ],
- // },
- // requiredAdd: [],
- // requiredUp: [],
- // },
- // componentDataDelete: {
- // entity: {
- // // orderId: '',
- // // orderBy: {
- // // field: 'sampleCode',
- // // order: 'asc'
- // // }
- // },
- // isPage: false,
- // isIndex: false,
- // showSelect: true,
- // select: true,
- // selectMethod: "selectDelete",
- // do: [],
- // tagField: {
- // insState: {
- // select: [],
- // },
- // insResult: {
- // select: [
- // {
- // value: 1,
- // label: "鍚堟牸",
- // type: "success",
- // },
- // {
- // value: 0,
- // label: "涓嶅悎鏍�",
- // type: "danger",
- // },
- // ],
- // },
- // },
- // selectField: {},
- // spanConfig: {},
- // requiredAdd: [],
- // requiredUp: [],
- // },
deleteDialogVisible: false,
- entityCopy: {},
- upIndex: 0,
upLoad: false,
- tabList: [
- {
- label: "寰呭鏍�",
- value: 0,
- },
- {
- label: "寰呮楠�",
- value: 1,
- },
- {
- label: "宸叉楠�",
- value: 4,
- },
- {
- label: "閫�鍥�",
- value: 2,
- },
- {
- label: "鎾ら攢",
- value: 3,
- },
- ],
- tabIndex: 0,
- active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
- currentId: null,
- more: false,
+
insOrderRow: {},
checkIndexList: [],
checkDataList: [
@@ -1548,12 +1320,6 @@
sampleCode: "",
},
],
- qrData: [],
- multipleSelection: [],
- sonLaboratoryList: [],
- queryCount: 0,
- urgencyDictList: [],
- tableHeight: 0,
};
},
created() {
@@ -1667,24 +1433,25 @@
insSampleId: row.insSampleId,
entrustCode: row.entrustCode,
sampleCode: row.sampleCode,
+ inspectionItemSubclass: row.inspectionItemSubclass,
};
- this.$axios
- .post(this.$api.insOrder.viewDetails, data, {
- headers: {
- "Content-Type": "application/json",
- },
- })
+ viewDetails(data)
.then((res) => {
- this.viewDetailsList = res.data;
- if (res.data[0].tableHeader) {
- this.tableHeader = res.data[0].tableHeader;
- } else {
- this.tableHeader = [
- {
- testValue0: "",
- },
- ];
+ if (res.code === 200) {
+ this.viewDetailsList = res.data;
+ if (res.data[0].tableHeader) {
+ this.tableHeader = res.data[0].tableHeader;
+ } else {
+ this.tableHeader = [
+ {
+ testValue0: "",
+ },
+ ];
+ }
}
+ })
+ .catch((error) => {
+ console.error(error);
});
},
getLabelPrinting(selection) {
@@ -1820,32 +1587,8 @@
this.getLabelPrinting(selection);
this.printDialogVisible = true;
},
- // 閫夋嫨妫�楠屽垎閰嶄汉鍛�
- getAuthorizedPerson() {
- this.$axios.get(this.$api.user.getLaboratoryPersonList).then((res) => {
- // let data = [];
- // res.data.forEach((a) => {
- // data.push({
- // label: a.name,
- // value: a.id,
- // });
- // });
- this.personList = res.data;
- });
- },
refreshTable() {
this.getList();
- },
- getTableData(newData) {
- if (newData && newData.length == 1) {
- const insState = newData[0].state;
- this.tabList.forEach((ele, index) => {
- if (ele.value == insState && this.queryCount == 0) {
- this.handleTab(ele, index);
- this.queryCount = 1;
- }
- });
- }
},
refresh() {
this.queryParams = {
@@ -1890,7 +1633,7 @@
active: 2,
currentId: row.id,
examine: 1,
- isReview: true,
+ isPlan: false,
},
});
},
@@ -1909,33 +1652,7 @@
},
// 涓嬭浇鎶ュ憡
download(row) {
- // let url = row.urlS ? row.urlS : row.url;
- // if (url) {
- // url = url.split(".")[0] + ".pdf";
- // const link = document.createElement("a");
- // link.href = this.javaApi + url;
- // link.target = "_blank";
- // document.body.appendChild(link);
- // link.click();
- // }
-
- // if(row.tempUrlPdf) {
- // const link = document.createElement('a');
- // link.href = this.javaApi + row.tempUrlPdf;
- // link.target = '_blank';
- // document.body.appendChild(link);
- // link.click();
- // }
- this.$axios
- .get(
- this.$api.insReport.downReport + "?id=" + row.reportId + "&type=1",
- {
- headers: {
- "Content-Type": "application/json",
- },
- responseType: "blob",
- }
- )
+ downReport({ id: row.reportId })
.then((res) => {
let fileName = row.tempUrlPdf;
if (fileName.includes("_")) {
@@ -1948,14 +1665,21 @@
link.download = fileName;
document.body.appendChild(link);
link.click();
+ })
+ .catch((error) => {
+ console.error(error);
});
},
// 瀹℃牳
handleVerify(row) {
- // this.verifyDialogVisible = true;
- this.active = 3;
- this.currentId = row.id;
- this.examine = 1;
+ this.$router.push({
+ name: "showDetails",
+ query: {
+ active: 3,
+ currentId: row.id,
+ examine: 1,
+ },
+ });
},
// 鍏ㄩ��
handleSelectionAll(val) {
@@ -2172,108 +1896,108 @@
if (this.deleteTilte == "鎾ら攢") {
// 鏄惁鏄俯搴﹀惊鐜�
if (tree.temperature) {
- this.$axios
- .get(
- this.$api.insOrder.selectTemperatureByProductId +
- "?productId=" +
- tree.id
- )
+ selectTemperatureByProductId({ productId: tree.id })
.then((res) => {
- this.loadRecursion(this.treeTableData, tree.id, res.data);
- resolve(res.data);
- this.recursionTreeTableData(this.revokeData, this.treeTableData);
- treeNode.loading = false;
+ if (res.code === 200) {
+ this.loadRecursion(this.treeTableData, tree.id, res.data);
+ resolve(res.data);
+ this.recursionTreeTableData(
+ this.revokeData,
+ this.treeTableData
+ );
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
}
// 鏄惁鏄楠屾鏁�
else if (tree.temperatureNumber) {
- this.$axios
- .get(
- this.$api.insOrder.selectTemperatureNumberByProductId +
- "?parentId=" +
- tree.parentId +
- "&inspectionItem=" +
- tree.inspectionItemTwo
- )
+ selectTemperatureNumberByProductId({
+ parentId: tree.parentId,
+ inspectionItem: tree.inspectionItemTwo,
+ })
.then((res) => {
- this.loadRecursion(this.treeTableData, tree.id, res.data);
- resolve(res.data);
- this.recursionTreeTableData(this.revokeData, this.treeTableData);
- treeNode.loading = false;
+ if (res.code === 200) {
+ this.loadRecursion(this.treeTableData, tree.id, res.data);
+ resolve(res.data);
+ this.recursionTreeTableData(
+ this.revokeData,
+ this.treeTableData
+ );
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
} else {
- this.$axios
- .get(
- this.$api.insOrder.selectProductsBySampleId +
- "?sampleId=" +
- tree.id +
- "&orderId=" +
- this.orderId
- )
+ selectProductsBySampleId({
+ sampleId: tree.id,
+ orderId: this.orderId,
+ })
.then((res) => {
- this.treeTableData.forEach((m, index) => {
- if (m.sampleId == tree.id) {
- m.children = res.data;
- }
- });
- resolve(res.data);
- this.recursionTreeTableData(this.revokeData, this.treeTableData);
- // // 濡傛灉璇ユ牱鍝佸凡缁忚鍕鹃�� 閭ｄ箞鎵�寰楀埌鐨勬楠岄」涔熻杩涜鍕鹃��
- // let data = this.revokeData.map((item) => item.id);
- // if (data.includes(tree.id)) {
- // this.treeTableData.forEach((m, index) => {
- // if (m.children) {
- // m.children.forEach((n, i) => {
- // if (tree.id == n.sampleId) {
- // this.$refs.revokeTable.toggleRowSelection(n, true);
- // }
- // });
- // }
- // });
- // }
- treeNode.loading = false;
+ if (res.code === 200) {
+ this.treeTableData.forEach((m, index) => {
+ if (m.sampleId == tree.id) {
+ m.children = res.data;
+ }
+ });
+ resolve(res.data);
+ this.recursionTreeTableData(
+ this.revokeData,
+ this.treeTableData
+ );
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
}
} else if (this.deleteTilte == "鎾ら攢瀹℃牳") {
// 鏄惁鏄俯搴﹀惊鐜�
if (tree.temperature) {
- this.$axios
- .get(
- this.$api.insOrder.revokeReviewTemperatureByProductId +
- "?productId=" +
- tree.id
- )
+ revokeReviewTemperatureByProductId({ productId: tree.id })
.then((res) => {
- resolve(res.data);
- treeNode.loading = false;
+ if (res.code === 200) {
+ resolve(res.data);
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
}
// 鏄惁鏄惊鐜鏁�
else if (tree.temperatureNumber) {
- this.$axios
- .get(
- this.$api.insOrder.revokeReviewConsistentByProductId +
- "?parentId=" +
- tree.parentId +
- "&inspectionItem=" +
- tree.inspectionItemTwo
- )
+ revokeReviewConsistentByProductId({
+ parentId: tree.parentId,
+ inspectionItem: tree.inspectionItemTwo,
+ })
.then((res) => {
- resolve(res.data);
- treeNode.loading = false;
+ if (res.code === 200) {
+ resolve(res.data);
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
} else {
- this.$axios
- .get(
- this.$api.insOrder.revokeReviewProduct +
- "?sampleId=" +
- tree.id +
- "&orderId=" +
- this.orderId
- )
+ revokeReviewProduct({
+ sampleId: tree.id,
+ orderId: this.orderId,
+ })
.then((res) => {
- resolve(res.data);
- treeNode.loading = false;
+ if (res.code === 200) {
+ resolve(res.data);
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
}
}
@@ -2284,18 +2008,20 @@
this.quashDialogVisible = true;
this.insOrderRow = row;
} else {
- // this.componentDataDelete.entity.orderId = row.id
this.orderId = row.id;
- this.$axios
- .get(this.$api.insOrder.selectSampleByOrderId + "?orderId=" + row.id)
+ selectSampleByOrderId({
+ orderId: row.id,
+ })
.then((res) => {
- console.log("res", res);
- this.treeTableData = res.data;
- this.treeTableData2 = JSON.parse(JSON.stringify(res.data));
+ if (res.code === 200) {
+ this.treeTableData = res.data;
+ this.treeTableData2 = JSON.parse(JSON.stringify(res.data));
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
this.revocationInsProductIds = "";
- this.componentDataDelete.showSelect = true;
- this.componentDataDelete.select = true;
this.deleteTilte = "鎾ら攢";
this.deleteDialogVisible = true;
}
@@ -2345,25 +2071,13 @@
}
});
productIds = [...new Set(productIds)];
- console.log("data", data);
- console.log("data1", data1);
}
- //
-
- console.log("sampleId", sampleIds);
- console.log("productIds", productIds);
let data = {
orderId: this.orderId,
sampleIds: sampleIds,
productIds: productIds,
};
- this.$axios
- .post(this.$api.insOrder.revoke, data, {
- headers: {
- "Content-Type": "application/json",
- },
- noQs: true,
- })
+ revoke(data)
.then((res) => {
if (res.code === 200) {
this.deleteDialogVisible = false;
@@ -2372,47 +2086,14 @@
this.refreshTable();
this.$message.success("鎾ら攢鎴愬姛");
}
+ })
+ .catch((error) => {
+ console.error(error);
});
- console.log("revokeData", this.revokeData);
- console.log("data", data);
- // let ids = this.deleteList.map((m) => m.id).join(",");
- // this.printLoading = true;
- // this.axios
- // .put(
- // this.$api.insOrder.updateInspected +
- // "?ids=" +
- // ids +
- // "&orderId=" +
- // this.orderId
- // )
- // .then((res) => {
- // if (res.code === 200) {
- // this.printLoading = false;
- // this.deleteDialogVisible = false;
- // this.refreshTable("page");
- // this.$message.success("鏇存柊鎴愬姛");
- // }
- // });
} else {
- // this.axios
- // .post(
- // this.$api.insOrder.checkUpdate +
- // "?orderId=" +
- // this.orderId +
- // "&state=" +
- // 1
- // )
- // .then((res) => {
- // if (res.code === 200) {
- // this.printLoading = false;
- // this.deleteDialogVisible = false;
- // this.refreshTable("page");
- // this.$message.success("鏇存柊鎴愬姛");
- // }
- // });
-
- this.axios
- .get(this.$api.insOrder.revocationPassed + "?orderId=" + this.orderId)
+ revocationPassed({
+ orderId: this.orderId,
+ })
.then((res) => {
if (res.code === 200) {
this.printLoading = false;
@@ -2420,28 +2101,26 @@
this.refreshTable();
this.$message.success("鏇存柊鎴愬姛");
}
+ })
+ .catch((error) => {
+ console.error(error);
});
}
},
handlEquashCheck(row) {
- // // this.componentDataDelete.entity.orderId = row.id
- // this.orderId = row.id;
- // this.revocationInsProductIds = row.revocationInsProductIds;
- // this.componentDataDelete.showSelect = false;
- // this.componentDataDelete.select = false;
- // this.deleteTilte = "鎾ら攢瀹℃牳";
- // this.deleteDialogVisible = true;
-
this.orderId = row.id;
this.revocationInsProductIds = row.revocationInsProductIds;
- this.componentDataDelete.showSelect = false;
- this.componentDataDelete.select = false;
this.deleteTilte = "鎾ら攢瀹℃牳";
- this.$axios
- .get(this.$api.insOrder.revokeReviewSample + "?orderId=" + row.id)
+ revokeReviewSample({
+ orderId: row.id,
+ })
.then((res) => {
- console.log("鎾ら攢瀹℃牳鏍峰搧鏌ヨ", res);
- this.treeTableData = res.data;
+ if (res.code === 200) {
+ this.treeTableData = res.data;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
this.deleteDialogVisible = true;
},
@@ -2450,24 +2129,9 @@
this.deleteDialogVisible = false;
this.revokeData = [];
} else {
- // this.axios
- // .post(
- // this.$api.insOrder.checkUpdate +
- // "?orderId=" +
- // this.orderId +
- // "&state=" +
- // 0
- // )
- // .then((res) => {
- // if (res.code === 200) {
- // this.printLoading = false;
- // this.deleteDialogVisible = false;
- // this.refreshTable("page");
- // this.$message.success("鏇存柊鎴愬姛");
- // }
- // });
- this.axios
- .get(this.$api.insOrder.revocationCancel + "?orderId=" + this.orderId)
+ revocationCancel({
+ orderId: this.orderId,
+ })
.then((res) => {
if (res.code === 200) {
this.printLoading = false;
@@ -2475,26 +2139,32 @@
this.refreshTable();
this.$message.success("鏇存柊鎴愬姛");
}
+ })
+ .catch((error) => {
+ console.error(error);
});
}
},
// 涓嬪彂
handleIssued(row) {
this.issuedDialogVisible = true;
- this.$axios
- .post(this.$api.insOrder.selectOrderManDay, {
- id: row.id,
- })
+ selectOrderManDay({
+ id: row.id,
+ })
.then((res) => {
- this.distributeData.orderId = row.id;
- this.distributeData.sampleId = row.sampleId;
- this.distributeData.appointed = res.data;
- this.distributeData.type = row.type;
- });
- this.$axios
- .post(this.$api.insOrderPlan.upPlanUser2, {
- orderId: row.id,
+ if (res.code === 200) {
+ this.distributeData.orderId = row.id;
+ this.distributeData.sampleId = row.sampleId;
+ this.distributeData.appointed = res.data;
+ this.distributeData.type = row.type;
+ }
})
+ .catch((error) => {
+ console.error(error);
+ });
+ upPlanUser2({
+ orderId: row.id,
+ })
.then((res) => {
if (res.code === 200 && res.data.length > 0) {
this.sonLaboratoryList = [];
@@ -2505,6 +2175,9 @@
});
});
}
+ })
+ .catch((error) => {
+ console.error(error);
});
},
submitForm2() {
@@ -2532,22 +2205,13 @@
return;
}
this.upLoad = true;
- this.$axios
- .post(
- this.$api.insOrder.upInsOrder,
- {
- orderId: this.distributeData.orderId,
- sampleId: this.distributeData.sampleId,
- appointed: this.distributeData.appointed,
- userIdList: [this.distributeData.userId],
- sonLaboratory: this.distributeData.sonLaboratory,
- },
- {
- headers: {
- "Content-Type": "application/json",
- },
- }
- )
+ upInsOrder({
+ orderId: this.distributeData.orderId,
+ sampleId: this.distributeData.sampleId,
+ appointed: this.distributeData.appointed,
+ userIdList: [this.distributeData.userId],
+ sonLaboratory: this.distributeData.sonLaboratory,
+ })
.then((res) => {
if (res.code === 201) {
this.upLoad = false;
@@ -2558,7 +2222,8 @@
this.issuedDialogVisible = false;
this.refreshTable();
})
- .catch((e) => {
+ .catch((error) => {
+ console.error(error);
this.$message.error("淇敼澶辫触");
this.upLoad = false;
});
@@ -2566,10 +2231,9 @@
submitForm() {
this.upLoad = true;
if (this.tabIndex == 1) {
- this.axios
- .put(
- this.$api.insOrder.updateInspected + "?id=" + this.insOrderRow.id
- )
+ updateInspected({
+ id: this.insOrderRow.id,
+ })
.then((res) => {
if (res.code === 200) {
this.upLoad = false;
@@ -2577,10 +2241,14 @@
this.refreshTable();
this.$message.success("鏇存柊鎴愬姛");
}
+ })
+ .catch((error) => {
+ console.error(error);
});
} else {
- this.axios
- .put(this.$api.insOrder.updateStatus + "?id=" + this.insOrderRow.id)
+ updateStatus({
+ id: this.insOrderRow.id,
+ })
.then((res) => {
if (res.code === 200) {
this.upLoad = false;
@@ -2588,17 +2256,11 @@
this.refreshTable();
this.$message.success("鏇存柊鎴愬姛");
}
+ })
+ .catch((error) => {
+ console.error(error);
});
}
- let authorizedPerson =
- this.formData.authorizedPerson.length > 0
- ? this.formData.authorizedPerson.join(",")
- : "";
- delete this.formData.createTime;
- delete this.formData.updateTime;
- delete this.formData.createUser;
- delete this.formData.updateUser;
- this.formData.authorizedPerson = authorizedPerson;
},
// 涓嬪崟
playOrder(num) {
@@ -2609,6 +2271,7 @@
query: {
active: num,
examine: 0,
+ isPlan: false,
},
});
},
@@ -2616,49 +2279,6 @@
this.tabIndex = i;
this.queryParams.state = m.value;
this.getList();
- },
- getUserMenu() {
- this.$axios.get(this.$api.user.getUserMenu).then((res) => {
- let data = [];
- res.data.forEach((a) => {
- data.push({
- label: a.name,
- value: a.id,
- });
- });
- this.componentData.tagField.createUser.select = data;
- });
- },
- getInsStateDicts() {
- this.$axios
- .post(this.$api.enums.selectEnumByCategory, {
- category: "妫�楠屼换鍔＄姸鎬�",
- })
- .then((res) => {
- let data = res.data;
- this.insStateList = data;
- data.forEach((ele) => {
- //0:寰呮楠� 1:妫�楠屼腑 2:宸叉楠� 3:寰呭鏍� 4:澶嶆牳鏈�氳繃 5:澶嶆牳閫氳繃
- if (["2", "5"].includes(ele.value)) {
- ele.type = "success";
- } else if (["1", "3"].includes(ele.value)) {
- ele.type = "warning";
- } else if (["0", "4"].includes(ele.value)) {
- ele.type = "danger";
- }
- });
- this.componentDataDataLook.tagField.insState.select = data;
- this.componentDataDelete.tagField.insState.select = data;
- });
- },
- selectEnumByCategoryForOrderType() {
- this.$axios
- .post(this.$api.enums.selectEnumByCategory, {
- category: "妫�楠岀被鍒�",
- })
- .then((res) => {
- this.componentData.tagField.orderType.select = res.data;
- });
},
changeUser() {
if (this.sonLaboratoryList.length > 0) {
--
Gitblit v1.9.3