派工单

src/api/jhzxgl/pgd.js

@@ -19,11 +19,14 @@ export function saveDhPgdFk(data) {return request({url: '/pgdDh/saveDhPgdFk', me
 
 
 
+
 export function getSljhPgd(data) {return request({url: '/pgdSljh/getSljhPgd', method: 'post', data})}
 export function saveSljhPgdXd(data) {return request({url: '/pgdSljh/saveSljhPgdXd', method: 'post', data})}
 export function saveSljhPgdXdBack(data) {return request({url: '/pgdSljh/saveSljhPgdXdBack', method: 'post', data})}
 export function saveSljhPgdFk(data) {return request({url: '/pgdSljh/saveSljhPgdFk', method: 'post', data})}
 export function saveSljhFk(data) {return request({url: '/pgdSljh/saveSljhFk', method: 'post', data})}
+export function saveSljhPg(data) {return request({url: '/pgdSljh/saveSljhPg', method: 'post', data})}
+export function saveSljhPgBack(data) {return request({url: '/pgdSljh/saveSljhPgBack', method: 'post', data})}
 
 
 
@@ -32,6 +35,8 @@ export function savePwPgdXd(data) {return request({url: '/pgdPwjh/savePwPgdXd',
 export function savePwPgdXdBack(data) {return request({url: '/pgdPwjh/savePwPgdXdBack', method: 'post', data})}
 export function savePwPgdFk(data) {return request({url: '/pgdPwjh/savePwPgdFk', method: 'post', data})}
 export function savePwFk(data) {return request({url: '/pgdPwjh/savePwFk', method: 'post', data})}
+export function savePwjhPg(data) {return request({url: '/pgdPwjh/savePwjhPg', method: 'post', data})}
+export function savePwjhPgBack(data) {return request({url: '/pgdPwjh/savePwjhPgBack', method: 'post', data})}
 
 
 export function getQgPgd(data) {return request({url: '/pgdQgjh/getQgPgd', method: 'post', data})}
@@ -40,7 +45,8 @@ export function saveQgPgdXdBack(data) {return request({url: '/pgdQgjh/saveQgPgdX
 export function saveQgPgdFk(data) {return request({url: '/pgdQgjh/saveQgPgdFk', method: 'post', data})}
 export function saveQgdFk(data) {return request({url: '/pgdQgjh/saveQgdFk', method: 'post', data})}
 
-
+export function saveQgjhPg(data) {return request({url: '/pgdQgjh/saveQgjhPg', method: 'post', data})}
+export function saveQgjhPgBack(data) {return request({url: '/pgdQgjh/saveQgjhPgBack', method: 'post', data})}
 
 
 export function getQmPgd(data) {return request({url: '/pgdQmjh/getQmPgd', method: 'post', data})}

src/views/jhzxgl/pwjhD.vue

@@ -7,7 +7,19 @@
         <el-row>
 
           <el-col :span="22">
-
+            <el-col :span="4" >
+              <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>
@@ -60,29 +72,49 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="14" >
+
-            <el-form-item label="状态:">
+          <el-col :span="20"  >
-              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+
+
+
+
+
+
+            <span style="width:6%" >班组:</span>
+            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
               <el-option
-                  v-for="item in statusOptions"
+                v-for="item in this.dictData.bmbm"
-                  :key="item.value"
+                :key="item.bm"
-                  :label="item.label"
+                :label="item.bmsm"
-                  :value="item.value"
+                :value="item.bm"
               >
               </el-option>
             </el-select>
-            </el-form-item>
+
-          </el-col>
+            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
-          <el-col :span="6"  style="text-align: right;">
+              <el-option
-            <el-form-item  >
+                v-for="item in this.dictData.gxry"
-              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+                :key="item.dlzh"
-              <el-button type="info" @click="plClick">批量</el-button>
+                :label="item.dlzh"
-            </el-form-item>
+                :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="saveclick">反馈</el-button>
+              <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>
@@ -105,7 +137,7 @@
               highlight-current-row
               :data="list"
               :scroll-y="{enabled: true}"
-              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
               highlight-hover-row
               show-overflow
               show-header-overflow
@@ -125,12 +157,13 @@
 
 <script>
 import {
-getPwPgd,
+  getPwPgd,
-  savePwPgdFk,
+  savePwFk,
+  getPgdBase,
   savePwPgdXd,
   savePwPgdXdBack,
-
+  savePwjhPg,
-  getPgdBase
+  savePwjhPgBack
 } from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -156,13 +189,25 @@ export default {
         },
         {
           value: "02",
-          label: "下达",
+          label: "派工",
         },
         {
-          value: "09",
+          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',
@@ -178,6 +223,7 @@ export default {
           },
         },
       ],
+
         tableColumn: [
       { type: 'checkbox', width: 40 },
       { type: 'seq', width: 40, title: '序号' },
@@ -268,36 +314,43 @@ export default {
         filterRender: { name: 'FilterCombination', },
       },
 
-        { field: 'pwjgry', title: '抛丸加工人员', width: 100,
+
+
+      { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
         filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
         filterRender: { name: 'FilterCombination', },
       },
-
+          { field: 'scdw', title: '生产单位', width: 100,editRender: { name: 'input' },
-        { field: 'pwksrq', title: '抛丸开始日期', width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination', },
           },
-
+          { field: 'scry', title: '生产人员', width: 100,editRender: { name: 'input' },
-        { field: 'pwjsrq', title: '抛丸结束日期', width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination', },
           },
-
+          // { field: 'fkry', title: '派工人员', width: 100,
-        { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
+          //   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: 'jsry', 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: 'jsrq', 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,
+          { field: 'fkrq', title: '反馈日期', width: 100,editRender: { name: 'input' },
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination', },
           },
 
-        { field: 'fkyy', title: '反馈原因', width: 100,editRender: { name: 'input' },
+          { field: 'fkry', title: '反馈人员', width: 100, editRender: { name: 'input' },
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination', },
           },
@@ -324,8 +377,6 @@ export default {
 
 
 
-
-
       ]
     }
   },
@@ -357,20 +408,64 @@ export default {
       }
 
     },
+    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].scry = 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'){
 
-    activeRowMethod({ row, rowIndex }){
+            selectRecords[i].slksrq = this.inParam.slks
-      if(row.zt==="01"){
+          }else if (type==='2'){
-        return  true
+            selectRecords[i].fkry = this.inParam.slry
-      }else{
+            selectRecords[i].fkrq = this.inParam.sljs
-        return  false
           }
+
+        }
+        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
@@ -387,24 +482,69 @@ export default {
 
     },
     saveclick(){
-      let obj=this.$refs.xGrid.getUpdateRecords()
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      // if(obj.length===0){
+      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+      //   return
+      // }
+      savePwFk(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){
-        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
         return
       }
-      savePwPgdFk(obj).then(res=>{
+      if(this.queryParam.zt==='02'){
+        this.$confirm('取消派工？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          savePwjhPgBack(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==='02'){
+      if(this.queryParam.zt==='03'){
-        this.$confirm('取消下达？', '提示', {
+        this.$confirm('取消接收？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -418,7 +558,7 @@ export default {
 
         })
       }else  {
-        this.$confirm('下达？', '提示', {
+        this.$confirm('接收？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'

src/views/jhzxgl/qgjhD.vue

@@ -6,7 +6,19 @@
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
-          <el-col :span="22">
+          <el-col :span="18">
+
+              <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-form-item label="船号:">
               <vxe-pulldown ref="xDown4" transfer >
@@ -53,7 +65,7 @@
 
 
           </el-col>
-          <el-col :span="2">
+          <el-col :span="6">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
               <el-button type="success" @click="syncXiaochi">同步小池</el-button>
@@ -61,29 +73,49 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="14" >
+
-            <el-form-item label="状态:">
+          <el-col :span="20"  >
-              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+
+
+
+
+
+
+            <span style="width:6%" >班组:</span>
+            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
               <el-option
-                  v-for="item in statusOptions"
+                v-for="item in this.dictData.bmbm"
-                  :key="item.value"
+                :key="item.bm"
-                  :label="item.label"
+                :label="item.bmsm"
-                  :value="item.value"
+                :value="item.bm"
               >
               </el-option>
             </el-select>
-            </el-form-item>
+
-          </el-col>
+            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
-          <el-col :span="6"  style="text-align: right;">
+              <el-option
-            <el-form-item  >
+                v-for="item in this.dictData.gxry"
-              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+                :key="item.dlzh"
-              <el-button type="info" @click="plClick">批量</el-button>
+                :label="item.dlzh"
-            </el-form-item>
+                :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="saveclick">反馈</el-button>
+              <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>
@@ -106,7 +138,7 @@
               highlight-current-row
               :data="list"
               :scroll-y="{enabled: true}"
-              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
               highlight-hover-row
               show-overflow
               show-header-overflow
@@ -127,11 +159,13 @@
 <script>
 import {
   getQgPgd,
+  saveQgdFk,
   saveQgPgdFk,
   saveQgPgdXd,
   saveQgPgdXdBack,
-
+  saveQgjhPg,
-  getPgdBase, syncXiaochi
+  saveQgjhPgBack,
+  getPgdBase, syncXiaochi, savePwjhPg
 } from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -140,7 +174,7 @@ import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 export default {
-  name:'QgjhD',
+  name:'PwjhD',
   data() {
     return {
       queryParam: {
@@ -157,13 +191,25 @@ export default {
         },
         {
           value: "02",
-          label: "下达",
+          label: "派工",
         },
         {
-          value: "09",
+          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',
@@ -179,6 +225,7 @@ export default {
           },
         },
       ],
+
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
@@ -319,24 +366,57 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zt', title: '状态', width: 100,
+        { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'fkry', title: '反馈人', width: 100,
+        { field: 'scdw', title: '生产单位', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
+        { field: 'scry', title: '生产人员', width: 100,editRender: { name: 'input' },
-        { field: 'fkrq', 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: 'jsry', title: '接收人员', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'jsrq', 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,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fkyy', title: '反馈原因', width: 100,editRender: { name: 'input' },
+        { field: 'fkry', 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,
+        //   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: '' } }],
@@ -360,9 +440,6 @@ export default {
 
 
 
-
-
-
       ]
     }
   },
@@ -401,20 +478,64 @@ export default {
       }
 
     },
+    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].scry = 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
+          }
 
-    activeRowMethod({ row, rowIndex }){
-      if(row.zt==="01"){
-        return  true
-      }else{
-        return  false
         }
+        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
@@ -431,24 +552,69 @@ export default {
 
     },
     saveclick(){
-      let obj=this.$refs.xGrid.getUpdateRecords()
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      // if(obj.length===0){
+      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+      //   return
+      // }
+      saveQgdFk(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){
-        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
         return
       }
-      saveQgPgdFk(obj).then(res=>{
+      if(this.queryParam.zt==='02'){
+        this.$confirm('取消派工？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveQgjhPgBack(obj).then(res=>{
             if(res.success){
+              this.$message({ message: '取消派工成功', type: 'success' })
               this.initList()
             }
           })
+
+        })
+      }else  {
+        this.$confirm('派工？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveQgjhPg(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==='02'){
+      if(this.queryParam.zt==='03'){
-        this.$confirm('取消下达？', '提示', {
+        this.$confirm('取消接收？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -462,14 +628,14 @@ export default {
 
         })
       }else  {
-        this.$confirm('下达？', '提示', {
+        this.$confirm('接收？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
           saveQgPgdXd(obj).then(res=>{
             if(res.success){
-              this.$message({ message: '下达成功', type: 'success' })
+              this.$message({ message: '接收成功', type: 'success' })
               this.initList()
             }
           })

src/views/jhzxgl/sljhD.vue

@@ -7,7 +7,19 @@
         <el-row>
 
           <el-col :span="22">
-
+            <el-col :span="4" >
+              <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>
@@ -60,29 +72,58 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="14" >
+
-            <el-form-item label="状态:">
+          <el-col :span="20"  >
-              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+
+
+
+
+            <span style="width:6%" >垛位:</span>
+              <el-select v-model="inParam.dw" placeholder="垛位" clearable style="width: 15%">
                 <el-option
-                  v-for="item in statusOptions"
+                  v-for="item in this.dictData.dwxx"
-                  :key="item.value"
+                  :key="item.dwh"
-                  :label="item.label"
+                  :label="item.dwh"
-                  :value="item.value"
+                  :value="item.dwh"
                 >
                 </el-option>
               </el-select>
-            </el-form-item>
+
-          </el-col>
+            <span style="width:6%" >班组:</span>
-          <el-col :span="6"  style="text-align: right;">
+            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
-            <el-form-item  >
+              <el-option
-              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+                v-for="item in this.dictData.bmbm"
-              <el-button type="info" @click="plClick">批量</el-button>
+                :key="item.bm"
-            </el-form-item>
+                :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="saveclick">反馈</el-button>
+              <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>
@@ -105,7 +146,7 @@
               highlight-current-row
               :data="list"
               :scroll-y="{enabled: true}"
-              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
               highlight-hover-row
               show-overflow
               show-header-overflow
@@ -125,12 +166,12 @@
 
 <script>
 import {
-getSljhPgd,
+  getSljhPgd,
   saveSljhPgdFk,
   saveSljhPgdXd,
   saveSljhPgdXdBack,
-
+  saveSljhFk,
-  getPgdBase
+  getPgdBase, saveSljhPg,saveSljhPgBack
 } from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -156,13 +197,25 @@ export default {
         },
         {
           value: "02",
-          label: "下达",
+          label: "派工",
         },
         {
-          value: "09",
+          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',
@@ -288,39 +341,59 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'slry', title: '上料人员', width: 100,
+
+
+        // { field: 'slksrq', title: '上料开始', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        { field: 'dw', title: '垛位', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'slksrq', title: '上料开始', width: 100,
+        { field: 'scdw', title: '生产单位', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
+        { field: 'scry', title: '生产人员', width: 100,editRender: { name: 'input' },
-        { field: 'sjjsrq', title: '上料结束', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
+        // { field: 'fkry', title: '派工人员', width: 100,
-        { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
+        //   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: 'jsry', 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: 'jsrq', 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,
+        { field: 'fkrq', title: '反馈日期', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fkyy', title: '反馈原因', width: 100, editRender: { name: 'input' },
+        { field: 'fkry', title: '反馈人员', width: 100, editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+
+        { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
+          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', },
@@ -375,16 +448,59 @@ export default {
       }
 
     },
+    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].scry = 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'){
 
-    activeRowMethod({ row, rowIndex }){
+            selectRecords[i].slksrq = this.inParam.slks
-      if(row.zt==="01"){
+          }else if (type==='2'){
-        return  true
+            selectRecords[i].fkry = this.inParam.slry
-      }else{
+            selectRecords[i].fkrq = this.inParam.sljs
-        return  false
           }
+
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+
+    activeRowMethod({ row, rowIndex }){
+      // if(row.zt==="01"){
+      //   return  true
+      // }else{
+      //   return  false
+      // }
+
+      return true;
     },
 
     initBase(){
@@ -405,24 +521,69 @@ export default {
 
     },
     saveclick(){
-      let obj=this.$refs.xGrid.getUpdateRecords()
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      // if(obj.length===0){
+      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+      //   return
+      // }
+      saveSljhFk(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){
-        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
         return
       }
-      saveSljhPgdFk(obj).then(res=>{
+      if(this.queryParam.zt==='02'){
+        this.$confirm('取消派工？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveSljhPgBack(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '取消派工成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }else  {
+        this.$confirm('派工？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveSljhPg(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==='02'){
+      if(this.queryParam.zt==='03'){
-        this.$confirm('取消下达？', '提示', {
+        this.$confirm('取消接收？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -436,7 +597,7 @@ export default {
 
         })
       }else  {
-        this.$confirm('下达？', '提示', {
+        this.$confirm('接收？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'