From 77fad81725d273ad7d515b1d98fa3e7c2b20be06 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 30 九月 2024 09:47:15 +0800
Subject: [PATCH] 样机编号完成40%
---
src/components/do/b1-ins-order/add.vue | 15 ++++++++++++++-
src/main.js | 4 ++--
src/components/view/b1-inspection-order.vue | 9 ++++++++-
src/assets/api/controller.js | 1 +
4 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 48680e7..b4f103c 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -183,6 +183,7 @@
export: "/insOrder/export", //瀵煎嚭
selectNoProducts: "/insOrder/selectNoProducts", //瀵煎嚭
checkUpdate: "/insOrder/checkUpdate", //鎾ら攢瀹℃牳閫氳繃
+ checkNumber: "/insOrder/checkNumber",
}
const sampleOrder = {
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 245417d..d7c17e7 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -362,6 +362,17 @@
</el-date-picker>
</div>
</el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label"><span class="required-span">* </span>鏍锋満瀹屾垚鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-date-picker
+ v-model="addObj.issueTime"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </div>
+ </el-col>
<el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
<div class="search_label">澶囨敞锛�</div>
<div class="search_input">
@@ -1026,6 +1037,7 @@
type: '0',
code: null,
appointed: null,
+ issueTime:null,
remark: null,
otcCode: null,
mating: 0,
@@ -1052,7 +1064,6 @@
departmentLimsId:null,
departmentLims:null,
partNo: null, // 闆朵欢鍙�
- appointed:null,
},
sample: {
sampleCode: null,
@@ -1791,6 +1802,8 @@
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
}else if (!this.addObj.appointed) {
this.$message.error('璇烽�夋嫨绾﹀畾鏃堕棿')
+ }else if (!this.addObj.issueTime) {
+ this.$message.error('璇烽�夋嫨鏍锋満瀹屾垚鏃堕棿')
} else if (!this.sampleList.every(m => m.standardMethodListId&&m.standardMethodListId.length>0)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
} else if(this.addObj.formType&&this.addObj.formType!='鍏朵粬鎴愬搧'&&!this.addObj.issueUser){
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 21b00f1..42658b2 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -790,6 +790,12 @@
selectMethod(val){
this.multipleSelection = val
},
+ async searchPrint(selection){
+ let res = await this.$axios.post(this.$api.insOrder.checkNumber,{
+ ids:selection.map(m=>m.id).join(',')
+ })
+ console.log(1111,res)
+ },
getLabelPrinting(selection){
this.loadPint = true;
this.$axios.post(this.$api.insOrder.labelPrinting,{
@@ -862,12 +868,13 @@
font_size: '0.20cm',
});
},
- print(){
+ async print(){
if(this.multipleSelection.length==0){
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
return
}
let selection = this.multipleSelection
+ await this.searchPrint(selection)
this.getLabelPrinting(selection)
this.printDialogVisible = true
},
diff --git a/src/main.js b/src/main.js
index f4acdb6..4be6985 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,11 +20,11 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://172.20.10.5:8001';
+// const javaApi = 'http://172.20.10.5:8001';
// //閫氫俊娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-// const javaApi = 'http://10.1.13.77:8001';
+const javaApi = 'http://10.1.13.77:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
--
Gitblit v1.9.3