From ecf3c9735379270912d16f37c486d085b36f4c8a Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期二, 30 一月 2024 09:48:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-ui/src/views/main/bs/orderScheduling/index.vue |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index d14ee27..97cf8d4 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -145,6 +145,15 @@
               v-hasPermi="['bs:orderScheduling:export']"
             >瀵煎嚭</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-close"
+              size="mini"
+              @click="handleClose"
+            >鍏抽棴</el-button>
+          </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
@@ -301,33 +310,34 @@
         <el-form-item label="鏈哄瀷" prop="model">
           <el-input v-model="form.model" placeholder="璇疯緭鍏ユ満鍨�" />
         </el-form-item>
-        <el-form-item label="鐢熶骇鐘舵��" prop="productionStatus">
-          <el-radio-group v-model="form.productionStatus">
-<!--            <el-radio-->
-<!--              v-for="dict in dict.type.${dictType}"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.value"-->
-<!--            >{{dict.label}}</el-radio>-->
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="鐢熶骇鐘舵��" prop="productionStatus">-->
+<!--          <el-radio-group v-model="form.productionStatus">-->
+<!--&lt;!&ndash;            <el-radio&ndash;&gt;-->
+<!--&lt;!&ndash;              v-for="dict in dict.type.${dictType}"&ndash;&gt;-->
+<!--&lt;!&ndash;              :key="dict.value"&ndash;&gt;-->
+<!--&lt;!&ndash;              :label="dict.value"&ndash;&gt;-->
+<!--&lt;!&ndash;            >{{dict.label}}</el-radio>&ndash;&gt;-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
         <el-form-item label="宸ユ椂" prop="workingHours">
           <el-input v-model="form.workingHours" placeholder="璇疯緭鍏ュ伐鏃�" />
         </el-form-item>
         <el-form-item label="褰撳墠宸ヤ綅" prop="currentWorkstation">
           <el-input v-model="form.currentWorkstation" placeholder="璇疯緭鍏ュ綋鍓嶅伐浣�" />
         </el-form-item>
-        <el-form-item label="璐ㄩ噺鐘舵��" prop="qualityStatus">
-          <el-radio-group v-model="form.qualityStatus">
+<!--        <el-form-item label="璐ㄩ噺鐘舵��" prop="qualityStatus">-->
+<!--          <el-radio-group v-model="form.qualityStatus">-->
 <!--            <el-radio-->
 <!--              v-for="dict in dict.type.${dictType}"-->
 <!--              :key="dict.value"-->
 <!--              :label="dict.value"-->
 <!--            >{{dict.label}}</el-radio>-->
-          </el-radio-group>
-        </el-form-item>
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
         <el-form-item label="鏄惁鎵撳嵃" prop="whetherOrPrint">
           <el-input v-model="form.whetherOrPrint" placeholder="璇疯緭鍏ユ槸鍚︽墦鍗�" />
         </el-form-item>
+
         <el-form-item label="鍚堢鎶ュ伐" prop="report10">
           <el-input v-model="form.report10" placeholder="璇疯緭鍏ュ悎绠辨姤宸�" />
         </el-form-item>
@@ -605,6 +615,11 @@
       this.download('bs/orderScheduling/export', {
         ...this.queryParams
       }, `orderScheduling_${new Date().getTime()}.xlsx`)
+    },
+    /** 杩斿洖鎸夐挳鎿嶄綔 */
+    handleClose() {
+      const obj = { path: "/main/om/productionOrde" };
+      this.$tab.closeOpenPage(obj);
     }
   }
 };

--
Gitblit v1.9.3