From 2e365b85a27a3aea69d51567c093537c2c61a06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Wed, 16 Apr 2025 17:32:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E4=B8=8A=E6=96=99=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=202.=E5=A2=9E=E5=8A=A0=E7=90=86=E8=AE=BA=E5=B7=A5?=
 =?UTF-8?q?=E6=97=B6=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jhzx/ydjhzxCX.vue      | 31 ++++++++++++++++++++++---------
 src/views/zyjhzx/sliao/index.vue |  5 +++--
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue
index 8fe3f48..17b918b 100644
--- a/src/views/jhzx/ydjhzxCX.vue
+++ b/src/views/jhzx/ydjhzxCX.vue
@@ -2,11 +2,11 @@
 <!--  月度计划管理 -->
   <el-container>
     <el-header style="width: 100%; height: 50px;font-size: 12px">
-      <el-form :inline="true"  label-width="82px"  label-position="left">
+      <el-form :inline="true"  label-width="50px"  label-position="left">
         <el-row>
-          <el-col :span="10" >
+          <el-col :span="7" >
             <el-form-item label="月份:">
-              <el-date-picker v-model="queryParam.yf" value-format="yyyy/MM/dd"  type="month"  style="width: 80%;" />
+              <el-date-picker v-model="queryParam.yf" value-format="yyyy/MM/dd" type="month" />
             </el-form-item>
             <el-form-item label="状态:">
               <el-select v-model="queryParam.zt" placeholder="状态" clearable>
@@ -20,7 +20,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4" >
+          <el-col :span="6" >
             <el-form-item>
               <el-select v-model="plParam.zyq" filterable  placeholder="作业区">
                 <el-option
@@ -31,12 +31,15 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item>
+              <el-input v-model="plParam.qgllgs" placeholder="切割理论工时" clearable />
+            </el-form-item>
             <el-form-item>
               <el-button type="success" @click="plsr">批量录入</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="5" >
-            <el-form-item label="完工情况：" >
+            <el-form-item label="完工情况：" label-width="82px">
               <el-radio-group   v-model="wgqk" @change="changeData" v-show="activeName=='first'">
                 <el-radio  label="0" >全部</el-radio>
                 <el-radio  label="1" >已完工</el-radio>
@@ -692,6 +695,14 @@ export default {
         //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
         //   filterRender: { name: 'FilterCombination' }
         // },
+        {
+          field: 'qgllgs',
+          title: '切割理论工时',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+          editRender:{ name: '$input'},
+        },
         {
           field: 'qgpgrq',
           title: '切割派工日期',
@@ -700,15 +711,15 @@ export default {
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'qgfkrq',
-          title: '切割报工日期',
+          field: 'qgpgry',
+          title: '切割派工人',formatter:this.formatWorker,
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'qgpgry',
-          title: '切割派工人',formatter:this.formatWorker,
+          field: 'qgfkrq',
+          title: '切割报工日期',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -951,12 +962,14 @@ export default {
       }
       for (const item of data) {
         item.zyq=this.plParam.zyq||item.zyq
+        item.qgllgs=this.plParam.qgllgs||item.qgllgs
         for (const _item of this.zyqList) {
           if(_item.value===this.plParam.zyq){
             item.zyq1=_item.label
           }
         }
       }
+      this.$refs.xGrid.loadData(this.list)
     },
     zyqChange({row}){
       for (const item of this.zyqList) {
diff --git a/src/views/zyjhzx/sliao/index.vue b/src/views/zyjhzx/sliao/index.vue
index 1d4d875..e037bc1 100644
--- a/src/views/zyjhzx/sliao/index.vue
+++ b/src/views/zyjhzx/sliao/index.vue
@@ -225,7 +225,6 @@ export default {
 
         shangLiaos(jh).then(res=>{
           this.selectedJh=[]
-          this.plslflag=false
           if (!res.success){
             this.drawSljhItem(this.sljhItemList.r('0:200'))
             return;
@@ -244,8 +243,10 @@ export default {
                 this.$delete(this.sljhItemList, index);
               }
             })
-            this.drawSljhItem(this.sljhItemList.r('0:200'))
           }
+          this.drawSljhItem(this.sljhItemList.r('0:200'))
+          this.plslList=[]
+          this.plslflag=false
           this.drawBaiFang(this.dw[this.currentDwIndex].list)
           this.initYcldw();
         })