From 5a74ff63f47921f97b6c3c35751b24b085a1a78c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 26 一月 2024 10:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue |   68 +++++++++++++++++++++++++++-------
 1 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index 4c05333..5f79a1d 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -97,7 +97,7 @@
                 >
                   <span
                     v-if="this.model != null"
-                    class="hight"
+                    class="hightColor"
                   >{{ this.model.teamName }}</span>
                   <span
                     v-else
@@ -107,9 +107,9 @@
               </a-col>
             </a-row>
             <a-row :gutter="24">
-              <a-col :span="24">
+              <a-col :span="17">
                 <a-form-item
-                  label="闂鍙婂鐞嗘帾鏂芥弿杩�"
+                  label="闂/澶勭悊鎺柦"
                   :labelCol="{span:3}"
                   :wrapperCol="{span:18}"
                   class="hightColor"
@@ -119,6 +119,21 @@
                     :disabled="this.model.status!='4'"
                     :placeholder="'璇疯緭鍏ラ棶棰樺強澶勭悊鎺柦鎻忚堪'"
                     v-model="model.description"
+                  />
+                </a-form-item>
+              </a-col>
+              <a-col :span="7">
+                <a-form-item
+                  label="鎶ュ伐浜�"
+                  :labelCol="{span:4}"
+                  :wrapperCol="{span:17}"
+                  class="hightColor"
+                >
+                  <a-input
+                    :disabled="this.model.status!='4'"
+                    allow-clear
+                    placeholder="璇疯緭鍏ユ姤宸ヤ汉"
+                    v-model="model.maintenanceUserId"
                   />
                 </a-form-item>
               </a-col>
@@ -222,7 +237,7 @@
               </div>
             </a-tab-pane>
 
-            <a-tab-pane
+            <!-- <a-tab-pane
               tab='璁″垝鐢ㄦ枡'
               key="2"
             >
@@ -269,7 +284,7 @@
                   :equipmentId="this.model.equipmentId"
                 ></actual-material-edit-table>
               </div>
-            </a-tab-pane>
+            </a-tab-pane>-->
             <a-tab-pane
               tab='瀹為檯宸ユ椂'
               key="6"
@@ -385,6 +400,18 @@
         xs: { span: 24 },
         sm: { span: 18 },
       },
+      /* 鍒嗛〉鍙傛暟 */
+      ipagination: {
+        current: 1,
+        pageSize: 99,
+        pageSizeOptions: ['99'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
       validatorRules: {
         // description: {
         //   rules: [
@@ -405,7 +432,7 @@
 
         },
         {
-          title: '閮ㄤ綅',
+          title: '淇濆吇閮ㄤ綅',
           align: 'center',
           dataIndex: 'location',
         },
@@ -418,12 +445,12 @@
         // },
         // class: "notshow"
         {
-          title: '淇濆吇椤圭洰',
+          title: '淇濆吇鍐呭',
           align: 'center',
           dataIndex: 'maintenanceProjectNum',
         },
         {
-          title: '淇濆吇鏍囧噯',
+          title: '楠屾敹鏍囧噯',
           align: 'center',
           dataIndex: 'standard',
         },
@@ -513,11 +540,11 @@
           // }
           //update-begin---author:zhangyafei    Date:20201118  for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
           this.dataSource = res.result.records || res.result;
-          if (res.result.total) {
-            this.ipagination.total = res.result.total;
-          } else {
-            this.ipagination.total = 0;
-          }
+          // if (res.result.total) {
+          //   this.ipagination.total = res.result.total;
+          // } else {
+          //   this.ipagination.total = 0;
+          // }
           //update-end---author:zhangyafei    Date:20201118  for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
         } else {
           this.$message.warning(res.message)
@@ -582,13 +609,26 @@
     handleReport() {
       const that = this;
       that.confirmLoading = true;
+      for (let i = 0; i < that.dataSource.length; i++) {
+        let o = this.dataSource[i]
+        if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
+          that.$message.warning("璇峰～鍐欑" + (i + 1) + "淇濆吇浜猴紒");
+          that.confirmLoading = false;
+          return
+        }
+      }
+      if (that.model.maintenanceUserId == null || that.model.maintenanceUserId == "") {
+        that.$message.warning("璇峰～鍐欐姤宸ヤ汉锛�");
+        that.confirmLoading = false;
+        return
+      }
       this.$confirm({
         title: '淇濆吇宸ュ崟鎶ュ伐',
         content: '鎻愮ず锛氭姤宸ュ悗淇濆吇瀹屽伐锛岃璋ㄦ厧鎿嶄綔锛�',
         okText: '纭',
         cancelText: '鍙栨秷',
         onOk() {
-          requestPut(that.url.report, { id: that.model.id, status: '5', description: that.model.description }).then((res) => {
+          requestPut(that.url.report, { id: that.model.id, status: '5', description: that.model.description, dailyMaintenanceOrderDetails: that.dataSource, maintenanceUserId: that.model.maintenanceUserId }).then((res) => {
             if (res.success) {
               that.model.status = '5'
               that.$message.success(res.message)

--
Gitblit v1.9.3