From 8b1bb50c8a5b14329253e202f6d4606cfd76598a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 19 二月 2025 09:54:16 +0800
Subject: [PATCH] 1.原材料下单迁移 2.铜材料下单迁移
---
src/api/business/materialInspection.js | 1
src/views/business/materialOrder/copperOrder.vue | 128 +++++++++++++------------------
src/views/business/materialOrder/customsInspection.vue | 8 -
src/api/business/rawMaterialOrder.js | 40 +++++++++-
src/api/structural/capability.js | 10 +-
5 files changed, 98 insertions(+), 89 deletions(-)
diff --git a/src/api/business/materialInspection.js b/src/api/business/materialInspection.js
index 3a6c23f..3f592b1 100644
--- a/src/api/business/materialInspection.js
+++ b/src/api/business/materialInspection.js
@@ -1,3 +1,4 @@
+// 鍘熸潗鏂欐姤妫�椤甸潰鐩稿叧鎺ュ彛
import request from '@/utils/request'
// 鏌ヨIFS璁㈠崟-寰呮姤妫�
diff --git a/src/api/business/rawMaterialOrder.js b/src/api/business/rawMaterialOrder.js
index 0f6b4ea..7256a8f 100644
--- a/src/api/business/rawMaterialOrder.js
+++ b/src/api/business/rawMaterialOrder.js
@@ -1,3 +1,4 @@
+// 鍘熸潗鏂欎笅鍗曢〉闈㈢浉鍏虫帴鍙�
import request from '@/utils/request'
// 鏌ヨ鍘熸潗鏂欎笅鍗�-寰呬笅鍗�
@@ -58,7 +59,7 @@
export function getInsOrder(query) {
return request({
url: '/insOrder/getInsOrder',
- method: 'post',
+ method: 'get',
params: query
})
}
@@ -114,8 +115,8 @@
export function selectStandardProductList(query) {
return request({
url: '/standardTree/selectStandardProductList',
- method: 'get',
- params: query
+ method: 'post',
+ data: query
})
}
// 鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�
@@ -126,7 +127,7 @@
params: query
})
}
-// 鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�
+// 娣诲姞妫�楠屼笅鍗曟暟鎹�
export function addInsOrder(query) {
return request({
url: '/insOrder/addInsOrder',
@@ -134,3 +135,34 @@
data: query
})
}
+// 閾滃崟涓濅笅鍗�
+export function addRawCopperOrder(query) {
+ return request({
+ url: '/insOrder/addRawCopperOrder',
+ method: 'post',
+ data: query
+ })
+}
+// 閾滃崟涓濅笅鍗曡繘鍘傛楠屽厤妫�鎺ュ彛
+export function addRawCopperOrderExemptionOrder(query) {
+ return request({
+ url: '/rawMaterialOrder/addRawCopperOrderExemptionOrder',
+ method: 'post',
+ data: query
+ })
+}
+// 閾滃崟涓濅笅鍗曡繘鍘傛楠屽厤妫�鎺ュ彛
+export function selectStandardTreeList2() {
+ return request({
+ url: '/standardTree/selectStandardTreeList2',
+ method: 'get'
+ })
+}
+// 閾滃崟涓濅笅鍗曡繘鍘傛楠屽厤妫�鎺ュ彛
+export function selectInsOrderTemplate(query) {
+ return request({
+ url: '/insOrder/selectInsOrderTemplate',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/api/structural/capability.js b/src/api/structural/capability.js
index edc0b50..e3f3dd5 100644
--- a/src/api/structural/capability.js
+++ b/src/api/structural/capability.js
@@ -28,7 +28,7 @@
export function delItemParameter(query) {
return request({
url: '/capacityScope/delItemParameter',
- method: 'post',
+ method: 'get',
params: query
})
}
@@ -59,7 +59,7 @@
export function delTestObject(query) {
return request({
url: '/capacityScope/delTestObject',
- method: 'post',
+ method: 'delete',
params: query
})
}
@@ -91,7 +91,7 @@
export function delProduct(query) {
return request({
url: '/capacityScope/delProduct',
- method: 'post',
+ method: 'delete',
params: query
})
}
@@ -141,11 +141,11 @@
data: query
})
}
-// 淇敼浜у搧鍘傚瀵嗗害缁戝畾
+// 鍒犻櫎浜у搧鍘傚瀵嗗害缁戝畾
export function deleteProductSupplierDensity(query) {
return request({
url: '/productSupplierDensity/deleteProductSupplierDensity',
- method: 'post',
+ method: 'delete',
params: query
})
}
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 3557623..ad0d97d 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -46,7 +46,7 @@
<el-col :span="6">
<el-form-item class="addObj-form-item" label="妫�楠岀被鍨�:">
<el-select v-model="addObj.orderType" clearable disabled size="small" style="width: 100%">
- <el-option v-for="(a, ai) in checkType" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <el-option v-for="(a, ai) in dict.type.check_type" :key="ai" :label="a.label" :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -198,7 +198,7 @@
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="selectable" type="selection" width="65"></el-table-column>
- <el-table-column v-if="PROJECT === '瑁呭鐢电紗'" 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">
@@ -383,14 +383,12 @@
</span>
</el-dialog>
<el-dialog
- :close-on-click-modal="false"
- :close-on-press-escape="false"
- :show-close="false"
:visible.sync="noNeedCheckDia"
title="鍏嶆鎻愮ず"
width="32%">
<span>纭鍏嶆褰撳墠妫�楠屽崟锛�</span>
<span slot="footer" class="dialog-footer">
+ <el-button :loading="noNeedCheckLoad" @click="noNeedCheckDia = false">鍙� 娑�</el-button>
<el-button :loading="noNeedCheckLoad" type="primary" @click="handleNoNeedCheck">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -400,6 +398,17 @@
<script>
// import ValueTable from '../../tool/value-table.vue'
import Vue from 'vue'
+import {
+ addRawCopperOrder,
+ getInsOrder,
+ getUserNow,
+ addRawCopperOrderExemptionOrder,
+ selectStandardTreeList2,
+ selectsStandardMethodByFLSSM,
+ selectInsOrderTemplate,
+ selectStandardProductList,
+ selectStandardMethodEnum
+} from "@/api/business/rawMaterialOrder";
var validateSixDecimalPositives = (rule, value, callback) => {
if (value == 0 || value == null) {
@@ -413,6 +422,7 @@
export default {
components: {},
+ dicts: ['check_type', 'urgency_level'],
props: {
currentId: {
type: Number,
@@ -468,7 +478,6 @@
isLeave: 0,
unit: null
},
- type: [],
selectStandardTree: false,
search: null,
list: [],
@@ -514,6 +523,7 @@
// total: 0,
RTS: '',
totalArr: [],
+ addObj1: {},
model: null,
standardMethodListId: null,
symbolList:['RTS'],
@@ -524,7 +534,6 @@
isShowInput: false,
temId: '',
selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
- checkType: [], // 妫�楠岀被鍨嬮�夐」鏁版嵁
addObjRules: { // 琛ㄥ崟鏍￠獙瑙勫垯
sample: [
{ required: true, message: '璇烽�夋嫨鏍峰搧', trigger: 'change' }
@@ -613,11 +622,9 @@
},
mounted() {
this.active = this.$route.query.active
- this.selectEnumByCategoryForType()
- this.getUserNow()
+ this.getUserNowInfo()
this.selectStandardTreeList()
this.selectStandardMethods()
- this.selectCheckType() // 鏌ヨ妫�楠岀被鍨�
this.getInfo() // 鑾峰彇鏁版嵁
},
methods: {
@@ -695,7 +702,7 @@
}
this.addObj.model = (trees[4] == undefined ? null : trees[4])
this.noNeedCheckLoad = true
- this.$axios.post(this.$api.rawMaterialOrder.addRawCopperOrderExemptionOrder, {
+ addRawCopperOrderExemptionOrder({
str: JSON.stringify({
insOrder: this.addObj,
list: JSON.stringify(sampleList.map(a => {
@@ -722,7 +729,7 @@
this.noNeedCheckLoad = false
if (res.code == 201) return
this.$message.success('宸叉彁浜�')
- this.$parent.playOrder(0)
+ this.goBack()
}).catch(e=>{
this.noNeedCheckLoad = false
})
@@ -733,9 +740,7 @@
if (this.active != 1) {
// 鏌ョ湅娴佺▼
// 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
- this.$axios.post(this.$api.insOrder.getInsOrder, {
- orderId: this.currentId
- }).then(res => {
+ getInsOrder({orderId: this.currentId}).then(res => {
this.addObj = {
...res.data.insOrder
}
@@ -757,13 +762,6 @@
})
})
}
- },
- selectCheckType() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "妫�楠岀被鍨�"
- }).then(res => {
- this.checkType = res.data
- })
},
//鐗规畩鍊煎～鍐欏鐞�
inputValueHandler(row,index){
@@ -825,13 +823,6 @@
})
})
}
- },
- selectEnumByCategoryForType() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "绱ф�ョ▼搴�"
- }).then(res => {
- this.type = res.data
- })
},
containsValue(str) {
if(str){
@@ -1156,22 +1147,18 @@
},
saveMethod(sampleList){
this.saveLoad = true
- this.$axios.post(this.$api.insOrder.addRawCopperOrder, {
+ addRawCopperOrder({
str: JSON.stringify({
insOrder: this.addObj,
list: JSON.stringify(sampleList.map(a => {
- if (this.PROJECT === '瑁呭鐢电紗') {
- if (a.modelNum) {
- const index = a.modelNum.indexOf('脳')
- if (index === 0) {
- a.model = a.model + a.modelNum
- } else if (index === -1) {
- a.model = a.model + '-' + a.modelNum
- } else {
- a.model = a.modelNum + a.model
- }
+ if (a.modelNum) {
+ const index = a.modelNum.indexOf('脳')
+ if (index === 0) {
+ a.model = a.model + a.modelNum
+ } else if (index === -1) {
+ a.model = a.model + '-' + a.modelNum
} else {
- a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ a.model = a.modelNum + a.model
}
} else {
a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
@@ -1186,13 +1173,13 @@
if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
- this.$parent.playOrder(0)
+ this.goBack()
}).catch(e=>{
this.saveLoad = false
})
},
- getUserNow() {
- this.$axios.get(this.$api.user.getUserNow).then(res => {
+ getUserNowInfo() {
+ getUserNow().then(res => {
let selects = res.data
if (selects == null) return
this.addObj.userId = selects.id
@@ -1202,7 +1189,7 @@
this.addObj.phone = selects.phone
this.addObj.companyId = selects.departId
if(this.active==1){
- this.selectInsOrderTemplate()
+ this.selectInsOrderTemplateInfo()
}
})
},
@@ -1260,7 +1247,7 @@
},
selectStandardTreeList() {
this.selectStandardTreeLoading = true
- this.$axios.get(this.$api.standardTree.selectStandardTreeList2).then(res => {
+ selectStandardTreeList2().then(res => {
this.list = res.data
this.list.forEach(a => {
this.expandedKeys.push(a.label)
@@ -1310,18 +1297,14 @@
},
selectsStandardMethodByFLSSM() {
this.methodLoad = true
- this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
- tree: this.selectTree
- }).then(res => {
+ 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)
- this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
- tree: selectTree
- }).then(ress => {
+ selectsStandardMethodByFLSSM({tree: selectTree}).then(ress => {
this.methods = ress.data.standardMethodList
})
} else {
@@ -1494,9 +1477,8 @@
}
return 'warning-row';
},
- selectInsOrderTemplate() {
- this.$axios.get(this.$api.insOrder.selectInsOrderTemplate+'?company='+this.addObj.company).then(res => {
- if (res.code == 201) return
+ selectInsOrderTemplateInfo() {
+ selectInsOrderTemplate({company: this.addObj.company}).then(res => {
this.templates = res.data
})
},
@@ -1519,15 +1501,11 @@
this.getProductLoad = true
let selectTreeList = this.selectTree.split(" - ")
this.addObj.model&&(selectTreeList[selectTreeList.length - 1] = this.addObj.model)
- this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ selectStandardProductList({
model: this.addObj.model?this.addObj.model:row.model,
modelNum: row.modelNum,
standardMethodListId: val,
factory: selectTreeList.join(" - "),
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
}).then(res => {
res.data.forEach(a => {
a.state = 0
@@ -1543,21 +1521,21 @@
})
}, 200)
})
- this.searchTemList()
+ // this.searchTemList()
},
- searchTemList () {
- this.temperatureList = []
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "鐢靛姏娓╁害寰幆妫�楠�"
- }).then(res => {
- if (res.data.length > 0) {
- this.temperatureEngList = res.data
- res.data.forEach(item => {
- this.temperatureList.push(item.label)
- })
- }
- })
- },
+ // searchTemList () {
+ // this.temperatureList = []
+ // this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ // category: "鐢靛姏娓╁害寰幆妫�楠�"
+ // }).then(res => {
+ // if (res.data.length > 0) {
+ // this.temperatureEngList = res.data
+ // res.data.forEach(item => {
+ // this.temperatureList.push(item.label)
+ // })
+ // }
+ // })
+ // },
changeModel() {
this.sampleList.forEach(a => {
let obj = this.sampleIds.find(b => b == a.id)
@@ -1603,7 +1581,7 @@
})
},
selectStandardMethods() {
- this.$axios.get(this.$api.standardTree.selectStandardMethodEnum).then(res => {
+ selectStandardMethodEnum().then(res => {
this.methods = res.data
})
},
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 6623b90..63eb53f 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -388,7 +388,7 @@
width="32%">
<span>{{ dialogMessage }}</span>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="this.goBack()">纭� 瀹�</el-button>
+ <el-button type="primary" @click="goBack()">纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog
@@ -765,12 +765,10 @@
this.selectTree = str.join(' - ')
this.addListInfo(this.codeLevel, res.data) // 鍘熸潗鏂欐牱鍝佹槸鍥哄畾鐨勶紝灏遍粯璁よ祴鍊间竴鏉℃暟鎹紝鍙媶鍒�
this.selectInsOrderTemplate() // 鍘熸潗鏂欐ā鏉垮垪琛ㄦ煡璇�
- } else {
- this.dialogVisible = true
- this.dialogMessage = res.message
}
}).catch(err => {
- console.log('err---', err)
+ this.dialogVisible = true
+ this.dialogMessage = err.message
})
}
},
--
Gitblit v1.9.3