合并分支 'fix_bug_first_stage' 到 'master'

修改禅道已知bug

查看合并请求 laws-nio/laws-weilai!37

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -830,7 +830,61 @@
             value: 'engineeringInterfacePerson',
             valueName: 'engineeringInterfacePersonName',
             text: this.$t('engineeringInterfacePerson')
-          }
+          },
+          {
+            type: '',
+            value: 'inventoryAffirmStatus',
+            text: this.$t('listConfirmationStatus'),
+            options:[
+              {
+                value:'Not started',
+                key:'Not started',
+                label:this.$t('notLaunch'),
+              },
+              {
+                value:'List to confirm',
+                key:'List to confirm',
+                label:this.$t('toBeConfirmed'),
+              },
+              {
+                value:'Accepted',
+                key:'Accepted',
+                label:this.$t('accept'),
+              },
+              {
+                value:'Rejected',
+                key:'Rejected',
+                label:this.$t('refuse'),
+              },
+            ],
+          },
+          {
+            type: '',
+            value: 'taskAffirmStatus',
+            text: this.$t('taskAffirmStatus'),
+            options:[
+              {
+                value:'Not started',
+                key:'Not started',
+                label:this.$t('notLaunch'),
+              },
+              {
+                value:'List to confirm',
+                key:'List to confirm',
+                label:this.$t('toBeConfirmed'),
+              },
+              {
+                value:'Accepted',
+                key:'Accepted',
+                label:this.$t('accept'),
+              },
+              {
+                value:'Rejected',
+                key:'Rejected',
+                label:this.$t('refuse'),
+              },
+            ],
+          },
         ],
         visibleRoleSwitching: false,
         confirmLoadingRoleSwitching: false,