From d3a278836dea72b9a8b845303b4fa8fb728478aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Tue, 24 Dec 2024 16:58:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E6=9C=88=E5=BA=A6=E8=AE=A1?=
=?UTF-8?q?=E5=88=92=E5=AE=A1=E6=A0=B8=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95?=
=?UTF-8?q?=E5=8F=B7=202.=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86=E7=BB=93?=
=?UTF-8?q?=E6=9E=9C=E6=98=BE=E7=A4=BA=203.=E4=BF=AE=E5=A4=8D=E5=88=92?=
=?UTF-8?q?=E7=BA=BF=E3=80=81=E5=88=87=E5=89=B2=E6=8A=A5=E5=B7=A5=E6=9C=AA?=
=?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BD=9C=E4=B8=9A=E5=8C=BA=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84bug=204.=E5=A2=9E=E5=8A=A0=E4=BD=9C?=
=?UTF-8?q?=E4=B8=9A=E8=AE=A1=E5=88=92=E4=BD=9C=E4=B8=9A=E5=8C=BA=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=E5=8A=9F=E8=83=BD=205.=E8=B0=83=E6=95=B4=E4=B8=8A?=
=?UTF-8?q?=E6=96=99=E6=91=86=E6=94=BE=E5=8C=BA=E5=9F=9F=E5=8F=AF=E6=8B=96?=
=?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/jhzxgl/ycldw.js | 17 +
src/api/jhzxgl/ydjh.js | 9 +
src/views/jhzx/ydjhzxGL.vue | 41 ++-
src/views/jhzxgl/ycldw/ycldw.vue | 305 ++++++++++++++++++
src/views/zyjhzx/components/SliaoSearch.vue | 17 +-
src/views/zyjhzx/components/search.js | 11 +
src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue | 4 +-
src/views/zyjhzx/qgefkui/comps/QgePgd.vue | 4 +-
src/views/zyjhzx/sliao/comps/baifang.js | 70 ++--
9 files changed, 433 insertions(+), 45 deletions(-)
create mode 100644 src/api/jhzxgl/ycldw.js
create mode 100644 src/api/jhzxgl/ydjh.js
create mode 100644 src/views/jhzxgl/ycldw/ycldw.vue
diff --git a/src/api/jhzxgl/ycldw.js b/src/api/jhzxgl/ycldw.js
new file mode 100644
index 0000000..f83678b
--- /dev/null
+++ b/src/api/jhzxgl/ycldw.js
@@ -0,0 +1,17 @@
+import request from "@/utils/request";
+
+export function ycldwcx(data) {
+ return request({
+ url: "/ycldw/list",
+ method: "post",
+ data,
+ });
+}
+
+export function ycldwUpdate(data) {
+ return request({
+ url: "/ycldw/submit",
+ method: "post",
+ data,
+ });
+}
diff --git a/src/api/jhzxgl/ydjh.js b/src/api/jhzxgl/ydjh.js
new file mode 100644
index 0000000..04cb99b
--- /dev/null
+++ b/src/api/jhzxgl/ydjh.js
@@ -0,0 +1,9 @@
+import request from "@/utils/request";
+
+export function editZyq(data) {
+ return request({
+ url: "/dmYdjh/editZyq",
+ method: "post",
+ data,
+ });
+}
diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
index 0396ae1..ddd3153 100644
--- a/src/views/jhzx/ydjhzxGL.vue
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -90,6 +90,7 @@ import XEUtils from 'xe-utils'
import { getToken } from '@/utils/auth'
import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
import {bgControl} from "@/api/zyjh";
+import {editZyq} from "@/api/jhzxgl/ydjh";
export default {
name:'YdjhzxGL',
@@ -114,6 +115,11 @@ export default {
yf:'',
zt: '0'
},
+ zyqList:[
+ {label:'二区',value:'FP2Q'},
+ {label:'三区',value:'FP3Q'},
+ {label:'四区',value:'FP4Q'},
+ ],
list: [],
list2: [],
list3: [],
@@ -137,22 +143,22 @@ export default {
// { field: 'dcCh1', title: '目标船号',width: 90,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }},//数据来源船,真实数据时,为空
- { field: 'dcPl', title: '批量',width: 80,
+ { field: 'dcPl', title: '批量',width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- { field: 'dcFd', title: '分段号',width: 100,
+ { field: 'dcFd', title: '分段号',width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
+ { field: 'zl', title: '组立',width: 70,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- { field: 'tzbh', title: '套料图号',width: 90,
+ { field: 'tzbh', title: '套料图号',width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- { field: 'ylbs', title: '余料',width: 90,
+ { field: 'ylbs', title: '余料',width: 80,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'jssj', title: '前方需求时间',width: 110,
@@ -178,6 +184,11 @@ export default {
filterRender: { name: 'FilterCombination', },
editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }}
},
+ { field: 'zyq', title: '作业区',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ editRender:{ name: '$select', options:[],events:{change:this.zyqChange,}},
+ },
{ field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
@@ -737,6 +748,22 @@ export default {
this.initBase()
},
methods: {
+ zyqChange({row}){
+ for (const item of this.zyqList) {
+ if(item.value===row.zyq){
+ row.zyq1=item.label
+ const data={
+ id:row.id,
+ zyq:row.zyq,
+ zyq1:item.label
+ }
+ editZyq(data).then(res=>{
+ this.$message.success('处理成功')
+ })
+ break
+ }
+ }
+ },
bgControlChange(val){
bgControl({gx:val})
},
@@ -858,11 +885,12 @@ export default {
return
}
getYdjh(this.queryParam).then((res) => {
+ const zyqColumn=this.$refs.xGrid.getColumnByField('zyq')
+ zyqColumn.editRender.options=this.zyqList
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
}
-
})
this.activeName='first'
},
@@ -873,7 +901,6 @@ export default {
this.height = window.innerHeight - 190
},
rowClassName({ row, rowIndex ,column}){
- console.log(row.color)
if(row.color==='red'){
return 'row-red'
}else if(row.color==='yellow'){
diff --git a/src/views/jhzxgl/ycldw/ycldw.vue b/src/views/jhzxgl/ycldw/ycldw.vue
new file mode 100644
index 0000000..f65baf5
--- /dev/null
+++ b/src/views/jhzxgl/ycldw/ycldw.vue
@@ -0,0 +1,305 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+ 保存
+ 添加
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/zyjhzx/components/SliaoSearch.vue b/src/views/zyjhzx/components/SliaoSearch.vue
index 264d7b0..64c6fc3 100644
--- a/src/views/zyjhzx/components/SliaoSearch.vue
+++ b/src/views/zyjhzx/components/SliaoSearch.vue
@@ -3,6 +3,7 @@
+
@@ -15,6 +16,7 @@