Merge branch 'dev' into vite

# Conflicts:
#	examples/main.js
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/AppDesigner.vue
#	packages/bigscreen/designer/components/Add.vue
#	packages/bigscreen/designer/components/Layout.vue
#	packages/bigscreen/designer/components/List.vue
#	packages/bigscreen/designer/components/SourceData.vue
#	packages/bigscreen/designer/components/form/DataConfig.vue
#	packages/bigscreen/designer/config.js
#	packages/bigscreen/viewer/AppGigscreenViewer.vue
#	packages/conv/creditScore/scoreManage/scoreChange.vue
#	packages/index.js
#	project/dv/apps/AppGridDV.vue
#	project/dvui/components/AiMonitor/dhVideo.vue
#	project/dvui/components/AiSwiper.vue
#	project/dvui/layout/AiDvBackground.vue
#	project/dvui/layout/AiDvSummary/AiDvSummary.vue
#	project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
#	project/dvui/package.json
#	public/index.html
#	vue.config.js

packages/work/processManagement/mattersConfig/components/processApproval.vue

@@ -45,7 +45,7 @@
                 </div>
               </div>
               <ai-wechat-selecter slot="append" :instance="instance" :props="{id:'wxUserId',label:'name'}"
-                                    v-model="item.candidateList" v-if="item.candidateApproverType==1">
+                                  v-model="item.candidateList" v-if="item.candidateApproverType==1">
                 <el-button size="mini" type="primary">选择指定人员</el-button>
               </ai-wechat-selecter>
             </div>
@@ -53,8 +53,8 @@
         </el-steps>
       </template>
     </ai-card>
-    <el-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
-               :close-on-click-modal="false">
+    <ai-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
+               :close-on-click-modal="false" @onConfirm="saveAddProgress('addForm')">
       <el-form :model="nodeObj" label-width="120px" ref="addForm" :rules="addRules">
         <el-form-item label="审批步骤名称：" prop="nodeName">
           <el-input size="small" v-model="nodeObj.nodeName" placeholder="如：部门主管审批（限10个字）" :maxLength="10"
@@ -87,12 +87,7 @@
           </el-radio-group>
         </el-form-item>
       </el-form>
-      <div slot="footer" style="text-align: center;">
-        <el-button style="width: 92px;" size="small" @click="isAddStep = false">取消</el-button>
-        <el-button style="width: 92px;" size="small" type="primary" @click="saveAddProgress('addForm')">确认
-        </el-button>
-      </div>
-    </el-dialog>
+    </ai-dialog>
   </div>
 </template>
 
@@ -117,14 +112,7 @@ export default {
       isSelectImg: false,
       isSelectUnit: false,
       isSelectPerson: false,
-      nodeObj: {
-        candidateApproverType: '1',
-        candidateList: [],
-        nodeIndex: '',
-        nodeName: '',
-        nodeType: '',
-        scopeCandidates: ''
-      },
+      nodeObj: {},
       indexType: '',
       titleType: '',
       bomIndex: '',
@@ -175,20 +163,17 @@ export default {
         this.titleType = '编辑审批步骤';
         item.nodeType = item.nodeType * 1;
         item.candidateApproverType = item.candidateApproverType * 1;
-        item.scopeCandidates = item.scopeCandidates * 1;
         this.nodeObj = JSON.parse(JSON.stringify(item));
       } else {
         this.titleType = '添加审批步骤';
-        if (this.form.processNodeList.length > 0) {
-          this.init();
-        }
+        this.init();
       }
     },
     // 确定添加审批步骤
     saveAddProgress(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.nodeObj.scopeCandidates == 0) this.nodeObj.candidateList = [];
+          if (this.nodeObj.scopeCandidates == '0') this.nodeObj.candidateList = [];
           if (this.indexType == 1) {
             this.form.processNodeList.push(JSON.parse(JSON.stringify(this.nodeObj)));
           } else {
@@ -206,7 +191,7 @@ export default {
         nodeIndex: '',
         nodeName: '',
         nodeType: '',
-        scopeCandidates: ''
+        scopeCandidates: '1',
       };
       this.$refs['addForm'].resetFields();
     },