修正

src/api/jhzxgl/pgd.js

@@ -0,0 +1,7 @@
+import request from "@/utils/request";
+
+export function getTzjhPgd(data) {return request({url: '/pgdTzjh/getTzjhPgd', method: 'post', data})}
+export function saveTzjhPgdXd(data) {return request({url: '/pgdTzjh/saveTzjhPgdXd', method: 'post', data})}
+export function saveTzjhPgdXdBack(data) {return request({url: '/pgdTzjh/saveTzjhPgdXdBack', method: 'post', data})}
+export function saveTzjhPgdFk(data) {return request({url: '/pgdTzjh/saveTzjhPgdFk', method: 'post', data})}
+export function getPgdBase(data) {return request({url: '/pgdTzjh/getPgdBase', method: 'post', data})}

src/views/jhzxgl/tzjhD.vue

@@ -1,22 +1,57 @@
 <template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
   <el-container>
     <el-header style="width: 100%; height: 80px;font-size: 12px">
-      <el-form :inline="true"  label-width="65px"  label-position="left">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
+
           <el-col :span="22">
+
             <el-form-item label="船号:">
-              <el-select v-model="queryParam.dcCh" filterable  placeholder="工程编号" @change="czbhChange" >
+              <vxe-pulldown ref="xDown4" transfer >
-                <el-option
+                <template #default>
-                  v-for="item in dictData.cbbm"
+                  <vxe-input
-                  :key="item.cbbm"
+                    v-model="queryParam.dcch"
-                  :label="item.cbbm"
+                    placeholder="船号"
-                  :value="item.cbbm">
+                    style="height: 28px;
-                </el-option>
+                    line-height: 28px; width: 140px;"
-              </el-select>
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
             </el-form-item>
             <el-form-item label="批量:">
-              <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" ></el-input>
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
             </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
           </el-col>
           <el-col :span="2">
             <el-form-item style="float: right" >
@@ -25,17 +60,30 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="20">
+          <el-col :span="14" >
-<!--            <el-form-item label="状态:">-->
+            <el-form-item label="状态:">
-<!--              <el-select v-model="queryParam.zt" filterable  placeholder="状态" @change="czbhChange" >-->
+              <el-select v-model="queryParam.Zt" placeholder="状态" clearable>
-<!--                <el-option-->
+                <el-option
-<!--                  v-for="item in zt"-->
+                  v-for="item in statusOptions"
-<!--                  :key="item.bm"-->
+                  :key="item.value"
-<!--                  :label="item.bmsm"-->
+                  :label="item.label"
-<!--                  :value="item.bm">-->
+                  :value="item.value"
-<!--                </el-option>-->
+                >
-<!--              </el-select>-->
+                </el-option>
-<!--            </el-form-item>-->
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" >
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="success" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">保存</el-button>
+              <el-button type="success" @click="xdClick">下达</el-button>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -56,13 +104,19 @@
               :columns="tableColumn"
               highlight-current-row
               :data="list"
-              :custom-config="{ storage: true }"
+              :scroll-y="{enabled: true}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}"
               highlight-hover-row
               show-overflow
               show-header-overflow
+
             >
+
+
             </vxe-grid>
           </div>
+
+
         </el-main>
       </el-container>
     </el-container>
@@ -71,10 +125,13 @@
 
 <script>
 import {
-  getList,
+ getTzjhPgd,
-  getCzxx
+  saveTzjhPgdFk,
-} from '@/api/jhzx/qfxq'
+  saveTzjhPgdXd,
+  saveTzjhPgdXdBack,
 
+  getPgdBase
+} from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
 import {null2str} from "@/utils/rpkj";
