From 62910884ce1e716eab8a032521181739789b3d02 Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Fri, 13 Sep 2024 15:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/jhzx/ylxx.js | 4 +
src/views/jhzxgl/components/YlxxAdd.vue | 552 +++++++++++++
src/views/jhzxgl/dmjhD.vue | 115 ++-
src/views/jhzxgl/hxjhD.vue | 657 ++++++++++++++++
src/views/jhzxgl/pkjhD.vue | 69 +-
src/views/jhzxgl/pwjhD.vue | 16 +-
src/views/jhzxgl/qgjhD.vue | 56 +-
src/views/jhzxgl/qmjhD.vue | 48 +-
src/views/jhzxgl/sljhD.vue | 14 +-
src/views/jhzxgl/ylxx.vue | 751 ++++++++++++++++++
src/views/kcwz/wzkctj.vue | 990 +++++++++++++++++++++++-
src/views/zl/czzjgz.vue | 0
12 files changed, 3097 insertions(+), 175 deletions(-)
create mode 100644 src/api/jhzx/ylxx.js
create mode 100644 src/views/jhzxgl/components/YlxxAdd.vue
create mode 100644 src/views/jhzxgl/hxjhD.vue
create mode 100644 src/views/jhzxgl/ylxx.vue
create mode 100644 src/views/zl/czzjgz.vue
diff --git a/src/api/jhzx/ylxx.js b/src/api/jhzx/ylxx.js
new file mode 100644
index 0000000..a3cd482
--- /dev/null
+++ b/src/api/jhzx/ylxx.js
@@ -0,0 +1,4 @@
+import request from '@/utils/request'
+
+export function getYlList(data) {return request({url: '/mpYlxxp/getYlList', method: 'post', data})}
+
diff --git a/src/views/jhzxgl/components/YlxxAdd.vue b/src/views/jhzxgl/components/YlxxAdd.vue
new file mode 100644
index 0000000..404a138
--- /dev/null
+++ b/src/views/jhzxgl/components/YlxxAdd.vue
@@ -0,0 +1,552 @@
+<template>
+ <el-container>
+
+ <vxe-modal v-model="dialogVisible" width="1200" title="增加">
+
+ <template #default>
+ <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+ <el-form :inline="true" label-width="60px" label-position="left">
+ <el-row>
+
+ <el-col :span="22">
+
+ <el-form-item label="船号:">
+ <vxe-pulldown ref="xDown4" transfer >
+ <template #default>
+ <vxe-input
+ v-model="queryParam.dcch"
+ placeholder="船号"
+ style="height: 28px;
+ line-height: 28px; width: 140px;"
+ suffix-icon="vxe-icon--search"
+ @keyup="keyupEvent4"
+ @focus="focusEvent4"
+ />
+ </template>
+ <template #dropdown>
+ <div class="my-dropdown mytable " style="width: 250px">
+ <vxe-grid
+ highlight-hover-row
+ height="auto"
+
+ :data="projectData"
+ :columns="projectColumns"
+ @cell-click="cellClickEvent"
+ show-overflow
+ >
+ <template #wgbsEdit="{ row}">
+ <vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
+ </template>
+ </vxe-grid>
+ </div>
+ </template>
+ </vxe-pulldown>
+
+
+ </el-form-item>
+ <el-form-item label="批量:">
+ <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+ </el-form-item>
+ <el-form-item label="分段:">
+ <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+ </el-form-item>
+
+ <el-form-item label="">
+ <el-checkbox v-model="queryParam.qbs" >曲标识</el-checkbox>
+ </el-form-item>
+
+
+
+
+ </el-col>
+ <el-col :span="2">
+ <el-form-item style="float: right" >
+ <el-button type="success" @click="initList">查询</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+
+ <el-col :span="22">
+
+
+
+
+
+
+ </el-col>
+ <el-col :span="2">
+ <el-form-item style="float: right" >
+ <el-button type="success" @click="qdClick">确定</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-header>
+
+
+ <div class="mytable">
+ <vxe-grid
+ id="id"
+ ref="xGrid"
+ border
+ resizable
+ height="500px"
+ keep-source
+ :auto-resize="true"
+ :columns="tableColumn"
+ :data="tableData"
+ highlight-hover-row
+ highlight-current-row
+ show-overflow
+ :header-cell-style="{'text-align':'center'}"
+ :cell-style="{'text-align':'center'}"
+ >
+
+
+ </vxe-grid>
+ </div>
+ </template>
+ </vxe-modal>
+ </el-container>
+
+</template>
+
+<script>
+ import XEUtils from 'xe-utils'
+
+ import {getZHBM, getBMBM} from "@/utils/rpkj";
+ import {mapGetters} from 'vuex'
+ import {getPgdBase, getQgPgd, insertQmList, selectQmByQgAndJh} from "@/api/jhzxgl/pgd";
+
+ export default {
+ name: 'GxsqAdd',
+ //props: ['flag'],
+ data() {
+ return {
+ dialogVisible: false,
+
+ tableData: [],
+ tableColumn: [
+ { type: 'checkbox', width: 40 },
+ { type: 'seq', width: 40, title: '序号' },
+
+
+ { field: 'lczbh', title: '船号', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'lpl', title: '批量', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'lfd', title: '分段', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'lzl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'ltlth', title: '套料图号', width: 100,formatter: ['dictFormat','ZLLB'],
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'lptblx', title: '配套表类型', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'ljbh', title: '零件编号', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'lljgg', title: '零件规格', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'lljcz', title: '零件材质', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'lwpfl', title: '物品分类', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'ljldw', title: '计量单位', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'lsl', title: '数量', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'lqfxqrqxz', title: '前方需求小组期', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'lqfxqrqdz', title: '前方需求大组期', width: 100,formatter: ['dictFormat','CLlQ'],
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'gylx', title: '工艺类型', width: 100,formatter: ['dictFormat','CLlQ'],
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'tlth', title: '套料图号', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'wpgg', title: '规格', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'wpcz', title: '材质', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'wpzl', title: '重量', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'qgjhrq', title: '切割计划期', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'pwjhwgrq', title: '抛丸计划完工期', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'qgfzry', title: '切割负责人', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'hxsbbh', title: '划线设备编号', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'hxcd', title: '划线长度', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'hxkccd', title: '划线空程长度', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'qgsbbh', title: '切割设备编号', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'qgcd', title: '切割长度', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'qgkccd', title: '切割空程长度', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'hxry', title: '划线人员', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'hxksrq', title: '划线开始时间', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'hxjsrq', title: '划线结束时间', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'qgry', title: '切割人员', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'qgksrq', title: '切割开始时间', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'qgjsrq', title: '切割结束时间', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'zt', title: '状态', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: 'fkry', title: '反馈人', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'fkrq', title: '反馈日期', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'fkyy', title: '反馈原因', width: 100,editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'bzry', title: '编制人', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'bzrq', title: '编制日期', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'xfry', title: '下发人', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'xfrq', title: '下发日期', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+
+
+
+
+
+ ],
+
+ queryParam: {
+ dcch:'',
+ pl:'',
+ fd:'',
+ qbs:true,
+ pkbs:false,
+ dmbs:false,
+ lx:'q',
+ },
+ projectData:[],
+ projectData1:[],
+ projectColumns: [
+ {field: 'cbbm', title: '船号',width: 110},
+ { field: 'wgbs', title: '完工标识', width: 80,
+ slots:{
+ default: 'wgbsEdit'
+ },
+ },
+ ],
+
+
+ dictData: [],
+
+ }
+ },
+ computed: {
+ ...mapGetters([
+ 'name',
+ 'bmbm'
+ ])
+ },
+ created() {
+ console.log(111)
+ this.initBase();
+
+ },
+ methods: {
+ cellClickEvent({row}) {
+ this.queryParam.dcch = row.cbbm
+ this.$refs.xDown4.hidePanel()
+ },
+ focusEvent4() {
+ this.$refs.xDown4.showPanel()
+ },
+ keyupEvent4() {
+
+
+ if (this.queryParam.dcch) {
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ } else {
+ this.projectData = this.projectData1.slice(0)
+ }
+
+ },
+
+
+ selectChange(row) {
+ this.$refs.xGrid.clearActived()// 清除单元格激活状态
+ this.$refs.xGrid.setActiveCell(row.row, row.column.property)// 设置单元格为激活状态
+ },
+
+ show() {
+ this.dialogVisible = true
+ // this.baseSeacrh()
+ },
+ qdClick(){
+ let obj = this.$refs.xGrid.getCheckboxRecords()
+ if (obj.length === 0) {
+ return
+ }
+ insertQmList({'list':obj,'lx':'q'}).then(res=>{
+ this.initList()
+ })
+ },
+
+ plChange() {
+ let obj = this.$refs.xGrid.getCheckboxRecords()
+ if (obj.length === 0) {
+ return
+ }
+ console.log(qcObjc)
+ if (qcObjc.length != 0) {
+ insertqcInspection(qcObjc).then(res => {
+ if (res.success) {
+
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (obj.indexOf(this.tableData[i]) !== -1) {
+ this.tableData.splice(i, 1)
+ i--
+ }
+ }
+
+ // this.tableData= this.tableData.filter((x) => !removeRecords.some((item) => x.id === item.id));
+ const xTable = this.$refs.xGrid
+ console.log(this.tableData)
+ xTable.loadData(this.tableData)
+ this.$emit('callback', obj, this.inputListAdd)
+ }
+ })
+ }
+
+ },
+ initBase(){
+ getPgdBase({}).then(res=>{
+ this.dictData = res.data
+ this.projectData=res.data.cbbm
+ this.projectData1=res.data.cbbm
+ })
+ },
+ initList() {
+ if (this.queryParam.dcch === '') {
+ this.$message.warning('选择船只编号')
+ return
+ }
+ selectQmByQgAndJh(this.queryParam).then((res) => {
+ this.list = res.data
+ if (this.$refs.xGrid) {
+ this.$refs.xGrid.loadData(this.list)
+ console.log(this.list)
+ }
+
+ })
+ },
+
+
+ }
+ }
+</script>
+
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+ .el-input{
+ width: 140px;
+ }
+ .el-select{
+ width: 140px;
+ }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+ background: #0a76a4;
+}
+
+.my-dropdown {
+ width: 400px;
+ height: 400px;
+ background-color: #fff;
+ border: 1px solid #dcdfe6;
+ box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+ font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.el-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.keyword-lighten {
+ color: #000;
+ background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+ line-height: inherit;
+}
+.el-form-item__label-wrap {
+ margin-left: 0px !important;
+ float: left;
+}
+.fontClass{
+ font-size: 12px;
+ font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/dmjhD.vue b/src/views/jhzxgl/dmjhD.vue
index e9b3f6e..be9fca5 100644
--- a/src/views/jhzxgl/dmjhD.vue
+++ b/src/views/jhzxgl/dmjhD.vue
@@ -112,8 +112,8 @@
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="slpgclick">派工</el-button>
- <el-button type="success" @click="xdClick">接收</el-button>
- <el-button type="success" @click="saveclick">反馈</el-button>
+<!-- <el-button type="success" @click="xdClick">接收</el-button>-->
+ <el-button type="success" @click="saveclick">报工</el-button>
</el-form-item>
</el-col>
@@ -185,13 +185,10 @@ export default {
value: "02",
label: "派工",
},
+
{
value: "03",
- label: "接收",
- },
- {
- value: "04",
- label: "反馈",
+ label: "报工",
},
],
inParam:{
@@ -225,177 +222,177 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dmZt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
+ { field: 'dmZt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'czbh', title: '船号', width: 120,
+ { field: 'czbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'pl', title: '批量', width: 120,
+ { field: 'pl', title: '批量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'fd', title: '分段', width: 120,
+ { field: 'fd', title: '分段', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'kw', title: '跨位', width: 120,
+ { field: 'kw', title: '跨位', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'zl', title: '组立', width: 120,
+ { field: 'zl', title: '组立', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'tlth', title: '套料图号', width: 120,
+ { field: 'tlth', title: '套料图号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ptblx', title: '套料图号', width: 120,
+ { field: 'ptblx', title: '套料图号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ljbh', title: '零件编号', width: 120,
+ { field: 'ljbh', title: '零件编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ljmc', title: '零件名称', width: 120,
+ { field: 'ljmc', title: '零件名称', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ljgg', title: '零件规格', width: 120,
+ { field: 'ljgg', title: '零件规格', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ljcz', title: '零件材质', width: 120,
+ { field: 'ljcz', title: '零件材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'wpfl', title: '物品分类', width: 120,
+ { field: 'wpfl', title: '物品分类', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'jldw', title: '计量单位', width: 120,
+ { field: 'jldw', title: '计量单位', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'sl', title: '数量', width: 120,
+ { field: 'sl', title: '数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dmjhrq', title: '打磨计划日期', width: 120,
+ { field: 'dmjhrq', title: '打磨计划日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'qfxqrqxz', title: '前方需求小组期', width: 120,
+ { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'qfxqrqdz', title: '前方需求大组期', width: 120,
+ { field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'gylx', title: '工艺路线', width: 120,
+ // { field: 'gylx', title: '工艺路线', width: 100,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
+
+ // { field: 'dmfzry', title: '打磨负责人', width: 100,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
+
+ { field: 'dmsbbh', title: '打磨设备编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dmfzry', title: '打磨负责人', width: 120,
+ { field: 'dmcd', title: '打磨长度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
-
- { field: 'dmsbbh', title: '打磨设备编号', width: 120,
+ { field: 'dmXfry', title: '派工人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dmcd', title: '打磨长度', width: 120,
+ { field: 'dmXfrq', title: '派工日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
-
- // { field: 'dmry', title: '打磨人员', width: 120,
+ // { field: 'dmry', title: '打磨人员', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
//
- // { field: 'dmksrq', title: '打磨开始日期', width: 120,
+ // { field: 'dmksrq', title: '打磨开始日期', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
//
- // { field: 'dmjsrq', title: '打磨结束日期', width: 120,
+ // { field: 'dmjsrq', title: '打磨结束日期', width: 100,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
+ // { field: 'dscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
- { field: 'dscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
{ field: 'dscry', title: '生产人员', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'djsry', title: '接收人员', width: 100,editRender: { name: 'input' },
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'djsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
+ // { field: 'djsry', title: '接收人员', width: 100,editRender: { name: 'input' },
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
+ // { field: 'djsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
- { field: 'dmFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
+ { field: 'dmFkry', title: '反馈人', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dmFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
+ { field: 'dmFkrq', title: '反馈日期', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dmBzry', title: '编制人', width: 120,
+ { field: 'dmBzry', title: '编制人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dmBzrq', title: '编制日期', width: 120,
+ { field: 'dmBzrq', title: '编制日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dmXfry', title: '下发人', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'dmXfrq', title: '下发日期', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
@@ -514,7 +511,7 @@ export default {
},
saveclick(){
- if(this.queryParam.zt!=='03'){
+ if(this.queryParam.zt!=='02'){
return
}
let obj=this.$refs.xGrid.getCheckboxRecords()
diff --git a/src/views/jhzxgl/hxjhD.vue b/src/views/jhzxgl/hxjhD.vue
new file mode 100644
index 0000000..ce1e836
--- /dev/null
+++ b/src/views/jhzxgl/hxjhD.vue
@@ -0,0 +1,657 @@
+<template>
+ <!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+ <el-container>
+ <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+ <el-form :inline="true" label-width="60px" label-position="left">
+ <el-row>
+
+ <el-col :span="22">
+ <el-col :span="5" >
+ <el-form-item label="状态:">
+ <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
+ <el-option
+ v-for="item in statusOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-form-item label="船号:">
+ <vxe-pulldown ref="xDown4" transfer >
+ <template #default>
+ <vxe-input
+ v-model="queryParam.dcch"
+ placeholder="船号"
+ style="height: 28px;
+ line-height: 28px; width: 140px;"
+ suffix-icon="vxe-icon--search"
+ @keyup="keyupEvent4"
+ @focus="focusEvent4"
+ />
+ </template>
+ <template #dropdown>
+ <div class="my-dropdown mytable " style="width: 250px">
+ <vxe-grid
+ highlight-hover-row
+ height="auto"
+
+ :data="projectData"
+ :columns="projectColumns"
+ @cell-click="cellClickEvent"
+ show-overflow
+ >
+ <template #wgbsEdit="{ row}">
+ <vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
+ </template>
+ </vxe-grid>
+ </div>
+ </template>
+ </vxe-pulldown>
+
+
+ </el-form-item>
+ <el-form-item label="跨位:">
+ <el-select v-model="queryParam.qgkw" placeholder="跨位" clearable >
+ <el-option
+ v-for="item in this.dictData.qgkw"
+ :key="item.bm"
+ :label="item.bmsm"
+ :value="item.bm"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+<!-- <el-form-item label="分段:">-->
+<!-- <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>-->
+<!-- </el-form-item>-->
+
+
+
+
+ </el-col>
+ <el-col :span="2">
+ <el-form-item style="float: right" >
+ <el-button type="success" @click="initList">查询</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+
+ <el-col :span="20" >
+
+
+
+
+
+
+ <span style="width:6%" >班组:</span>
+ <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
+ <el-option
+ v-for="item in this.dictData.bmbm"
+ :key="item.bm"
+ :label="item.bmsm"
+ :value="item.bm"
+ >
+ </el-option>
+ </el-select>
+
+ <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
+ <el-option
+ v-for="item in this.dictData.gxry"
+ :key="item.dlzh"
+ :label="item.dlzh"
+ :value="item.dlzh"
+ >
+ </el-option>
+ </el-select>
+
+
+ <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
+<!-- <span style="width:6%" >反馈人员:</span>-->
+<!-- <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%" />-->
+<!-- <span style="width:6%" >反馈日期:</span>-->
+<!-- <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>-->
+<!-- <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>-->
+ </el-col>
+ <el-col :span="4" >
+ <el-form-item style="float: right" >
+ <el-button type="success" @click="slpgclick">派工</el-button>
+ <el-button type="success" @click="saveclick">报工</el-button>
+
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-header>
+ <el-container style="padding-top: 0px">
+ <el-container>
+ <el-main>
+ <div class="mytable">
+ <vxe-grid
+ id="id"
+ ref="xGrid"
+ border
+ resizable
+ keep-source
+ :align="'center'"
+ :height="height"
+ :auto-resize="true"
+ :columns="tableColumn"
+ highlight-current-row
+ :data="list"
+ :scroll-y="{enabled: true}"
+ :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
+ highlight-hover-row
+ show-overflow
+ show-header-overflow
+
+ >
+
+
+ </vxe-grid>
+ </div>
+
+
+ </el-main>
+ </el-container>
+ </el-container>
+ </el-container>
+</template>
+
+<script>
+import {
+ getPwPgd,
+ savePwFk,
+ getPgdBase,
+ savePwPgdXd,
+ savePwPgdXdBack,
+ savePwjhPg,
+ savePwjhPgBack
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import {null2str} from "@/utils/rpkj";
+import { getToken } from '@/utils/auth'
+import { startLoading, endLoading } from '@/utils'
+import { Message } from 'element-ui'
+export default {
+ name:'HxjhD',
+ data() {
+ return {
+ queryParam: {
+ dcch:'',
+ field:'',
+ user:'',
+ jhrqField:'',
+ zt:'42',
+ qgkw:''
+ },
+ statusOptions: [
+ {
+ value: "42",
+ label: "未派工",
+ },
+ {
+ value: "51",
+ label: "未报工",
+ },
+ {
+ value: "52",
+ label: "已报工",
+ },
+
+ ],
+ inParam:{
+ slry:'',
+ slks:'',
+ sljs:'',
+ dw:'',
+ scry:'',
+ scdw:''
+ },
+ list: [],
+ heads: { token: getToken() },
+ uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+ dictData:{},
+ height: '500px',
+ projectData:[],
+ projectData1:[],
+ projectColumns: [
+ {field: 'cbbm', title: '船号',width: 110},
+ { field: 'wgbs', title: '完工标识', width: 80,
+ slots:{
+ default: 'wgbsEdit'
+ },
+ },
+ ],
+
+ tableColumn: [
+ { type: 'checkbox', width: 40 },
+ { type: 'seq', width: 40, title: '序号' },
+
+ { field: 'dcCh', title: '船号',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+
+ { field: 'dcPl', title: '批量',width: 80,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'dcFd', title: '分段号',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'zl', title: '组立',width: 80,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,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'jssj', title: '前方需求时间',width: 110,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+
+
+ { field: 'hxjhrq', title: '划线计划日期',width: 110,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ // { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', }},
+ // { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', }},
+
+ { field: 'wpgg', title: '规格',width: 80,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+
+
+ { field: 'wpxh', title: '材质',width: 80,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
+
+ {
+ field: 'lldw',
+ title: '理料垛位',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'llcs',
+ title: '理料层数',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'hxpgry',
+ title: '划线派工人',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'hxpgrq',
+ title: '划线派工日期',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'hxfkrq',
+ title: '划线反馈日期',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+
+ {
+ field: 'hxry',
+ title: '划线人员',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+
+ {
+ field: 'hxfkry',
+ title: '划线反馈人员',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'hxbz',
+ title: '划线备注',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+
+ ]
+ }
+ },
+ computed: {
+ ...mapGetters(['name', 'bmbm'])
+ },
+ created() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ this.initBase()
+
+
+
+
+ },
+ methods: {
+ cellClickEvent({row}) {
+ this.queryParam.dcch = row.cbbm
+ this.$refs.xDown4.hidePanel()
+ },
+ focusEvent4() {
+ this.$refs.xDown4.showPanel()
+ },
+ keyupEvent4() {
+
+
+ if (this.queryParam.dcch) {
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ } else {
+ this.projectData = this.projectData1.slice(0)
+ }
+
+ },
+ ztChange(){
+ this.list=[]
+ },
+ bzClick(){
+ console.log(this.dictData.gxry)
+ console.log(this.inParam.scdw)
+ this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+ console.log(this.dictData.gxry)
+ },
+ updates2(){
+ let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+ if(selectRecords.length>0){
+ for(let i = 0; i < selectRecords.length; i++) {
+
+ // selectRecords[i].dw = this.inParam.dw
+ //selectRecords[i].scdw = this.inParam.scdw
+ selectRecords[i].hxry = this.inParam.scry
+ selectRecords[i].hxpgry = this.name
+ // selectRecords[i].pwpgrq = this.inParam.scry
+
+
+ }
+ this.$refs.xGrid.updateData(this.list)
+ }
+ },
+ updates(type){
+
+
+ let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+ if(selectRecords.length>0){
+ for(let i = 0; i < selectRecords.length; i++) {
+ if(type==='1'){
+
+ selectRecords[i].slksrq = this.inParam.slks
+ }else if (type==='2'){
+ selectRecords[i].fkry = this.inParam.slry
+ selectRecords[i].fkrq = this.inParam.sljs
+ }
+
+ }
+ this.$refs.xGrid.updateData(this.list)
+ }
+
+ },
+
+ activeRowMethod({ row, rowIndex }){
+ // if(row.zt==="01"){
+ // return true
+ // }else{
+ // return false
+ // }
+
+ return true;
+ },
+
+ initBase(){
+ getPgdBase({}).then(res=>{
+ console.log(res.data)
+ this.dictData = res.data
+ this.projectData=res.data.cbbm
+ this.projectData1=res.data.cbbm
+ })
+ },
+ plClick(){
+ let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+ if(selectRecords.length>0){
+ for(let i = 0; i < selectRecords.length; i++) {
+ selectRecords[i].fkyy = this.queryParam.fkyy
+ }
+ this.$refs.xGrid.updateData(this.list)
+ }
+
+ },
+ saveclick(){
+ if(this.queryParam.zt!=='51'){
+ return
+ }
+ let obj=this.$refs.xGrid.getCheckboxRecords()
+ // if(obj.length===0){
+ // this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+ // return
+ // }
+
+ savePwjhPgBack({
+ 'field': 'hxfkrq',
+ 'fieldry': 'hxfkry',
+ 'zxZtName':'HXFK',
+ 'list':obj,
+
+ }).then(res=>{
+ if(res.success){
+ this.initList()
+ }
+ })
+ },
+
+ slpgclick(){
+ if(this.queryParam.zt!=="42"){
+ return
+ }
+
+ let obj=this.$refs.xGrid.getCheckboxRecords()
+ if(obj.length===0){
+ return
+ }
+ // if(this.queryParam.zt==='02'){
+ // this.$confirm('取消派工？', '提示', {
+ // confirmButtonText: '确定',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // }).then(() =>{
+
+ savePwjhPgBack({
+ 'field': 'hxpgrq',
+ 'fieldry': 'hxpgry',
+ 'zxZtName':'HXPG',
+ 'list':obj
+
+ }).then(res=>{
+ if(res.success){
+ this.$message({ message: '派工成功', type: 'success' })
+ this.initList()
+ }
+ })
+
+ // })
+ // }else {
+ // this.$confirm('派工？', '提示', {
+ // confirmButtonText: '确定',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // }).then(() =>{
+ // savePwjhPg(obj).then(res=>{
+ // if(res.success){
+ // this.initList()
+ // }
+ // })
+ //
+ // })
+ // }
+
+
+ },
+ xdClick(){
+
+ if(this.queryParam.zt!=="02"){
+ return
+ }
+ let obj=this.$refs.xGrid.getCheckboxRecords()
+ if(obj.length===0){
+ return
+ }
+ if(this.queryParam.zt==='03'){
+ this.$confirm('取消接收？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() =>{
+ savePwPgdXdBack(obj).then(res=>{
+ if(res.success){
+ this.$message({ message: '取消下达成功', type: 'success' })
+ this.initList()
+ }
+ })
+
+ })
+ }else {
+ this.$confirm('接收？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() =>{
+ savePwPgdXd(obj).then(res=>{
+ if(res.success){
+ this.$message({ message: '下达成功', type: 'success' })
+ this.initList()
+ }
+ })
+
+ })
+ }
+
+
+ },
+ initList() {
+ // if (this.queryParam.dcch === '') {
+ // this.$message.warning('选择船只编号')
+ // return
+ // }
+ // this.
+ if(this.queryParam.zt==='21'){
+
+ }else{
+ // this.queryParam.field='pwry';
+ this.queryParam.user=this.name;
+
+ }
+ getPwPgd(this.queryParam).then((res) => {
+ this.list = res.data
+ if (this.$refs.xGrid) {
+ this.$refs.xGrid.loadData(this.list)
+ console.log(this.list)
+ }
+
+ })
+ },
+ selectChange(row) {
+ // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+ this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+ // this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+ null2str(row.row)
+ },
+ getHeight() {
+ this.height = window.innerHeight - 190
+ },
+
+ }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+ .el-input{
+ width: 140px;
+ }
+ .el-select{
+ width: 140px;
+ }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+ background: #0a76a4;
+}
+
+.my-dropdown {
+ width: 400px;
+ height: 400px;
+ background-color: #fff;
+ border: 1px solid #dcdfe6;
+ box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+ font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.el-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.keyword-lighten {
+ color: #000;
+ background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+ line-height: inherit;
+}
+.el-form-item__label-wrap {
+ margin-left: 0px !important;
+ float: left;
+}
+.fontClass{
+ font-size: 12px;
+ font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/pkjhD.vue b/src/views/jhzxgl/pkjhD.vue
index fb802e9..ce6fe17 100644
--- a/src/views/jhzxgl/pkjhD.vue
+++ b/src/views/jhzxgl/pkjhD.vue
@@ -112,8 +112,8 @@
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="slpgclick">派工</el-button>
- <el-button type="success" @click="xdClick">接收</el-button>
- <el-button type="success" @click="saveclick">反馈</el-button>
+<!-- <el-button type="success" @click="xdClick">接收</el-button>-->
+ <el-button type="success" @click="saveclick">报工</el-button>
</el-form-item>
</el-col>
@@ -185,13 +185,10 @@ export default {
value: "02",
label: "派工",
},
+
{
value: "03",
- label: "接收",
- },
- {
- value: "04",
- label: "反馈",
+ label: "报工",
},
],
inParam:{
@@ -300,10 +297,7 @@ export default {
filterRender: { name: 'FilterCombination', },
},
- { field: 'dmjhrq', title: '打磨计划日期', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
+
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -315,19 +309,19 @@ export default {
filterRender: { name: 'FilterCombination', },
},
- { field: 'gylx', title: '工艺路线', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
+ // { field: 'gylx', title: '工艺路线', width: 120,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
{ field: 'pkjhrq', title: '坡口计划日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'pkfzry', title: '坡口负责人', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
+ // { field: 'pkfzry', title: '坡口负责人', width: 120,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
{ field: 'pksbbh', title: '坡口设备编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -359,7 +353,16 @@ export default {
// filterRender: { name: 'FilterCombination', },
// },
- { field: 'pscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
+ // { field: 'pscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
+ { field: 'pkXfry', title: '派工人员', width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'pkXfrq', title: '派工日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -375,14 +378,14 @@ export default {
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
- { field: 'pjsry', title: '接收人员', width: 100,editRender: { name: 'input' },
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'pjsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
+ // { field: 'pjsry', title: '接收人员', width: 100,editRender: { name: 'input' },
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
+ // { field: 'pjsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
{ field: 'pkFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@@ -406,15 +409,7 @@ export default {
filterRender: { name: 'FilterCombination', },
},
- { field: 'pkXfry', title: '下发人', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'pkXfrq', title: '下发日期', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
@@ -530,7 +525,7 @@ export default {
},
saveclick(){
- if(this.queryParam.zt!=='03'){
+ if(this.queryParam.zt!=='02'){
return
}
let obj=this.$refs.xGrid.getCheckboxRecords()
diff --git a/src/views/jhzxgl/pwjhD.vue b/src/views/jhzxgl/pwjhD.vue
index 8da0b73..faa2327 100644
--- a/src/views/jhzxgl/pwjhD.vue
+++ b/src/views/jhzxgl/pwjhD.vue
@@ -55,7 +55,7 @@
</el-form-item>
<el-form-item label="跨位:">
- <el-select v-model="queryParam.qgkw" placeholder="切割跨位" clearable >
+ <el-select v-model="queryParam.qgkw" placeholder="跨位" clearable >
<el-option
v-for="item in this.dictData.qgkw"
:key="item.bm"
@@ -120,7 +120,7 @@
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="slpgclick">派工</el-button>
- <el-button type="success" @click="saveclick">反馈</el-button>
+ <el-button type="success" @click="saveclick">报工</el-button>
</el-form-item>
</el-col>
@@ -197,11 +197,11 @@ export default {
},
{
value: "31",
- label: "未反馈",
+ label: "未报工",
},
{
value: "32",
- label: "已反馈",
+ label: "已报工",
},
],
@@ -255,6 +255,13 @@ export default {
{ field: 'jssj', title: '前方需求时间',width: 110,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
+ {
+ field: 'pwjhrq',
+ title: '抛丸计划日期',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
// { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }},
@@ -342,6 +349,7 @@ export default {
filterRender: { name: 'FilterCombination' }
},
+
]
}
},
diff --git a/src/views/jhzxgl/qgjhD.vue b/src/views/jhzxgl/qgjhD.vue
index f41dd1a..a3843c7 100644
--- a/src/views/jhzxgl/qgjhD.vue
+++ b/src/views/jhzxgl/qgjhD.vue
@@ -7,7 +7,7 @@
<el-row>
<el-col :span="22">
- <el-col :span="4" >
+ <el-col :span="5" >
<el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
<el-option
@@ -112,7 +112,7 @@
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="slpgclick">派工</el-button>
- <el-button type="success" @click="saveclick">反馈</el-button>
+ <el-button type="success" @click="saveclick">报工</el-button>
</el-form-item>
</el-col>
@@ -179,20 +179,21 @@ export default {
field:'',
user:'',
jhrqField:'',
- zt:'52'
+ zt:'42',
+ ztHx:'52'
},
statusOptions: [
{
- value: "52",
+ value: "42",
label: "未派工",
},
{
value: "61",
- label: "未反馈",
+ label: "未报工",
},
{
value: "62",
- label: "已反馈",
+ label: "已报工",
},
],
@@ -246,6 +247,9 @@ export default {
{ field: 'jssj', title: '前方需求时间',width: 110,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
+ { field: 'qgjhrq', title: '切割计划日期',width: 110,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
// { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }},
@@ -261,32 +265,16 @@ export default {
{ field: 'wpxh', title: '材质',width: 80,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
- {
- field: 'pwsb', title: '抛丸设备', width: 100,
- filters: [{
- data: {
- checks: [],
- sVal: '',
- sMenu: '',
- fType1: '',
- fVal1: '',
- fMode: 'and',
- fType2: '',
- fVal2: ''
- }
- }],
-
- },{
- field: 'qgdw',
- title: '切割垛位',
+ {
+ field: 'lldw',
+ title: '理料垛位',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
-
{
- field: 'qgcs',
- title: '切割层数',
+ field: 'llcs',
+ title: '理料层数',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
@@ -467,7 +455,7 @@ export default {
},
slpgclick(){
- if(this.queryParam.zt!=="52"){
+ if(this.queryParam.zt!=="42"){
return
}
@@ -475,6 +463,16 @@ export default {
if(obj.length===0){
return
}
+ for(let i =0;i<obj.length;i++){
+ let rows =this.$refs.xGrid.getRowSeq(obj[i])
+ if(obj[i].qgry==null||obj[i].qgry===''){
+ this.$message({ message: '第'+rows+'行施工人不能为空', type: 'error' })
+ return
+ }
+
+ }
+ // 判断施工人 不能为空
+
// if(this.queryParam.zt==='02'){
// this.$confirm('取消派工？', '提示', {
// confirmButtonText: '确定',
@@ -560,7 +558,7 @@ export default {
// return
// }
// this.
- if(this.queryParam.zt==='52'){
+ if(this.queryParam.zt==='42'){
}else{
// this.queryParam.field='pwry';
diff --git a/src/views/jhzxgl/qmjhD.vue b/src/views/jhzxgl/qmjhD.vue
index f772835..91500c3 100644
--- a/src/views/jhzxgl/qmjhD.vue
+++ b/src/views/jhzxgl/qmjhD.vue
@@ -112,8 +112,7 @@
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="slpgclick">派工</el-button>
- <el-button type="success" @click="xdClick">接收</el-button>
- <el-button type="success" @click="saveclick">反馈</el-button>
+ <el-button type="success" @click="saveclick">报工</el-button>
</el-form-item>
</el-col>
@@ -188,11 +187,7 @@ export default {
},
{
value: "03",
- label: "接收",
- },
- {
- value: "04",
- label: "反馈",
+ label: "报工",
},
],
inParam:{
@@ -343,62 +338,39 @@ export default {
// filterRender: { name: 'FilterCombination', },
// },
- { field: 'qscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'qscry', title: '生产人员', width: 100,editRender: { name: 'input' },
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- // { field: 'fkry', title: '派工人员', width: 100,
+ // { field: 'qscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
- // { field: 'fkrq', title: '派工日期', width: 100,
- // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- // filterRender: { name: 'FilterCombination', },
- // },
- { field: 'qjsry', title: '接收人员', width: 100,editRender: { name: 'input' },
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'qjsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
+ { field: 'qscry', title: '生产人员', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'qjgFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'qjgFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'qjgBzry', title: '编制人', width: 120,
+ { field: 'qjgXfry', title: '派工人员', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'qjgBzrq', title: '编制日期', width: 120,
+ { field: 'qjgXfrq', title: '派工日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'qjgXfry', title: '下发人', width: 120,
+ { field: 'qjgFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'qjgXfrq', title: '下发日期', width: 120,
+ { field: 'qjgFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
+
// { field: 'qjgFkyy', title: '反馈原因', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
@@ -519,7 +491,7 @@ export default {
},
saveclick(){
- if(this.queryParam.zt!=='03'){
+ if(this.queryParam.zt!=='02'){
return
}
let obj=this.$refs.xGrid.getCheckboxRecords()
diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue
index 676e84e..69c4def 100644
--- a/src/views/jhzxgl/sljhD.vue
+++ b/src/views/jhzxgl/sljhD.vue
@@ -371,11 +371,14 @@ export default {
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }},
+
{ field: 'wpgg', title: '规格',width: 80,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
-
+ { field: 'wpxh1', title: '材质1',width: 80,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
{ field: 'wpxh', title: '材质',width: 80,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
@@ -476,9 +479,9 @@ export default {
{ type: 'seq', width: 40, title: '序号' }, // 1
// { title: '操作', width: 50, slots: { default: 'operation' }, fixed: 'right' },
{
- title: '入库日期',
+ title: '小合同号',
width: "120px",
- field: 'rkrq',
+ field: 'gcddh',
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
@@ -653,10 +656,11 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
+
{
- title: '小合同号',
+ title: '入库日期',
width: "120px",
- field: 'gcddh',
+ field: 'rkrq',
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
diff --git a/src/views/jhzxgl/ylxx.vue b/src/views/jhzxgl/ylxx.vue
new file mode 100644
index 0000000..80c1c46
--- /dev/null
+++ b/src/views/jhzxgl/ylxx.vue
@@ -0,0 +1,751 @@
+<template>
+ <!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+ <el-container>
+ <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+ <el-form :inline="true" label-width="60px" label-position="left">
+ <el-row>
+
+ <el-col :span="18">
+
+
+
+ <el-form-item label="船号:">
+ <vxe-pulldown ref="xDown4" transfer >
+ <template #default>
+ <vxe-input
+ v-model="queryParam.dcch"
+ placeholder="船号"
+ style="height: 28px;
+ line-height: 28px; width: 140px;"
+ suffix-icon="vxe-icon--search"
+ @keyup="keyupEvent4"
+ @focus="focusEvent4"
+ />
+ </template>
+ <template #dropdown>
+ <div class="my-dropdown mytable " style="width: 250px">
+ <vxe-grid
+ highlight-hover-row
+ height="auto"
+
+ :data="projectData"
+ :columns="projectColumns"
+ @cell-click="cellClickEvent"
+ show-overflow
+ >
+ <template #wgbsEdit="{ row}">
+ <vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
+ </template>
+ </vxe-grid>
+ </div>
+ </template>
+ </vxe-pulldown>
+
+
+ </el-form-item>
+ <el-form-item label="批量:">
+ <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+ </el-form-item>
+<!-- <el-form-item label="分段:">-->
+<!-- <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>-->
+<!-- </el-form-item>-->
+
+
+
+
+ </el-col>
+ <el-col :span="6">
+ <el-form-item style="float: right" >
+ <el-button type="success" @click="initList">查询</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+
+ <el-col :span="20" >
+
+
+
+
+
+
+
+
+ </el-col>
+ <el-col :span="4" >
+ <el-form-item style="float: right" >
+<!-- <el-button type="success" @click="slpgclick">派工</el-button>-->
+<!-- <el-button type="success" @click="xdClick">接收</el-button>-->
+<!-- <el-button type="success" @click="saveclick">反馈</el-button>-->
+
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-header>
+ <el-container style="padding-top: 0px">
+ <el-container>
+ <el-main>
+ <div class="mytable">
+ <vxe-grid
+ id="id"
+ ref="xGrid"
+ border
+ resizable
+ keep-source
+ :align="'center'"
+ :height="height"
+ :auto-resize="true"
+ :columns="tableColumn"
+ highlight-current-row
+ :data="list"
+ :scroll-y="{enabled: true}"
+ :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
+ highlight-hover-row
+ show-overflow
+ show-header-overflow
+
+ >
+
+
+ </vxe-grid>
+ </div>
+
+
+ </el-main>
+ </el-container>
+ </el-container>
+ </el-container>
+</template>
+
+<script>
+import {
+ getPgdBase
+} from '@/api/jhzxgl/pgd'
+import {
+ getYlList
+} from '@/api/jhzx/ylxx'
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import {null2str} from "@/utils/rpkj";
+import { getToken } from '@/utils/auth'
+import { startLoading, endLoading } from '@/utils'
+import { Message } from 'element-ui'
+export default {
+ name:'HxjhD',
+ data() {
+ return {
+ queryParam: {
+ dcch:'',
+ pl:'',
+ fd:'',
+ fkyy:'',
+ zt:'01'
+ },
+ statusOptions: [
+ {
+ value: "01",
+ label: "编制",
+ },
+ {
+ value: "02",
+ label: "派工",
+ },
+ {
+ value: "03",
+ label: "接收",
+ },
+ {
+ value: "04",
+ label: "反馈",
+ },
+ ],
+ inParam:{
+ slry:'',
+ slks:'',
+ sljs:'',
+ dw:'',
+ scry:'',
+ scdw:''
+ },
+ list: [],
+ heads: { token: getToken() },
+ uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+ dictData:{},
+ height: '500px',
+ projectData:[],
+ projectData1:[],
+ projectColumns: [
+ {field: 'cbbm', title: '船号',width: 110},
+ { field: 'wgbs', title: '完工标识', width: 80,
+ slots:{
+ default: 'wgbsEdit'
+ },
+ },
+ ],
+
+ tableColumn: [
+
+ { type: 'seq', width: 40, title: '序号' },
+ {
+ field: 'dcCh',
+ title: '船号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'dcPl',
+ title: '批量',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'dcZl',
+ title: '组立',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'dcHx',
+ title: '划线',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'tzbh',
+ title: '图纸编号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'ylbh',
+ title: '余料编号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'wpxh',
+ title: '物品型号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'wpgg',
+ title: '物品规格',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'ylzd1',
+ title: '余料规格',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 't1',
+ title: '厚',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'b1',
+ title: '宽',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'l',
+ title: '长',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'sl',
+ title: '张数',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'jldw',
+ title: '计量单位',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'ylzl',
+ title: '余料重量(KG)',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'hxfl',
+ title: '余料分类',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'dcLph',
+ title: '炉批号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'scrq',
+ title: '余料生成日期',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ // {
+ // field: 'syrq',
+ // title: '余料使用日期',
+ // width: 120,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination' }
+ // },
+ {
+ field: 'sybs',
+ title: '标识',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'dcCh2',
+ title: '使用船号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'dcPl2',
+ title: '使用批号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'ylkwh',
+ title: '余料存放垛位',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'ylzd2',
+ title: '层数',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'tzbh1',
+ title: '使用余料图纸编号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ }
+ ,
+ {
+ field: 'ysrq',
+ title: '使用日期',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'ylcjbm',
+ title: '余料存放跨',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ }
+ ,
+ {
+ field: 'gzzx',
+ title: '工作中心',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ }
+ ,
+ {
+ field: 'bz',
+ title: '备注',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ }
+ ,
+ {
+ field: 'ylsxh',
+ title: '余料流水号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ }
+ ,
+ {
+ field: 'hxbh',
+ title: '内部编号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ }
+ ,
+ {
+ field: 'xh',
+ title: '内部序号',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ }
+ ,
+ {
+ field: 'bzry',
+ title: '编制人员',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ }
+ ,
+ {
+ field: 'bzrq',
+ title: '编制日期',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ }
+ ,
+ {
+ field: 'zt',
+ title: '状态',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ }
+
+
+
+
+
+
+
+
+
+ ]
+ }
+ },
+ computed: {
+ ...mapGetters(['name', 'bmbm'])
+ },
+ created() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ this.initBase()
+
+
+ },
+ methods: {
+
+ cellClickEvent({row}) {
+ this.queryParam.dcch = row.cbbm
+ this.$refs.xDown4.hidePanel()
+ },
+ focusEvent4() {
+ this.$refs.xDown4.showPanel()
+ },
+ keyupEvent4() {
+
+
+ if (this.queryParam.dcch) {
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ } else {
+ this.projectData = this.projectData1.slice(0)
+ }
+
+ },
+ ztChange(){
+ this.list=[]
+ },
+ bzClick(){
+ console.log(this.dictData.gxry)
+ console.log(this.inParam.scdw)
+ this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+ console.log(this.dictData.gxry)
+ },
+ updates2(){
+ let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+ if(selectRecords.length>0){
+ for(let i = 0; i < selectRecords.length; i++) {
+
+
+ selectRecords[i].pscdw = this.inParam.scdw
+ selectRecords[i].pscry = this.inParam.scry
+
+
+ }
+ this.$refs.xGrid.updateData(this.list)
+ }
+ },
+ updates(type){
+
+
+ let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+ if(selectRecords.length>0){
+ for(let i = 0; i < selectRecords.length; i++) {
+ if(type==='1'){
+
+ selectRecords[i].slksrq = this.inParam.slks
+ }else if (type==='2'){
+ selectRecords[i].pkFkry = this.inParam.slry
+ selectRecords[i].pkFkrq = this.inParam.sljs
+ }
+
+ }
+ this.$refs.xGrid.updateData(this.list)
+ }
+
+ },
+
+ activeRowMethod({ row, rowIndex }){
+ // if(row.zt==="01"){
+ // return true
+ // }else{
+ // return false
+ // }
+
+ return true;
+ },
+
+ initBase(){
+ getPgdBase({}).then(res=>{
+ console.log(res.data)
+ this.dictData = res.data
+ this.projectData=res.data.cbbm
+ this.projectData1=res.data.cbbm
+ })
+ },
+ plClick(){
+ let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+ if(selectRecords.length>0){
+ for(let i = 0; i < selectRecords.length; i++) {
+ selectRecords[i].fkyy = this.queryParam.fkyy
+ }
+ this.$refs.xGrid.updateData(this.list)
+ }
+
+ },
+ saveclick(){
+
+ if(this.queryParam.zt!=='03'){
+ return
+ }
+ let obj=this.$refs.xGrid.getCheckboxRecords()
+ // if(obj.length===0){
+ // this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+ // return
+ // }
+ savePkPgdFk(obj).then(res=>{
+ if(res.success){
+ this.initList()
+ }
+ })
+ },
+
+ slpgclick(){
+ // if(this.queryParam.zt!=="01"){
+ // return
+ // }
+
+ let obj=this.$refs.xGrid.getCheckboxRecords()
+ if(obj.length===0){
+ return
+ }
+ if(this.queryParam.zt==='02'){
+ this.$confirm('取消派工？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() =>{
+ savePkPgdXdBack(obj).then(res=>{
+ if(res.success){
+ this.$message({ message: '取消派工成功', type: 'success' })
+ this.initList()
+ }
+ })
+
+ })
+ }else if (this.queryParam.zt==='01') {
+ this.$confirm('派工？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() =>{
+ savePkPgdXd(obj).then(res=>{
+ if(res.success){
+ this.initList()
+ }
+ })
+
+ })
+ }
+
+
+ },
+ xdClick(){
+
+ if(this.queryParam.zt!=="02"){
+ return
+ }
+ let obj=this.$refs.xGrid.getCheckboxRecords()
+ if(obj.length===0){
+ return
+ }
+ // if(this.queryParam.zt==='03'){
+ // this.$confirm('取消接收？', '提示', {
+ // confirmButtonText: '确定',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // }).then(() =>{
+ // saveQgPgdXdBack(obj).then(res=>{
+ // if(res.success){
+ // this.$message({ message: '取消下达成功', type: 'success' })
+ // this.initList()
+ // }
+ // })
+ //
+ // })
+ // }else {
+ this.$confirm('接收？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() =>{
+ savePkPgdJs(obj).then(res=>{
+ if(res.success){
+ this.$message({ message: '接收成功', type: 'success' })
+ this.initList()
+ }
+ })
+
+ })
+ // }
+
+
+ },
+ initList() {
+ if (this.queryParam.dcch === '') {
+ this.$message.warning('选择船只编号')
+ return
+ }
+ getYlList(this.queryParam).then((res) => {
+ console.log(res.data)
+ this.list = res.data
+ if (this.$refs.xGrid) {
+ this.$refs.xGrid.loadData(this.list)
+ console.log(this.list)
+ }
+
+ })
+ },
+ selectChange(row) {
+ // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+ this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+ // this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+ null2str(row.row)
+ },
+ getHeight() {
+ this.height = window.innerHeight - 190
+ },
+
+ }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+ .el-input{
+ width: 140px;
+ }
+ .el-select{
+ width: 140px;
+ }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+ background: #0a76a4;
+}
+
+.my-dropdown {
+ width: 400px;
+ height: 400px;
+ background-color: #fff;
+ border: 1px solid #dcdfe6;
+ box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+ font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.el-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.keyword-lighten {
+ color: #000;
+ background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+ line-height: inherit;
+}
+.el-form-item__label-wrap {
+ margin-left: 0px !important;
+ float: left;
+}
+.fontClass{
+ font-size: 12px;
+ font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/kcwz/wzkctj.vue b/src/views/kcwz/wzkctj.vue
index 7f7eefa..e0acfc6 100644
--- a/src/views/kcwz/wzkctj.vue
+++ b/src/views/kcwz/wzkctj.vue
@@ -1,22 +1,1006 @@
<template>
<el-container>
- <span style="margin-top: 20px;margin-left: 20px">待开发...</span>
+ <el-header style="width: 100%; height: 60px;font-size: 12px">
+
+
+ <el-row>
+
+ <el-col :span="20">
+ <el-form :inline="true" label-width="50px" label-position="left">
+ <el-form-item label="状态:">
+ <el-select v-model="queryParam.rqopt" placeholder="状态" clearable @change="ztChange" style="width: 80px">
+ <el-option
+ v-for="item in statusOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="船号:">
+ <vxe-pulldown ref="xDown4" transfer >
+ <template #default>
+ <vxe-input
+ v-model="queryParam.dcch"
+ placeholder="船号"
+ style="height: 28px;
+ line-height: 28px; width: 140px;"
+ suffix-icon="vxe-icon--search"
+ @keyup="keyupEvent4"
+ @focus="focusEvent4"
+ />
+ </template>
+ <template #dropdown>
+ <div class="my-dropdown mytable " style="width: 250px">
+ <vxe-grid
+ highlight-hover-row
+ height="auto"
+
+ :data="projectData"
+ :columns="projectColumns"
+ @cell-click="cellClickEvent"
+ show-overflow
+ >
+ <template #wgbsEdit="{ row}">
+ <vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
+ </template>
+ </vxe-grid>
+ </div>
+ </template>
+ </vxe-pulldown>
+
+
+ </el-form-item>
+ <el-form-item label="期量:" label-width="40">
+
+
+ <el-select v-model="inParam.ql" placeholder="期量" clearable >
+ <el-option
+ v-for="item in this.dictData.dhql"
+ :key="item.bm"
+ :label="item.bmsm"
+ :value="item.bm"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="规格:">
+ <el-input v-model="queryParam.wpgg" type="search" placeholder="规格" style="width: 200px" ></el-input>
+ </el-form-item>
+ <el-form-item label="材质:">
+ <el-input v-model="queryParam.wpxh" type="search" placeholder="材质" ></el-input>
+ </el-form-item>
+
+
+
+ </el-form>
+ </el-col>
+ <el-col :span="4" style="text-align: right">
+
+ <el-button type="success" @click="initList">查询</el-button>
+
+ </el-col>
+
+
+ </el-row>
+
+
+ </el-header>
+ <el-container :style="defaultHeight" style="margin-top: 10px">
+ <el-container>
+ <el-main>
+
+ <div class="mytable" >
+
+
+ <vxe-grid
+ id="id"
+ ref="xGrid"
+ border
+ resizable
+ keep-source
+ :height="height"
+ :auto-resize="true"
+ :columns="tableColumn1"
+ :data="tableOne"
+ :scroll-y="{enabled: true}"
+ :custom-config="{storage: true}"
+
+ highlight-hover-row
+ highlight-current-row
+ @current-change="rowClick"
+ :header-cell-style="{'text-align':'center'}"
+
+ >
+ <!-- <template #operation="{ row }">-->
+ <!-- <vxe-button type="text" icon="vxe-icon--check" @click="tjClcik(row)" />-->
+ <!-- </template>-->
+ </vxe-grid>
+
+ </div>
+
+
+
+ </el-main>
+ </el-container>
+ </el-container>
+
</el-container>
+
</template>
<script>
+import {
+ getSljhPgd,
+ saveSljhPgdFk,
+ saveSljhPgdXd,
+ saveSljhPgdXdBack,
+ saveSljhFk,
+ getPgdBase, saveSljhPg, saveSljhPgBack, getKcAndSljh, kcAdnSlBd, kcAdnSlZx, getydjhByid, getKcAndSljh1, slPrint
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import SljhPrint from "@/views/jhzxgl/components/SljhPrint";
+import {null2str} from "@/utils/rpkj";
+import { getToken } from '@/utils/auth'
+import { startLoading, endLoading } from '@/utils'
+import { Message } from 'element-ui'
export default {
- name: "Wzkctj",
+ name:'Wzkctj',
+ components: {SljhPrint},
data() {
+ return {
+ queryParam: {
+ dcch:'',
+ ql:'',
+ xqdcch:'',
+ xqpl:'',
+ kw:'',
+ sljhrq:'',
+ rqopt:'01',
+ wpgg:'',
+ wpxh:''
+ },
+ defaultHeight: { height: '' },
+ wgzyprintFlag:false,
+ sljhPrintData:[],
+ statusOptions: [
+ {
+ value: "01",
+ label: "未核对",
+ },
+ {
+ value: "02",
+ label: "未打印",
+ },
+ {
+ value: "03",
+ label: "已打印",
+ }
+ ],
+ inParam:{
+ dcch:'',
+ pl:'',
+ pwwz:'',
+ qgkw:'',
+ jhrq:'',
+ bz:'',
+ lx:'',
+ dw:''
+ },
+ list: [],
+ tableOne: [],
+ bdbs: "",
+ tableTwo: [],
+ heads: { token: getToken() },
+ uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+ dictData:{},
+ height: '500px',
+ projectData:[],
+ projectData1:[],
+ projectColumns: [
+ {field: 'cbbm', title: '船号',width: 110},
+ { field: 'wgbs', title: '完工标识', width: 80,
+ slots:{
+ default: 'wgbsEdit'
+ },
+ },
+ ],
+ tableColumn2: [
+ { type: 'checkbox', width: 40 },
+ { type: 'seq', width: '40px', title: '序号' },
+ // { field: 'id', title: 'id',width: 80,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
+ // { field: 'zt', title: '状态',width: 80,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
+ { field: 'dcCh', title: '船号',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+
+ { field: 'dcPl', title: '批量',width: 80,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'dcFd', title: '分段号',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'zl', title: '组立',width: 80,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,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+
+ // { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', }},
+ // { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', }},
+
+
+ { field: 'wpgg', title: '规格',width: 80,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+
+ { field: 'wpxh1', title: '材质1',width: 80,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'wpxh', title: '材质',width: 80,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
+
+ {
+ field: 'slkcdw',
+ title: '上料库存垛位',
+ editRender: { name: 'input' },
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'slcs',
+ title: '上料层数',editRender: { name: 'input' },
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'slxhth',
+ title: '上料小合同号',
+ width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'slhth',
+ title: '上料合同号',
+ width: 100, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'slwlh',
+ title: '上料物料号',
+ width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'slkcxx',
+ title: '上料库存信息',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'slycldw',
+ title: '上料预处理垛位',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'slpgry',
+ title: '上料派工人',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'slfkry',
+ title: '上料反馈人',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'slfkrq',
+ title: '上料反馈日期',
+ width: 120,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'slbz',
+ title: '上料备注',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ {
+ field: 'sljhrq',
+ title: '上料计划日期',
+ width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' }
+ },
+ { field: 'jssj', title: '前方需求时间',width: 110,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'id', title: '生产id',width: 110,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ ],
+ tableColumn1: [
+ { type: 'checkbox', width: 40 },
+ { type: 'seq', width: 40, title: '序号' }, // 1
+ // { title: '操作', width: 50, slots: { default: 'operation' }, fixed: 'right' },
+ {
+ title: '小合同号',
+ width: "120px",
+ field: 'gcddh',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+
+ {
+ title: '期量',
+ width: "90px",
+ field: 'dzwz',
+ formatter: ['dictFormat','DHQL'],
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+
+ {
+ title: '船号',
+ width: "80px",
+ field: 'dcch',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '材质',
+ width: "80px",
+ field: 'wpxh',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '规格',
+ width: "80px",
+ field: 'wpgg',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '炉批号',
+ width: "70px",
+ field: 'lph',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '数量',
+ width: "70px",
+ field: 'qxkcl',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '库存',
+ width: "70px",
+ field: 'kwh',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '层数',
+ width: "100px",
+ field: 'cfcs1',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '打印单',
+ width: "100px",
+ field: 'sllsh',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+
+ {
+ title: '套料图号',
+ width: "120px",
+ field: 'dcTh',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '需求船只',
+ width: "120px",
+ field: 'zych',
+ editRender: {
+ name: '$select', options: [],
+ optionProps: {value: 'cbbm', label: 'cbbm'},
+ props: {clearable: true}
+ , events: {change: this.selectChange}
+ },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '需求批量',
+ width: "120px",
+ field: 'zypl',
+ editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '流向',
+ width: "120px",
+ field: 'zylx',
+ editRender: {
+ name: '$select', options: [],
+ optionProps: {value: 'bm', label: 'bmsm'},
+ props: {clearable: true}
+ , events: {change: this.selectChange}
+ },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '切割跨位',
+ width: "120px",
+ field: 'sldw',
+ formatter: ['dictFormat', 'QGKW'],
+ editRender: {
+ name: '$select', options: [],
+ optionProps: {value: 'bm', label: 'bmsm'},
+ props: {clearable: true}
+ , events: {change: this.selectChange}
+ },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '抛丸位置',
+ width: "120px",
+ field: 'pwwz',
+ formatter: ['dictFormat', 'PWWZ'],
+ editRender: {
+ name: '$select', options: [],
+ optionProps: {value: 'bm', label: 'bmsm'},
+ props: {clearable: true}
+ , events: {change: this.selectChange}
+ },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '计划日期',
+ width: "120px",
+ field: 'dhh',
+ editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '物品状态',
+ width: "120px",
+ field: 'wpzt',
+ formatter: ['dictFormat', 'WPZT'],
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+
+ {
+ title: '备注',
+ width: "120px",
+ field: 'bz',
+ editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+
+ {
+ title: '入库日期',
+ width: "120px",
+ field: 'rkrq',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '车号',
+ width: "100px",
+ field: 'dcTpbh',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '合同号',
+ width: "120px",
+ field: 'dcFd',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ {
+ title: '生产id',
+ width: "120px",
+ field: 'ydid',
+
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination' },
+ },
+ ],
+ }
+ },
+ computed: {
+ ...mapGetters(['name', 'bmbm'])
},
created() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ this.initBase()
+ this.inParam.dw=0
},
methods: {
+ cellClickEvent({row}) {
+ this.queryParam.dcch = row.cbbm
+ this.$refs.xDown4.hidePanel()
+ },
+ focusEvent4() {
+ this.$refs.xDown4.showPanel()
+ },
+ keyupEvent4() {
+
+
+ if (this.queryParam.dcch) {
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ } else {
+ this.projectData = this.projectData1.slice(0)
+ }
+
+ },
+ ztChange(){
+ this.list=[]
+ },
+ bzClick(){
+ console.log(this.dictData.gxry)
+ console.log(this.inParam.scdw)
+ this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+ console.log(this.dictData.gxry)
+ },
+ updates2(){
+ let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+ if(selectRecords.length>0){
+ for(let i = 0; i < selectRecords.length; i++) {
+
+
+
+ if(this.inParam.dcch !==''){
+ selectRecords[i].zych = this.inParam.dcch
+ }
+ if(this.inParam.pl !==''){
+ selectRecords[i].zypl = this.inParam.pl
+ }
+ if(this.inParam.lx !==''){
+ selectRecords[i].zylx = this.inParam.lx
+ }
+ if(this.inParam.qgkw !==''){
+ selectRecords[i].sldw = this.inParam.qgkw
+ }
+ if(this.inParam.pwwz!==''){
+ selectRecords[i].pwwz = this.inParam.pwwz
+ }
+ if(this.inParam.jhrq !==''){
+ selectRecords[i].dhh = this.inParam.jhrq
+ }
+ if(this.inParam.bz !==''){
+ selectRecords[i].bz = this.inParam.bz
+ }
+
+
+
+
+
+
+
+
+
+ }
+ this.$refs.xGrid.updateData(this.list)
+ }
+ },
+ updates(type){
+
+
+ let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+ if(selectRecords.length>0){
+ for(let i = 0; i < selectRecords.length; i++) {
+ if(type==='1'){
+
+ selectRecords[i].slksrq = this.inParam.slks
+ }else if (type==='2'){
+ selectRecords[i].fkry = this.inParam.slry
+ selectRecords[i].fkrq = this.inParam.sljs
+ }
+
+ }
+ this.$refs.xGrid.updateData(this.list)
+ }
+
+ },
+
+ activeRowMethod({ row, rowIndex }){
+ // if(row.zt==="01"){
+ // return true
+ // }else{
+ // return false
+ // }
+
+ return true;
+ },
+
+ initBase(){
+ getPgdBase({}).then(res=>{
+ this.dictData = res.data
+ this.projectData=res.data.cbbm
+ this.projectData1=res.data.cbbm
+
+
+
+
+
+ const zych = this.$refs.xGrid.getColumnByField('zych')
+ zych.editRender.options = this.dictData.cbbm
+
+ const zylx = this.$refs.xGrid.getColumnByField('zylx')
+ zylx.editRender.options = this.dictData.zylx
+
+
+ const sldw = this.$refs.xGrid.getColumnByField('sldw')
+ sldw.editRender.options = this.dictData.qgkw
+
+ const pwwz = this.$refs.xGrid.getColumnByField('pwwz')
+ pwwz.editRender.options = this.dictData.pwwz
+
+
+
+
+
+ })
+ },
+ plClick(){
+ let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+ if(selectRecords.length>0){
+ for(let i = 0; i < selectRecords.length; i++) {
+ selectRecords[i].fkyy = this.queryParam.fkyy
+ }
+ this.$refs.xGrid.updateData(this.list)
+ }
+
+ },
+ print(){
+ let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+ if(selectRecords.length>0){
+ slPrint(selectRecords).then(res=>{
+ this.sljhPrintData=res.data
+ console.log(this.sljhPrintData)
+ this.wgzyprintFlag=true
+ setTimeout(() => {
+ this.$print(this.$refs.print)
+ this.wgzyprintFlag = false
+ this.initList()
+ }, 50)
+ })
+ }
+
+ },
+ async getlist1 (){
+ await getKcAndSljh1(this.queryParam).then((res) => {
+
+
+ this.tableTwo = res.data
+
+
+ if (this.$refs.xGrid1) {
+ this.$refs.xGrid1.loadData(res.data)
+ console.log(this.list)
+ }
+
+ })
+ },
+
+ async rowClick({ column, row }) {
+
+ if(row.ydid==='' || row.ydid==null){
+ this.$refs.xGrid1.setCurrentRow();
+ return
+ }
+ let a=true
+ getydjhByid({"id":row.ydid}).then(res=>{
+ if(res.success){
+ let subObj=this.$refs.xGrid1.getTableData().visibleData
+ for(let obj of subObj){
+ console.log(obj)
+ console.log(res.data)
+ let yds=res.data
+ // console.log(Object.assign(this.testClone(updateobj),obj))
+ if(obj.id===yds[0].id){
+ a=false
+ this.$refs.xGrid1.setCurrentRow( obj);
+ }
+ }
+ if(a){
+ this.$refs.xGrid1.loadData(res.data)
+ }
+ }
+ })
+ },
+
+ initList() {
+ this.bdbs=""
+ // if (this.queryParam.dcch === '') {
+ // this.$message.warning('选择船只编号')
+ // return
+ // }
+ getKcAndSljh(this.queryParam).then((res) => {
+ this.tableOne = res.data.slkcs
+ console.log(this.tableOne)
+
+ //this.tableTwo = res.data.ydjhs
+ console.log(this.tableTwo)
+ if (this.$refs.xGrid) {
+ this.$refs.xGrid.loadData(this.tableOne)
+ console.log(this.list)
+ }
+ // if (this.$refs.xGrid1) {
+ // this.$refs.xGrid1.loadData(this.tableTwo)
+ // console.log(this.list)
+ // }
+
+ })
+ },
+ initList1() {
+ this.bdbs=""
+ // if (this.queryParam.dcch === '') {
+ // this.$message.warning('选择船只编号')
+ // return
+ // }
+ getKcAndSljh1(this.queryParam).then((res) => {
+
+
+ this.tableTwo = res.data
+
+
+ if (this.$refs.xGrid1) {
+ this.$refs.xGrid1.loadData(res.data)
+ console.log(this.list)
+ }
+
+ })
+ },
+
+ hdClick(){
+ if(this.queryParam.rqopt!=='01'){
+ return
+ }
+
+
+ if(this.inParam.pl !=='') {
+ this.queryParam.xqdcch = this.inParam.dcch
+ }
+ if(this.inParam.dcch !==''){
+ this.queryParam.xqdcch=this.inParam.dcch
+ this.getlist1().then(res=>{
+ this.hd()
+ })
+
+ }else{
+ this.hd()
+ }
+
+ // if(this.bdbs=='01'){
+ // this.$message({ message: '核对结果未保存，重新查询后进行核对', type: 'warning' })
+ // return
+ // }
+ console.log(this.$refs.xGrid.getTableData())
+
+ },
+
+ async hd (){
+ await kcAdnSlBd({
+ // "data1":this.$refs.xGrid.getTableData().visibleData,
+ // "data2":this.$refs.xGrid1.getTableData().visibleData
+ "data1":this.$refs.xGrid.getTableData().visibleData,
+ "data2":this.$refs.xGrid1.getTableData().visibleData,
+ "dw":this.inParam.dw
+ }).then((res) => {
+ if(res.success){
+
+ // 与现有数据进行比对
+ let array1 = this.$refs.xGrid.getTableData().visibleData
+ let array2=res.data.slkcs
+ console.log(array1)
+ console.log(array2)
+ array1.forEach(item1 => {
+ array2.forEach(item2 => {
+ if (item1.ckh === item2.ckh && item1.wph === item2.wph && item1.kwh === item2.kwh && item1.nbsbm === item2.nbsbm) {
+ //console.log(`Match found: ${item1.name} and ${item2.name}`);
+ //console.log(item1.nbsbm);
+ console.log(item2);
+ item1.zych = item2.dcch
+ item1.zypl = item2.zypl
+ item1.zylx =item2.zylx
+ item1.sldw = item2.sldw
+ item1.ydid = item2.ydid
+ item1.dhh = item2.dhh
+
+ // item1.dhh = item2.sljhrq
+
+ this.$refs.xGrid.setCheckboxRow(item1,true)
+ return
+
+ }
+ });
+ });
+
+ array1 = this.$refs.xGrid1.getTableData().visibleData
+ array2=res.data.slkcs
+ console.log(array1)
+ console.log(array2)
+ array1.forEach(item1 => {
+ array2.forEach(item2 => {
+ if (item1.id === item2.ydid) {
+ //console.log(`Match found: ${item1.name} and ${item2.name}`);
+ item1.slcs = item2.cfcs1
+ item1.slxhth = item2.gcddh
+ item1.slhth = item2.dcFd
+ item1.slwlh = item2.wph
+ item1.slkcdw = item2.kwh
+ item1.slycldw = item1.slycldw
+
+ this.$refs.xGrid1.setCheckboxRow(item1, true)
+ return
+
+ }
+ });
+ });
+
+ }
+
+
+ })
+ },
+ saveOne(){
+ if(this.queryParam.rqopt!=='01'){
+ return
+ }
+
+
+ kcAdnSlZx({
+ // "data1":this.$refs.xGrid.getTableData().visibleData,
+ // "data2":this.$refs.xGrid1.getTableData().visibleData
+ "data1":this.$refs.xGrid.getUpdateRecords(),
+ "data2":this.$refs.xGrid1.getUpdateRecords()
+ }).then((res) => {
+ // if(res.success){
+ this.initList()
+ this.initList1()
+ //}
+
+ })
+ },
+ selectChange(row) {
+ // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+ this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+ // this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+ null2str(row.row)
+ },
+ getHeight() {
+ this.height = window.innerHeight - 190
+ },
}
-};
+}
</script>
+
<style lang="scss" scoped >
+.el-header{margin:0;padding: 5px;height:auto;
+ .el-input{
+ width: 140px;
+ }
+ .el-select{
+ width: 140px;
+ }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+ background: #0a76a4;
+}
+
+.my-dropdown {
+ width: 400px;
+ height: 400px;
+ background-color: #fff;
+ border: 1px solid #dcdfe6;
+ box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+ font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.el-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.keyword-lighten {
+ color: #000;
+ background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+ line-height: inherit;
+}
+.el-form-item__label-wrap {
+ margin-left: 0px !important;
+ float: left;
+}
+.fontClass{
+ font-size: 12px;
+ font-weight: bold;
+}
+
+
</style>
diff --git a/src/views/zl/czzjgz.vue b/src/views/zl/czzjgz.vue
new file mode 100644
index 0000000..e69de29