Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/projectorder/detail.vue

@@ -95,6 +95,7 @@
                   <el-col :span="24">
                     <el-form-item label="业务员">
                       <UserSelect
+                      class="!w-250px"
                         :disabled="alterDisabled || detailDisabled"
                         v-model="formData.businessMan"
                         @update:newValue="handleSelectedUser"
@@ -684,7 +685,7 @@ const formData = ref({
   warehouseId: undefined
 })
 const formRules = reactive({
-  businessDeptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
+  businessDeptId: [{ required: true, message: '所属部门不能为空', trigger: '' }],
   customerId: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }],
   projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
   businessLine: [{ required: true, message: '所属业务线不能为空', trigger: 'change' }],

mes-ui/mes-ui-admin-vue3/src/views/majoys/screen/index.vue

@@ -19,7 +19,7 @@
             </template>
             <template #default="{ row, $index }">
               <el-form-item :prop="`${$index}[1]`" class="mb-0px!">
-                <el-input v-model="row[0]" style="width: 100%;!important" placeholder="请输入生产工单" :disabled="formData.ProductionStateList.openMock==0?true:false" />
+                <el-input v-model="row[0]" style="width: 100% !important;" placeholder="请输入生产工单" :disabled="formData.ProductionStateList.openMock==0?true:false" />
               </el-form-item>
             </template>
           </el-table-column>