From 2b2fa317c30ee2de7a8b6f5fc964532031adea66 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 13:48:54 +0800
Subject: [PATCH] fix: 优化报告功能
---
src/views/system/customer/index.vue | 25
src/views/business/productOrder/components/addOrder.vue | 2966 ++++++++++++++-------------
src/views/business/inspectionReview/index.vue | 101
src/views/business/reportPreparation/index.vue | 259 +
src/views/CNAS/process/method/standardMethod/index.vue | 160 +
src/views/business/productOrder/components/addView.vue | 2795 +++++++++++++------------
src/api/business/insReport.js | 13
7 files changed, 3,355 insertions(+), 2,964 deletions(-)
diff --git a/src/api/business/insReport.js b/src/api/business/insReport.js
index 0c66aaf..c52b317 100644
--- a/src/api/business/insReport.js
+++ b/src/api/business/insReport.js
@@ -27,14 +27,23 @@
}
// 鍗曚唤鎶ュ憡涓嬭浇
-export function downloadReport(id) {
+export function downloadReport(id, reportType) {
return request({
url: '/insReport/download',
method: 'get',
- params: { id },
+ params: { id, reportType },
responseType: 'blob'
})
}
+
+// 閲嶆柊鐢熸垚鎶ュ憡
+export function regenerateReport(id) {
+ return request({
+ url: '/insReport/regenerate',
+ method: 'post',
+ data: { id }
+ })
+}
// 鎶ュ憡閫�鍥炲埌妫�楠屼换鍔�
export function sendBackTask(query) {
return request({
diff --git a/src/views/CNAS/process/method/standardMethod/index.vue b/src/views/CNAS/process/method/standardMethod/index.vue
index 187794b..801222f 100644
--- a/src/views/CNAS/process/method/standardMethod/index.vue
+++ b/src/views/CNAS/process/method/standardMethod/index.vue
@@ -30,13 +30,14 @@
</div>
</div>
<lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
- :height="'calc(100vh - 250px)'" @pagination="pagination"></lims-table>
+ :height="'calc(100vh - 250px)'" @pagination="pagination"></lims-table>
<!-- 鏂板/缂栬緫 -->
<el-dialog :title="title" :visible.sync="addDlog" width="500px">
<el-form :model="addForm" ref="addForm" :rules="addRules" label-position="right" label-width="120px">
<el-form-item label="琛屼笟" prop="industryIds">
- <el-select v-model="addForm.industryIds" multiple filterable clearable collapse-tags placeholder="璇烽�夋嫨琛屼笟" style="width: 100%">
- <el-option v-for="item in industryOptions" :key="item.id" :label="item.laboratoryName" :value="item.id" />
+ <el-select v-model="addForm.industryIds" multiple filterable clearable collapse-tags placeholder="璇烽�夋嫨琛屼笟"
+ style="width: 100%">
+ <el-option v-for="item in industryOptions" :key="item.id" :label="item.laboratoryName" :value="item.id"/>
</el-select>
</el-form-item>
<el-form-item label="鏍囧噯缂栧彿" prop="code">
@@ -59,21 +60,22 @@
</el-form-item>
<el-form-item label="鏄惁浜у搧鏍囧噯" prop="isProduct">
<el-select v-model="addForm.isProduct" size="small" clearable placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option label="鍚�" :value="0"> </el-option>
- <el-option label="鏄�" :value="1"> </el-option>
+ <el-option label="鍚�" :value="0"></el-option>
+ <el-option label="鏄�" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鏄惁鍚敤" prop="isUse">
<el-select v-model="addForm.isUse" size="small" clearable placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option label="鍚�" :value="0"> </el-option>
- <el-option label="鏄�" :value="1"> </el-option>
+ <el-option label="鍚�" :value="0"></el-option>
+ <el-option label="鏄�" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="title === '鏂板'" label="闄勪欢">
<el-upload ref="addUpload" action="#" :auto-upload="false" multiple :file-list="pendingFiles"
- :on-change="pendingFileChange" :on-remove="pendingFileRemove" :before-upload="beforeFileUpload"
- accept=".jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar">
- <el-button size="small" type="primary">閫夋嫨闄勪欢</el-button><div slot="tip" class="el-upload__tip">鏀寔澶氫釜闄勪欢锛屽崟涓笉瓒呰繃10MB</div>
+ :on-change="pendingFileChange" :on-remove="pendingFileRemove" :before-upload="beforeFileUpload"
+ accept=".jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar">
+ <el-button size="small" type="primary">閫夋嫨闄勪欢</el-button>
+ <div slot="tip" class="el-upload__tip">鏀寔澶氫釜闄勪欢锛屽崟涓笉瓒呰繃200MB</div>
</el-upload>
</el-form-item>
</el-form>
@@ -83,18 +85,27 @@
</span>
</el-dialog>
<el-dialog title="鏍囧噯闄勪欢" :visible.sync="attachmentDialog" width="760px">
- <el-upload v-if="currentMethod.id" :action="attachmentAction" :headers="uploadHeader" multiple :show-file-list="false"
- :before-upload="beforeFileUpload" :on-success="attachmentUploadSuccess"
- accept=".jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar">
+ <el-upload v-if="currentMethod.id" :action="attachmentAction" :headers="uploadHeader" multiple
+ :show-file-list="false"
+ :before-upload="beforeFileUpload" :on-success="attachmentUploadSuccess"
+ accept=".jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar">
<el-button size="small" type="primary">涓婁紶闄勪欢</el-button>
</el-upload>
<el-table :data="attachmentList" border size="small" style="margin-top:12px">
- <el-table-column label="鏂囦欢鍚嶇О" prop="fileName" min-width="280" />
- <el-table-column label="涓婁紶鏃堕棿" prop="createTime" width="170" />
- <el-table-column label="鎿嶄綔" width="180"><template slot-scope="scope"><el-button type="text" @click="previewAttachment(scope.row)">棰勮</el-button><el-button type="text" @click="downloadAttachment(scope.row)">涓嬭浇</el-button><el-button type="text" style="color:#f56c6c" @click="removeAttachment(scope.row)">鍒犻櫎</el-button></template></el-table-column>
+ <el-table-column label="鏂囦欢鍚嶇О" prop="fileName" min-width="280"/>
+ <el-table-column label="涓婁紶鏃堕棿" prop="createTime" width="170"/>
+ <el-table-column label="鎿嶄綔" width="180">
+ <template slot-scope="scope">
+ <el-button type="text" @click="previewAttachment(scope.row)">棰勮</el-button>
+ <el-button type="text" @click="downloadAttachment(scope.row)">涓嬭浇</el-button>
+ <el-button type="text" style="color:#f56c6c" @click="removeAttachment(scope.row)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
</el-table>
</el-dialog>
- <el-dialog title="棰勮闄勪欢" :visible.sync="previewDialog" fullscreen><file-preview v-if="previewDialog" :current-file="currentAttachment" :file-url="previewUrl" /></el-dialog>
+ <el-dialog title="棰勮闄勪欢" :visible.sync="previewDialog" fullscreen>
+ <file-preview v-if="previewDialog" :current-file="currentAttachment" :file-url="previewUrl"/>
+ </el-dialog>
</div>
</template>
@@ -107,6 +118,7 @@
addStandardMethod,
upStandardMethod, selectIndustryOptions, selectAttachments, uploadAttachment, deleteAttachment,
} from "@/api/cnas/process/method/standardMethod";
+
export default {
name: 'StandardMethod',
components: {
@@ -120,11 +132,11 @@
queryParams: {},
tableData: [],
column: [
- { label: "琛屼笟", prop: "industryNames", width: "140px" },
- { label: "鏍囧噯缂栧彿", prop: "code", width: "100px" },
- { label: "鏍囧噯鎻忚堪", prop: "name", width: "100px" },
- { label: "澶囨敞", prop: "remark" },
- { label: "璧勮川", prop: "qualificationId" },
+ {label: "琛屼笟", prop: "industryNames", width: "140px"},
+ {label: "鏍囧噯缂栧彿", prop: "code", width: "100px"},
+ {label: "鏍囧噯鎻忚堪", prop: "name", width: "100px"},
+ {label: "澶囨敞", prop: "remark"},
+ {label: "璧勮川", prop: "qualificationId"},
{
label: "鏄惁浜у搧鏍囧噯",
prop: "isProduct",
@@ -163,10 +175,10 @@
}
},
},
- { label: "鍒涘缓浜�", prop: "createUserName" },
- { label: "鍒涘缓鏃堕棿", prop: "createTime" },
- { label: "鏇存柊浜�", prop: "updateUserName" },
- { label: "鏇存柊鏃堕棿", prop: "updateTime" },
+ {label: "鍒涘缓浜�", prop: "createUserName"},
+ {label: "鍒涘缓鏃堕棿", prop: "createTime"},
+ {label: "鏇存柊浜�", prop: "updateUserName"},
+ {label: "鏇存柊鏃堕棿", prop: "updateTime"},
{
dataType: "action",
fixed: "right",
@@ -212,13 +224,13 @@
pendingFiles: [], attachmentDialog: false, attachmentList: [], currentMethod: {},
previewDialog: false, currentAttachment: {}, previewUrl: '',
addRules: {
- code: [{ required: true, message: "璇疯緭鍏ユ爣鍑嗙紪鍙�", trigger: "blur" }],
- name: [{ required: true, message: "璇疯緭鍏ユ爣鍑嗘弿杩�", trigger: "blur" }],
+ code: [{required: true, message: "璇疯緭鍏ユ爣鍑嗙紪鍙�", trigger: "blur"}],
+ name: [{required: true, message: "璇疯緭鍏ユ爣鍑嗘弿杩�", trigger: "blur"}],
isProduct: [
- { required: true, message: "璇烽�夋嫨鏄惁浜у搧鏍囧噯", trigger: "change" },
+ {required: true, message: "璇烽�夋嫨鏄惁浜у搧鏍囧噯", trigger: "change"},
],
isUse: [
- { required: true, message: "璇烽�夋嫨鏄惁鍚敤", trigger: "change" },
+ {required: true, message: "璇烽�夋嫨鏄惁鍚敤", trigger: "change"},
],
},
};
@@ -231,9 +243,9 @@
methods: {
getList() {
this.tableLoading = true;
- let param = { ...this.queryParams, ...this.page };
+ let param = {...this.queryParams, ...this.page};
delete param.total;
- selectStandardMethodList({ ...param })
+ selectStandardMethodList({...param})
.then((res) => {
this.tableLoading = false;
if (res.code === 200) {
@@ -245,7 +257,7 @@
this.tableLoading = false;
});
},
- pagination({ page, limit }) {
+ pagination({page, limit}) {
this.page.current = page;
this.page.size = limit;
this.getList();
@@ -263,7 +275,7 @@
},
openAdd() {
this.title = "鏂板";
- this.addForm = { industryIds: [], isProduct: 1, isUse: 1 };
+ this.addForm = {industryIds: [], isProduct: 1, isUse: 1};
this.pendingFiles = [];
this.addDlog = true;
},
@@ -284,7 +296,11 @@
this.qualificationList = arr;
});
},
- loadIndustryOptions() { selectIndustryOptions().then(res => { this.industryOptions = res.data || []; }); },
+ loadIndustryOptions() {
+ selectIndustryOptions().then(res => {
+ this.industryOptions = res.data || [];
+ });
+ },
submitProduct(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
@@ -301,11 +317,11 @@
return uploadAttachment(formData, id);
}));
}).then(() => {
- this.addLoading = false;
- this.$message.success("鎻愪氦鎴愬姛");
- this.getList();
- this.addDlog = false;
- })
+ this.addLoading = false;
+ this.$message.success("鎻愪氦鎴愬姛");
+ this.getList();
+ this.addDlog = false;
+ })
.catch((err) => {
this.addLoading = false;
});
@@ -329,12 +345,26 @@
}
});
},
- beforeFileUpload(file) { if (file.size > 10 * 1024 * 1024) { this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10MB'); return false; } return true; },
- pendingFileChange(file, files) { this.pendingFiles = files; },
- pendingFileRemove(file, files) { this.pendingFiles = files; },
- openAttachments(row) { this.currentMethod = row; this.attachmentDialog = true; this.loadAttachments(); },
+ beforeFileUpload(file) {
+ if (file.size > 200 * 1024 * 1024) {
+ this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�200MB');
+ return false;
+ }
+ return true;
+ },
+ pendingFileChange(file, files) {
+ this.pendingFiles = files;
+ },
+ pendingFileRemove(file, files) {
+ this.pendingFiles = files;
+ },
+ openAttachments(row) {
+ this.currentMethod = row;
+ this.attachmentDialog = true;
+ this.loadAttachments();
+ },
downloadAttachments(row) {
- selectAttachments({ standardMethodId: row.id }).then(res => {
+ selectAttachments({standardMethodId: row.id}).then(res => {
const attachments = res.data || [];
if (!attachments.length) this.$message.warning('鏆傛棤闄勪欢');
else if (attachments.length === 1) this.downloadAttachment(attachments[0]);
@@ -342,18 +372,35 @@
});
},
previewAttachments(row) {
- selectAttachments({ standardMethodId: row.id }).then(res => {
+ selectAttachments({standardMethodId: row.id}).then(res => {
const attachments = res.data || [];
if (!attachments.length) this.$message.warning('鏆傛棤闄勪欢');
else if (attachments.length === 1) this.previewAttachment(attachments[0]);
else this.openAttachments(row);
});
},
- loadAttachments() { selectAttachments({ standardMethodId: this.currentMethod.id }).then(res => { this.attachmentList = res.data || []; }); },
- attachmentUploadSuccess(res) { if (res.code === 200) { this.$message.success('涓婁紶鎴愬姛'); this.loadAttachments(); } },
- downloadAttachment(row) { this.$download.saveAs(row.fileUrl, row.fileName); },
- previewAttachment(row) { this.currentAttachment = row; this.previewUrl = /\.(jpg|jpeg|png|gif)$/i.test(row.fileUrl) ? this.javaApi + '/img/' + row.fileUrl : this.javaApi + '/word/' + row.fileUrl; this.previewDialog = true; },
- removeAttachment(row) { this.$confirm('鏄惁鍒犻櫎璇ラ檮浠讹紵', '鎻愮ず', { type: 'warning' }).then(() => deleteAttachment({ id: row.id })).then(() => this.loadAttachments()); },
+ loadAttachments() {
+ selectAttachments({standardMethodId: this.currentMethod.id}).then(res => {
+ this.attachmentList = res.data || [];
+ });
+ },
+ attachmentUploadSuccess(res) {
+ if (res.code === 200) {
+ this.$message.success('涓婁紶鎴愬姛');
+ this.loadAttachments();
+ }
+ },
+ downloadAttachment(row) {
+ this.$download.saveAs(row.fileUrl, row.fileName);
+ },
+ previewAttachment(row) {
+ this.currentAttachment = row;
+ this.previewUrl = /\.(jpg|jpeg|png|gif)$/i.test(row.fileUrl) ? this.javaApi + '/img/' + row.fileUrl : this.javaApi + '/word/' + row.fileUrl;
+ this.previewDialog = true;
+ },
+ removeAttachment(row) {
+ this.$confirm('鏄惁鍒犻櫎璇ラ檮浠讹紵', '鎻愮ず', {type: 'warning'}).then(() => deleteAttachment({id: row.id})).then(() => this.loadAttachments());
+ },
// 鍒犻櫎
handleDelete(row) {
this.$confirm("鏄惁鍒犻櫎璇ユ潯鏁版嵁?", "鎻愮ず", {
@@ -362,14 +409,19 @@
type: "warning",
})
.then(() => {
- delStandardMethod({ id: row.id }).then((res) => {
+ delStandardMethod({id: row.id}).then((res) => {
this.$message.success("鍒犻櫎鎴愬姛");
this.getList();
});
})
- .catch(() => { });
+ .catch(() => {
+ });
},
},
- computed: { attachmentAction() { return this.javaApi + '/standardMethod/uploadAttachment?standardMethodId=' + this.currentMethod.id; } },
+ computed: {
+ attachmentAction() {
+ return this.javaApi + '/standardMethod/uploadAttachment?standardMethodId=' + this.currentMethod.id;
+ }
+ },
};
</script>
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index 787b497..a054dbc 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -4,20 +4,20 @@
<el-form :model="entity" ref="entity" size="small" :inline="true">
<el-form-item label="濮旀墭缂栧彿" prop="entrustCode">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.entrustCode"
- @keyup.enter.native="refreshTable()"></el-input>
+ @keyup.enter.native="refreshTable()"></el-input>
</el-form-item>
-<!-- <el-form-item label="涓嬪崟绫诲埆" prop="entrustCode">-->
-<!-- <el-select size="small" v-model="entity.typeSource" clearable style="width: 100%;" @change="refreshTable()">-->
-<!-- <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鐗╂枡灞炴��" prop="materialProp">-->
-<!-- <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">-->
-<!-- <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"-->
-<!-- :value="dict.value">-->
-<!-- </el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
+ <!-- <el-form-item label="涓嬪崟绫诲埆" prop="entrustCode">-->
+ <!-- <el-select size="small" v-model="entity.typeSource" clearable style="width: 100%;" @change="refreshTable()">-->
+ <!-- <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鐗╂枡灞炴��" prop="materialProp">-->
+ <!-- <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">-->
+ <!-- <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"-->
+ <!-- :value="dict.value">-->
+ <!-- </el-option>-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
<el-button size="mini" @click="refresh">閲嶇疆</el-button>
@@ -35,30 +35,30 @@
</div>
<!--鎶ュ憡鏌ョ湅-->
<el-dialog title="鎶ュ憡鏌ョ湅" :visible.sync="issuedVisible" width="80vw" :modal-append-to-body="false"
- :fullscreen="fullscreen">
+ :fullscreen="fullscreen">
<div class="full-screen">
<i class="el-icon-full-screen" style="cursor: pointer;font-size: 18px" @click="fullscreen = true;"
- v-if="!fullscreen"></i>
+ v-if="!fullscreen"></i>
<img src="@/assets/images/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen = false;">
</div>
<div style="height: 80vh;" v-if="issuedVisible">
- <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
+ <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;"/>
</div>
</el-dialog>
<el-dialog title="鏌ョ湅闄勪欢" :visible.sync="lookDialogVisible" width="800px" top="5vh" fullscreen>
<filePreview v-if="lookDialogVisible" :fileUrl="javaApi + '/word/' + currentInfo.tempUrlPdf" :currentFile="{}"
- style="max-height: 90vh;overflow-y: auto;" />
+ style="max-height: 90vh;overflow-y: auto;"/>
</el-dialog>
</div>
</template>
<script>
-import { getYearAndMonthAndDays } from "@/utils/date";
+import {getYearAndMonthAndDays} from "@/utils/date";
import onlyoffice from "@/components/Onlyoffice/onlyoffice.vue";
import limsTable from "@/components/Table/lims-table.vue";
-import { selectInsOrderPlanList, selectUserCondition } from "@/api/business/inspectionTask";
-import { mapGetters } from "vuex";
-import { upReportUrl } from "@/api/business/insReport";
+import {selectInsOrderPlanList, selectUserCondition} from "@/api/business/inspectionTask";
+import {mapGetters} from "vuex";
+import {upReportUrl} from "@/api/business/insReport";
import filePreview from "@/components/Preview/filePreview.vue";
export default {
@@ -68,9 +68,9 @@
onlyoffice,
limsTable,
},
- dicts: ["urgency_level", "inspection_task_state","material_prop_type"],
+ dicts: ["urgency_level", "inspection_task_state", "material_prop_type"],
computed: {
- ...mapGetters(["nickName", "userId"]),
+ ...mapGetters(["nickName", "userId", "roles"]),
},
data() {
return {
@@ -95,7 +95,7 @@
dataType: "link",
linkMethod: "selectAllByOne",
},
- { label: "鏍峰搧鍚嶇О", prop: "sample", width: "160px" },
+ {label: "鏍峰搧鍚嶇О", prop: "sample", width: "160px"},
// {
// label: '鐗╂枡灞炴��',
// prop: 'materialProp',
@@ -119,14 +119,14 @@
formatData: (params) => {
if (params == 0) {
return "澶栬喘涓嬪崟";
- } else if(params==1) {
+ } else if (params == 1) {
return "鍘熸潗鏂欎笅鍗�";
- }else{
+ } else {
return "濮旀墭涓嬪崟";
}
},
},
- { label: "鏍峰搧鍨嬪彿", prop: "sampleModel", width: "120px" },
+ {label: "鏍峰搧鍨嬪彿", prop: "sampleModel", width: "120px"},
// {
// label: "绱ф�ョ▼搴�",
// prop: "type",
@@ -177,12 +177,12 @@
}
},
},
- { label: "妫�楠屼汉", prop: "userName" },
- { label: "澶嶆牳浜�", prop: "checkName" },
- { label: "绾﹀畾鏃堕棿", prop: "appointed" },
- { label: "涓嬪彂鏃堕棿", prop: "sendTime", width: "140px" },
- { label: "妫�楠屽紑濮嬫椂闂�", prop: "insTime", width: "140px" },
- { label: "鐞嗙敱", prop: "verifyTell", width: "140px" },
+ {label: "妫�楠屼汉", prop: "userName"},
+ {label: "澶嶆牳浜�", prop: "checkName"},
+ {label: "绾﹀畾鏃堕棿", prop: "appointed"},
+ {label: "涓嬪彂鏃堕棿", prop: "sendTime", width: "140px"},
+ {label: "妫�楠屽紑濮嬫椂闂�", prop: "insTime", width: "140px"},
+ {label: "鐞嗙敱", prop: "verifyTell", width: "140px"},
{
dataType: "action",
fixed: "right",
@@ -195,6 +195,7 @@
this.handleReview(row);
},
disabled: (row) => {
+ if (this.roles.includes("admin")) return false
return row.checkName == null || (row.checkName && !row.checkName.includes(this.nickName))
}
},
@@ -260,9 +261,9 @@
currentTime: null,
sonLaboratoryList: [],
typeSourceList: [
- { label: '濮旀墭涓嬪崟', value: -1 },
- { label: '澶栬喘涓嬪崟', value: 0 },
- { label: '鍘熸潗鏂欎笅鍗�', value: 1 },
+ {label: '濮旀墭涓嬪崟', value: -1},
+ {label: '澶栬喘涓嬪崟', value: 0},
+ {label: '鍘熸潗鏂欎笅鍗�', value: 1},
],
isCopper: null,
customsInspection: {},
@@ -272,10 +273,10 @@
fullscreen: false,
option: null,
orderTypeList: [
- { label: '濮旀墭璇曢獙', value: 'Customer-ordered test', type: 'success' },
- { label: '鎶芥', value: '鎶芥', type: 'danger' },
- { label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�', type: 'info' },
- { label: '瀛ｅ害妫�楠�', value: 'Quarterly inspection', type: '' },
+ {label: '濮旀墭璇曢獙', value: 'Customer-ordered test', type: 'success'},
+ {label: '鎶芥', value: '鎶芥', type: 'danger'},
+ {label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�', type: 'info'},
+ {label: '瀛ｅ害妫�楠�', value: 'Quarterly inspection', type: ''},
],
urgencyLevel: [],
inspectionTaskState: [],
@@ -300,9 +301,9 @@
methods: {
refreshTable() {
this.tableLoading = true;
- let param = { ...this.entity, ...this.page };
+ let param = {...this.entity, ...this.page};
delete param.total;
- selectInsOrderPlanList({ ...param }).then((res) => {
+ selectInsOrderPlanList({...param}).then((res) => {
this.tableLoading = false;
if (res.code === 200) {
this.tableData = res.data.records;
@@ -312,7 +313,7 @@
this.tableLoading = false;
});
},
- pagination({ page, limit }) {
+ pagination({page, limit}) {
this.page.current = page;
this.page.size = limit;
this.refreshTable();
@@ -321,7 +322,7 @@
this.resetForm('entity')
this.refreshTable()
},
- rowClassName({ row, rowIndex }) {
+ rowClassName({row, rowIndex}) {
if (this.currentTime == row.appointed) {
return "highlight-warning-row-border";
} else if (this.currentTime > row.appointed) {
@@ -383,7 +384,7 @@
},
// 涓嬭浇鎶ュ憡
download(row) {
- let url = (row.urlS===null||row.urlS==='')?row.url:row.urlS
+ let url = (row.urlS === null || row.urlS === '') ? row.url : row.urlS
const link = document.createElement('a');
link.href = this.javaApi + url;
link.target = '_blank';
@@ -397,13 +398,14 @@
cancelButtonText: "鍙栨秷",
type: "warning"
}).then(() => {
- upReportUrl({ id: row.insReportId }).then(res => {
+ upReportUrl({id: row.insReportId}).then(res => {
if (res.code === 200) {
this.$message.success('杩樺師鎴愬姛')
this.refreshTable()
}
})
- }).catch(() => { })
+ }).catch(() => {
+ })
},
// 鏌ョ湅鎶ュ憡
@@ -416,7 +418,7 @@
fileName = row.tempUrlPdf
fileType = "pdf"
}
- fileName = fileName.replace('/word/','')
+ fileName = fileName.replace('/word/', '')
const userName = this.nickName
this.option = {
url: this.javaApi + "/word/" + fileName,
@@ -432,7 +434,7 @@
this.issuedVisible = true;
},
getAuthorizedPerson() {
- selectUserCondition({ type: 1 }).then((res) => {
+ selectUserCondition({type: 1}).then((res) => {
let data = [];
res.data.forEach((a) => {
data.push({
@@ -451,6 +453,7 @@
margin-bottom: 10px;
display: flex;
}
+
.page_total span:last-child {
color: #3a7bfa;
font-size: 23px;
diff --git a/src/views/business/productOrder/components/addOrder.vue b/src/views/business/productOrder/components/addOrder.vue
index 961ff35..f70fb79 100644
--- a/src/views/business/productOrder/components/addOrder.vue
+++ b/src/views/business/productOrder/components/addOrder.vue
@@ -25,62 +25,150 @@
</el-option>
</el-select>
<el-button v-show="active==1" size="small" @click="templateDia=true">淇濆瓨妯℃澘</el-button>
- <el-button v-if="active==1&&addObj.sampleType!=undefined&&(addObj.sampleType.indexOf('鐢电紗')>-1 ||addObj.sampleType.indexOf('缁煎悎')>-1)" size="small" type="primary" plain @click="openCableConfig">鐢电紗閰嶇疆</el-button>
- <el-button v-if="active==1&&addObj.sampleType!=undefined&&addObj.sampleType.indexOf('鐢电紗')>-1" size="small" type="primary" plain @click="openAuxiliaryCore">杈呭姪绾胯姱閰嶇疆</el-button>
- <el-button v-show="active==1||(tabIndex==4&&active==2)" :loading="saveLoad" size="small" type="primary" @click="save">鎻愪氦</el-button>
+ <el-button
+ v-if="active==1&&addObj.sampleType!=undefined&&(addObj.sampleType.indexOf('鐢电紗')>-1 ||addObj.sampleType.indexOf('缁煎悎')>-1)"
+ size="small" type="primary" plain @click="openCableConfig">鐢电紗閰嶇疆
+ </el-button>
+ <el-button v-if="active==1&&addObj.sampleType!=undefined&&addObj.sampleType.indexOf('鐢电紗')>-1" size="small"
+ type="primary" plain @click="openAuxiliaryCore">杈呭姪绾胯姱閰嶇疆
+ </el-button>
+ <el-button v-show="active==1||(tabIndex==4&&active==2)" :loading="saveLoad" size="small" type="primary"
+ @click="save">鎻愪氦
+ </el-button>
<!-- 瀹℃牳 -->
<el-button v-show="active==3" :disabled="saveLoad" :loading="saveLoad" size="small"
- @click="upInsOrderOfState(2)">涓嶉�氳繃</el-button>
+ @click="upInsOrderOfState(2)">涓嶉�氳繃
+ </el-button>
<el-button v-show="active==3" :loading="saveLoad" size="small" type="primary"
- @click="upInsOrderOfState(1)">閫氳繃</el-button>
+ @click="upInsOrderOfState(1)">閫氳繃
+ </el-button>
<el-button size="small" @click="goBack">杩斿洖</el-button>
</div>
</div>
<div v-show="!cableConfigShow&&!auxiliaryShow" class="order-body">
<el-card shadow="never" class="order-card">
- <el-form ref="newJuOrder" class="newju-order-form" :model="addObj" size="small" label-width="108px" label-position="right">
+ <el-form ref="newJuOrder" class="newju-order-form" :model="addObj" size="small" label-width="108px"
+ label-position="right">
<el-row :gutter="16">
- <el-col :span="6"><el-form-item label="妫�娴嬩緷鎹�"><el-input v-model="addObj.sample" disabled size="small"><template slot="append"><el-button :disabled="active>1" icon="el-icon-search" size="small" @click="selectStandardTree = true" /></template></el-input></el-form-item></el-col>
+ <el-col :span="6">
+ <el-form-item label="妫�娴嬩緷鎹�">
+ <el-input v-model="addObj.sample" disabled size="small">
+ <template slot="append">
+ <el-button :disabled="active>1" icon="el-icon-search" size="small"
+ @click="selectStandardTree = true"/>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
<el-col :span="18">
<el-form-item label="鍘熷璁板綍妯℃澘">
<div v-loading="templateBindingLoading" class="template-tag-list">
- <el-tag v-for="(item, index) in boundTemplateList" :key="item.templateId" :closable="active==1" size="small" effect="plain" @close="removeBoundTemplate(index)">{{ item.name }}</el-tag>
+ <el-tag v-for="(item, index) in boundTemplateList" :key="item.templateId" :closable="active==1"
+ size="small" effect="plain" @close="removeBoundTemplate(index)">{{ item.name }}
+ </el-tag>
<span v-if="!templateBindingLoading && boundTemplateList.length === 0" class="empty-template-text">鏆傛湭缁戝畾鍘熷璁板綍妯℃澘</span>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
- <el-col :span="6"><el-form-item label="鏍峰搧鍚嶇О"><el-input v-model="addObj.sampleView" :disabled="active>1" size="small" /></el-form-item></el-col>
- <el-col :span="6"><el-form-item label="鐢熶骇鍗曚綅"><el-input v-model="addObj.production" :disabled="active>1" size="small" /></el-form-item></el-col>
- <el-col :span="6"><el-form-item label="濮旀墭鍗曚綅"><el-input v-model="addObj.company" disabled size="small"><template slot="append"><el-button :disabled="active>1" icon="el-icon-search" size="small" @click="openCompanyList" /></template></el-input></el-form-item></el-col>
- <el-col :span="6"><el-form-item label="妫�楠岀被鍒�"><el-select v-model="addObj.orderType" :disabled="active>1" size="small"><el-option v-for="item in dict.type.check_type1" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item></el-col>
+ <el-col :span="6">
+ <el-form-item label="鏍峰搧鍚嶇О">
+ <el-input v-model="addObj.sampleView" :disabled="active>1" size="small"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇鍗曚綅">
+ <el-input v-model="addObj.production" :disabled="active>1" size="small"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="濮旀墭鍗曚綅">
+ <el-input v-model="addObj.company" disabled size="small">
+ <template slot="append">
+ <el-button :disabled="active>1" icon="el-icon-search" size="small" @click="openCompanyList"/>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="妫�楠岀被鍒�">
+ <el-select v-model="addObj.orderType" :disabled="active>1" size="small">
+ <el-option v-for="item in dict.type.check_type1" :key="item.value" :label="item.label"
+ :value="item.value"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="16">
- <el-col :span="6"><el-form-item label="鏍峰搧鏁伴噺"><el-input v-model="addObj.testQuantity" :disabled="active>1" placeholder="濡傦細2妗躲��500mL" size="small" /></el-form-item></el-col>
- <el-col :span="6"><el-form-item label="鏍峰搧缂栧彿"><el-input v-model="sampleCode" :disabled="active>1" size="small" /></el-form-item></el-col>
- <el-col :span="6"><el-form-item label="鏍峰搧澶栬"><el-input v-model="addObj.sampleStatus" :disabled="active>1" size="small" /></el-form-item></el-col>
- <el-col :span="6"><el-form-item label="閫佹牱浜�"><el-input v-model="addObj.prepareUser" :disabled="active>1" size="small" /></el-form-item></el-col>
+ <el-col :span="6">
+ <el-form-item label="鏍峰搧鏁伴噺">
+ <el-input v-model="addObj.testQuantity" :disabled="active>1" placeholder="濡傦細2妗躲��500mL" size="small"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏍峰搧缂栧彿">
+ <el-input v-model="sampleCode" :disabled="active>1" size="small"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏍峰搧澶栬">
+ <el-input v-model="addObj.sampleStatus" :disabled="active>1" size="small"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閫佹牱浜�">
+ <el-input v-model="addObj.prepareUser" :disabled="active>1" size="small"/>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="16">
- <el-col :span="6"><el-form-item label="鐢熶骇鏃ユ湡"><el-date-picker v-model="addObj.productionDate" type="date" value-format="yyyy-MM-dd" :disabled="active>1" size="small" /></el-form-item></el-col>
- <el-col :span="6"><el-form-item label="鐢熶骇鎵瑰彿"><el-input v-model="addObj.productionBatch" :disabled="active>1" size="small" /></el-form-item></el-col>
- <el-col :span="6"><el-form-item label="閫佹牱鏃ユ湡"><el-date-picker v-model="addObj.sampleDate" type="date" value-format="yyyy-MM-dd" :disabled="active>1" size="small" /></el-form-item></el-col>
- <el-col :span="6"><el-form-item label="鑱旂郴鏂瑰紡"><el-input v-model="addObj.phone" :disabled="active>1" size="small" /></el-form-item></el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇鏃ユ湡">
+ <el-date-picker v-model="addObj.productionDate" type="date" value-format="yyyy-MM-dd"
+ :disabled="active>1" size="small"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇鎵瑰彿">
+ <el-input v-model="addObj.productionBatch" :disabled="active>1" size="small"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閫佹牱鏃ユ湡">
+ <el-date-picker v-model="addObj.sampleDate" type="date" value-format="yyyy-MM-dd" :disabled="active>1"
+ size="small"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴鏂瑰紡">
+ <el-input v-model="addObj.phone" :disabled="active>1" size="small"/>
+ </el-form-item>
+ </el-col>
</el-row>
- <el-row :gutter="16"><el-col :span="12"><el-form-item label="澶囨敞"><el-input v-model="addObj.remark" :disabled="active>1" size="small" /></el-form-item></el-col></el-row>
+ <el-row :gutter="16">
+ <el-col :span="12">
+ <el-form-item label="澶囨敞">
+ <el-input v-model="addObj.remark" :disabled="active>1" size="small"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
- <el-form v-if="false" ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px" label-position="right">
+ <el-form v-if="false" ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px"
+ label-position="right">
<el-row>
<el-col :span="6">
<el-form-item label="濮旀墭缂栧彿:" prop="entrustCode">
- <el-input v-model="addObj.entrustCode" clearable disabled placeholder="绯荤粺鐢熸垚" size="small"></el-input>
+ <el-input v-model="addObj.entrustCode" clearable disabled placeholder="绯荤粺鐢熸垚"
+ size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="妫�楠岀被鍒�:" prop="orderType">
- <el-select v-model="addObj.orderType" :disabled="active>1&&tabIndex!=4" clearable size="small" style="width: 100%;">
- <el-option v-for="(a, ai) in dict.type.check_type1" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <el-select v-model="addObj.orderType" :disabled="active>1&&tabIndex!=4" clearable size="small"
+ style="width: 100%;">
+ <el-option v-for="(a, ai) in dict.type.check_type1" :key="ai" :label="a.label"
+ :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -91,7 +179,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="濮旀墭鍗曚綅:" prop="company">
- <el-input v-model="addObj.company" disabled placeholder="閫夋嫨濮旀墭鍗曚綅" size="small" style="width: 208px">
+ <el-input v-model="addObj.company" disabled placeholder="閫夋嫨濮旀墭鍗曚綅" size="small"
+ style="width: 208px">
<template slot="append">
<el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
@click="openCompanyList"></el-button>
@@ -103,21 +192,25 @@
<el-row>
<el-col :span="6">
<el-form-item label="鑱旂郴鏂瑰紡:" prop="phone">
- <el-input v-model="addObj.phone" :disabled="active>1&&tabIndex!=4" clearable placeholder="閫夋嫨濮旀墭瀹㈡埛" size="small"></el-input>
+ <el-input v-model="addObj.phone" :disabled="active>1&&tabIndex!=4" clearable placeholder="閫夋嫨濮旀墭瀹㈡埛"
+ size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="绱ф�ョ▼搴�:" prop="type">
<el-select v-model="addObj.type" :disabled="active>1&&tabIndex!=4" clearable size="small">
- <el-option v-for="(a, ai) in dict.type.urgency_level" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <el-option v-for="(a, ai) in dict.type.urgency_level" :key="ai" :label="a.label"
+ :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鏍峰搧鍚嶇О:" prop="sample">
<el-input v-model="addObj.sample" disabled size="small" style="width: 208px">
- <template slot="append"><el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
- @click="selectStandardTree = true"></el-button></template>
+ <template slot="append">
+ <el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
+ @click="selectStandardTree = true"></el-button>
+ </template>
</el-input>
</el-form-item>
</el-col>
@@ -132,19 +225,22 @@
<el-col :span="6">
<el-form-item label="鏍峰搧鐘舵��:" prop="sampleStatus">
<el-select v-model="addObj.sampleStatus" :disabled="active>1&&tabIndex!=4" size="small">
- <el-option v-for="(a,ai) in dict.type.sample_status_list" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <el-option v-for="(a,ai) in dict.type.sample_status_list" :key="ai" :label="a.label"
+ :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎶芥鏁伴噺:" prop="testQuantity">
- <el-input v-model="addObj.testQuantity" :disabled="active>1&&tabIndex!=4" clearable size="small"></el-input>
+ <el-input v-model="addObj.testQuantity" :disabled="active>1&&tabIndex!=4" clearable
+ size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鏉ユ牱鏂瑰紡:" prop="formType">
<el-select v-model="addObj.formType" :disabled="active>1&&tabIndex!=4" size="small" clearable>
- <el-option v-for="(a,ai) in dict.type.form_type" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <el-option v-for="(a,ai) in dict.type.form_type" :key="ai" :label="a.label"
+ :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -160,7 +256,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="鏍峰搧澶勭悊鏂瑰紡:" prop="processing">
- <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini" style="display: flex; flex-direction: column;">
+ <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini"
+ style="display: flex; flex-direction: column;">
<el-radio :label="0" border style="margin-right: 0">濮旀墭鍗曚綅鍙栧洖</el-radio>
<el-radio :label="1" border>瀹為獙瀹ゅ鐞�</el-radio>
</el-radio-group>
@@ -190,23 +287,27 @@
<el-row>
<el-col :span="6">
<el-form-item label="濮旀墭浜�:" prop="prepareUser">
- <el-input v-model="addObj.prepareUser" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
+ <el-input v-model="addObj.prepareUser" :disabled="active>1&&tabIndex!=4"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="濮旀墭浜鸿嫳鏂�:" prop="prepareUserEn">
- <el-input v-model="addObj.prepareUserEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
+ <el-input v-model="addObj.prepareUserEn" :disabled="active>1&&tabIndex!=4"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="澶囨敞:" prop="remark">
- <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}"
+ :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small" style="width: 100%" type="textarea"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="澶囨敞鑻辨枃:" prop="remarkEn">
- <el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ <el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}"
+ :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small" type="textarea"></el-input>
</el-form-item>
</el-col>
@@ -214,19 +315,22 @@
<el-row>
<el-col :span="6">
<el-form-item label="鏍峰搧鍚嶇О:" prop="sampleView">
- <el-input v-model="addObj.sampleView" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ <el-input v-model="addObj.sampleView" :disabled="active>1&&tabIndex!=4"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鏍峰搧鍚嶇О鑻辨枃:" prop="sampleViewEn">
- <el-input v-model="addObj.sampleViewEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ <el-input v-model="addObj.sampleViewEn" :disabled="active>1&&tabIndex!=4"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="濮旀墭浜哄伐鍙�:" prop="prepareCode">
- <el-input v-model="addObj.prepareCode" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ <el-input v-model="addObj.prepareCode" :disabled="active>1&&tabIndex!=4"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
</el-col>
@@ -260,12 +364,13 @@
<span style="width: 150px;font-size: 14px;text-align: right;">鐗规畩鏍囧噯锛�</span>
<el-input v-model="specialStandardMethod" :disabled="!isSpecial" clearable size="small"></el-input>
<el-button v-show="active==1" size="small" style="margin-left: 10px"
- type="primary" @click="editSpecial">缂栬緫</el-button>
+ type="primary" @click="editSpecial">缂栬緫
+ </el-button>
</div>
</div>
<el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
- max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
+ max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
<el-table-column v-if="active==1" :selectable="selectable" type="selection" width="60"></el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
<el-table-column align="center" label="鏍峰搧鍚嶇О" min-width="100" prop="sample">
@@ -276,13 +381,13 @@
<el-table-column align="center" label="鏍峰搧缂栧彿" min-width="100" prop="sampleCode">
<template slot-scope="scope">
<el-input v-model="scope.row.sampleCode" :disabled="active>1" clearable placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"
- size="small"></el-input>
+ size="small"></el-input>
</template>
</el-table-column>
<el-table-column align="center" label="鏍峰搧鍨嬪彿" min-width="60" prop="model">
<template slot-scope="scope">
<el-select v-model="scope.row.model" :disabled="active>1" allow-create default-first-option filterable
- placeholder="鏍峰搧鍨嬪彿" size="small" style="width: 100%;" @change="handleChangeModel">
+ placeholder="鏍峰搧鍨嬪彿" size="small" style="width: 100%;" @change="handleChangeModel">
<el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -297,7 +402,7 @@
<el-table-column v-if="!(active>1)" align="center" label="鍨嬪彿鍙傛暟" prop="modelNum" width="110">
<template slot-scope="scope">
<el-input v-model="scope.row.modelNum" clearable placeholder="闈炲繀濉�" size="small"
- @input="methodChange(scope.row.standardMethodListId, scope.row, 'splice')"></el-input>
+ @input="methodChange(scope.row.standardMethodListId, scope.row, 'splice')"></el-input>
</template>
</el-table-column>
<el-table-column v-if="!(active>1)" align="center" label="鏈�缁堟牱鍝佸瀷鍙�" prop="endModels" width="160">
@@ -308,8 +413,9 @@
<el-table-column align="center" label="妫�楠屾爣鍑�" min-width="100" prop="standardMethodListId">
<template slot-scope="scope">
<el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null||active>1"
- :loading="methodLoad" :readonly="active>1" clearable placeholder="妫�楠屾爣鍑�"
- size="small" style="width: 100%;" @change="(value)=>methodChange(value, scope.row)" @clear="productList = []" @focus="methodFocus">
+ :loading="methodLoad" :readonly="active>1" clearable placeholder="妫�楠屾爣鍑�"
+ size="small" style="width: 100%;" @change="(value)=>methodChange(value, scope.row)"
+ @clear="productList = []" @focus="methodFocus">
<el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
@@ -339,25 +445,27 @@
<el-table ref="productTable" v-loading="getProductLoad" :data="productList"
:row-class-name="tableRowClassName" border class="el-table"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
- max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
- @select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
- <el-table-column v-if="canSelectProduct" :selectable="selectable0" type="selection" width="65"></el-table-column>
- <el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column>
+ max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
+ @select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
+ <el-table-column v-if="canSelectProduct" :selectable="selectable0" type="selection"
+ width="65"></el-table-column>
+ <el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass"
+ show-overflow-tooltip></el-table-column>
<el-table-column label="妫�楠岄」" min-width="140" prop="inspectionItem" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>妫�楠岄」</span>
<el-input
v-if="canSelectProduct"
- v-model="inspectionItem"
- placeholder="璇疯緭鍏�"
- size="mini"
- @input="searchFilterList"/>
+ v-model="inspectionItem"
+ placeholder="璇疯緭鍏�"
+ size="mini"
+ @input="searchFilterList"/>
</div>
</template>
</el-table-column>
<el-table-column label="妫�楠岄」瀛愰」" min-width="140" prop="inspectionItemSubclass"
- show-overflow-tooltip>
+ show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>妫�楠岄」瀛愰」</span>
@@ -372,31 +480,35 @@
</el-table-column>
<el-table-column label="瑕佹眰鍊�" min-width="220px" prop="ask">
<template slot-scope="scope">
- <el-input v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)&&scope.row.inspectionValueType!='5'" v-model="scope.row.ask" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鍊�"
- size="small" type="textarea"
- @change="e=>requestChange(e,scope.row,'ask')"></el-input>
+ <el-input
+ v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)&&scope.row.inspectionValueType!='5'"
+ v-model="scope.row.ask" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鍊�"
+ size="small" type="textarea"
+ @change="e=>requestChange(e,scope.row,'ask')"></el-input>
<span v-else>
- <template >{{ scope.row.ask }}</template>
+ <template>{{ scope.row.ask }}</template>
</span>
</template>
</el-table-column>
<el-table-column label="瑕佹眰鎻忚堪" min-width="220px" prop="tell">
<template slot-scope="scope">
- <el-input v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)" v-model="scope.row.tell" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鎻忚堪"
- size="small" type="textarea"
- @change="e=>requestChange(e,scope.row,'tell')"></el-input>
+ <el-input v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)" v-model="scope.row.tell"
+ :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鎻忚堪"
+ size="small" type="textarea"
+ @change="e=>requestChange(e,scope.row,'tell')"></el-input>
<span v-else>
- <template >{{ scope.row.tell }}</template>
+ <template>{{ scope.row.tell }}</template>
</span>
</template>
</el-table-column>
<el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
<template slot-scope="scope">
- <el-input v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)" v-model="scope.row.radius" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="鏉′欢"
+ <el-input v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)" v-model="scope.row.radius"
+ :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="鏉′欢"
size="small" type="textarea"
@change="e=>requestChange(e,scope.row,'radius')">
</el-input>
- <span v-else>{{scope.row.radius}}</span>
+ <span v-else>{{ scope.row.radius }}</span>
</template>
</el-table-column>
<el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip>
@@ -415,12 +527,17 @@
<el-table-column label="璁￠噺鍗曚綅" prop="unit" show-overflow-tooltip width="100"></el-table-column>
<el-table-column label="鍗曚环" prop="price" show-overflow-tooltip width="100"></el-table-column>
<el-table-column label="鍖洪棿" min-width="120" prop="section" show-overflow-tooltip></el-table-column>
- <el-table-column :filter-method="filterHandler" :filters="filters" label="瀛愬疄楠屽" min-width="130" prop="sonLaboratory"
- show-overflow-tooltip></el-table-column>
- <el-table-column v-if="isSpecial&&active==1" label="鎿嶄綔" width="100">
+ <el-table-column :filter-method="filterHandler" :filters="filters" label="瀛愬疄楠屽" min-width="130"
+ prop="sonLaboratory"
+ show-overflow-tooltip></el-table-column>
+ <el-table-column v-if="isSpecial&&active==1" label="鎿嶄綔" width="100">
<template slot-scope="scope">
- <el-button v-if="!scope.row.repetitionTag" size="small" type="text" @click="addProductList(productList,scope.row,scope.$index)">鎻掑叆琛�</el-button>
- <el-button v-if="!!scope.row.repetitionTag&&scope.row.delete" size="small" type="text" @click="deleteProductList(scope.$index,productList)">鍒犻櫎</el-button>
+ <el-button v-if="!scope.row.repetitionTag" size="small" type="text"
+ @click="addProductList(productList,scope.row,scope.$index)">鎻掑叆琛�
+ </el-button>
+ <el-button v-if="!!scope.row.repetitionTag&&scope.row.delete" size="small" type="text"
+ @click="deleteProductList(scope.$index,productList)">鍒犻櫎
+ </el-button>
</template>
</el-table-column>
</el-table>
@@ -428,6 +545,16 @@
</div>
<el-dialog :visible.sync="selectUserDia" title="閫夋嫨鍗曚綅" width="70%">
<div v-if="selectUserDia" class="body">
+ <el-form :inline="true" size="small" @submit.native.prevent>
+ <el-form-item label="濮旀墭鍗曚綅">
+ <el-input v-model="companyQuery" clearable placeholder="璇疯緭鍏ュ鎵樺崟浣�"
+ @keyup.enter.native="searchCompany"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="searchCompany">鏌ヨ</el-button>
+ <el-button @click="resetCompanySearch">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
<lims-table :tableData="tableData1" :column="column1"
:isSelection="true" :handleSelectionChange="selectMethod"
@pagination="pagination1" height="400px" key="tableData1"
@@ -439,22 +566,25 @@
</span>
</el-dialog>
<el-dialog :visible.sync="selectStandardTree" title="閫夋嫨鏍峰搧" width="500px">
- <div v-if="selectStandardTree" v-loading="selectStandardTreeLoading" class="body" style="height: 60vh;overflow-y: auto;user-select: none;">
+ <div v-if="selectStandardTree" v-loading="selectStandardTreeLoading" class="body"
+ style="height: 60vh;overflow-y: auto;user-select: none;">
<el-row>
<el-col :span="24">
<el-input v-model="search" clearable placeholder="杈撳叆鍏抽敭瀛楄繘琛屾悳绱�" size="small"
- style="margin-bottom: 5px;" suffix-icon="el-icon-search" @blur="searchFilter" @clear="searchFilter"
- @keyup.enter.native="searchFilter"></el-input>
+ style="margin-bottom: 5px;" suffix-icon="el-icon-search" @blur="searchFilter"
+ @clear="searchFilter"
+ @keyup.enter.native="searchFilter"></el-input>
</el-col>
</el-row>
<el-tree ref="tree" :data="list" :default-expanded-keys="expandedKeys" :filter-node-method="filterNode"
- :props="{ children: 'children', label: 'label' }" highlight-current node-key="label" @node-click="handleNodeClick"
- @node-expand="nodeOpen" @node-collapse="nodeClose" @dblclick.native="activeStandardTree">
+ :props="{ children: 'children', label: 'label' }" highlight-current node-key="label"
+ @node-click="handleNodeClick"
+ @node-expand="nodeOpen" @node-collapse="nodeClose" @dblclick.native="activeStandardTree">
<div slot-scope="{ node, data }" class="custom-tree-node">
<el-row>
<el-col :span="24">
<span><i
- :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
+ :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
{{ data.label }}</span>
</el-col>
</el-row>
@@ -478,21 +608,23 @@
<el-button :loading="templateLoading" type="primary" @click="addTemplateDia">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" :visible.sync="issuedDialogVisible" title="妫�楠屼笅鍙�" width="400px">
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"
+ :visible.sync="issuedDialogVisible" title="妫�楠屼笅鍙�" width="400px">
<div class="body" style="max-height: 60vh;">
<el-row>
<el-col :span="22" class="search_thing">
<div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div>
<div class="search_input">
<el-date-picker v-model="distributeData.appointed" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" size="small"
- style="width: 100%;" type="date" value-format="yyyy-MM-dd">
+ style="width: 100%;" type="date" value-format="yyyy-MM-dd">
</el-date-picker>
</div>
</el-col>
<el-col :span="22" class="search_thing">
<div class="search_label"><span class="required-span">* </span>鎸囨淳浜哄憳锛�</div>
<div class="search_input">
- <el-select v-model="distributeData.userId" filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%;" @change="changeUser">
+ <el-select v-model="distributeData.userId" filterable placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%;" @change="changeUser">
<el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -501,8 +633,10 @@
<el-col v-if="distributeData.userId" :span="22" class="search_thing">
<div class="search_label">璇曢獙瀹わ細</div>
<div class="search_input">
- <el-select v-model="distributeData.sonLaboratory" filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
- <el-option v-for="item in newJuLaboratoryList" :key="item.value" :label="item.label" :value="item.value">
+ <el-select v-model="distributeData.sonLaboratory" filterable placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%;">
+ <el-option v-for="item in newJuLaboratoryList" :key="item.value" :label="item.label"
+ :value="item.value">
</el-option>
</el-select>
</div>
@@ -535,22 +669,26 @@
</span>
</el-dialog>
<!--鐢电紗閰嶇疆-->
- <cableConfig v-if="cableConfigShow" ref="cableConfigShow" :active="active" :isSpecial="isSpecial" :sampleSelectionList="sampleSelectionList" @goBackAdd="goBackAdd"/>
+ <cableConfig v-if="cableConfigShow" ref="cableConfigShow" :active="active" :isSpecial="isSpecial"
+ :sampleSelectionList="sampleSelectionList" @goBackAdd="goBackAdd"/>
<!--杈呭姪绾胯姱閰嶇疆-->
- <auxiliary-wire-core v-if="auxiliaryShow" :active="active" :isSpecial="isSpecial" :sampleSelectionList="sampleSelectionList" @goBackAdd2="goBackAdd2"></auxiliary-wire-core>
+ <auxiliary-wire-core v-if="auxiliaryShow" :active="active" :isSpecial="isSpecial"
+ :sampleSelectionList="sampleSelectionList" @goBackAdd2="goBackAdd2"></auxiliary-wire-core>
<!--鐗规畩鍊煎鐞嗘-->
- <el-dialog :before-close="beforeClose" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"
+ <el-dialog :before-close="beforeClose" :close-on-click-modal="false" :close-on-press-escape="false"
+ :show-close="false"
:visible.sync="bsm1DiaAll"
min-width="400px"
title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨">
<div v-for="(item, index) in bsm1DiaList" :key="item.id" class="body" style="max-height: 60vh;">
- <span>{{item.inspectionItem}}</span>
+ <span>{{ item.inspectionItem }}</span>
<el-row v-if="item.bsm1">
<el-col :span="24" class="search_thing" style="height: initial;margin: 5px 0;">
<div class="search_label" style="width: 80px;"><span class="required-span">* </span>閫夐」锛�</div>
<div class="search_input">
<el-radio-group v-model="item.bsm1Val" v-removeAriaHidden @input="upBsmAll(item)">
- <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
+ <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai" :label="a"
+ style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
</el-radio-group>
</div>
</el-col>
@@ -559,7 +697,8 @@
<div class="search_input">
<el-radio-group v-model="item.bsm1Val" v-removeAriaHidden @input="upBsmAll(item)">
<el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai"
- :label="a">{{JSON.parse(item.bsmRow.askCopy)[ai]}}</el-radio>
+ :label="a">{{ JSON.parse(item.bsmRow.askCopy)[ai] }}
+ </el-radio>
</el-radio-group>
</div>
</el-col>
@@ -576,10 +715,10 @@
:show-close="false" :visible.sync="bsm3Dia"
title="鍖洪棿鍊煎～鍐�" width="800px">
<el-table
- :data="editTable"
- height="80vh" style="width: 100%">
- <!-- inspectionItemList -->
- <el-table-column
+ :data="editTable"
+ height="80vh" style="width: 100%">
+ <!-- inspectionItemList -->
+ <el-table-column
label="妫�楠岄」"
prop="inspectionItemList"
width="180">
@@ -602,7 +741,8 @@
label="璇嗗埆绗﹀��"
prop="value">
<template slot-scope="scope">
- <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" size="small" @input="inputValueHandler(scope.row,scope.$index)"></el-input>
+ <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" size="small"
+ @input="inputValueHandler(scope.row,scope.$index)"></el-input>
</template>
</el-table-column>
</el-table>
@@ -638,7 +778,7 @@
import limsTable from "@/components/Table/lims-table.vue";
import {selectCustomPageList} from "@/api/system/customer";
import {mapGetters} from "vuex";
-import { bigEval } from "@/utils/bigEval";
+import {bigEval} from "@/utils/bigEval";
import {addQuarter, updateQuarterOnOrder} from "@/api/business/finishedProductSampling";
import {
isLeafPath,
@@ -653,7 +793,7 @@
cableConfig,
AuxiliaryWireCore
},
- computed:{
+ computed: {
...mapGetters(["nickName", 'nameEn', 'userName']),
canSelectProduct() {
return this.active == 1 || (this.tabIndex == 4 && this.active == 2)
@@ -675,7 +815,7 @@
boundTemplateList: [],
templateBindingLoading: false,
sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
- editTable:[],
+ editTable: [],
template: null,
templates: [],
addObj: {
@@ -707,8 +847,8 @@
production: null,
productionEn: null,
companyId: null,
- prepareUser:null, // 濮旀墭浜�
- prepareUserEn:null, // 濮旀墭浜鸿嫳鏂�
+ prepareUser: null, // 濮旀墭浜�
+ prepareUserEn: null, // 濮旀墭浜鸿嫳鏂�
prepareCode: '', // 濮旀墭浜哄伐鍙�
quarterItemId: '',
sampleView: '', // 鏍峰搧鍚嶇О锛堟姤鍛婂睍绀哄瓧娈碉級
@@ -716,31 +856,31 @@
},
addObjRules: { // 琛ㄥ崟鏍￠獙瑙勫垯
orderType: [
- { required: true, message: '璇烽�夋嫨妫�楠岀被鍒�', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨妫�楠岀被鍒�', trigger: 'change'}
],
company: [
- { required: true, message: '璇烽�夋嫨濮旀墭鍗曚綅', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨濮旀墭鍗曚綅', trigger: 'change'}
],
phone: [
- { required: true, message: '璇峰～鍐欒仈绯绘柟寮�', trigger: 'blur' }
+ {required: true, message: '璇峰～鍐欒仈绯绘柟寮�', trigger: 'blur'}
],
type: [
- { required: true, message: '璇烽�夋嫨绱ф�ョ▼搴�', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨绱ф�ョ▼搴�', trigger: 'change'}
],
sample: [
- { required: true, message: '璇烽�夋嫨妫�娴嬩緷鎹�', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨妫�娴嬩緷鎹�', trigger: 'change'}
],
sampleNum: [
- { required: true, message: '璇峰～鍐欐牱鍝佹暟閲�', trigger: 'blur' }
+ {required: true, message: '璇峰～鍐欐牱鍝佹暟閲�', trigger: 'blur'}
],
sampleStatus: [
- { required: true, message: '璇烽�夋嫨鏍峰搧鐘舵��', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨鏍峰搧鐘舵��', trigger: 'change'}
],
formType: [
- { required: true, message: '璇烽�夋嫨鏉ユ牱鏂瑰紡', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨鏉ユ牱鏂瑰紡', trigger: 'change'}
],
testQuantity: [
- { required: true, message: '璇峰～鍐欐娊妫�鏁伴噺', trigger: 'blur' }
+ {required: true, message: '璇峰～鍐欐娊妫�鏁伴噺', trigger: 'blur'}
],
},
sample: {
@@ -760,6 +900,7 @@
tableData1: [],
tableLoading1: false,
multipleSelection: [],
+ companyQuery: '',
column1: [
{label: '瀹㈡埛鍚嶇О', prop: 'company'},
{label: '瀹㈡埛鍗曚綅EN', prop: 'companyEn'},
@@ -771,9 +912,9 @@
{label: '宸ュ巶鍩�', prop: 'code'}
],
page1: {
- total:0,
- size:10,
- current:1
+ total: 0,
+ size: 10,
+ current: 1
},
selectStandardTree: false,
search: null,
@@ -803,7 +944,7 @@
distributeData: {
appointed: '',
userId: '',
- sonLaboratory:''
+ sonLaboratory: ''
},
personList: [],
upLoad: false,
@@ -832,15 +973,15 @@
addObj1: {},
model: null,
standardMethodListId: null,
- symbolList:['RTS'],
- inspectionItem:null,
- inspectionItemSubclass:null,
- methodS:null,
- isBsm2Val2:false,
+ symbolList: ['RTS'],
+ inspectionItem: null,
+ inspectionItemSubclass: null,
+ methodS: null,
+ isBsm2Val2: false,
temperatureEngList: [],
isShowInput: false,
temId: '',
- sonLaboratoryList:[],
+ sonLaboratoryList: [],
selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
quarterItemOptions: [], // 鏌ヨ瀛ｅ害淇℃伅
specialStandardMethod: '',
@@ -884,10 +1025,10 @@
this.model = null
this.standardMethodListId = null
},
- tabIndex(val){
- if(val==4&&this.active==2){
+ tabIndex(val) {
+ if (val == 4 && this.active == 2) {
this.isSpecial = true
- }else{
+ } else {
this.isSpecial = false
}
}
@@ -898,9 +1039,9 @@
this.currentId = this.$route.query.currentId
this.getUserNowData()
this.getInfo()
- if(this.tabIndex==4&&this.active==2){
+ if (this.tabIndex == 4 && this.active == 2) {
this.isSpecial = true
- }else{
+ } else {
this.isSpecial = false
}
},
@@ -979,197 +1120,172 @@
}
},
- // 缂栬緫瑕佹眰鍊艰〃鏍�
- editSpecial () {
- this.isSpecial = true
- this.$nextTick(() => {
- this.$refs.productTable.doLayout();
- });
- },
- getQuarterOnOrderList () {
- getQuarterOnOrder().then(res => {
- if (res.code === 200) {
- this.quarterItemOptions = res.data
- }
- })
- },
- //鐗规畩鍊煎～鍐欏鐞�
- inputValueHandler(row,index){
- if(row){
- const nextIndex = index+1
- for (let i = nextIndex; i < this.editTable.length; i++) {
- const element = this.editTable[i];
- if(element.model==row.model&&row.symbolItem==element.symbolItem){
- this.editTable[i].value = row.value
- }
+ // 缂栬緫瑕佹眰鍊艰〃鏍�
+ editSpecial() {
+ this.isSpecial = true
+ this.$nextTick(() => {
+ this.$refs.productTable.doLayout();
+ });
+ },
+ getQuarterOnOrderList() {
+ getQuarterOnOrder().then(res => {
+ if (res.code === 200) {
+ this.quarterItemOptions = res.data
+ }
+ })
+ },
+ //鐗规畩鍊煎～鍐欏鐞�
+ inputValueHandler(row, index) {
+ if (row) {
+ const nextIndex = index + 1
+ for (let i = nextIndex; i < this.editTable.length; i++) {
+ const element = this.editTable[i];
+ if (element.model == row.model && row.symbolItem == element.symbolItem) {
+ this.editTable[i].value = row.value
}
}
- },
- changeProductList0(){
- this.productList0.forEach(a=>{
- let obj = this.productList.find(m => {
- if(a.repetitionTag){
- return m.id === a.id&&m.repetitionTag == a.repetitionTag
- }else{
- return m.id === a.id&&!m.repetitionTag
- }
- })
-
- if(obj){
- a.state = obj.state
- a.section = obj.section
- a.ask = obj.ask
- a.manHour = obj.manHour
- a.price = obj.price
- a.tell = obj.tell
- a.radius = obj.radius
- }
- if(a.state == 0&&a.bsmRow){
- a = this.HaveJson(a.bsmRow)
- }
- })
- },
- searchFilterList () {
- const vtw = {
- inspectionItem: this.inspectionItem, // 妫�楠岄」
- inspectionItemSubclass: this.inspectionItemSubclass, // 妫�楠岄」瀛愰」
- methodS: this.methodS, // 璇曢獙鏂规硶
- }
- const isHaveValue = Object.values(vtw).some(item => {
- return item
- })
- this.changeProductList0()
- if (isHaveValue) {
- for(let i in vtw) {
- if (vtw[i]) {
- this.productList = this.productList0.filter((item) => {
- return item[i] && item[i].includes(vtw[i])
- })
- }
- }
- this.$nextTick(()=>{
- this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- })
- } else {
- // 娌℃湁鏌ヨ鏉′欢鏃舵覆鏌撴墍鏈夋暟鎹�
- this.productList = this.productList0
- this.$nextTick(()=>{
- this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- })
- }
- },
- // 鑾峰彇鐢ㄦ埛鍒楄〃
- getAuthorizedPerson() {
- selectUserCondition({ type: 1 }).then(res => {
- let data = []
- res.data.forEach(a => {
- data.push({
- label: a.name,
- value: a.id
- })
- })
- this.personList = data
- })
- },
- openCompanyList () {
- this.selectUserDia = true
- this.getCompanyList()
- },
- getCompanyList () {
- selectCustomPageList({...this.page1}).then(res => {
- this.tableLoading1 = false
- if (res.code === 200) {
- this.tableData1 = res.data.records
- this.page1.total = res.data.total
- }
- }).catch(err => {
- this.tableLoading1 = false
- })
- },
- pagination1 (page) {
- this.page1.size = page.limit
- this.getCompanyList()
- },
- selectMethod (row) {
- this.multipleSelection = row
- },
- selectUser() {
- if (this.multipleSelection.length === 0) {
- this.$message.error('鏈�夋嫨鏁版嵁')
- return
- }
- this.addObj.company = this.multipleSelection[0].company
- this.addObj.code = this.multipleSelection[0].code
- this.addObj.companyId = this.multipleSelection[0].id
- this.selectUserDia = false
- if(this.active==1){
- // TODO
- this.selectInsOrderTemplate()
- }
- },
- containsValue(str) {
- if(str){
- let symbolItem = ''
- this.symbolList.some(value =>{
- if(str.includes(value)){
- symbolItem = value
- return true
- }
- })
- return symbolItem
- }
- },
- handleAsk(ask,symbolItem, value) {
- try{
- let code = [">", "<", "=", "锛�", "锛�", "鈮�", "鈮�", "卤"];
- let code2 = ['+', '*', '/', '-']
- if (ask.includes('&')) {
- // 澶氫釜鏉′欢
- let arr0 = ask.split('&')
- let arr1 = []
- arr0.forEach(m => {
- let index = code.findIndex(b => m.includes(b))
- if (index > -1) {
- let arr = m.split(code[index]).filter(b => !!b)
- let calcNum = this.$Big(
- bigEval(this.replaceAll(arr[0], symbolItem, value))
- );
- let num = calcNum.toFixed(
- this.getDecimalPlaces(value, ask, calcNum)
- );
- // let num = eval(this.replaceAll(arr[0], symbolItem, value))
- m = code[index] + '' + num
- arr1.push(m)
- }
- })
- return arr1.join('&')
- } else if (ask.includes('锝�') || ask.includes('~')) {
- let arr0 = []
- if (ask.includes('锝�')) {
- arr0 = ask.split('锝�')
- } else {
- arr0 = ask.split('~')
- }
- // 澶氫釜鏉′欢
- let arr1 = []
- arr0.forEach(m => {
- m = m.replace(symbolItem, value)
- const index = code2.findIndex(b => m.includes(b))
- if (index > -1) {
- m = eval(m)
- }
- arr1.push(m)
- })
- return arr1.join('锝�')
+ }
+ },
+ changeProductList0() {
+ this.productList0.forEach(a => {
+ let obj = this.productList.find(m => {
+ if (a.repetitionTag) {
+ return m.id === a.id && m.repetitionTag == a.repetitionTag
} else {
- // 鍗曚釜鏉′欢
- let index = code.findIndex(b => ask.includes(b))
+ return m.id === a.id && !m.repetitionTag
+ }
+ })
+
+ if (obj) {
+ a.state = obj.state
+ a.section = obj.section
+ a.ask = obj.ask
+ a.manHour = obj.manHour
+ a.price = obj.price
+ a.tell = obj.tell
+ a.radius = obj.radius
+ }
+ if (a.state == 0 && a.bsmRow) {
+ a = this.HaveJson(a.bsmRow)
+ }
+ })
+ },
+ searchFilterList() {
+ const vtw = {
+ inspectionItem: this.inspectionItem, // 妫�楠岄」
+ inspectionItemSubclass: this.inspectionItemSubclass, // 妫�楠岄」瀛愰」
+ methodS: this.methodS, // 璇曢獙鏂规硶
+ }
+ const isHaveValue = Object.values(vtw).some(item => {
+ return item
+ })
+ this.changeProductList0()
+ if (isHaveValue) {
+ for (let i in vtw) {
+ if (vtw[i]) {
+ this.productList = this.productList0.filter((item) => {
+ return item[i] && item[i].includes(vtw[i])
+ })
+ }
+ }
+ this.$nextTick(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ })
+ } else {
+ // 娌℃湁鏌ヨ鏉′欢鏃舵覆鏌撴墍鏈夋暟鎹�
+ this.productList = this.productList0
+ this.$nextTick(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ })
+ }
+ },
+ // 鑾峰彇鐢ㄦ埛鍒楄〃
+ getAuthorizedPerson() {
+ selectUserCondition({type: 1}).then(res => {
+ let data = []
+ res.data.forEach(a => {
+ data.push({
+ label: a.name,
+ value: a.id
+ })
+ })
+ this.personList = data
+ })
+ },
+ openCompanyList() {
+ this.selectUserDia = true
+ this.resetCompanySearch()
+ },
+ getCompanyList() {
+ this.tableLoading1 = true
+ selectCustomPageList({company: this.companyQuery, ...this.page1}).then(res => {
+ this.tableLoading1 = false
+ if (res.code === 200) {
+ this.tableData1 = res.data.records
+ this.page1.total = res.data.total
+ }
+ }).catch(err => {
+ this.tableLoading1 = false
+ })
+ },
+ pagination1(page) {
+ this.page1.size = page.limit
+ this.getCompanyList()
+ },
+ searchCompany() {
+ this.page1.current = 1
+ this.getCompanyList()
+ },
+ resetCompanySearch() {
+ this.companyQuery = ''
+ this.page1.current = 1
+ this.getCompanyList()
+ },
+ selectMethod(row) {
+ this.multipleSelection = row
+ },
+ selectUser() {
+ if (this.multipleSelection.length === 0) {
+ this.$message.error('鏈�夋嫨鏁版嵁')
+ return
+ }
+ this.addObj.company = this.multipleSelection[0].company
+ this.addObj.code = this.multipleSelection[0].code
+ this.addObj.companyId = this.multipleSelection[0].id
+ this.selectUserDia = false
+ if (this.active == 1) {
+ // TODO
+ this.selectInsOrderTemplate()
+ }
+ },
+ containsValue(str) {
+ if (str) {
+ let symbolItem = ''
+ this.symbolList.some(value => {
+ if (str.includes(value)) {
+ symbolItem = value
+ return true
+ }
+ })
+ return symbolItem
+ }
+ },
+ handleAsk(ask, symbolItem, value) {
+ try {
+ let code = [">", "<", "=", "锛�", "锛�", "鈮�", "鈮�", "卤"];
+ let code2 = ['+', '*', '/', '-']
+ if (ask.includes('&')) {
+ // 澶氫釜鏉′欢
+ let arr0 = ask.split('&')
+ let arr1 = []
+ arr0.forEach(m => {
+ let index = code.findIndex(b => m.includes(b))
if (index > -1) {
- let arr = ask.split(code[index]).filter(b => !!b)
+ let arr = m.split(code[index]).filter(b => !!b)
let calcNum = this.$Big(
bigEval(this.replaceAll(arr[0], symbolItem, value))
);
@@ -1177,96 +1293,91 @@
this.getDecimalPlaces(value, ask, calcNum)
);
// let num = eval(this.replaceAll(arr[0], symbolItem, value))
- return code[index] + '' + num
+ m = code[index] + '' + num
+ arr1.push(m)
}
+ })
+ return arr1.join('&')
+ } else if (ask.includes('锝�') || ask.includes('~')) {
+ let arr0 = []
+ if (ask.includes('锝�')) {
+ arr0 = ask.split('锝�')
+ } else {
+ arr0 = ask.split('~')
}
- }catch(e){}
- },
- replaceAll(str,find,value) {
- if (str === undefined) {
- return str
+ // 澶氫釜鏉′欢
+ let arr1 = []
+ arr0.forEach(m => {
+ m = m.replace(symbolItem, value)
+ const index = code2.findIndex(b => m.includes(b))
+ if (index > -1) {
+ m = eval(m)
+ }
+ arr1.push(m)
+ })
+ return arr1.join('锝�')
+ } else {
+ // 鍗曚釜鏉′欢
+ let index = code.findIndex(b => ask.includes(b))
+ if (index > -1) {
+ let arr = ask.split(code[index]).filter(b => !!b)
+ let calcNum = this.$Big(
+ bigEval(this.replaceAll(arr[0], symbolItem, value))
+ );
+ let num = calcNum.toFixed(
+ this.getDecimalPlaces(value, ask, calcNum)
+ );
+ // let num = eval(this.replaceAll(arr[0], symbolItem, value))
+ return code[index] + '' + num
+ }
}
- return str.replaceAll(find, value);
- },
- save() {
- if (this.addObj.standardTreeId) {
- if (!this.addObj.sample || !this.addObj.company || !this.addObj.orderType || !this.addObj.testQuantity) {
- this.$message.error('璇峰～鍐欐娴嬩緷鎹�佸鎵樺崟浣嶃�佹楠岀被鍒拰鏍峰搧鏁伴噺');
- return;
- }
- this.saveData([]);
+ } catch (e) {
+ }
+ },
+ replaceAll(str, find, value) {
+ if (str === undefined) {
+ return str
+ }
+ return str.replaceAll(find, value);
+ },
+ save() {
+ if (this.addObj.standardTreeId) {
+ if (!this.addObj.sample || !this.addObj.company || !this.addObj.orderType || !this.addObj.testQuantity) {
+ this.$message.error('璇峰～鍐欐娴嬩緷鎹�佸鎵樺崟浣嶃�佹楠岀被鍒拰鏍峰搧鏁伴噺');
return;
}
- this.$refs['addObj'].validate((valid) => {
- if (valid) {
+ this.saveData([]);
+ return;
+ }
+ this.$refs['addObj'].validate((valid) => {
+ if (valid) {
+ this.sampleList.forEach(item => {
+ item.specialStandardMethod = this.specialStandardMethod
+ })
+ try {
this.sampleList.forEach(item => {
- item.specialStandardMethod = this.specialStandardMethod
- })
- try {
- this.sampleList.forEach(item => {
- if (item.insulating){
- let sampleListArr = []
- let insulatingArr = []
- // 鏈夌數缂嗛厤缃椂锛屾瘮杈冪數缂嗛厤缃殑妫�楠岄」鏄惁涓庡闈㈤噸澶�
- item.insProduct.filter(a => a.state == 1).forEach(obj => {
- sampleListArr.push(obj.id)
- })
- item.insulating.insProduct.filter(a => a.state == 1).forEach(obj => {
- insulatingArr.push(obj.id)
- })
- const sameLength = sampleListArr.filter(id => insulatingArr.indexOf(id) > -1).length
- if (sameLength > 0) {
- this.$message.error('妫�楠岄」涓庣數缂嗛厤缃楠岄」涓嶈兘閲嶅')
- }
- throw sameLength > 0
+ if (item.insulating) {
+ let sampleListArr = []
+ let insulatingArr = []
+ // 鏈夌數缂嗛厤缃椂锛屾瘮杈冪數缂嗛厤缃殑妫�楠岄」鏄惁涓庡闈㈤噸澶�
+ item.insProduct.filter(a => a.state == 1).forEach(obj => {
+ sampleListArr.push(obj.id)
+ })
+ item.insulating.insProduct.filter(a => a.state == 1).forEach(obj => {
+ insulatingArr.push(obj.id)
+ })
+ const sameLength = sampleListArr.filter(id => insulatingArr.indexOf(id) > -1).length
+ if (sameLength > 0) {
+ this.$message.error('妫�楠岄」涓庣數缂嗛厤缃楠岄」涓嶈兘閲嶅')
}
- })
- } catch (e) {
- console.log('e---', e)
- if (e === true) throw e
- }
- let sampleList = this.HaveJson(this.sampleList)
- sampleList.forEach(a => {
- if (a.insProduct.length > 0) {
- a.insProduct.forEach(c => {
- if (this.tabIndex != 4) {
- delete c.id
- }
- if (c.isNew) {
- c.id = null
- delete c.isNew
- }
- })
- }
- if (a.endModels) {
- a.model = a.endModels
- }
- if (!this.canSelectProduct || this.active == 1) {
- a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ throw sameLength > 0
}
})
- let projectNum = this.totalArr.filter(a => a.state == 1).length
- if(projectNum==0){
- this.$message.warning('璇疯嚦灏戦�夋嫨涓�涓楠岄」')
- return
- }else{
- let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
- if (isRTS) {
- this.editTable = this.handleData(sampleList,this.containsValue, 0)
- this.editTable.forEach(item => {
- item.value = item.modelNum
- })
- this.bsm3Dia = true;
- return
- }
- this.saveMethod(sampleList)
- }
+ } catch (e) {
+ console.log('e---', e)
+ if (e === true) throw e
}
- })
- },
- save0(){
- if(this.editTable.every(m=>m.value)){
- let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
+ let sampleList = this.HaveJson(this.sampleList)
sampleList.forEach(a => {
if (a.insProduct.length > 0) {
a.insProduct.forEach(c => {
@@ -1283,1106 +1394,1152 @@
a.model = a.endModels
}
if (!this.canSelectProduct || this.active == 1) {
- a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ a.insProduct = a.insProduct.filter(b => b.state === 1)
}
})
- this.saveMethod(sampleList)
- }else{
- this.$message.error('璇峰～鍐欒瘑鍒鍊�')
- }
- },
- handleData(sampleList,calBack,type){
- let editTable = []
- sampleList.forEach(item => {
- let obj = {
- sampleCode:item.sampleCode,
- model:item.model,
- symbolList:[],
- sampleId:item.id,
- modelNum:item.modelNum,
+ let projectNum = this.totalArr.filter(a => a.state == 1).length
+ if (projectNum == 0) {
+ this.$message.warning('璇疯嚦灏戦�夋嫨涓�涓楠岄」')
+ return
+ } else {
+ let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b => a.ask.includes(b)) && a.state == 1)
+ if (isRTS) {
+ this.editTable = this.handleData(sampleList, this.containsValue, 0)
+ this.editTable.forEach(item => {
+ item.value = item.modelNum
+ })
+ this.bsm3Dia = true;
+ return
+ }
+ this.saveMethod(sampleList)
}
- if (item.insProduct && item.insProduct.length > 0) {
- item.insProduct.forEach(a => {
- if (a.state == 1) {
- if(type==0){
- let str = calBack(a.ask)
- str&&obj.symbolList.push({
- symbolItem:str,
- inspectionItem:a.inspectionItem,
- })
- }else if(type==1){
- let arr = this.editTable.filter(b => b.sampleId == item.id)
- for (var i=0;i<arr.length;i++){
- if(a.ask){
- if(a.ask.includes(arr[i].symbolItem)){
- let ask = calBack(a.ask, arr[i].symbolItem,arr[i].value)
- if (ask) {
- a.ask = ask
- }
- let tell = this.handleAsk(a.tell, arr[i].symbolItem,arr[i].value)
- if (tell) {
- a.tell = tell
- }
+ }
+ })
+ },
+ save0() {
+ if (this.editTable.every(m => m.value)) {
+ let sampleList = this.handleData(this.HaveJson(this.sampleList), this.handleAsk, 1)
+ sampleList.forEach(a => {
+ if (a.insProduct.length > 0) {
+ a.insProduct.forEach(c => {
+ if (this.tabIndex != 4) {
+ delete c.id
+ }
+ if (c.isNew) {
+ c.id = null
+ delete c.isNew
+ }
+ })
+ }
+ if (a.endModels) {
+ a.model = a.endModels
+ }
+ if (!this.canSelectProduct || this.active == 1) {
+ a.insProduct = a.insProduct.filter(b => b.state === 1)
+ }
+ })
+ this.saveMethod(sampleList)
+ } else {
+ this.$message.error('璇峰～鍐欒瘑鍒鍊�')
+ }
+ },
+ handleData(sampleList, calBack, type) {
+ let editTable = []
+ sampleList.forEach(item => {
+ let obj = {
+ sampleCode: item.sampleCode,
+ model: item.model,
+ symbolList: [],
+ sampleId: item.id,
+ modelNum: item.modelNum,
+ }
+ if (item.insProduct && item.insProduct.length > 0) {
+ item.insProduct.forEach(a => {
+ if (a.state == 1) {
+ if (type == 0) {
+ let str = calBack(a.ask)
+ str && obj.symbolList.push({
+ symbolItem: str,
+ inspectionItem: a.inspectionItem,
+ })
+ } else if (type == 1) {
+ let arr = this.editTable.filter(b => b.sampleId == item.id)
+ for (var i = 0; i < arr.length; i++) {
+ if (a.ask) {
+ if (a.ask.includes(arr[i].symbolItem)) {
+ let ask = calBack(a.ask, arr[i].symbolItem, arr[i].value)
+ if (ask) {
+ a.ask = ask
}
- }else{
- this.$message.error('瑕佹眰鍊间负绌猴紝闇�瑕佸幓鏍囧噯搴撶淮鎶わ紒')
+ let tell = this.handleAsk(a.tell, arr[i].symbolItem, arr[i].value)
+ if (tell) {
+ a.tell = tell
+ }
}
+ } else {
+ this.$message.error('瑕佹眰鍊间负绌猴紝闇�瑕佸幓鏍囧噯搴撶淮鎶わ紒')
}
}
}
- })
- }
- if(type==0){
- editTable.push(obj)
- }
- })
- if(type==0){
- editTable.forEach(a => {
- a.symbolList.forEach(b => {
- let arr = a.symbolList.filter(c => c.symbolItem == b.symbolItem);
- b.inspectionItemList = arr.map(c => c.inspectionItem).join(',')
- })
- })
- editTable.forEach(a => {
- let mySet = new Set();
- a.symbolList = a.symbolList.filter(b =>{
- let num0 = mySet.size;
- mySet.add(b.symbolItem);
- let num1 = mySet.size;
- if(num0!=num1){
- return true;
- }else{
- return false
- }
- })
- })
- let editTableNew = []
- editTable.forEach(a => {
- a.symbolList.forEach(b => {
- let obj = {
- sampleCode:a.sampleCode,
- model:a.model,
- symbolItem:b.symbolItem,
- sampleId:a.sampleId,
- value:null,
- inspectionItemList:b.inspectionItemList,
- modelNum:a.modelNum,
- }
- editTableNew.push(obj)
- })
- })
- return editTableNew
- }else{
- return sampleList
- }
- },
- saveMethod(sampleList){
- if (this.addObj.standardTreeId) {
- this.saveData([]);
- return;
- }
- if (this.addObj.quarterItemId) {
- this.addObj.quarterItemId = this.addObj.quarterItemId[1]
- }
- if (this.addObj.createTime) {
- delete this.addObj.createTime
- }
- if (this.addObj.orderType === '鎶芥') {
- judgeNotSpotCheckOrder({ insOrder: this.addObj, sampleList: sampleList }).then(res => {
- if (res.data === true) {
- this.saveData(sampleList);
- } else {
- // const message = res.message.replace(/\n/g, '<br>');
- this.$confirm(res.message, '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- dangerouslyUseHTMLString: true, // 馃憟 鍏抽敭鐐癸細鍏佽 HTML
- message: res.message // 杩欓噷涔熷彲浠ョ渷鐣ワ紝鍥犱负绗簩涓弬鏁版槸 title锛岀涓変釜鏄� options
- }).then(() => {
- this.saveData(sampleList);
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '宸插彇娑�'
- });
- });
}
- });
- } else {
- this.saveData(sampleList)
+ })
}
- },
+ if (type == 0) {
+ editTable.push(obj)
+ }
+ })
+ if (type == 0) {
+ editTable.forEach(a => {
+ a.symbolList.forEach(b => {
+ let arr = a.symbolList.filter(c => c.symbolItem == b.symbolItem);
+ b.inspectionItemList = arr.map(c => c.inspectionItem).join(',')
+ })
+ })
+ editTable.forEach(a => {
+ let mySet = new Set();
+ a.symbolList = a.symbolList.filter(b => {
+ let num0 = mySet.size;
+ mySet.add(b.symbolItem);
+ let num1 = mySet.size;
+ if (num0 != num1) {
+ return true;
+ } else {
+ return false
+ }
+ })
+ })
+ let editTableNew = []
+ editTable.forEach(a => {
+ a.symbolList.forEach(b => {
+ let obj = {
+ sampleCode: a.sampleCode,
+ model: a.model,
+ symbolItem: b.symbolItem,
+ sampleId: a.sampleId,
+ value: null,
+ inspectionItemList: b.inspectionItemList,
+ modelNum: a.modelNum,
+ }
+ editTableNew.push(obj)
+ })
+ })
+ return editTableNew
+ } else {
+ return sampleList
+ }
+ },
+ saveMethod(sampleList) {
+ if (this.addObj.standardTreeId) {
+ this.saveData([]);
+ return;
+ }
+ if (this.addObj.quarterItemId) {
+ this.addObj.quarterItemId = this.addObj.quarterItemId[1]
+ }
+ if (this.addObj.createTime) {
+ delete this.addObj.createTime
+ }
+ if (this.addObj.orderType === '鎶芥') {
+ judgeNotSpotCheckOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
+ if (res.data === true) {
+ this.saveData(sampleList);
+ } else {
+ // const message = res.message.replace(/\n/g, '<br>');
+ this.$confirm(res.message, '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ dangerouslyUseHTMLString: true, // 馃憟 鍏抽敭鐐癸細鍏佽 HTML
+ message: res.message // 杩欓噷涔熷彲浠ョ渷鐣ワ紝鍥犱负绗簩涓弬鏁版槸 title锛岀涓変釜鏄� options
+ }).then(() => {
+ this.saveData(sampleList);
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑�'
+ });
+ });
+ }
+ });
+ } else {
+ this.saveData(sampleList)
+ }
+ },
saveData(sampleList) {
this.saveLoad = true
- if(this.tabIndex==4&&this.active==2){
+ if (this.tabIndex == 4 && this.active == 2) {
// 閫�鍥炲悗鎻愪氦
updateInsOrder({insOrder: this.addObj, sampleProduct: sampleList}).then(res => {
this.saveLoad = false
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
this.closeOpenPage()
- }).catch(e=>{
+ }).catch(e => {
this.saveLoad = false
})
- }else{
+ } else {
// 甯歌鎻愪氦
- const newJuOrder = {...this.addObj,typeSource:-1}
+ const newJuOrder = {...this.addObj, typeSource: -1}
delete newJuOrder.temperature
delete newJuOrder.humidity
const payload = this.addObj.standardTreeId
? {
- insOrder: newJuOrder,
- standardTreeId: this.addObj.standardTreeId,
- sampleCode: this.sampleCode,
- templateList: this.boundTemplateList.map((item, index) => ({ templateId: item.templateId, sort: index }))
- }
- : { insOrder: {...this.addObj,typeSource:-1}, sampleList: sampleList }
+ insOrder: newJuOrder,
+ standardTreeId: this.addObj.standardTreeId,
+ sampleCode: this.sampleCode,
+ templateList: this.boundTemplateList.map((item, index) => ({templateId: item.templateId, sort: index}))
+ }
+ : {insOrder: {...this.addObj, typeSource: -1}, sampleList: sampleList}
addInsOrder(payload).then(res => {
this.saveLoad = false
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
this.closeOpenPage()
- }).catch(e=>{
+ }).catch(e => {
this.saveLoad = false
})
}
},
- upInsOrderOfState(state) {
- if (state == 1) {
- this.saveLoad = true
- upInsOrderOfState({
- state,
- id: this.currentId,
- companyId:this.addObj.companyId,
- laboratory:this.addObj.laboratory,
- company: this.addObj.company
- }).then(res => {
- this.saveLoad = false
- this.$message.success('鎻愪氦鎴愬姛')
- selectOrderManDay({
- id: this.currentId
- }).then(ress => {
- this.distributeData.orderId = this.currentId
- this.distributeData.appointed = ress.data
- })
- setTimeout(() => {
- this.distributeData.sonLaboratory = this.newJuLaboratoryList.length > 0 ? this.newJuLaboratoryList[0].value : ''
- this.issuedDialogVisible = true;
- }, 1000)
- })
- } else {
- // 涓嶉�氳繃
- this.noDialogVisible = true
- }
- },
- // 涓嬪彂
- submitForm2() {
- if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
- this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
- return
- }
- if (this.distributeData.userId == null || this.distributeData.userId == '') {
- this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
- return
- }
- this.upLoad = true;
- upInsOrder({
- orderId: this.distributeData.orderId,
- appointed: this.distributeData.appointed,
- userId: this.distributeData.userId,
- sonLaboratory:this.distributeData.sonLaboratory
+ upInsOrderOfState(state) {
+ if (state == 1) {
+ this.saveLoad = true
+ upInsOrderOfState({
+ state,
+ id: this.currentId,
+ companyId: this.addObj.companyId,
+ laboratory: this.addObj.laboratory,
+ company: this.addObj.company
}).then(res => {
+ this.saveLoad = false
this.$message.success('鎻愪氦鎴愬姛')
- this.upLoad = false
- this.issuedDialogVisible = false
- this.closeOpenPage()
- }).catch(e => {
- this.$message.error('鎻愪氦澶辫触')
- this.upLoad = false
+ selectOrderManDay({
+ id: this.currentId
+ }).then(ress => {
+ this.distributeData.orderId = this.currentId
+ this.distributeData.appointed = ress.data
+ })
+ setTimeout(() => {
+ this.distributeData.sonLaboratory = this.newJuLaboratoryList.length > 0 ? this.newJuLaboratoryList[0].value : ''
+ this.issuedDialogVisible = true;
+ }, 1000)
})
- },
- getUserNowData() {
+ } else {
+ // 涓嶉�氳繃
+ this.noDialogVisible = true
+ }
+ },
+ // 涓嬪彂
+ submitForm2() {
+ if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
+ this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
+ return
+ }
+ if (this.distributeData.userId == null || this.distributeData.userId == '') {
+ this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
+ return
+ }
+ this.upLoad = true;
+ upInsOrder({
+ orderId: this.distributeData.orderId,
+ appointed: this.distributeData.appointed,
+ userId: this.distributeData.userId,
+ sonLaboratory: this.distributeData.sonLaboratory
+ }).then(res => {
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.upLoad = false
+ this.issuedDialogVisible = false
+ this.closeOpenPage()
+ }).catch(e => {
+ this.$message.error('鎻愪氦澶辫触')
+ this.upLoad = false
+ })
+ },
+ getUserNowData() {
this.addObj.prepareUserEn = this.nameEn
this.addObj.prepareCode = this.userName
- getUserNow().then(res => {
- let selects = res.data
- if (selects == null) return
- this.addObj.userId = selects.id
- this.addObj.company = selects.company
- this.addObj.custom = selects.name
- this.addObj.code = selects.code
- this.addObj.companyId = selects.departId
- this.addObj.production = ''
- this.addObj.productionEn = ''
- if(this.active==1){
- this.selectInsOrderTemplate()
+ getUserNow().then(res => {
+ let selects = res.data
+ if (selects == null) return
+ this.addObj.userId = selects.id
+ this.addObj.company = selects.company
+ this.addObj.custom = selects.name
+ this.addObj.code = selects.code
+ this.addObj.companyId = selects.departId
+ this.addObj.production = ''
+ this.addObj.productionEn = ''
+ if (this.active == 1) {
+ this.selectInsOrderTemplate()
+ }
+ })
+ },
+ getProNum() {
+ this.sampleSelectionList.forEach((m, i) => {
+ this.$set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
+ })
+ this.$refs.sampleTable.doLayout()
+ },
+ searchFilter() {
+ this.$refs.tree.filter(this.search)
+ },
+ nodeOpen(data, node, el) {
+ $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
+ if (data.sampleTypeEn !== undefined && data.sampleTypeEn !== null) {
+ this.sampleViewEn = data.sampleTypeEn
+ } else if (data.sampleEn !== undefined && data.sampleEn !== null) {
+ this.sampleViewEn = data.sampleEn
+ }
+ },
+ nodeClose(data, node, el) {
+ $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
+ },
+ handleNodeClick(val, node, el) {
+ this.selectTreeNode = node
+ this.models = val.children || []
+ this.selectTree = buildSelectTree(node, '')
+ if (val.sampleTypeEn !== undefined && val.sampleTypeEn !== null) {
+ this.sampleViewEn = val.sampleTypeEn
+ } else if (val.sampleEn !== undefined && val.sampleEn !== null) {
+ this.sampleViewEn = val.sampleEn
+ }
+ },
+ selectStandardTreeList() {
+ this.selectStandardTreeLoading = true
+ selectStandardTreeList2().then(res => {
+ this.list = res.data
+ this.list.forEach(a => {
+ this.expandedKeys.push(a.label)
+ })
+ this.selectStandardTreeLoading = false
+ })
+ },
+ filterNode(value, data) {
+ if (!value) return true;
+ return data.label.indexOf(value) !== -1;
+ },
+ activeStandardTree() {
+ if (!this.selectTreeNode || this.selectTreeNode.data.code !== '[2]') {
+ this.$message.error('璇烽�夋嫨浜岀骇浜у搧')
+ return
+ }
+ const productName = this.selectTreeNode.data.label
+ this.addObj.sample = productName
+ this.addObj.standardTreeId = this.selectTreeNode.data.id
+ this.loadTemplateBindings(this.addObj.standardTreeId)
+ this.selectStandardTree = false
+ this.sampleList = []
+ },
+ sortTemplateList(list) {
+ return (list || []).slice().sort((a, b) => (a.sort || 0) - (b.sort || 0))
+ },
+ // 涓嬪崟鏃朵粠鏍囧噯搴撶粦瀹氱殑妯℃澘閲屽垹鍑忥紝鎻愪氦鏃堕殢 templateList 涓�璧蜂笅鍙�
+ removeBoundTemplate(index) {
+ this.boundTemplateList.splice(index, 1)
+ },
+ async loadTemplateBindings(standardTreeId) {
+ this.boundTemplateList = []
+ if (!standardTreeId) return
+ this.templateBindingLoading = true
+ try {
+ const res = await selectTemplateBindings({standardTreeId})
+ this.boundTemplateList = this.sortTemplateList(res.data)
+ } finally {
+ this.templateBindingLoading = false
+ }
+ },
+ // 鐢ㄦ寚瀹氬瀷鍙锋浛鎹㈡爲璺緞鏈锛堟湯娈靛嵆鏍囧噯/鍨嬪彿锛�
+ buildFactoryPath(model) {
+ const tree = this.selectTree || ''
+ if (!tree || !model) return tree
+ const tokens = tree.split(' - ')
+ tokens[tokens.length - 1] = model
+ return tokens.join(' - ')
+ },
+ selectsStandardMethodByFLSSMList() {
+ this.methodLoad = true
+ selectsStandardMethodByFLSSM({
+ tree: this.selectTree
+ }).then(res => {
+ this.methodLoad = false
+ const list = (res.data && res.data.standardMethodList) || []
+ // 褰撳墠鏄彾瀛�(鏍囧噯)鍗存煡涓嶅埌鏍囧噯鏃讹紝鍥為��鍒扮埗绾у啀鏌ヤ竴娆�
+ // 鐢ㄨ矾寰勫垽瀹氬彾瀛愶細妯℃澘鍥炲～鏃� selectTreeNode 涓虹┖锛岃妭鐐瑰璞″垽瀹氫細澶辨晥
+ if (list.length === 0 && isLeafPath(this.selectTree)) {
+ const parentTree = dropLastLabel(this.selectTree)
+ if (parentTree) {
+ selectsStandardMethodByFLSSM({
+ tree: parentTree
+ }).then(ress => {
+ this.methods = (ress.data && ress.data.standardMethodList) || []
+ })
+ return
}
- })
- },
- getProNum() {
- this.sampleSelectionList.forEach((m, i) => {
- this.$set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
- })
- this.$refs.sampleTable.doLayout()
- },
- searchFilter() {
- this.$refs.tree.filter(this.search)
- },
- nodeOpen(data, node, el) {
- $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
- if (data.sampleTypeEn !== undefined && data.sampleTypeEn !== null) {
- this.sampleViewEn = data.sampleTypeEn
- } else if (data.sampleEn !== undefined && data.sampleEn !== null) {
- this.sampleViewEn = data.sampleEn
}
- },
- nodeClose(data, node, el) {
- $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
- },
- handleNodeClick(val, node, el) {
- this.selectTreeNode = node
- this.models = val.children || []
- this.selectTree = buildSelectTree(node, '')
- if (val.sampleTypeEn !== undefined && val.sampleTypeEn !== null) {
- this.sampleViewEn = val.sampleTypeEn
- } else if (val.sampleEn !== undefined && val.sampleEn !== null) {
- this.sampleViewEn = val.sampleEn
- }
- },
- selectStandardTreeList() {
- this.selectStandardTreeLoading = true
- selectStandardTreeList2().then(res => {
- this.list = res.data
- this.list.forEach(a => {
- this.expandedKeys.push(a.label)
- })
- this.selectStandardTreeLoading=false
- })
- },
- filterNode(value, data) {
- if (!value) return true;
- return data.label.indexOf(value) !== -1;
- },
- activeStandardTree() {
- if (!this.selectTreeNode || this.selectTreeNode.data.code !== '[2]') {
- this.$message.error('璇烽�夋嫨浜岀骇浜у搧')
- return
- }
- const productName = this.selectTreeNode.data.label
- this.addObj.sample = productName
- this.addObj.standardTreeId = this.selectTreeNode.data.id
- this.loadTemplateBindings(this.addObj.standardTreeId)
- this.selectStandardTree = false
- this.sampleList = []
- },
- sortTemplateList(list) {
- return (list || []).slice().sort((a, b) => (a.sort || 0) - (b.sort || 0))
- },
- // 涓嬪崟鏃朵粠鏍囧噯搴撶粦瀹氱殑妯℃澘閲屽垹鍑忥紝鎻愪氦鏃堕殢 templateList 涓�璧蜂笅鍙�
- removeBoundTemplate(index) {
- this.boundTemplateList.splice(index, 1)
- },
- async loadTemplateBindings(standardTreeId) {
- this.boundTemplateList = []
- if (!standardTreeId) return
- this.templateBindingLoading = true
- try {
- const res = await selectTemplateBindings({standardTreeId})
- this.boundTemplateList = this.sortTemplateList(res.data)
- } finally {
- this.templateBindingLoading = false
- }
- },
- // 鐢ㄦ寚瀹氬瀷鍙锋浛鎹㈡爲璺緞鏈锛堟湯娈靛嵆鏍囧噯/鍨嬪彿锛�
- buildFactoryPath(model) {
- const tree = this.selectTree || ''
- if (!tree || !model) return tree
- const tokens = tree.split(' - ')
- tokens[tokens.length - 1] = model
- return tokens.join(' - ')
- },
- selectsStandardMethodByFLSSMList() {
- this.methodLoad = true
- selectsStandardMethodByFLSSM({
- tree: this.selectTree
- }).then(res => {
- this.methodLoad = false
- const list = (res.data && res.data.standardMethodList) || []
- // 褰撳墠鏄彾瀛�(鏍囧噯)鍗存煡涓嶅埌鏍囧噯鏃讹紝鍥為��鍒扮埗绾у啀鏌ヤ竴娆�
- // 鐢ㄨ矾寰勫垽瀹氬彾瀛愶細妯℃澘鍥炲～鏃� selectTreeNode 涓虹┖锛岃妭鐐瑰璞″垽瀹氫細澶辨晥
- if (list.length === 0 && isLeafPath(this.selectTree)) {
- const parentTree = dropLastLabel(this.selectTree)
- if (parentTree) {
- selectsStandardMethodByFLSSM({
- tree: parentTree
- }).then(ress => {
- this.methods = (ress.data && ress.data.standardMethodList) || []
- })
- return
- }
- }
- this.methods = list
- })
- },
- addStandardTree() {
- if (this.selectTree == null) return
- this.sampleList = []
- this.productList = []
- for (var i = 0; i < this.addObj.sampleNum; i++) {
- this.sample.joinName = null
- this.sample.joinModel = null
- this.sample.joinNum = 1
- this.sample.sample = this.addObj.sample
- this.sample.model = this.addObj.model
- this.sample.unit = this.addObj.unit
- this.sample.standardMethodListId = null
- this.sample.insProduct = []
- this.sample.id = parseInt(i+1)
- this.sample.childSampleList = []
- this.sample.insulating = null
- this.sample.sheath = null
- this.sampleList.push(this.HaveJson(this.sample))
- // this.count++
- }
- },
- selectSample(val) {
+ this.methods = list
+ })
+ },
+ addStandardTree() {
+ if (this.selectTree == null) return
+ this.sampleList = []
+ this.productList = []
+ for (var i = 0; i < this.addObj.sampleNum; i++) {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ this.sample.sample = this.addObj.sample
+ this.sample.model = this.addObj.model
+ this.sample.unit = this.addObj.unit
+ this.sample.standardMethodListId = null
+ this.sample.insProduct = []
+ this.sample.id = parseInt(i + 1)
+ this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
+ this.sampleList.push(this.HaveJson(this.sample))
+ // this.count++
+ }
+ },
+ selectSample(val) {
+ this.sampleIds = []
+ val.forEach(a => {
+ this.sampleIds.push(a.id)
+ })
+ this.sampleSelectionList = val
+ },
+ selectProduct(val) {
+ this.productIds = []
+ val.forEach(a => {
+ this.productIds.push(a.id)
+ })
+ },
+ rowClick(row, column, event) {
+ this.currentMethod = row
+ let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ if (obj && obj.code == '鎶�鏈姹�') {
+ this.isAskOnlyRead = true
+ } else {
+ this.isAskOnlyRead = false
+ }
+ this.sampleId = row.id
+ if (this.active !== 1) {
this.sampleIds = []
- val.forEach(a => {
- this.sampleIds.push(a.id)
+ this.sampleSelectionList.forEach(ele => {
+ if (ele.id == row.id) {
+ this.sampleIds.push(row.id)
+ }
})
- this.sampleSelectionList = val
- },
- selectProduct(val) {
- this.productIds = []
- val.forEach(a => {
- this.productIds.push(a.id)
+ }
+ this.productList = row.insProduct
+ this.productList0 = JSON.parse(JSON.stringify(this.productList))
+ this.inspectionScope = this.productList.length === 0
+ ? (this.active == 1 ? 'all' : 'specified')
+ : (this.productList.every(item => item.state == 1) ? 'all' : 'specified')
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) {
+ this.toggleSelection(a)
+ } else {
+ this.$refs.productTable.toggleRowSelection(a, false);
+ }
})
- },
- rowClick(row, column, event) {
- this.currentMethod = row
- let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
- if (obj && obj.code == '鎶�鏈姹�') {
- this.isAskOnlyRead = true
- } else {
- this.isAskOnlyRead = false
+ }, 200)
+ },
+ toggleSelection(row) {
+ this.$refs.productTable.toggleRowSelection(row, true);
+ },
+ selectOne(selection, row) {
+ this.bsm1DiaList = []
+ row.state = row.state == 1 ? 0 : 1
+ if (row.section === null) {
+ row.section = ""
+ }
+ if (row.sectionCopy === undefined && row.section) {
+ if (row.section.indexOf('[') > -1) {
+ this.$set(row, 'sectionCopy', row.section)
}
- this.sampleId = row.id
- if (this.active !== 1) {
- this.sampleIds = []
- this.sampleSelectionList.forEach(ele=>{
- if(ele.id == row.id){
- this.sampleIds.push(row.id)
+ }
+ if (row.ask.includes('[')) {
+ this.$set(row, 'askCopy', row.ask)
+ }
+ if (row.tell.includes('[')) {
+ this.$set(row, 'tellCopy', row.tell)
+ }
+ let arr = this.productList.filter(m => m.state == 1 && row.sectionCopy && row.sectionCopy.includes(m.sectionCopy) && m.ask && m.sectionCopy.indexOf('[') == -1)
+ if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.sectionCopy !== undefined && row.state === 1 && arr.length == 0) {
+ if (row.sectionCopy.indexOf('[') > -1) {
+ row.bsmRow = this.HaveJson(row)
+ }
+ row.bsm1 = true
+ this.bsm1DiaList.push(row)
+ this.bsm1DiaAll = true
+ } else if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.state === 0 && arr.length == 0) {
+ row.bsm1 = false
+ } else if (arr.length > 0) {
+ try {
+ row.bsmRow = this.HaveJson(row)
+ let sectionCopy = arr[0].sectionCopy
+ let arr0 = JSON.parse(row.sectionCopy)
+ let arr1 = JSON.parse(row.ask)
+ let arr4 = JSON.parse(row.tell)
+ let index = arr0.indexOf(sectionCopy)
+ row.sectionCopy = sectionCopy
+ row.ask = arr1[index]
+ row.tell = arr4[index]
+ } catch (e) {
+ }
+ }
+ this.sampleList.forEach(item => {
+ if (this.sampleIds.indexOf(item.id) > -1 || this.currentMethod.id == item.id) {
+ item.insProduct.forEach(m => {
+ if (m.id == row.id) {
+ m.state = row.state;
}
})
}
+ })
+ this.productList.forEach(item => {
+ if (item.id == row.id) {
+ item.state = row.state;
+ }
+ })
+ this.changeProductList0()
+ this.currentMethod.insProduct = this.productList0
+ this.inspectionScope = this.productList.length > 0 && this.productList.every(item => item.state == 1)
+ ? 'all'
+ : 'specified'
+ this.getProNum()
+ },
+ permute(nums) {
+ const result = [];
+
+ function backtrack(temp, nums) {
+ if (temp.length === 2) {
+ result.push([...temp]);
+ return;
+ }
+ for (let i = 0; i < nums.length; i++) {
+ if (temp.includes(nums[i])) continue;
+ // 閬垮厤閲嶅鏁板瓧
+ if (temp.length > 0 && nums[i] < temp[temp.length - 1]) continue; // 瑙勫畾椤哄簭锛岄伩鍏嶉噸澶嶇粍鍚�
+ temp.push(nums[i]);
+ backtrack(temp, nums);
+ temp.pop();
+ }
+ }
+
+ backtrack([], nums);
+ return result;
+ },
+ tableRowClassName({row, rowIndex}) {
+ if (row.state == 1) {
+ return 'warning-row';
+ } else {
+ return '';
+ }
+ },
+ selectInsOrderTemplate() {
+ selectInsOrderTemplate({company: this.addObj.company}).then(res => {
+ this.templates = res.data
+ })
+ },
+ // 鍒犻櫎妯℃澘--璋冪敤鎺ュ彛
+ handleDelete(row) {
+ this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ delInsOrderTemplate({
+ id: row.id
+ }).then(res => {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.selectInsOrderTemplate()
+ }).catch(e => {
+ this.$message.error('鍒犻櫎澶辫触')
+ })
+ }).catch(() => {
+ })
+ },
+ // 淇濆瓨妯℃澘
+ addTemplateDia() {
+ if (this.templateName) {
+ this.templateLoading = true;
+ addInsOrderTemplate({
+ name: this.templateName,
+ thing: JSON.stringify({
+ addObj: this.addObj,
+ sampleList: this.sampleList,
+ selectTree: this.selectTree
+ })
+ }).then(res => {
+ this.templateLoading = false;
+ this.templateDia = false;
+ this.$message.success('淇濆瓨鎴愬姛')
+ this.selectInsOrderTemplate()
+ this.templateName = ''
+ }).catch(e => {
+ this.templateLoading = false;
+ })
+ } else {
+ this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
+ }
+ },
+ // 鏌ヨ妯℃澘
+ selectInsOrderTemplateById(e) {
+ selectInsOrderTemplateById({id: e}).then(res => {
+ let obj = JSON.parse(res.data)
+ //鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
+ let user = this.nickName
+ obj.addObj.custom = user.name
+ obj.addObj.userId = user.userId
+ this.addObj = obj.addObj;
+ this.sampleList = obj.sampleList;
+ this.selectTree = obj.selectTree
+ this.rowClick(this.sampleList[0])
+ })
+ },
+ delSampleAndProduct() {
+ this.sampleList.splice(scope.$index, 1)
+ this.productList = []
+ },
+ spliceString(row, val, type) {
+ if (type === 'cores') {
+ const index = this.sampleList.findIndex(item => item.id === row.id)
+ if (index > -1) {
+ if (this.sampleList[index].modelNum) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores + '*' + this.sampleList[index].modelNum)
+ } else {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores)
+ }
+ if (this.sampleList[index].modelNum && !this.sampleList[index].cores) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].modelNum)
+ }
+ }
+ }
+ this.getProductLoad = true
+ selectStandardProductList({
+ model: this.addObj.model ? this.addObj.model : row.model,
+ modelNum: row.modelNum,
+ standardMethodListId: val,
+ factory: this.buildFactoryPath(this.addObj.model),
+ cores: row.cores,
+ conductorMaterial: row.conductorMaterial,
+ conductorType: row.conductorType,
+ }).then(res => {
+ res.data.forEach(a => {
+ a.state = this.inspectionScope === 'all' ? 1 : 0
+ })
+ row.insProduct = this.HaveJson(res.data)
+ this.getProductLoad = false
this.productList = row.insProduct
this.productList0 = JSON.parse(JSON.stringify(this.productList))
- this.inspectionScope = this.productList.length === 0
- ? (this.active == 1 ? 'all' : 'specified')
- : (this.productList.every(item => item.state == 1) ? 'all' : 'specified')
+ this.$refs.sampleTable.setCurrentRow(row)
+ this.$nextTick(() => {
+ this.$refs.productTable.doLayout();
+ this.upIndex++
+ });
setTimeout(() => {
this.productList.forEach(a => {
- if (a.state == 1) {
- this.toggleSelection(a)
- }else{
- this.$refs.productTable.toggleRowSelection(a, false);
- }
+ if (a.state == 1) this.toggleSelection(a)
})
+ if (this.inspectionScope === 'all') {
+ this.handleAll(this.productList.filter(item => this.selectable0(item)))
+ }
}, 200)
- },
- toggleSelection(row) {
- this.$refs.productTable.toggleRowSelection(row, true);
- },
- selectOne(selection, row) {
- this.bsm1DiaList = []
- row.state = row.state == 1 ? 0 : 1
- if(row.section === null) {
- row.section = ""
- }
- if (row.sectionCopy === undefined && row.section) {
- if (row.section.indexOf('[') > -1) {
- this.$set(row, 'sectionCopy', row.section)
- }
- }
- if (row.ask.includes('[')) {
- this.$set(row, 'askCopy', row.ask)
- }
- if (row.tell.includes('[')) {
- this.$set(row, 'tellCopy', row.tell)
- }
- let arr = this.productList.filter(m=>m.state==1&&row.sectionCopy&&row.sectionCopy.includes(m.sectionCopy)&&m.ask&&m.sectionCopy.indexOf('[')==-1)
- if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.sectionCopy !== undefined && row.state === 1&&arr.length==0) {
- if (row.sectionCopy.indexOf('[') > -1) {
- row.bsmRow = this.HaveJson(row)
- }
- row.bsm1 = true
- this.bsm1DiaList.push(row)
- this.bsm1DiaAll = true
- } else if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.state === 0&&arr.length==0) {
- row.bsm1 = false
- }else if(arr.length>0){
- try{
- row.bsmRow = this.HaveJson(row)
- let sectionCopy = arr[0].sectionCopy
- let arr0 = JSON.parse(row.sectionCopy)
- let arr1 = JSON.parse(row.ask)
- let arr4 = JSON.parse(row.tell)
- let index = arr0.indexOf(sectionCopy)
- row.sectionCopy = sectionCopy
- row.ask = arr1[index]
- row.tell = arr4[index]
- } catch(e) {}
- }
- this.sampleList.forEach(item => {
- if (this.sampleIds.indexOf(item.id) > -1||this.currentMethod.id==item.id) {
- item.insProduct.forEach(m => {
- if (m.id == row.id) {
- m.state = row.state;
- }
- })
- }
- })
- this.productList.forEach(item => {
- if (item.id == row.id) {
- item.state = row.state;
- }
- })
- this.changeProductList0()
- this.currentMethod.insProduct = this.productList0
- this.inspectionScope = this.productList.length > 0 && this.productList.every(item => item.state == 1)
- ? 'all'
- : 'specified'
- this.getProNum()
- },
- permute(nums) {
- const result = [];
-
- function backtrack(temp, nums) {
- if (temp.length === 2) {
- result.push([...temp]);
- return;
- }
- for (let i = 0; i < nums.length; i++) {
- if (temp.includes(nums[i])) continue;
- // 閬垮厤閲嶅鏁板瓧
- if (temp.length > 0 && nums[i] < temp[temp.length - 1]) continue; // 瑙勫畾椤哄簭锛岄伩鍏嶉噸澶嶇粍鍚�
- temp.push(nums[i]);
- backtrack(temp, nums);
- temp.pop();
- }
- }
- backtrack([], nums);
- return result;
- },
- tableRowClassName({row, rowIndex}) {
- if (row.state == 1) {
- return 'warning-row';
- } else {
- return '';
- }
- },
- selectInsOrderTemplate() {
- selectInsOrderTemplate({company: this.addObj.company}).then(res => {
- this.templates = res.data
- })
- },
- // 鍒犻櫎妯℃澘--璋冪敤鎺ュ彛
- handleDelete(row) {
- this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- delInsOrderTemplate({
- id: row.id
- }).then(res => {
- this.$message.success('鍒犻櫎鎴愬姛')
- this.selectInsOrderTemplate()
- }).catch(e => {
- this.$message.error('鍒犻櫎澶辫触')
- })
- }).catch(() => {})
- },
- // 淇濆瓨妯℃澘
- addTemplateDia() {
- if (this.templateName) {
- this.templateLoading = true;
- addInsOrderTemplate({
- name: this.templateName,
- thing: JSON.stringify({
- addObj: this.addObj,
- sampleList: this.sampleList,
- selectTree:this.selectTree
- })
- }).then(res => {
- this.templateLoading = false;
- this.templateDia = false;
- this.$message.success('淇濆瓨鎴愬姛')
- this.selectInsOrderTemplate()
- this.templateName = ''
- }).catch(e => {
- this.templateLoading = false;
- })
- } else {
- this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
- }
- },
- // 鏌ヨ妯℃澘
- selectInsOrderTemplateById(e) {
- selectInsOrderTemplateById({id: e}).then(res => {
- let obj = JSON.parse(res.data)
- //鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
- let user = this.nickName
- obj.addObj.custom = user.name
- obj.addObj.userId = user.userId
- this.addObj = obj.addObj;
- this.sampleList = obj.sampleList;
- this.selectTree = obj.selectTree
- this.rowClick(this.sampleList[0])
- })
- },
- delSampleAndProduct() {
- this.sampleList.splice(scope.$index, 1)
- this.productList = []
- },
- spliceString (row, val, type) {
- if (type === 'cores') {
- const index = this.sampleList.findIndex(item => item.id === row.id)
- if (index > -1) {
+ })
+ },
+ methodChange(val, row, type) {
+ if (type === 'splice') {
+ const index = this.sampleList.findIndex(item => item.id === row.id)
+ if (index > -1) {
+ if (this.sampleList[index].cores) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores + '*' + this.sampleList[index].modelNum)
+ } else {
if (this.sampleList[index].modelNum) {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores + '*' + this.sampleList[index].modelNum)
+ const index2 = this.sampleList[index].modelNum.indexOf('脳')
+ if (index2 === 0) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + this.sampleList[index].modelNum)
+ } else if (index2 === -1) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].modelNum)
+ } else {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].modelNum + this.sampleList[index].model)
+ }
} else {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores)
- }
- if (this.sampleList[index].modelNum && !this.sampleList[index].cores) {
- this.$set(this.sampleList[index], 'endModels',this.sampleList[index].model + ' ' + this.sampleList[index].modelNum)
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ((this.sampleList[index].modelNum == null || this.sampleList[index].modelNum == '' || this.sampleList[index].modelNum == 'null') ? '' : (' ' + this.sampleList[index].modelNum)))
}
}
+ if (!this.sampleList[index].modelNum && this.sampleList[index].cores) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores)
+ }
}
- this.getProductLoad = true
- selectStandardProductList({
- model: this.addObj.model?this.addObj.model:row.model,
- modelNum: row.modelNum,
- standardMethodListId: val,
- factory: this.buildFactoryPath(this.addObj.model),
- cores: row.cores,
- conductorMaterial: row.conductorMaterial,
- conductorType: row.conductorType,
- }).then(res => {
- res.data.forEach(a => {
- a.state = this.inspectionScope === 'all' ? 1 : 0
- })
- row.insProduct = this.HaveJson(res.data)
- this.getProductLoad = false
- this.productList = row.insProduct
- this.productList0 = JSON.parse(JSON.stringify(this.productList))
- this.$refs.sampleTable.setCurrentRow(row)
- this.$nextTick(() => {
- this.$refs.productTable.doLayout();
- this.upIndex++
- });
- setTimeout(() => {
- this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- if (this.inspectionScope === 'all') {
- this.handleAll(this.productList.filter(item => this.selectable0(item)))
- }
- }, 200)
+ }
+ if (val === null || val === '') return
+ this.currentMethod = row
+ let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ if (obj && obj.code == '鎶�鏈姹�') {
+ this.isAskOnlyRead = true
+ } else {
+ this.isAskOnlyRead = false
+ }
+ this.getProductLoad = true
+ selectStandardProductList({
+ model: this.addObj.model ? this.addObj.model : row.model,
+ modelNum: row.modelNum,
+ standardMethodListId: val,
+ cores: row.cores,
+ factory: this.buildFactoryPath(this.addObj.model),
+ }).then(res => {
+ res.data.forEach(a => {
+ a.state = this.inspectionScope === 'all' ? 1 : 0
})
- },
- methodChange(val, row, type) {
- if (type === 'splice') {
- const index = this.sampleList.findIndex(item => item.id === row.id)
- if (index > -1) {
- if (this.sampleList[index].cores) {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores + '*' + this.sampleList[index].modelNum)
- } else {
- if (this.sampleList[index].modelNum) {
- const index2 = this.sampleList[index].modelNum.indexOf('脳')
- if (index2 === 0) {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + this.sampleList[index].modelNum)
- } else if (index2 === -1) {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].modelNum)
- } else {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].modelNum + this.sampleList[index].model)
+ row.insProduct = this.HaveJson(res.data)
+ this.getProductLoad = false
+ this.productList = row.insProduct
+ this.productList0 = JSON.parse(JSON.stringify(this.productList))
+ this.$refs.sampleTable.setCurrentRow(row)
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ if (this.inspectionScope === 'all') {
+ this.handleAll(this.productList.filter(item => this.selectable0(item)))
+ }
+ }, 200)
+ })
+ },
+ changeModel() {
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if (obj) {
+ a.model = this.model
+ }
+ })
+ },
+ changeStandardMethodListId() {
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if (obj) {
+ a.standardMethodListId = this.standardMethodListId
+ this.methodChange(this.standardMethodListId, a)
+ }
+ })
+ },
+ methodFocus() {
+ this.selectsStandardMethodByFLSSMList()
+ },
+ handleChangeModel(e) {
+ this.productList = []
+ const tree = this.selectTree || ''
+ // 璺緞鏈宸叉槸鏍囧噯(鍙跺瓙)锛氭浛鎹㈡湯娈碉紱鍚﹀垯杩藉姞
+ // 鐢ㄨ矾寰勫垽瀹氾細妯℃澘鍥炲～(obj.selectTree)鏃舵病鏈夊彲鐢ㄧ殑鏍戣妭鐐瑰璞�
+ if (isLeafPath(tree)) {
+ this.selectTree = this.buildFactoryPath(e)
+ } else {
+ this.selectTree = tree ? tree + ' - ' + e : e
+ }
+ },
+ // 瑕佹眰鍊煎彉鍖栨椂
+ requestChange(e, row, type) {
+ //this.currentMethod 褰撳墠鏍峰搧id
+ this.sampleList.forEach(item => {
+ if (item.id == this.currentMethod.id) {
+ item.insProduct.forEach(i => {
+ if (i.id == row.id) {
+ if (row.repetitionTag) {
+ if (row.repetitionTag == i.repetitionTag) {
+ i[type] = e
}
} else {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ((this.sampleList[index].modelNum == null || this.sampleList[index].modelNum == '' || this.sampleList[index].modelNum == 'null') ? '' : (' ' + this.sampleList[index].modelNum)))
- }
- }
- if (!this.sampleList[index].modelNum && this.sampleList[index].cores) {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores)
- }
- }
- }
- if (val === null || val === '') return
- this.currentMethod = row
- let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
- if (obj && obj.code == '鎶�鏈姹�') {
- this.isAskOnlyRead = true
- } else {
- this.isAskOnlyRead = false
- }
- this.getProductLoad = true
- selectStandardProductList({
- model: this.addObj.model?this.addObj.model:row.model,
- modelNum: row.modelNum,
- standardMethodListId: val,
- cores: row.cores,
- factory: this.buildFactoryPath(this.addObj.model),
- }).then(res => {
- res.data.forEach(a => {
- a.state = this.inspectionScope === 'all' ? 1 : 0
- })
- row.insProduct = this.HaveJson(res.data)
- this.getProductLoad = false
- this.productList = row.insProduct
- this.productList0 = JSON.parse(JSON.stringify(this.productList))
- this.$refs.sampleTable.setCurrentRow(row)
- setTimeout(() => {
- this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- if (this.inspectionScope === 'all') {
- this.handleAll(this.productList.filter(item => this.selectable0(item)))
- }
- }, 200)
- })
- },
- changeModel() {
- this.sampleList.forEach(a => {
- let obj = this.sampleIds.find(b => b == a.id)
- if (obj) {
- a.model = this.model
- }
- })
- },
- changeStandardMethodListId() {
- this.sampleList.forEach(a => {
- let obj = this.sampleIds.find(b => b == a.id)
- if (obj) {
- a.standardMethodListId = this.standardMethodListId
- this.methodChange(this.standardMethodListId, a)
- }
- })
- },
- methodFocus() {
- this.selectsStandardMethodByFLSSMList()
- },
- handleChangeModel(e) {
- this.productList = []
- const tree = this.selectTree || ''
- // 璺緞鏈宸叉槸鏍囧噯(鍙跺瓙)锛氭浛鎹㈡湯娈碉紱鍚﹀垯杩藉姞
- // 鐢ㄨ矾寰勫垽瀹氾細妯℃澘鍥炲～(obj.selectTree)鏃舵病鏈夊彲鐢ㄧ殑鏍戣妭鐐瑰璞�
- if (isLeafPath(tree)) {
- this.selectTree = this.buildFactoryPath(e)
- } else {
- this.selectTree = tree ? tree + ' - ' + e : e
- }
- },
- // 瑕佹眰鍊煎彉鍖栨椂
- requestChange(e, row,type) {
- //this.currentMethod 褰撳墠鏍峰搧id
- this.sampleList.forEach(item=>{
- if(item.id == this.currentMethod.id){
- item.insProduct.forEach(i=>{
- if(i.id == row.id){
- if(row.repetitionTag){
- if(row.repetitionTag==i.repetitionTag){
- i[type] = e
- }
- }else{
- if(!i.repetitionTag){
- i[type] = e
- }
+ if (!i.repetitionTag) {
+ i[type] = e
}
}
+ }
+ })
+ }
+ })
+ },
+ selectStandardMethods() {
+ selectStandardMethodEnum().then(res => {
+ this.methods = res.data
+ })
+ },
+ selectable() {
+ if (this.active > 1) {
+ return false
+ } else {
+ return true
+ }
+ },
+ selectable0(row, index) {
+ if (!this.canSelectProduct || row.repetitionTag) {
+ return false
+ } else {
+ return true
+ }
+ },
+ handleAll(e) {
+ if (e.length > 0) {
+ this.productList.map(m => {
+ if (e.find(a => a.id == m.id)) {
+ m.state = 1
+ }
+ return m
+ })
+ } else {
+ this.productList.map(m => {
+ m.state = 0
+ return m
+ })
+ }
+ this.bsm1DiaList = []
+ this.productList.forEach(p => {
+ if (p.sectionCopy === undefined && p.section) {
+ if (p.section.indexOf('[') > -1) {
+ this.$set(p, 'sectionCopy', p.section)
+ }
+ }
+ if (p.ask.includes('[')) {
+ this.$set(p, 'askCopy', p.ask)
+ }
+ if (p.tell.includes('[')) {
+ this.$set(p, 'tellCopy', p.tell)
+ }
+ // if (p.manHour.includes('[')) {
+ // this.$set(p, 'manHourCopy', p.manHour)
+ // }
+ // if (p.price.includes('[')) {
+ // this.$set(p, 'priceCopy', p.price)
+ // }
+ if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
+ if (p.sectionCopy.indexOf('[') > -1) {
+ p.bsmRow = this.HaveJson(p)
+ }
+ p.bsm1 = true
+ this.bsm1DiaList.push(p)
+ this.bsm1DiaAll = true
+ } else if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.state === 0) {
+ p.bsm1 = false
+ }
+ })
+ if (e.length > 0) {
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1 || this.currentMethod.id == item.id) {
+ item.insProduct.map(m => {
+ m.state = 1
+ return m;
})
}
+ return item
})
- },
- selectStandardMethods() {
- selectStandardMethodEnum().then(res => {
- this.methods = res.data
- })
- },
- selectable() {
- if (this.active > 1) {
- return false
- } else {
- return true
- }
- },
- selectable0(row,index) {
- if (!this.canSelectProduct||row.repetitionTag) {
- return false
- } else {
- return true
- }
- },
- handleAll(e) {
- if (e.length > 0) {
- this.productList.map(m => {
- if(e.find(a=>a.id == m.id)){
- m.state = 1
- }
- return m
- })
- } else {
- this.productList.map(m => {
- m.state = 0
- return m
- })
- }
- this.bsm1DiaList = []
- this.productList.forEach(p => {
- if (p.sectionCopy === undefined && p.section) {
- if (p.section.indexOf('[') > -1) {
- this.$set(p, 'sectionCopy', p.section)
- }
+ } else {
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1 || this.currentMethod.id == item.id) {
+ item.insProduct.map(m => {
+ m.state = 0
+ return m;
+ })
}
- if (p.ask.includes('[')) {
- this.$set(p, 'askCopy', p.ask)
- }
- if (p.tell.includes('[')) {
- this.$set(p, 'tellCopy', p.tell)
- }
- // if (p.manHour.includes('[')) {
- // this.$set(p, 'manHourCopy', p.manHour)
- // }
- // if (p.price.includes('[')) {
- // this.$set(p, 'priceCopy', p.price)
- // }
- if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
- if (p.sectionCopy.indexOf('[') > -1) {
- p.bsmRow = this.HaveJson(p)
- }
- p.bsm1 = true
- this.bsm1DiaList.push(p)
- this.bsm1DiaAll = true
- } else if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.state === 0) {
- p.bsm1 = false
- }
+ return item
})
- if (e.length > 0) {
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1||this.currentMethod.id==item.id) {
- item.insProduct.map(m => {
- m.state = 1
- return m;
- })
- }
- return item
- })
+ }
+ this.changeProductList0()
+ this.currentMethod.insProduct = this.productList0
+ this.inspectionScope = e.length > 0 ? 'all' : 'specified'
+ this.getProNum()
+ this.$nextTick(() => {
+ this.$refs.productTable.doLayout()
+ })
+ },
+ changeInspectionScope(scope) {
+ if (scope !== 'all' || this.productList.length === 0) return
+ this.$refs.productTable.clearSelection()
+ this.productList.forEach(item => {
+ if (this.selectable0(item)) this.$refs.productTable.toggleRowSelection(item, true)
+ })
+ this.handleAll(this.productList.filter(item => this.selectable0(item)))
+ },
+ inspectionProductKey(product) {
+ return [
+ product.structureItemParameterId,
+ product.inspectionItemClass,
+ product.inspectionItem,
+ product.inspectionItemSubclass
+ ].join('|')
+ },
+ loadSelectableProducts(sample) {
+ const selectedProducts = sample.insProduct || []
+ if (!sample.standardMethodListId) return Promise.resolve(sample)
+ const product = selectedProducts[0] || {}
+ const factory = this.buildFactoryPath(product.model || sample.model)
+ return selectStandardProductList({
+ model: sample.model,
+ modelNum: sample.modelNum,
+ standardMethodListId: sample.standardMethodListId,
+ factory,
+ cores: sample.cores,
+ conductorMaterial: sample.conductorMaterial,
+ conductorType: sample.conductorType
+ }).then(res => {
+ const selectedKeys = new Set(selectedProducts.map(item => this.inspectionProductKey(item)))
+ const availableProducts = (res.data || [])
+ .filter(item => !selectedKeys.has(this.inspectionProductKey(item)))
+ .map((item, index) => ({...item, id: `new-${sample.id}-${index}`, state: 0, isNew: true}))
+ sample.insProduct = selectedProducts.concat(availableProducts)
+ return sample
+ }).catch(() => sample)
+ },
+ submitTell() {
+ if (!this.tell) {
+ this.$message.error('璇疯緭鍏ヤ笉閫氳繃鍘熷洜')
+ return
+ }
+ this.noLoading = true;
+ upInsOrderOfState({
+ state: 2,
+ id: this.currentId,
+ tell: this.tell
+ }).then(res => {
+ this.noLoading = false;
+ this.tell = '';
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.issuedDialogVisible = false;
+ this.closeOpenPage()
+ })
+ },
+ filterHandler(value, row, column) {
+ const property = column['property'];
+ return row[property] === value;
+ },
+ areObjectsValuesEqual(objects, property) {
+ if (!objects || objects.length === 0) return false;
+ const firstValue = objects[0][property];
+ return objects.every(obj => obj[property] === firstValue);
+ },
+ // 杈呭姪绾胯姱閰嶇疆
+ openAuxiliaryCore() {
+ if (this.active == 1) {
+ if (this.sampleIds.length === 0) {
+ this.$message.error("鏈�夋嫨鏍峰搧")
+ } else if (this.sampleIds.length === 1) {
+ if (!this.sampleSelectionList[0].standardMethodListId) {
+ this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ return
+ }
+ this.auxiliaryShow = true
} else {
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1||this.currentMethod.id==item.id) {
- item.insProduct.map(m => {
- m.state = 0
- return m;
- })
- }
- return item
- })
- }
- this.changeProductList0()
- this.currentMethod.insProduct = this.productList0
- this.inspectionScope = e.length > 0 ? 'all' : 'specified'
- this.getProNum()
- this.$nextTick(() => {
- this.$refs.productTable.doLayout()
- })
- },
- changeInspectionScope(scope) {
- if (scope !== 'all' || this.productList.length === 0) return
- this.$refs.productTable.clearSelection()
- this.productList.forEach(item => {
- if (this.selectable0(item)) this.$refs.productTable.toggleRowSelection(item, true)
- })
- this.handleAll(this.productList.filter(item => this.selectable0(item)))
- },
- inspectionProductKey(product) {
- return [
- product.structureItemParameterId,
- product.inspectionItemClass,
- product.inspectionItem,
- product.inspectionItemSubclass
- ].join('|')
- },
- loadSelectableProducts(sample) {
- const selectedProducts = sample.insProduct || []
- if (!sample.standardMethodListId) return Promise.resolve(sample)
- const product = selectedProducts[0] || {}
- const factory = this.buildFactoryPath(product.model || sample.model)
- return selectStandardProductList({
- model: sample.model,
- modelNum: sample.modelNum,
- standardMethodListId: sample.standardMethodListId,
- factory,
- cores: sample.cores,
- conductorMaterial: sample.conductorMaterial,
- conductorType: sample.conductorType
- }).then(res => {
- const selectedKeys = new Set(selectedProducts.map(item => this.inspectionProductKey(item)))
- const availableProducts = (res.data || [])
- .filter(item => !selectedKeys.has(this.inspectionProductKey(item)))
- .map((item, index) => ({...item, id: `new-${sample.id}-${index}`, state: 0, isNew: true}))
- sample.insProduct = selectedProducts.concat(availableProducts)
- return sample
- }).catch(() => sample)
- },
- submitTell() {
- if (!this.tell) {
- this.$message.error('璇疯緭鍏ヤ笉閫氳繃鍘熷洜')
- return
- }
- this.noLoading = true;
- upInsOrderOfState({
- state: 2,
- id: this.currentId,
- tell: this.tell
- }).then(res => {
- this.noLoading = false;
- this.tell = '';
- this.$message.success('鎻愪氦鎴愬姛')
- this.issuedDialogVisible = false;
- this.closeOpenPage()
- })
- },
- filterHandler(value, row, column) {
- const property = column['property'];
- return row[property] === value;
- },
- areObjectsValuesEqual (objects, property) {
- if (!objects || objects.length === 0) return false;
- const firstValue = objects[0][property];
- return objects.every(obj => obj[property] === firstValue);
- },
- // 杈呭姪绾胯姱閰嶇疆
- openAuxiliaryCore () {
- if (this.active == 1) {
- if (this.sampleIds.length === 0) {
- this.$message.error("鏈�夋嫨鏍峰搧")
- } else if (this.sampleIds.length === 1) {
- if (!this.sampleSelectionList[0].standardMethodListId) {
- this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ // 鍚屾椂閰嶇疆澶氫釜鏍峰搧鐨勭數缂嗛厤缃椂蹇呴』閫夋嫨鐩稿悓鐨勬楠屾爣鍑�
+ if (!this.sampleSelectionList.every(value => value.standardMethodListId)) {
+ this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ } else {
+ if (!this.areObjectsValuesEqual(this.sampleSelectionList, 'standardMethodListId')) {
+ this.$message.error("璇烽�夋嫨鐩稿悓鐨勬楠屾爣鍑�")
return
}
this.auxiliaryShow = true
- } else {
- // 鍚屾椂閰嶇疆澶氫釜鏍峰搧鐨勭數缂嗛厤缃椂蹇呴』閫夋嫨鐩稿悓鐨勬楠屾爣鍑�
- if (!this.sampleSelectionList.every(value => value.standardMethodListId)) {
- this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
- } else {
- if (!this.areObjectsValuesEqual(this.sampleSelectionList, 'standardMethodListId')) {
- this.$message.error("璇烽�夋嫨鐩稿悓鐨勬楠屾爣鍑�")
- return
- }
- this.auxiliaryShow = true
- }
- }
- } else {
- if (this.sampleId === null) {
- this.$message.error('鏈�変腑鏍峰搧')
}
}
- },
- openCableConfig() {
- if (this.active == 1) {
- if (this.sampleIds.length === 0) {
- this.$message.error("鏈�夋嫨鏍峰搧")
- } else if (this.sampleIds.length === 1) {
- if (!this.sampleSelectionList[0].standardMethodListId) {
- this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ } else {
+ if (this.sampleId === null) {
+ this.$message.error('鏈�変腑鏍峰搧')
+ }
+ }
+ },
+ openCableConfig() {
+ if (this.active == 1) {
+ if (this.sampleIds.length === 0) {
+ this.$message.error("鏈�夋嫨鏍峰搧")
+ } else if (this.sampleIds.length === 1) {
+ if (!this.sampleSelectionList[0].standardMethodListId) {
+ this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ return
+ }
+ this.cableConfigShow = true
+ } else {
+ // 鍚屾椂閰嶇疆澶氫釜鏍峰搧鐨勭數缂嗛厤缃椂蹇呴』閫夋嫨鐩稿悓鐨勬楠屾爣鍑�
+ if (!this.sampleSelectionList.every(value => value.standardMethodListId)) {
+ this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ } else {
+ if (!this.areObjectsValuesEqual(this.sampleSelectionList, 'standardMethodListId')) {
+ this.$message.error("璇烽�夋嫨鐩稿悓鐨勬楠屾爣鍑�")
return
}
this.cableConfigShow = true
- } else {
- // 鍚屾椂閰嶇疆澶氫釜鏍峰搧鐨勭數缂嗛厤缃椂蹇呴』閫夋嫨鐩稿悓鐨勬楠屾爣鍑�
- if (!this.sampleSelectionList.every(value => value.standardMethodListId)) {
- this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
- } else {
- if (!this.areObjectsValuesEqual(this.sampleSelectionList, 'standardMethodListId')) {
- this.$message.error("璇烽�夋嫨鐩稿悓鐨勬楠屾爣鍑�")
- return
+ }
+ }
+ } else {
+ if (this.sampleId === null) {
+ this.$message.error('鏈�変腑鏍峰搧')
+ }
+ }
+ },
+ goBackAdd() {
+ this.cableConfigShow = false
+ },
+ goBackAdd2() {
+ this.auxiliaryShow = false
+ },
+ // 鍏ㄩ�夌壒娈婂�煎鐞嗘閫夋嫨瑕佹眰鍊肩殑鍥炶皟
+ upBsmAll(item) {
+ const i = this.bsm1DiaList.findIndex(obj => obj.id === item.id)
+ if (i > -1) {
+ // 鎵惧埌鐩稿簲鐨勬楠岄」璧嬪��
+ this.bsm1DiaList[i].bsm1Val = item.bsm1Val
+ let sections = this.bsm1DiaList[i].bsmRow.sectionCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.sectionCopy);
+ let asks = this.bsm1DiaList[i].bsmRow.askCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.askCopy);
+ let tells = this.bsm1DiaList[i].bsmRow.tellCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.tellCopy);
+ // let manHours = this.bsm1DiaList[i].bsmRow.manHourCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.manHourCopy);
+ // let prices = this.bsm1DiaList[i].bsmRow.priceCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.priceCopy);
+ for (var a in sections) {
+ if (this.bsm1DiaList[i].bsm1Val === sections[a]) {
+ this.productList.forEach(p => {
+ // 灏嗛�夋嫨濂界殑瑕佹眰鍊艰祴鍊煎埌鍒楄〃閲�
+ if (p.id === this.bsm1DiaList[i].bsmRow.id) {
+ p.section = sections[a]
+ p.ask = asks[a]
+ p.tell = tells[a]
+ // p.manHour = manHours[a]
+ // p.price = prices[a]
}
- this.cableConfigShow = true
- }
- }
- } else {
- if (this.sampleId === null) {
- this.$message.error('鏈�変腑鏍峰搧')
- }
- }
- },
- goBackAdd () {
- this.cableConfigShow = false
- },
- goBackAdd2 () {
- this.auxiliaryShow = false
- },
- // 鍏ㄩ�夌壒娈婂�煎鐞嗘閫夋嫨瑕佹眰鍊肩殑鍥炶皟
- upBsmAll (item) {
- const i = this.bsm1DiaList.findIndex(obj => obj.id === item.id)
- if (i > -1) {
- // 鎵惧埌鐩稿簲鐨勬楠岄」璧嬪��
- this.bsm1DiaList[i].bsm1Val = item.bsm1Val
- let sections = this.bsm1DiaList[i].bsmRow.sectionCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.sectionCopy);
- let asks = this.bsm1DiaList[i].bsmRow.askCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.askCopy);
- let tells = this.bsm1DiaList[i].bsmRow.tellCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.tellCopy);
- // let manHours = this.bsm1DiaList[i].bsmRow.manHourCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.manHourCopy);
- // let prices = this.bsm1DiaList[i].bsmRow.priceCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.priceCopy);
- for (var a in sections) {
- if (this.bsm1DiaList[i].bsm1Val === sections[a]) {
- this.productList.forEach(p => {
- // 灏嗛�夋嫨濂界殑瑕佹眰鍊艰祴鍊煎埌鍒楄〃閲�
- if (p.id === this.bsm1DiaList[i].bsmRow.id) {
- p.section = sections[a]
- p.ask = asks[a]
- p.tell = tells[a]
- // p.manHour = manHours[a]
- // p.price = prices[a]
- }
- })
- break
- }
- }
- }
- this.changeProductList0()
- this.currentMethod.insProduct = this.productList0
- },
- save1 () {
- if (this.bsm1DiaList.length > 0) {
- this.bsm1DiaList.forEach(item => {
- if (!item.bsm1Val) {
- throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
- }
- })
- }
- this.bsm1DiaAll = false
- },
- beforeClose(done) {
- if (this.bsm1DiaList.length > 0) {
- this.bsm1DiaList.forEach(item => {
- if (!item.bsm1Val) {
- throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
- }
- })
- }
- done()
- },
- getTotal() {
- this.totalArr = []
- // this.total = 0;
- this.sampleList.forEach(item => {
- if (item.insProduct && item.insProduct.length > 0) {
- item.insProduct.forEach(a => {
- this.totalArr.push(a)
})
+ break
+ }
+ }
+ }
+ this.changeProductList0()
+ this.currentMethod.insProduct = this.productList0
+ },
+ save1() {
+ if (this.bsm1DiaList.length > 0) {
+ this.bsm1DiaList.forEach(item => {
+ if (!item.bsm1Val) {
+ throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
}
})
- let mySet = new Set();
- let arr0 = this.totalArr.filter(item => {
- if (item.state == 1) {
- let num1 = mySet.size
- if (item.manHourGroup === '' || !item.manHourGroup) {
+ }
+ this.bsm1DiaAll = false
+ },
+ beforeClose(done) {
+ if (this.bsm1DiaList.length > 0) {
+ this.bsm1DiaList.forEach(item => {
+ if (!item.bsm1Val) {
+ throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ }
+ })
+ }
+ done()
+ },
+ getTotal() {
+ this.totalArr = []
+ // this.total = 0;
+ this.sampleList.forEach(item => {
+ if (item.insProduct && item.insProduct.length > 0) {
+ item.insProduct.forEach(a => {
+ this.totalArr.push(a)
+ })
+ }
+ })
+ let mySet = new Set();
+ let arr0 = this.totalArr.filter(item => {
+ if (item.state == 1) {
+ let num1 = mySet.size
+ if (item.manHourGroup === '' || !item.manHourGroup) {
+ return true
+ } else {
+ mySet.add(item.manHourGroup)
+ let num2 = mySet.size
+ if (num2 > num1) {
return true
} else {
- mySet.add(item.manHourGroup)
- let num2 = mySet.size
- if (num2 > num1) {
- return true
- } else {
- return false
- }
+ return false
}
}
- })
- let arr1 = this.totalArr.filter(item => item.state == 1)
- let mySet0 = new Set();
- this.sonLaboratoryList = []
- arr1.forEach(item => {
- let num1 = mySet0.size
- mySet0.add(item.sonLaboratory)
- let num2 = mySet0.size
- if(num2>num1){
- this.sonLaboratoryList.push({
- label:item.sonLaboratory,
- value:item.sonLaboratory,
- })
- }
- })
- },
- changeUser(){
- if(this.newJuLaboratoryList.length>0){
- this.distributeData.sonLaboratory = this.newJuLaboratoryList[0].value
}
- },
- addProductList(productList,row,index){
- let list = productList.filter(m=>{
- if(m.id==row.id){
- m.delete = false
- }
- return m.id==row.id
- })
- let num = list.length
- let obj = this.HaveJson(row)
- obj.repetitionTag = num
- obj.delete = true
- productList.splice(index+num,0,obj)
- this.addProductList0(row,index)
- },
- addProductList0(row,index){
- let list = this.productList0.filter(m=>{
- if(m.id==row.id){
- m.delete = false
- }
- return m.id==row.id
- })
- let num = list.length
- let obj = this.HaveJson(row)
- obj.repetitionTag = num
- obj.delete = true
- this.productList0.splice(index+num,0,obj)
- },
- deleteProductList(index,list){
- if(list[index-1]&&list[index-1].repetitionTag){
- list[index-1].delete=true
+ })
+ let arr1 = this.totalArr.filter(item => item.state == 1)
+ let mySet0 = new Set();
+ this.sonLaboratoryList = []
+ arr1.forEach(item => {
+ let num1 = mySet0.size
+ mySet0.add(item.sonLaboratory)
+ let num2 = mySet0.size
+ if (num2 > num1) {
+ this.sonLaboratoryList.push({
+ label: item.sonLaboratory,
+ value: item.sonLaboratory,
+ })
}
- list.splice(index,1)
- this.deleteProductList0(index)
- },
- deleteProductList0(index){
- if(this.productList0[index-1]&&this.productList0[index-1].repetitionTag){
- this.productList0[index-1].delete=true
+ })
+ },
+ changeUser() {
+ if (this.newJuLaboratoryList.length > 0) {
+ this.distributeData.sonLaboratory = this.newJuLaboratoryList[0].value
+ }
+ },
+ addProductList(productList, row, index) {
+ let list = productList.filter(m => {
+ if (m.id == row.id) {
+ m.delete = false
}
- this.productList0.splice(index,1)
- },
- goBack () {
- if (this.active == 1) {
- this.$router.go(-1)
- } else {
- this.closeOpenPage()
+ return m.id == row.id
+ })
+ let num = list.length
+ let obj = this.HaveJson(row)
+ obj.repetitionTag = num
+ obj.delete = true
+ productList.splice(index + num, 0, obj)
+ this.addProductList0(row, index)
+ },
+ addProductList0(row, index) {
+ let list = this.productList0.filter(m => {
+ if (m.id == row.id) {
+ m.delete = false
}
- },
- closeOpenPage() {
+ return m.id == row.id
+ })
+ let num = list.length
+ let obj = this.HaveJson(row)
+ obj.repetitionTag = num
+ obj.delete = true
+ this.productList0.splice(index + num, 0, obj)
+ },
+ deleteProductList(index, list) {
+ if (list[index - 1] && list[index - 1].repetitionTag) {
+ list[index - 1].delete = true
+ }
+ list.splice(index, 1)
+ this.deleteProductList0(index)
+ },
+ deleteProductList0(index) {
+ if (this.productList0[index - 1] && this.productList0[index - 1].repetitionTag) {
+ this.productList0[index - 1].delete = true
+ }
+ this.productList0.splice(index, 1)
+ },
+ goBack() {
+ if (this.active == 1) {
this.$router.go(-1)
- this.$tab.closeOpenPage()
- },
- }
+ } else {
+ this.closeOpenPage()
+ }
+ },
+ closeOpenPage() {
+ this.$router.go(-1)
+ this.$tab.closeOpenPage()
+ },
}
+}
</script>
<style scoped>
->>>.warning-row {
+>>> .warning-row {
color: #1890FF;
}
+
.node_i {
color: orange;
font-size: 18px;
}
+
.template-tag-list {
min-height: 32px;
display: flex;
@@ -2390,26 +2547,32 @@
flex-wrap: wrap;
gap: 8px;
}
+
.newju-order-form >>> .el-form-item {
display: flex;
margin-right: 0;
}
+
.newju-order-form >>> .el-form-item__label {
flex: 0 0 108px;
}
+
.newju-order-form >>> .el-form-item__content {
flex: 1;
min-width: 0;
margin-left: 0 !important;
}
+
.newju-order-form >>> .el-input,
.newju-order-form >>> .el-select,
.newju-order-form >>> .el-date-editor {
width: 100%;
}
+
.empty-template-text {
color: #909399;
}
+
/* 濮旀墭鍗曚俊鎭細椤堕儴鎿嶄綔鏍� */
.order-header {
display: flex;
@@ -2420,49 +2583,60 @@
padding-bottom: 12px;
border-bottom: 1px solid #ebeef5;
}
+
.order-header__title {
font-size: 16px;
font-weight: bold;
color: #303133;
}
+
.order-header__actions {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 8px;
}
+
/* 闂磋窛缁熶竴浜ょ粰 gap锛屽幓鎺夌浉閭绘寜閽嚜甯︾殑 margin-left */
-.order-header__actions>>>.el-button+.el-button {
+.order-header__actions >>> .el-button + .el-button {
margin-left: 0;
}
+
.order-header__quarter {
width: 220px;
}
+
.order-header__template {
width: 160px;
}
+
/* 濮旀墭鍗曚俊鎭細琛ㄥ崟鍗＄墖 */
.order-body {
margin-top: 12px;
}
-.order-card>>>.el-card__body {
+
+.order-card >>> .el-card__body {
padding: 20px 20px 6px;
}
-.order-card>>>.el-form-item {
+
+.order-card >>> .el-form-item {
margin-bottom: 16px;
}
+
/* 鎺т欢缁熶竴鍗犳弧鏍囩涔嬪鐨勬暣鍒楀搴︼細el-date-editor 榛樿鍐欐 220px銆�
el-select 瀹藉害鏀剁缉鎴愬浐鏈夊搴︼紝涓嶆寚瀹氬氨浼氬拰鍏朵粬杈撳叆妗嗗乏鍙宠竟缂樺涓嶉綈 */
-.order-card>>>.el-input,
-.order-card>>>.el-select {
+.order-card >>> .el-input,
+.order-card >>> .el-select {
width: 100%;
}
+
/* append 鍗曞厓鏍肩殑 20px 鍐呰竟璺� + 鎸夐挳 -10px 璐熻竟璺濇槸鎸夐粯璁� 40px 鎸夐挳鏍囧畾鐨勶紝
small 杈撳叆涓嬫寜閽細姣旇緭鍏ユ楂樸�佷笂涓嬫孩鍑猴紱鏀规垚鎸夐挳鐩存帴鎾戞弧鍗曞厓鏍� */
-.order-card>>>.el-input-group__append {
+.order-card >>> .el-input-group__append {
padding: 0;
}
-.order-card>>>.el-input-group__append .el-button {
+
+.order-card >>> .el-input-group__append .el-button {
margin: 0;
padding: 9px 15px;
font-size: 12px;
diff --git a/src/views/business/productOrder/components/addView.vue b/src/views/business/productOrder/components/addView.vue
index 48765fb..1503f96 100644
--- a/src/views/business/productOrder/components/addView.vue
+++ b/src/views/business/productOrder/components/addView.vue
@@ -5,12 +5,12 @@
<div class="order-detail__title">濮旀墭鍗曚俊鎭�</div>
<div>
<el-cascader v-if="false"
- v-model="addObj.quarterItemId"
- :disabled="active>1"
- :options="quarterItemOptions"
- size="small"
- style="width: 380px"
- @focus="getQuarterOnOrderList"></el-cascader>
+ v-model="addObj.quarterItemId"
+ :disabled="active>1"
+ :options="quarterItemOptions"
+ size="small"
+ style="width: 380px"
+ @focus="getQuarterOnOrderList"></el-cascader>
<el-select v-show="active==1" v-model="template" placeholder="涓嬪崟妯℃澘" size="small"
@change="selectInsOrderTemplateById">
<el-option v-for="(a, ai) in templates" :key="ai" :label="a.name" :value="a.id">
@@ -22,14 +22,23 @@
<el-button v-show="active==1" size="small" @click="templateDia=true">
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
- <el-button v-if="active==1&&addObj.sampleType!=undefined&&(addObj.sampleType.indexOf('鐢电紗')>-1 ||addObj.sampleType.indexOf('缁煎悎')>-1)" size="small" type="primary" @click="openCableConfig">鐢电紗閰嶇疆</el-button>
- <el-button v-if="active==1&&addObj.sampleType!=undefined&&addObj.sampleType.indexOf('鐢电紗')>-1" size="small" type="primary" @click="openAuxiliaryCore">杈呭姪绾胯姱閰嶇疆</el-button>
- <el-button v-show="active==1||(tabIndex==4&&active==2)" :loading="saveLoad" size="small" type="primary" @click="save">鎻愪氦</el-button>
+ <el-button
+ v-if="active==1&&addObj.sampleType!=undefined&&(addObj.sampleType.indexOf('鐢电紗')>-1 ||addObj.sampleType.indexOf('缁煎悎')>-1)"
+ size="small" type="primary" @click="openCableConfig">鐢电紗閰嶇疆
+ </el-button>
+ <el-button v-if="active==1&&addObj.sampleType!=undefined&&addObj.sampleType.indexOf('鐢电紗')>-1" size="small"
+ type="primary" @click="openAuxiliaryCore">杈呭姪绾胯姱閰嶇疆
+ </el-button>
+ <el-button v-show="active==1||(tabIndex==4&&active==2)" :loading="saveLoad" size="small" type="primary"
+ @click="save">鎻愪氦
+ </el-button>
<!-- 瀹℃牳 -->
<el-button v-show="active==3" :disabled="saveLoad" :loading="saveLoad" size="small"
- @click="upInsOrderOfState(2)">涓嶉�氳繃</el-button>
+ @click="upInsOrderOfState(2)">涓嶉�氳繃
+ </el-button>
<el-button v-show="active==3" :loading="saveLoad" size="small" type="primary"
- @click="upInsOrderOfState(1)">閫氳繃</el-button>
+ @click="upInsOrderOfState(1)">閫氳繃
+ </el-button>
<el-button size="small" @click="goBack">
<span style="color: #3A7BFA;">杩斿洖</span>
</el-button>
@@ -54,23 +63,30 @@
<el-descriptions-item label="鑱旂郴鏂瑰紡">{{ addObj.phone || '-' }}</el-descriptions-item>
<el-descriptions-item label="鍘熷璁板綍妯℃澘" :span="4">
<div v-if="boundTemplateList.length" class="template-tag-list">
- <el-tag v-for="item in boundTemplateList" :key="item.templateId" size="small" effect="plain">{{ item.name }}</el-tag>
+ <el-tag v-for="item in boundTemplateList" :key="item.templateId" size="small" effect="plain">{{
+ item.name
+ }}
+ </el-tag>
</div>
<span v-else class="order-detail__empty">鏆傛湭缁戝畾鍘熷璁板綍妯℃澘</span>
</el-descriptions-item>
<el-descriptions-item label="澶囨敞" :span="4">{{ addObj.remark || '-' }}</el-descriptions-item>
</el-descriptions>
- <el-form v-show="false" ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px" label-position="right">
+ <el-form v-show="false" ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px"
+ label-position="right">
<el-row>
<el-col :span="6">
<el-form-item label="濮旀墭缂栧彿:" prop="entrustCode">
- <el-input v-model="addObj.entrustCode" clearable disabled placeholder="绯荤粺鐢熸垚" size="small"></el-input>
+ <el-input v-model="addObj.entrustCode" clearable disabled placeholder="绯荤粺鐢熸垚"
+ size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="妫�楠岀被鍒�:" prop="orderType">
- <el-select v-model="addObj.orderType" :disabled="active>1&&tabIndex!=4" clearable size="small" style="width: 100%;">
- <el-option v-for="(a, ai) in dict.type.check_type1" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <el-select v-model="addObj.orderType" :disabled="active>1&&tabIndex!=4" clearable size="small"
+ style="width: 100%;">
+ <el-option v-for="(a, ai) in dict.type.check_type1" :key="ai" :label="a.label"
+ :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -81,7 +97,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="濮旀墭鍗曚綅:" prop="company">
- <el-input v-model="addObj.company" disabled placeholder="閫夋嫨濮旀墭鍗曚綅" size="small" style="width: 208px">
+ <el-input v-model="addObj.company" disabled placeholder="閫夋嫨濮旀墭鍗曚綅" size="small"
+ style="width: 208px">
<template slot="append">
<el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
@click="openCompanyList"></el-button>
@@ -93,21 +110,25 @@
<el-row>
<el-col :span="6">
<el-form-item label="鑱旂郴鏂瑰紡:" prop="phone">
- <el-input v-model="addObj.phone" :disabled="active>1&&tabIndex!=4" clearable placeholder="閫夋嫨濮旀墭瀹㈡埛" size="small"></el-input>
+ <el-input v-model="addObj.phone" :disabled="active>1&&tabIndex!=4" clearable placeholder="閫夋嫨濮旀墭瀹㈡埛"
+ size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="绱ф�ョ▼搴�:" prop="type">
<el-select v-model="addObj.type" :disabled="active>1&&tabIndex!=4" clearable size="small">
- <el-option v-for="(a, ai) in dict.type.urgency_level" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <el-option v-for="(a, ai) in dict.type.urgency_level" :key="ai" :label="a.label"
+ :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鏍峰搧鍚嶇О:" prop="sample">
<el-input v-model="addObj.sample" disabled size="small" style="width: 208px">
- <template slot="append"><el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
- @click="selectStandardTree = true"></el-button></template>
+ <template slot="append">
+ <el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
+ @click="selectStandardTree = true"></el-button>
+ </template>
</el-input>
</el-form-item>
</el-col>
@@ -122,19 +143,22 @@
<el-col :span="6">
<el-form-item label="鏍峰搧鐘舵��:" prop="sampleStatus">
<el-select v-model="addObj.sampleStatus" :disabled="active>1&&tabIndex!=4" size="small">
- <el-option v-for="(a,ai) in dict.type.sample_status_list" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <el-option v-for="(a,ai) in dict.type.sample_status_list" :key="ai" :label="a.label"
+ :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎶芥鏁伴噺:" prop="testQuantity">
- <el-input v-model="addObj.testQuantity" :disabled="active>1&&tabIndex!=4" clearable size="small"></el-input>
+ <el-input v-model="addObj.testQuantity" :disabled="active>1&&tabIndex!=4" clearable
+ size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鏉ユ牱鏂瑰紡:" prop="formType">
<el-select v-model="addObj.formType" :disabled="active>1&&tabIndex!=4" size="small" clearable>
- <el-option v-for="(a,ai) in dict.type.form_type" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <el-option v-for="(a,ai) in dict.type.form_type" :key="ai" :label="a.label"
+ :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -150,7 +174,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="鏍峰搧澶勭悊鏂瑰紡:" prop="processing">
- <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini" style="display: flex; flex-direction: column;">
+ <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini"
+ style="display: flex; flex-direction: column;">
<el-radio :label="0" border style="margin-right: 0">濮旀墭鍗曚綅鍙栧洖</el-radio>
<el-radio :label="1" border>瀹為獙瀹ゅ鐞�</el-radio>
</el-radio-group>
@@ -180,23 +205,27 @@
<el-row>
<el-col :span="6">
<el-form-item label="濮旀墭浜�:" prop="prepareUser">
- <el-input v-model="addObj.prepareUser" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
+ <el-input v-model="addObj.prepareUser" :disabled="active>1&&tabIndex!=4"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="濮旀墭浜鸿嫳鏂�:" prop="prepareUserEn">
- <el-input v-model="addObj.prepareUserEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
+ <el-input v-model="addObj.prepareUserEn" :disabled="active>1&&tabIndex!=4"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="澶囨敞:" prop="remark">
- <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}"
+ :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small" style="width: 100%" type="textarea"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="澶囨敞鑻辨枃:" prop="remarkEn">
- <el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ <el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}"
+ :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small" type="textarea"></el-input>
</el-form-item>
</el-col>
@@ -204,19 +233,22 @@
<el-row>
<el-col :span="6">
<el-form-item label="鏍峰搧鍚嶇О:" prop="sampleView">
- <el-input v-model="addObj.sampleView" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ <el-input v-model="addObj.sampleView" :disabled="active>1&&tabIndex!=4"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鏍峰搧鍚嶇О鑻辨枃:" prop="sampleViewEn">
- <el-input v-model="addObj.sampleViewEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ <el-input v-model="addObj.sampleViewEn" :disabled="active>1&&tabIndex!=4"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="濮旀墭浜哄伐鍙�:" prop="prepareCode">
- <el-input v-model="addObj.prepareCode" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ <el-input v-model="addObj.prepareCode" :disabled="active>1&&tabIndex!=4"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
</el-col>
@@ -250,12 +282,13 @@
<span style="width: 150px;font-size: 14px;text-align: right;">鐗规畩鏍囧噯锛�</span>
<el-input v-model="specialStandardMethod" :disabled="!isSpecial" clearable size="small"></el-input>
<el-button v-show="active==1" size="small" style="margin-left: 10px"
- type="primary" @click="editSpecial">缂栬緫</el-button>
+ type="primary" @click="editSpecial">缂栬緫
+ </el-button>
</div>
</div>
<el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
- max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
+ max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
<el-table-column v-if="active==1" :selectable="selectable" type="selection" width="60"></el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
<el-table-column align="center" label="鏍峰搧鍚嶇О" min-width="100" prop="sample">
@@ -266,13 +299,13 @@
<el-table-column align="center" label="鏍峰搧缂栧彿" min-width="100" prop="sampleCode">
<template slot-scope="scope">
<el-input v-model="scope.row.sampleCode" :disabled="active>1" clearable placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"
- size="small"></el-input>
+ size="small"></el-input>
</template>
</el-table-column>
<el-table-column align="center" label="鏍峰搧鍨嬪彿" min-width="60" prop="model">
<template slot-scope="scope">
<el-select v-model="scope.row.model" :disabled="active>1" allow-create default-first-option filterable
- placeholder="鏍峰搧鍨嬪彿" size="small" style="width: 100%;" @change="handleChangeModel">
+ placeholder="鏍峰搧鍨嬪彿" size="small" style="width: 100%;" @change="handleChangeModel">
<el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -287,7 +320,7 @@
<el-table-column v-if="!(active>1)" align="center" label="鍨嬪彿鍙傛暟" prop="modelNum" width="110">
<template slot-scope="scope">
<el-input v-model="scope.row.modelNum" clearable placeholder="闈炲繀濉�" size="small"
- @input="methodChange(scope.row.standardMethodListId, scope.row, 'splice')"></el-input>
+ @input="methodChange(scope.row.standardMethodListId, scope.row, 'splice')"></el-input>
</template>
</el-table-column>
<el-table-column v-if="!(active>1)" align="center" label="鏈�缁堟牱鍝佸瀷鍙�" prop="endModels" width="160">
@@ -298,8 +331,9 @@
<el-table-column align="center" label="妫�楠屾爣鍑�" min-width="100" prop="standardMethodListId">
<template slot-scope="scope">
<el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null||active>1"
- :loading="methodLoad" :readonly="active>1" clearable placeholder="妫�楠屾爣鍑�"
- size="small" style="width: 100%;" @change="(value)=>methodChange(value, scope.row)" @clear="productList = []" @focus="methodFocus">
+ :loading="methodLoad" :readonly="active>1" clearable placeholder="妫�楠屾爣鍑�"
+ size="small" style="width: 100%;" @change="(value)=>methodChange(value, scope.row)"
+ @clear="productList = []" @focus="methodFocus">
<el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
@@ -321,25 +355,26 @@
<el-table ref="productTable" v-loading="getProductLoad" :data="productList"
:row-class-name="tableRowClassName" border class="el-table"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
- max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
- @select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
+ max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
+ @select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
<el-table-column v-if="active==1" :selectable="selectable0" type="selection" width="65"></el-table-column>
- <el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column>
+ <el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass"
+ show-overflow-tooltip></el-table-column>
<el-table-column label="妫�楠岄」" min-width="140" prop="inspectionItem" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>妫�楠岄」</span>
<el-input
v-if="active==1"
- v-model="inspectionItem"
- placeholder="璇疯緭鍏�"
- size="mini"
- @input="searchFilterList"/>
+ v-model="inspectionItem"
+ placeholder="璇疯緭鍏�"
+ size="mini"
+ @input="searchFilterList"/>
</div>
</template>
</el-table-column>
<el-table-column label="妫�楠岄」瀛愰」" min-width="140" prop="inspectionItemSubclass"
- show-overflow-tooltip>
+ show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>妫�楠岄」瀛愰」</span>
@@ -354,31 +389,35 @@
</el-table-column>
<el-table-column label="瑕佹眰鍊�" min-width="220px" prop="ask">
<template slot-scope="scope">
- <el-input v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)&&scope.row.inspectionValueType!='5'" v-model="scope.row.ask" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鍊�"
- size="small" type="textarea"
- @change="e=>requestChange(e,scope.row,'ask')"></el-input>
+ <el-input
+ v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)&&scope.row.inspectionValueType!='5'"
+ v-model="scope.row.ask" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鍊�"
+ size="small" type="textarea"
+ @change="e=>requestChange(e,scope.row,'ask')"></el-input>
<span v-else>
- <template >{{ scope.row.ask }}</template>
+ <template>{{ scope.row.ask }}</template>
</span>
</template>
</el-table-column>
<el-table-column label="瑕佹眰鎻忚堪" min-width="220px" prop="tell">
<template slot-scope="scope">
- <el-input v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)" v-model="scope.row.tell" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鎻忚堪"
- size="small" type="textarea"
- @change="e=>requestChange(e,scope.row,'tell')"></el-input>
+ <el-input v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)" v-model="scope.row.tell"
+ :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鎻忚堪"
+ size="small" type="textarea"
+ @change="e=>requestChange(e,scope.row,'tell')"></el-input>
<span v-else>
- <template >{{ scope.row.tell }}</template>
+ <template>{{ scope.row.tell }}</template>
</span>
</template>
</el-table-column>
<el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
<template slot-scope="scope">
- <el-input v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)" v-model="scope.row.radius" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="鏉′欢"
+ <el-input v-if="(active==1||tabIndex==4)&&(isAskOnlyRead || isSpecial)" v-model="scope.row.radius"
+ :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="鏉′欢"
size="small" type="textarea"
@change="e=>requestChange(e,scope.row,'radius')">
</el-input>
- <span v-else>{{scope.row.radius}}</span>
+ <span v-else>{{ scope.row.radius }}</span>
</template>
</el-table-column>
<el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip>
@@ -397,12 +436,17 @@
<el-table-column label="璁￠噺鍗曚綅" prop="unit" show-overflow-tooltip width="100"></el-table-column>
<el-table-column label="鍗曚环" prop="price" show-overflow-tooltip width="100"></el-table-column>
<el-table-column label="鍖洪棿" min-width="120" prop="section" show-overflow-tooltip></el-table-column>
- <el-table-column :filter-method="filterHandler" :filters="filters" label="瀛愬疄楠屽" min-width="130" prop="sonLaboratory"
- show-overflow-tooltip></el-table-column>
- <el-table-column v-if="isSpecial&&active==1" label="鎿嶄綔" width="100">
+ <el-table-column :filter-method="filterHandler" :filters="filters" label="瀛愬疄楠屽" min-width="130"
+ prop="sonLaboratory"
+ show-overflow-tooltip></el-table-column>
+ <el-table-column v-if="isSpecial&&active==1" label="鎿嶄綔" width="100">
<template slot-scope="scope">
- <el-button v-if="!scope.row.repetitionTag" size="small" type="text" @click="addProductList(productList,scope.row,scope.$index)">鎻掑叆琛�</el-button>
- <el-button v-if="!!scope.row.repetitionTag&&scope.row.delete" size="small" type="text" @click="deleteProductList(scope.$index,productList)">鍒犻櫎</el-button>
+ <el-button v-if="!scope.row.repetitionTag" size="small" type="text"
+ @click="addProductList(productList,scope.row,scope.$index)">鎻掑叆琛�
+ </el-button>
+ <el-button v-if="!!scope.row.repetitionTag&&scope.row.delete" size="small" type="text"
+ @click="deleteProductList(scope.$index,productList)">鍒犻櫎
+ </el-button>
</template>
</el-table-column>
</el-table>
@@ -410,6 +454,16 @@
</div>
<el-dialog :visible.sync="selectUserDia" title="閫夋嫨鍗曚綅" width="70%">
<div v-if="selectUserDia" class="body">
+ <el-form :inline="true" size="small" @submit.native.prevent>
+ <el-form-item label="濮旀墭鍗曚綅">
+ <el-input v-model="companyQuery" clearable placeholder="璇疯緭鍏ュ鎵樺崟浣�"
+ @keyup.enter.native="searchCompany"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="searchCompany">鏌ヨ</el-button>
+ <el-button @click="resetCompanySearch">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
<lims-table :tableData="tableData1" :column="column1"
:isSelection="true" :handleSelectionChange="selectMethod"
@pagination="pagination1" height="400px" key="tableData1"
@@ -421,22 +475,25 @@
</span>
</el-dialog>
<el-dialog :visible.sync="selectStandardTree" title="閫夋嫨鏍峰搧" width="500px">
- <div v-if="selectStandardTree" v-loading="selectStandardTreeLoading" class="body" style="height: 60vh;overflow-y: auto;user-select: none;">
+ <div v-if="selectStandardTree" v-loading="selectStandardTreeLoading" class="body"
+ style="height: 60vh;overflow-y: auto;user-select: none;">
<el-row>
<el-col :span="24">
<el-input v-model="search" clearable placeholder="杈撳叆鍏抽敭瀛楄繘琛屾悳绱�" size="small"
- style="margin-bottom: 5px;" suffix-icon="el-icon-search" @blur="searchFilter" @clear="searchFilter"
- @keyup.enter.native="searchFilter"></el-input>
+ style="margin-bottom: 5px;" suffix-icon="el-icon-search" @blur="searchFilter"
+ @clear="searchFilter"
+ @keyup.enter.native="searchFilter"></el-input>
</el-col>
</el-row>
<el-tree ref="tree" :data="list" :default-expanded-keys="expandedKeys" :filter-node-method="filterNode"
- :props="{ children: 'children', label: 'label' }" highlight-current node-key="label" @node-click="handleNodeClick"
- @node-expand="nodeOpen" @node-collapse="nodeClose" @dblclick.native="activeStandardTree">
+ :props="{ children: 'children', label: 'label' }" highlight-current node-key="label"
+ @node-click="handleNodeClick"
+ @node-expand="nodeOpen" @node-collapse="nodeClose" @dblclick.native="activeStandardTree">
<div slot-scope="{ node, data }" class="custom-tree-node">
<el-row>
<el-col :span="24">
<span><i
- :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
+ :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
{{ data.label }}</span>
</el-col>
</el-row>
@@ -460,21 +517,23 @@
<el-button :loading="templateLoading" type="primary" @click="addTemplateDia">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" :visible.sync="issuedDialogVisible" title="妫�楠屼笅鍙�" width="400px">
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"
+ :visible.sync="issuedDialogVisible" title="妫�楠屼笅鍙�" width="400px">
<div class="body" style="max-height: 60vh;">
<el-row>
<el-col :span="22" class="search_thing">
<div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div>
<div class="search_input">
<el-date-picker v-model="distributeData.appointed" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" size="small"
- style="width: 100%;" type="date" value-format="yyyy-MM-dd">
+ style="width: 100%;" type="date" value-format="yyyy-MM-dd">
</el-date-picker>
</div>
</el-col>
<el-col :span="22" class="search_thing">
<div class="search_label"><span class="required-span">* </span>鎸囨淳浜哄憳锛�</div>
<div class="search_input">
- <el-select v-model="distributeData.userId" filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%;" @change="changeUser">
+ <el-select v-model="distributeData.userId" filterable placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%;" @change="changeUser">
<el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -483,8 +542,10 @@
<el-col v-if="distributeData.userId" :span="22" class="search_thing">
<div class="search_label">璇曢獙瀹わ細</div>
<div class="search_input">
- <el-select v-model="distributeData.sonLaboratory" filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
- <el-option v-for="item in newJuLaboratoryList" :key="item.value" :label="item.label" :value="item.value">
+ <el-select v-model="distributeData.sonLaboratory" filterable placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%;">
+ <el-option v-for="item in newJuLaboratoryList" :key="item.value" :label="item.label"
+ :value="item.value">
</el-option>
</el-select>
</div>
@@ -517,22 +578,26 @@
</span>
</el-dialog>
<!--鐢电紗閰嶇疆-->
- <cableConfig v-if="cableConfigShow" ref="cableConfigShow" :active="active" :isSpecial="isSpecial" :sampleSelectionList="sampleSelectionList" @goBackAdd="goBackAdd"/>
+ <cableConfig v-if="cableConfigShow" ref="cableConfigShow" :active="active" :isSpecial="isSpecial"
+ :sampleSelectionList="sampleSelectionList" @goBackAdd="goBackAdd"/>
<!--杈呭姪绾胯姱閰嶇疆-->
- <auxiliary-wire-core v-if="auxiliaryShow" :active="active" :isSpecial="isSpecial" :sampleSelectionList="sampleSelectionList" @goBackAdd2="goBackAdd2"></auxiliary-wire-core>
+ <auxiliary-wire-core v-if="auxiliaryShow" :active="active" :isSpecial="isSpecial"
+ :sampleSelectionList="sampleSelectionList" @goBackAdd2="goBackAdd2"></auxiliary-wire-core>
<!--鐗规畩鍊煎鐞嗘-->
- <el-dialog :before-close="beforeClose" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"
+ <el-dialog :before-close="beforeClose" :close-on-click-modal="false" :close-on-press-escape="false"
+ :show-close="false"
:visible.sync="bsm1DiaAll"
min-width="400px"
title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨">
<div v-for="(item, index) in bsm1DiaList" :key="item.id" class="body" style="max-height: 60vh;">
- <span>{{item.inspectionItem}}</span>
+ <span>{{ item.inspectionItem }}</span>
<el-row v-if="item.bsm1">
<el-col :span="24" class="search_thing" style="height: initial;margin: 5px 0;">
<div class="search_label" style="width: 80px;"><span class="required-span">* </span>閫夐」锛�</div>
<div class="search_input">
<el-radio-group v-model="item.bsm1Val" v-removeAriaHidden @input="upBsmAll(item)">
- <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
+ <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai" :label="a"
+ style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
</el-radio-group>
</div>
</el-col>
@@ -541,7 +606,8 @@
<div class="search_input">
<el-radio-group v-model="item.bsm1Val" v-removeAriaHidden @input="upBsmAll(item)">
<el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai"
- :label="a">{{JSON.parse(item.bsmRow.askCopy)[ai]}}</el-radio>
+ :label="a">{{ JSON.parse(item.bsmRow.askCopy)[ai] }}
+ </el-radio>
</el-radio-group>
</div>
</el-col>
@@ -558,10 +624,10 @@
:show-close="false" :visible.sync="bsm3Dia"
title="鍖洪棿鍊煎～鍐�" width="800px">
<el-table
- :data="editTable"
- height="80vh" style="width: 100%">
- <!-- inspectionItemList -->
- <el-table-column
+ :data="editTable"
+ height="80vh" style="width: 100%">
+ <!-- inspectionItemList -->
+ <el-table-column
label="妫�楠岄」"
prop="inspectionItemList"
width="180">
@@ -584,7 +650,8 @@
label="璇嗗埆绗﹀��"
prop="value">
<template slot-scope="scope">
- <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" size="small" @input="inputValueHandler(scope.row,scope.$index)"></el-input>
+ <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" size="small"
+ @input="inputValueHandler(scope.row,scope.$index)"></el-input>
</template>
</el-table-column>
</el-table>
@@ -628,8 +695,8 @@
cableConfig,
AuxiliaryWireCore
},
- computed:{
- ...mapGetters(["nickName"]),
+ computed: {
+ ...mapGetters(["nickName"]),
newJuLaboratoryList() {
return (this.dict.type.sys_sub_lab || []).filter(item => item.label === '鏂拌仛')
},
@@ -650,7 +717,7 @@
sampleCode: '',
boundTemplateList: [],
sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
- editTable:[],
+ editTable: [],
template: null,
templates: [],
addObj: {
@@ -682,8 +749,8 @@
production: null,
productionEn: null,
companyId: null,
- prepareUser:null, // 濮旀墭浜�
- prepareUserEn:null, // 濮旀墭浜鸿嫳鏂�
+ prepareUser: null, // 濮旀墭浜�
+ prepareUserEn: null, // 濮旀墭浜鸿嫳鏂�
prepareCode: '', // 濮旀墭浜哄伐鍙�
quarterItemId: '',
sampleView: '', // 鏍峰搧鍚嶇О锛堟姤鍛婂睍绀哄瓧娈碉級
@@ -691,31 +758,31 @@
},
addObjRules: { // 琛ㄥ崟鏍￠獙瑙勫垯
orderType: [
- { required: true, message: '璇烽�夋嫨妫�楠岀被鍒�', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨妫�楠岀被鍒�', trigger: 'change'}
],
company: [
- { required: true, message: '璇烽�夋嫨濮旀墭鍗曚綅', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨濮旀墭鍗曚綅', trigger: 'change'}
],
phone: [
- { required: true, message: '璇峰～鍐欒仈绯绘柟寮�', trigger: 'blur' }
+ {required: true, message: '璇峰～鍐欒仈绯绘柟寮�', trigger: 'blur'}
],
type: [
- { required: true, message: '璇烽�夋嫨绱ф�ョ▼搴�', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨绱ф�ョ▼搴�', trigger: 'change'}
],
sample: [
- { required: true, message: '璇烽�夋嫨妫�娴嬩緷鎹�', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨妫�娴嬩緷鎹�', trigger: 'change'}
],
sampleNum: [
- { required: true, message: '璇峰～鍐欐牱鍝佹暟閲�', trigger: 'blur' }
+ {required: true, message: '璇峰～鍐欐牱鍝佹暟閲�', trigger: 'blur'}
],
sampleStatus: [
- { required: true, message: '璇烽�夋嫨鏍峰搧鐘舵��', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨鏍峰搧鐘舵��', trigger: 'change'}
],
formType: [
- { required: true, message: '璇烽�夋嫨鏉ユ牱鏂瑰紡', trigger: 'change' }
+ {required: true, message: '璇烽�夋嫨鏉ユ牱鏂瑰紡', trigger: 'change'}
],
testQuantity: [
- { required: true, message: '璇峰～鍐欐娊妫�鏁伴噺', trigger: 'blur' }
+ {required: true, message: '璇峰～鍐欐娊妫�鏁伴噺', trigger: 'blur'}
],
},
sample: {
@@ -735,6 +802,7 @@
tableData1: [],
tableLoading1: false,
multipleSelection: [],
+ companyQuery: '',
column1: [
{label: '瀹㈡埛鍚嶇О', prop: 'company'},
{label: '瀹㈡埛鍗曚綅EN', prop: 'companyEn'},
@@ -746,9 +814,9 @@
{label: '宸ュ巶鍩�', prop: 'code'}
],
page1: {
- total:0,
- size:10,
- current:1
+ total: 0,
+ size: 10,
+ current: 1
},
selectStandardTree: false,
search: null,
@@ -776,7 +844,7 @@
distributeData: {
appointed: '',
userId: '',
- sonLaboratory:''
+ sonLaboratory: ''
},
personList: [],
upLoad: false,
@@ -805,15 +873,15 @@
addObj1: {},
model: null,
standardMethodListId: null,
- symbolList:['RTS'],
- inspectionItem:null,
- inspectionItemSubclass:null,
- methodS:null,
- isBsm2Val2:false,
+ symbolList: ['RTS'],
+ inspectionItem: null,
+ inspectionItemSubclass: null,
+ methodS: null,
+ isBsm2Val2: false,
temperatureEngList: [],
isShowInput: false,
temId: '',
- sonLaboratoryList:[],
+ sonLaboratoryList: [],
selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
quarterItemOptions: [], // 鏌ヨ瀛ｅ害淇℃伅
specialStandardMethod: '',
@@ -856,10 +924,10 @@
this.model = null
this.standardMethodListId = null
},
- tabIndex(val){
- if(val==4&&this.active==2){
+ tabIndex(val) {
+ if (val == 4 && this.active == 2) {
this.isSpecial = true
- }else{
+ } else {
this.isSpecial = false
}
}
@@ -912,284 +980,255 @@
})
})
}
- if(this.tabIndex==4&&this.active==2){
+ if (this.tabIndex == 4 && this.active == 2) {
this.isSpecial = true
- }else{
+ } else {
this.isSpecial = false
}
},
- getPrepareUser () {
- // this.addObj.prepareUser = JSON.parse(localStorage.getItem("user")).name;
- // this.addObj.prepareUserEn = JSON.parse(localStorage.getItem("user")).nameEn
- // this.addObj.prepareCode = JSON.parse(localStorage.getItem("user")).account
+ getPrepareUser() {
+ // this.addObj.prepareUser = JSON.parse(localStorage.getItem("user")).name;
+ // this.addObj.prepareUserEn = JSON.parse(localStorage.getItem("user")).nameEn
+ // this.addObj.prepareCode = JSON.parse(localStorage.getItem("user")).account
},
- // 缂栬緫瑕佹眰鍊艰〃鏍�
- editSpecial () {
- this.isSpecial = true
- this.$nextTick(() => {
- this.$refs.productTable.doLayout();
- });
- },
- getQuarterOnOrderList () {
- getQuarterOnOrder().then(res => {
- if (res.code === 200) {
- this.quarterItemOptions = res.data
- }
- })
- },
- //鐗规畩鍊煎～鍐欏鐞�
- inputValueHandler(row,index){
- if(row){
- const nextIndex = index+1
- for (let i = nextIndex; i < this.editTable.length; i++) {
- const element = this.editTable[i];
- if(element.model==row.model&&row.symbolItem==element.symbolItem){
- this.editTable[i].value = row.value
- }
+ // 缂栬緫瑕佹眰鍊艰〃鏍�
+ editSpecial() {
+ this.isSpecial = true
+ this.$nextTick(() => {
+ this.$refs.productTable.doLayout();
+ });
+ },
+ getQuarterOnOrderList() {
+ getQuarterOnOrder().then(res => {
+ if (res.code === 200) {
+ this.quarterItemOptions = res.data
+ }
+ })
+ },
+ //鐗规畩鍊煎～鍐欏鐞�
+ inputValueHandler(row, index) {
+ if (row) {
+ const nextIndex = index + 1
+ for (let i = nextIndex; i < this.editTable.length; i++) {
+ const element = this.editTable[i];
+ if (element.model == row.model && row.symbolItem == element.symbolItem) {
+ this.editTable[i].value = row.value
}
}
- },
- changeProductList0(){
- this.productList0.forEach(a=>{
- let obj = this.productList.find(m => {
- if(a.repetitionTag){
- return m.id === a.id&&m.repetitionTag == a.repetitionTag
- }else{
- return m.id === a.id&&!m.repetitionTag
- }
- })
-
- if(obj){
- a.state = obj.state
- a.section = obj.section
- a.ask = obj.ask
- a.manHour = obj.manHour
- a.price = obj.price
- a.tell = obj.tell
- a.radius = obj.radius
- }
- if(a.state == 0&&a.bsmRow){
- a = this.HaveJson(a.bsmRow)
- }
- })
- },
- searchFilterList () {
- const vtw = {
- inspectionItem: this.inspectionItem, // 妫�楠岄」
- inspectionItemSubclass: this.inspectionItemSubclass, // 妫�楠岄」瀛愰」
- methodS: this.methodS, // 璇曢獙鏂规硶
- }
- const isHaveValue = Object.values(vtw).some(item => {
- return item
- })
- this.changeProductList0()
- if (isHaveValue) {
- for(let i in vtw) {
- if (vtw[i]) {
- this.productList = this.productList0.filter((item) => {
- return item[i] && item[i].includes(vtw[i])
- })
- }
- }
- this.$nextTick(()=>{
- this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- })
- } else {
- // 娌℃湁鏌ヨ鏉′欢鏃舵覆鏌撴墍鏈夋暟鎹�
- this.productList = this.productList0
- this.$nextTick(()=>{
- this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- })
- }
- },
- // 鑾峰彇鐢ㄦ埛鍒楄〃
- getAuthorizedPerson() {
- selectUserCondition({ type: 1 }).then(res => {
- let data = []
- res.data.forEach(a => {
- data.push({
- label: a.name,
- value: a.id
- })
- })
- this.personList = data
- })
- },
- openCompanyList () {
- this.selectUserDia = true
- this.getCompanyList()
- },
- getCompanyList () {
- selectCustomPageList({...this.page1}).then(res => {
- this.tableLoading1 = false
- if (res.code === 200) {
- this.tableData1 = res.data.records
- this.page1.total = res.data.total
- }
- }).catch(err => {
- this.tableLoading1 = false
- })
- },
- pagination1 (page) {
- this.page1.size = page.limit
- this.getCompanyList()
- },
- selectMethod (row) {
- this.multipleSelection = row
- },
- selectUser() {
- if (this.multipleSelection.length === 0) {
- this.$message.error('鏈�夋嫨鏁版嵁')
- return
- }
- this.addObj.company = this.multipleSelection[0].company
- this.addObj.code = this.multipleSelection[0].code
- this.addObj.companyId = this.multipleSelection[0].id
- this.selectUserDia = false
- if(this.active==1){
- // TODO
- this.selectInsOrderTemplate()
- }
- },
- containsValue(str) {
- if(str){
- let symbolItem = ''
- this.symbolList.some(value =>{
- if(str.includes(value)){
- symbolItem = value
- return true
- }
- })
- return symbolItem
- }
- },
- handleAsk(ask,symbolItem, value) {
- try{
- let code = [">", "<", "=", "锛�", "锛�", "鈮�", "鈮�", "卤"];
- let code2 = ['+', '*', '/', '-']
- if (ask.includes('&')) {
- // 澶氫釜鏉′欢
- let arr0 = ask.split('&')
- let arr1 = []
- arr0.forEach(m => {
- let index = code.findIndex(b => m.includes(b))
- if (index > -1) {
- let arr = m.split(code[index]).filter(b => !!b)
- let num = eval(this.replaceAll(arr[0], symbolItem, value))
- m = code[index] + '' + num
- arr1.push(m)
- }
- })
- return arr1.join('&')
- } else if (ask.includes('锝�') || ask.includes('~')) {
- let arr0 = []
- if (ask.includes('锝�')) {
- arr0 = ask.split('锝�')
- } else {
- arr0 = ask.split('~')
- }
- // 澶氫釜鏉′欢
- let arr1 = []
- arr0.forEach(m => {
- m = m.replace(symbolItem, value)
- const index = code2.findIndex(b => m.includes(b))
- if (index > -1) {
- m = eval(m)
- }
- arr1.push(m)
- })
- return arr1.join('锝�')
+ }
+ },
+ changeProductList0() {
+ this.productList0.forEach(a => {
+ let obj = this.productList.find(m => {
+ if (a.repetitionTag) {
+ return m.id === a.id && m.repetitionTag == a.repetitionTag
} else {
- // 鍗曚釜鏉′欢
- let index = code.findIndex(b => ask.includes(b))
- if (index > -1) {
- let arr = ask.split(code[index]).filter(b => !!b)
- let num = eval(this.replaceAll(arr[0], symbolItem, value))
- return code[index] + '' + num
- }
- }
- }catch(e){}
- },
- replaceAll(str,find,value) {
- if (str === undefined) {
- return str
- }
- return str.replaceAll(find, value);
- },
- save() {
- this.$refs['addObj'].validate((valid) => {
- if (valid) {
- this.sampleList.forEach(item => {
- item.specialStandardMethod = this.specialStandardMethod
- })
- try {
- this.sampleList.forEach(item => {
- if (item.insulating){
- let sampleListArr = []
- let insulatingArr = []
- // 鏈夌數缂嗛厤缃椂锛屾瘮杈冪數缂嗛厤缃殑妫�楠岄」鏄惁涓庡闈㈤噸澶�
- item.insProduct.filter(a => a.state == 1).forEach(obj => {
- sampleListArr.push(obj.id)
- })
- item.insulating.insProduct.filter(a => a.state == 1).forEach(obj => {
- insulatingArr.push(obj.id)
- })
- const sameLength = sampleListArr.filter(id => insulatingArr.indexOf(id) > -1).length
- if (sameLength > 0) {
- this.$message.error('妫�楠岄」涓庣數缂嗛厤缃楠岄」涓嶈兘閲嶅')
- }
- throw sameLength > 0
- }
- })
- } catch (e) {
- console.log('e---', e)
- if (e === true) throw e
- }
- let sampleList = this.HaveJson(this.sampleList)
- sampleList.forEach(a => {
- if (a.insProduct.length > 0) {
- a.insProduct.forEach(c => {
- if (this.tabIndex != 4) {
- delete c.id
- }
- })
- }
- if (a.endModels) {
- a.model = a.endModels
- }
- a.insProduct = a.insProduct.filter(b=>b.state === 1)
- })
- let projectNum = this.totalArr.filter(a => a.state == 1).length
- if(projectNum==0){
- this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.saveMethod(sampleList)
- }).catch(() => {})
- }else{
- let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
- if (isRTS) {
- this.editTable = this.handleData(sampleList,this.containsValue, 0)
- this.editTable.forEach(item => {
- item.value = item.modelNum
- })
- this.bsm3Dia = true;
- return
- }
- this.saveMethod(sampleList)
- }
+ return m.id === a.id && !m.repetitionTag
}
})
- },
- save0(){
- if(this.editTable.every(m=>m.value)){
- let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
+
+ if (obj) {
+ a.state = obj.state
+ a.section = obj.section
+ a.ask = obj.ask
+ a.manHour = obj.manHour
+ a.price = obj.price
+ a.tell = obj.tell
+ a.radius = obj.radius
+ }
+ if (a.state == 0 && a.bsmRow) {
+ a = this.HaveJson(a.bsmRow)
+ }
+ })
+ },
+ searchFilterList() {
+ const vtw = {
+ inspectionItem: this.inspectionItem, // 妫�楠岄」
+ inspectionItemSubclass: this.inspectionItemSubclass, // 妫�楠岄」瀛愰」
+ methodS: this.methodS, // 璇曢獙鏂规硶
+ }
+ const isHaveValue = Object.values(vtw).some(item => {
+ return item
+ })
+ this.changeProductList0()
+ if (isHaveValue) {
+ for (let i in vtw) {
+ if (vtw[i]) {
+ this.productList = this.productList0.filter((item) => {
+ return item[i] && item[i].includes(vtw[i])
+ })
+ }
+ }
+ this.$nextTick(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ })
+ } else {
+ // 娌℃湁鏌ヨ鏉′欢鏃舵覆鏌撴墍鏈夋暟鎹�
+ this.productList = this.productList0
+ this.$nextTick(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ })
+ }
+ },
+ // 鑾峰彇鐢ㄦ埛鍒楄〃
+ getAuthorizedPerson() {
+ selectUserCondition({type: 1}).then(res => {
+ let data = []
+ res.data.forEach(a => {
+ data.push({
+ label: a.name,
+ value: a.id
+ })
+ })
+ this.personList = data
+ })
+ },
+ openCompanyList() {
+ this.selectUserDia = true
+ this.resetCompanySearch()
+ },
+ getCompanyList() {
+ this.tableLoading1 = true
+ selectCustomPageList({company: this.companyQuery, ...this.page1}).then(res => {
+ this.tableLoading1 = false
+ if (res.code === 200) {
+ this.tableData1 = res.data.records
+ this.page1.total = res.data.total
+ }
+ }).catch(err => {
+ this.tableLoading1 = false
+ })
+ },
+ pagination1(page) {
+ this.page1.size = page.limit
+ this.getCompanyList()
+ },
+ searchCompany() {
+ this.page1.current = 1
+ this.getCompanyList()
+ },
+ resetCompanySearch() {
+ this.companyQuery = ''
+ this.page1.current = 1
+ this.getCompanyList()
+ },
+ selectMethod(row) {
+ this.multipleSelection = row
+ },
+ selectUser() {
+ if (this.multipleSelection.length === 0) {
+ this.$message.error('鏈�夋嫨鏁版嵁')
+ return
+ }
+ this.addObj.company = this.multipleSelection[0].company
+ this.addObj.code = this.multipleSelection[0].code
+ this.addObj.companyId = this.multipleSelection[0].id
+ this.selectUserDia = false
+ if (this.active == 1) {
+ // TODO
+ this.selectInsOrderTemplate()
+ }
+ },
+ containsValue(str) {
+ if (str) {
+ let symbolItem = ''
+ this.symbolList.some(value => {
+ if (str.includes(value)) {
+ symbolItem = value
+ return true
+ }
+ })
+ return symbolItem
+ }
+ },
+ handleAsk(ask, symbolItem, value) {
+ try {
+ let code = [">", "<", "=", "锛�", "锛�", "鈮�", "鈮�", "卤"];
+ let code2 = ['+', '*', '/', '-']
+ if (ask.includes('&')) {
+ // 澶氫釜鏉′欢
+ let arr0 = ask.split('&')
+ let arr1 = []
+ arr0.forEach(m => {
+ let index = code.findIndex(b => m.includes(b))
+ if (index > -1) {
+ let arr = m.split(code[index]).filter(b => !!b)
+ let num = eval(this.replaceAll(arr[0], symbolItem, value))
+ m = code[index] + '' + num
+ arr1.push(m)
+ }
+ })
+ return arr1.join('&')
+ } else if (ask.includes('锝�') || ask.includes('~')) {
+ let arr0 = []
+ if (ask.includes('锝�')) {
+ arr0 = ask.split('锝�')
+ } else {
+ arr0 = ask.split('~')
+ }
+ // 澶氫釜鏉′欢
+ let arr1 = []
+ arr0.forEach(m => {
+ m = m.replace(symbolItem, value)
+ const index = code2.findIndex(b => m.includes(b))
+ if (index > -1) {
+ m = eval(m)
+ }
+ arr1.push(m)
+ })
+ return arr1.join('锝�')
+ } else {
+ // 鍗曚釜鏉′欢
+ let index = code.findIndex(b => ask.includes(b))
+ if (index > -1) {
+ let arr = ask.split(code[index]).filter(b => !!b)
+ let num = eval(this.replaceAll(arr[0], symbolItem, value))
+ return code[index] + '' + num
+ }
+ }
+ } catch (e) {
+ }
+ },
+ replaceAll(str, find, value) {
+ if (str === undefined) {
+ return str
+ }
+ return str.replaceAll(find, value);
+ },
+ save() {
+ this.$refs['addObj'].validate((valid) => {
+ if (valid) {
+ this.sampleList.forEach(item => {
+ item.specialStandardMethod = this.specialStandardMethod
+ })
+ try {
+ this.sampleList.forEach(item => {
+ if (item.insulating) {
+ let sampleListArr = []
+ let insulatingArr = []
+ // 鏈夌數缂嗛厤缃椂锛屾瘮杈冪數缂嗛厤缃殑妫�楠岄」鏄惁涓庡闈㈤噸澶�
+ item.insProduct.filter(a => a.state == 1).forEach(obj => {
+ sampleListArr.push(obj.id)
+ })
+ item.insulating.insProduct.filter(a => a.state == 1).forEach(obj => {
+ insulatingArr.push(obj.id)
+ })
+ const sameLength = sampleListArr.filter(id => insulatingArr.indexOf(id) > -1).length
+ if (sameLength > 0) {
+ this.$message.error('妫�楠岄」涓庣數缂嗛厤缃楠岄」涓嶈兘閲嶅')
+ }
+ throw sameLength > 0
+ }
+ })
+ } catch (e) {
+ console.log('e---', e)
+ if (e === true) throw e
+ }
+ let sampleList = this.HaveJson(this.sampleList)
sampleList.forEach(a => {
if (a.insProduct.length > 0) {
a.insProduct.forEach(c => {
@@ -1201,1053 +1240,1100 @@
if (a.endModels) {
a.model = a.endModels
}
- a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ a.insProduct = a.insProduct.filter(b => b.state === 1)
})
- this.saveMethod(sampleList)
- }else{
- this.$message.error('璇峰～鍐欒瘑鍒鍊�')
- }
- },
- handleData(sampleList,calBack,type){
- let editTable = []
- sampleList.forEach(item => {
- let obj = {
- sampleCode:item.sampleCode,
- model:item.model,
- symbolList:[],
- sampleId:item.id,
- modelNum:item.modelNum,
+ let projectNum = this.totalArr.filter(a => a.state == 1).length
+ if (projectNum == 0) {
+ this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ this.saveMethod(sampleList)
+ }).catch(() => {
+ })
+ } else {
+ let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b => a.ask.includes(b)) && a.state == 1)
+ if (isRTS) {
+ this.editTable = this.handleData(sampleList, this.containsValue, 0)
+ this.editTable.forEach(item => {
+ item.value = item.modelNum
+ })
+ this.bsm3Dia = true;
+ return
+ }
+ this.saveMethod(sampleList)
}
- if (item.insProduct && item.insProduct.length > 0) {
- item.insProduct.forEach(a => {
- if (a.state == 1) {
- if(type==0){
- let str = calBack(a.ask)
- str&&obj.symbolList.push({
- symbolItem:str,
- inspectionItem:a.inspectionItem,
- })
- }else if(type==1){
- let arr = this.editTable.filter(b => b.sampleId == item.id)
- for (var i=0;i<arr.length;i++){
- if(a.ask){
- if(a.ask.includes(arr[i].symbolItem)){
- let ask = calBack(a.ask, arr[i].symbolItem,arr[i].value)
- if (ask) {
- a.ask = ask
- }
- let tell = this.handleAsk(a.tell, arr[i].symbolItem,arr[i].value)
- if (tell) {
- a.tell = tell
- }
+ }
+ })
+ },
+ save0() {
+ if (this.editTable.every(m => m.value)) {
+ let sampleList = this.handleData(this.HaveJson(this.sampleList), this.handleAsk, 1)
+ sampleList.forEach(a => {
+ if (a.insProduct.length > 0) {
+ a.insProduct.forEach(c => {
+ if (this.tabIndex != 4) {
+ delete c.id
+ }
+ })
+ }
+ if (a.endModels) {
+ a.model = a.endModels
+ }
+ a.insProduct = a.insProduct.filter(b => b.state === 1)
+ })
+ this.saveMethod(sampleList)
+ } else {
+ this.$message.error('璇峰～鍐欒瘑鍒鍊�')
+ }
+ },
+ handleData(sampleList, calBack, type) {
+ let editTable = []
+ sampleList.forEach(item => {
+ let obj = {
+ sampleCode: item.sampleCode,
+ model: item.model,
+ symbolList: [],
+ sampleId: item.id,
+ modelNum: item.modelNum,
+ }
+ if (item.insProduct && item.insProduct.length > 0) {
+ item.insProduct.forEach(a => {
+ if (a.state == 1) {
+ if (type == 0) {
+ let str = calBack(a.ask)
+ str && obj.symbolList.push({
+ symbolItem: str,
+ inspectionItem: a.inspectionItem,
+ })
+ } else if (type == 1) {
+ let arr = this.editTable.filter(b => b.sampleId == item.id)
+ for (var i = 0; i < arr.length; i++) {
+ if (a.ask) {
+ if (a.ask.includes(arr[i].symbolItem)) {
+ let ask = calBack(a.ask, arr[i].symbolItem, arr[i].value)
+ if (ask) {
+ a.ask = ask
}
- }else{
- this.$message.error('瑕佹眰鍊间负绌猴紝闇�瑕佸幓鏍囧噯搴撶淮鎶わ紒')
+ let tell = this.handleAsk(a.tell, arr[i].symbolItem, arr[i].value)
+ if (tell) {
+ a.tell = tell
+ }
}
+ } else {
+ this.$message.error('瑕佹眰鍊间负绌猴紝闇�瑕佸幓鏍囧噯搴撶淮鎶わ紒')
}
}
}
- })
- }
- if(type==0){
- editTable.push(obj)
- }
+ }
+ })
+ }
+ if (type == 0) {
+ editTable.push(obj)
+ }
+ })
+ if (type == 0) {
+ editTable.forEach(a => {
+ a.symbolList.forEach(b => {
+ let arr = a.symbolList.filter(c => c.symbolItem == b.symbolItem);
+ b.inspectionItemList = arr.map(c => c.inspectionItem).join(',')
+ })
})
- if(type==0){
- editTable.forEach(a => {
- a.symbolList.forEach(b => {
- let arr = a.symbolList.filter(c => c.symbolItem == b.symbolItem);
- b.inspectionItemList = arr.map(c => c.inspectionItem).join(',')
- })
+ editTable.forEach(a => {
+ let mySet = new Set();
+ a.symbolList = a.symbolList.filter(b => {
+ let num0 = mySet.size;
+ mySet.add(b.symbolItem);
+ let num1 = mySet.size;
+ if (num0 != num1) {
+ return true;
+ } else {
+ return false
+ }
})
- editTable.forEach(a => {
- let mySet = new Set();
- a.symbolList = a.symbolList.filter(b =>{
- let num0 = mySet.size;
- mySet.add(b.symbolItem);
- let num1 = mySet.size;
- if(num0!=num1){
- return true;
- }else{
- return false
- }
- })
+ })
+ let editTableNew = []
+ editTable.forEach(a => {
+ a.symbolList.forEach(b => {
+ let obj = {
+ sampleCode: a.sampleCode,
+ model: a.model,
+ symbolItem: b.symbolItem,
+ sampleId: a.sampleId,
+ value: null,
+ inspectionItemList: b.inspectionItemList,
+ modelNum: a.modelNum,
+ }
+ editTableNew.push(obj)
})
- let editTableNew = []
- editTable.forEach(a => {
- a.symbolList.forEach(b => {
- let obj = {
- sampleCode:a.sampleCode,
- model:a.model,
- symbolItem:b.symbolItem,
- sampleId:a.sampleId,
- value:null,
- inspectionItemList:b.inspectionItemList,
- modelNum:a.modelNum,
- }
- editTableNew.push(obj)
- })
- })
- return editTableNew
- }else{
- return sampleList
+ })
+ return editTableNew
+ } else {
+ return sampleList
+ }
+ },
+ saveMethod(sampleList) {
+ this.saveLoad = true
+ if (this.addObj.quarterItemId) {
+ this.addObj.quarterItemId = this.addObj.quarterItemId[1]
+ }
+ if (this.tabIndex == 4 && this.active == 2) {
+ if (this.addObj.createTime) {
+ delete this.addObj.createTime
}
- },
- saveMethod(sampleList){
- this.saveLoad = true
- if (this.addObj.quarterItemId) {
- this.addObj.quarterItemId = this.addObj.quarterItemId[1]
- }
- if(this.tabIndex==4&&this.active==2){
- if (this.addObj.createTime) {
- delete this.addObj.createTime
- }
- // 閫�鍥炲悗鎻愪氦
- updateInsOrder({insOrder: this.addObj, sampleProduct: sampleList}).then(res => {
- this.saveLoad = false
- this.$message.success('宸叉彁浜�')
- this.bsm3Dia = false;
- this.closeOpenPage()
- }).catch(e=>{
- this.saveLoad = false
- })
- }else{
- // 甯歌鎻愪氦
- addInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
- this.saveLoad = false
- this.$message.success('宸叉彁浜�')
- this.bsm3Dia = false;
- this.closeOpenPage()
- }).catch(e=>{
- this.saveLoad = false
- })
- }
-
- },
- upInsOrderOfState(state) {
- if (state == 1) {
- this.saveLoad = true
- upInsOrderOfState({
- state,
- id: this.currentId,
- companyId:this.addObj.companyId,
- laboratory:this.addObj.laboratory,
- company: this.addObj.company
- }).then(res => {
- this.saveLoad = false
- this.$message.success('鎻愪氦鎴愬姛')
- selectOrderManDay({
- id: this.currentId
- }).then(ress => {
- this.distributeData.orderId = this.currentId
- this.distributeData.appointed = ress.data
- })
- setTimeout(() => {
- this.distributeData.sonLaboratory = this.newJuLaboratoryList.length > 0 ? this.newJuLaboratoryList[0].value : ''
- this.issuedDialogVisible = true;
- }, 1000)
- })
- } else {
- // 涓嶉�氳繃
- this.noDialogVisible = true
- }
- },
- // 涓嬪彂
- submitForm2() {
- if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
- this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
- return
- }
- if (this.distributeData.userId == null || this.distributeData.userId == '') {
- this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
- return
- }
- this.upLoad = true;
- upInsOrder({
- orderId: this.distributeData.orderId,
- appointed: this.distributeData.appointed,
- userId: this.distributeData.userId,
- sonLaboratory:this.distributeData.sonLaboratory
- }).then(res => {
- this.$message.success('鎻愪氦鎴愬姛')
- this.upLoad = false
- this.issuedDialogVisible = false
+ // 閫�鍥炲悗鎻愪氦
+ updateInsOrder({insOrder: this.addObj, sampleProduct: sampleList}).then(res => {
+ this.saveLoad = false
+ this.$message.success('宸叉彁浜�')
+ this.bsm3Dia = false;
this.closeOpenPage()
}).catch(e => {
- this.$message.error('鎻愪氦澶辫触')
- this.upLoad = false
+ this.saveLoad = false
})
- },
- getUserNowData() {
- getUserNow().then(res => {
- let selects = res.data
- if (selects == null) return
- this.addObj.userId = selects.id
- this.addObj.company = selects.company
- this.addObj.custom = selects.name
- this.addObj.code = selects.code
- this.addObj.phone = selects.phone
- this.addObj.companyId = selects.departId
- this.addObj.production = ''
- this.addObj.productionEn = ''
- if(this.active==1){
- this.selectInsOrderTemplate()
- }
+ } else {
+ // 甯歌鎻愪氦
+ addInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
+ this.saveLoad = false
+ this.$message.success('宸叉彁浜�')
+ this.bsm3Dia = false;
+ this.closeOpenPage()
+ }).catch(e => {
+ this.saveLoad = false
})
- },
- getProNum() {
- this.sampleSelectionList.forEach((m, i) => {
- this.$set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
- })
- this.$refs.sampleTable.doLayout()
- },
- searchFilter() {
- this.$refs.tree.filter(this.search)
- },
- nodeOpen(data, node, el) {
- $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
- if (node.data.code === '[3]') {
- this.sampleViewEn = data.sampleTypeEn
- } else if (node.data.code === '[4]') {
- this.sampleViewEn = data.sampleEn
- }
- },
- nodeClose(data, node, el) {
- $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
- },
- handleNodeClick(val, node, el) {
- this.selectTree = ''
- this.models = val.children
- this.getNodeParent(node)
- let flag = false
- if (node.level == 3) {
- if(node.data.children.length>0){
- node.data.children.forEach(a => {
- let key = Object.keys(a)
- if(!key.includes('level')) {
- flag = true
- }
- })
+ }
- }
- }
- if (node.data.code === '[3]') {
- this.sampleViewEn = val.sampleTypeEn
- } else if (node.data.code === '[4]') {
- if (node.data.children!==null && node.data.children.length>0) {
- this.sampleViewEn = val.sampleEn
- }
- }
- this.selectTree = this.selectTree.replace(' - ', '')
- if(flag) {
- this.selectTree = ' - - ' + this.selectTree
- }
- let data = this.selectTree.split(' - ')
- let data2 = ''
- for (let index = data.length - 1; index >= 0; index--) {
- data2 += " - " + data[index]
- }
- this.selectTree = data2.replace(' - ', '')
- },
- getNodeParent(val) {
- if (val.parent != null) {
- if (val.data.children === null) {
- this.selectTree += ' - ' + val.label + ' - ' + ''
- } else {
- this.selectTree += ' - ' + val.label
- }
- this.getNodeParent(val.parent)
- }
- },
- selectStandardTreeList() {
- this.selectStandardTreeLoading = true
- selectStandardTreeList2().then(res => {
- this.list = res.data
- this.list.forEach(a => {
- this.expandedKeys.push(a.label)
- })
- this.selectStandardTreeLoading=false
- })
- },
- filterNode(value, data) {
- if (!value) return true;
- return data.label.indexOf(value) !== -1;
- },
- activeStandardTree() {
- let trees = this.selectTree.split(" - ")
- if (trees.length < 3) {
- this.$message.error('鏈�夋嫨瀵硅薄')
- return
- }
- this.addObj.factory = trees[0]
- this.addObj.laboratory = trees[1]
- this.addObj.sampleType = trees[2]
- if (trees[3] === undefined || trees[3] === '' || trees[3] === '- ') {
- this.addObj.sample = trees[2]
- } else {
- this.addObj.sample = trees[3]
- }
- this.addObj.sampleViewEn = this.sampleViewEn
- this.addObj.model = (trees[4] == undefined ? null : trees[4])
- this.selectStandardTree = false
- this.sampleList = []
- for (var i = 0; i < this.addObj.sampleNum; i++) {
- this.sample.joinName = null
- this.sample.joinModel = null
- this.sample.joinNum = 1
- this.sample.sample = this.addObj.sample
- this.sample.model = this.addObj.model
- this.sample.unit = this.addObj.unit
- this.sample.standardMethodListId = null
- this.sample.insProduct = []
- this.sample.id = this.count
- this.sample.childSampleList = []
- this.sample.insulating = null
- this.sample.sheath = null
- this.sampleList.push(this.HaveJson(this.sample))
- this.count++
- }
- this.$refs.sampleTable.doLayout()
- // this.selectsStandardMethodByFLSSM()
- },
- selectsStandardMethodByFLSSMList() {
- this.methodLoad = true
- selectsStandardMethodByFLSSM({
- tree: this.selectTree
+ },
+ upInsOrderOfState(state) {
+ if (state == 1) {
+ this.saveLoad = true
+ upInsOrderOfState({
+ state,
+ id: this.currentId,
+ companyId: this.addObj.companyId,
+ laboratory: this.addObj.laboratory,
+ company: this.addObj.company
}).then(res => {
- this.methodLoad = false
- try {
- if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) {
- let arr = this.selectTree.split('-')
- let arr0 = arr.slice(0, arr.length - 1)
- let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
- selectsStandardMethodByFLSSM({
- tree: selectTree
- }).then(ress => {
- this.methods = ress.data.standardMethodList
- })
- } else {
- this.methods = res.data.standardMethodList
+ this.saveLoad = false
+ this.$message.success('鎻愪氦鎴愬姛')
+ selectOrderManDay({
+ id: this.currentId
+ }).then(ress => {
+ this.distributeData.orderId = this.currentId
+ this.distributeData.appointed = ress.data
+ })
+ setTimeout(() => {
+ this.distributeData.sonLaboratory = this.newJuLaboratoryList.length > 0 ? this.newJuLaboratoryList[0].value : ''
+ this.issuedDialogVisible = true;
+ }, 1000)
+ })
+ } else {
+ // 涓嶉�氳繃
+ this.noDialogVisible = true
+ }
+ },
+ // 涓嬪彂
+ submitForm2() {
+ if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
+ this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
+ return
+ }
+ if (this.distributeData.userId == null || this.distributeData.userId == '') {
+ this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
+ return
+ }
+ this.upLoad = true;
+ upInsOrder({
+ orderId: this.distributeData.orderId,
+ appointed: this.distributeData.appointed,
+ userId: this.distributeData.userId,
+ sonLaboratory: this.distributeData.sonLaboratory
+ }).then(res => {
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.upLoad = false
+ this.issuedDialogVisible = false
+ this.closeOpenPage()
+ }).catch(e => {
+ this.$message.error('鎻愪氦澶辫触')
+ this.upLoad = false
+ })
+ },
+ getUserNowData() {
+ getUserNow().then(res => {
+ let selects = res.data
+ if (selects == null) return
+ this.addObj.userId = selects.id
+ this.addObj.company = selects.company
+ this.addObj.custom = selects.name
+ this.addObj.code = selects.code
+ this.addObj.phone = selects.phone
+ this.addObj.companyId = selects.departId
+ this.addObj.production = ''
+ this.addObj.productionEn = ''
+ if (this.active == 1) {
+ this.selectInsOrderTemplate()
+ }
+ })
+ },
+ getProNum() {
+ this.sampleSelectionList.forEach((m, i) => {
+ this.$set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
+ })
+ this.$refs.sampleTable.doLayout()
+ },
+ searchFilter() {
+ this.$refs.tree.filter(this.search)
+ },
+ nodeOpen(data, node, el) {
+ $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
+ if (node.data.code === '[3]') {
+ this.sampleViewEn = data.sampleTypeEn
+ } else if (node.data.code === '[4]') {
+ this.sampleViewEn = data.sampleEn
+ }
+ },
+ nodeClose(data, node, el) {
+ $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
+ },
+ handleNodeClick(val, node, el) {
+ this.selectTree = ''
+ this.models = val.children
+ this.getNodeParent(node)
+ let flag = false
+ if (node.level == 3) {
+ if (node.data.children.length > 0) {
+ node.data.children.forEach(a => {
+ let key = Object.keys(a)
+ if (!key.includes('level')) {
+ flag = true
}
- } catch (e) {}
- })
- },
- addStandardTree() {
- if (this.selectTree == null) return
- this.sampleList = []
- this.productList = []
- for (var i = 0; i < this.addObj.sampleNum; i++) {
- this.sample.joinName = null
- this.sample.joinModel = null
- this.sample.joinNum = 1
- this.sample.sample = this.addObj.sample
- this.sample.model = this.addObj.model
- this.sample.unit = this.addObj.unit
- this.sample.standardMethodListId = null
- this.sample.insProduct = []
- this.sample.id = parseInt(i+1)
- this.sample.childSampleList = []
- this.sample.insulating = null
- this.sample.sheath = null
- this.sampleList.push(this.HaveJson(this.sample))
- // this.count++
+ })
+
}
- },
- selectSample(val) {
- this.sampleIds = []
- val.forEach(a => {
- this.sampleIds.push(a.id)
- })
- this.sampleSelectionList = val
- },
- selectProduct(val) {
- this.productIds = []
- val.forEach(a => {
- this.productIds.push(a.id)
- })
- },
- rowClick(row, column, event) {
- this.currentMethod = row
- let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
- if (obj && obj.code == '鎶�鏈姹�') {
- this.isAskOnlyRead = true
+ }
+ if (node.data.code === '[3]') {
+ this.sampleViewEn = val.sampleTypeEn
+ } else if (node.data.code === '[4]') {
+ if (node.data.children !== null && node.data.children.length > 0) {
+ this.sampleViewEn = val.sampleEn
+ }
+ }
+ this.selectTree = this.selectTree.replace(' - ', '')
+ if (flag) {
+ this.selectTree = ' - - ' + this.selectTree
+ }
+ let data = this.selectTree.split(' - ')
+ let data2 = ''
+ for (let index = data.length - 1; index >= 0; index--) {
+ data2 += " - " + data[index]
+ }
+ this.selectTree = data2.replace(' - ', '')
+ },
+ getNodeParent(val) {
+ if (val.parent != null) {
+ if (val.data.children === null) {
+ this.selectTree += ' - ' + val.label + ' - ' + ''
} else {
- this.isAskOnlyRead = false
+ this.selectTree += ' - ' + val.label
}
- this.sampleId = row.id
- if (this.active !== 1) {
- this.sampleIds = []
- this.sampleSelectionList.forEach(ele=>{
- if(ele.id == row.id){
- this.sampleIds.push(row.id)
+ this.getNodeParent(val.parent)
+ }
+ },
+ selectStandardTreeList() {
+ this.selectStandardTreeLoading = true
+ selectStandardTreeList2().then(res => {
+ this.list = res.data
+ this.list.forEach(a => {
+ this.expandedKeys.push(a.label)
+ })
+ this.selectStandardTreeLoading = false
+ })
+ },
+ filterNode(value, data) {
+ if (!value) return true;
+ return data.label.indexOf(value) !== -1;
+ },
+ activeStandardTree() {
+ let trees = this.selectTree.split(" - ")
+ if (trees.length < 3) {
+ this.$message.error('鏈�夋嫨瀵硅薄')
+ return
+ }
+ this.addObj.factory = trees[0]
+ this.addObj.laboratory = trees[1]
+ this.addObj.sampleType = trees[2]
+ if (trees[3] === undefined || trees[3] === '' || trees[3] === '- ') {
+ this.addObj.sample = trees[2]
+ } else {
+ this.addObj.sample = trees[3]
+ }
+ this.addObj.sampleViewEn = this.sampleViewEn
+ this.addObj.model = (trees[4] == undefined ? null : trees[4])
+ this.selectStandardTree = false
+ this.sampleList = []
+ for (var i = 0; i < this.addObj.sampleNum; i++) {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ this.sample.sample = this.addObj.sample
+ this.sample.model = this.addObj.model
+ this.sample.unit = this.addObj.unit
+ this.sample.standardMethodListId = null
+ this.sample.insProduct = []
+ this.sample.id = this.count
+ this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
+ this.sampleList.push(this.HaveJson(this.sample))
+ this.count++
+ }
+ this.$refs.sampleTable.doLayout()
+ // this.selectsStandardMethodByFLSSM()
+ },
+ selectsStandardMethodByFLSSMList() {
+ this.methodLoad = true
+ selectsStandardMethodByFLSSM({
+ tree: this.selectTree
+ }).then(res => {
+ this.methodLoad = false
+ try {
+ if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) {
+ let arr = this.selectTree.split('-')
+ let arr0 = arr.slice(0, arr.length - 1)
+ let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
+ selectsStandardMethodByFLSSM({
+ tree: selectTree
+ }).then(ress => {
+ this.methods = ress.data.standardMethodList
+ })
+ } else {
+ this.methods = res.data.standardMethodList
+ }
+ } catch (e) {
+ }
+ })
+ },
+ addStandardTree() {
+ if (this.selectTree == null) return
+ this.sampleList = []
+ this.productList = []
+ for (var i = 0; i < this.addObj.sampleNum; i++) {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ this.sample.sample = this.addObj.sample
+ this.sample.model = this.addObj.model
+ this.sample.unit = this.addObj.unit
+ this.sample.standardMethodListId = null
+ this.sample.insProduct = []
+ this.sample.id = parseInt(i + 1)
+ this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
+ this.sampleList.push(this.HaveJson(this.sample))
+ // this.count++
+ }
+ },
+ selectSample(val) {
+ this.sampleIds = []
+ val.forEach(a => {
+ this.sampleIds.push(a.id)
+ })
+ this.sampleSelectionList = val
+ },
+ selectProduct(val) {
+ this.productIds = []
+ val.forEach(a => {
+ this.productIds.push(a.id)
+ })
+ },
+ rowClick(row, column, event) {
+ this.currentMethod = row
+ let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ if (obj && obj.code == '鎶�鏈姹�') {
+ this.isAskOnlyRead = true
+ } else {
+ this.isAskOnlyRead = false
+ }
+ this.sampleId = row.id
+ if (this.active !== 1) {
+ this.sampleIds = []
+ this.sampleSelectionList.forEach(ele => {
+ if (ele.id == row.id) {
+ this.sampleIds.push(row.id)
+ }
+ })
+ }
+ this.productList = row.insProduct
+ this.productList0 = JSON.parse(JSON.stringify(this.productList))
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) {
+ this.toggleSelection(a)
+ } else {
+ this.$refs.productTable.toggleRowSelection(a, false);
+ }
+ })
+ }, 200)
+ },
+ toggleSelection(row) {
+ this.$refs.productTable.toggleRowSelection(row, true);
+ },
+ selectOne(selection, row) {
+ this.bsm1DiaList = []
+ row.state = row.state == 1 ? 0 : 1
+ if (row.section === null) {
+ row.section = ""
+ }
+ if (row.sectionCopy === undefined && row.section) {
+ if (row.section.indexOf('[') > -1) {
+ this.$set(row, 'sectionCopy', row.section)
+ }
+ }
+ if (row.ask.includes('[')) {
+ this.$set(row, 'askCopy', row.ask)
+ }
+ if (row.tell.includes('[')) {
+ this.$set(row, 'tellCopy', row.tell)
+ }
+ let arr = this.productList.filter(m => m.state == 1 && row.sectionCopy && row.sectionCopy.includes(m.sectionCopy) && m.ask && m.sectionCopy.indexOf('[') == -1)
+ if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.sectionCopy !== undefined && row.state === 1 && arr.length == 0) {
+ if (row.sectionCopy.indexOf('[') > -1) {
+ row.bsmRow = this.HaveJson(row)
+ }
+ row.bsm1 = true
+ this.bsm1DiaList.push(row)
+ this.bsm1DiaAll = true
+ } else if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.state === 0 && arr.length == 0) {
+ row.bsm1 = false
+ } else if (arr.length > 0) {
+ try {
+ row.bsmRow = this.HaveJson(row)
+ let sectionCopy = arr[0].sectionCopy
+ let arr0 = JSON.parse(row.sectionCopy)
+ let arr1 = JSON.parse(row.ask)
+ let arr4 = JSON.parse(row.tell)
+ let index = arr0.indexOf(sectionCopy)
+ row.sectionCopy = sectionCopy
+ row.ask = arr1[index]
+ row.tell = arr4[index]
+ } catch (e) {
+ }
+ }
+ this.sampleList.forEach(item => {
+ if (this.sampleIds.indexOf(item.id) > -1 || this.currentMethod.id == item.id) {
+ item.insProduct.forEach(m => {
+ if (m.id == row.id) {
+ m.state = row.state;
}
})
}
+ })
+ this.productList.forEach(item => {
+ if (item.id == row.id) {
+ item.state = row.state;
+ }
+ })
+ this.changeProductList0()
+ this.currentMethod.insProduct = this.productList0
+ this.getProNum()
+ },
+ permute(nums) {
+ const result = [];
+
+ function backtrack(temp, nums) {
+ if (temp.length === 2) {
+ result.push([...temp]);
+ return;
+ }
+ for (let i = 0; i < nums.length; i++) {
+ if (temp.includes(nums[i])) continue;
+ // 閬垮厤閲嶅鏁板瓧
+ if (temp.length > 0 && nums[i] < temp[temp.length - 1]) continue; // 瑙勫畾椤哄簭锛岄伩鍏嶉噸澶嶇粍鍚�
+ temp.push(nums[i]);
+ backtrack(temp, nums);
+ temp.pop();
+ }
+ }
+
+ backtrack([], nums);
+ return result;
+ },
+ tableRowClassName({row, rowIndex}) {
+ if (row.state == 1) {
+ return 'warning-row';
+ } else {
+ return '';
+ }
+ },
+ selectInsOrderTemplate() {
+ selectInsOrderTemplate({company: this.addObj.company}).then(res => {
+ this.templates = res.data
+ })
+ },
+ // 鍒犻櫎妯℃澘--璋冪敤鎺ュ彛
+ handleDelete(row) {
+ this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ delInsOrderTemplate({
+ id: row.id
+ }).then(res => {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.selectInsOrderTemplate()
+ }).catch(e => {
+ this.$message.error('鍒犻櫎澶辫触')
+ })
+ }).catch(() => {
+ })
+ },
+ // 淇濆瓨妯℃澘
+ addTemplateDia() {
+ if (this.templateName) {
+ this.templateLoading = true;
+ addInsOrderTemplate({
+ name: this.templateName,
+ thing: JSON.stringify({
+ addObj: this.addObj,
+ sampleList: this.sampleList,
+ selectTree: this.selectTree
+ })
+ }).then(res => {
+ this.templateLoading = false;
+ this.templateDia = false;
+ this.$message.success('淇濆瓨鎴愬姛')
+ this.selectInsOrderTemplate()
+ this.templateName = ''
+ }).catch(e => {
+ this.templateLoading = false;
+ })
+ } else {
+ this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
+ }
+ },
+ // 鏌ヨ妯℃澘
+ selectInsOrderTemplateById(e) {
+ selectInsOrderTemplateById({id: e}).then(res => {
+ let obj = JSON.parse(res.data)
+ //鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
+ let user = this.nickName
+ obj.addObj.custom = user.name
+ obj.addObj.userId = user.userId
+ this.addObj = obj.addObj;
+ this.sampleList = obj.sampleList;
+ this.selectTree = obj.selectTree
+ this.rowClick(this.sampleList[0])
+ })
+ },
+ delSampleAndProduct() {
+ this.sampleList.splice(scope.$index, 1)
+ this.productList = []
+ },
+ spliceString(row, val, type) {
+ if (type === 'cores') {
+ const index = this.sampleList.findIndex(item => item.id === row.id)
+ if (index > -1) {
+ if (this.sampleList[index].modelNum) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores + '*' + this.sampleList[index].modelNum)
+ } else {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores)
+ }
+ if (this.sampleList[index].modelNum && !this.sampleList[index].cores) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].modelNum)
+ }
+ }
+ }
+ this.getProductLoad = true
+ let selectTreeList = this.selectTree.split(" - ")
+ this.addObj.model && (selectTreeList[selectTreeList.length - 1] = this.addObj.model)
+ selectStandardProductList({
+ model: this.addObj.model ? this.addObj.model : row.model,
+ modelNum: row.modelNum,
+ standardMethodListId: val,
+ factory: selectTreeList.join(" - "),
+ cores: row.cores,
+ conductorMaterial: row.conductorMaterial,
+ conductorType: row.conductorType,
+ }).then(res => {
+ res.data.forEach(a => {
+ a.state = 0
+ })
+ row.insProduct = this.HaveJson(res.data)
+ this.getProductLoad = false
this.productList = row.insProduct
this.productList0 = JSON.parse(JSON.stringify(this.productList))
+ this.$refs.sampleTable.setCurrentRow(row)
+ this.$nextTick(() => {
+ this.$refs.productTable.doLayout();
+ this.upIndex++
+ });
setTimeout(() => {
this.productList.forEach(a => {
- if (a.state == 1) {
- this.toggleSelection(a)
- }else{
- this.$refs.productTable.toggleRowSelection(a, false);
- }
+ if (a.state == 1) this.toggleSelection(a)
})
}, 200)
- },
- toggleSelection(row) {
- this.$refs.productTable.toggleRowSelection(row, true);
- },
- selectOne(selection, row) {
- this.bsm1DiaList = []
- row.state = row.state == 1 ? 0 : 1
- if(row.section === null) {
- row.section = ""
- }
- if (row.sectionCopy === undefined && row.section) {
- if (row.section.indexOf('[') > -1) {
- this.$set(row, 'sectionCopy', row.section)
- }
- }
- if (row.ask.includes('[')) {
- this.$set(row, 'askCopy', row.ask)
- }
- if (row.tell.includes('[')) {
- this.$set(row, 'tellCopy', row.tell)
- }
- let arr = this.productList.filter(m=>m.state==1&&row.sectionCopy&&row.sectionCopy.includes(m.sectionCopy)&&m.ask&&m.sectionCopy.indexOf('[')==-1)
- if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.sectionCopy !== undefined && row.state === 1&&arr.length==0) {
- if (row.sectionCopy.indexOf('[') > -1) {
- row.bsmRow = this.HaveJson(row)
- }
- row.bsm1 = true
- this.bsm1DiaList.push(row)
- this.bsm1DiaAll = true
- } else if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.state === 0&&arr.length==0) {
- row.bsm1 = false
- }else if(arr.length>0){
- try{
- row.bsmRow = this.HaveJson(row)
- let sectionCopy = arr[0].sectionCopy
- let arr0 = JSON.parse(row.sectionCopy)
- let arr1 = JSON.parse(row.ask)
- let arr4 = JSON.parse(row.tell)
- let index = arr0.indexOf(sectionCopy)
- row.sectionCopy = sectionCopy
- row.ask = arr1[index]
- row.tell = arr4[index]
- } catch(e) {}
- }
- this.sampleList.forEach(item => {
- if (this.sampleIds.indexOf(item.id) > -1||this.currentMethod.id==item.id) {
- item.insProduct.forEach(m => {
- if (m.id == row.id) {
- m.state = row.state;
- }
- })
- }
- })
- this.productList.forEach(item => {
- if (item.id == row.id) {
- item.state = row.state;
- }
- })
- this.changeProductList0()
- this.currentMethod.insProduct = this.productList0
- this.getProNum()
- },
- permute(nums) {
- const result = [];
-
- function backtrack(temp, nums) {
- if (temp.length === 2) {
- result.push([...temp]);
- return;
- }
- for (let i = 0; i < nums.length; i++) {
- if (temp.includes(nums[i])) continue;
- // 閬垮厤閲嶅鏁板瓧
- if (temp.length > 0 && nums[i] < temp[temp.length - 1]) continue; // 瑙勫畾椤哄簭锛岄伩鍏嶉噸澶嶇粍鍚�
- temp.push(nums[i]);
- backtrack(temp, nums);
- temp.pop();
- }
- }
- backtrack([], nums);
- return result;
- },
- tableRowClassName({row, rowIndex}) {
- if (row.state == 1) {
- return 'warning-row';
- } else {
- return '';
- }
- },
- selectInsOrderTemplate() {
- selectInsOrderTemplate({company: this.addObj.company}).then(res => {
- this.templates = res.data
- })
- },
- // 鍒犻櫎妯℃澘--璋冪敤鎺ュ彛
- handleDelete(row) {
- this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- delInsOrderTemplate({
- id: row.id
- }).then(res => {
- this.$message.success('鍒犻櫎鎴愬姛')
- this.selectInsOrderTemplate()
- }).catch(e => {
- this.$message.error('鍒犻櫎澶辫触')
- })
- }).catch(() => {})
- },
- // 淇濆瓨妯℃澘
- addTemplateDia() {
- if (this.templateName) {
- this.templateLoading = true;
- addInsOrderTemplate({
- name: this.templateName,
- thing: JSON.stringify({
- addObj: this.addObj,
- sampleList: this.sampleList,
- selectTree:this.selectTree
- })
- }).then(res => {
- this.templateLoading = false;
- this.templateDia = false;
- this.$message.success('淇濆瓨鎴愬姛')
- this.selectInsOrderTemplate()
- this.templateName = ''
- }).catch(e => {
- this.templateLoading = false;
- })
- } else {
- this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
- }
- },
- // 鏌ヨ妯℃澘
- selectInsOrderTemplateById(e) {
- selectInsOrderTemplateById({id: e}).then(res => {
- let obj = JSON.parse(res.data)
- //鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
- let user = this.nickName
- obj.addObj.custom = user.name
- obj.addObj.userId = user.userId
- this.addObj = obj.addObj;
- this.sampleList = obj.sampleList;
- this.selectTree = obj.selectTree
- this.rowClick(this.sampleList[0])
- })
- },
- delSampleAndProduct() {
- this.sampleList.splice(scope.$index, 1)
- this.productList = []
- },
- spliceString (row, val, type) {
- if (type === 'cores') {
- const index = this.sampleList.findIndex(item => item.id === row.id)
- if (index > -1) {
+ })
+ },
+ methodChange(val, row, type) {
+ if (type === 'splice') {
+ const index = this.sampleList.findIndex(item => item.id === row.id)
+ if (index > -1) {
+ if (this.sampleList[index].cores) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores + '*' + this.sampleList[index].modelNum)
+ } else {
if (this.sampleList[index].modelNum) {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores + '*' + this.sampleList[index].modelNum)
+ const index2 = this.sampleList[index].modelNum.indexOf('脳')
+ if (index2 === 0) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + this.sampleList[index].modelNum)
+ } else if (index2 === -1) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].modelNum)
+ } else {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].modelNum + this.sampleList[index].model)
+ }
} else {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores)
- }
- if (this.sampleList[index].modelNum && !this.sampleList[index].cores) {
- this.$set(this.sampleList[index], 'endModels',this.sampleList[index].model + ' ' + this.sampleList[index].modelNum)
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ((this.sampleList[index].modelNum == null || this.sampleList[index].modelNum == '' || this.sampleList[index].modelNum == 'null') ? '' : (' ' + this.sampleList[index].modelNum)))
}
}
+ if (!this.sampleList[index].modelNum && this.sampleList[index].cores) {
+ this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores)
+ }
}
- this.getProductLoad = true
- let selectTreeList = this.selectTree.split(" - ")
- this.addObj.model&&(selectTreeList[selectTreeList.length - 1] = this.addObj.model)
- selectStandardProductList({
- model: this.addObj.model?this.addObj.model:row.model,
- modelNum: row.modelNum,
- standardMethodListId: val,
- factory: selectTreeList.join(" - "),
- cores: row.cores,
- conductorMaterial: row.conductorMaterial,
- conductorType: row.conductorType,
- }).then(res => {
- res.data.forEach(a => {
- a.state = 0
- })
- row.insProduct = this.HaveJson(res.data)
- this.getProductLoad = false
- this.productList = row.insProduct
- this.productList0 = JSON.parse(JSON.stringify(this.productList))
- this.$refs.sampleTable.setCurrentRow(row)
- this.$nextTick(() => {
- this.$refs.productTable.doLayout();
- this.upIndex++
- });
- setTimeout(() => {
- this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- }, 200)
+ }
+ if (val === null || val === '') return
+ this.currentMethod = row
+ let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ if (obj && obj.code == '鎶�鏈姹�') {
+ this.isAskOnlyRead = true
+ } else {
+ this.isAskOnlyRead = false
+ }
+ this.getProductLoad = true
+ let selectTreeList = this.selectTree.split(" - ")
+ this.addObj.model && (selectTreeList[selectTreeList.length - 1] = this.addObj.model)
+ selectStandardProductList({
+ model: this.addObj.model ? this.addObj.model : row.model,
+ modelNum: row.modelNum,
+ standardMethodListId: val,
+ cores: row.cores,
+ factory: selectTreeList.join(" - "),
+ }).then(res => {
+ res.data.forEach(a => {
+ a.state = 0
})
- },
- methodChange(val, row, type) {
- if (type === 'splice') {
- const index = this.sampleList.findIndex(item => item.id === row.id)
- if (index > -1) {
- if (this.sampleList[index].cores) {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores + '*' + this.sampleList[index].modelNum)
- } else {
- if (this.sampleList[index].modelNum) {
- const index2 = this.sampleList[index].modelNum.indexOf('脳')
- if (index2 === 0) {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + this.sampleList[index].modelNum)
- } else if (index2 === -1) {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].modelNum)
- } else {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].modelNum + this.sampleList[index].model)
+ row.insProduct = this.HaveJson(res.data)
+ this.getProductLoad = false
+ this.productList = row.insProduct
+ this.productList0 = JSON.parse(JSON.stringify(this.productList))
+ this.$refs.sampleTable.setCurrentRow(row)
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 200)
+ })
+ },
+ changeModel() {
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if (obj) {
+ a.model = this.model
+ }
+ })
+ },
+ changeStandardMethodListId() {
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if (obj) {
+ a.standardMethodListId = this.standardMethodListId
+ this.methodChange(this.standardMethodListId, a)
+ }
+ })
+ },
+ methodFocus() {
+ this.selectsStandardMethodByFLSSMList()
+ },
+ handleChangeModel(e) {
+ this.productList = []
+ let num = this.selectTree.split('-').length;
+ if (num != 5) {
+ this.selectTree = this.selectTree + ' - ' + e
+ } else {
+ let arr = this.selectTree.split('-')
+ let arr0 = arr.slice(0, arr.length - 1)
+ this.selectTree = arr0.join('-') + '- ' + e
+ }
+ },
+ // 瑕佹眰鍊煎彉鍖栨椂
+ requestChange(e, row, type) {
+ //this.currentMethod 褰撳墠鏍峰搧id
+ this.sampleList.forEach(item => {
+ if (item.id == this.currentMethod.id) {
+ item.insProduct.forEach(i => {
+ if (i.id == row.id) {
+ if (row.repetitionTag) {
+ if (row.repetitionTag == i.repetitionTag) {
+ i[type] = e
}
} else {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ((this.sampleList[index].modelNum == null || this.sampleList[index].modelNum == '' || this.sampleList[index].modelNum == 'null') ? '' : (' ' + this.sampleList[index].modelNum)))
- }
- }
- if (!this.sampleList[index].modelNum && this.sampleList[index].cores) {
- this.$set(this.sampleList[index], 'endModels', this.sampleList[index].model + ' ' + this.sampleList[index].cores)
- }
- }
- }
- if (val === null || val === '') return
- this.currentMethod = row
- let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
- if (obj && obj.code == '鎶�鏈姹�') {
- this.isAskOnlyRead = true
- } else {
- this.isAskOnlyRead = false
- }
- this.getProductLoad = true
- let selectTreeList = this.selectTree.split(" - ")
- this.addObj.model&&(selectTreeList[selectTreeList.length - 1] = this.addObj.model)
- selectStandardProductList({
- model: this.addObj.model?this.addObj.model:row.model,
- modelNum: row.modelNum,
- standardMethodListId: val,
- cores: row.cores,
- factory: selectTreeList.join(" - "),
- }).then(res => {
- res.data.forEach(a => {
- a.state = 0
- })
- row.insProduct = this.HaveJson(res.data)
- this.getProductLoad = false
- this.productList = row.insProduct
- this.productList0 = JSON.parse(JSON.stringify(this.productList))
- this.$refs.sampleTable.setCurrentRow(row)
- setTimeout(() => {
- this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- }, 200)
- })
- },
- changeModel() {
- this.sampleList.forEach(a => {
- let obj = this.sampleIds.find(b => b == a.id)
- if (obj) {
- a.model = this.model
- }
- })
- },
- changeStandardMethodListId() {
- this.sampleList.forEach(a => {
- let obj = this.sampleIds.find(b => b == a.id)
- if (obj) {
- a.standardMethodListId = this.standardMethodListId
- this.methodChange(this.standardMethodListId, a)
- }
- })
- },
- methodFocus() {
- this.selectsStandardMethodByFLSSMList()
- },
- handleChangeModel(e) {
- this.productList = []
- let num = this.selectTree.split('-').length;
- if (num != 5) {
- this.selectTree = this.selectTree + ' - ' + e
- } else {
- let arr = this.selectTree.split('-')
- let arr0 = arr.slice(0, arr.length - 1)
- this.selectTree = arr0.join('-') + '- ' + e
- }
- },
- // 瑕佹眰鍊煎彉鍖栨椂
- requestChange(e, row,type) {
- //this.currentMethod 褰撳墠鏍峰搧id
- this.sampleList.forEach(item=>{
- if(item.id == this.currentMethod.id){
- item.insProduct.forEach(i=>{
- if(i.id == row.id){
- if(row.repetitionTag){
- if(row.repetitionTag==i.repetitionTag){
- i[type] = e
- }
- }else{
- if(!i.repetitionTag){
- i[type] = e
- }
+ if (!i.repetitionTag) {
+ i[type] = e
}
}
+ }
+ })
+ }
+ })
+ },
+ selectStandardMethods() {
+ selectStandardMethodEnum().then(res => {
+ this.methods = res.data
+ })
+ },
+ selectable() {
+ if (this.active > 1) {
+ return false
+ } else {
+ return true
+ }
+ },
+ selectable0(row, index) {
+ if (this.active > 1 || row.repetitionTag) {
+ return false
+ } else {
+ return true
+ }
+ },
+ handleAll(e) {
+ if (e.length > 0) {
+ this.productList.map(m => {
+ if (e.find(a => a.id == m.id)) {
+ m.state = 1
+ }
+ return m
+ })
+ } else {
+ this.productList.map(m => {
+ m.state = 0
+ return m
+ })
+ }
+ this.bsm1DiaList = []
+ this.productList.forEach(p => {
+ if (p.sectionCopy === undefined && p.section) {
+ if (p.section.indexOf('[') > -1) {
+ this.$set(p, 'sectionCopy', p.section)
+ }
+ }
+ if (p.ask.includes('[')) {
+ this.$set(p, 'askCopy', p.ask)
+ }
+ if (p.tell.includes('[')) {
+ this.$set(p, 'tellCopy', p.tell)
+ }
+ // if (p.manHour.includes('[')) {
+ // this.$set(p, 'manHourCopy', p.manHour)
+ // }
+ // if (p.price.includes('[')) {
+ // this.$set(p, 'priceCopy', p.price)
+ // }
+ if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
+ if (p.sectionCopy.indexOf('[') > -1) {
+ p.bsmRow = this.HaveJson(p)
+ }
+ p.bsm1 = true
+ this.bsm1DiaList.push(p)
+ this.bsm1DiaAll = true
+ } else if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.state === 0) {
+ p.bsm1 = false
+ }
+ })
+ if (e.length > 0) {
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1 || this.currentMethod.id == item.id) {
+ item.insProduct.map(m => {
+ m.state = 1
+ return m;
})
}
+ return item
})
- },
- selectStandardMethods() {
- selectStandardMethodEnum().then(res => {
- this.methods = res.data
+ } else {
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1 || this.currentMethod.id == item.id) {
+ item.insProduct.map(m => {
+ m.state = 0
+ return m;
+ })
+ }
+ return item
})
- },
- selectable() {
- if (this.active > 1) {
- return false
+ }
+ this.productList.forEach(item => {
+ if (item.id == row.id) {
+ item.state = row.state;
+ }
+ })
+ this.changeProductList0()
+ this.currentMethod.insProduct = this.productList0
+ this.getProNum()
+ this.$nextTick(() => {
+ this.$refs.productTable.doLayout()
+ })
+ },
+ submitTell() {
+ if (!this.tell) {
+ this.$message.error('璇疯緭鍏ヤ笉閫氳繃鍘熷洜')
+ return
+ }
+ this.noLoading = true;
+ upInsOrderOfState({
+ state: 2,
+ id: this.currentId,
+ tell: this.tell
+ }).then(res => {
+ this.noLoading = false;
+ this.tell = '';
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.issuedDialogVisible = false;
+ this.closeOpenPage()
+ })
+ },
+ filterHandler(value, row, column) {
+ const property = column['property'];
+ return row[property] === value;
+ },
+ areObjectsValuesEqual(objects, property) {
+ if (!objects || objects.length === 0) return false;
+ const firstValue = objects[0][property];
+ return objects.every(obj => obj[property] === firstValue);
+ },
+ // 杈呭姪绾胯姱閰嶇疆
+ openAuxiliaryCore() {
+ if (this.active == 1) {
+ if (this.sampleIds.length === 0) {
+ this.$message.error("鏈�夋嫨鏍峰搧")
+ } else if (this.sampleIds.length === 1) {
+ if (!this.sampleSelectionList[0].standardMethodListId) {
+ this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ return
+ }
+ this.auxiliaryShow = true
} else {
- return true
- }
- },
- selectable0(row,index) {
- if (this.active > 1||row.repetitionTag) {
- return false
- } else {
- return true
- }
- },
- handleAll(e) {
- if (e.length > 0) {
- this.productList.map(m => {
- if(e.find(a=>a.id == m.id)){
- m.state = 1
- }
- return m
- })
- } else {
- this.productList.map(m => {
- m.state = 0
- return m
- })
- }
- this.bsm1DiaList = []
- this.productList.forEach(p => {
- if (p.sectionCopy === undefined && p.section) {
- if (p.section.indexOf('[') > -1) {
- this.$set(p, 'sectionCopy', p.section)
- }
- }
- if (p.ask.includes('[')) {
- this.$set(p, 'askCopy', p.ask)
- }
- if (p.tell.includes('[')) {
- this.$set(p, 'tellCopy', p.tell)
- }
- // if (p.manHour.includes('[')) {
- // this.$set(p, 'manHourCopy', p.manHour)
- // }
- // if (p.price.includes('[')) {
- // this.$set(p, 'priceCopy', p.price)
- // }
- if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
- if (p.sectionCopy.indexOf('[') > -1) {
- p.bsmRow = this.HaveJson(p)
- }
- p.bsm1 = true
- this.bsm1DiaList.push(p)
- this.bsm1DiaAll = true
- } else if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.state === 0) {
- p.bsm1 = false
- }
- })
- if (e.length > 0) {
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1||this.currentMethod.id==item.id) {
- item.insProduct.map(m => {
- m.state = 1
- return m;
- })
- }
- return item
- })
- } else {
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1||this.currentMethod.id==item.id) {
- item.insProduct.map(m => {
- m.state = 0
- return m;
- })
- }
- return item
- })
- }
- this.productList.forEach(item => {
- if (item.id == row.id) {
- item.state = row.state;
- }
- })
- this.changeProductList0()
- this.currentMethod.insProduct = this.productList0
- this.getProNum()
- this.$nextTick(() => {
- this.$refs.productTable.doLayout()
- })
- },
- submitTell() {
- if (!this.tell) {
- this.$message.error('璇疯緭鍏ヤ笉閫氳繃鍘熷洜')
- return
- }
- this.noLoading = true;
- upInsOrderOfState({
- state: 2,
- id: this.currentId,
- tell: this.tell
- }).then(res => {
- this.noLoading = false;
- this.tell = '';
- this.$message.success('鎻愪氦鎴愬姛')
- this.issuedDialogVisible = false;
- this.closeOpenPage()
- })
- },
- filterHandler(value, row, column) {
- const property = column['property'];
- return row[property] === value;
- },
- areObjectsValuesEqual (objects, property) {
- if (!objects || objects.length === 0) return false;
- const firstValue = objects[0][property];
- return objects.every(obj => obj[property] === firstValue);
- },
- // 杈呭姪绾胯姱閰嶇疆
- openAuxiliaryCore () {
- if (this.active == 1) {
- if (this.sampleIds.length === 0) {
- this.$message.error("鏈�夋嫨鏍峰搧")
- } else if (this.sampleIds.length === 1) {
- if (!this.sampleSelectionList[0].standardMethodListId) {
- this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ // 鍚屾椂閰嶇疆澶氫釜鏍峰搧鐨勭數缂嗛厤缃椂蹇呴』閫夋嫨鐩稿悓鐨勬楠屾爣鍑�
+ if (!this.sampleSelectionList.every(value => value.standardMethodListId)) {
+ this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ } else {
+ if (!this.areObjectsValuesEqual(this.sampleSelectionList, 'standardMethodListId')) {
+ this.$message.error("璇烽�夋嫨鐩稿悓鐨勬楠屾爣鍑�")
return
}
this.auxiliaryShow = true
- } else {
- // 鍚屾椂閰嶇疆澶氫釜鏍峰搧鐨勭數缂嗛厤缃椂蹇呴』閫夋嫨鐩稿悓鐨勬楠屾爣鍑�
- if (!this.sampleSelectionList.every(value => value.standardMethodListId)) {
- this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
- } else {
- if (!this.areObjectsValuesEqual(this.sampleSelectionList, 'standardMethodListId')) {
- this.$message.error("璇烽�夋嫨鐩稿悓鐨勬楠屾爣鍑�")
- return
- }
- this.auxiliaryShow = true
- }
- }
- } else {
- if (this.sampleId === null) {
- this.$message.error('鏈�変腑鏍峰搧')
}
}
- },
- openCableConfig() {
- if (this.active == 1) {
- if (this.sampleIds.length === 0) {
- this.$message.error("鏈�夋嫨鏍峰搧")
- } else if (this.sampleIds.length === 1) {
- if (!this.sampleSelectionList[0].standardMethodListId) {
- this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ } else {
+ if (this.sampleId === null) {
+ this.$message.error('鏈�変腑鏍峰搧')
+ }
+ }
+ },
+ openCableConfig() {
+ if (this.active == 1) {
+ if (this.sampleIds.length === 0) {
+ this.$message.error("鏈�夋嫨鏍峰搧")
+ } else if (this.sampleIds.length === 1) {
+ if (!this.sampleSelectionList[0].standardMethodListId) {
+ this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ return
+ }
+ this.cableConfigShow = true
+ } else {
+ // 鍚屾椂閰嶇疆澶氫釜鏍峰搧鐨勭數缂嗛厤缃椂蹇呴』閫夋嫨鐩稿悓鐨勬楠屾爣鍑�
+ if (!this.sampleSelectionList.every(value => value.standardMethodListId)) {
+ this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
+ } else {
+ if (!this.areObjectsValuesEqual(this.sampleSelectionList, 'standardMethodListId')) {
+ this.$message.error("璇烽�夋嫨鐩稿悓鐨勬楠屾爣鍑�")
return
}
this.cableConfigShow = true
- } else {
- // 鍚屾椂閰嶇疆澶氫釜鏍峰搧鐨勭數缂嗛厤缃椂蹇呴』閫夋嫨鐩稿悓鐨勬楠屾爣鍑�
- if (!this.sampleSelectionList.every(value => value.standardMethodListId)) {
- this.$message.error("鏍峰搧鏈�夋嫨妫�楠屾爣鍑�")
- } else {
- if (!this.areObjectsValuesEqual(this.sampleSelectionList, 'standardMethodListId')) {
- this.$message.error("璇烽�夋嫨鐩稿悓鐨勬楠屾爣鍑�")
- return
+ }
+ }
+ } else {
+ if (this.sampleId === null) {
+ this.$message.error('鏈�変腑鏍峰搧')
+ }
+ }
+ },
+ goBackAdd() {
+ this.cableConfigShow = false
+ },
+ goBackAdd2() {
+ this.auxiliaryShow = false
+ },
+ // 鍏ㄩ�夌壒娈婂�煎鐞嗘閫夋嫨瑕佹眰鍊肩殑鍥炶皟
+ upBsmAll(item) {
+ const i = this.bsm1DiaList.findIndex(obj => obj.id === item.id)
+ if (i > -1) {
+ // 鎵惧埌鐩稿簲鐨勬楠岄」璧嬪��
+ this.bsm1DiaList[i].bsm1Val = item.bsm1Val
+ let sections = this.bsm1DiaList[i].bsmRow.sectionCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.sectionCopy);
+ let asks = this.bsm1DiaList[i].bsmRow.askCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.askCopy);
+ let tells = this.bsm1DiaList[i].bsmRow.tellCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.tellCopy);
+ // let manHours = this.bsm1DiaList[i].bsmRow.manHourCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.manHourCopy);
+ // let prices = this.bsm1DiaList[i].bsmRow.priceCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.priceCopy);
+ for (var a in sections) {
+ if (this.bsm1DiaList[i].bsm1Val === sections[a]) {
+ this.productList.forEach(p => {
+ // 灏嗛�夋嫨濂界殑瑕佹眰鍊艰祴鍊煎埌鍒楄〃閲�
+ if (p.id === this.bsm1DiaList[i].bsmRow.id) {
+ p.section = sections[a]
+ p.ask = asks[a]
+ p.tell = tells[a]
+ // p.manHour = manHours[a]
+ // p.price = prices[a]
}
- this.cableConfigShow = true
- }
- }
- } else {
- if (this.sampleId === null) {
- this.$message.error('鏈�変腑鏍峰搧')
- }
- }
- },
- goBackAdd () {
- this.cableConfigShow = false
- },
- goBackAdd2 () {
- this.auxiliaryShow = false
- },
- // 鍏ㄩ�夌壒娈婂�煎鐞嗘閫夋嫨瑕佹眰鍊肩殑鍥炶皟
- upBsmAll (item) {
- const i = this.bsm1DiaList.findIndex(obj => obj.id === item.id)
- if (i > -1) {
- // 鎵惧埌鐩稿簲鐨勬楠岄」璧嬪��
- this.bsm1DiaList[i].bsm1Val = item.bsm1Val
- let sections = this.bsm1DiaList[i].bsmRow.sectionCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.sectionCopy);
- let asks = this.bsm1DiaList[i].bsmRow.askCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.askCopy);
- let tells = this.bsm1DiaList[i].bsmRow.tellCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.tellCopy);
- // let manHours = this.bsm1DiaList[i].bsmRow.manHourCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.manHourCopy);
- // let prices = this.bsm1DiaList[i].bsmRow.priceCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.priceCopy);
- for (var a in sections) {
- if (this.bsm1DiaList[i].bsm1Val === sections[a]) {
- this.productList.forEach(p => {
- // 灏嗛�夋嫨濂界殑瑕佹眰鍊艰祴鍊煎埌鍒楄〃閲�
- if (p.id === this.bsm1DiaList[i].bsmRow.id) {
- p.section = sections[a]
- p.ask = asks[a]
- p.tell = tells[a]
- // p.manHour = manHours[a]
- // p.price = prices[a]
- }
- })
- break
- }
- }
- }
- this.changeProductList0()
- this.currentMethod.insProduct = this.productList0
- },
- save1 () {
- if (this.bsm1DiaList.length > 0) {
- this.bsm1DiaList.forEach(item => {
- if (!item.bsm1Val) {
- throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
- }
- })
- }
- this.bsm1DiaAll = false
- },
- beforeClose(done) {
- if (this.bsm1DiaList.length > 0) {
- this.bsm1DiaList.forEach(item => {
- if (!item.bsm1Val) {
- throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
- }
- })
- }
- done()
- },
- getTotal() {
- this.totalArr = []
- // this.total = 0;
- this.sampleList.forEach(item => {
- if (item.insProduct && item.insProduct.length > 0) {
- item.insProduct.forEach(a => {
- this.totalArr.push(a)
})
+ break
+ }
+ }
+ }
+ this.changeProductList0()
+ this.currentMethod.insProduct = this.productList0
+ },
+ save1() {
+ if (this.bsm1DiaList.length > 0) {
+ this.bsm1DiaList.forEach(item => {
+ if (!item.bsm1Val) {
+ throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
}
})
- let mySet = new Set();
- let arr0 = this.totalArr.filter(item => {
- if (item.state == 1) {
- let num1 = mySet.size
- if (item.manHourGroup === '' || !item.manHourGroup) {
+ }
+ this.bsm1DiaAll = false
+ },
+ beforeClose(done) {
+ if (this.bsm1DiaList.length > 0) {
+ this.bsm1DiaList.forEach(item => {
+ if (!item.bsm1Val) {
+ throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ }
+ })
+ }
+ done()
+ },
+ getTotal() {
+ this.totalArr = []
+ // this.total = 0;
+ this.sampleList.forEach(item => {
+ if (item.insProduct && item.insProduct.length > 0) {
+ item.insProduct.forEach(a => {
+ this.totalArr.push(a)
+ })
+ }
+ })
+ let mySet = new Set();
+ let arr0 = this.totalArr.filter(item => {
+ if (item.state == 1) {
+ let num1 = mySet.size
+ if (item.manHourGroup === '' || !item.manHourGroup) {
+ return true
+ } else {
+ mySet.add(item.manHourGroup)
+ let num2 = mySet.size
+ if (num2 > num1) {
return true
} else {
- mySet.add(item.manHourGroup)
- let num2 = mySet.size
- if (num2 > num1) {
- return true
- } else {
- return false
- }
+ return false
}
}
- })
- let arr1 = this.totalArr.filter(item => item.state == 1)
- let mySet0 = new Set();
- this.sonLaboratoryList = []
- arr1.forEach(item => {
- let num1 = mySet0.size
- mySet0.add(item.sonLaboratory)
- let num2 = mySet0.size
- if(num2>num1){
- this.sonLaboratoryList.push({
- label:item.sonLaboratory,
- value:item.sonLaboratory,
- })
- }
- })
- },
- changeUser(){
- if(this.newJuLaboratoryList.length>0){
- this.distributeData.sonLaboratory = this.newJuLaboratoryList[0].value
}
- },
- addProductList(productList,row,index){
- let list = productList.filter(m=>{
- if(m.id==row.id){
- m.delete = false
- }
- return m.id==row.id
- })
- let num = list.length
- let obj = this.HaveJson(row)
- obj.repetitionTag = num
- obj.delete = true
- productList.splice(index+num,0,obj)
- this.addProductList0(row,index)
- },
- addProductList0(row,index){
- let list = this.productList0.filter(m=>{
- if(m.id==row.id){
- m.delete = false
- }
- return m.id==row.id
- })
- let num = list.length
- let obj = this.HaveJson(row)
- obj.repetitionTag = num
- obj.delete = true
- this.productList0.splice(index+num,0,obj)
- },
- deleteProductList(index,list){
- if(list[index-1]&&list[index-1].repetitionTag){
- list[index-1].delete=true
+ })
+ let arr1 = this.totalArr.filter(item => item.state == 1)
+ let mySet0 = new Set();
+ this.sonLaboratoryList = []
+ arr1.forEach(item => {
+ let num1 = mySet0.size
+ mySet0.add(item.sonLaboratory)
+ let num2 = mySet0.size
+ if (num2 > num1) {
+ this.sonLaboratoryList.push({
+ label: item.sonLaboratory,
+ value: item.sonLaboratory,
+ })
}
- list.splice(index,1)
- this.deleteProductList0(index)
- },
- deleteProductList0(index){
- if(this.productList0[index-1]&&this.productList0[index-1].repetitionTag){
- this.productList0[index-1].delete=true
+ })
+ },
+ changeUser() {
+ if (this.newJuLaboratoryList.length > 0) {
+ this.distributeData.sonLaboratory = this.newJuLaboratoryList[0].value
+ }
+ },
+ addProductList(productList, row, index) {
+ let list = productList.filter(m => {
+ if (m.id == row.id) {
+ m.delete = false
}
- this.productList0.splice(index,1)
- },
- goBack () {
- if (this.active == 1) {
- this.$router.go(-1)
- } else {
- this.closeOpenPage()
+ return m.id == row.id
+ })
+ let num = list.length
+ let obj = this.HaveJson(row)
+ obj.repetitionTag = num
+ obj.delete = true
+ productList.splice(index + num, 0, obj)
+ this.addProductList0(row, index)
+ },
+ addProductList0(row, index) {
+ let list = this.productList0.filter(m => {
+ if (m.id == row.id) {
+ m.delete = false
}
- },
- closeOpenPage() {
+ return m.id == row.id
+ })
+ let num = list.length
+ let obj = this.HaveJson(row)
+ obj.repetitionTag = num
+ obj.delete = true
+ this.productList0.splice(index + num, 0, obj)
+ },
+ deleteProductList(index, list) {
+ if (list[index - 1] && list[index - 1].repetitionTag) {
+ list[index - 1].delete = true
+ }
+ list.splice(index, 1)
+ this.deleteProductList0(index)
+ },
+ deleteProductList0(index) {
+ if (this.productList0[index - 1] && this.productList0[index - 1].repetitionTag) {
+ this.productList0[index - 1].delete = true
+ }
+ this.productList0.splice(index, 1)
+ },
+ goBack() {
+ if (this.active == 1) {
this.$router.go(-1)
- this.$tab.closeOpenPage()
- },
- }
+ } else {
+ this.closeOpenPage()
+ }
+ },
+ closeOpenPage() {
+ this.$router.go(-1)
+ this.$tab.closeOpenPage()
+ },
}
+}
</script>
<style scoped>
->>>.warning-row {
+>>> .warning-row {
color: #1890FF;
}
+
.node_i {
color: orange;
font-size: 18px;
}
+
.template-tag-list {
min-height: 32px;
display: flex;
@@ -2255,23 +2341,28 @@
flex-wrap: wrap;
gap: 8px;
}
+
/* 濮旀墭鍗曚俊鎭細鍙璇︽儏 */
.order-detail__title {
font-size: 16px;
font-weight: bold;
color: #303133;
}
-.order-detail>>>.el-descriptions-item__label.is-bordered-label {
+
+.order-detail >>> .el-descriptions-item__label.is-bordered-label {
width: 104px;
white-space: nowrap;
}
-.order-detail>>>.el-descriptions-item__content {
+
+.order-detail >>> .el-descriptions-item__content {
color: #303133;
}
+
/* 鎻忚堪鍒楄〃鍐呬笉闇�瑕侀澶栫殑琛岄珮鍗犱綅锛屾爣绛捐涓庡叾瀹冭绛夐珮 */
.order-detail .template-tag-list {
min-height: 0;
}
+
.order-detail__empty {
color: #c0c4cc;
}
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 74f7232..56d1f0e 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -4,30 +4,30 @@
<el-form :model="entity" ref="entity" size="small" :inline="true">
<el-form-item label="鎶ュ憡缂栧彿" prop="code">
<el-input v-model="entity.code" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input>
+ @keyup.enter.native="refreshTable()"></el-input>
</el-form-item>
<el-form-item label="鐘舵��" prop="queryStatus">
<el-select v-model="entity.queryStatus" clearable size="small" @change="refreshTable()">
<el-option v-for="(a, i) in queryStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
</el-select>
</el-form-item>
-<!-- <el-form-item label="鎶ュ憡绫诲瀷" prop="reportType">-->
-<!-- <el-select v-model="entity.reportType" clearable size="small" @change="refreshTable()">-->
-<!-- <el-option v-for="item in reportTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="涓嬪崟绫诲埆" prop="typeSource">-->
-<!-- <el-select v-model="entity.typeSource" clearable size="small" @change="refreshTable()">-->
-<!-- <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鐗╂枡灞炴��" prop="materialProp">-->
-<!-- <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">-->
-<!-- <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"-->
-<!-- :value="dict.value">-->
-<!-- </el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
+ <!-- <el-form-item label="鎶ュ憡绫诲瀷" prop="reportType">-->
+ <!-- <el-select v-model="entity.reportType" clearable size="small" @change="refreshTable()">-->
+ <!-- <el-option v-for="item in reportTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="涓嬪崟绫诲埆" prop="typeSource">-->
+ <!-- <el-select v-model="entity.typeSource" clearable size="small" @change="refreshTable()">-->
+ <!-- <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鐗╂枡灞炴��" prop="materialProp">-->
+ <!-- <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">-->
+ <!-- <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"-->
+ <!-- :value="dict.value">-->
+ <!-- </el-option>-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item label="妫�楠岀被鍒�" prop="orderType">
<el-select v-model="entity.orderType" clearable size="small" @change="refreshTable()">
<el-option v-for="(a, i) in orderTypeList" :key="i" :label="a.label" :value="a.value"></el-option>
@@ -45,57 +45,66 @@
</div>
<div>
<lims-table :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading"
- :isSelection="true" :handleSelectionChange="handleChange" :height="'calc(100vh - 290px)'"
- @pagination="pagination" key="valueTableData">
+ :isSelection="true" :handleSelectionChange="handleChange" :height="'calc(100vh - 290px)'"
+ @pagination="pagination" key="valueTableData">
<div slot="action" slot-scope="scope">
-<!-- <el-button size="small" type="text" @click="viewIssued(scope.row)">鏌ョ湅鎶ュ憡</el-button>-->
+ <!-- <el-button size="small" type="text" @click="viewIssued(scope.row)">鏌ョ湅鎶ュ憡</el-button>-->
<el-upload ref='upload1' style="display: inline;margin: 0 6px" :action="fileAction1 + '?id=' + scope.row.id"
- :auto-upload="true" :before-upload="fileBeforeUpload1" :headers="uploadHeader" :on-error="onError1"
- :on-success="handleSuccessUp1" :show-file-list="false" accept='.doc,.docx'>
+ :auto-upload="true" :before-upload="fileBeforeUpload1" :headers="uploadHeader" :on-error="onError1"
+ :on-success="handleSuccessUp1" :show-file-list="false" accept='.doc,.docx'>
<el-button size="small" type="text"
- :disabled="scope.row.state != 0 || nickName !== scope.row.writeUserName">涓婁紶</el-button>
+ :disabled="scope.row.state != 0 || nickName !== scope.row.writeUserName">涓婁紶
+ </el-button>
</el-upload>
-<!-- <el-button type="text" size="small" :disabled="scope.row.state != 0 || nickName !== scope.row.writeUserName"-->
-<!-- @click="handleRestore(scope.row)">杩樺師</el-button>-->
+ <!-- <el-button type="text" size="small" :disabled="scope.row.state != 0 || nickName !== scope.row.writeUserName"-->
+ <!-- @click="handleRestore(scope.row)">杩樺師</el-button>-->
+ <el-button type="text" size="small" @click="sendBackTask(scope.row)">閫�鍥炰换鍔�</el-button>
<el-button type="text" size="small" :disabled="scope.row.state != 0 || nickName !== scope.row.writeUserName"
- @click="sendBackTask(scope.row)">閫�鍥炰换鍔�</el-button>
- <el-button type="text" size="small" :disabled="scope.row.state != 0 || nickName !== scope.row.writeUserName"
- @click="handle(scope.row)">鎻愪氦</el-button>
+ @click="handle(scope.row)">鎻愪氦
+ </el-button>
<el-button type="text" size="small"
- :disabled="scope.row.state == null || scope.row.state == 0 || scope.row.isExamine == 1 || nickName !== scope.row.examineUser"
- @click="handleIssued(scope.row)">瀹℃牳</el-button>
+ :disabled="scope.row.state == null || scope.row.state == 0 || scope.row.isExamine == 1 || nickName !== scope.row.examineUser"
+ @click="handleIssued(scope.row)">瀹℃牳
+ </el-button>
<el-button type="text" size="small"
- :disabled="scope.row.state == null || scope.row.state == 0 || scope.row.isExamine == 0 || scope.row.isExamine == null || scope.row.isRatify == 1 || nickName !== scope.row.ratifyUser"
- @click="handleApprove(scope.row)">鎵瑰噯</el-button>
+ :disabled="scope.row.state == null || scope.row.state == 0 || scope.row.isExamine == 0 || scope.row.isExamine == null || scope.row.isRatify == 1 || nickName !== scope.row.ratifyUser"
+ @click="handleApprove(scope.row)">鎵瑰噯
+ </el-button>
<el-button style="margin-left: 10px" type="text" size="small"
- :disabled="!scope.row.url && !scope.row.urlS" @click="download(scope.row)">涓嬭浇</el-button>
+ :disabled="!scope.row.url && !scope.row.urlS" @click="download(scope.row)">涓嬭浇
+ </el-button>
+ <el-button type="text" size="small"
+ :loading="regeneratingReportId === scope.row.id"
+ :disabled="regeneratingReportId === scope.row.id"
+ @click="handleRegenerate(scope.row)">閲嶆柊鐢熸垚
+ </el-button>
<el-button type="text" size="small" @click="viewInspectInfo(scope.row)">鍘熷璁板綍</el-button>
<el-button type="text" size="small" @click="handleFileLook(scope.row)">闄勪欢涓婁紶</el-button>
</div>
</lims-table>
</div>
<el-dialog :fullscreen="fullscreen" :modal-append-to-body="false" :visible.sync="claimVisible" title="鍦ㄧ嚎缂栧埗"
- width="22cm">
+ width="22cm">
<div class="full-screen">
<i v-if="!fullscreen" class="el-icon-full-screen" style="cursor: pointer;font-size: 18px"
- @click="fullscreen = true;"></i>
+ @click="fullscreen = true;"></i>
<img v-else alt="" src="@/assets/images/no-full.svg" style="cursor: pointer;" @click="fullscreen = false;">
</div>
- <Word v-if="claimVisible" ref="Word" :class="{ fullscreen: fullscreen }" :value="value" style="height:70vh" />
+ <Word v-if="claimVisible" ref="Word" :class="{ fullscreen: fullscreen }" :value="value" style="height:70vh"/>
<span slot="footer" class="dialog-footer">
<el-button @click="claimVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="confirmClaim">纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog :fullscreen="fullscreen" :modal-append-to-body="false" :visible.sync="issuedVisible" title="鎶ュ憡瀹℃牳"
- width="80vw">
+ width="80vw">
<div class="full-screen">
<i v-if="!fullscreen" class="el-icon-full-screen" style="cursor: pointer;font-size: 18px"
- @click="fullscreen = true;"></i>
+ @click="fullscreen = true;"></i>
<img v-else alt="" src="@/assets/images/no-full.svg" style="cursor: pointer;" @click="fullscreen = false;">
</div>
<div v-if="issuedVisible" style="height: 70vh;">
- <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
+ <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;"/>
</div>
<span slot="footer" class="dialog-footer">
<el-button :disabled="loadingIssued" @click="issuedReasonVisible = true">涓嶉�氳繃</el-button>
@@ -105,7 +114,9 @@
<el-dialog :modal-append-to-body="false" :visible.sync="issuedReasonVisible" title="涓嶉�氳繃鍘熷洜" width="400px">
<div class="search_thing">
<div class="search_label">涓嶉�氳繃鍘熷洜锛�</div>
- <div class="search_input"><el-input v-model="reason" clearable placeholder="璇疯緭鍏�" size="small"></el-input></div>
+ <div class="search_input">
+ <el-input v-model="reason" clearable placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
</div>
<span slot="footer" class="dialog-footer">
<el-button :disabled="loadingIssuedReason" @click="issuedReasonVisible = false">鍙栨秷</el-button>
@@ -113,14 +124,14 @@
</span>
</el-dialog>
<el-dialog :fullscreen="fullscreen" :modal-append-to-body="false" :visible.sync="approveVisible" title="鎶ュ憡鎵瑰噯"
- width="80vw">
+ width="80vw">
<div class="full-screen">
<i v-if="!fullscreen" class="el-icon-full-screen" style="cursor: pointer;font-size: 18px"
- @click="fullscreen = true;"></i>
+ @click="fullscreen = true;"></i>
<img v-else alt="" src="@/assets/images/no-full.svg" style="cursor: pointer;" @click="fullscreen = false;">
</div>
<div v-if="approveVisible" style="height: 70vh;">
- <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
+ <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;"/>
</div>
<span slot="footer" class="dialog-footer">
<el-button :disabled="loadingApprove" @click="approveReasonVisible = true">涓嶆壒鍑�</el-button>
@@ -130,7 +141,9 @@
<el-dialog :modal-append-to-body="false" :visible.sync="approveReasonVisible" title="涓嶆壒鍑嗗師鍥�" width="400px">
<div class="search_thing">
<div class="search_label">涓嶆壒鍑嗗師鍥狅細</div>
- <div class="search_input"><el-input v-model="reason" clearable placeholder="璇疯緭鍏�" size="small"></el-input></div>
+ <div class="search_input">
+ <el-input v-model="reason" clearable placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
</div>
<span slot="footer" class="dialog-footer">
<el-button :disabled="loadingApproveReason" @click="approveReasonVisible = false">鍙栨秷</el-button>
@@ -138,7 +151,7 @@
</span>
</el-dialog>
<el-dialog :close-on-click-modal="false" :visible.sync="addApproverDia" title="鎸囧畾鎵瑰噯浜哄憳" width="400px"
- @close="closeAddApproverDia">
+ @close="closeAddApproverDia">
<div class="body" style="display: flex;padding: 10px;align-items: center;">
<div class="search_label" style="width: 150px;"><span class="required-span">*</span>鎵瑰噯浜猴細</div>
<div class="search_input" style="width: 100%;">
@@ -154,7 +167,7 @@
</span>
</el-dialog>
<el-dialog :close-on-click-modal="false" :visible.sync="addVerifyDia" title="鎸囧畾瀹℃牳浜哄憳" width="400px"
- @close="closeAddVerifyDia">
+ @close="closeAddVerifyDia">
<div class="body" style="display: flex;padding: 10px;align-items: center;">
<div class="search_label" style="width: 150px;"><span class="required-span">*</span>瀹℃牳浜猴細</div>
<div class="search_input" style="width: 100%;">
@@ -173,28 +186,46 @@
<!-- <ShowInfo v-if="showInfoDialog" ref="showInfoDialog" :showInfoDialog="showInfoDialog"></ShowInfo>-->
<!--鎶ュ憡鏌ョ湅-->
<el-dialog :fullscreen="fullscreen" :modal-append-to-body="false" :visible.sync="viewIssuedVisible" title="鎶ュ憡鏌ョ湅"
- width="80vw">
+ width="80vw">
<div class="full-screen">
<i v-if="!fullscreen" class="el-icon-full-screen" style="cursor: pointer;font-size: 18px"
- @click="fullscreen = true;"></i>
+ @click="fullscreen = true;"></i>
<img v-else alt="" src="@/assets/images/no-full.svg" style="cursor: pointer;" @click="fullscreen = false;">
</div>
<div v-if="viewIssuedVisible" style="height: 80vh;">
- <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
+ <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;"/>
</div>
</el-dialog>
<!--闄勪欢鏌ョ湅-->
<el-dialog :visible.sync="filesDialogVisible" title="闄勪欢鏌ョ湅" width="80%" @closed="closeFilesLook">
<div style="margin-bottom: 10px">
<el-upload ref='upload' :action="fileAction" :auto-upload="true" :before-upload="fileBeforeUpload"
- :data="{ orderId: filesLookInfo.insOrderId }" :headers="uploadHeader" :on-error="onError"
- :on-success="handleSuccessUp" :show-file-list="false"
- accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' style="width: 80px !important;">
+ :data="{ orderId: filesLookInfo.insOrderId }" :headers="uploadHeader" :on-error="onError"
+ :on-success="handleSuccessUp" :show-file-list="false"
+ accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
+ style="width: 80px !important;">
<el-button size="small" style="height: 38px" type="primary">闄勪欢涓婁紶</el-button>
</el-upload>
</div>
<lims-table :tableData="tableDataFile" :column="columnFile" height="600px"
- key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table>
+ key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table>
+ </el-dialog>
+ <el-dialog title="閫夋嫨涓嬭浇鎶ュ憡" :visible.sync="downloadDialogVisible" width="400px"
+ :close-on-click-modal="false" @closed="closeDownloadDialog">
+ <el-form label-width="90px">
+ <el-form-item label="鎶ュ憡绫诲瀷锛�">
+ <el-radio-group v-model="selectedReportType">
+ <el-radio :label="0">妫�娴嬫姤鍛�</el-radio>
+ <el-radio :label="1" :disabled="!downloadRow || !downloadRow.inspectionUrl">妫�楠屾姤鍛�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="downloadDialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" :loading="downloadingReportType !== null"
+ :disabled="selectedReportType === null || downloadingReportType !== null"
+ @click="downloadSelectedReport(selectedReportType)">涓� 杞�</el-button>
+ </span>
</el-dialog>
</div>
</template>
@@ -207,19 +238,21 @@
downloadReport,
examineReport,
pageInsReport,
+ regenerateReport,
ratifyReport,
sendBackTask,
upReportUrl,
writeReport,
reportAllExport
} from "@/api/business/insReport";
-import { mapGetters } from "vuex";
-import { selectUserCondition } from "@/api/business/inspectionTask";
+import {mapGetters} from "vuex";
+import {selectUserCondition} from "@/api/business/inspectionTask";
import limsTable from "@/components/Table/lims-table.vue";
import {delFile, downFile, getFileList} from "@/api/business/rawMaterialOrder";
+
export default {
name: 'ReportPreparation',
- components: { limsTable, onlyoffice },
+ components: {limsTable, onlyoffice},
dicts: ['material_prop_type'],
data() {
return {
@@ -255,6 +288,11 @@
mutiList: [],
outLoading: false,
outExportLoading: false,
+ regeneratingReportId: null,
+ downloadDialogVisible: false,
+ downloadRow: null,
+ selectedReportType: 0,
+ downloadingReportType: null,
inLoading: false,
addApproverDia: false, // 鎸囧畾瀹℃壒浜哄憳寮规
approver: '', // 瀹℃壒浜哄憳
@@ -264,19 +302,19 @@
verifyUser: null, // 瀹℃牳浜哄憳
loadingVerify: false, // 瀹℃牳浜哄憳
typeSourceList: [
- { label: '濮旀墭涓嬪崟', value: -1 },
- { label: '澶栬喘涓嬪崟', value: 0 },
- { label: '鍘熸潗鏂欎笅鍗�', value: 1 },
+ {label: '濮旀墭涓嬪崟', value: -1},
+ {label: '澶栬喘涓嬪崟', value: 0},
+ {label: '鍘熸潗鏂欎笅鍗�', value: 1},
],
orderTypeList: [
- { label: '濮旀墭璇曢獙', value: 'Customer-ordered test' },
- { label: '鎶芥', value: '鎶芥' },
+ {label: '濮旀墭璇曢獙', value: 'Customer-ordered test'},
+ {label: '鎶芥', value: '鎶芥'},
// { label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�' },
// { label: '瀛ｅ害妫�楠�', value: 'Quarterly inspection' },
],
reportTypeList: [
- { label: '妫�娴嬫姤鍛�', value: 0 },
- { label: '妫�楠屾姤鍛�', value: 1 },
+ {label: '妫�娴嬫姤鍛�', value: 0},
+ {label: '妫�楠屾姤鍛�', value: 1},
],
showInfoDialog: false, // 浜т笟閾句俊鎭煡鐪�
isReport: 1,
@@ -286,9 +324,9 @@
examine: null,
viewIssuedVisible: false,
queryStatusList: [
- { label: '寰呮彁浜�', value: 0 },
- { label: '寰呭鏍�', value: 1 },
- { label: '寰呮壒鍑�', value: 2 },
+ {label: '寰呮彁浜�', value: 0},
+ {label: '寰呭鏍�', value: 1},
+ {label: '寰呮壒鍑�', value: 2},
],
state: 0,
orderId: 0,
@@ -324,9 +362,9 @@
}
}
},
- { label: '闄勪欢鍚嶇О', prop: 'fileName' },
- { label: '涓婁紶浜�', prop: 'name' },
- { label: '涓婁紶鏃堕棿', prop: 'createTime' },
+ {label: '闄勪欢鍚嶇О', prop: 'fileName'},
+ {label: '涓婁紶浜�', prop: 'name'},
+ {label: '涓婁紶鏃堕棿', prop: 'createTime'},
{
dataType: 'action',
fixed: 'right',
@@ -411,9 +449,9 @@
return this.orderTypeList.find((m) => m.value == params).type;
},
},
- { label: "鍒涘缓鏃堕棿", prop: "createTime" },
- { label: "鎻愪氦浜�", prop: "writeUserName" },
- { label: "鎻愪氦鏃堕棿", prop: "writeTime" },
+ {label: "鍒涘缓鏃堕棿", prop: "createTime"},
+ {label: "鎻愪氦浜�", prop: "writeUserName"},
+ {label: "鎻愪氦鏃堕棿", prop: "writeTime"},
{
label: "鎻愪氦鐘舵��",
prop: "state",
@@ -434,8 +472,8 @@
}
},
},
- { label: "瀹℃牳浜�", prop: "examineUser" },
- { label: "瀹℃牳鏃堕棿", prop: "examineTime" },
+ {label: "瀹℃牳浜�", prop: "examineUser"},
+ {label: "瀹℃牳鏃堕棿", prop: "examineTime"},
{
label: "瀹℃牳鐘舵��",
prop: "isExamine",
@@ -460,9 +498,9 @@
}
},
},
- { label: "瀹℃牳澶囨敞", prop: "examineTell" },
- { label: "鎵瑰噯浜�", prop: "ratifyUser" },
- { label: "鎵瑰噯鏃堕棿", prop: "ratifyTime" },
+ {label: "瀹℃牳澶囨敞", prop: "examineTell"},
+ {label: "鎵瑰噯浜�", prop: "ratifyUser"},
+ {label: "鎵瑰噯鏃堕棿", prop: "ratifyTime"},
{
label: "鎵瑰噯鐘舵��",
prop: "isRatify",
@@ -487,12 +525,12 @@
}
},
},
- { label: "鎵瑰噯澶囨敞", prop: "ratifyTell" },
+ {label: "鎵瑰噯澶囨敞", prop: "ratifyTell"},
{
fixed: "right",
dataType: "slot",
slot: "action",
- width: '360px',
+ width: '440px',
label: "鎿嶄綔"
}
],
@@ -525,7 +563,7 @@
this.valueTableData = res.data.body.records
})
},
- pagination({ page, limit }) {
+ pagination({page, limit}) {
this.page.current = page;
this.page.size = limit;
this.refreshTable();
@@ -565,7 +603,7 @@
// 鏌ヨ闄勪欢鏌ョ湅鍒楄〃鍥炶皟
getFileList() {
this.tableLoadingFile = true
- getFileList({ insOrderId: this.filesLookInfo.insOrderId,current: -1, size: -1 }).then(res => {
+ getFileList({insOrderId: this.filesLookInfo.insOrderId, current: -1, size: -1}).then(res => {
this.tableLoadingFile = false
if (res.code === 200) {
this.tableDataFile = res.data.records
@@ -607,7 +645,7 @@
type: 'warning'
}).then(() => {
this.tableLoadingFile = true
- delFile({ id: row.id }).then(res => {
+ delFile({id: row.id}).then(res => {
this.tableLoadingFile = false
this.$message.success('鍒犻櫎鎴愬姛')
this.getFileList()
@@ -636,7 +674,7 @@
}
let str = this.mutiList.map(m => m.id).join(',')
this.outLoading = true
- downAll({ ids: str }).then(res => {
+ downAll({ids: str}).then(res => {
this.outLoading = false
this.$download.zip(res.data, '鎶ュ憡.zip');
}).catch(() => {
@@ -651,7 +689,7 @@
...this.entity
}).then(res => {
this.outExportLoading = false
- const blob = new Blob([res], { type: 'application/octet-stream' });
+ const blob = new Blob([res], {type: 'application/octet-stream'});
this.$download.saveAs(blob, "鎶ュ憡鎶ヨ〃瀵煎嚭.xlsx");
})
},
@@ -749,7 +787,28 @@
}
},
download(row) {
- downloadReport(row.id).then(res => {
+ this.downloadRow = row
+ // 鍘嗗彶鏁版嵁鍙湁妫�娴嬫姤鍛婏細鐩存帴鎸夋娴嬫姤鍛婁笅杞斤紝淇濇寔鍘熸湁鎿嶄綔涔犳儻銆�
+ if (!row.inspectionUrl) {
+ this.downloadSelectedReport(0)
+ return
+ }
+ this.selectedReportType = 0
+ this.downloadDialogVisible = true
+ },
+ closeDownloadDialog() {
+ if (this.downloadingReportType === null) {
+ this.downloadRow = null
+ this.selectedReportType = 0
+ }
+ },
+ downloadSelectedReport(reportType) {
+ if (!this.downloadRow) {
+ return
+ }
+ const row = this.downloadRow
+ this.downloadingReportType = reportType
+ downloadReport(row.id, reportType).then(res => {
if (res.type && res.type.includes('application/json')) {
const reader = new FileReader()
reader.onload = () => {
@@ -762,11 +821,33 @@
reader.readAsText(res)
return
}
- const reportUrl = row.urlS || row.url || ''
+ const reportUrl = reportType === 1 ? row.inspectionUrl : (row.urlS || row.url || '')
const filename = decodeURIComponent(reportUrl.substring(reportUrl.lastIndexOf('/') + 1)) || `${row.code}.docx`
this.$download.saveAs(res, filename)
+ this.downloadDialogVisible = false
}).catch(() => {
this.$message.error('鎶ュ憡涓嬭浇澶辫触')
+ }).finally(() => {
+ this.downloadingReportType = null
+ if (!this.downloadDialogVisible) {
+ this.downloadRow = null
+ }
+ })
+ },
+ handleRegenerate(row) {
+ this.$confirm('灏嗘牴鎹綋鍓嶅師濮嬭褰曢噸鏂扮敓鎴愬苟瑕嗙洊绯荤粺鎶ュ憡锛屾槸鍚︾户缁紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.regeneratingReportId = row.id
+ return regenerateReport(row.id).then(() => {
+ this.$message.success('鎶ュ憡閲嶆柊鐢熸垚鎴愬姛')
+ this.refreshTable()
+ }).finally(() => {
+ this.regeneratingReportId = null
+ })
+ }).catch(() => {
})
},
// 杩樺師鎿嶄綔
@@ -837,7 +918,7 @@
type: 'warning'
}).then(() => {
this.upLoad = true
- sendBackTask({ id: row.id }).then(res => {
+ sendBackTask({id: row.id}).then(res => {
this.upLoad = false
this.$message.success('閫�鍥炴垚鍔燂紒')
this.refreshTable('page')
@@ -885,7 +966,7 @@
},
// 鑾峰彇浜哄憳鍒楄〃
getAuthorizedPerson() {
- selectUserCondition({ type: 1 }).then((res) => {
+ selectUserCondition({type: 1}).then((res) => {
let data = [];
res.data.forEach((a) => {
data.push({
diff --git a/src/views/system/customer/index.vue b/src/views/system/customer/index.vue
index 1e400c9..cc63aa7 100644
--- a/src/views/system/customer/index.vue
+++ b/src/views/system/customer/index.vue
@@ -27,28 +27,15 @@
<el-form-item label="瀹㈡埛鍚嶇О" prop="company">
<el-input v-model="user.company" size="small" clearable></el-input>
</el-form-item>
- <el-form-item label="瀹㈡埛鍗曚綅EN" prop="companyEn">
- <el-input v-model="user.companyEn" size="small" clearable></el-input>
- </el-form-item>
<el-form-item label="鍗曚綅鍦板潃" prop="address">
<el-input type="textarea" v-model="user.address" size="small" clearable
:autosize="{minRows: 2, maxRows: 4}"></el-input>
</el-form-item>
- <el-form-item label="鍗曚綅鍦板潃EN" prop="addressEn">
- <el-input type="textarea" v-model="user.addressEn" size="small" clearable
- :autosize="{minRows: 2, maxRows: 4}"></el-input>
+ <el-form-item label="鑱旂郴浜�" prop="contact">
+ <el-input v-model="user.contact" size="small" clearable></el-input>
</el-form-item>
<el-form-item label="鍗曚綅鐢佃瘽" prop="phone">
<el-input v-model="user.phone" size="small" clearable></el-input>
- </el-form-item>
- <el-form-item label="鍔犳�ラ搴�" prop="num">
- <el-input v-model="user.num" size="small" clearable></el-input>
- </el-form-item>
- <el-form-item label="瀹㈡埛缂栧彿" prop="code2">
- <el-input v-model="user.code2" size="small" clearable></el-input>
- </el-form-item>
- <el-form-item label="宸ュ巶鍩�" prop="code">
- <el-input v-model="user.code" size="small" clearable></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -75,13 +62,9 @@
tableData: [],
column: [
{label: '瀹㈡埛鍚嶇О', prop: 'company'},
- {label: '瀹㈡埛鍗曚綅EN', prop: 'companyEn'},
{label: '鍗曚綅鍦板潃', prop: 'address'},
- {label: '鍗曚綅鍦板潃EN', prop: 'addressEn'},
+ {label: '鑱旂郴浜�', prop: 'contact'},
{label: '鍗曚綅鐢佃瘽', prop: 'phone'},
- {label: '鍔犳�ラ搴�', prop: 'num'},
- {label: '瀹㈡埛缂栧彿', prop: 'code2'},
- {label: '宸ュ巶鍩�', prop: 'code'},
{
dataType: 'action',
fixed: 'right',
@@ -120,8 +103,6 @@
userRules: {
company: [{ required: true, message: '璇疯緭鍏ュ鎴峰悕绉�', trigger: 'blur' }],
address: [{ required: true, message: '璇疯緭鍏ュ崟浣嶅湴鍧�', trigger: 'blur' }],
- num: [{ required: true, message: '璇疯緭鍏ュ姞鎬ラ搴�', trigger: 'blur' }],
- code2: [{ required: true, message: '璇疯緭鍏ュ鎴风紪鍙�', trigger: 'blur' }],
},
loading: false,
//
--
Gitblit v1.9.3