ERP_override.git

			@@ -19,7 +19,7 @@
			})

			//工序
			const value = ref()
			const procseeValue = ref()

			//表尾求和
			const sumNum = (list, field) => {
			@@ -75,7 +75,7 @@
			form.date1 = getNowTime()
			let startTime = form.date1[0]
			let endTime = form.date1[1]
			let selectProcesses = value.value
			let selectProcesses = procseeValue.value

			let total = reactive({
			pageTotal: 0,
			@@ -126,7 +126,7 @@

			let startTime = form.date1[0]
			let endTime = form.date1[1]
			let selectProcesses = value.value
			let selectProcesses = procseeValue.value

			request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${selectProcesses}`, filterData.value).then((res) => {

			@@ -156,6 +156,7 @@
			}

			function filterChanged(column){
			let selectProcesses = procseeValue.value
			//gridOptions.loading=true
			//筛选条件发生变化条件发生变化
			let value = column.datas[0]!=undefined?column.datas[0]:''
			@@ -173,6 +174,7 @@

			let startTime = form.date1[0]
			let endTime = form.date1[1]
			console.log(selectProcesses)
			request.post(`/report/teamOutput/1/${total.pageSize}/${startTime}/${endTime}/${selectProcesses}`, filterData.value).then((res) => {

			if (res.code == 200) {
			@@ -252,7 +254,7 @@
			{field: 'width', width: 100, title: t('order.width')},
			{field: 'height', width: 100, title: t('order.height')},
			{field: 'shape', width: 90, title: t('order.shape')},
			{field: 'thickness', width: 90, title: t('order.totalThickness'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'thickness', width: 90, title: t('order.totalThickness')},
			{field: 'edgingType', width: 110, title: t('order.edgingType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'completedQuantity', width: 90, title: t('reportingWorks.completedQuantity')},
			{field: 'area', width: 100, title: t('reportingWorks.completedArea')},
			@@ -292,7 +294,7 @@
			})

			function exportExcel(url, fileName,date) {
			let processes = value.value
			let processes = procseeValue.value
			if(date===null){
			ElMessage.warning(t('report.pleaseSelectADateFirst'))
			return
			@@ -351,7 +353,7 @@
			value-format="YYYY-MM-DD"
			/>

			<el-select v-model="value" clearable default-value="default_city" style="width: 120px">
			<el-select v-model="procseeValue" clearable default-value="default_city" style="width: 120px">
			<el-option
			v-for="item in titleSelectJson['processType']"
			:key="item.id"
			@@ -368,6 +370,7 @@
			class="mytable-scrollbar"
			height="100%"
			v-bind="gridOptions"
			@filter-change="filterChanged"

			>
			<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
			@@ -391,6 +394,7 @@
			:layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
			:total="total.dataTotal"
			@page-change="handlePageChange"

			>
			</vxe-pager>
			</template>