修改冲突

build/utils.js

@@ -18,15 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
  // let devModules = ['index','WMS']
  let devModules = ['all']
-<<<<<<< HEAD
 // let devModules = ['index','TMS','statisticalReport','appoint','sale','RMS'];
 // let devModules = ['index','appoint','WMS'];
-=======
- // let devModules = ['index','WMS','inward','SporadicManage','TMS','sale']
-// let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
-
-// let devModules = ['index','appoint','WMS','sale'];
->>>>>>> 962e307333c007954c1e2d1022a8e53577afc121
 
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

src/views/TMS/components/importedIngredients/truckLeaveFactoryFuResult.vue

@@ -1,7 +1,6 @@
 <template>
   <!-- 辅料出厂作业页面 -->
   <div class="homeworkPath">
-<<<<<<< HEAD
    <div class="top"> 
       <span class="text">出厂时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
@@ -10,17 +9,6 @@
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
        <el-button type="primary" class="btn" @click="onclick">
-=======
-    <div class="top">
-      <el-input
-        placeholder="请输入内容"
-        class="input"
-        v-model="input"
-        clearable
-      >
-      </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
->>>>>>> 316aaeed393abe41c9ba8b8fc4bef29b4f666027
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
@@ -29,11 +17,8 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 import { sjTime } from "@/utils/sharedJsFile";
-=======
 import { getCookie } from "@/utils/util.js";
->>>>>>> 316aaeed393abe41c9ba8b8fc4bef29b4f666027
 export default {
   name: "homeworkPath",
   data() {
@@ -64,7 +49,6 @@ export default {
       }
     },
     onclick() {
-<<<<<<< HEAD
      let startTime = null;
       let endTime = null;
       if(this.startTime){
@@ -85,11 +69,6 @@ export default {
         this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
         
       }  
-=======
-      this.option.requestUrl =
-        "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&con=" +
-        this.input;
->>>>>>> 316aaeed393abe41c9ba8b8fc4bef29b4f666027
     },
   },
 };

src/views/TMS/components/importedTruck/truckLeaveFactoryResult.vue

@@ -2,7 +2,6 @@
   <!-- 出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-<<<<<<< HEAD
        <span class="text">出厂时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
@@ -10,10 +9,6 @@
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
        <el-button type="primary" class="btn" @click="onclick">
-=======
-      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
->>>>>>> 316aaeed393abe41c9ba8b8fc4bef29b4f666027
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/exFactoryOld.vue

@@ -1,7 +1,6 @@
 //老区采购化工产品出厂作业
 <template>
   <div class="homeworkPath">
-<<<<<<< HEAD
    <div class="top"> 
      <span class="text">出厂时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
@@ -10,11 +9,6 @@
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
        <el-button type="primary" class="btn" @click="onclick">
-=======
-    <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
->>>>>>> 316aaeed393abe41c9ba8b8fc4bef29b4f666027
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
@@ -25,11 +19,8 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 import { sjTime } from "@/utils/sharedJsFile";
-=======
 import { getCookie } from "@/utils/util.js";
->>>>>>> 316aaeed393abe41c9ba8b8fc4bef29b4f666027
 export default {
   name: "homeworkPath",
   data() {
@@ -54,7 +45,6 @@ export default {
   },
   methods: {
     onclick() {
-<<<<<<< HEAD
       let startTime = null;
       let endTime = null;
       if(this.startTime){
@@ -75,13 +65,6 @@ export default {
         this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
         
       }  
-=======
-      if (getCookie("orgCode") == "chengyunshang") {
-        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=17&carrierSsoId=" + getCookie("userId")+"&con=" + this.input;;
-      } else {
-        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=17&carrierSsoId=" + null +"&con=" + this.input;
-      }
->>>>>>> 316aaeed393abe41c9ba8b8fc4bef29b4f666027
     },
    }
 };