'合并冲突'

src/components/product/productTool.vue

@@ -13,7 +13,7 @@
       </template>
 
       <span style="float: right;">
-        <remoteSearch/>
+        <remoteSearch v-if="showSelect"/>
         <el-button type="primary" @click="handProduct">添加产品</el-button>
       </span>
     </div>

src/components/public/uploadFiles.vue

@@ -95,7 +95,7 @@ methods: {
       let fileType = file.name.split(".");
       let type = fileType[fileType.length - 1];
       let key = "&key=" + fileType[0] + file.uid + "." + type
-      // let CreateTime = tools.formatDate(new Date(file.lastModified))
+      let CreateTime = tools.formatDate(new Date(file.lastModified))
       reader.onloadstart = function () {
         // 这个事件在读取开始时触发
       };
@@ -131,7 +131,7 @@ methods: {
                   Key: key.split("=")[1],
                   Type: type,
                   Name: file.name,
-                  // CreateTime,
+                  CreateTime,
                   SystemId: 'dataPlatform'
                 }
 

src/components/supplement/sagaSupplement.vue

@@ -39,7 +39,6 @@
 
               <el-input
                 v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'"
-                :class="item.InputMode == 'A1'||item.InputMode == 'A2' ? 'reset-width':''"
                 type="number"
                 v-model="ruleForm.ProdParam[item.Code]">
                 <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
@@ -126,9 +125,9 @@
 
 <script>
   import uploadFiles from "@/components/public/uploadFiles"
-  import { prodTypeCreate, prodTypeUpdate, defFuncidQuery, prodRecordQuery } from "@/api/product"
-  import { brandQueryByKeyword, brandRecordQuery } from "@/api/brand"
-  import { mapGetters } from "vuex"
+  import {defFuncidQuery, prodRecordQuery, prodTypeCreate, prodTypeUpdate} from "@/api/product"
+  import {brandQueryByKeyword, brandRecordQuery} from "@/api/brand"
+  import {mapGetters} from "vuex"
 
   export default {
     components: {uploadFiles},
@@ -383,12 +382,6 @@
   /deep/ .el-scrollbar__wrap {
     overflow-x: hidden;
   }
-
-  .reset-width {
-    /*.el-input__inner {*/
-    /*   width: 200px;*/
-    /* }*/
-  }
 }
 
 ::-webkit-scrollbar-thumb {

src/utils/tools.js

@@ -52,13 +52,21 @@ tools.isSimilarly = (newValue, oldValue) => {
                     }
                 })
             } catch (error) {
-                return false
+              return false
             }
-            return flag
+          return flag
         }
     } else {
-        return false
+      return false
     }
 }
-
-export default tools
+tools.formatDate = (now) => {
+  let year = now.getFullYear();
+  let month = now.getMonth() + 1;
+  let date = now.getDate();
+  let hour = now.getHours();
+  let minute = now.getMinutes();
+  let second = now.getSeconds();
+  return year + "-" + month + "-" + (date > 10 ? date : '0' + date) + " " + hour + ":" + (minute > 10 ? minute : '0' + minute) + ":" + (second > 10 ? second : '0' + second);
+};
+export default tools