dsj

build/utils.js

@@ -18,8 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
 
-//  let devModules = ['all']
-let devModules = ['index','TMS']
+ let devModules = ['all']
+// let devModules = ['index','TMS','inward']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','RMS'];

config/index.js

@@ -64,10 +64,10 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://172.16.33.166:8080",
+    target: "http://172.16.33.166:8080",
     // target: "http://localhost:8080",
     // target: "http://localhost:8019",
-    target: "http://192.168.1.107:8019",
+    // target: "http://192.168.1.107:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -415,6 +415,7 @@ export default {
                 type: "warning",
               });
               this.purchaseOrderNo = null
+              this.purchaseOrderId = null
               this.form1 = [];
             } else {
               console.log();

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

@@ -418,6 +418,8 @@ export default {
                 type: "warning",
               });
               this.form1 = [];
+              this.purchaseOrderId = null
+              this.purchaseOrderNo = null
             } else {
               console.log();
               this.remark = res.data.data.remark;
@@ -523,8 +525,6 @@ export default {
       console.log(res);
       this.isKuang = false;
     },
-    refreshTable(){
-    },
     ondrawer(num) {
       if(this.supplierId == null){
           this.$message.warning("请先选择发货单位")
@@ -600,21 +600,8 @@ export default {
       this.purchaseOrderId = selection.purchaseOrderId;
     },
     currentRadioChange3(selection) {
+      this.selectionList = [];
       this.selectionList = selection;
-      console.log(selection)
-      selection.forEach((e) => {
-            var addmap = {
-              orderMaterialWeight:e.orderMaterialWeight,
-              carrierName:e.carrierName,
-              capacityNumber:e.capacityNumber,
-              remark:e.remark,
-              carrierId:e.carrierId,
-              capacityId:e.capacityId
-            };
-            this.selectionList.push(addmap)
-            console.log(this.selectionList)
-      })
-      this.truckList = selection
     },
     // 确认
     onClickConfirm() {

src/views/TMS/components/importedMineral/transportExcute/enfactory.vue

@@ -0,0 +1,78 @@
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      startTime: null,
+      endTime: null,
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=8",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=8&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/grossResult.vue

@@ -0,0 +1,47 @@
+<template>
+  <!-- 辅料计毛实绩页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=8",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=8&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/outfactory.vue

@@ -0,0 +1,75 @@
+<template>
+  <!-- 辅料出厂作业页面 -->
+  <div class="homeworkPath">
+   <div class="top"> 
+      <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      startTime: null,
+      endTime: null,
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=8",
+      },
+    };
+  },
+
+  methods: {
+    
+    onclick() {
+       let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=8&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=8&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+        
+      }  
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/qualityResult.vue

@@ -0,0 +1,56 @@
+<template>
+  <!-- 辅料质检作业 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+
+    </div>
+    
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="50">
+        <template slot-scope="scope">
+          <el-button @click="updateClick(scope.row.resultId)" type="text" size="small">
+            修改
+          </el-button>
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "wagonPlease",
+  data() {
+    return {
+      status: "",
+      input: "",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getQualityResult?apiId=150&orderType=8",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+         this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=150&orderType=8&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/tareResult.vue

@@ -0,0 +1,48 @@
+<template>
+  <!-- 辅料计皮实绩页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=8",
+      },
+    };
+  },
+
+  methods: {
+
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=8&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/unload.vue

@@ -0,0 +1,45 @@
+<template>
+  <!-- 卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=8",
+      },
+    };
+  },
+ 
+  methods: {
+    onclick() {
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=8&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -537,16 +537,7 @@ export default {
           this.$message.error("请填写联系电话")
           this.disabled = false
           return
-      }else{
-        let reg = /^1[3|4|5|7|8][0-9]{9}$/;
-        if(!reg.test(this.form.Tel)){
-          // 当校验失败时
-           this.$message.error("联系电话格式填写有误，请重新填写")
-          this.disabled = false
-          return
-        }
       }
-
       var i=0
       this.tableData.forEach((e) =>{
         if(e.requirementPlatformId&&e.requirementUnloadUnitId){