no message

src/views/auxiliaryFittings/salesManagement/attachmentSalesOrder/index.vue

@@ -353,7 +353,6 @@ export default {
       if (loadingLen === 0) {
         this.$endLoading()
       }
-      console.log(333)
       // 预览打印内容
       this.$refs.preView.show(this.hiprintTemplate, this.panel)
     },

src/views/workOrder/workOrderPool/detail.vue

@@ -5,18 +5,18 @@
       <el-tab-pane label="操作明细" name="operationDetails" key="operationDetails"> </el-tab-pane>
       <el-tab-pane label="完工明细" name="detailsCompletion" key="detailsCompletion"></el-tab-pane>
       <el-tab-pane label="支付费用" name="payFee" key="payFee"></el-tab-pane>
-      <el-tab-pane v-if="EvaluationShow" label="评价信息" name="Evaluation" key="Evaluation">
-      </el-tab-pane>
-      <el-tab-pane v-if="SettleAccountsShow" label="费用结算" name="SettleAccounts" key="SettleAccounts">
-      </el-tab-pane>
+      <el-tab-pane v-if="EvaluationShow" label="评价信息" name="Evaluation" key="Evaluation"> </el-tab-pane>
+      <el-tab-pane v-if="SettleAccountsShow" label="费用结算" name="SettleAccounts" key="SettleAccounts"> </el-tab-pane>
       <el-tab-pane v-if="PartsApplicationShow" label="配件申请" name="PartsApplication" key="PartsApplication">
       </el-tab-pane>
     </el-tabs>
     <div class="view_div">
-      <div :style="{
-      height: activeName === 'workOrderInfo' ? '100%' : '0px',
-      overflow: activeName === 'workOrderInfo' ? '' : 'hidden'
-    }">
+      <div
+        :style="{
+          height: activeName === 'workOrderInfo' ? '100%' : '0px',
+          overflow: activeName === 'workOrderInfo' ? '' : 'hidden'
+        }"
+      >
         <workOrderInfo :id="id" ref="workOrderInfo" :workOrderType="workOrderType" />
       </div>
       <OperationDetail v-if="activeName == 'operationDetails'" :id="id" ref="operationDetails" />
@@ -24,8 +24,11 @@
       <Payment v-if="activeName == 'payFee'" :id="id" ref="payFee" :workOrderType="workOrderType" />
       <Evaluation v-if="activeName == 'Evaluation' && EvaluationShow" :id="id" ref="Evaluation" />
       <SettleAccounts v-if="activeName == 'SettleAccounts' && SettleAccountsShow" :id="id" ref="SettleAccounts" />
-      <PartsApplication v-if="activeName == 'PartsApplication' && PartsApplicationShow" :id="id"
-        ref="PartsApplication" />
+      <PartsApplication
+        v-if="activeName == 'PartsApplication' && PartsApplicationShow"
+        :id="id"
+        ref="PartsApplication"
+      />
     </div>
   </div>
 </template>
@@ -64,7 +67,7 @@ export default {
       activeName: this?.$route?.params?.pagePam || 'workOrderInfo',
       EvaluationShow: false,
       SettleAccountsShow: false,
-      PartsApplicationShow: true,
+      PartsApplicationShow: true
     }
   },
   created() {
@@ -72,12 +75,29 @@ export default {
       orderBaseId: this.id
     }).then(res => {
       if (
-        !["DYY"].includes(this?.orderInfo?.orderStatus) &&
-        !["DSHPG", "CJ", "YPD", "DXSPD", "DZBPG", "DWDSPGP", "DXSSPGP", "DTJXSSPGP", "DZBSPGP", "DFZXPD", "DFZXSPGP", 'XSBH', "TJXSBH", "ZBBH", "FZXBH", "FL"].includes(this?.orderInfo?.orderStatus) &&
-        !["DWDPG", "DWDPD", "WDBH"].includes(this?.orderInfo?.orderStatus) &&
-        !["DJD", "DSM", "YZP"].includes(this?.orderInfo?.orderStatus) &&
-        !["FWZ", "GCSZT", "BFWG"].includes(this?.orderInfo?.orderStatus) &&
-        !["YQX", "FWZT", "YCGB", "FWQX"].includes(this?.orderInfo?.orderStatus)
+        !['DYY'].includes(this?.orderInfo?.orderStatus) &&
+        ![
+          'DSHPG',
+          'CJ',
+          'YPD',
+          'DXSPD',
+          'DZBPG',
+          'DWDSPGP',
+          'DXSSPGP',
+          'DTJXSSPGP',
+          'DZBSPGP',
+          'DFZXPD',
+          'DFZXSPGP',
+          'XSBH',
+          'TJXSBH',
+          'ZBBH',
+          'FZXBH',
+          'FL'
+        ].includes(this?.orderInfo?.orderStatus) &&
+        !['DWDPG', 'DWDPD', 'WDBH'].includes(this?.orderInfo?.orderStatus) &&
+        !['DJD', 'DSM', 'YZP'].includes(this?.orderInfo?.orderStatus) &&
+        !['FWZ', 'GCSZT', 'BFWG'].includes(this?.orderInfo?.orderStatus) &&
+        !['YQX', 'FWZT', 'YCGB', 'FWQX'].includes(this?.orderInfo?.orderStatus)
       ) {
         this.EvaluationShow = true
         this.SettleAccountsShow = true
@@ -85,7 +105,7 @@ export default {
     })
   },
   methods: {
-    handleClick(tab, event) { }
+    handleClick(tab, event) {}
   }
 }
 </script>
