From df33895b6a072ce2963dc8b0688ebfd0989eef2c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 22 八月 2024 14:06:53 +0800
Subject: [PATCH] 变更检验下单
---
src/components/do/b1-ins-order/add.vue | 5 ++++-
src/view/enter.vue | 2 +-
src/main.js | 2 +-
src/components/do/b1-inspect-order-plan/Inspection.vue | 22 +++++++++++++++++++---
src/components/view/b1-inspection-order.vue | 18 +++++++-----------
static/img/特高压.jpg | 0
src/assets/api/controller.js | 2 +-
7 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 077cdc7..8f79f84 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -166,7 +166,7 @@
selectOrderManDay: "/insOrder/selectOrderManDay", //鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿
upInsOrder: "/insOrder/upInsOrder", //妫�楠屼笅鍙�
getInsOrder: "/insOrder/getInsOrder", //鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�
- upInsOrderOfState: "/insOrder/upInsOrderOfState", //瀹℃牳妫�楠屽崟鏈鸿繘琛岀姸鎬佷慨鏀�
+ upInsOrderOfState: "/insOrder/upInsOrderOfState2", //瀹℃牳妫�楠屽崟鏈鸿繘琛岀姸鎬佷慨鏀�
addInsOrderTemplate: "/insOrder/addInsOrderTemplate", //娣诲姞妫�楠屽崟妯℃澘
selectInsOrderTemplate: "/insOrder/selectInsOrderTemplate", //鏌ヨ妫�楠屽崟妯℃澘
selectInsOrderTemplateById: "/insOrder/selectInsOrderTemplateById", //閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 8c9f4b5..1eaf682 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -2065,7 +2065,10 @@
this.distributeData.appointed = ress.data
})
setTimeout(() => {
- this.issuedDialogVisible = true;
+ // this.issuedDialogVisible = true;
+ // this.$message.success('鎻愪氦鎴愬姛')
+ this.upLoad = false
+ this.$parent.playOrder(0)
}, 1000)
})
} else {
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index d375aa1..f4ec2e1 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -3337,7 +3337,7 @@
}
},
handleSubmit(){
- if(this.insOrder.departmentLims=='妫�娴嬩腑蹇�'&&this.insOrder.orderType=='C'){
+ if(this.insOrder.orderType=='C'){
this.verifyUser = this.insOrder.prepareUserId
this.submit()
}else{
@@ -3370,8 +3370,9 @@
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
entrustCode: this.insOrder.entrustCode
- }).then(res => {
+ }).then(async res => {
if (res.code === 200) {
+ await this.handleCType()
this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
@@ -3402,8 +3403,9 @@
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser
- }).then(res => {
+ }).then( async res => {
if (res.code === 200) {
+ await this.handleCType()
this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
@@ -3421,6 +3423,20 @@
})
return
},
+ async handleCType(){
+ if(this.insOrder.departmentLims=='璐ㄩ噺閮�'){
+ await this.$axios.post(this.$api.insOrderPlan.verifyPlan, {
+ orderId: this.orderId,
+ type: 1,
+ laboratory: this.sonLaboratory,
+ tell: null
+ }).then(res => {
+ if (res.code === 200) {
+ }
+ }).catch(error => {
+ })
+ }
+ },
// 缁熶竴鍦ㄨ繖閲屼繚瀛樻暟鎹�
saveInsContext() {
try {
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index d866587..1f25b27 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -282,7 +282,7 @@
</el-dialog>
<!-- 涓嬪彂 -->
<el-dialog title="妫�楠屽垎閰�" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
- <div class="body" style="max-height: 60vh;">
+ <div class="body" style="max-height: 60vh;" v-if="issuedDialogVisible">
<el-row>
<el-col class="search_thing" style="width: 95%;">
<div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div>
@@ -293,7 +293,7 @@
</div>
</el-col>
<el-col class="search_thing" style="width: 95%;">
- <div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>鎸囨淳浜哄憳锛�</div>
+ <div class="search_label">鎸囨淳浜哄憳锛�</div>
<div class="search_input">
<el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable @change="changeUser">
<el-option v-for="(item,i) in personList" :key="i+'gbnm.'" :label="item.label" :value="item.value">
@@ -301,7 +301,7 @@
</el-select>
</div>
</el-col>
- <el-col class="search_thing" style="width: 95%;" v-if="distributeData.userId">
+ <el-col class="search_thing" style="width: 95%;">
<div class="search_label"><span class="required-span" >* </span>璇曢獙瀹わ細</div>
<div class="search_input">
<el-select v-model="distributeData.sonLaboratory" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable>
@@ -554,7 +554,8 @@
type: 'text',
method: 'handleIssued',
disabFun: (row, index) => {
- return row.state != 1 || !!row.assign
+ // return row.state != 1 || !!row.assign
+ return row.appointed || row.state != 1
}
}],
linkEvent: {
@@ -888,7 +889,7 @@
if (power[i].menuMethod == 'updateStatus') {
revoke = true
}
- if (power[i].menuMethod == 'upInsOrderOfState') {
+ if (power[i].menuMethod == 'upInsOrderOfState2') {
check = true
}
if (power[i].menuMethod == 'checkUpdate') {
@@ -1057,12 +1058,7 @@
this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
return
}
- //
- if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){
- this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
- return
- }
- if(this.distributeData.userId&&(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory=='')){
+ if(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory==''){
this.$message.error('璇曢獙瀹ゆ湭濉啓')
return
}
diff --git a/src/main.js b/src/main.js
index c3b1ea1..ea6084e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,7 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://192.168.0.104:8001';
+const javaApi = 'http://192.168.255.249:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
// const javaApi = 'http://114.132.189.42:1234';
diff --git a/src/view/enter.vue b/src/view/enter.vue
index a02a3f4..1bd979e 100644
--- a/src/view/enter.vue
+++ b/src/view/enter.vue
@@ -97,7 +97,7 @@
<template>
<div class="enter">
<div class="left">
- <img src="../../static/img/鐗归珮鍘�.png">
+ <img src="../../static/img/鐗归珮鍘�.jpg">
</div>
<div class="right">
<div style="width: calc(100% - 100px * 2);">
diff --git "a/static/img/\347\211\271\351\253\230\345\216\213.jpg" "b/static/img/\347\211\271\351\253\230\345\216\213.jpg"
new file mode 100644
index 0000000..67037ab
--- /dev/null
+++ "b/static/img/\347\211\271\351\253\230\345\216\213.jpg"
Binary files differ
--
Gitblit v1.9.3