From 04b8eff075a04db23e6f908855699b4d2954588c Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期四, 23 五月 2024 18:47:01 +0800
Subject: [PATCH] 380新产品,优化

---
 jcdm-ui/src/views/main/bs/orderScheduling/index.vue |  441 +++++++++++++++++++++++++-----------------------------
 1 files changed, 204 insertions(+), 237 deletions(-)

diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index c92d6e2..4fb42a3 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -10,15 +10,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="鍙戝姩鏈哄彿" prop="engineNo">
-            <el-input
-              v-model="queryParams.engineNo"
-              placeholder="璇疯緭鍏ュ彂鍔ㄦ満鍙�"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
           <el-form-item label="鏈哄瀷" prop="model">
             <el-input
               v-model="queryParams.model"
@@ -27,119 +18,87 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-
-          <el-form-item label="宸ユ椂" prop="workingHours">
-            <el-input
-              v-model="queryParams.workingHours"
-              placeholder="璇疯緭鍏ュ伐鏃�"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+          <el-form-item label="鐢熶骇鐘舵��" prop="productionStatus">
+            <el-select v-model="queryParams.productionStatus" placeholder="璇烽�夋嫨宸ュ崟鐘舵��" clearable>
+              <el-option
+                v-for="dict in dict.type.order_scheduling_produce_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"/>
+            </el-select>
           </el-form-item>
-          <el-form-item label="褰撳墠宸ヤ綅" prop="currentWorkstation">
-            <el-input
-              v-model="queryParams.currentWorkstation"
-              placeholder="璇疯緭鍏ュ綋鍓嶅伐浣�"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="鏄惁鎵撳嵃" prop="whetherOrPrint">
-            <el-input
-              v-model="queryParams.whetherOrPrint"
-              placeholder="璇疯緭鍏ユ槸鍚︽墦鍗�"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="10鎶ュ伐" prop="report10">
-            <el-input
-              v-model="queryParams.report10"
-              placeholder="璇疯緭鍏�10鎶ュ伐"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="20鎶ュ伐" prop="report20">
-            <el-input
-              v-model="queryParams.report20"
-              placeholder="璇疯緭鍏�20鎶ュ伐"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="鎿嶄綔浜�" prop="operator">
-            <el-input
-              v-model="queryParams.operator"
-              placeholder="璇疯緭鍏ユ搷浣滀汉"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-<!--          <el-form-item label="棰勭暀瀛楁1" prop="spareField1">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.spareField1"-->
-<!--              placeholder="璇疯緭鍏ラ鐣欏瓧娈�1"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="棰勭暀瀛楁2" prop="spareField2">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.spareField2"-->
-<!--              placeholder="璇疯緭鍏ラ鐣欏瓧娈�2"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="棰勭暀瀛楁3" prop="spareField3">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.spareField3"-->
-<!--              placeholder="璇疯緭鍏ラ鐣欏瓧娈�3"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="棰勭暀瀛楁4" prop="spareField4">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.spareField4"-->
-<!--              placeholder="璇疯緭鍏ラ鐣欏瓧娈�4"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.createUser"-->
-<!--              placeholder="璇疯緭鍏ュ垱寤虹敤鎴�"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.updateUser"-->
-<!--              placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="澶囨敞" prop="remarks">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.remarks"-->
-<!--              placeholder="璇疯緭鍏ュ娉�"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
           <el-form-item style="float: right">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
             <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
           </el-form-item>
         </el-form>
+      <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px">
+        <el-form-item label="鍙戝姩鏈哄彿" prop="engineNo">
+          <el-input
+            v-model="queryParams.engineNo"
+            placeholder="璇疯緭鍏ュ彂鍔ㄦ満鍙�"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="璐ㄩ噺鐘舵��" prop="qualityStatus">
+          <el-select v-model="queryParams.qualityStatus" placeholder="璇烽�夋嫨璐ㄩ噺鐘舵��" clearable>
+            <el-option
+              v-for="dict in dict.type.quality_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鏄惁鎵撳嵃" prop="whetherOrPrint">
+          <el-select v-model="queryParams.whetherOrPrint" placeholder="璇烽�夋嫨鏄惁鎵撳嵃" clearable>
+            <el-option
+              v-for="dict in dict.type.print_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"/>
+          </el-select>
+        </el-form-item>
+        <br/>
+        <el-form-item label="鍚堢鎶ュ伐" prop="report10">
+          <el-input
+            v-model="queryParams.report10"
+            placeholder="璇疯緭鍏ュ悎绠辨姤宸�"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="鎬昏鎶ュ伐" prop="report20">
+          <el-input
+            v-model="queryParams.report20"
+            placeholder="璇疯緭鍏ユ�昏鎶ュ伐"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="CVT鎶ュ伐" prop="report30">
+          <el-input
+            v-model="queryParams.report30"
+            placeholder="璇疯緭鍏VT鎶ュ伐"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <br/>
+        <el-form-item label="鎿嶄綔鏃堕棿" prop="operateTime">
+          <el-date-picker
+            v-model="queryParams.dateConditions"
+            type="datetimerange"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            range-separator="鑷�"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+            align="right">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
     </el-card>
 
     <el-card style="margin-top: 10px" class="box-card">
