Merge remote-tracking branch 'origin/master'

src/api/jhzx/sygd.js

@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+export function list(data) {return request({url: '/dmSygdMx/list', method: 'get', params:data})}
 export function getList(data) {return request({url: '/dmSygdMx/getList', method: 'post', data})}
 export function getSygdList(data) {return request({url: '/dmSygd/getList', method: 'post', data})}
 export function tj(data) {return request({url: '/dmSygd/tj', method: 'post', params:data})}

src/api/jhzxgl/pgd.js

@@ -1,5 +1,6 @@
 import request from "@/utils/request";
 
+
 //小池同步
 export function syncXiaochi(data) {return request({url: '/xiaochi/syncXiaochi', method: 'get'})}
 
@@ -63,7 +64,8 @@ export function saveQgdFk(data) {return request({url: '/pgdQgjh/saveQgdFk', meth
 
 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 qrlph(data) {return request({url: '/pgdQgjh/comLph', method: 'post', data})}
 
 export function saveQmPgdJs(data) {return request({url: '/pgdQmjh/saveQmPgdJs', method: 'post', data})}
 export function getQmPgd(data) {return request({url: '/pgdQmjh/getQmPgd', method: 'post', data})}

src/views/jhzx/sygdSH.vue

@@ -96,7 +96,7 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getList, getSygdList, sh, tj} from '@/api/jhzx/sygd'
+import {getList, getSygdList, list, sh, tj} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -136,7 +136,6 @@ export default {
       dictData:[],
       height: '500px',
       tableColumn:[
-        { type: 'checkbox', width: 50 ,},
         { type: 'seq', width: 60, title: '序号',fixed: "left"},
         { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -147,7 +146,7 @@ export default {
         { field: 'dcFd', title: '分段号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'bs', title: '板数', width: 120,
+        { field: 'bs1', title: '板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -171,10 +170,26 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        // { field: '', title: '大板切割开始', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
         { field: 'ykpkjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        // { field: 'eksk2', title: '二垮龙门板数', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '龙门切割开始', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '龙门切割结束', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
         { field: 'eksk', title: '二垮数控板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -211,7 +226,7 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'qptZjs', title: '曲平铁转结束', width: 120,
+        { field: 'qpt_zjs', title: '曲平铁转结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -227,6 +242,18 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        // { field: '', title: '腹板板数', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '腹板切割开始', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '腹板切割结束', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
         { field: 'skbs', title: '数控   板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -262,14 +289,7 @@ export default {
         { field: 'bz', title: '备注', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
-        },
-        // { field: 'zt', title: '状态', width: 120,formatter:this.formatterZt,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: 'id', title: '流水号（禁止修改）',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }}
+        }
 
       ],
       checkedList: [],
@@ -430,7 +450,11 @@ export default {
         this.$message.warning('选择时间范围')
         return
       }
-      getSygdList(this.queryParam).then((res) => {
+      const data={
+        begin:this.queryParam.beginTime,
+        end:this.queryParam.endTime
+      }
+      list(data).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)

src/views/jhzx/sygdWH.vue

@@ -96,7 +96,7 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getList, getSygdList, tj} from '@/api/jhzx/sygd'
+import {getList, getSygdList, list, tj} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -136,7 +136,6 @@ export default {
       dictData:[],
       height: '500px',
       tableColumn:[
-        { type: 'checkbox', width: 50 ,},
         { type: 'seq', width: 60, title: '序号',fixed: "left"},
         { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -147,7 +146,7 @@ export default {
         { field: 'dcFd', title: '分段号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'bs', title: '板数', width: 120,
+        { field: 'bs1', title: '板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -171,10 +170,26 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        // { field: '', title: '大板切割开始', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
         { field: 'ykpkjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        // { field: 'eksk2', title: '二垮龙门板数', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '龙门切割开始', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '龙门切割结束', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
         { field: 'eksk', title: '二垮数控板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -211,7 +226,7 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'qptZjs', title: '曲平铁转结束', width: 120,
+        { field: 'qpt_zjs', title: '曲平铁转结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -227,6 +242,18 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        // { field: '', title: '腹板板数', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '腹板切割开始', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '腹板切割结束', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
         { field: 'skbs', title: '数控   板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -262,14 +289,7 @@ export default {
         { field: 'bz', title: '备注', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
-        },
-        // { field: 'zt', title: '状态', width: 120,formatter:this.formatterZt,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: 'id', title: '流水号（禁止修改）',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }}
+        }
 
       ],
       checkedList: [],
@@ -430,7 +450,11 @@ export default {
         this.$message.warning('选择时间范围')
         return
       }
-      getSygdList(this.queryParam).then((res) => {
+      const data={
+        begin:this.queryParam.beginTime,
+        end:this.queryParam.endTime
+      }
+      list(data).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)

src/views/jhzx/symxCX.vue

@@ -356,6 +356,7 @@
 import router from "@/router";
 import {getCzxx} from '@/api/jhzx/qfxq'
 import {
+  list,
   getList,
   sygdPC,
   saveByDcch,
@@ -1225,7 +1226,7 @@ export default {
         { field: 'dcFd', title: '分段号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'bs', title: '板数', width: 120,
+        { field: 'bs1', title: '板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -1249,26 +1250,26 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '大板切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+        // { field: '', title: '大板切割开始', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
         { field: 'ykpkjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'eksk2', title: '二垮龙门板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '龙门切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '龙门切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+        // { field: 'eksk2', title: '二垮龙门板数', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '龙门切割开始', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '龙门切割结束', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
         { field: 'eksk', title: '二垮数控板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -1321,18 +1322,18 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '腹板板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '腹板切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '腹板切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+        // { field: '', title: '腹板板数', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '腹板切割开始', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: '', title: '腹板切割结束', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
         { field: 'skbs', title: '数控   板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -3078,10 +3079,14 @@ export default {
         this.$message.warning('选择时间范围')
         return
       }
-      getList(this.queryParam).then((res) => {
-        this.list = res.data.list
+      const data={
+        begin:this.queryParam.beginTime,
+        end:this.queryParam.endTime
+      }
+      list(data).then((res) => {
+        this.list = res.data
       })
-      // this.activeName = 'first'
+      this.activeName = 'first'
     },
 
     formatDate({cellValue}) {

src/views/jhzxgl/qgjhD.vue

@@ -124,6 +124,7 @@
           </el-col>
           <el-col :span="4" >
             <el-form-item style="float: right" >
+              <el-button type="success" @click="comLph">确认炉批号</el-button>
               <el-button type="success" @click="slpgclick">派工</el-button>
               <el-button type="success" @click="saveclick">报工</el-button>
 
@@ -154,6 +155,7 @@
               show-overflow
               show-header-overflow
               :header-cell-style="headerCellStyle"
+              :row-style="tableRowClassName"
             >
 
 
@@ -175,7 +177,7 @@ import {
   savePwPgdXd,
   savePwPgdXdBack,
   savePwjhPg,
-  savePwjhPgBack
+  savePwjhPgBack, qrlph
 } from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -346,7 +348,20 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
-
+        {
+          field: 'lphqrry',
+          title: '炉批号确认人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'lphqrrq',
+          title: '炉批号确认日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
 
       ]
     }
@@ -364,6 +379,23 @@ export default {
 
   },
   methods: {
+    tableRowClassName({ row, rowIndex }){
+      if (row.lphqrrq){
+        return {backgroundColor:'rgb(236, 104, 104)'}
+      }
+    },
+    comLph(){
+      const data=this.$refs.xGrid.getCheckboxRecords()
+      if(data.length===0){
+        this.$message.warning('请选择已确认的数据')
+        return
+      }
+      qrlph(data.filter(item=>!item.lphqrrq)).then(()=>{
+        this.$message.success('成功')
+        this.initList();
+      })
+
+    },
     headerCellStyle ({ column, columnIndex }) {
       if (['qgry','qgpgrq','qgpgry','qgfkry','qgfkrq'].includes(column.property)) {
         return {