1.更新一些内容

src/permission.js

@@ -8,7 +8,7 @@ import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/menu','/login', '/auth-redirect','/kban','/sliao','/pwpg','/pwfk','/llpg','/llfk','/hxpg','/hxfk','/qgpg','/qgfk','/ljian'] // no redirect whitelist
+const whiteList = ['/menu','/login', '/auth-redirect','/kban','/sliao','/pwpg','/pwfk','/llpg','/llfk','/hxpg','/hxfk','/qgpg','/qgfk','/ljian','baogong'] // no redirect whitelist
 export function flatRoutes(routes) {
   let ret = [];
   routes.forEach(it => {

src/router/index.js

@@ -119,6 +119,11 @@ export const constantRoutes = [
     component: () => import('@/views/zyjhzx/ljian/index'),
     hidden: true
   },
+  {
+    path: '/baogong',
+    component: () => import('@/views/zyjhzx/ljian/baogong'),
+    hidden: true
+  },
   {
     path: '/login',
     component: () => import('@/views/login/index'),

src/views/jhzx/qfqrGL.vue

@@ -300,10 +300,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 100,
+        // { field: 'ljmc', title: '零件名称', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
 
         { field: 'ljgg', title: '零件规格', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -871,10 +871,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getDmppxxbList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/components/GxsqAdd.vue

@@ -464,10 +464,10 @@
         })
       },
       initList() {
-        if (this.queryParam.dcch === '') {
+        // if (this.queryParam.dcch === '') {
-          this.$message.warning('选择船只编号')
+        //   this.$message.warning('选择船只编号')
-          return
+        //   return
-        }
+        // }
         selectQmByQgAndJh(this.queryParam).then((res) => {
           this.list = res.data
           if (this.$refs.xGrid) {

src/views/jhzxgl/components/GxsqAdddm.vue

@@ -464,10 +464,10 @@
         })
       },
       initList() {
-        if (this.queryParam.dcch === '') {
+        // if (this.queryParam.dcch === '') {
-          this.$message.warning('选择船只编号')
+        //   this.$message.warning('选择船只编号')
-          return
+        //   return
-        }
+        // }
         selectQmByQgAndJh(this.queryParam).then((res) => {
           this.list = res.data
           if (this.$refs.xGrid) {

src/views/jhzxgl/components/GxsqAddpk.vue

@@ -464,10 +464,10 @@
         })
       },
       initList() {
-        if (this.queryParam.dcch === '') {
+        // if (this.queryParam.dcch === '') {
-          this.$message.warning('选择船只编号')
+        //   this.$message.warning('选择船只编号')
-          return
+        //   return
-        }
+        // }
         selectQmByQgAndJh(this.queryParam).then((res) => {
           this.list = res.data
           if (this.$refs.xGrid) {

src/views/jhzxgl/components/YlxxAdd.vue

@@ -464,10 +464,10 @@
         })
       },
       initList() {
-        if (this.queryParam.dcch === '') {
+        // if (this.queryParam.dcch === '') {
-          this.$message.warning('选择船只编号')
+        //   this.$message.warning('选择船只编号')
-          return
+        //   return
-        }
+        // }
         selectQmByQgAndJh(this.queryParam).then((res) => {
           this.list = res.data
           if (this.$refs.xGrid) {

src/views/jhzxgl/dhqdFK.vue

@@ -403,10 +403,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getDhPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/dmjhD.vue

@@ -300,10 +300,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 120,
+        // { field: 'ljmc', title: '零件名称', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
 
         { field: 'ljgg', title: '零件规格', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -813,10 +813,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getQmPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/dmjhFK.vue

@@ -242,10 +242,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 120,
+        // { field: 'ljmc', title: '零件名称', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
 
         { field: 'ljgg', title: '零件规格', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -452,10 +452,10 @@ export default {
     },
 
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getDmPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/hxjhD.vue

@@ -200,10 +200,14 @@ export default {
         field:'',
         user:'',
         jhrqField:'',
-        zt:'42',
+        zt:'11',
         qgkw:''
       },
       statusOptions: [
+        {
+          value: "11",
+          label: "已打印",
+        },
         {
           value: "42",
           label: "未派工",

src/views/jhzxgl/pkjhD.vue

@@ -301,10 +301,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 120,
+        // { field: 'ljmc', title: '零件名称', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
 
         { field: 'ljgg', title: '零件规格', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -804,10 +804,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getQmPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/pkjhFK.vue

@@ -249,10 +249,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 120,
+        // { field: 'ljmc', title: '零件名称', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
 
         { field: 'ljgg', title: '零件规格', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -508,10 +508,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getPkPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/pwjhD.vue

@@ -202,12 +202,16 @@ export default {
         field:'',
         user:'',
         jhrqField:'',
-        zt:'21',
+        zt:'11',
         qgkw:''
       },
       zyqs:[],
       zyrys:[],
       statusOptions: [
+        {
+          value: "11",
+          label: "已打印",
+        },
         {
           value: "21",
           label: "未派工",

src/views/jhzxgl/pwjhFK.vue

@@ -458,10 +458,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getPwPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/qgjhD.vue

@@ -192,12 +192,16 @@ export default {
         field:'',
         user:'',
         jhrqField:'',
-        zt:'42',
+        zt:'11',
         ztHx:'52'
       },
       zyqs:[],
       zyrys:[],
       statusOptions: [
+        {
+          value: "11",
+          label: "已打印",
+        },
         {
           value: "42",
           label: "未派工",

src/views/jhzxgl/qgjhFK.vue

@@ -498,10 +498,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getQgPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/qmjhD.vue

@@ -299,10 +299,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 120,
+        // { field: 'ljmc', title: '零件名称', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
 
         { field: 'ljgg', title: '零件规格', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -800,10 +800,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getQmPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/qmjhFK.vue

@@ -240,10 +240,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 120,
+        // { field: 'ljmc', title: '零件名称', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
 
         { field: 'ljgg', title: '零件规格', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -482,10 +482,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getQmPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/sljhD.vue

@@ -542,7 +542,14 @@ export default {
       tableColumn1: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' }, // 1
-        // { title: '操作', width: 50, slots: { default: 'operation' }, fixed: 'right' },
+        {
+          title: '合同号',
+          width: "120px",
+          field: 'dcFd',
+
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+        },
         {
           title: '小合同号',
           width: "120px",
@@ -738,14 +745,6 @@ export default {
           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",

src/views/jhzxgl/sljhFK.vue

@@ -469,10 +469,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getSljhPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/tzjhFK.vue

@@ -389,10 +389,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getTzjhPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/ylxx.vue

@@ -655,10 +655,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getYlList(this.queryParam).then((res) => {
         console.log(res.data)
         this.list = res.data

src/views/jhzxgl/yppCX.vue

@@ -326,10 +326,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 100,
+        // { field: 'ljmc', title: '零件名称', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
 
         { field: 'ljgg', title: '零件规格', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -880,10 +880,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getDmppxxbList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/yppFK.vue

@@ -300,10 +300,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 100,
+        // { field: 'ljmc', title: '零件名称', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
 
         { field: 'ljgg', title: '零件规格', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -862,10 +862,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getDmppxxbList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/jhzxgl/yppGL.vue

@@ -318,10 +318,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 100,
+        // { field: 'ljmc', title: '零件名称', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
 
         { field: 'ljgg', title: '零件规格', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -872,10 +872,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getDmppxxbList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/sjfx/sygdFX.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="kb-container" class="dashboard-editor-container" style="background-color: #f6fbff;">
-    <iframe src="http://127.0.0.1:9527/#/kban" style="width: 100%;height:100vh"></iframe>
+    <iframe :src="url||'http://192.127.0.22/#/kban'" style="width: 100%;height:100vh"></iframe>
   </div>
 </template>
 
@@ -11,7 +11,9 @@ export default {
   name: "SygdFX",
   components: {DataView},
   data() {
-    return {}
+    return {
+      url:process.env.VUE_APP_KBAN
+    }
   },
   created() {
   },

src/views/sjzx/bclqCX.vue

@@ -436,10 +436,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getBcLQlList(this.queryParam).then((res) => {
        //this.list = res.data
         if (this.$refs.xGrid) {

src/views/sjzx/bclqCX1.vue

@@ -681,10 +681,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getBcLQlList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/sjzx/bctltCX.vue

@@ -388,10 +388,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-          this.$message.warning('选择船只编号')
+      //     this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getTLTList(this.queryParam).then((res) => {
 
         this.list = res.data

src/views/sjzx/bcybCX.vue

@@ -380,10 +380,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getBcTJlList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/sjzx/bomcx.vue

@@ -752,10 +752,10 @@ export default {
 
     },
     bomClick(){
-      if (this.queryParam.cbbm === '') {
+      // if (this.queryParam.cbbm === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
 
       addListBom(this.queryParam).then(res=>{
         this.tableData=res.data;
@@ -776,10 +776,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
 
       getListBomRealy(this.queryParam).then((res) => {
         this.list = res.data

src/views/sjzx/bomwh.vue

@@ -1248,10 +1248,10 @@ export default {
 
     },
     bomClick(){
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
 
       addListBom(this.queryParam).then(res=>{
         this.tableData=res.data;
@@ -1289,10 +1289,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
 
       getListBom(this.queryParam).then((res) => {
         this.list = res.data

src/views/sjzx/bomxg.vue

@@ -516,10 +516,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getListBomRealy(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/sjzx/components/SelectBom.vue

@@ -706,10 +706,10 @@ export default {
 
     },
     bomClick(){
-      if (this.queryParam.cbbm === '') {
+      // if (this.queryParam.cbbm === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
 
       addListBom(this.queryParam).then(res=>{
         this.tableData=res.data;
@@ -733,10 +733,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
 
       getListBomRealy1(this.queryParam).then((res) => {
         this.list = res.data

src/views/sjzx/czbhcx.vue

@@ -177,15 +177,15 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'ckxszt', title: '库存系统显示标识', width: 120, editRender: {  },
+        // { field: 'ckxszt', title: '库存系统显示标识', width: 120, editRender: {  },
-          slots:{
+        //   slots:{
-            //
+        //     //
-            edit:'ckxsztEdit',
+        //     edit:'ckxsztEdit',
-            default: 'ckxsztEdit'
+        //     default: 'ckxsztEdit'
-          },
+        //   },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
         { field: 'cjs', title: '船级社', width: 120, editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -251,15 +251,15 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'cwfzbs', title: '财务封账标识', width: 120, editRender: { },
+        // { field: 'cwfzbs', title: '财务封账标识', width: 120, editRender: { },
-          slots:{
+        //   slots:{
-            //
+        //     //
-            edit:'cwfzbsEdit',
+        //     edit:'cwfzbsEdit',
-            default: 'cwfzbsEdit'
+        //     default: 'cwfzbsEdit'
-          },
+        //   },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+        //   filterRender: { name: 'FilterCombination', },
-        },
+        // },
         { field: 'bz', title: '备注', width: 120, editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },

src/views/sjzx/ljptCX.vue

@@ -379,10 +379,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getLJQDList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/sjzx/xclqCX.vue

@@ -462,10 +462,10 @@ export default {
       ]
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getBcLQlList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/sjzx/xctltCX.vue

@@ -388,10 +388,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getTLTList(this.queryParam).then((res) => {
 
         this.list = res.data

src/views/sjzx/xcylCX.vue

@@ -353,10 +353,10 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       getBcTJlList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {

src/views/tp/czfdzgtcx.vue

@@ -161,447 +161,514 @@ export default {
 
       //    tableData: [],
       tableColumnMx: [
-        { type: 'seq', width: 60, title: '序号' },
+        { type: 'checkbox', width: 40 },
-        { field: 'jhqh', title: '计划期号', width: 100 ,
+        { type: 'seq', width: 40, title: '序号' },
+
 
+        { field: 'ppzt', title: '状态', width: 90, formatter: ['dictFormat', 'PPZT'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'czbh', title: '船只编号', width: 90 ,
+        { field: 'czbh', title: '船号', width: 90,
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zyjd', title: '作业阶段', width: 90 ,formatter: ['dictXtFormat','ZYJD'],
 
+        { field: 'pl', title: '批量', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'fdh', title: '分段号', width: 80 ,
 
+        { field: 'fd', title: '分段', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tpbh', title: '托盘表号', width: 110 ,
 
+        { field: 'kw', title: '跨位', width: 90,formatter: ['dictFormat', 'QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'hh', title: '行号', width: 80 ,
 
+        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'azth', title: '安装图号', width: 100 ,
 
+        { field: 'tlth', title: '套料图号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zztph', title: '批号/卡号', width: 80 ,
 
+
+
+        { field: 'ljbh', title: '零件编号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zzth', title: '制作图号', width: 110 ,
 
+        // { field: 'ljmc', title: '零件名称', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+
+        { field: 'ljgg', title: '零件规格', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zztmc', title: '制作图名称', width: 150 ,
 
+        { field: 'ljcz', title: '零件材质', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'bjdh', title: '部件号', width: 80 ,
 
+        { field: 'wpfl', title: '物品分类', width: 60,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'bjmc', title: '部件名称', width: 100 ,
 
+        { field: 'jldw', title: '计量单位', width: 60,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'wpgg', title: '规格+型号+材质', width: 210 ,
 
+        { field: 'sl', title: '数量', width: 70,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jhxqrq', title: '集团三月滚动计划期', width: 150 ,
+        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'fdxqrq', title: '分段计划需求期', width: 150 ,
 
+
+
+        { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zyzzssbm', title: '需求部门', width: 100 ,formatter: ['ddeptFormat'],
 
+        { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zyzzcjmc', title: '作业车间及场地', width: 140 ,
+        { field: 'rkry', title: '报工人员', width: 90,editRender: { name: 'input' },
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'xqsl', title: '需求数量', width: 70 ,
 
+        { field: 'rkrq', title: '报工日期', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'bjzl', title: '单重', width: 80 ,
 
+        { field: 'dzjz', title: '大组极重', minWidth: "70",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'bjzzl', title: '总重', width: 80 ,
+        { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'xzjhrkrq', title: '舾装公司计划集配入库', width: 160 ,
+        { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zdcp', title: '重点产品', width: 100 ,
+        { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tplx', title: '部件分类', width: 100 ,formatter: ['dictFormat','TPLX'],
+        { field: 'xdb', title: 'X大板', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'ygpprq', title: '预计配送期', width: 100 ,
+        { field: 'xskj', title: 'X数控件', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'fkpprq', title: '反馈配送期', width: 150 ,
+        { field: 'xpt', title: 'X平铁', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'xqtsc', title: '需求/反馈差距', width: 160 ,
+        { field: 'xyw', title: 'X压弯', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'fkwtsm', title: '反馈说明', width: 100 ,
+        { field: 'xxc', title: 'X型材', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sscj', title: '所属车间', width: 100 ,formatter: ['dictFormat','BMBM'],
+        { field: 'xtxc', title: 'X二次装T型材', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jhlx', title: '计划类型', width: 100 ,
+        { field: 'ddb', title: 'D大板', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jhjtrq', title: '设计院计划发图日期', width: 150 ,
+        { field: 'dqb', title: 'D曲板', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jtxqts', title: '需求发图天数差', width: 150 ,
+        { field: 'dxc', title: 'D型材T', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sjltsj', title: '实际接图日期', width: 120 ,
+        { field: 'dsj', title: 'D散件', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'ltxqts', title: '需求来图天数差', width: 130 ,
 
+        { field: 'dgdh', title: '打磨工单号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jhxqrq_sq', title: '上期滚动计划需求日期', width: 160 ,
+        { field: 'dmsbbh', title: '打磨设备编号', width: 100,
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jhbgts', title: '变更天数', width: 120 ,
 
+        { field: 'dmcd', title: '打磨打磨长度', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jhxqrq_ls', title: '滚动计划需求期变更历史', width: 165 ,
+        { field: 'dmjhrq', title: '打磨计划日期', width: 100,
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dmXfry', title: '打磨派工人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'por_no', title: '采购需求编号', width: 120 ,
 
+        { field: 'dmXfrq', title: '打磨派工日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'lc', title: '来处', width: 120 ,
 
+        { field: 'dscry', title: '打磨生产人员', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zzt_zt', title: '技术处理状态', width: 120 ,
 
+
+        { field: 'dmFkry', title: '打磨反馈人', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zzt_gyspsj', title: '工艺审批时间', width: 120 ,
 
+        { field: 'dmFkrq', title: '打磨反馈日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zzt_cplx', title: '产品类型', width: 120 ,formatter: ['dictFormat','CPLX'],
+        { field: 'pgdh', title: '坡口工单号', width: 100,
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zzt_clfs', title: '表面处理方式', width: 120 ,formatter: ['dictFormat','CLFS'],
 
+        { field: 'pkjhrq', title: '坡口计划日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zzt_bmcl', title: '表面处理', width: 120 ,formatter: ['dictFormat','CLFS'],
 
+        { field: 'pgdh', title: '坡口工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zzt_ntzdm', title: '内表面涂装代码', width: 130 ,
 
+        { field: 'pksbbh', title: '坡口设备编号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zzt_wtzdm', title: '外表面涂装代码', width: 130 ,
 
+        { field: 'pklx', title: '坡口类型', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'xglx', title: '修改类型', width: 120 ,formatter: ['dictFormat','TPXG'],
 
+        { field: 'pkcd', title: '坡口长度', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'xgph', title: '修改批号/卡号', width: 120 ,
+        { field: 'pkXfry', title: '坡口派工人员', width: 120,
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'xgsj', title: '修改时间', width: 120 ,
 
+        { field: 'pkXfrq', title: '坡口派工日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'xgtzdh', title: '修改通知单号', width: 140 ,
+        { field: 'pscry', title: '坡口生产人员', width: 100,
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sc_zt', title: '制作状态', width: 120 ,
 
+        { field: 'pkFkrq', title: '坡口反馈日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sgdw', title: '结构施工单位', width: 120 ,formatter: ['deptFormat'],
+        { field: 'pkFkry', title: '坡口反馈人', width: 120,
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jgwgrq', title: '结构实际完工日期', width: 140 ,
 
+        { field: 'qgdh', title: '  曲工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tzdw', title: '表面处理单位', width: 120 ,formatter: ['deptFormat'],
 
+        { field: 'qjgjhrq', title: '曲加工计划期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tzjsrq', title: '表面处理接收日期', width: 140 ,
 
+
+        { field: 'qsbbh', title: '曲设备编号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tzwgrq', title: '表面处理时间完工日期', width: 140 ,
 
+
+        { field: 'qscry', title: '曲生产人员', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'scqkbz', title: '生产情况备注', width: 120 ,
 
+
+        { field: 'qjgXfry', title: '曲派工人员', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'psdw', title: '配送单位', width: 120 ,formatter: ['deptFormat'],
 
+        { field: 'qjgXfrq', title: '曲派工日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jprkrq', title: '集配入库完工时间', width: 140 ,
 
+        { field: 'qjgFkry', title: '曲反馈人', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'ps_zt', title: '配送状态', width: 120 ,
 
+        { field: 'qjgFkrq', title: '曲反馈日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'qfsqrq', title: '前方配送申请日期', width: 140 ,
 
+        //-------------------------------------------
+
+        // --------------------------------------------------------------
+
+
+        {
+          field: 'slfkry',
+          title: '上料反馈人',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination' }
         },
-        { field: 'qfxqrq', title: '前方实际需求期', width: 140 ,
+        {
-
+          field: 'slfkrq',
+          title: '上料反馈日期',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination' }
         },
-        { field: 'qfpssl', title: '前方配送数量', width: 120 ,
+        {
-
+          field: 'pwfkry',
+          title: '抛丸反馈人',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination' }
         },
-        { field: 'qfpswc', title: '配送完成情况', width: 120 ,
+        {
-
+          field: 'pwfkrq',
+          title: '抛丸反馈日期',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination' }
         },
-        { field: 'qfpsrq', title: '实际配送日期', width: 120 ,
+        {
-
+          field: 'llfkry',
+          title: '理料反馈人',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination' }
         },
-        { field: 'qfqrrq', title: '配送确认日期', width: 120 ,
+        {
-
+          field: 'llfkrq',
+          title: '理料反馈日期',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination' }
         },
-        { field: 'psqkbz', title: '配送情况备注', width: 120 ,
 
+        {
+          field: 'hxfkrq',
+          title: '划线反馈日期',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination' }
         },
-        { field: 'jhdrry', title: '计划导入人员', width: 120 ,
+        {
-
+          field: 'hxfkry',
+          title: '划线反馈人员',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination' }
         },
-        { field: 'jhdrrq', title: '计划导入日期', width: 120 ,
 
+        {
+          field: 'qgfkry',
+          title: '切割反馈人',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination' }
         },
+        {
+          field: 'qgfkrq',
+          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: 'pwjhrq',
+          title: '抛丸计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'lljhrq',
+          title: '理料计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjhrq',
+          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' }
+        },
+
+
+
       ],
       tableColumnMain:[
+        { type: 'checkbox', width: 50 },
         { type: 'seq', width: 60, title: '序号' },
-
+        { field: 'dcCh', title: '船只', minWidth: "70",
-        { field: 'czbh', title: '船只编号', width: 90 ,
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'fdh', title: '分段号', width: 80 ,
+        { field: 'dcPl', title: '批量', minWidth: "70",
-          slots: { default: 'fdh' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tpbh', title: '托盘表号', width: 110 ,
+        { field: 'zdh', title: '总段号', minWidth: 100,
-          slots: { default: 'tpbh' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zyzzssbm', title: '需求部门', width: 100 ,formatter: ['ddeptFormat'],
+        { field: 'dcFd', title: '分段号', minWidth: "70",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zyzzcjmc', title: '作业车间及场地', width: 140 ,
+        { field: 'dzjz', title: '大组极重', minWidth: "70",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tplx', title: '物质类别', width: 110 ,formatter: ['dictFormat','TPLX'],
+        { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'xqsl', title: '需求数量', width: 90 ,
+        { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'pssl', title: '配送数量', width: 90 ,formatter:['numberFormat','zero'],
+        { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'psbfb', title: '实际配送率', width: 100 ,formatter:['numberFormat','percent',2],
+        { field: 'xdb', title: 'X大板', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'pssl0', title: '按期配送率', width: 100 ,formatter:['numberFormat','percent',2],
+        { field: 'xskj', title: 'X数控件', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'pssl5', title: '预计5日配送率', width: 100 ,formatter:['numberFormat','percent',2],
+        { field: 'xpt', title: 'X平铁', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'pssl10', title: '预计10日配送率', width: 100 ,formatter:['numberFormat','percent',2],
+        { field: 'xyw', title: 'X压弯', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'pssl15', title: '预计15日配送率', width: 100 ,formatter:['numberFormat','percent',2],
+        { field: 'xxc', title: 'X型材', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'qfxqrq', title: '前方实际需求期 ', width: 130 ,
+        { field: 'xtxc', title: 'X二次装T型材', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'fdxqrq', title: '分段计划需求期', width: 130 ,
+        { field: 'ddb', title: 'D大板', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jhxqrq', title: '集团计划需求期', width: 130 ,
+        { field: 'dqb', title: 'D曲板', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'yjtgq', title: '预计提供期', width: 110 ,
+        { field: 'dxc', title: 'D型材T', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sjpsrqmin', title: '配送开始期', width: 110 ,
+        { field: 'dsj', title: 'D散件', minWidth: "100",
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sjpsrqmax', title: '配送结束期', width: 110 ,
+        { field: 'xqzt', title: '需求状态', minWidth: "100",formatter:this.formatterZt,
-
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'drcs', title: '导入次数', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xzglxqOld', title: '原需求期', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX']
+        },
+        { field: 'shry', title: '审核人员', width: 110, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
         },
+        { field: 'shrq', title: '审核日期', width: 110, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        }
       ],
       activeName: 'first',
       tableDataMx: [

src/views/zl/czzjgz.vue

@@ -219,13 +219,13 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
-        {
+        // {
-          field: 'WPMC',
+        //   field: 'WPMC',
-          title: '零件名称',
+        //   title: '零件名称',
-          width: 120,
+        //   width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
+        //   filterRender: { name: 'FilterCombination' }
-        },
+        // },
         {
           field: 'WPGG',
           title: '规格',
@@ -523,10 +523,10 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
+      // if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
+      //   this.$message.warning('选择船只编号')
-        return
+      //   return
-      }
+      // }
       czzjList(this.queryParam).then((res) => {
         console.log(res.data)
         this.list = res.data

src/views/zyjhzx/components/SelectComp.vue

@@ -1,12 +1,15 @@
 <template>
   <div class="component">
-    <el-radio-group v-model="data.zyType" v-if="zyRadioShow" @change="changePage" style="width: 20%">
+    <el-radio-group class="radio-group-label" v-model="data.zyType" @change="changePage" :style="{width: zyTypeWidth}">
-      <el-radio label="0">派工</el-radio>
+      <el-radio class="custom-radio-green" label="0" style="color: white">派工</el-radio>
-      <el-radio label="1">报工</el-radio>
+      <el-radio class="custom-radio-red" v-if="!ljbs" label="1" style="color: white">报工</el-radio>
+      <el-radio class="custom-radio-green" v-if="ljbs" label="10" style="color: white">坡口报工</el-radio>
+      <el-radio class="custom-radio-red" v-if="ljbs" label="11" style="color: white">曲面报工</el-radio>
+      <el-radio class="custom-radio-red" v-if="ljbs" label="12" style="color: white">打磨报工</el-radio>
     </el-radio-group>
-    <el-radio-group v-model="data.bzType" @change="init">
+    <el-radio-group class="radio-group-label" v-model="data.bzType" @change="init">
-      <el-radio label="01">白班</el-radio>
+      <el-radio class="custom-radio-green" label="01" style="color: white">白班</el-radio>
-      <el-radio label="02">二班</el-radio>
+      <el-radio class="custom-radio-red" label="02" style="color: white">二班</el-radio>
     </el-radio-group>
   </div>
 </template>
@@ -16,7 +19,8 @@ export default {
   name:"ZyjhSelectComp",
   data(){
     return {
-      zyRadioShow:true,
+      ljbs:false,
+      zyTypeWidth:'20%',
       data:{
         zyType:'0',
         bzType:'01',
@@ -26,12 +30,13 @@ export default {
         sliao:{path:''},
         pwpg:{path:'/pwfk'},
         pwfk:{path:'/pwpg'},
-        llfk:{path:''},
+        llfk:{path:'/'},
         hxpg:{path:'/hxfk'},
         hxfk:{path:'/hxpg'},
         qgpg:{path:'/qgfk'},
         qgfk:{path:'/qgpg'},
-        ljian:{path:''}
+        ljian:{path:'/baogong'},
+        baogong:{path:'/ljian'},
       },
     }
   },
@@ -39,8 +44,13 @@ export default {
     this.data.zyType=this.$route.query.zyType||'0'
     const path=this.$route.path.replace('/','')
     this.nextPath=this.nextPathName[path].path
-    if (path==='llfk'||path==='ljian'){
+    if (path==='ljian'){
-      this.zyRadioShow=false
+      this.zyTypeWidth='43%'
+      this.ljbs=true
+    }
+    if (path==='baogong'){
+      this.zyTypeWidth='43%'
+      this.ljbs=true
     }
   },
   methods:{
@@ -59,7 +69,46 @@ export default {
 </script>
 
 <style scoped>
-.component .el-radio .el-radio__label {
+::v-deep{
-  color: white;
+  .custom-radio-green{
+    .el-radio__input.is-checked + .el-radio__label{
+      color: white;
+    }
+    .el-radio__inner {
+      border-color: white; /* 默认边框颜色 */
+    }
+    .el-radio__inner::after {
+      background-color: blue; /* 默认选中状态的背景颜色 */
+    }
+    .is-checked .el-radio__inner {
+      border-color: blue; /* 选中状态的边框颜色 */
+    }
+    .is-checked .el-radio__inner::after {
+      background-color: #FFFFFF; /* 选中状态的背景颜色 */
+    }
+    .el-radio__input.is-checked .el-radio__inner{
+      background: blue; /*圆圈里面背景色*/
+    }
+  }
+  .custom-radio-red {
+    .el-radio__input.is-checked + .el-radio__label{
+      color: white;
+    }
+    .el-radio__inner {
+      border-color: white; /* 默认边框颜色 */
+    }
+    .el-radio__inner::after {
+      background-color: blue; /* 默认选中状态的背景颜色 */
+    }
+    .is-checked .el-radio__inner {
+      border-color: blue; /* 选中状态的边框颜色 */
+    }
+    .is-checked .el-radio__inner::after {
+      background-color: #FFFFFF; /* 选中状态的背景颜色 */
+    }
+    .el-radio__input.is-checked .el-radio__inner{
+      background: blue; /*圆圈里面背景色*/
+    }
+  }
 }
 </style>

src/views/zyjhzx/components/SliaoSearch.vue

@@ -1,13 +1,14 @@
 <template>
   <div id="searchPl" ref="searchPl">
-    <ProjectSelect ref="projectSelectRef" :_style="{width:'115px'}"/>
+    <ProjectSelect ref="projectSelectRef" clearable :_style="{width:'115px'}"/>
-    <VxeInput v-model="queryParam.dcPl" placeholder="请输入批量"/>
+    <VxeInput v-model="queryParam.dcPl" clearable placeholder="请输入批量"/>
-    <VxeInput v-if="kwShow" v-model="queryParam.kw" placeholder="请输入跨位"/>
+    <VxeInput v-if="ljbs" v-model="queryParam.kw" clearable placeholder="请输入跨位"/>
+    <VxeInput v-if="ljbs" v-model="queryParam.fd" clearable placeholder="请输入分段"/>
     <VxeButton status="primary" content="查询" @click="search" />
-    <VxeSelect v-if="ljbs" v-model="gylxSelectData" ref="gylxSelectRef" :options="gylx" placeholder="选择工艺路线"/>
+    <VxeSelect v-if="ljbs" v-model="gylxSelectData" ref="gylxSelectRef" clearable :options="gylx" placeholder="选择工艺路线"/>
-    <VxeSelect v-if="ljbs" v-model="worker.pscry" ref="pkSelectRef" :options="sgry" placeholder="坡口施工"/>
+    <VxeSelect v-if="ljbs" v-model="worker.pscry" ref="pkSelectRef" clearable :options="sgry" placeholder="坡口施工"/>
-    <VxeSelect v-if="ljbs" v-model="worker.qscry" ref="qmSelectRef" :options="sgry" placeholder="曲面施工"/>
+    <VxeSelect v-if="ljbs" v-model="worker.qscry" ref="qmSelectRef" clearable :options="sgry" placeholder="曲面施工"/>
-    <VxeSelect v-if="ljbs" v-model="worker.dscry" ref="dmSelectRef" :options="sgry" placeholder="打磨施工"/>
+    <VxeSelect v-if="ljbs" v-model="worker.dscry" ref="dmSelectRef" clearable :options="sgry" placeholder="打磨施工"/>
     <VxeButton v-if="ljbs" status="primary" content="批量" @click="plGylx" />
     <VxeButton v-if="ljbs" status="success" content="派工" @click="paigong" />
   </div>
@@ -43,7 +44,10 @@ export default {
       },
       gylxSelectData:'',
       gylx:[
+        {label:'坡口',value:['pkbs']},
+        {label:'打磨',value:['dmbs']},
         {label:'坡口->曲面',value:['pkbs','qbs']},
+        {label:'坡口->打磨',value:['pkbs','dmbs']},
         {label:'坡口->曲面->打磨',value:['pkbs','qbs','dmbs']},
       ],
     }
@@ -66,7 +70,7 @@ export default {
     },
     search(){
       this.queryParam.dcCh=this.$refs.projectSelectRef.getDcch()
-      this.$emit('search',this.queryParam)
+      this.$emit('search')
     },
     getQueryParam(){
       return this.queryParam

src/views/zyjhzx/components/TipsComp.vue

@@ -0,0 +1,31 @@
+<template>
+  <div v-if="showStatus" id="tips" class="tips" ref="tips"></div>
+</template>
+
+<script>
+export default {
+  name: "TipsComp",
+  props:{
+    msg:{
+      type:Object,
+      default:{}
+    }
+  },
+  data(){
+    return {
+      showStatus:false,
+    }
+  },
+  methods:{
+    getShowStatus(){
+      return this.showStatus
+    },
+    hide(){
+      this.showStatus = false;
+    },
+    show(){
+      this.showStatus = true
+    },
+  }
+}
+</script>

src/views/zyjhzx/ljian/baogong.vue

@@ -0,0 +1,161 @@
+<template>
+  <div class="container">
+    <div id="pwpg" class="pwpg" ref="pwpg"></div>
+    <LjianPgd v-if="show" id="ljianbgd" ref="hxpgd" @initPgd="initPgd" @search="search" :worker="currentWorker" :workers="workers" />
+    <ZyjhSelectComp id="selectComp" ref="selRef"  @initWorkers="initWorkers"/>
+  </div>
+</template>
+
+<script>
+import container from "./bgcomps/container";
+import drawTitle from './bgcomps/title'
+import workers from "./bgcomps/person";
+import drawPgd from './bgcomps/pgd'
+import {getBzryList} from "@/api/sjzx/bzzGL";
+import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
+import LjianPgd from "@/views/zyjhzx/ljian/bgcomps/LjianPgd.vue";
+import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue";
+import {getQmPgd} from "@/api/jhzxgl/pgd";
+import {startLoading} from "@/utils";
+
+export default {
+  name:'PWanFKui',
+  components: {SliaoSearch, LjianPgd, ZyjhSelectComp},
+  data(){
+    return {
+      title:'零   件   作   业   报   工',
+      width:0,
+      height:0,
+      stage:null,
+      layer:null,
+      pgdGroup:null,
+      drawGd:null,
+      pgd:[],
+      currentWorker:null,
+      setWorkers:null,
+      workers:null,
+      workerGroup:null,
+      person:null,
+      show:false
+    }
+  },
+  mounted() {
+    this.$store.dispatch('page/handler', true)
+    this.initKonvaStage();
+  },
+  created(){
+    window.addEventListener('resize', this.initKonvaStage)
+  },
+  sockets:{},
+  methods:{
+    plGylx(gylx,worker){
+      this.$refs.hxpgd.plGylx(gylx,worker)
+    },
+    paigong(){
+      this.$refs.hxpgd.paigong()
+    },
+    initPgd(pgd={}){
+      const group=this.drawGd(pgd)
+      this.pgdGroup.destroyChildren()
+      this.pgdGroup.add(group)
+    },
+    initWorkers(bzType){
+      if (this.workerGroup){
+        this.workerGroup.destroyChildren()
+      }else{
+        const {container,person,getCurrentWorker}=workers(this.width,this.height)
+        this.person=person
+        this.getCurrentWorker=getCurrentWorker
+        const {bgGroup,group}=container()
+        this.workerGroup=group
+        this.layer.add(bgGroup)
+
+      }
+      getBzryList({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{
+        this.workers=res.data
+        this.show=true
+        this.setWorkers(res.data)
+        const that=this
+        for (let i=0;i<res.data.length;i++){
+          const item=res.data[i]
+          const worker=this.person(i,item)
+          worker.on('click touchstart',function (){
+            that.currentWorker=item
+            that.search(item)
+          })
+          this.workerGroup.add(worker)
+        }
+      })
+    },
+    search(worker=null){
+
+      const searchParam={}
+      if (worker){
+        searchParam.qscry=worker.userCode
+        // searchParam.dmry=worker.userCode
+        // searchParam.pkry=worker.userCode
+      }
+      startLoading()
+      // !!this.currentWorker&&(searchParam.worker=this.currentWorker)
+      getQmPgd(searchParam).then((res) => {
+        this.$refs.hxpgd.initData(res.data)
+      })
+    },
+    initKonvaStage(){
+      this.width=this.$refs.pwpg.clientWidth
+      this.height=this.$refs.pwpg.clientHeight
+      const {stage,layer}=container(this.width,this.height,'pwpg')
+      this.stage=stage
+      this.layer=layer
+
+      const titel=drawTitle(this.width,this.height,this.title)
+      this.layer.add(titel)
+
+      this.initWorkers(this.$refs.selRef.getData().bzType)
+
+      const {container:pgdContainer,drawGd,setWorkers}=drawPgd(this.width,this.height)
+      this.setWorkers=setWorkers
+      this.drawGd=drawGd
+      const {group:pgdGroup,bgGroup}=pgdContainer()
+      this.pgdGroup=pgdGroup
+      this.layer.add(bgGroup)
+
+      // const {group}=initSearch()
+      // this.layer.add(group)
+    },
+  }
+}
+
+</script>
+
+<style>
+#selectComp {
+  width:50%;
+  height: auto;
+  position: absolute;
+  top:10px;
+  left:20px;
+  border: none;
+  margin: 0;
+}
+#ljianbgd {
+  width:59.6%;
+  height: auto;
+  position: absolute;
+  top:45px;
+  left:165px;
+  border: none;
+  margin: 0;
+}
+
+#pwpg {
+  overflow: hidden;
+  width: 100%;
+  height: 100vh;
+  aspect-ratio: 16/9;
+}
+
+.container{
+  background: #ddd;
+}
+</style>

src/views/zyjhzx/ljian/bgcomps/LjianPgd.vue

@@ -0,0 +1,98 @@
+<template>
+  <VxeGrid ref="ljpgd" v-bind="gridOptions" @cell-click="cellClick" @current-change="getCurrentData"
+           @checkbox-change="checkboxChange" @checkbox-all="checkboxAll" />
+</template>
+
+<script>
+import paoWanPgdConfig from './pgdTable'
+import {ljpg} from "@/api/jhzxgl/pgd";
+import {endLoading, startLoading} from "@/utils";
+
+export default {
+  name:'LjianPgd',
+  props:{
+    worker:{
+      type:Object,
+      default: {}
+    },
+    workers:{
+      type:Array,
+      default:[]
+    },
+  },
+  data(){
+    return{
+      gridOptions:{},
+      list:{},
+      setExt:null,
+      checkedList:[],
+    }
+  },
+  created(){
+    const {options,columns,setExt}=paoWanPgdConfig()
+    this.setExt=setExt
+    this.gridOptions=options
+    this.gridOptions.columns=columns
+    this.setExt("workers",this.$props.workers)
+  },
+  methods:{
+    paigong(){
+      const data=this.checkedList
+      if (data.length===0){
+        this.$message.warning('请选择需要派工的工单')
+        return;
+      }
+      for (const item of data) {
+        if (item.pkbs&&item.pscry==='Y'){
+          this.$message.warning('坡口施工人员未安排')
+          return
+        }
+        if (item.qbs&&item.qscry==='Y'){
+          this.$message.warning('曲面施工人员未安排')
+          return
+        }
+        if (item.dmbs&&item.dscry==='Y'){
+          this.$message.warning('打磨施工人员未安排')
+          return
+        }
+      }
+      const pgData=data//.filter(item=>this.isAllNotEmpty(item.dmry,item.pkry,item.qjgry,item.pkbs,item.qbs,item.dmbs))
+        .map(item=>{
+          const data={
+            id:item.id,
+            dscry:item.dscry,pscry:item.pscry,qscry:item.qscry,
+            pkbs:item.pkbs,qbs:item.qbs,dmbs:item.dmbs,
+          }
+          item.pkbs==='Y'&&(data.pkZt='02')
+          item.qbs==='Y'&&(data.qjgZt='02')
+          item.dmbs==='Y'&&(data.dmZt='02')
+          return data
+        })
+      startLoading()
+      ljpg(pgData).then(res=>{
+        if (res.success){
+          this.$message.warning('成功')
+          this.$emit('search',this.worker)
+        }
+      })
+    },
+    checkboxAll() {
+      this.checkedList = this.$refs.ljpgd.getCheckboxRecords();
+      this.baogong()
+    },
+    checkboxChange() {
+      this.checkedList = this.$refs.ljpgd.getCheckboxRecords();
+      this.baogong()
+    },
+    initData(data){
+      this.$refs.ljpgd.reloadData(data)
+      setTimeout(()=>{
+        endLoading()
+      },2000)
+    },
+    cellClick({row}){
+      this.$emit('initPgd',row)
+    }
+  }
+}
+</script>

src/views/zyjhzx/ljian/bgcomps/container.js

@@ -0,0 +1,34 @@
+import Konva from "konva";
+
+const container=function (width=0,height=0,container){
+  const stage = new Konva.Stage({
+    container: container,
+    width: width,
+    height: height,
+  });
+
+  const layer = new Konva.Layer();
+  stage.add(layer)
+  layer.draw();
+
+  const imageObj = new Image();
+  const imgSize=width
+  imageObj.src = require('@/assets/kban/bg.png');
+  imageObj.onload = function () {
+    const shape = new Konva.Image({
+      x: 0,
+      y: 0,
+      width: imgSize,
+      height:this.height,
+      image: imageObj,
+    });
+    layer.add(shape)
+    shape.zIndex(0)
+  }
+
+  return {
+    stage,layer
+  }
+}
+
+export default container

src/views/zyjhzx/ljian/bgcomps/person.js

@@ -0,0 +1,152 @@
+import Konva from "konva";
+
+export default function (width,height){
+  const _width=width*0.075,_height=height*0.9751
+
+  const container=function (){
+    const x=20,y=40
+
+    const group=new Konva.Group({
+      x:0,
+      y:0,
+      width:_width,
+      height:_height,
+      draggable:true,
+      dragBoundFunc:function (pos){
+        return {
+          x:x,
+          y:pos.y
+        }
+      },
+    })
+
+    const bgGroup=new Konva.Group({
+      x:x,
+      y:y,
+      width:_width,
+      height:_height,
+    })
+    bgGroup.clipFunc(function(ctx) {
+      ctx.rect(0, 0, _width, _height*0.969);
+    });
+    bgGroup.add(group)
+
+    const imageObj = new Image();
+    imageObj.src = require('@/assets/sliao/personbg.png');
+    imageObj.onload = function () {
+      const shape = new Konva.Image({
+        x: 0,
+        y: 0,
+        width: _width,
+        height:_height*0.975,
+        image: this,
+      });
+      bgGroup.add(shape)
+      shape.zIndex(0)
+    }
+
+    return {bgGroup,group}
+  }
+
+  let currentWork=null;
+  let selectedShape=null;
+
+  const getCurrentWorker=function (){
+    return currentWork
+  }
+
+  const person=function (index,persons={}){
+    const alignSize=1
+    const width=(_width-5)/alignSize,height=110
+    const x=index%alignSize*width+index%alignSize+5,y=height*(Math.floor(index/alignSize))+(Math.floor(index/alignSize)+1)*10
+    const group=new Konva.Group({
+      x:x,
+      y:y,
+      width:width,
+      height:height
+    })
+
+    const selectObj = new Image();
+    selectObj.src = require('@/assets/sliao/selected.png');
+    let selectShape=null
+    const setSelectShape=function (shape){
+      selectShape=shape
+    }
+    selectObj.onload = function () {
+      const shape = new Konva.Image({
+        x: width-width*0.3,
+        y: 2,
+        width: width*0.25,
+        height:height*0.25,
+        image: this,
+        visible:false
+      });
+      group.add(shape)
+      shape.zIndex(0)
+      setSelectShape(shape)
+    }
+
+    group.on('click touchstart',function (){
+      currentWork=persons
+      window.localStorage.setItem('worker',JSON.stringify(currentWork))
+      if (selectedShape){
+        selectedShape.hide()
+        if (selectedShape===selectShape){
+          selectedShape=null
+          return
+        }
+      }
+      selectedShape=selectShape
+      selectedShape.show()
+    })
+
+    const bgObj = new Image();
+    bgObj.src = require('@/assets/sliao/personbg1.png');
+    bgObj.onload = function () {
+      const shape = new Konva.Image({
+        x: 0,
+        y: 0,
+        offsetX:4,
+        width: width,
+        height:height,
+        image: this,
+      });
+      group.add(shape)
+      shape.zIndex(0)
+    }
+
+    const imageObj = new Image();
+    imageObj.src = require('@/assets/sliao/headImage.png');
+    imageObj.onload = function () {
+      const shape = new Konva.Image({
+        x: 0,
+        y: 0,
+        offsetX:-4,
+        offsetY:-10,
+        width: width*0.89,
+        height:height*0.85,
+        image: this,
+      });
+      group.add(shape)
+      shape.zIndex(0)
+    }
+
+    const text=new Konva.Text({
+      x:0,
+      y:height,
+      width:width,
+      height:height*0.1,
+      text: persons.userName,
+      align: 'center',
+      verticalAlign:'middle',
+      fontSize:12
+    })
+    group.add(text)
+
+    return group
+  }
+
+  return{
+    container,person
+  }
+}

src/views/zyjhzx/ljian/bgcomps/pgd.js

@@ -0,0 +1,687 @@
+import Konva from "konva";
+import QRCode from 'qrcode'
+
+export default function (width,height){
+  const x=width*0.66+40,y=40,_width=width*0.30,_height=height*0.95
+
+  const container=function (){
+    const group=new Konva.Group({
+      x:0,
+      y:0,
+      width:_width,
+      height:_height
+    })
+
+    const bgGroup=new Konva.Group({
+      x:x,
+      y:y,
+      width:_width,
+      height:_height
+    })
+
+    const bgObj = new Image();
+    bgObj.src = require('@/assets/pwan/pgdbg.png');
+    bgObj.onload = function () {
+      const shape = new Konva.Image({
+        x: 0,
+        y: 0,
+        width: _width,
+        height:_height,
+        image: this,
+      });
+      bgGroup.add(shape)
+      shape.zIndex(0)
+    }
+    bgGroup.add(group)
+    return {bgGroup,group}
+  }
+
+  let workers=[]
+  const setWorkers=function (persons){
+    workers=persons
+  }
+
+  const formatWorker=function (code){
+    console.log(code)
+    console.log(workers)
+    for (const item of workers) {
+      if(item.userCode===code){
+        return item.userName
+      }
+    }
+  }
+
+  const drawGd=function (data){
+    // this.layer.destroyChildren();
+
+    const group=new Konva.Group({
+      x:13,
+      y:12,
+      width:_width,
+      height:_height
+    })
+
+    const rect=new Konva.Rect({
+      x:0,
+      y:0,
+      width:_width-25,
+      height:_height-20,
+    })
+    group.add(rect)
+
+    const title=new Konva.Text({
+      x:0,
+      y:10,
+      width:_width,
+      height:35,
+      fill:'#fff',
+      text:'大连重工大连钢材加工配送有限公司',
+      align:'center',
+      fontSize:22,
+    })
+    group.add(title)
+
+    const sgdTitle=new Konva.Text({
+      x:0,
+      y:40,
+      width:_width,
+      height:25,
+      lineHeight:1,
+      fill:'#fff',
+      strokeWidth:1,
+      text:'零件计划单',
+      align:'center',
+      fontSize:20,
+    })
+    group.add(sgdTitle)
+
+    const dhTitle=new Konva.Text({
+      x:_width*0.7,
+      y:50,
+      width:_width-48,
+      height:15,
+      fill:'#fff',
+      text:`单号:${data.qgdh?data.qgdh:''}`,
+      align:'left',
+      fontSize:12,
+    })
+    group.add(dhTitle)
+
+    const group0=new Konva.Group({
+      x:15,
+      y:65,
+      width:_width-60,
+      height:_width-100,
+    })
+    group.add(group0)
+
+    const group1=drawCzbh(data)
+    group0.add(group1)
+    const group2=drawPlAndFd(data)
+    group0.add(group2)
+    const group3=drawTzbh(data)
+    group0.add(group3)
+    const group4=drawTlt(data)
+    group0.add(group4)
+    const group5=drawJs(data)
+    group0.add(group5)
+
+    const group51=drawJs1(data)
+    group0.add(group51)
+    const group52=drawJs2(data)
+    group0.add(group52)
+
+    const group6=drawHb(data)
+    group0.add(group6)
+    const group7=drawBz(data)
+    group0.add(group7)
+    const group8=drawQz(data)
+    group0.add(group8)
+    generateQRCode(data.djh,group0)
+    return group
+  }
+
+  const drawQz=function (data){
+    const group=new Konva.Group({
+      x:0,
+      y:620,
+      width:(_width-60),
+      height:30,
+    })
+
+    const jsText=new Konva.Text({
+      x:5,
+      y:1,
+      width:(_width-60),
+      height:30,
+      fill:'#fff',
+      text:'负责人:',
+      fontSize:18,
+      verticalAlign:'middle'
+    })
+    group.add(jsText)
+    return group
+  }
+  const drawBz=function (data){
+    const group=new Konva.Group({
+      x:0,
+      y:440,
+      width:(_width-60),
+      height:180,
+    })
+
+    const rect=new Konva.Rect({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:180,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(rect)
+    return group
+  }
+  const drawHb=function (data){
+    const group=new Konva.Group({
+      x:0,
+      y:410,
+      width:(_width-60),
+      height:30,
+    })
+
+    const jsRect=new Konva.Rect({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(jsRect)
+
+    const jsText=new Konva.Text({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:30,
+      fill:'#fff',
+      text:'报工',
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(jsText)
+
+    const plRect=new Konva.Rect({
+      x:0,
+      y:30,
+      width:(_width-60),
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(plRect)
+
+    const plText=new Konva.Text({
+      x:0,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      fill:'#fff',
+      text:data.qjgFkrq,
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+
+    const fdRect=new Konva.Rect({
+      x:(_width-60)/2,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(fdRect)
+
+    const fdText=new Konva.Text({
+      x:(_width-60)/2,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      fill:'#fff',
+      text:data.pwfkrq,
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(fdText)
+
+    group.add(plText)
+
+    return group
+  }
+  const drawJs=function (data){
+    const group=new Konva.Group({
+      x:0,
+      y:150,
+      width:(_width-60),
+      height:30,
+    })
+
+    const jsRect=new Konva.Rect({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(jsRect)
+
+    const jsText=new Konva.Text({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:30,
+      fill:'#fff',
+      text:'坡口施工',
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(jsText)
+
+    const plRect=new Konva.Rect({
+      x:0,
+      y:30,
+      width:(_width-60),
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(plRect)
+
+    const pscry=formatWorker(data.pscry)
+    const qscry=formatWorker(data.qscry)
+    const dscry=formatWorker(data.dscry)
+
+    const plText=new Konva.Text({
+      x:0,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      fill:'#fff',
+      text:pscry,
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+
+    const fdRect=new Konva.Rect({
+      x:(_width-60)/2,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(fdRect)
+
+    const fdText=new Konva.Text({
+      x:(_width-60)/2,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      fill:'#fff',
+      text:data.pkXfrq||'',
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(fdText)
+
+    group.add(plText)
+
+    return group
+  }
+  const drawJs1=function (data){
+    const group=new Konva.Group({
+      x:0,
+      y:250,
+      width:(_width-60),
+      height:30,
+    })
+
+    const jsRect=new Konva.Rect({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(jsRect)
+
+    const jsText=new Konva.Text({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:30,
+      fill:'#fff',
+      text:'曲面施工',
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(jsText)
+
+    const plRect=new Konva.Rect({
+      x:0,
+      y:30,
+      width:(_width-60),
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(plRect)
+
+    const qscry=formatWorker(data.qscry)
+
+    const plText=new Konva.Text({
+      x:0,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      fill:'#fff',
+      text:qscry,
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+
+    const fdRect=new Konva.Rect({
+      x:(_width-60)/2,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(fdRect)
+
+    const fdText=new Konva.Text({
+      x:(_width-60)/2,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      fill:'#fff',
+      text:data.qjgXfrq||'',
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(fdText)
+
+    group.add(plText)
+
+    return group
+  }
+  const drawJs2=function (data){
+    const group=new Konva.Group({
+      x:0,
+      y:350,
+      width:(_width-60),
+      height:30,
+    })
+
+    const jsRect=new Konva.Rect({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(jsRect)
+
+    const jsText=new Konva.Text({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:30,
+      fill:'#fff',
+      text:'打磨施工',
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(jsText)
+
+    const plRect=new Konva.Rect({
+      x:0,
+      y:30,
+      width:(_width-60),
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(plRect)
+
+    const dscry=formatWorker(data.dscry)
+
+    const plText=new Konva.Text({
+      x:0,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      fill:'#fff',
+      text:dscry,
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+
+    const fdRect=new Konva.Rect({
+      x:(_width-60)/2,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(fdRect)
+
+    const fdText=new Konva.Text({
+      x:(_width-60)/2,
+      y:30,
+      width:(_width-60)/2,
+      height:30,
+      fill:'#fff',
+      text:data.dmXfrq||'',
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(fdText)
+
+    group.add(plText)
+
+    return group
+  }
+  const drawTlt=function (data){
+    const group=new Konva.Group({
+      x:0,
+      y:150,
+      width:(_width-60),
+      height:200,
+    })
+
+    const rect=new Konva.Rect({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:200,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(rect)
+    return group
+  }
+  const drawTzbh=function (data){
+    const group=new Konva.Group({
+      x:0,
+      y:120,
+      width:(_width-60),
+      height:30,
+    })
+
+    const rect=new Konva.Rect({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:30,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(rect)
+
+    const text=new Konva.Text({
+      x:0,
+      y:0,
+      width:(_width-60),
+      height:30,
+      fill:'#fff',
+      text:data.tlth,
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(text)
+    return group
+  }
+  const drawPlAndFd=function (data){
+    const group=new Konva.Group({
+      x:0,
+      y:60,
+      width:(_width-188),
+      height:60,
+    })
+
+    const plRect=new Konva.Rect({
+      x:0,
+      y:0,
+      width:(_width-188)/2,
+      height:60,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(plRect)
+
+    const plText=new Konva.Text({
+      x:0,
+      y:0,
+      width:(_width-188)/2,
+      height:60,
+      fill:'#fff',
+      text:'批量:'+data.pl,
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(plText)
+
+    const fdRect=new Konva.Rect({
+      x:(_width-188)/2,
+      y:0,
+      width:(_width-188)/2,
+      height:60,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(fdRect)
+
+    const fdText=new Konva.Text({
+      x:(_width-188)/2,
+      y:0,
+      width:(_width-188)/2,
+      height:60,
+      fill:'#fff',
+      text:'分段:'+data.fd,
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    group.add(fdText)
+
+
+    return group
+  }
+  const drawCzbh=function (data){
+    const czbhGroup=new Konva.Group({
+      x:0,
+      y:0,
+      width:(_width-188),
+      height:60,
+    })
+
+    const czbhRect=new Konva.Rect({
+      x:0,
+      y:0,
+      width:(_width-188),
+      height:60,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    czbhGroup.add(czbhRect)
+
+    const czbhText=new Konva.Text({
+      x:0,
+      y:0,
+      width:(_width-188),
+      height:60,
+      fill:'#fff',
+      text:'船号:'+data.czbh,
+      fontSize:18,
+      align:'center',
+      verticalAlign:'middle'
+    })
+    czbhGroup.add(czbhText)
+    return czbhGroup
+  }
+  const generateQRCode=function (text='',group) {
+    const imgSize=118
+    const rect=new Konva.Rect({
+      x:385,
+      y:0,
+      width:128.7,
+      height:120,
+      stroke:'#4991E5',
+      strokeWidth:1,
+    })
+    group.add(rect)
+    QRCode.toDataURL(text,{width:600,height:600,margin:1})
+      .then(url => {
+        const imageObj = new Image();
+        imageObj.src = url;
+        imageObj.onload = function () {
+
+          const shape = new Konva.Image({
+            x: 390,
+            y: 1,
+            width: imgSize,
+            height: imgSize,
+            image: imageObj,
+          });
+          group.add(shape)
+        }
+
+      }).catch(err => {
+      console.error(err);
+    });
+  }
+
+  return {
+    container,drawGd,setWorkers
+  }
+}

src/views/zyjhzx/ljian/bgcomps/pgdTable.js

@@ -0,0 +1,219 @@
+
+export default function () {
+  const options={
+    height:866,
+    align:'center',
+    border: true,
+    resizable: true,
+    keepSource:true,
+    size:'mini',
+    showOverflow: true,
+    scrollY:{enabled:true},
+    highlightCurrentRow:true,
+    data:[],
+    ycldw:null,
+  }
+  const ext={}
+  const setExt=function (key,value){
+    ext[key]=value
+  }
+
+  const nameFormat=function ({cellValue}){
+    const workers=ext.workers
+    for (const item of workers) {
+      if(item.userCode===cellValue){
+        return item.userName
+      }
+    }
+  }
+  const columns = [
+    { type: 'checkbox', width: 40 },
+    { type: 'seq', width: 50, title: '序号' },
+    { field: 'pkbs', title: '坡口标识', width: 90,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'pscry', title: '坡口施工', width: 90,formatter:nameFormat,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'qbs', title: '曲面标识', width: 90,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'qscry', title: '曲面施工', width: 90,formatter:nameFormat,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dmbs', title: '打磨标识', width: 90,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dscry', title: '打磨施工', width: 90,formatter:nameFormat,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    // { field: 'qjgZt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+    { field: 'czbh', title: '船号', width: 70,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'pl', title: '批量', width: 70,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'fd', title: '分段', width: 70,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    // { field: 'kw', title: '跨位', width: 70,formatter: ['dictFormat', 'QGKW'],
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+    { field: 'zl', title: '组立', width: 70,formatter:['dictFormat','ZLLB'],
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'tlth', title: '套料图号', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'ljbh', title: '零件编号', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    // { field: 'ljmc', title: '零件名称', width: 120,
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+    { field: 'ljgg', title: '零件规格', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'ljcz', title: '零件材质', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'wpfl', 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: 'sl', 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: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    // { field: 'qfxqrqdz', title: '前方需求大组期', width: 120,
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+    { field: 'qgdh', title: '曲工单号', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    // { field: 'qjgjhrq', title: '曲加工计划期', width: 120,editRender: { name: 'input' },
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+    // { field: 'qsbbh', title: '曲设备编号', width: 120,
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+    // { field: 'qjgXfry', 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,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: 'pgdh', 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: 'pksbbh', title: '坡口设备编号', width: 120,
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+    { field: 'pklx', title: '坡口类型', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'pkcd', title: '坡口长度', width: 120,
+      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', },
+    },
+    { field: 'pkFkrq', title: '坡口反馈日期', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'pkFkry', title: '坡口反馈人', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dgdh', 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: 'dmcd', title: '打磨打磨长度', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    // { field: 'dmXfry', title: '打磨派工人', width: 100,
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+    { field: 'dmXfrq', title: '打磨派工日期', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dmFkry', title: '打磨反馈人', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dmFkrq', title: '打磨反馈日期', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+  ]
+
+  return {
+    options,
+    columns,
+    setExt
+  }
+}

src/views/zyjhzx/ljian/bgcomps/sljh.js

@@ -0,0 +1,280 @@
+import Konva from "konva";
+
+export const sljh=function (width,height){
+
+  const layer=new Konva.Layer({
+    id:'2',
+    x:20,
+    y:75,
+  })
+
+  const group=new Konva.Group({
+    x:0,
+    y:0,
+    width: width*0.6,
+    height: height*0.2-60,
+    draggable: true,
+    dragBoundFunc:function (pos){
+      return {
+        x:pos.x,
+        y:75
+      }
+    },
+  });
+
+  const bgGroup=new Konva.Group({
+    x:34,
+    y:0,
+  })
+  bgGroup.clipFunc(function(ctx) {
+    ctx.rect(4, 0, width*0.6, height*0.2-10);
+  });
+
+  layer.add(bgGroup)
+  bgGroup.zIndex(0)
+  bgGroup.add(group)
+
+  const left2ImageObj=new Image()
+  left2ImageObj.src = require('@/assets/sliao/left2.png');
+  left2ImageObj.onload = function () {
+    const shape1 = new Konva.Image({
+      x: 0,
+      y: 35,
+      width: 32,
+      height:120,
+      image: this,
+    });
+    layer.add(shape1)
+    shape1.zIndex(1)
+    shape1.on('click touchstart',function (){
+      group.move({
+        x:-116
+      })
+    })
+  }
+
+  const right2ImageObj=new Image()
+  right2ImageObj.src = require('@/assets/sliao/right2.png');
+  right2ImageObj.onload = function () {
+    const shape1 = new Konva.Image({
+      x: width*0.65,
+      y: 35,
+      width: 32,
+      height:120,
+      image: this,
+    });
+    layer.add(shape1)
+    shape1.zIndex(1)
+    shape1.on('click touchstart',function (){
+      group.move({
+        x:116
+      })
+    })
+  }
+
+  const imageObj = new Image();
+  imageObj.src = require('@/assets/sliao/sljhbg.png');
+  imageObj.onload = function () {
+    const shape = new Konva.Image({
+      x: 8,
+      y: 0,
+      width: width*0.66,
+      height:181,
+      image: this,
+    });
+    layer.add(shape)
+    shape.zIndex(0)
+  }
+
+  function drawItem(i,item){
+    const itemWith=111;
+    const itemHeight=108
+
+    const x=(i+1)*5+i*itemWith;
+    const qyGroup=new Konva.Group({
+      x:x,
+      y:10,
+      width:itemWith,
+      height:itemHeight,
+    })
+    qyGroup.setAttr('index',i)
+    qyGroup.setAttr('item',item)
+    group.add(qyGroup)
+
+    const imageObj = new Image();
+    imageObj.src = require('@/assets/sliao/sljhItemBg.png');
+    imageObj.onload = function () {
+      const shape = new Konva.Image({
+        x: 0,
+        y: 0,
+        width: 111,
+        height:163,
+        image: this,
+      });
+      qyGroup.add(shape)
+      shape.zIndex(0)
+    }
+
+    const tlth=new Konva.Text({
+      x: 0,
+      y: 0,
+      width: 111,
+      height:34,
+      fontSize:12,
+      fontStyle:'bold',
+      fill:'#fff',
+      align:'center',
+      verticalAlign:'middle',
+      text:item.tzbh
+    })
+    qyGroup.add(tlth)
+
+    const nameGroup=new Konva.Group({
+      x: 5,
+      y: 43,
+      width: 38,
+      height:105,
+    })
+
+    const nameImageObj1 = new Image();
+    nameImageObj1.src = require('@/assets/sliao/nameBg1.png');
+    nameImageObj1.onload = function () {
+      const shape = new Konva.Image({
+        x: 0,
+        y: 0,
+        width: 38,
+        height:105,
+        image: this,
+      });
+      nameGroup.add(shape)
+      shape.zIndex(0)
+    }
+    qyGroup.add(nameGroup)
+
+    const name1=new Konva.Text({
+      x: 0,
+      y: 0,
+      width: 38,
+      height:20,
+      fontSize:12,
+      fontStyle:'bold',
+      fill:'#fff',
+      align:'center',
+      verticalAlign:'middle',
+      text:'船号'
+    })
+    nameGroup.add(name1)
+
+    const name2=new Konva.Text({
+      x: 0,
+      y: 21,
+      width: 38,
+      height:20,
+      fontSize:12,
+      fontStyle:'bold',
+      fill:'#fff',
+      align:'center',
+      verticalAlign:'middle',
+      text:'批量'
+    })
+    nameGroup.add(name2)
+
+    const name3=new Konva.Text({
+      x: 0,
+      y: 43,
+      width: 38,
+      height:20,
+      fontSize:12,
+      fontStyle:'bold',
+      fill:'#fff',
+      align:'center',
+      verticalAlign:'middle',
+      text:'规格'
+    })
+    nameGroup.add(name3)
+
+    const name4=new Konva.Text({
+      x: 0,
+      y: 64.5,
+      width: 38,
+      height:20,
+      fontSize:12,
+      fontStyle:'bold',
+      fill:'#fff',
+      align:'center',
+      verticalAlign:'middle',
+      text:'垛位'
+    })
+    nameGroup.add(name4)
+
+    const name5=new Konva.Text({
+      x: 0,
+      y: 86.5,
+      width: 38,
+      height:20,
+      fontSize:12,
+      fontStyle:'bold',
+      fill:'#fff',
+      align:'center',
+      verticalAlign:'middle',
+      text:'层数'
+    })
+    nameGroup.add(name5)
+
+    const infoGroup=new Konva.Group({
+      x: 43,
+      y: 43,
+      width: 65,
+      height:105,
+    })
+    qyGroup.add(infoGroup)
+
+    const info1=new Konva.Text({
+      x: 0,
+      y: 0,
+      width: 65,
+      height:20,
+      fontSize:12,
+      fontStyle:'bold',
+      fill:'#fff',
+      align:'center',
+      verticalAlign:'middle',
+      text:item.dcCh
+    })
+    infoGroup.add(info1)
+
+    const info2=new Konva.Text({
+      x: 0,
+      y: 21,
+      width: 65,
+      height:20,
+      fontSize:12,
+      fontStyle:'bold',
+      fill:'#fff',
+      align:'center',
+      verticalAlign:'middle',
+      text:item.dcPl
+    })
+    infoGroup.add(info2)
+
+    const info3=new Konva.Text({
+      x: 0,
+      y: 43,
+      width: 65,
+      height:20,
+      fontSize:9,
+      fontStyle:'bold',
+      fill:'#fff',
+      align:'center',
+      verticalAlign:'middle',
+      text:item.wpgg
+    })
+    infoGroup.add(info3)
+
+    return qyGroup
+  }
+
+  return {
+    layer,group,drawItem
+  }
+}

src/views/zyjhzx/ljian/bgcomps/title.js

@@ -0,0 +1,40 @@
+import Konva from "konva";
+
+const title=function (width,height,title) {
+  const group=new Konva.Group({
+    x: 0,
+    y: 0,
+    width: width,
+    height: 20,
+  })
+
+  const imageObj = new Image();
+  imageObj.src = require('@/assets/kban/logo.png');
+  imageObj.onload = function () {
+    const shape = new Konva.Image({
+      x: 0,
+      y: 0,
+      width: width*0.86,
+      height:41,
+      image: imageObj,
+    });
+    group.add(shape)
+  }
+
+  const text=new Konva.Text({
+    x: 0,
+    y: 8,
+    width: width,
+    height: 20,
+    text: title,
+    align: 'center',
+    fill:'#fff',
+    fontSize: 32,
+    fontStyle:'bold'
+  })
+  group.add(text)
+
+  return group
+}
+
+export default title

src/views/zyjhzx/ljian/comps/LjianPgd.vue

@@ -1,5 +1,6 @@
 <template>
-  <VxeGrid ref="ljpgd" v-bind="gridOptions" @cell-click="cellClick" @current-change="getCurrentData" />
+  <VxeGrid ref="ljpgd" v-bind="gridOptions" @cell-click="cellClick" @current-change="getCurrentData"
+           @checkbox-change="checkboxChange" @checkbox-all="checkboxAll" />
 </template>
 
 <script>
@@ -24,10 +25,10 @@ export default {
       gridOptions:{},
       list:{},
       setExt:null,
+      checkedList:[],
     }
   },
   created(){
-    this.$store.dispatch('page/handler', true)
     const {options,columns,setExt}=paoWanPgdConfig()
     this.setExt=setExt
     this.gridOptions=options
@@ -41,36 +42,40 @@ export default {
         this.$message.warning('请选择工艺路线')
         return;
       }
-      const data=this.$refs.ljpgd.getCheckboxRecords()
+      const data=this.checkedList
       if (data.length===0){
         this.$message.warning('工单未选择')
         return;
       }
       data.forEach(item=>{
+        item.pkbs='N'
+        item.qbs='N'
+        item.dmbs='N'
         gylx.forEach(gy=>{
           item[gy]='Y'
         })
-        item.pscry=worker.pscry
+
-        item.qscry=worker.qscry
+        item.pkbs==='Y'&&(item.pscry=worker.pscry)
-        item.dscry=worker.dscry
+        item.qbs==='Y'&&(item.qscry=worker.qscry)
+        item.dmbs&&(item.dscry=worker.dscry)
       })
     },
-    paigong(worker){
+    paigong(){
-      const data=this.$refs.ljpgd.getCheckboxRecords()
+      const data=this.checkedList
       if (data.length===0){
         this.$message.warning('请选择需要派工的工单')
         return;
       }
       for (const item of data) {
-        if (item.pkbs&&!item.pscry){
+        if (item.pkbs&&item.pscry==='Y'){
           this.$message.warning('坡口施工人员未安排')
           return
         }
-        if (item.qbs&&!item.qscry){
+        if (item.qbs&&item.qscry==='Y'){
           this.$message.warning('曲面施工人员未安排')
           return
         }
-        if (item.dmbs&&!item.dscry){
+        if (item.dmbs&&item.dscry==='Y'){
           this.$message.warning('打磨施工人员未安排')
           return
         }
@@ -80,20 +85,26 @@ export default {
           const data={
             id:item.id,
             dscry:item.dscry,pscry:item.pscry,qscry:item.qscry,
-            pkbs:item.pkbs,qbs:item.qbs,dmbs:item.dmbs
+            pkbs:item.pkbs,qbs:item.qbs,dmbs:item.dmbs,
           }
+          item.pkbs==='Y'&&(data.pkZt='02')
+          item.qbs==='Y'&&(data.qjgZt='02')
+          item.dmbs==='Y'&&(data.dmZt='02')
           return data
         })
       startLoading()
       ljpg(pgData).then(res=>{
         if (res.success){
           this.$message.warning('成功')
-          this.$emit('search')
+          this.$emit('search',this.worker)
         }
       })
     },
-    isAllNotEmpty(...data){
+    checkboxAll() {
-
+      this.checkedList = this.$refs.ljpgd.getCheckboxRecords();
+    },
+    checkboxChange() {
+      this.checkedList = this.$refs.ljpgd.getCheckboxRecords();
     },
     initData(data){
       // this.gridOptions.data=data
@@ -103,7 +114,7 @@ export default {
       },2000)
     },
     getCurrentData(){
-      const data= this.$refs.ljpgd.getCheckboxRecords()
+      const data= this.checkedList
       window.localStorage.setItem("ljfk",JSON.stringify(data))
     },
     cellClick({row}){

src/views/zyjhzx/ljian/comps/pgd.js

@@ -6,6 +6,13 @@ export default function (width,height){
 
   const container=function (){
     const group=new Konva.Group({
+      x:0,
+      y:0,
+      width:_width,
+      height:_height
+    })
+
+    const bgGroup=new Konva.Group({
       x:x,
       y:y,
       width:_width,
@@ -22,10 +29,11 @@ export default function (width,height){
         height:_height,
         image: this,
       });
-      group.add(shape)
+      bgGroup.add(shape)
       shape.zIndex(0)
     }
-    return group
+    bgGroup.add(group)
+    return {bgGroup,group}
   }
 
   let workers=[]

src/views/zyjhzx/ljian/comps/pgdTable.js

@@ -8,7 +8,7 @@ export default function () {
     keepSource:true,
     size:'mini',
     showOverflow: true,
-    scrollY:{enable:true},
+    scrollY:{enabled:true},
     highlightCurrentRow:true,
     data:[],
     ycldw:null,
@@ -69,11 +69,11 @@ export default function () {
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'kw', title: '跨位', width: 70,formatter: ['dictFormat', 'QGKW'],
+    // { field: 'kw', title: '跨位', width: 70,formatter: ['dictFormat', 'QGKW'],
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
+    //   filterRender: { name: 'FilterCombination', },
-    },
+    // },
-    { field: 'zl', title: '组立', width: 70,
+    { field: 'zl', title: '组立', width: 70,formatter:['dictFormat','ZLLB'],
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
@@ -85,10 +85,10 @@ export default function () {
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'ljmc', title: '零件名称', width: 120,
+    // { field: 'ljmc', title: '零件名称', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
+    //   filterRender: { name: 'FilterCombination', },
-    },
+    // },
     { field: 'ljgg', title: '零件规格', width: 120,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
@@ -113,22 +113,26 @@ export default function () {
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'qfxqrqdz', title: '前方需求大组期', width: 120,
+    // { field: 'qfxqrqdz', title: '前方需求大组期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
+    //   filterRender: { name: 'FilterCombination', },
-    },
+    // },
-    { field: 'qjgjhrq', title: '曲加工计划期', width: 120,editRender: { name: 'input' },
+    { field: 'qgdh', title: '曲工单号', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'qsbbh', title: '曲设备编号', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'qjgXfry', title: '曲派工人员', width: 120,editRender: { name: 'input' },
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
+    // { field: 'qjgjhrq', title: '曲加工计划期', width: 120,editRender: { name: 'input' },
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+    // { field: 'qsbbh', title: '曲设备编号', width: 120,
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+    // { field: 'qjgXfry', 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,editRender: { name: 'input' },
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
@@ -141,31 +145,30 @@ export default function () {
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'pghd', title: '坡口工单号', width: 120,
+    { field: 'pgdh', 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: 'pksbbh', 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: 'pksbbh', title: '坡口设备编号', width: 120,
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
     { field: 'pklx', title: '坡口类型', width: 120,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
     { field: 'pkcd', title: '坡口长度', width: 120,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'pkXfry', title: '坡口派工人员', width: 120,
+    // { field: 'pkXfry', title: '坡口派工人员', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
+    //   filterRender: { name: 'FilterCombination', },
-    },
+    // },
     { field: 'pkXfrq', title: '坡口派工日期', width: 120,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
@@ -182,18 +185,18 @@ export default function () {
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'dmsbbh', title: '打磨设备编号', width: 100,
+    // { field: 'dmsbbh', title: '打磨设备编号', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
+    //   filterRender: { name: 'FilterCombination', },
-    },
+    // },
     { field: 'dmcd', title: '打磨打磨长度', width: 100,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'dmXfry', title: '打磨派工人', width: 100,
+    // { field: 'dmXfry', title: '打磨派工人', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
+    //   filterRender: { name: 'FilterCombination', },
-    },
+    // },
     { field: 'dmXfrq', title: '打磨派工日期', width: 100,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
@@ -206,113 +209,6 @@ export default function () {
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    {
-      field: 'slfkry',
-      title: '上料反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'slfkrq',
-      title: '上料反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'pwfkry',
-      title: '抛丸反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'pwfkrq',
-      title: '抛丸反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'llfkry',
-      title: '理料反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'llfkrq',
-      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: 'hxfkry',
-      title: '划线反馈人员',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-
-    {
-      field: 'qgfkry',
-      title: '切割反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'qgfkrq',
-      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: 'pwjhrq',
-      title: '抛丸计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'lljhrq',
-      title: '理料计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'hxjhrq',
-      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' }
-    },
   ]
 
   return {

src/views/zyjhzx/ljian/index.vue

@@ -18,7 +18,7 @@ import LjianPgd from "@/views/zyjhzx/ljian/comps/LjianPgd.vue";
 import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue";
 import {getQmPgd} from "@/api/jhzxgl/pgd";
 import initSearch from "@/views/zyjhzx/components/search";
-import {startLoading} from "@/utils";
+import {endLoading, startLoading} from "@/utils";
 
 export default {
   name:'PWanFKui',
@@ -42,6 +42,7 @@ export default {
     }
   },
   mounted() {
+    this.$store.dispatch('page/handler', true)
     this.initKonvaStage();
   },
   created(){
@@ -53,10 +54,11 @@ export default {
       this.$refs.hxpgd.plGylx(gylx,worker)
     },
     paigong(){
-      this.$refs.hxpgd.paigong(this.currentWorker)
+      this.$refs.hxpgd.paigong()
     },
     initPgd(pgd={}){
       const group=this.drawGd(pgd)
+      this.pgdGroup.destroyChildren()
       this.pgdGroup.add(group)
     },
     initWorkers(bzType){
@@ -87,23 +89,22 @@ export default {
         }
       })
     },
-    search(worker){
+    search(worker=null){
       const data=this.$refs.sliaoSearch.getQueryParam()
 
       const searchParam={
         dcch:data.dcCh,
         pl:data.dcPl,
         fd:data.dcFd,
-        lx:'q',
-        zt:'01'
       }
       if (worker){
-        searchParam.qjgry=worker.userCode
+        searchParam.qscry=worker.userCode
         // searchParam.dmry=worker.userCode
         // searchParam.pkry=worker.userCode
       }else{
         if (!searchParam.dcch){
           this.$message.warning('请选择船号')
+          endLoading()
           return
         }
       }
@@ -128,8 +129,9 @@ export default {
       const {container:pgdContainer,drawGd,setWorkers}=drawPgd(this.width,this.height)
       this.setWorkers=setWorkers
       this.drawGd=drawGd
-      this.pgdGroup=pgdContainer()
+      const {group:pgdGroup,bgGroup}=pgdContainer()
-      this.layer.add(this.pgdGroup)
+      this.pgdGroup=pgdGroup
+      this.layer.add(bgGroup)
 
       const {group}=initSearch()
       this.layer.add(group)

src/views/zyjhzx/pwanpgong/comps/pgd.js

@@ -2,7 +2,7 @@ import Konva from "konva";
 import QRCode from 'qrcode'
 
 export default function (width,height){
-  const x=width*0.66+40,y=40,_width=width*0.30,_height=height*0.95
+  const x=width*0.66+40,y=40,_width=width*0.30,_height=height*0.954
 
   const container=function (){
     const group=new Konva.Group({

src/views/zyjhzx/pwanpgong/comps/pgdTable.js

@@ -1,7 +1,7 @@
 
 export default function () {
   const options={
-    height:706,
+    height:715,
     align:'center',
     border: true,
     resizable: true,

src/views/zyjhzx/sliao/index.vue

@@ -2,6 +2,7 @@
   <div>
     <div id="sliao" class="sliao" ref="sliao"></div>
     <SliaoSearch ref="sliaoSearch" @search="search" />
+    <TipsComp ref="tipsRef" :msg="msg" />
   </div>
 </template>
 
@@ -17,10 +18,11 @@ import liliao from "@/views/zyjhzx/sliao/comps/liliao";
 import baifang from "@/views/zyjhzx/sliao/comps/baifang";
 import {dict, getSljhPgd, getYcldw, shangLiao} from "@/api/zyjh";
 import {getBzryList} from "@/api/sjzx/bzzGL";
+import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
 
 export default {
   name:'SLiao',
-  components: {SliaoSearch},
+  components: {TipsComp, SliaoSearch},
   data(){
     return {
       title:'上  料  作  业  报  工',
@@ -40,7 +42,9 @@ export default {
       tlt:[],
       dw:[],
       workers:[],
-      zt:'11'
+      zt:'11',
+      msg:null,
+      tipsId:null,
     }
   },
   mounted() {
@@ -76,6 +80,9 @@ export default {
         }
         this.initYcldw();
       })
+      this.sockets.subscribe('tips', data => {
+
+      })
     },
     search(queryParam){
       getSljhPgd(queryParam).then(res=>{

vue.config.js

@@ -31,6 +31,7 @@ module.exports = {
   lintOnSave: false,
   productionSourceMap: false,
   devServer: {
+    host: '192.127.2.129',
     port: port,
     open: true,
     overlay: {