Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/enum/dict.js

@@ -87,7 +87,8 @@ export default {
   实验报工类型: 'experiment_rules_report_work_type',
   实验规则类型: 'experiment_sheet',
   实验模板样式: 'experiment_template_style',
-  表计类型: 'meter_type'
+  表计类型: 'meter_type',
+  印章类型: 'main_seal_type'
 };
 
 export const numberList = [

src/views/sealManagement/sealDialog.vue

@@ -58,20 +58,14 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="印章类型" prop="sealType" required>
-            <el-select
-              v-model="form.sealType"
-              placeholder="请选择"
+            <DictSelection
+              dictName="印章类型"
               clearable
-              style="width: 100%"
-              :disabled="title == '详情' || title == '变更'"
+              filterable
+              v-model="form.sealType"
+              :isProhibit="title == '详情' || title == '变更'"
             >
-              <el-option
-                v-for="item in sealTypeList"
-                :label="item.label"
-                :key="item.value"
-                :value="item.value"
-              />
-            </el-select>
+            </DictSelection>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -231,7 +225,7 @@
     sealHolderId: '',
     sealHolderName: '',
     sealNumber: '',
-    sealType: '',
+    sealType: 'legal_effect',
     sealTypeName: '',
     status: 1,
     processInstanceId: '',

src/views/system/organization/components/org-user-edit.vue

@@ -162,7 +162,15 @@
             >
             </el-switch>
           </el-form-item>
-          <el-form-item label="审批签名:" prop="signature">
+          <el-form-item
+            label="审批签名:"
+            prop="signature"
+            :rules="{
+              required: this.isCategory == 1,
+              message: '请上传审批签名',
+              trigger: ['blur', 'change']
+            }"
+          >
             <WithView
               :assetName="''"
               v-model="form.signature"
@@ -1172,6 +1180,7 @@
   import dictMixins from '@/mixins/dictMixins';
   import aptitudeDialog from '@/views/factoryModel/jobManagement/components/aptitudeDialog.vue';
   import criticalProcess from './criticalProcess.vue';
+  import { parameterGetByCode } from '@/api/system/dictionary/index.js';
 
   // D:\中赢\kd-aiot-frontend\src\views\system\user
 
@@ -1231,7 +1240,7 @@
       };
       return {
         defaultForm,
-
+        isCategory: '0', //是否启用个人电子签。0 不启用，1启用
         // 表单数据
         form: { ...defaultForm },
         disabled: false,
@@ -1910,6 +1919,11 @@
       this.getFactoryList();
       console.log(this.institutionList, '========');
       this.getProfessionList();
+      parameterGetByCode({
+        code: 'main_is_personal_electronic_signature'
+      }).then((res) => {
+        this.isCategory = res.value;
+      });
     },
     methods: {
       chooseAptitude(data) {
@@ -2042,7 +2056,13 @@
 
       /* 保存编辑 */
       save() {
-        this.$refs.form.validate((valid) => {
+        this.$refs.form.validate((valid, obj) => {
+          if (obj) {
+            let messages = Object.keys(obj).map((key) => obj[key][0]);
+            if (messages.length > 0) {
+              this.$message.warning(messages[0].message);
+            }
+          }
           if (!valid) {
             return false;
           }