From 187b2cc9a3caf04657affbbc6998359c5d8cf3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 4 Jul 2024 17:51:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=BB=A1=E8=B6=B3=E5=9D=87=E8=A1=A1=E6=8E=92?=
 =?UTF-8?q?=E4=BA=A7=E9=97=AE=E9=A2=98=202.=E5=9C=A8=E6=BB=A1=E8=B6=B3?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=AE=8C=E6=95=B4=E6=80=A7=E7=9A=84=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6,=E5=BD=93=E4=BA=A7=E8=83=BD=E4=B8=8D=E8=B6=B3?=
 =?UTF-8?q?=E6=97=B6=E9=9C=80=E6=95=B4=E6=89=B9=E9=87=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue |  3 ++-
 src/views/jhzx/symxCX.vue     | 31 +++++++++++++++++--------------
 src/views/login/index.vue     |  3 ++-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 3b0e8a4..5371005 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="dashboard-editor-container" style="background-color: #f6fbff;">
+<!--  直观图组件  -->
 <!--    <Czfdzgtcx />-->
-    <Uni />
+<!--    <Uni />-->
     <!--    <div class=" clearfix">-->
     <!--      <pan-thumb :image="avatar" style="float: left">-->
     <!--        &lt;!&ndash; Your roles:-->
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index d86283a..c5de62c 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -17,7 +17,7 @@
               <el-button type="success" @click="initList">查询</el-button>
 <!--              <el-button type="success" @click="initList1">查询1</el-button>-->
               <el-button type="success" @click="save">保存</el-button>
-              <el-button type="success" @click="tqSygd">提交三月滚动</el-button>
+              <el-button type="success" @click="tqSygd">提交月度计划</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -26,10 +26,11 @@
     <el-container style="padding-top: 0px">
       <el-main>
         <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="三月滚动计划编制" name="sygdjh" v-if="isUser">
+          <el-tab-pane label="月度计划编制" name="sygdjh" v-if="isUser">
             <div class="mytable" >
-              <el-button type="success" @click="paichan">三月滚动计划编制</el-button>
-              <el-button type="success" @click="jgcx">读取三月滚动</el-button>
+              <el-button type="success" @click="paichan">月度计划排产</el-button>
+              <el-button type="success" @click="jgcx(false)">获取排产结果</el-button>
+              <el-button type="success" @click="creatYdjh">生成月度计划</el-button>
               <vxe-grid
                 id="id9"
                 ref="xGrid9"
@@ -60,8 +61,8 @@
           </el-tab-pane>
           <el-tab-pane label="前方三月需求计划" name="first">
             <div class="mytable">
-              <el-button type="success" @click="confirmModal">三月滚动计划编制</el-button>
-              <el-button type="success" @click="jgcx">读取三月滚动</el-button>
+              <el-button type="success" @click="confirmModal">月度计划排产</el-button>
+              <el-button type="success" @click="jgcx">生成月度计划</el-button>
               <el-button type="success" @click="symxhz">汇总</el-button>
               <vxe-grid
                 id="id"
@@ -353,7 +354,7 @@ import {mapGetters} from 'vuex'
 import XEUtils from 'xe-utils'
 import {getToken} from '@/utils/auth'
 import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
-import {排产, 生成三月滚动, 获取排产结果,} from "@/api/jhzx/pc";
+import {排产, 生成月度计划, 获取排产结果,} from "@/api/jhzx/pc";
 import Gcrl from '@/components/Gcrl';
 import Sbwxjh from '@/views/sjzx/sbwxjhWH.vue';
 import Sbjgry from '@/views/sjzx/sbjgryWH.vue';
@@ -2766,7 +2767,7 @@ export default {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
     this.initBase()
-    if(this.yhdm=='user01'){
+    if(this.yhdm==='user01'||this.yhdm==='user02'){
       this.isUser=true
     }
   },
@@ -2943,7 +2944,7 @@ export default {
         }
       }
     },
-    //提取三月滚动
+    //提取月度计划
     tqSygd() {
       const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
       tqSygd(data).then((res) => {
@@ -3043,18 +3044,20 @@ export default {
     getHeight() {
       this.height = window.innerHeight - 200
     },
+    creatYdjh(){
+      const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
+      生成月度计划(data).then(res=>{
+        this.list=res.data
+        this.initList()
+      })
+    },
     paichan(){
         this.dialogVisible2=false
         const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
         排产(data).then((res)=>{
           if (res.success){
             this.jgcx(false)
-            生成三月滚动(data).then(res=>{
-              this.list=res.data
-              this.initList()
-            })
           }else{
-            this.jgcx(false)
             this.$message.warning(res.message)
           }
         })
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9388bec..644f73c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -8,6 +8,7 @@
 
       <div class="title-container">
 
+<!--        <h1 class="title">{{ loginForm.zxtmc }}集团信息管理系统</h1>-->
         <h1 class="title">{{ loginForm.zxtmc }}钢加生产管控系统</h1>
         <h3 class="title">{{ loginForm.zxtmc }}登录</h3>
       </div>
@@ -103,7 +104,7 @@
         cgdlList:[],
         cgdlm:"",
         loginForm: {
-          username: 'UserAdmin',
+          username: '',
           password: '',
           zxtbm: '',
           zxtmc: '',