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

src/views/business/spd/bo/gather/index.vue

@@ -12,8 +12,8 @@
         <el-col :span="4">
           <el-form-item label="产线" prop="productionLineName">
             <el-popover-tree-select v-model="queryParams.productionLineName" valueKey='name' title="产线"
-              referName="PRODUCTLINE" :dataMapping="{ customCode: 'id', custom: 'name'}" :source.sync="queryParams"
-              placeholder="请输入产线" @keyup.enter.native="handleQuery" />
+              referName="PRODUCTLINE" :dataMapping="{ productionLine: 'id', productionLineName: 'name'}"
+              :source.sync="queryParams" placeholder="请输入产线" @keyup.enter.native="handleQuery" />
           </el-form-item>
         </el-col>
         <el-col :span="5">
@@ -121,8 +121,8 @@
           <el-col :span="6">
             <el-form-item label="产线" prop="productionLineName">
               <el-popover-tree-select v-model="form.productionLineName" valueKey='name' title="产线"
-                referName="PRODUCTLINE" :dataMapping="{ customCode: 'id', custom: 'name'}" :source.sync="form"
-                placeholder="请输入产线" />
+                referName="PRODUCTLINE" :dataMapping="{ productionLine: 'id', productionLineName: 'name'}"
+                :source.sync="form" placeholder="请输入产线" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -462,7 +462,7 @@
       handleExport() {
         this.download('mk/bo/gathercg/export', {
           ...this.queryParams
-        }, `gather_${new Date().getTime()}.xlsx`)
+        }, '项目信息收集_' + this.dateToStrDownload(new Date()) + '.xlsx')
       },
       // 日期转字符串格式
       dateToStr(date) {
@@ -487,6 +487,20 @@
           ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
           (day > 9 ? day : ("0" + day)) + " " + "23:59:59"
       },
+      dateToStrDownload(date) {
+        var year = date.getFullYear(); // 年
+        var month = date.getMonth(); // 月
+        var day = date.getDate(); // 日
+        var hours = date.getHours(); // 时
+        var min = date.getMinutes(); // 分
+        var second = date.getSeconds(); // 秒
+        return year + "_" +
+          ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "_" +
+          (day > 9 ? day : ("0" + day)) + "_" +
+          (hours > 9 ? hours : ("0" + hours)) + "_" +
+          (min > 9 ? min : ("0" + min)) + "_" +
+          (second > 9 ? second : ("0" + second));
+      },
     }
   };