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

src/pages/main/demandDevelop/index.vue

@@ -282,7 +282,9 @@
                                             v-for="item in supportList"
                                             :key="item.id"
                                             :label="item.factoryName"
-                                            :value="item.factoryName">
+                                            :value="item.factoryName"
+                                            :disabled="getDisabledFlag(item)"
+                                        >
                                         </el-option>
                                     </el-select>
                                 </el-form-item>
@@ -684,6 +686,15 @@ export default {
     // },
   },
   methods: {
+    // 判断需求支撑方是否可选
+    getDisabledFlag(support){
+        for(let n=0;n<this.infodatas.length;n++){
+            if (this.infodatas[n] === support.factoryName){
+                return true;
+            }
+        }
+        return false;
+    },
     // 新的处理方法
     handlePreview(file) {
       console.log(file, "Preview");

src/pages/main/demandDevelop/ywStanding.vue

@@ -176,6 +176,13 @@ export default {
           });
       },
     outlist() {
+        var date = new Date()
+        var year = date.getFullYear()
+        var month = date.getMonth() + 1 < 10 ?
+            '0' + (date.getMonth() + 1) : date.getMonth()+ 1
+        var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+        var nowDate=year+month+day
+
       this.$http({
         url: "/market/mkOnlineChannel/exportLedger",
         method: "post",
@@ -195,7 +202,7 @@ export default {
           });
           window.navigator.msSaveOrOpenBlob(
             blob,
-            "线上业务需求台账-"+new Date().getTime() + ".xlsx"
+            "线上业务需求台账-"+nowDate + ".xlsx"
           );
         } else {
           /* 火狐谷歌的文件下载方式 */
@@ -203,7 +210,7 @@ export default {
           var downloadElement = document.createElement("a");
           var href = window.URL.createObjectURL(blob);
           downloadElement.href = href;
-          downloadElement.download = "线上业务需求台账-"+new Date().getTime() + ".xlsx";
+          downloadElement.download = "线上业务需求台账-"+nowDate + ".xlsx";
           document.body.appendChild(downloadElement);
           downloadElement.click();
           document.body.removeChild(downloadElement);