@@ -95,8 +115,8 @@ export default {
   height: calc(100vh - 140px) !important;
   overflow: hidden;
 
-  &> ::v-deep .el-tabs:nth-child(1) {
-    &>.el-tabs__header:nth-child(1) {
+  & > ::v-deep .el-tabs:nth-child(1) {
+    & > .el-tabs__header:nth-child(1) {
       margin-bottom: 0 !important;
     }
   }

src/views/workOrder/workOrderPool/index.vue

@@ -1,33 +1,90 @@
 <template>
   <!-- 工单池 -->
-  <template-page ref="pageRef" :getList="getList" :operation="operation()" :exportList="exportList"
-    :optionsEvensGroup="optionsEvensGroup" :columnParsing="columnParsing" :tableAttributes="tableAttributes"
-    :tableEvents="tableEvents" :moreParameters="moreParameters" :screeningAnalysis="screeningAnalysis"
-    :filterMethod="filterMethod" :replaceOrNotMap="true" :defaultSearchData="defaultSearchData">
+  <template-page
+    v-if="showTableBool"
+    ref="pageRef"
+    :getList="getList"
+    :operation="operation()"
+    :exportList="exportList"
+    :optionsEvensGroup="optionsEvensGroup"
+    :columnParsing="columnParsing"
+    :tableAttributes="tableAttributes"
+    :tableEvents="tableEvents"
+    :moreParameters="moreParameters"
+    :screeningAnalysis="screeningAnalysis"
+    :filterMethod="filterMethod"
+    :replaceOrNotMap="true"
+    :defaultSearchData="defaultSearchData"
+  >
+    <div slot="moreSearch">
+      <div style="margin-bottom: 10px">
+        <span
+          style="
+            font-size: 12px;
+            font-weight: 400;
+            text-align: left;
+            color: #666;
+            line-height: 28px;
+            margin-right: 10px;
+          "
+          >选择年份</span
+        >
+        <el-date-picker
+          style="width: 130px"
+          v-model="value1"
+          format="yyyy"
+          size="mini"
+          type="year"
+          placeholder="选择日期"
+        >
+        </el-date-picker>
+      </div>
+    </div>
     <!-- 创建工单 -->
     <div class="cartographer_big">
-      <el-dialog title="创建工单" width="100%" :modal="false" :visible.sync="createFormBool" :before-close="handleClose">
+      <el-dialog
+        title="创建工单"
+        width="100%"
+        :modal="false"
+        :visible.sync="createFormBool"
+        :before-close="handleClose"
+      >
         <workOrderInfo :workOrderType="workOrderType" v-if="createFormBool" :cloneWorkOrder="cloneWorkOrder" />
       </el-dialog>
     </div>
     <!-- 工单详情 -->
     <div class="cartographer_big">
-      <el-dialog :title="'工单详情-' + id" width="100%" :modal="false" :visible.sync="detailFormBool"
-        :before-close="handleClose">
+      <el-dialog
+        :title="'工单详情-' + id"
+        width="100%"
+        :modal="false"
+        :visible.sync="detailFormBool"
+        :before-close="handleClose"
+      >
         <Detail v-if="detailFormBool" :id="id" :workOrderType="workOrderType" />
       </el-dialog>
     </div>
     <!-- 批量预约/改约 -->
     <div class="cartographer_big">
-      <el-dialog title="批量约单" width="100%" :modal="false" :visible.sync="rescheduleBool"
-        :before-close="rescheduleClose">
+      <el-dialog
+        title="批量约单"
+        width="100%"
+        :modal="false"
+        :visible.sync="rescheduleBool"
+        :before-close="rescheduleClose"
+      >
         <Reschedule v-if="rescheduleBool" :recordSelected="recordSelected" @close="rescheduleClose" />
       </el-dialog>
     </div>
     <!-- 批量派工/改派 -->
     <div class="cartographer_big">
-      <el-dialog title="批量派单" width="100%" :modal="false" :visible.sync="reassignmentBool"
-        :before-close="reassignmentClose">
+      <el-dialog
+        title="批量派单"
+        width="100%"
+        :modal="false"
+        :visible.sync="reassignmentBool"
+        :before-close="reassignmentClose"
+      >
         <Reassignment v-if="reassignmentBool" :recordSelected="recordSelected" @close="reassignmentClose" />
       </el-dialog>
     </div>
@@ -91,7 +148,17 @@ export default {
       orderStatusList: [],
       defaultSearchData: [],
       workOrderType: 1,
-      cloneWorkOrder: null
+      cloneWorkOrder: null,
+      value1: new Date(),
+      showTableBool: true
+    }
+  },
+  watch: {
+    value1() {
+      this.showTableBool = false
+      this.$nextTick(() => {
+        this.showTableBool = true
+      })
     }
   },
   computed: {
@@ -134,7 +201,7 @@ export default {
           [
             this.optionsEvensAuth(['createWorkOrder', 'createWbWorkOrder'], {
               name: '创建工单',
-              click: () => { }
+              click: () => {}
             }),
             this.optionsEvensAuth('createWorkOrder', {
               click: () => {
@@ -160,7 +227,7 @@ export default {
               ['import4', 'importTemplate', 'downloadImportTemplate', 'importTemplate2', 'downloadImportTemplate2'],
               {
                 name: '导入工单',
-                click: () => { }
+                click: () => {}
               }
             ),
             this.optionsEvensAuth('import4', ({ moduleName }) => {
@@ -243,7 +310,7 @@ export default {
           [
             this.optionsEvensAuth(['bulkOrder', 'lotOrder'], {
               name: '批量操作',
-              click: () => { }
+              click: () => {}
             }),
             this.optionsEvensAuth('bulkOrder', {
               click: () => {
@@ -330,10 +397,12 @@ export default {
 
     selectable(row, index) {
       var orderStatus = Object.entries(row.selectMapData.orderStatus).find(([key, val]) => val == row.orderStatus)?.[0]
-      return !["YWG", "GCSZX", "WDWG", "YWGO"].includes(orderStatus) &&
-        !["YJS", "LRCD"].includes(orderStatus) &&
-        !["YQX", "FWZT", "YCGB", "FWQX"].includes(orderStatus) &&
+      return (
+        !['YWG', 'GCSZX', 'WDWG', 'YWGO'].includes(orderStatus) &&
+        !['YJS', 'LRCD'].includes(orderStatus) &&
+        !['YQX', 'FWZT', 'YCGB', 'FWQX'].includes(orderStatus) &&
         !row.rpProjectRepairId
+      )
     },
 
     screeningAnalysis(jname, val) {
@@ -427,6 +496,12 @@ export default {
         if (pam.orderSmallTypeText) {
           pam.params.push({ param: 'a.order_small_type_text', compare: '=', value: pam.orderSmallTypeText })
         }
+        if (this.value1) {
+          pam.params.push(
+            { param: 'a.create_time', compare: '>=', value: `${new Date(this.value1).getFullYear()}-1-1 00:00:00` },
+            { param: 'a.create_time', compare: '<=', value: `${new Date(this.value1).getFullYear()}-12-31 23:59:59` }
+          )
+        }
         cb && cb(pam)
         return orderBaseList(pam)
       } catch (err) {
@@ -460,7 +535,7 @@ export default {
               this.detailFormBool = true
             })
           }
-        },
+        }
         // view: {
         //   conditions: ({ row, index, column }) => {
         //     return row.isImport