From 4fa0cbae96cde47e4878e16c87da294903a457ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 11 九月 2023 17:41:21 +0800
Subject: [PATCH] 同步素材库商品

---
 minipro_standard/pages_adjust/pages/workOrder/workOrder.vue |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
index 512aa00..3425d8c 100644
--- a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
+++ b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content p30">
 		<div class="content_search">
-			<v-Search @searchInput="searchInput" @submit="submit" @reset="reset" :isShow="true"
+			<v-Search @searchInput="searchForm.mixParam" @submit="search" @reset="reset" :isShow="true"
 				placeholder="鎼滅储宸ュ崟缂栫爜/宸ュ簭鍚嶇О">
 				<template v-slot:content>
 					<div class="Search_item">
@@ -28,7 +28,7 @@
 				<div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
 					<div class="content_list_item_top">
 						<div class="content_list_item_top_left">
-							<span v-if="item.mmodel">{{item.mmodel.name}} | {{item.procedureName}}</span>
+							<span class="f32" v-if="item.mmodel">{{item.mmodel.name}} | {{item.procedureName}}</span>
 							<div class="content_list_item_top_left_tag" v-if="item.urgent">浼樺厛{{item.urgent}}</div>
 							<div class="content_list_item_top_left_tag backgreen" v-if="item.type === 0">姝e父</div>
 							<div class="content_list_item_top_left_tag backyellow" v-if="item.type === 2">杩斿伐杩斾慨</div>
@@ -45,7 +45,7 @@
 							<span class="green" v-if="item.status === 7">杩涜涓�</span>
 						</div>
 					</div>
-					<span>宸ュ崟缂栧彿: {{item.code}}</span>
+					<span class="f24">宸ュ崟缂栧彿: {{item.code}}</span>
 					<div class="content_list_item_content">
 						<div class="content_list_item_content_item">
 							<div class="content_list_item_content_item_label">鐗╂枡缂栫爜锛�</div>
@@ -79,7 +79,9 @@
 				</div>
 			</div>
 		</scroll-view>
-		<u-calendar :show="isOpenDate" mode="range" @confirm="dateConfirm"></u-calendar>
+		<!-- <u-calendar :show="isOpenDate" mode="range" @confirm="dateConfirm"></u-calendar> -->
+		<l-calendar :lunar="false" v-model="isOpenDate" @change="onConfirm" :isRange="true" activeBgColor="#305ED5"
+			rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
 	</view>
 </template>
 
@@ -89,7 +91,8 @@
 	import {
 		getList,
 		pageCount
-	} from '@/util/api/WorkOrderAPI.js'
+	} from '@/util/api/WorkOrderAPI.js'
+	import { gsdate } from '@/util/utils.js'
 	export default {
 		components: {
 			vSearch,
@@ -119,7 +122,7 @@
 				searchForm: {
 					mixParam: '',
 					startDate: '',
-					endDate: '',
+					endDate: gsdate(new Date()),
 					statusList: []
 				},
 				page: {
@@ -134,7 +137,18 @@
 			this.pageCounts()
 			this.loadData()
 		},
-		methods: {
+		methods: {
+			reset() {
+				this.searchForm = {
+					mixParam: '',
+					startDate: '',
+					endDate: gsdate(new Date()),
+					statusList: []
+				}
+				this.page.page = 1
+				this.pageCounts()
+				this.loadData()
+			},
 			loadData() {
 
 				getList({
@@ -163,7 +177,7 @@
 			pageCounts() {
 				pageCount({
 					...this.searchForm,
-					endDate: this.searchForm.endDate ? (this.searchForm.endDate + ' 23:59:59') : '',
+					endDate: this.searchForm.endDate || '',
 					statusList: this.searchForm.statusList.length === 0 ? this.tagList[0].id : this.searchForm
 						.statusList
 				}).then(res => {
@@ -194,6 +208,10 @@
 				this.triggered = true;
 				this.page.page = 1
 				this.loadData()
+			},
+			search() {
+				this.page.page = 1
+				this.loadData()
 			},
 			jump(item) {
 				// uni.navigateTo({

--
Gitblit v1.9.3