From e055d2d93b516985fbc2df0f6f5a135f3230cccf Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:13:47 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue |   48 ++++--------------------------------------------
 1 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue
index 8a6bdcf..41f7c37 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue
@@ -3,18 +3,13 @@
     <!-- 鏌ヨ鍖哄煙 -->
     <div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :md="7" :sm="7">
-            <a-form-item label="鏃堕棿">
-              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="4">
+        <a-row :gutter="24" style="width: 100%;">
+          <a-col :md="5" :sm="5">
             <a-form-item label="璁惧缂栧彿">
               <a-input placeholder="杈撳叆璁惧缂栧彿鏌ヨ" v-model="queryParams.equipmentId"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="4" :xs="4">
+          <a-col :md="5" :sm="5" :xs="5">
             <a-form-item label="璁惧鍚嶇О">
               <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParams.equipmentName"></a-input>
             </a-form-item>
@@ -25,15 +20,6 @@
               <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
             </a-space>
           </a-col>
-          <!--<a-col :md="2" :sm="3" :xs="3">-->
-            <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
-          <!--</a-col>-->
-          <!--<a-col :md="2" :sm="2" :xs="2">-->
-            <!--<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>-->
-          <!--</a-col>-->
-          <!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
-            <!--<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>-->
-          <!--</a-col>-->
         </a-row>
       </a-form>
     </div>
@@ -63,7 +49,7 @@
     <div id="DeviceList" style="flex: 1;overflow: hidden">
       <a-table ref="table" bordered size="middle" rowKey="id" :columns="columns"
                :scroll="{x:'max-content',y:scrollY}" :dataSource="dataSource" :pagination="ipagination" :loading="loading"
-               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+               :rowSelection="{selectedRowKeys: selectedRowKeys}"
                @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
         <a @click="handleEdit(record)">缂栬緫</a>
@@ -91,7 +77,6 @@
 </template>
 
 <script>
-  import moment from 'moment'
   import $ from 'jquery'
   import JDictSelectTag from '@/components/dict/JDictSelectTag'
   import JDate from '../../../../../components/jeecg/JDate'
@@ -103,8 +88,6 @@
   } from '@/api/manage'
   import MdcStandardProcessDurationModal from './MdcStandardProcessDurationModal'
   import MdcStandardProcessDurationEdit from './MdcStandardProcessDurationEdit'
-  // import DeviceRepairModelAdd from './DeviceRepairModelAdd'
-  // import DeviceRepairModelEdit from './DeviceRepairModelEdit'
   import '@/components/table2excel/table2excel'
   import {
     JeecgListMixin
@@ -120,8 +103,6 @@
       Tooltip,
       MdcStandardProcessDurationModal,
       MdcStandardProcessDurationEdit,
-      // DeviceRepairModelAdd,
-      // DeviceRepairModelEdit,
       JDictSelectTag,
       JInput,
       JDate,
@@ -133,7 +114,6 @@
         typeTree:"",
         typeParent:1,
         typeEquipment:1,
-        dates: [],
         xianshi:"",
         readOnly:true,
         queryParam: {},
@@ -154,18 +134,12 @@
             align: 'center',
             dataIndex: 'equipmentName',
             width:200
-            // defaultSortOrder:'descend',
-            // sorter: (a, b) => {return a.equipmentName>b.equipmentName?1:-1}
           },
           {
             title: '闆朵欢鍙�',
             align: 'center',
             dataIndex: 'partsCode',
             width:150
-            // scopedSlots:{customRender:'startTime'},
-            // customRender:(text,row,index) => {
-            //   return moment(text).format("YYYY-MM-DD HH:mm:ss")
-            // }
           },
           {
             title: '鎵规鍙�',
@@ -214,7 +188,6 @@
       Type(valmath){
         this.dataList = [];
         this.queryParams.typeTree = valmath
-        // console.log(this.queryParams.typeTree)
       },
       nodeTree(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
         if (JSON.stringify(val) != '{}') {
@@ -257,19 +230,6 @@
         document.body.appendChild(a);
         a.click();
         a.remove();
-      },
-      dateParamChange(v1, v2) {
-        // console.log(v1,v2)
-        this.queryParam.startTime = v2[0]
-        this.queryParam.endTime = v2[1]
-        // console.log(v2[0],v2[1])
-      },
-      onChange(value, dateString) {
-        // console.log('Selected Time: ', value);
-        // console.log('Formatted Selected Time: ', dateString);
-      },
-      onOk(value) {
-        console.log('onOk: ', value);
       },
       searchReset() {
         if(this.queryParams.typeTree == "1"){

--
Gitblit v1.9.3