@@ -82,80 +139,146 @@ import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 export default {
-  name:'TzjhD',
+  name:'tzjhD',
   data() {
     return {
       queryParam: {
-        dcCh:'',
+        dcch:'',
-        dcPl:'',
+        pl:'',
-        zt:''
+        fd:'',
+        fkyy:'',
+        zt:'01'
       },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "99",
+          label: "反馈",
+        },
+      ],
       list: [],
-      filedis:true,
-      uploadData:{
-      },
       heads: { token: getToken() },
-      uploadAction: process.env.VUE_APP_BASE_API + '/dmQfxq/upload',
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
-      dictData:{
+      dictData:{},
-        cbbm:[]
-      },
-      zt:[],
       height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
       tableColumn: [
-        { type: 'seq', width: 60, title: '序号' },
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'tzzt', title: '图纸状态', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'czbh', title: '船号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pl', title: '批量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lqbxfrq', title: '领取表下发日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
-        { field: '', title: '船名', width: 120, editRender: { name: 'input' },
+        { field: 'lqbjsrq', title: '领取表接收日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '批量', width: 120, editRender: { name: 'input' },
+
+        { field: 'tltxfrq', title: '套料图下发日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '图名', width: 120, editRender: { name: 'input' },
+
+        { field: 'tltjsrq', title: '套料图接收日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '科室', width: 120, editRender: { name: 'input' },
+
+        { field: 'qgxqrq', title: '切割需求日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '套料图下发', width: 120, editRender: { name: 'input' },
+
+        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '套料图生产需求期', width: 120, editRender: { name: 'input' },
+
+        { field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '套料图接收', width: 120, editRender: { name: 'input' },
+
+        { field: 'zt', title: '状态', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '板材领取表下发', width: 120, editRender: { name: 'input' },
+
+
+
+        { field: 'xfry', title: '下发人员', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '板材领取表生产需求期', width: 120, editRender: { name: 'input' },
+
+        { field: 'xfrq', title: '下发日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '板材领取表接收', width: 120, editRender: { name: 'input' },
+
+        { field: 'fkry', title: '反馈人员', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '零件配套表下发', width: 120, editRender: { name: 'input' },
+
+        { field: 'fkrq', title: '反馈日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '零件配套表生产需求期', width: 120, editRender: { name: 'input' },
+
+        { field: 'fkyy', title: '反馈原因', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: '', title: '零件配套表接收', width: 120, editRender: { name: 'input' },
+        { field: 'bzry', title: '编制人员', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+
+        { field: 'bzrq', title: '编制日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
       ]
     }
   },
@@ -166,48 +289,120 @@ export default {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
     this.initBase()
+
+
   },
   methods: {
+    cellClickEvent({row}) {
+      this.queryParam.dcch = row.cbbm
+      this.$refs.xDown4.hidePanel()
+    },
+    focusEvent4() {
+      this.$refs.xDown4.showPanel()
+    },
+    keyupEvent4() {
+
+
+      if (this.queryParam.dcch) {
+        this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+      } else {
+        this.projectData = this.projectData1.slice(0)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
 
     initBase(){
-      getCzxx({}).then(res=>{
+      getPgdBase({}).then(res=>{
-        this.dictData.cbbm = res.data
+        this.dictData = res.data
+        this.projectData=res.data.cbbm
+        this.projectData1=res.data.cbbm
       })
-      const dict=window.localStorage.getItem('ZTLX');
+    },
-      this.zt=JSON.parse(dict)
+    plClick(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          selectRecords[i].fkyy = this.queryParam.fkyy
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+    saveclick(){
+
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        this.$confirm('取消下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveTzjhPgdXdBack(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '取消下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }else  {
+        this.$confirm('下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveTzjhPgdXd(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
     },
     initList() {
-      if (this.queryParam.dcCh === '') {
+      if (this.queryParam.dcch === '') {
-          this.$message.warning('选择船只编号')
+        this.$message.warning('选择船只编号')
         return
       }
-      getList(this.queryParam).then((res) => {
+      getTzjhPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
         }
 
       })
     },
-    czbhChange(){
-      if (this.queryParam.dcCh === '') {
-        this.filedis=true
-      }else{
-        this.filedis=false
-      }
-    },
     selectChange(row) {
       // this.$refs.xGrid.clearActived() // 清除单元格激活状态
       this.$refs.xGrid.clearEdit() // 清除单元格激活状态
       //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
       null2str(row.row)
     },
-    formatDate ({ cellValue }) {
-      return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
-    },
     getHeight() {
       this.height = window.innerHeight - 190
     },
+
   }
 }
 </script>

src/views/sjzx/bomwh.vue

@@ -132,6 +132,7 @@
             border
             show-header-overflow
             show-overflow
+            height="500px"
             align="center"
             :data="tableupload">
             <vxe-column type="seq" width="50"></vxe-column>
@@ -989,6 +990,7 @@ export default {
     handleChange(file, fileList) {
       this.fileList = fileList
       console.log(file)
+      console.log(fileList)
       const bcph=""
       if (file.name.includes("板材领取表")) {
         this.czbhu=  file.name.split("_")[0]
@@ -1054,6 +1056,9 @@ export default {
       })
       this.queryParam.dcch=this.czbhu
       this.queryParam.dcpl=this.phu
+      // 请求后台 得到需求期
+
+
       this.dialogVisible=true;
     },
     // 删除文件之前的钩子，参数为上传的文件和文件列表，若返回 false 或者返回 Promise 且被 reject，则停止删除。function(file, fileList)