.env.dev

@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-16 14:07:34
+ # @LastEditTime: 2023-11-16 08:52:02
- # @LastEditors: DY
+ # @LastEditors: zhp
  # @Description:
 ###
 # 开发环境配置

src/assets/styles/login.scss

@@ -94,11 +94,8 @@ $buttonHeight: $buttonH * 1px;
 		display: flex;
 
 		.pic {
-			flex: 3;
-			width: 1px;
-			min-width: 800px;
 			// 元素
-			// width: $picWidth;
+			width: $picWidth;
 			height: $picHeight;
 			background-image: url($picImage);
 			background-repeat: no-repeat;
@@ -119,8 +116,7 @@ $buttonHeight: $buttonH * 1px;
 		.field {
 			position: relative;
 			margin-top: 8%;
-			flex: 2;
+			flex: 1;
-			// width: 800px;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
@@ -174,7 +170,7 @@ $buttonHeight: $buttonH * 1px;
 			}
 
 			.form {
-				margin-top: 0;
+				margin-top: 32px;
 				box-sizing: border-box;
 				// width: $formWidth;
 				width: 100%;
@@ -311,19 +307,6 @@ $buttonHeight: $buttonH * 1px;
 }
 
 // - - - - - PC 最小尺寸设置
-@media screen and (min-width: 1920px) {
-	.container {
-		.content {
-
-			.field {
-				flex: initial;
-				width: 800px;
-			}
-		}
-	}
-}
-
-
 @media screen and (min-width: 599px) and (max-width: 1366px) {
 	.container {
 		min-width: 599px;

src/views/base/coreProductionLine/index.vue

@@ -140,8 +140,8 @@ export default {
     getDataList() {
       this.dataListLoading = true;
       this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list;
+        // this.tableData = response.data.list;
-				// this.getStatus(response.data.list)
+				this.getStatus(response.data.list)
         this.listQuery.total = response.data.total;
         this.dataListLoading = false;
       });
@@ -150,7 +150,6 @@ export default {
 			const ids = list.map((i) => {
 				return i.id;
 			});
-			console.log('111', ids)
 			getStatus(ids).then((response) => {
 				response.forEach((a) => {
 					list.forEach((b) => {

src/views/base/coreWorkOrder/allocation.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-16 09:14:35
+ * @LastEditTime: 2023-11-15 17:45:04
  * @Description:
 -->
 <template>
@@ -41,12 +41,12 @@
 					<el-table-column prop="priority" label="优先级" />
 					<el-table-column prop="planAssignmentQuantity" label="计划分配数量" >
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.planAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+							<el-input v-model="scope.row.planAssignmentQuantity"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column prop="actualAssignmentQuantity" label="实际分配数量">
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.actualAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+							<el-input v-model="scope.row.actualAssignmentQuantity"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column label="操作">

src/views/base/coreWorkOrder/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-16 13:45:13
+ * @LastEditTime: 2023-11-15 14:18:38
  * @Description:
 -->
 <template>
@@ -64,15 +64,15 @@
 			<div class="formContent">
 				<el-row :gutter="20">
 					<el-col :span="8">订单创建时间:
-						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: pre-wrap">{{ parseTime(item.createTime) }}</span>
+						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: normal">{{ item.createTime }}</span>
 					</el-col>
-					<el-col :span="8">计划开始时间:{{ parseTime(dataForm.planStartTime) }}</el-col>
+					<el-col :span="8">计划开始时间:{{ dataForm.planStartTime }}</el-col>
-					<el-col :span="8">计划完成时间:{{ parseTime(dataForm.planFinishTime) }}</el-col>
+					<el-col :span="8">计划完成时间:{{ dataForm.planFinishTime }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
-					<el-col :span="8">预计结束时间:{{ parseTime(dataForm.computeFinishTime) }}</el-col>
+					<el-col :span="8">预计结束时间:{{ dataForm.computeFinishTime }}</el-col>
-					<el-col :span="8">实际开始时间:{{ parseTime(dataForm.startProduceTime) }}</el-col>
+					<el-col :span="8">实际开始时间:{{ dataForm.startProduceTime }}</el-col>
-					<el-col :span="8">实际完成时间:{{ parseTime(dataForm.finishProduceTime) }}</el-col>
+					<el-col :span="8">实际完成时间:{{ dataForm.finishProduceTime }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
 					<el-col :span="8">工单状态:{{ fitlerS(dataForm.status) }}</el-col>
@@ -147,7 +147,6 @@ import { orderList } from "@/api/base/orderManage";
 import { getProcessFlowList } from '@/api/base/orderManage'
 import SmallTitle from './SmallTitle';
 import { publicFormatter } from "@/utils/dict";
-import { parseTime } from '@/utils/ruoyi'
 
 const tableBtn = [
 	{
@@ -234,7 +233,7 @@ export default {
 		this.getDict()
 	},
 	mounted() {
-		if (this.$route.query.woIdString && this.$route.query.woIdString !== 'undefined') {
+		if (this.$route.query.woIdString) {
 			const idList = this.$route.query.woIdString.split(',')
 			getCoreWOListById(idList).then(res => {
 				this.workOrderButton = res.data.map(work => {

src/views/base/coreWorkOrder/index.vue

@@ -348,25 +348,20 @@ export default {
 					id: val.data.id,
 					status: undefined
 				}
-				let opration = ''
 				if (val.type === 'active') {
 					param.status = 2
-					opration = '激活'
 				}
 				if (val.type === 'pause') {
 					param.status = 3
-					opration = '暂停'
 				}
 				if (val.type === 'nullify') {
 					param.status = 9
-					opration = '报废'
 				}
 				if (val.type === 'finish') {
 					param.status = 4
-					opration = '完成'
 				}
 				console.log('22',val)
-				this.$confirm(`确定${opration}${'"工单' + val.data.name + '"'}?`, "提示", {
+				this.$confirm(`确定对${'[工单名称=' + val.data.name + ']'}进行${val.type}操作?`, "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",
 					type: "warning",
@@ -374,7 +369,7 @@ export default {
         .then(() => {
 					statusChange(param).then(({ data }) => {
 						this.$message({
-							message: '操作成功！工单状态稍后将会更新！',
+							message: '操作成功！',
 							type: 'success',
 							duration: 1500,
 							onClose: () => {

src/views/core/analysis/yieldAnalysis/index.vue

@@ -80,7 +80,7 @@ export default {
 					type: 'datePicker',
 					label: '时间',
 					dateType: 'month',
-					format: 'yyyy-MM',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',

src/views/order/base/orderManage/index.vue

@@ -397,7 +397,7 @@ export default {
           this.workIssueTitle = '绑定工单'
           this.addWorkOrdervisible = true
           this.$nextTick(() => {
-            this.$refs.addWorkOrder.init(val.data, 'bind')
+            this.$refs.addWorkOrder.init(val.data.id, 'bind')
           })
           break
         case 'complete':