@@ -186,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>
 
@@ -198,7 +166,9 @@
 
           </el-table-column>
           <el-table-column label="浜у搧绫诲瀷" align="center" prop="productType">
-
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.material_type" :value="scope.row.productType"/>
+            </template>
           </el-table-column>
           <el-table-column label="鏈哄瀷" align="center" prop="model">
 
@@ -215,75 +185,62 @@
 
           </el-table-column>
           <el-table-column label="璐ㄩ噺鐘舵��" align="center" prop="qualityStatus">
-
-          </el-table-column>
-          <el-table-column label="鏄惁鎵撳嵃" align="center" prop="whetherOrPrint">
-
-          </el-table-column>
-          <el-table-column label="10鎶ュ伐" align="center" prop="report10">
-
-          </el-table-column>
-          <el-table-column label="20鎶ュ伐" align="center" prop="report20">
-
-          </el-table-column>
-          <el-table-column label="鍚堢涓婄嚎" align="center" prop="combinedBoxTime">
-
-          </el-table-column>
-          <el-table-column label="鎬昏涓嬬嚎" align="center" prop="finalAssemblyTime">
-
-          </el-table-column>
-          <el-table-column label="鎿嶄綔浜�" align="center" prop="operator">
-
-          </el-table-column>
-          <el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="operateTime" width="160">
-
-          </el-table-column>
-<!--          <el-table-column label="鐘舵��" align="center" prop="status">-->
-
-<!--          </el-table-column>-->
-<!--          <el-table-column label="棰勭暀瀛楁1" align="center" prop="spareField1">-->
-
-<!--          </el-table-column>-->
-<!--          <el-table-column label="棰勭暀瀛楁2" align="center" prop="spareField2">-->
-
-<!--          </el-table-column>-->
-<!--          <el-table-column label="棰勭暀瀛楁3" align="center" prop="spareField3">-->
-
-<!--          </el-table-column>-->
-<!--          <el-table-column label="棰勭暀瀛楁4" align="center" prop="spareField4">-->
-
-<!--          </el-table-column>-->
-<!--          <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">-->
-
-<!--          </el-table-column>-->
-<!--          <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">-->
-
-<!--          </el-table-column>-->
-<!--          <el-table-column label="澶囨敞" align="center" prop="remarks">-->
-
-<!--          </el-table-column>-->
-          <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="success"
-                plain
-                style="width: 72px"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['bs:orderScheduling:edit']"
-              >淇敼</el-button>
-              <el-button
-                size="mini"
-                type="danger"
-                plain
-                style="width: 72px"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['bs:orderScheduling:remove']"
-              >鍒犻櫎</el-button>
+              <dict-tag :options="dict.type.quality_status" :value="scope.row.qualityStatus"/>
             </template>
           </el-table-column>
+          <el-table-column label="鏄惁鎵撳嵃" align="center" prop="whetherOrPrint">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.print_status" :value="scope.row.whetherOrPrint"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="鍚堢鎶ュ伐" align="center" prop="report10">
+
+          </el-table-column>
+          <el-table-column label="鎬昏鎶ュ伐" align="center" prop="report20">
+
+          </el-table-column>
+          <el-table-column label="CVT鎶ュ伐" align="center" prop="report30">
+
+          </el-table-column>
+          <el-table-column label="鍚堢涓婄嚎鏃堕棿" align="center" prop="boxClosingOnlineTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.boxClosingOnlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="鍚堢涓嬬嚎鏃堕棿" align="center" prop="closingBoxOfflineTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.closingBoxOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="鎬昏涓婄嚎鏃堕棿" align="center" prop="finalAssemblyLaunchTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.finalAssemblyLaunchTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="鎬昏涓嬬嚎鏃堕棿" align="center" prop="finalAssemblyOfflineTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.finalAssemblyOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="CVT涓婄嚎鏃堕棿" align="center" prop="cvtLaunchTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.cvtLaunchTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="CVT涓嬬嚎鏃堕棿" align="center" prop="cvtOfflineTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.cvtOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="鎿嶄綔浜�" align="center" prop="operator">
+          </el-table-column>
+          <el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="operateTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.operateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+
         </el-table>
     </el-card>
 
@@ -296,12 +253,12 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀硅鍗曟帓浜у璇濇 -->
-    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="700px" append-to-body>
       <span slot="title">
         <i class="el-icon-s-order"></i>
         {{titleName}}
       </span>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
         <el-form-item label="璁㈠崟缂栧彿" prop="orderNo">
           <el-input v-model="form.orderNo" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
         </el-form-item>
