Browse Source

修改生产线查询条件

lijuncheng0816
niexiting 3 months ago
parent
commit
b929adb42e
  1. 9
      .env.production
  2. 4
      src/pages/issue/job/issueJob.vue
  3. 19
      src/pages/repleinsh/job/repleinshJob.vue

9
.env.production

@ -1,11 +1,12 @@
VITE_BASE_URL=http://172.21.32.13:81/api/admin-api VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
# 租户配置 # 租户配置
VITE_TENANT='[{"text":"长春1379","value":1}]' VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=false VITE_isDevelopment=false
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' VITE_JMREPORT_BASE_URL='http://172.22.32.8:90'

4
src/pages/issue/job/issueJob.vue

@ -302,12 +302,12 @@
value: params.fromLocationCode value: params.fromLocationCode
}) })
} }
if (params.productionLine) { if (params.productionLineCode) {
// 线 // 线
filters.push({ filters.push({
column: "productionLineCode", column: "productionLineCode",
action: "==", action: "==",
value: params.productionLine value: params.productionLineCode
}) })
} }
if (params.itemCode) { if (params.itemCode) {

19
src/pages/repleinsh/job/repleinshJob.vue

@ -6,7 +6,7 @@
:checkedWaitTask="checkedWaitTask" @fromLocationCode="fromLocationCode"> :checkedWaitTask="checkedWaitTask" @fromLocationCode="fromLocationCode">
</job-filter> --> </job-filter> -->
<job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" :productionline="productionlineList" <job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="false" :productionline="productionlineList"
ref="filter" otherTitle="" @switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait" ref="filter" otherTitle="" @switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait"
@onScanNumber="getScanNumber" :checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask" @onScanNumber="getScanNumber" :checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask"
:isShowItemCode="true" @productionLineCode="productionLineCode" @fromLocationCode="fromLocationCode" :isShowItemCode="true" @productionLineCode="productionLineCode" @fromLocationCode="fromLocationCode"
@ -102,8 +102,8 @@
scanBalance: {}, scanBalance: {},
inInventoryStatus: "", // inInventoryStatus: "", //
outInventoryStatus: "", // outInventoryStatus: "", //
productionLineCode:"", productionLineCode: "",
productionlineList:[] productionlineList: []
}; };
}, },
onLoad(option) { onLoad(option) {
@ -209,8 +209,8 @@
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
sort: 'number', // sort: 'number',
by: 'desc' // by: 'desc'
} }
getRepleinshJobList(params).then(res => { getRepleinshJobList(params).then(res => {
@ -276,14 +276,7 @@
value: params.fromLocationCode value: params.fromLocationCode
}) })
} }
if (params.productionLine) {
// 线
filters.push({
column: "productionLineCode",
action: "==",
value: params.productionLine
})
}
if (params.itemCode) { if (params.itemCode) {
// 线 // 线
filters.push({ filters.push({

Loading…
Cancel
Save