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

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -474,7 +474,12 @@ export default {
       saveLoading: false,
       fileType: '',
       bpnId: '',
-      decomposeOptions: [], //分解单来源数据
+      decomposeOptions: [
+        {
+            value: "BDR",
+            label: '不带入'
+        }
+      ], //分解单来源数据
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
@@ -571,16 +576,16 @@ export default {
       });
     },
     typeList(row){
-      this.decomposeOptions = []
+      // this.decomposeOptions = []
       this.$http.get("SarStandItems/sar-stand-items/getFileType", {
         standId: row.standId
       }, {}, res => {
-        this.decomposeOptions.push(
-          {
-            value: 'BDR',
-            label: '不带入'
-          }
-        )
+        // this.decomposeOptions.push(
+        //   {
+        //     value: "BDR",
+        //     label: '不带入'
+        //   }
+        // )
         res.data.forEach(item => {
           this.decomposeOptions.push(item)
         })