From 7864b173683ee7a73dc91d00ed1105dd07deaa84 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 26 二月 2024 14:37:02 +0800
Subject: [PATCH] 车间看板页面背景图尺寸调整为固定尺寸，不随屏幕分辨率改变而改变

---
 src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue |   74 ++++++++++++++++++++++++++++++-------
 1 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index 60a0ef4..5e9f9f4 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -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>
@@ -417,11 +432,11 @@
           }
 
         },
-        {
-          title: '閮ㄤ綅',
-          align: 'center',
-          dataIndex: 'location',
-        },
+        // {
+        //   title: '閮ㄤ綅',
+        //   align: 'center',
+        //   dataIndex: 'location',
+        // },
         // class: "notshow"
         // {
         //   title: '绀烘剰鍥�',
@@ -431,15 +446,15 @@
         // },
         // class: "notshow"
         {
-          title: '淇濆吇椤圭洰',
+          title: '淇濆吇鍐呭',
           align: 'center',
           dataIndex: 'maintenanceProjectNum',
         },
-        {
-          title: '淇濆吇鏍囧噯',
-          align: 'center',
-          dataIndex: 'standard',
-        },
+        // {
+        //   title: '淇濆吇鏍囧噯',
+        //   align: 'center',
+        //   dataIndex: 'standard',
+        // },
         // {
         //   title: '鏂规硶',
         //   align: 'center',
@@ -599,13 +614,31 @@
     handleReport() {
       const that = this;
       that.confirmLoading = true;
+      for (let i = 0; i < that.dataSource.length; i++) {
+        let o = this.dataSource[i]
+        if (o.maintenanceOrderDetailUda2 == null || o.maintenanceOrderDetailUda2 == '') {
+          that.$message.warning("璇峰～鍐欑" + (i + 1) + "鎵ц鎯呭喌锛�");
+          that.confirmLoading = false;
+          return
+        }
+        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)
@@ -657,6 +690,19 @@
     handleOk() {
       const that = this
       this.loading = true;
+      for (let i = 0; i < that.dataSource.length; i++) {
+        let o = this.dataSource[i]
+        if (o.maintenanceOrderDetailUda2 == null || o.maintenanceOrderDetailUda2 == '') {
+          that.$message.warning("璇峰～鍐欑" + (i + 1) + "鎵ц鎯呭喌锛�");
+          that.loading = false;
+          return
+        }
+        if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
+          that.$message.warning("璇峰～鍐欑" + (i + 1) + "淇濆吇浜猴紒");
+          that.loading = false;
+          return
+        }
+      }
       this.form.validateFields((err, values) => {
         if (!err) {
           that.confirmLoading = true

--
Gitblit v1.9.3