Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
2021-07-19 17:39:52 +08:00
parent a76a1ab869 9e315314bc
commit a3e01f170f
50 changed files with 826 additions and 393 deletions
@@ -3730,11 +3730,12 @@ export default {
      this.formFieldList = data.map((item) => {
        if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
            if(item.attrField === 'WSSMR'){
-                const options = [
-                    {label:"署名人1",value:"1"},{label:"署名人2",value:"2"}
-                ]
                return Object.assign({}, item, {
-                    options: options
+                    options: this.allSelectOptions["WSSMR"]
+                })
+            }else if(item.attrField === 'QCDW'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["QCDW"]
                })
            }else if(item.attrField === 'CYSD'){
                return Object.assign({}, item, {