Merge remote-tracking branch 'origin/master'

src/api/jhzx/sygd.js

@@ -10,3 +10,5 @@ export function sygdPC() {return request({url: '/dmSygdMx/sygdPC', method: 'post
 export function tqSygd() {return request({url: '/dmSygdMx/tqSygd', method: 'post'})}
 export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'post'})}
 export function saveMxList() {return request({url: '/dmSygdMx/saveList', method: 'post'})}
+export function getYdjh(data) {return request({url: '/dmYdjh/getList', method: 'post', data})}
+export function tjydjh() {return request({url: '/dmYdjh/tjydjh', method: 'post'})}

src/views/jhzx/gdxqDR.vue

@@ -120,6 +120,7 @@ export default {
       dictData:[],
       height: '500px',
       tableColumn:[
+
         { field: 'dcCh', title: '船只', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -262,19 +263,12 @@ export default {
       return cellValue
     },
     footerMethod({ columns, data }){
-
       return [
         columns.map((column, columnIndex) => {
           if (columnIndex === 0) {
             return '合计'
           }
           return this.sumNum(data, column.property)
-          // if (['yf08'].includes(column.property)) {
-          //   console.log(123)
-          //   return this.sumNum(data, column.property)
-          // }
-          //
-          // return null
         })
       ]
     },

src/views/jhzx/qfxqCX.vue

@@ -5,14 +5,36 @@
         <el-row>
           <el-col :span="22">
             <el-form-item label="船号:">
-              <el-select v-model="queryParam.dcCh" filterable  placeholder="工程编号" @change="czbhChange" >
-                <el-option
-                  v-for="item in dictData.cbbm"
-                  :key="item.cbbm"
-                  :label="item.cbbm"
-                  :value="item.cbbm">
-                </el-option>
-              </el-select>
+            <vxe-pulldown ref="xDown4" transfer >
+              <template #default>
+                <vxe-input
+                  v-model="queryParam.dcch"
+                  placeholder="船号"
+                  style="height: 28px;
+                    line-height: 28px; width: 150px;"
+                  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>
@@ -25,7 +47,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="20">
+          <el-col :span="22">
             <el-form-item label="状态:">
               <el-select v-model="queryParam.zt" filterable  placeholder="状态" @change="czbhChange" >
                 <el-option
@@ -79,8 +101,7 @@ import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
 import {null2str} from "@/utils/rpkj";
 import { getToken } from '@/utils/auth'
-import { startLoading, endLoading } from '@/utils'
-import { Message } from 'element-ui'
+import {getCzplBase} from "@/api/sjzx/jcsj";
 export default {
   name:'QfxqCX',
   data() {
@@ -91,6 +112,16 @@ export default {
         zt:''
       },
       list: [],
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
       filedis:true,
       uploadData:{
       },
@@ -170,11 +201,31 @@ export default {
     this.initList()
   },
   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)
+      }
 
+    },
     initBase(){
       getCzxx({}).then(res=>{
         this.dictData.cbbm = res.data
       })
+      getCzplBase({}).then(res=>{
+        this.projectData=res.data.cbbm
+        this.projectData1=res.data.cbbm
+      })
       const dict=window.localStorage.getItem('ZTLX');
       this.zt=JSON.parse(dict)
     },

src/views/jhzx/sygdWH.vue

@@ -13,7 +13,6 @@
             <el-form-item label="状态:" >
               <el-select
                 v-model="queryParam.gdZt"
-                placeholder="状态"
                 clearable
                 disabled
               >
@@ -109,7 +108,7 @@ export default {
       queryParam: {
         beginTime:'2023/08/01',
         endTime:'2023/10/01',
-        // gdZt:'0'
+        gdZt:'0'
       },
       gdZtOptions:[
         {

src/views/jhzx/xbjhCX.vue

@@ -71,8 +71,6 @@
           :footer-method="footerMethod"
           :footer-cell-class-name="footerCellClassName"
           :data="arrList"
-          @checkbox-all="selectAllEvent"
-          @checkbox-change="selectChangeEvent"
         >
           <vxe-column type="seq" width="80" :resizable="false" show-overflow>
             <template #header>
@@ -108,6 +106,7 @@
 <script>
 import { getList, tj, save, upload } from "@/api/jhzx/xbjhWH";
 import { getCzxx } from "@/api/jhzx/qfxq";
+import XEUtils from "xe-utils";
 export default {
   name: "xbjhCX",
   data() {
@@ -169,6 +168,7 @@ export default {
           em.zl = em.zl ? em.zl : null;
         });
       });
+
       this.tableData = data;
       this.leftColumn = []; //左侧列数据
       this.topColumn = []; //顶部列数据
@@ -251,6 +251,7 @@ export default {
         }
       }
       this.arrList = Object.values(objeckList); //data数据
+
     },
 
     // 上传excel
@@ -312,13 +313,13 @@ export default {
       } else {
         this.request.nf = "";
       }
-      // if()
       getList(params).then((res) => {
         if (res.success) {
           this.checkedList = {};
           this.getTableList(res.data);
         }
       });
+
     },
     // 表尾列求和
     total(list, field) {
@@ -331,17 +332,26 @@ export default {
       return count;
     },
     footerMethod({ columns, data }) {
-      const totalList = []; //合计
-      columns.forEach((column) => {
-        if (["checkbox"].includes(column.property)) {
-          return "合并了";
+      console.log( columns, data)
+      return [
+        columns.map((column, columnIndex) => {
+          if (columnIndex === 0) {
+            return '合计'
+          }
+          return this.sumNum(data, column.property)
+        })
+      ]
+    },
+    sumNum(list, field) {
+      let count = 0
+      list.forEach(item => {
+        let num = Number(item[field])
+        if (!XEUtils.isNumber(num) || isNaN(num)) {
+          num = 0
         }
-        var totalData = null;
-        totalData = this.total(data, column.property);
-        totalList.push(totalData);
-      });
-      totalList[0] = "合计";
-      return [totalList];
+        count = this.cal.accAdd(count, num)
+      })
+      return count==0?'-':count;
     },
     // 头部header css
     headerCellClassName({ column, $rowIndex }) {

src/views/jhzx/ydjhzxGL.vue

@@ -12,7 +12,7 @@
           <el-col :span="9">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
-              <el-button type="success" @click="initList">提交月度计划</el-button>
+              <el-button type="success" @click="tjydjh">提交月度计划</el-button>
               <el-button type="success" @click="initList">保存</el-button>
             </el-form-item>
           </el-col>
@@ -199,7 +199,7 @@
 <script>
 import router from "@/router";
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getList, sygdPC, saveByDcch, tqSygd, symxhz, getCnsb, saveMxList} from '@/api/jhzx/sygd'
+import {getYdjh, tjydjh, getCnsb} from '@/api/jhzx/sygd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
 import { getToken } from '@/utils/auth'
@@ -247,7 +247,7 @@ export default {
         { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'jssj', title: '组立结束时间',width: 110,
+        { field: 'jssj', title: '前方需求时间',width: 110,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
         { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
@@ -794,7 +794,7 @@ export default {
         this.$message.warning('选择时间范围')
         return
       }
-      getList(this.queryParam).then((res) => {
+      getYdjh(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
@@ -807,22 +807,14 @@ export default {
       return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
     },
     getHeight() {
-      this.height = window.innerHeight - 200
+      this.height = window.innerHeight - 230
     },
-    //明细排产
-    sygdPC() {
-      this.$store.dispatch('app/closeSideBar',true)
-      sygdPC().then((res) => {
-        if(res.data.no_tlt){
-          this.selectMbch=res.data
-          this.haveTltBoms=res.data.haveTltBoms
-          this.dialogVisible=true;
-        }else {
-          this.list = res.data.mxList
-          if (this.$refs.xGrid) {
-            this.$refs.xGrid.loadData(this.list)
-          }
-        }
+    //提取月度计划
+    tjydjh() {
+      tjydjh().then((res) => {
+            if (res){
+              this.list=res.data
+            }
       })
       this.activeName='first'
     }

src/views/login/index.vue

@@ -57,22 +57,6 @@
           </span>
         </el-form-item>
       </el-tooltip>
-
-      <!--<el-form-item prop="username">-->
-      <!--<span class="svg-container">-->
-      <!--<svg-icon icon-class="user" />-->
-      <!--</span>-->
-      <!--<el-input-->
-      <!--ref="zxtbm"-->
-      <!--v-model="loginForm.zxtbm"-->
-      <!--placeholder="Username"-->
-      <!--name="zxtbm"-->
-      <!--type="text"-->
-      <!--tabindex="1"-->
-      <!--autocomplete="on"-->
-      <!--/>-->
-      <!--</el-form-item>-->
-
       <template >
         <div align="center" >
           <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">账号登陆</el-button>
@@ -308,10 +292,11 @@
         height: 47px;
         caret-color: $cursor;
 
-        &:-webkit-autofill {
-          box-shadow: 0 0 0px 1000px $bg inset !important;
-          -webkit-text-fill-color: $cursor !important;
-        }
+        //账号密码自动填充
+        //&:-webkit-autofill {
+        //  box-shadow: 0 0 0px 1000px $bg inset !important;
+        //  -webkit-text-fill-color: $cursor !important;
+        //}
       }
     }
 

src/views/sjzx/gcrlWH.vue

@@ -87,11 +87,11 @@ export default {
           title: "星期",
           align: "center",
         },
-        {
-          field: "yz",
-          title: "月周",
-          align: "center",
-        },
+        // {
+        //   field: "yz",
+        //   title: "月周",
+        //   align: "center",
+        // },
         {
           field: "nz",
           title: "年周",
@@ -138,7 +138,7 @@ export default {
     window.addEventListener("resize", this.getHeight);
     this.getHeight();
     var date=new Date;
-    var year=date.getFullYear(); 
+    var year=date.getFullYear();
     this.request.nf = year;
     this.typeList();
     this.initList();

src/views/sjzx/sbcnWH.vue

@@ -4,7 +4,7 @@
     <el-header style="width: 100%">
       <el-form ref="requestForm" :model="request" label-width="80px">
         <el-row>
-          <el-col :span="4">
+          <el-col :span="8">
             <el-form-item label="跨位:">
               <el-select v-model="request.kw" placeholder="跨位" clearable>
                 <el-option
@@ -17,13 +17,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="设备名称:">
-              <el-input
-                v-model="request.sbmc"
-                placeholder="设备名称"
-                clearable
-              />
-            </el-form-item>
+<!--            <el-form-item label="设备名称:">-->
+<!--              <el-input-->
+<!--                v-model="request.sbmc"-->
+<!--                placeholder="设备名称"-->
+<!--                clearable-->
+<!--              />-->
+<!--            </el-form-item>-->
           </el-col>
           <el-col :span="16" style="text-align: right">
             <el-button type="success" @click="toolbarButtonClickEvent('insert')"
@@ -117,6 +117,28 @@ export default {
       tableColumn: [
         { type: "checkbox", width: "50", align: "center" },
         { type: "seq", width: "50", title: "序号", align: "center" },
+        // {
+        //   field: "sbbh",
+        //   title: "设备编号",
+        //   align: "center",
+        //   minWidth: "90",
+        //   slots: { edit: "sbbh_edit" },
+        //   filters: [
+        //     {
+        //       data: {
+        //         checks: [],
+        //         sVal: "",
+        //         sMenu: "",
+        //         fType1: "",
+        //         fVal1: "",
+        //         fMode: "and",
+        //         fType2: "",
+        //         fVal2: "",
+        //       },
+        //     },
+        //   ],
+        //   filterRender: { name: "FilterCombination" },
+        // },
         {
           field: "kw",
           title: "跨位",
@@ -148,7 +170,11 @@ export default {
           title: "工序",
           align: "center",
           minWidth: "70",
-          editRender: { name: "input" },
+          editRender: {
+            name: "$select",
+            options: [],
+            props: { clearable: true },
+          },
           filters: [
             {
               data: {
@@ -167,7 +193,7 @@ export default {
         },
         {
           field: "szcs",
-          title: "所属部门",
+          title: "设备所属部门",
           align: "center",
           minWidth: "90",
           editRender: {
@@ -223,29 +249,6 @@ export default {
           ],
           filterRender: { name: "FilterCombination" },
         },
-        {
-          field: "sbbh",
-          title: "设备编号",
-          align: "center",
-          minWidth: "90",
-          editRender: { name: "input" },
-          slots: { edit: "sbbh_edit" },
-          filters: [
-            {
-              data: {
-                checks: [],
-                sVal: "",
-                sMenu: "",
-                fType1: "",
-                fVal1: "",
-                fMode: "and",
-                fType2: "",
-                fVal2: "",
-              },
-            },
-          ],
-          filterRender: { name: "FilterCombination" },
-        },
         {
           field: "sbcn",
           title: "产能（每小时）",
@@ -273,7 +276,11 @@ export default {
           title: "产能单位",
           align: "center",
           minWidth: "90",
-          editRender: { name: "input" },
+          editRender: {
+            name: "$select",
+            options: [],
+            props: { clearable: true },
+          },
           filters: [
             {
               data: {
@@ -291,8 +298,8 @@ export default {
           filterRender: { name: "FilterCombination" },
         },
         {
-          field: "dwsj",
-          title: "产能系数",
+          field: "",
+          title: "设备默认排产顺序",
           align: "center",
           minWidth: "90",
           editRender: { name: "input" },
@@ -330,8 +337,47 @@ export default {
     this.emSbjbbZM("bmbm");
     this.getBMMCBM();
     this.initList();
+    this.initgxList();
+    this.initdwList();
   },
   methods: {
+    //工序 xn20231110
+    initgxList(){
+      const dict=window.localStorage.getItem( 'PCGX');
+      const gxList =JSON.parse(dict)
+        this.$nextTick(() => {
+          const tableRef = this.$refs.tableRef;
+          const gx = tableRef.getColumnByField("gx");
+          const testList = [];
+          for (let i = 0; i < gxList.length; i++) {
+            const temp = {
+              label: gxList[i].bmsm,
+              value: gxList[i].bm,
+            };
+            testList.push(temp);
+          }
+          gx.editRender.options = testList;
+        });
+
+    },
+    initdwList(){
+      const dict=window.localStorage.getItem( 'JLDW');
+      const dwList =JSON.parse(dict)
+        this.$nextTick(() => {
+          const tableRef = this.$refs.tableRef;
+          const dw = tableRef.getColumnByField("dw");
+          const testList = [];
+          for (let i = 0; i < dwList.length; i++) {
+            const temp = {
+              label: dwList[i].bmsm,
+              value: dwList[i].bm,
+            };
+            testList.push(temp);
+          }
+          dw.editRender.options = testList;
+        });
+
+    },
     // 部门对应设备名称和编号
     getBMMCBM() {
       getBMMCBM().then((res) => {