.env.dev

@@ -31,6 +31,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.front

@@ -14,6 +14,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.prod

@@ -28,6 +28,9 @@ VUE_APP_APP_NAME ='yudao-admin'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.env.stage

@@ -15,6 +15,9 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.env.static

@@ -17,6 +17,9 @@ VUE_APP_APP_NAME ='/admin-ui-vue2/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

src/api/base/delivery.js

@@ -18,15 +18,6 @@ export function deliveryProgressPage(data) {
   })
 }
 
-// 获取订单列表
-export function listOrderList(query) {
-  return request({
-    url: '/extend/delivery-log/listOrderList',
-    method: 'get',
-    params: query
-  })
-}
-
 // 获取发货进度分页
 export function deliveryLogDetPage(data) {
   return request({

src/styles/index.scss

@@ -197,7 +197,3 @@ input, textarea{
   vertical-align: middle;
 }
 // 抽屉head区域---end
-// 弹出框，上下分布，去掉label的padding-bottom
-.el-form--label-top .el-form-item__label {
-  padding: 0;
-}

src/utils/ruoyi.js

@@ -187,6 +187,19 @@ export function getTenantEnable() {
   return process.env.VUE_APP_TENANT_ENABLE || true;
 }
 
+/**
+ * 获得验证码功能是否开启
+ */
+export function getCaptchaEnable() {
+  if (process.env.VUE_APP_CAPTCHA_ENABLE === "true") {
+    return true;
+  }
+  if (process.env.VUE_APP_CAPTCHA_ENABLE === "false") {
+    return false;
+  }
+  return process.env.VUE_APP_CAPTCHA_ENABLE || true;
+}
+
 /**
  * 获得文档是否开启
  */

src/views/base/coreWorkOrder/add-or-updata.vue

@@ -2,23 +2,23 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-28 14:09:09
+ * @LastEditTime: 2023-11-24 18:20:26
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="true"
+		:wrapper-closable="false"
 		class="drawer"
 		size="50%">
 		<small-title slot="title" :no-padding="true">
-			{{ '工单名称：' + dataForm.name }}
+			{{ '预使用主原料信息' }}
 		</small-title>
 		<div class="content">
-			<!-- <div style="height: 10vh">
+			<div style="height: 10vh">
 				<div style="font-size: 18px;">工单名：{{ dataForm.name }}</div>
-			</div> -->
+			</div>
 
 			<div class="attr-list">
 				<small-title
@@ -30,7 +30,7 @@
 				<div class="action_btn">
 					<template>
             <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
             </span>
           </template>
 				</div>
@@ -55,9 +55,9 @@
 					@pagination="getList" />
 			</div>
 
-			<!-- <div class="drawer-body__footer">
+			<div class="drawer-body__footer">
 				<el-button type="primary" @click="goback()">关闭</el-button>
-			</div> -->
+			</div>
 		</div>
 
 		<attr-add

src/views/base/coreWorkOrder/addWorkOrder.vue

@@ -13,7 +13,7 @@
       </el-col>
       <el-col :span='8'>
         <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="dataForm.planProductId" placeholder="请选择产品" style="width: 100%;" filterable @change="selectProduct">
+          <el-select v-model="dataForm.planProductId" placeholder="请选择产品" style="width: 100%;" @change="selectProduct">
             <el-option
               v-for="item in productList"
               :key="item.id"
@@ -175,7 +175,6 @@ export default {
         planQuantity: 0,
         processFlowId: '',
         materialMethod: 1,
-        triggerOrigin: 1,
         priority: '',
         productLineIds: [],
         type: '',

src/views/base/coreWorkOrder/attr-add.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'50%'"
+		:width="'35%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
@@ -17,92 +17,73 @@
 			ref="dataForm"
 			:model="dataForm"
 			:rules="dataRule"
-			label-width="80px"
+			label-width="100px"
 			@keyup.enter.native="dataFormSubmit()">
-			<el-row :gutter="20">
+			<el-form-item label="原料" prop="material">
-				<el-col :span="12">
+				<el-select
-					<el-form-item label="原料" prop="material">
+					v-model="dataForm.material"
-						<el-select
+					filterable
-							v-model="dataForm.material"
+					style="width: 100%"
-							filterable
+					placeholder="请选择原料">
-							style="width: 100%"
+					<el-option
-							placeholder="请选择原料">
+						v-for="dict in getDictDatas('material')"
-							<el-option
+						:key="dict.value"
-								v-for="dict in getDictDatas('material')"
+						:label="dict.label"
-								:key="dict.value"
+						:value="dict.value" />
-								:label="dict.label"
+				</el-select>
-								:value="dict.value" />
+			</el-form-item>
-						</el-select>
+			<el-form-item label="来源" prop="origin">
-					</el-form-item>
+				<el-select
-				</el-col>
+					v-model="dataForm.origin"
-				<el-col :span="12">
+					filterable
-					<el-form-item label="来源" prop="origin">
+					style="width: 100%"
-						<el-select
+					placeholder="请选择来源">
-							v-model="dataForm.origin"
+					<el-option
-							filterable
+						v-for="dict in originList"
-							style="width: 100%"
+						:key="dict.value"
-							placeholder="请选择来源">
+						:label="dict.label"
-							<el-option
+						:value="dict.value" />
-								v-for="dict in originList"
+				</el-select>
-								:key="dict.value"
+			</el-form-item>
-								:label="dict.label"
+			<el-form-item label="供应商" prop="supplierId">
-								:value="dict.value" />
+				<el-select
-						</el-select>
+					v-model="dataForm.supplierId"
-					</el-form-item>
+					filterable
-				</el-col>
+					style="width: 100%"
-			</el-row>
+					placeholder="请选择供应商">
-			<el-row :gutter="20">
+					<el-option
-				<el-col :span="12">
+						v-for="dict in supplierList"
-					<el-form-item label="供应商" prop="supplierId">
+						:key="dict.id"
-						<el-select
+						:label="dict.name"
-							v-model="dataForm.supplierId"
+						:value="dict.id" />
-							filterable
+				</el-select>
-							style="width: 100%"
+			</el-form-item>
-							placeholder="请选择供应商">
+			<el-form-item label="批次号" prop="batch">
-							<el-option
+				<el-input
-								v-for="dict in supplierList"
+					v-model="dataForm.batch"
-								:key="dict.id"
+					clearable
-								:label="dict.name"
+					placeholder="请输入批次号" />
-								:value="dict.id" />
+			</el-form-item>
-						</el-select>
+			<el-form-item label="数量" prop="num">
-					</el-form-item>
+				<el-input-number
-				</el-col>
+					v-model="dataForm.num"
-				<el-col :span="12">
+					clearable
-					<el-form-item label="批次号" prop="batch">
+					style="width: 100%"
-						<el-input
+					placeholder="请输入数量" />
-							v-model="dataForm.batch"
+			</el-form-item>
-							clearable
+			<el-form-item label="单位" prop="unit">
-							placeholder="请输入批次号" />
+				<el-select
-					</el-form-item>
+					v-model="dataForm.unit"
-				</el-col>
+					filterable
-			</el-row>
+					style="width: 100%"
-			<el-row :gutter="20">
+					placeholder="请选择单位">
-				<el-col :span="12">
+					<el-option
-					<el-form-item label="数量" prop="num">
+						v-for="dict in getDictDatas('unit_dict')"
-						<el-input-number
+						:key="dict.value"
-							v-model="dataForm.num"
+						:label="dict.label"
-							clearable
+						:value="dict.value" />
-							controls-position="right"
+				</el-select>
-							style="width: 100%"
+			</el-form-item>
-							placeholder="请输入数量" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="单位" prop="unit">
-						<el-select
-							v-model="dataForm.unit"
-							filterable
-							style="width: 100%"
-							placeholder="请选择单位">
-							<el-option
-								v-for="dict in getDictDatas('unit_dict')"
-								:key="dict.value"
-								:label="dict.label"
-								:value="dict.value" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-			</el-row>
 		</el-form>
 
 		<el-row style="text-align: right">

src/views/base/coreWorkOrder/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="350"
+				:width="300"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -57,8 +57,7 @@ import {
 	getCoreWOPage,
 	deleteCoreWO,
 	statusChange,
-	getConOrderList,
+	getConOrderList
-	getCoreWOList
 } from '@/api/base/coreWorkOrder';
 
 
@@ -67,26 +66,19 @@ const tableProps = [
 		prop: 'createTime',
 		label: '创建时间',
 		filter: parseTime,
-		minWidth: 150,
+		'show-overflow-tooltip': true
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '工单名称',
+		label: '工单名称'
-		minWidth: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '工单编码',
+		label: '工单编码'
-		minWidth: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'workers',
-		label: '负责人',
+		label: '负责人'
-		minWidth: 100,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'priority',
@@ -96,7 +88,7 @@ const tableProps = [
 	{
 		prop: 'triggerOrigin',
 		label: '来源',
-		filter: (val) => ['', 'MES-手动', 'MES-订单下发', 'ERP'][val]
+		filter: (val) => ['', 'MES', 'ERP'][val]
 	},
 	{
 		prop: 'status',
@@ -106,19 +98,15 @@ const tableProps = [
 	{
 		prop: 'planFinishTime',
 		label: '计划完成时间',
-		filter: parseTime,
+		filter: parseTime
-		minWidth: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'planQuantity',
-		label: '计划生产数量',
+		label: '计划生产数量'
-		minWidth: 120,
 	},
 	{
 		prop: 'actualQuantity',
-		label: '实际生产数量',
+		label: '实际生产数量'
-		minWidth: 120,
 	}
 ];
 
@@ -263,16 +251,6 @@ export default {
 			].filter((v)=>v),
 			tableData: [],
 			formConfig: [
-				// {
-				// 	type: 'select',
-				// 	label: '工单名称',
-				// 	placeholder: '工单名称',
-				// 	param: 'name',
-				// 	defaultSelect: '',
-				// 	selectOptions: [],
-				// 	allowCreate: true,
-				// 	filterable: true
-				// },
 				{
 					type: 'input',
 					label: '工单名称',
@@ -330,20 +308,9 @@ export default {
 			this.listQuery.name = this.$route.query.workOrderName;
 			this.formConfig[0].defaultSelect = this.$route.query.workOrderName;
 		}
-		// this.getWorkOrder()
 		this.getDataList()
 	},
 	methods: {
-		getWorkOrder() {
-			getCoreWOList().then(res => {
-				this.formConfig[0].selectOptions = res.data.map(item => {
-					return {
-						name: item.name,
-						id: item.name
-					}
-				})
-			})
-		},
 		refreshWorkOrder(val) {
 			console.log(val)
 			if (val) {

src/views/delivery/deliveryLog/components/addOrUpdate.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="订单名" prop="orderId">
-          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;" filterable>
+          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;">
             <el-option
               v-for="item in orderList"
               :key="item.id"
@@ -39,7 +39,7 @@
     <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="发货负责人" prop="deliveryPersonId">
-          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;" filterable>
+          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;">
             <el-option
               v-for="item in personList"
               :key="item.id"
@@ -75,8 +75,9 @@
   </el-form>
 </template>
 <script>
+import { orderList } from '@/api/base/orderManage'
 import { getWorkerList } from '@/api/base/worker'
-import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog, listOrderList } from '@/api/base/delivery'
+import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog } from '@/api/base/delivery'
 export default {
   name: 'AddOrUpdate',
   data() {
@@ -115,7 +116,7 @@ export default {
       }
     },
     getSelectList() {
-      listOrderList().then(res => {
+      orderList().then(res => {
         this.orderList = res.data || []
       })
       getWorkerList().then(res => {

src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="100px" :model="form">
     <el-form-item label="关联表名" prop="plcId">
-      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;" filterable>
+      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;">
         <el-option
           v-for="item in plcList"
           :key="item.id"

src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="typeId">
-          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;" filterable>
+          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;">
             <el-option
               v-for="item in energyListType"
               :key="item.id"

src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue

@@ -15,7 +15,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="energyTypeId">
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable @change="toggleType">
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" @change="toggleType">
             <el-option
               v-for="item in this.energyTypeList"
               :key="item.id"

src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue

@@ -27,7 +27,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="energyTypeId">
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;">
             <el-option
               v-for="item in energyListType"
               :key="item.id"

src/views/equipment/base/inspection/Record/addRecord.vue

@@ -10,7 +10,7 @@
 		ref="drawer"
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="isdetail"
+		:wrapper-closable="false"
 		class="drawer"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
@@ -85,19 +85,6 @@
 							placeholder="选择巡检时间" />
 					</el-form-item>
 				</el-col>
-				<el-col :span="12">
-					<el-form-item label="数据来源" prop="origin">
-						<el-select
-							v-model="dataForm.origin"
-							filterable
-							:disabled="isdetail"
-							style="width: 100%"
-							placeholder="请选择数据来源">
-							<el-option key="1" label="手动" :value="1" />
-							<el-option key="2" label="自动" :value="2" />
-						</el-select>
-					</el-form-item>
-				</el-col>
 			</el-row>
 			<el-form-item label="巡检内容">
 				<base-table
@@ -115,9 +102,12 @@
 			
 		</el-form>
 
-		<div v-if="!isdetail" class="drawer-body__footer">
+		<div class="drawer-body__footer">
-			<el-button type="primary" @click="goback()">取消</el-button>
+			<el-button type="primary" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</el-button>
-			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+			<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
+				编辑
+			</el-button> -->
+			<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
 		</div>
 	</el-drawer>
 </template>
@@ -184,7 +174,6 @@ export default {
 				actualTime: undefined,
 				responsible: undefined,
 				description: undefined,
-				origin: undefined,
 				files: []
 			},
 			list: [],
@@ -238,6 +227,15 @@ export default {
 			return this.$refs.dataForm.resetFields(args);
 		},
 		initData() {
+			this.dataForm = {
+				id: undefined,
+				configId: undefined,
+				equipmentId: undefined,
+				actualTime: undefined,
+				responsible: undefined,
+				description: undefined,
+				files: []
+			}
 			this.list = []
 			this.file = ''
 			this.fileName = ''

src/views/equipment/base/inspection/Record/attr-add.vue

@@ -0,0 +1,148 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'35%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="备品备件" prop="sparePartId">
+				<el-select
+					v-model="dataForm.sparePartId"
+					filterable
+					style="width: 100%"
+					placeholder="请选择备品备件">
+					<el-option
+						v-for="dict in partList"
+						:key="dict.id"
+						:label="dict.name"
+						:value="dict.id" />
+				</el-select>
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import {
+	createConfigDet,
+	getSparePartList
+} from  '@/api/equipment/base/spare-parts/config';
+
+export default {
+	props: {
+		configId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				sparePartId: ''
+			},
+			partList: [],
+			dataRule: {
+				sparePartId: [{ required: true, message: '备品备件不能为空', trigger: 'change' }]
+			},
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			const res = await getSparePartList()
+			this.partList = res.data
+		},
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			// this.$nextTick(() => {
+			// 	this.$refs['dataForm'].resetFields();
+			// 	if (this.dataForm.id) {
+			// 		getCoreProductAttr({
+			// 			id: this.dataForm.id
+			// 		}).then((res) => {
+			// 			const { name, value } = res.data;
+			// 			this.dataForm.name = name;
+			// 			this.dataForm.value = value;
+			// 		});
+			// 	}
+			// });
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					// if (this.dataForm.id) {
+					// 	updateCoreProductAttr({
+					// 		...this.dataForm,
+					// 		productId: this.productId,
+					// 	}).then((response) => {
+					// 		this.$modal.msgSuccess('修改成功');
+					// 		this.visible = false;
+					// 		this.$emit('refreshDataList');
+					// 	});
+					// 	return;
+					// }
+					// 添加的提交
+					createConfigDet({
+						...this.dataForm,
+						configId: this.configId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/equipment/base/inspection/Record/index.vue

@@ -93,7 +93,7 @@ export default {
 			tableProps: [
 				{ prop: 'configName', label: '配置名称' },
 				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', '自动'][val] },
+				// { prop: 'lineName', label: '数据来源' },
 				// { prop: 'sectionName', label: '计划巡检时间' },
 				{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
 				// { prop: 'maintenanceDetail', label: '完成状态' },

src/views/group/base/groupTeam/components/groupTeamAdd.vue

@@ -15,7 +15,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item label="班组组长" prop="leaderId">
-          <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" filterable @change="selectLeader">
+          <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" @change="selectLeader">
             <el-option
               v-for="item in workerList"
               :key="item.id"

src/views/login.vue

@@ -80,6 +80,13 @@
 
 				<!-- 表单 -->
 				<div class="form-cont">
+					<el-tabs
+						class="form"
+						v-model="loginForm.loginType"
+						style="float: none">
+						<el-tab-pane label="账号密码登录" name="uname"></el-tab-pane>
+						<el-tab-pane label="短信验证码登录" name="sms"></el-tab-pane>
+					</el-tabs>
 					<div style="">
 						<el-form
 							ref="loginForm"
@@ -99,7 +106,7 @@
 								</el-input>
 							</el-form-item>
 							<!-- 账号密码登录 -->
-							<div>
+							<div v-if="loginForm.loginType === 'uname'">
 								<el-form-item prop="username">
 									<el-input
 										v-model="loginForm.username"
@@ -132,6 +139,56 @@
 								</el-checkbox>
 							</div>
 
+							<!-- 短信验证码登录 -->
+							<div v-if="loginForm.loginType === 'sms'">
+								<el-form-item prop="mobile">
+									<el-input
+										v-model="loginForm.mobile"
+										type="text"
+										auto-complete="off"
+										placeholder="请输入手机号">
+										<!-- <svg-icon
+											slot="prefix"
+											icon-class="phone"
+											class="el-input__icon input-icon" /> -->
+									</el-input>
+								</el-form-item>
+								<el-form-item prop="mobileCode">
+									<el-input
+										v-model="loginForm.mobileCode"
+										type="text"
+										auto-complete="off"
+										placeholder="短信验证码"
+										class="sms-login-mobile-code-prefix"
+										@keyup.enter.native="handleLogin">
+										<!-- <template>
+											<svg-icon
+												slot="prefix"
+												icon-class="password"
+												class="el-input__icon input-icon" />
+										</template> -->
+										<template slot="suffix">
+											<span
+												v-if="mobileCodeTimer <= 0"
+												class="getMobileCode"
+												@click="getSmsCode"
+												style="
+													cursor: pointer;
+													color: #0b58ff;
+													font-size: calc(12 * 0.12vh);
+													line-height: calc(54 * 0.12vh);
+													padding-right: calc(10 * 0.12vh);
+												">
+												获取验证码
+											</span>
+											<span v-if="mobileCodeTimer > 0" class="getMobileCode">
+												{{ mobileCodeTimer }}秒后可重新获取
+											</span>
+										</template>
+									</el-input>
+								</el-form-item>
+							</div>
+
 							<!-- 下方的登录按钮 -->
 							<el-form-item
 								id="button-form-item"
@@ -170,6 +227,13 @@
 				</div>
 			</div>
 		</div>
+
+		<!-- 图形验证码 -->
+		<Verify
+			ref="verify"
+			:captcha-type="'blockPuzzle'"
+			:img-size="{ width: '400px', height: '200px' }"
+			@success="handleLogin" />
 	</div>
 </template>
 
@@ -177,7 +241,7 @@
 import { sendSmsCode, socialAuthRedirect } from '@/api/login';
 import { getTenantIdByName } from '@/api/system/tenant';
 import { SystemUserSocialTypeEnum } from '@/utils/constants';
-import { getTenantEnable } from '@/utils/ruoyi';
+import { getCaptchaEnable, getTenantEnable } from '@/utils/ruoyi';
 import {
 	getPassword,
 	getRememberMe,
@@ -205,7 +269,7 @@ export default {
 	data() {
 		return {
 			codeUrl: '',
-			captchaEnable: false,
+			captchaEnable: true,
 			tenantEnable: true,
 			mobileCodeTimer: 0,
 			loginForm: {
@@ -283,6 +347,8 @@ export default {
 				}
 			});
 		}
+		// 验证码开关
+		this.captchaEnable = getCaptchaEnable();
 		// 重定向地址
 		this.redirect = this.$route.query.redirect
 			? decodeURIComponent(this.$route.query.redirect)
@@ -294,7 +360,15 @@ export default {
 	},
 	methods: {
 		getCode() {
-			this.handleLogin({});
+			// 情况一，未开启：则直接登录
+			if (!this.captchaEnable) {
+				this.handleLogin({});
+				return;
+			}
+
+			// 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
+			// 弹出验证码
+			this.$refs.verify.show();
 		},
 		getCookie() {
 			const username = getUsername();
@@ -448,7 +522,4 @@ export default {
 		top: 22%;
 	}
 }
-.form-cont {
-	padding-top: 40px;
-}
 </style>

src/views/order/base/orderManage/components/addWorkOrder.vue

@@ -6,7 +6,7 @@
           <el-input v-model="form.name"></el-input>
         </el-form-item>
         <el-form-item label="工单名称" prop="workOrderId"  v-if='isBind'>
-          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable @change="getWorkOrderMsg">
+          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" @change="getWorkOrderMsg">
             <el-option
               v-for="item in workOrderList"
               :key="item.id"

src/views/order/base/orderManage/components/orderAdd.vue

@@ -18,7 +18,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable>
+          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;">
             <el-option
               v-for="item in productList"
               :key="item.id"
@@ -39,7 +39,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="客户" prop="customerId">
-          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
+          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable>
             <el-option
               v-for="item in customerList"
               :key="item.id"
@@ -82,7 +82,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable filterable @change="processFlowIdChange">
+          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable @change="processFlowIdChange">
             <el-option
               v-for="item in processFlowList"
               :key="item.id"

src/views/order/monitoring/orderCompletionMonitoring/index.vue

@@ -154,7 +154,7 @@ export default {
       },
       tableProps,
       list: [],
-      tableH: this.tableHeight(305),
+      tableH: this.tableHeight(315),
       total: 0,
       tableBtn: [
       this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
@@ -215,7 +215,7 @@ export default {
   components: { MonitoringRingCharts },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(305)
+      this.tableH = this.tableHeight(315)
     })
     let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
     let end = moment().format('yyyy-MM-DD')
@@ -347,9 +347,6 @@ export default {
   .el-tabs__item {
     color: rgba(0, 0, 0, 0.45);
   }
-  .searchBarBox {
-    margin-bottom: 0;
-  }
   .boxTitle {
     display: inline-block;
     font-size: 16px;

src/views/quality/monitoring/statisticalData/index.vue

@@ -256,11 +256,10 @@ export default {
   },
   mounted() {
     if (this.$route.query.woIdString) {
-      console.log(this.$route.query.woIdString)
+      console.log(this.$route.query.woIdString);
-      this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
+      this.queryParams.workOrderIdList = [this.$route.query.woIdString]
-      // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
       // let arr =[]
-      this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
+      this.searchBarFormConfig[0].defaultSelect = [this.$route.query.woIdString]
       console.log(this.searchBarFormConfig[0].defaultSelect);
     }
     // if (this.$route.params.startTime && this.$route.params.endTime) {