瀏覽代碼

进口矿国产矿

liyg 3 年之前
父節點
當前提交
025136d350

+ 2 - 2
src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -32,7 +32,7 @@
         <el-table-column
         align="center"
           prop="materialName"
-          label="物资"
+          label="品  名"
           width="180px">
         </el-table-column>
         <el-table-column
@@ -570,7 +570,7 @@ export default {
           if(rows.length>0){
             that.disable=false;
             that.tableData=[];
-            if((typeof rows[0]['车号'])=='undefined'){
+            if((typeof rows[0]['车号'])=='undefined' || (typeof rows[0]['发站'])=='undefined' ){
               that.$message({
                 message: "导入Excel格式错误,请参考下方表头格式!",
                 type: "warning",

+ 6 - 1
src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -304,6 +304,9 @@ export default {
       toTheStation:"老区轨道衡"
     };
   },
+  mounted(){
+    this.form1.resultLoadingDate=new Date();
+  },
   methods: {
     currentRadioChange1(selection) {
       this.input = null;
@@ -677,7 +680,9 @@ export default {
     orderChange(selection){
       console.log(selection);
       this.purchaseOrderId=selection.purchaseOrderId;
-      this.form1 = { purchaseOrderNo: selection.purchaseOrderNo };
+      this.form1 = { 
+        purchaseOrderNo: selection.purchaseOrderNo ,
+        resultLoadingDate:new Date() };
       this.materialId=selection.materialId;
       this.materialName=selection.materialName;
       this.supplierId=selection.supplierId;

+ 7 - 1
src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -304,6 +304,9 @@ export default {
       toTheStation:"老区轨道衡"
     };
   },
+  mounted(){
+    this.form1.resultLoadingDate=new Date();
+  },
   methods: {
     currentRadioChange1(selection) {
       this.input = null;
@@ -677,7 +680,10 @@ export default {
     orderChange(selection){
       console.log(selection);
       this.purchaseOrderId=selection.purchaseOrderId;
-      this.form1 = { purchaseOrderNo: selection.purchaseOrderNo };
+      this.form1 = { 
+        purchaseOrderNo: selection.purchaseOrderNo,
+        resultLoadingDate:new Date() 
+        };
       this.materialId=selection.materialId;
       this.materialName=selection.materialName;
       this.supplierId=selection.supplierId;

+ 0 - 1
src/views/WMS/components/steel/steel_outbound.vue

@@ -45,7 +45,6 @@ export default {
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     onclick(){
-      console.log(this.options);
       let startTime = null;
       let endTime = null;
       if (this.startTime) {