@@ -310,49 +267,32 @@
         </el-form-item>
         <el-form-item label="浜у搧绫诲瀷" prop="productType">
           <el-select v-model="form.productType" placeholder="璇烽�夋嫨浜у搧绫诲瀷">
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.${dictType}"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.value"-->
-<!--            ></el-option>-->
+
           </el-select>
         </el-form-item>
         <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="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-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="whetherOrPrint">
           <el-input v-model="form.whetherOrPrint" placeholder="璇疯緭鍏ユ槸鍚︽墦鍗�" />
         </el-form-item>
-        <el-form-item label="10鎶ュ伐" prop="report10">
-          <el-input v-model="form.report10" placeholder="璇疯緭鍏�10鎶ュ伐" />
+
+        <el-form-item label="鍚堢鎶ュ伐" prop="report10">
+          <el-input v-model="form.report10" placeholder="璇疯緭鍏ュ悎绠辨姤宸�" />
         </el-form-item>
-        <el-form-item label="20鎶ュ伐" prop="report20">
-          <el-input v-model="form.report20" placeholder="璇疯緭鍏�20鎶ュ伐" />
+        <el-form-item label="鎬昏鎶ュ伐" prop="report20">
+          <el-input v-model="form.report20" placeholder="璇疯緭鍏ユ�昏鎶ュ伐" />
+        </el-form-item>
+        <el-form-item label="30鎶ュ伐" prop="report20">
+          <el-input v-model="form.report30" placeholder="璇疯緭鍏�30鎶ュ伐" />
         </el-form-item>
         <el-form-item label="鎿嶄綔浜�" prop="operator">
           <el-input v-model="form.operator" placeholder="璇疯緭鍏ユ搷浣滀汉" />
@@ -366,27 +306,7 @@
 <!--            >{{dict.label}}</el-radio>-->
           </el-radio-group>
         </el-form-item>
-<!--        <el-form-item label="棰勭暀瀛楁1" prop="spareField1">-->
-<!--          <el-input v-model="form.spareField1" placeholder="璇疯緭鍏ラ鐣欏瓧娈�1" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="棰勭暀瀛楁2" prop="spareField2">-->
-<!--          <el-input v-model="form.spareField2" placeholder="璇疯緭鍏ラ鐣欏瓧娈�2" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="棰勭暀瀛楁3" prop="spareField3">-->
-<!--          <el-input v-model="form.spareField3" placeholder="璇疯緭鍏ラ鐣欏瓧娈�3" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="棰勭暀瀛楁4" prop="spareField4">-->
-<!--          <el-input v-model="form.spareField4" placeholder="璇疯緭鍏ラ鐣欏瓧娈�4" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
-<!--          <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
-<!--          <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="澶囨敞" prop="remarks">-->
-<!--          <el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />-->
-<!--        </el-form-item>-->
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -401,7 +321,7 @@
 
 export default {
   name: "OrderScheduling",
-  dicts: ['order_scheduling_produce_status'],
+  dicts: ['order_scheduling_produce_status','quality_status','print_status','material_type'],
   data() {
     return {
       // 閬僵灞�
@@ -413,6 +333,7 @@
       single: true,
       // 闈炲涓鐢�
       multiple: true,
+      advancedShowSearch: false,
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
       // 鎬绘潯鏁�
@@ -449,7 +370,8 @@
         spareField4: null,
         createUser: null,
         updateUser: null,
-        remarks: null
+        remarks: null,
+        dateConditions: [],
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
@@ -458,7 +380,36 @@
         id: [
           { required: true, message: "ID涓嶈兘涓虹┖", trigger: "blur" }
         ],
-      }
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '鏈�杩戜竴鍛�',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '鏈�杩戜竴涓湀',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '鏈�杩戜笁涓湀',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+      value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
+      value2: ''
     };
   },
   created() {
@@ -467,9 +418,13 @@
     this.getList();
   },
   methods: {
+    advancedQuery(){
+      this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true;
+    },
     /** 鏌ヨ璁㈠崟鎺掍骇鍒楄〃 */
     getList() {
       this.loading = true;
+      console.log(this.queryParams)
       listOrderScheduling(this.queryParams).then(response => {
         this.orderSchedulingList = response.rows;
         this.total = response.total;
@@ -509,7 +464,14 @@
         createTime: null,
         updateUser: null,
         updateTime: null,
-        remarks: null
+        remarks: null,
+        report30: null,
+        boxClosingOnlineTime: null,
+        closingBoxOfflineTime: null,
+        finalAssemblyLaunchTime: null,
+        finalAssemblyOfflineTime: null,
+        cvtLaunchTime: null,
+        cvtOfflineTime: null
       };
       this.resetForm("form");
     },
@@ -580,6 +542,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