From 9b6bd0c014b73456edb095ee53b22324437ae646 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期三, 09 七月 2025 10:59:45 +0800
Subject: [PATCH] 现场问题修改
---
src/views/tms/modules/baseTools/ParaBladeModal.vue | 20 +++++-
src/views/tms/modules/inbound/InboundModel.vue | 18 +++--
src/views/tms/requirement/modules/ToolsModal.vue | 2
src/views/tms/modules/baseTools/ParaMillToolModal.vue | 18 ++++-
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue | 18 ++++-
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue | 19 ++++-
src/views/tms/modules/baseTools/BaseToolsListRight.vue | 2
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue | 18 ++++-
src/views/tms/InboundOrderList.vue | 7 --
src/views/tms/modules/baseTools/ParaCommonToolModal.vue | 18 ++++-
src/views/tms/modules/inboundOrder/InboundDetailList.vue | 5 +
src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue | 2
src/views/tms/modules/inboundOrder/InboundOrderModel.vue | 24 +++++++
13 files changed, 129 insertions(+), 42 deletions(-)
diff --git a/src/views/tms/InboundOrderList.vue b/src/views/tms/InboundOrderList.vue
index adce8d0..891dcca 100644
--- a/src/views/tms/InboundOrderList.vue
+++ b/src/views/tms/InboundOrderList.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-form-item label="鍏ュ簱鐢宠鍗曠紪鍙�">
- <a-input placeholder="璇疯緭鍏ュ叆搴撶敵璇峰崟缂栧彿" v-model="queryParam.inboundNum" />
+ <j-input placeholder="璇疯緭鍏ュ叆搴撶敵璇峰崟缂栧彿" v-model="queryParam.inboundNum" />
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
@@ -151,11 +151,6 @@
title: '瀹℃牳鐘舵��',
align: 'center',
dataIndex: 'orderStatus_dictText',
- },
- {
- title: '鍊熺敤鍗曞彿',
- align: 'center',
- dataIndex: 'borrowNum',
},
{
title: '瀹℃壒鎰忚',
diff --git a/src/views/tms/modules/baseTools/BaseToolsListRight.vue b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
index 78201e1..b2285a4 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListRight.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -539,6 +539,8 @@
}else{
this.dataSource = [];
this.clearPara()
+ this.loading = false;
+ return
}
getAction(httpUrl, params)
.then((res) => {
diff --git a/src/views/tms/modules/baseTools/ParaBladeModal.vue b/src/views/tms/modules/baseTools/ParaBladeModal.vue
index 87955a7..e33aff7 100644
--- a/src/views/tms/modules/baseTools/ParaBladeModal.vue
+++ b/src/views/tms/modules/baseTools/ParaBladeModal.vue
@@ -121,7 +121,14 @@
</a-col>
<a-col :span="8">
<a-form-model-item prop="positionCode" label="搴撲綅鍙�">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ簱浣嶅彿'" v-model="model.positionCode" :disabled="disableSubmit"/>
+ <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="搴撲綅鍙�">
+ <a-select
+ :disabled="disableSubmit"
+ :triggerChange="true"
+ :options="locationCodeOptions"
+ v-model="model.positionCode"
+ />
+ </a-form-item>
</a-form-model-item>
</a-col>
</a-row>
@@ -336,10 +343,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
-import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
-import { getSystemConfigValue } from '@api/api'
- import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { ajaxGetDictItems } from '@/api/api'
export default {
name: 'ParaHoleToolsModal',
@@ -420,9 +426,15 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
+ locationCodeOptions:[]
}
},
created() {
+ ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
+ if (res.success) {
+ this.locationCodeOptions = res.result
+ }
+ })
},
methods: {
add(nodeSelected) {
diff --git a/src/views/tms/modules/baseTools/ParaCommonToolModal.vue b/src/views/tms/modules/baseTools/ParaCommonToolModal.vue
index 4d77c26..c07a495 100644
--- a/src/views/tms/modules/baseTools/ParaCommonToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaCommonToolModal.vue
@@ -120,7 +120,12 @@
</a-col>
<a-col :span="8">
<a-form-model-item prop="positionCode" label="搴撲綅鍙�">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ簱浣嶅彿'" v-model="model.positionCode" :disabled="disableSubmit"/>
+ <a-select
+ :disabled="disableSubmit"
+ :triggerChange="true"
+ :options="locationCodeOptions"
+ v-model="model.positionCode"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -190,10 +195,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
-import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
-import { getSystemConfigValue } from '@api/api'
- import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { ajaxGetDictItems } from '@/api/api'
export default {
name: 'ParaCommonToolModal',
@@ -247,9 +251,15 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
+ locationCodeOptions:[]
}
},
created() {
+ ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
+ if (res.success) {
+ this.locationCodeOptions = res.result
+ }
+ })
},
methods: {
add(nodeSelected) {
diff --git a/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue b/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
index 1dc3977..60905ed 100644
--- a/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
+++ b/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
@@ -120,7 +120,12 @@
</a-col>
<a-col :span="8">
<a-form-model-item prop="positionCode" label="搴撲綅鍙�">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ簱浣嶅彿'" v-model="model.positionCode" :disabled="disableSubmit"/>
+ <a-select
+ :disabled="disableSubmit"
+ :triggerChange="true"
+ :options="locationCodeOptions"
+ v-model="model.positionCode"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -379,10 +384,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
-import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
-import { getSystemConfigValue } from '@api/api'
- import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { ajaxGetDictItems } from '@/api/api'
export default {
name: 'ParaHoleToolsModal',
@@ -460,9 +464,15 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
+ locationCodeOptions:[]
}
},
created() {
+ ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
+ if (res.success) {
+ this.locationCodeOptions = res.result
+ }
+ })
},
methods: {
add(nodeSelected) {
diff --git a/src/views/tms/modules/baseTools/ParaMillToolModal.vue b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
index 2ae4d59..9ee29a0 100644
--- a/src/views/tms/modules/baseTools/ParaMillToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
@@ -120,7 +120,12 @@
</a-col>
<a-col :span="8">
<a-form-model-item prop="positionCode" label="搴撲綅鍙�">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ簱浣嶅彿'" v-model="model.positionCode" :disabled="disableSubmit"/>
+ <a-select
+ :disabled="disableSubmit"
+ :triggerChange="true"
+ :options="locationCodeOptions"
+ v-model="model.positionCode"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -384,10 +389,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
-import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
-import { getSystemConfigValue } from '@api/api'
- import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { ajaxGetDictItems } from '@/api/api'
export default {
name: 'ParaHoleToolsModal',
@@ -474,9 +478,15 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
+ locationCodeOptions:[]
}
},
created() {
+ ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
+ if (res.success) {
+ this.locationCodeOptions = res.result
+ }
+ })
},
methods: {
add(nodeSelected) {
diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
index ed55313..e34e55a 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
@@ -120,7 +120,12 @@
</a-col>
<a-col :span="8">
<a-form-model-item prop="positionCode" label="搴撲綅鍙�">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ簱浣嶅彿'" v-model="model.positionCode" :disabled="disableSubmit"/>
+ <a-select
+ :disabled="disableSubmit"
+ :triggerChange="true"
+ :options="locationCodeOptions"
+ v-model="model.positionCode"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -325,11 +330,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
-import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
-import { getSystemConfigValue } from '@api/api'
- import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
-import JThirdAppDropdown from '../../../../components/jeecgbiz/thirdApp/JThirdAppDropdown.vue'
+import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { ajaxGetDictItems } from '@/api/api'
export default {
name: 'ParaHoleToolsModal',
@@ -413,9 +416,15 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
+ locationCodeOptions:[]
}
},
created() {
+ ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
+ if (res.success) {
+ this.locationCodeOptions = res.result
+ }
+ })
},
methods: {
add(nodeSelected) {
diff --git a/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue b/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
index 9c190d3..367e78e 100644
--- a/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
+++ b/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
@@ -121,7 +121,12 @@
</a-col>
<a-col :span="8">
<a-form-model-item prop="positionCode" label="搴撲綅鍙�">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ簱浣嶅彿'" v-model="model.positionCode" :disabled="disableSubmit"/>
+ <a-select
+ :disabled="disableSubmit"
+ :triggerChange="true"
+ :options="locationCodeOptions"
+ v-model="model.positionCode"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -403,10 +408,9 @@
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
-import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
-import { getSystemConfigValue } from '@api/api'
- import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { ajaxGetDictItems } from '@/api/api'
export default {
name: 'ParaHoleToolsModal',
@@ -490,9 +494,15 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
+ locationCodeOptions:[]
}
},
created() {
+ ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
+ if (res.success) {
+ this.locationCodeOptions = res.result
+ }
+ })
},
methods: {
add(nodeSelected) {
diff --git a/src/views/tms/modules/inbound/InboundModel.vue b/src/views/tms/modules/inbound/InboundModel.vue
index bbd4993..d4d8ad2 100644
--- a/src/views/tms/modules/inbound/InboundModel.vue
+++ b/src/views/tms/modules/inbound/InboundModel.vue
@@ -283,6 +283,7 @@
return filterObj(this.param)
},
add (nodeSelected) {
+ this.qrList = []
this.classifyId = nodeSelected.key
this.model.classifyNum = nodeSelected.entity.classifyId
this.model.typeName = nodeSelected.entity.typeName
@@ -325,17 +326,20 @@
},
handleOk() {
const that = this
+ if(this.dataSource.length == 0){
+ that.$message.error("璇峰厛閫夋嫨闇�瑕佸叆搴撶殑宸ュ叿!")
+ return
+ }
// 瑙﹀彂琛ㄥ崟楠岃瘉
- this.form.validateFields((err, values) => {
- if (!err) {
+ this.$refs.form.validate(valid => {
+ if (valid) {
that.confirmLoading = true
- let formData = Object.assign(this.model, values)
- formData.detailData = this.dataSource
- formData.classifyId = this.classifyId
- postAction(this.url.addInStorage, formData)
+ this.model.detailData = this.dataSource
+ this.model.classifyId = this.classifyId
+ postAction(this.url.addInStorage, this.model)
.then((res) => {
if (res.success) {
- if(formData.inStorehouseType === '1'){
+ if(this.model.inStorehouseType === '1'){
this.qrList = res.result.map((content, i) => ({
content:res.result[i].content,
base64: res.result[i].image
diff --git a/src/views/tms/modules/inboundOrder/InboundDetailList.vue b/src/views/tms/modules/inboundOrder/InboundDetailList.vue
index a105e63..0eec0dc 100644
--- a/src/views/tms/modules/inboundOrder/InboundDetailList.vue
+++ b/src/views/tms/modules/inboundOrder/InboundDetailList.vue
@@ -61,6 +61,11 @@
dataIndex: 'applicationType',
align: 'center',
},
+ {
+ title: '搴撲綅鍙�',
+ align: 'center',
+ dataIndex: 'locationCode',
+ },
{
title: '鍏ュ簱鏁伴噺',
dataIndex: 'inStorageQuantity',
diff --git a/src/views/tms/modules/inboundOrder/InboundOrderModel.vue b/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
index c66d5c8..4e1d578 100644
--- a/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
+++ b/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
@@ -40,7 +40,7 @@
/>
</a-form-item>
</a-col>
- <a-col :span="24 / 2">
+ <!-- <a-col :span="24 / 2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="搴撲綅鍙�">
<a-select
:triggerChange="true"
@@ -48,7 +48,7 @@
v-decorator="[ 'locationCodeId', validatorRules.locationCodeId ]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<!-- <a-col :span="24 / 2">
<a-form-item label="鐢宠鍘熷洜" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="璇疯緭鍏ョ敵璇峰師鍥�" :disabled="disableSubmit" v-decorator="['applicationReason', validatorRules.applicationReason]" />
@@ -148,6 +148,17 @@
@change="(e) => handleChange(e, record.key, col, index)"
:min="1"
/>
+ <a-select
+ v-if="col.dataIndex == 'goodsShelvesId'"
+ :disabled="disableSubmit"
+ :triggerChange="true"
+ :value="text"
+ show-search
+ :filter-option="filterOption"
+ style="width: 100%"
+ :options="locationCodeOptions"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ />
</div>
</template>
<span slot="action" slot-scope="text, record, index">
@@ -327,6 +338,12 @@
align: 'center',
dataIndex: 'toolModel'
},
+ {
+ title: '搴撲綅鍙�',
+ align: 'center',
+ dataIndex: 'goodsShelvesId',
+ scopedSlots: { customRender: 'goodsShelvesId' },
+ },
{
title: '鍏ュ簱鏁伴噺',
align: 'center',
@@ -353,6 +370,9 @@
methods: {
modalFormOk() {
},
+ filterOption(input, option) {
+ return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
getQueryParams() {
this.param.pageNo = this.ipagination.current
this.param.pageSize = this.ipagination.pageSize
diff --git a/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue b/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
index 9fdc32e..d79f132 100644
--- a/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
+++ b/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
@@ -142,6 +142,7 @@
},
methods: {
add (nodeSelected) {
+ this.validatorRules.paraTypeFlag[0].required = false
this.modelDefault.parentId = nodeSelected.key
this.modelDefault.parentNum = nodeSelected.entity.classifyId
this.modelDefault.parentName = nodeSelected.entity.typeName
@@ -164,7 +165,6 @@
},
submitForm () {
const that = this;
- console.log("111",this.model.id)
// 瑙﹀彂琛ㄥ崟楠岃瘉
this.$refs.form.validate(valid => {
if (valid) {
diff --git a/src/views/tms/requirement/modules/ToolsModal.vue b/src/views/tms/requirement/modules/ToolsModal.vue
index a8e1f42..04f76cf 100644
--- a/src/views/tms/requirement/modules/ToolsModal.vue
+++ b/src/views/tms/requirement/modules/ToolsModal.vue
@@ -8,7 +8,7 @@
<a-row :gutter="24">
<a-col :md="7" :sm="7">
<a-form-item label="宸ュ叿缂栫爜">
- <a-input placeholder="璇疯緭鍏ュ伐鍏风紪鐮佹绱�" v-model="queryParam.equipmentid"></a-input>
+ <a-input placeholder="璇疯緭鍏ュ伐鍏风紪鐮佹绱�" v-model="queryParam.toolId"></a-input>
</a-form-item>
</a-col>
<a-col :md="3" :sm="3">
--
Gitblit v1.9.3