From 229e4dee0dbb1fc83e8254e465c10826259aef74 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 16 十一月 2022 10:53:20 +0800
Subject: [PATCH] 1.班组、人员工资报表求和统计

---
 src/views/scgl/scdd.vue |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 262793f..18b0ff6 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -55,7 +55,7 @@
             <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
               <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label="棰勮寮�宸ユ椂闂�" label-width="100px" style=" line-height: 40px;;display: flex;font-size: 14px;">
+            <el-form-item v-show="isExpandForm" label="棰勮寮�宸ユ椂闂�" label-width="100px" style="display: flex;font-size: 14px;align-items: center">
               <el-date-picker
                 v-model="form.paystartdate"
                 type="daterange"
@@ -71,7 +71,7 @@
               <!--              :picker-options="expireTimeOption"-->
 
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;">
+            <el-form-item v-show="isExpandForm" label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;align-items: center">
               <el-date-picker
                 v-model="form.payenddate"
                 type="daterange"
@@ -135,6 +135,7 @@
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
           @sort-change="sortChange"
+          @row-click="rowClick"
         >
           <!--          <el-table-column-->
           <!--            type="selection"-->
@@ -149,8 +150,8 @@
                 v-model="radioSelectedId"
                 :label="row.id"
                 style="color: transparent;padding-left: 10px;"
-                @change.native="getCurrentRow(row.id)"
               />
+              <!--              @change.native="getCurrentRow(row.id)"-->
             </template>
           </el-table-column>
           <el-table-column
@@ -189,11 +190,13 @@
             label="浜у搧鍚嶇О"
             sortable="custom"
             min-width="150"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="partspec"
             label="浜у搧瑙勬牸"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="110"
           >
             <template slot-scope="{row}">
@@ -370,7 +373,12 @@
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
           <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button type="primary" :disabled="sendButtonIsDisabled" @click="dialogVisibleConfirm">涓� 杈�</el-button>
+          <el-button
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >涓� 杈�</el-button>
         </div>
       </span>
     </el-dialog>
@@ -580,6 +588,9 @@
     getCurrentRow(id) {
       this.radioSelectedId = id
     },
+    rowClick(row) {
+      this.radioSelectedId = row.id
+    },
     // 璁㈠崟鍏抽棴
     async orderClose() {
       if (this.radioSelectedId.length < 1) {
@@ -653,7 +664,6 @@
       this.dialogForm.ordernum = ''
       this.dialogForm.relse_qty = ''
 
-      this.sendButtonIsDisabled = false
       this.$refs.dialogForm.clearValidate()
     },
     // 瀵硅瘽妗嗗彇娑�
@@ -670,13 +680,13 @@
         return this.$message.info('涓嬪崟鏁伴噺瓒呭嚭鍙笅鍗曟暟鐨勮寖鍥达紒')
       }
 
-      console.log(this.dialogForm.ordernum < this.dialogForm.markqty)
       if (this.dialogForm.ordernum < 1 || this.dialogForm.ordernum > this.dialogForm.markqty) {
         return this.$message.info('涓嬪崟鍗曟暟瓒呭嚭鍙笅鍗曞崟鏁扮殑鑼冨洿锛�')
       }
 
       this.$refs.dialogForm.validate(valid => {
         if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
           const data = {
             'erporderid': this.dialogForm.erporderid,
             // 'erporderstus': this.dialogForm.erporderstus,
@@ -689,12 +699,12 @@
             'ordernum': this.dialogForm.ordernum,
             'relse_qty': this.dialogForm.relse_qty
           }
-          this.sendButtonIsDisabled = true
           MarkSaveErpOrder(data).then(res => {
             if (res.code === '200') {
-              this.$message.success('涓嬭揪鎴愬姛锛�')
               this.dialogVisible = false
+              this.$message.success('涓嬭揪鎴愬姛锛�')
               this.getErpOrderSearch()
+              this.$store.state.app.buttonIsDisabled = false
             } else {
               this.$message.error('涓嬭揪澶辫触锛�')
             }
@@ -839,15 +849,18 @@
     height: 100% !important;
   }
 }
+
 </style>
 <style>
 .el-table .custom-row {
   background: #f8f8fa;
 }
-</style>
-<style>
 .osloading{
-  font-size: 40px;
+  font-size: 26px !important;
 }
 
+.el-loading-text{
+  font-size: 26px !important;
+}
 </style>
+

--
Gitblit v1.9.3