Your Name 3 năm trước cách đây
mục cha
commit
b5e1469597
86 tập tin đã thay đổi với 983 bổ sung2046 xóa
  1. 8 8
      config/index.js
  2. 53 5
      src/components/main.vue
  3. 2 2
      src/views/TMS/components/importedFuel/transportReserveRan.vue
  4. 1 2
      src/views/TMS/components/importedFuel/transportReserveRanAdd.vue
  5. 148 43
      src/views/TMS/components/importedFuel/transportReserveRanEdit.vue
  6. 32 17
      src/views/appoint/components/saleContract/addSaleOrder.vue
  7. 15 1
      src/views/appoint/components/saleContract/addTransportPrice.vue
  8. 16 1
      src/views/appoint/components/saleContract/addTruckNoDetail.vue
  9. 17 2
      src/views/appoint/components/saleContract/editSaleOrder.vue
  10. 16 1
      src/views/appoint/components/saleContract/editSaleOrderDetail.vue
  11. 19 0
      src/views/appoint/components/saleContract/editTransportPrice.vue
  12. 16 1
      src/views/appoint/components/saleContract/editTruckNoDetail.vue
  13. 8 1
      src/views/appoint/components/saleContract/editaddress.vue
  14. 6 2
      src/views/appoint/components/saleContract/saleOrder.vue
  15. 16 1
      src/views/appoint/components/saleContract/saleOrderDetail.vue
  16. 8 1
      src/views/appoint/components/saleContract/saleOrderDetailApproved.vue
  17. 6 2
      src/views/appoint/components/saleContract/transportPrice.vue
  18. 3 3
      src/views/homepage/app.html
  19. 4 4
      src/views/homepage/app.js
  20. 15 0
      src/views/homepage/components/homepage.vue
  21. 33 0
      src/views/homepage/router/index.js
  22. 0 262
      src/views/importedIngredients/components/transportReserveFu.vue
  23. 0 550
      src/views/importedIngredients/components/transportReserveFuAdd.vue
  24. 0 98
      src/views/importedIngredients/components/transportReserveFuEdit.vue
  25. 0 113
      src/views/importedIngredients/components/truckDriverReceiveFu.vue
  26. 0 104
      src/views/importedIngredients/components/truckEnfactoryFuResult.vue
  27. 0 187
      src/views/importedIngredients/components/truckJiMaoFuResult.vue
  28. 0 45
      src/views/importedIngredients/components/truckJiPiFuResult.vue
  29. 0 58
      src/views/importedIngredients/components/truckLeaveFactoryFuResult.vue
  30. 0 72
      src/views/importedIngredients/components/truckQualityFuResult.vue
  31. 0 95
      src/views/importedIngredients/components/truckQualityFuResultEdit.vue
  32. 0 58
      src/views/importedIngredients/components/truckReceiptFuResult.vue
  33. 0 58
      src/views/importedIngredients/components/truckReturnResult.vue
  34. 0 57
      src/views/importedIngredients/components/truckUnloadFuResult.vue
  35. 0 53
      src/views/importedIngredients/router/index.js
  36. 3 0
      src/views/sale/components/saleSelfMachine/printLading.vue
  37. 3 0
      src/views/sale/components/saleSelfMachine/printReceipt.vue
  38. 2 1
      src/views/sale/components/saleSelfMachine/printScan.vue
  39. 3 0
      src/views/sale/components/saleSelfMachine/printWarranty.vue
  40. 16 2
      src/views/sale/components/transportFreight/saleTrainSettlement/addBmsTrainFreight.vue
  41. 5 4
      src/views/sale/components/transportFreight/saleTrainSettlement/bmsTrainFreight.vue
  42. 16 2
      src/views/sale/components/transportFreight/saleTrainSettlement/updateBmsTrainFreight.vue
  43. 21 2
      src/views/sale/components/transportFreight/saleTruckSettlement/addBmsTruckStatement.vue
  44. 5 4
      src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailOrder.vue
  45. 5 4
      src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckInvoice.vue
  46. 5 4
      src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckStatement.vue
  47. 5 4
      src/views/sale/components/transport_appointment/addOpenDistribution.vue
  48. 5 4
      src/views/sale/components/transport_appointment/directionalDispatch.vue
  49. 5 4
      src/views/sale/components/transport_appointment/openDistribution.vue
  50. 5 4
      src/views/sale/components/transport_appointment/orderGrabbing.vue
  51. 20 3
      src/views/sale/components/transport_appointment/railPlan/addCokeRailPlan.vue
  52. 16 2
      src/views/sale/components/transport_appointment/railPlan/addSlagRailPlan.vue
  53. 18 4
      src/views/sale/components/transport_appointment/railPlan/addSteelRailPlan.vue
  54. 5 4
      src/views/sale/components/transport_appointment/railPlan/cokeRailPlan.vue
  55. 5 4
      src/views/sale/components/transport_appointment/railPlan/slagRailPlan.vue
  56. 5 4
      src/views/sale/components/transport_appointment/railPlan/steelRailPlan.vue
  57. 17 3
      src/views/sale/components/transport_appointment/railPlan/updateCokeRailPlan.vue
  58. 17 3
      src/views/sale/components/transport_appointment/railPlan/updateSlagRailPlan.vue
  59. 17 3
      src/views/sale/components/transport_appointment/railPlan/updateSteelRailPlan.vue
  60. 5 5
      src/views/sale/components/transport_excute/dilNotice/Carrier_dilNotice.vue
  61. 5 5
      src/views/sale/components/transport_excute/dilNotice/sale_dilNotice.vue
  62. 5 5
      src/views/sale/components/transport_excute/enFactoryResult.vue
  63. 5 4
      src/views/sale/components/transport_excute/grossWeightResult.vue
  64. 5 5
      src/views/sale/components/transport_excute/loadTruckResult.vue
  65. 5 5
      src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue
  66. 5 4
      src/views/sale/components/transport_excute/outFactory/smsResult.vue
  67. 5 4
      src/views/sale/components/transport_excute/qualityResult.vue
  68. 5 4
      src/views/sale/components/transport_excute/returnResult.vue
  69. 5 4
      src/views/sale/components/transport_excute/tareWeightResult.vue
  70. 8 1
      src/views/sale/components/transport_order/disatchSteelSaleOrderAdd.vue
  71. 5 1
      src/views/sale/components/transport_order/dispatchCokeRailPlan.vue
  72. 15 1
      src/views/sale/components/transport_order/dispatchCokeRailPlanAdd.vue
  73. 20 1
      src/views/sale/components/transport_order/dispatchCokeRailPlanCheck.vue
  74. 22 5
      src/views/sale/components/transport_order/dispatchOrder.vue
  75. 15 1
      src/views/sale/components/transport_order/dispatchSlagDayPlanAdd.vue
  76. 15 0
      src/views/sale/components/transport_order/dispatchSlagDayPlanCheck.vue
  77. 5 1
      src/views/sale/components/transport_order/dispatchSlagRailPlan.vue
  78. 5 1
      src/views/sale/components/transport_order/dispatchSteelSaleOrder.vue
  79. 5 1
      src/views/sale/components/transport_order/dispatchSteelSaleOrderCheck.vue
  80. 5 4
      src/views/sale/components/transport_order/receiveOrder.vue
  81. 5 0
      src/views/statisticalReport/app.js
  82. 44 0
      src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelNewMonitor.vue
  83. 44 0
      src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelOldMonitor.vue
  84. 44 0
      src/views/statisticalReport/components/purchaseAccessoriesMonitor.vue
  85. 8 6
      src/views/statisticalReport/router/index.js
  86. 2 2
      文件目录.md

+ 8 - 8
config/index.js

@@ -55,13 +55,6 @@ let proxyTable = {
     }
   },
   // 所有数据的请求域名地址
-  // "/api/v1": {
-  //   target: "http://172.16.33.166:8080",
-  //   ws: true,
-  //   pathRewrite: {
-  //     "^/api/v1": "/api/v1"
-  //   }
-  // },
   "/api/v1": {
     target: "http://192.168.1.104:8081",
     ws: true,
@@ -73,9 +66,16 @@ let proxyTable = {
     target: "http://192.168.1.104:8081",
     ws: true,
     pathRewrite: {
-      "^/views/api/v1": "/api/v1"
+      "^/api/v1": "/api/v1"
     }
   },
+  // "/views/api/v1": {
+  //   target: "http://172.16.33.166:8080",
+  //   ws: true,
+  //   pathRewrite: {
+  //     "^/views/api/v1": "/api/v1"
+  //   }
+  // },
   '/icore.icp.web/pass/logout': {
     target: 'http://172.16.33.161:9001/logout',
     changeOrigin: true,

+ 53 - 5
src/components/main.vue

@@ -74,7 +74,7 @@
     >
       <div id="menuDrag" v-if="menuType === '2'" class="menuDrag"></div>
       <el-menu
-        :default-active="menuData.length > 1 ? '1' : '0-0'"
+        :default-active="defaultActiveIndex"
         :collapse="menuType === '1'"
         class="el-menu-vertical-demo icore-menu icore-menu-level1"
         v-for="(item, index) in menuData"
@@ -270,7 +270,7 @@
             <span
               class="ifCompany el-dropdown-link"
               v-if="companys.length === 1"
-              >{{ companyName }}1</span
+              >{{ companyName }}</span
             >
             <el-dropdown trigger="click" @command="selectComPany" v-else>
               <span class="el-dropdown-link">
@@ -638,7 +638,7 @@
       </div>
     </el-dialog>
   </div>
-</template>
+</template> 
 
 <script>
 import element_css_json_import from "../assets/json/element_css.js";
@@ -650,7 +650,8 @@ import { checkCharLength } from "@/utils/validator.js";
 import store from "@/store/index.js";
 //  字典数据
 import dataDictionary from "@/store/dataDictionary.js";
-import defaultVue from "./default.vue";
+// import defaultVue from "./defaultVue.vue";
+import defaultVue from '@/views/homepage/components/homepage.vue'
 import { proPath } from "@/config/config.js";
 import draggable from "vuedraggable";
 export default {
@@ -864,6 +865,7 @@ export default {
       styleControll: false,
       dutyId: "",
       appId: '',
+      defaultActiveIndex: '' 
     };
   },
   created() {
@@ -984,6 +986,10 @@ export default {
         });
       }
     },
+    selectedMenu: function(menuId){
+      var currentMenu = this.getMenuIndexByMenuId(this.menuData,  null, menuId);
+      currentMenu && window.top.localStorage.setItem("currentMenuIndex", currentMenu.menuIndex);
+    }
   },
   mounted() {
     let that = this;
@@ -1538,7 +1544,10 @@ export default {
           this.init(token);
         }
         // 打开设为主页的菜单
-        that.openMainPage();
+        // that.openMainPage();
+
+        // 自动打开上一次访问页面
+        that.autoOpenLatestPage();
       }
 
       if (routerFlag > 0 || routerFlagP > 0) {
@@ -1744,6 +1753,7 @@ export default {
               menuLabel: "首页",
             },
           ];
+          window.top.localStorage.setItem("currentMenuIndex","");
         }
       }
       that.tabsData = temp;
@@ -1790,6 +1800,9 @@ export default {
         });
       }
       //   console.log('目录', that.selectedMenu, that.tabsData)
+      // 左侧菜单点击切换的时候需要重新加载页面
+      that.menuTabIndex = that.getTabIndex(menuData.menuId);
+      $("#menuTabId iframe").eq(that.menuTabIndex).length && $("#menuTabId iframe").eq(that.menuTabIndex)[0].contentWindow.location.reload(true);
     },
     //  是否合部都不是菜单就不用显示
     allNoMenu(items) {
@@ -2401,6 +2414,41 @@ export default {
       }
       return list;
     },
+    getMenuIndexByMenuId(tree, index, menuId) {
+      if (!!tree && tree.length !== 0) {
+        for (let i = 0; i < tree.length; i++) {
+          let menuIndex = index ? (index + "-" + i.toString()) : i.toString();
+          if (tree[i].menuId == menuId){
+            tree[i]["menuIndex"] = menuIndex;
+            return tree[i];
+          } 
+
+            if (
+              tree[i].hasOwnProperty("children") &&
+              tree[i].children !== null &&
+              tree[i].children.length > 0
+            ) {
+              var result = this.getMenuIndexByMenuId(tree[i].children, menuIndex, menuId);
+              if(result){
+                return result;
+              }
+            }
+        }
+      }
+    },
+    autoOpenLatestPage() {
+      var that = this;
+      var currentMenuIndex = window.top.localStorage.getItem("currentMenuIndex");
+      let menuList = window.top.document.getElementsByClassName("el-menu-item");
+      for (let i = 0; i < menuList.length; i++) {
+        if(menuList[i].__vue__.index === currentMenuIndex){
+            setTimeout(function(){
+                that.defaultActiveIndex = currentMenuIndex;
+                menuList[i].click();
+            }, 20);
+        }
+      }
+    },
     // 打开设为主页菜单页面
     openMainPage() {
       this.mainPageList = this.getMainPage(this.menuData);

+ 2 - 2
src/views/TMS/components/importedFuel/transportReserveRan.vue

@@ -87,7 +87,7 @@ export default {
       option2: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&fuelOrder=1",
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1",
       },
     };
   },
@@ -99,7 +99,7 @@ export default {
           this.input;
       } else {
         this.option2.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&fuelOrder=1&con=" +
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&con=" +
           this.input;
       }
     },

+ 1 - 2
src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -461,8 +461,7 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" >
+<style lang="scss">
 .contractDetails {
   width: 100%;
 }

+ 148 - 43
src/views/TMS/components/importedFuel/transportReserveRanEdit.vue

@@ -2,39 +2,120 @@
   <!-- 修改运输预约页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="main">
-      <span class="text">修改运输预约</span>
-      <span class="a"></span>
-    </div>
     <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="220" v-model="form1"></dil-form>
+      <div class="form-one">
+        <dil-form :formId="220" v-model="form1"> </dil-form>
+      </div>
+      <div class="btn">
+        <div class="btn1">
+          <el-button type="primary" @click="selectTruck">浏览</el-button>
+        </div>
+        <div class="btn1">
+          <el-button type="primary" @click="selectUnloadingPoint"
+            >浏览</el-button
+          >
         </div>
       </div>
-    </div>  
- 
-    <div class="button-box">
+    </div>
+
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
+
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      size="40%"
+      :wrapperClosable="true"
+      :close-on-press-escape="false"
+      :destroy-on-close="false"
+      :show-close="false"
+      :withHeader="true"
+      modal
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 0.625rem; margin-left: 1.25rem; width: 200px"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="third"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import {sjTime} from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
-    data(){
-          return {
-          form1: {},
-        }
-    },
+  data() {
+    return {
+      form1: {},
+      drawer: false,
+      direction: "rtl",
+      a: null,
+      third: {
+        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        selectionType: "radio",
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+      capacityId: null,
+      warehouseId: null,
+      input: null,
+      orderType:null,
+    };
+  },
   mounted() {
     this.information();
   },
   methods: {
+    onclick(a) {
+      if (a == 1) {
+        this.third.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&con=" + this.input;
+      } else if (a == 2) {
+      }
+    },
+    selectTruck() {
+      this.a = 1;
+      this.drawer = true;
+    },
+    selectUnloadingPoint() {
+      this.a = 2;
+      this.drawer = true;
+    },
+    currentRadioChange(row) {
+      this.form1.capacityNumber = row.capacityNumber;
+      this.capacityId = row.capacityId;
+    },
+    currentRadioChange2(row) {
+      this.form1.warehouseName = row.warehouseName;
+      this.warehouseId = row.warehouseId;
+    },
     information() {
       this.axios
         .post("/api/v1/oms/selectOrderByOrderId/" + this.$route.params.orderId)
@@ -44,40 +125,64 @@ export default {
           });
         });
     },
-     // 返回
+    // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
-     // 确认
+    // 确认
     onClickConfirm() {
       let obj = {
-        orderId: this.$route.params.orderId,
-        materialId: this.form1.materialId,
-        orderEntryTime: sjTime(this.form1.orderEntryTime),
-        unloadPointId: this.form1.unloadPointId,
-        orderType: this.form1.orderType
-      };
-
-      if (
-        obj.orderId==null||
-        obj.materialId==null||
-        obj.unloadPointId==null||
-        obj.orderEntryTime==null
-      ) this.$message.error("存在空值!");
-      else
-      this.axios
-        .post("/api/v1/oms/updateOrder", obj)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
-          });
-          this.$router.go(-1);
+          orderId:this.$route.params.orderId,
+          capacityId:parseInt(this.capacityId),
+          unloadPointId:this.warehouseId,
+          orderEntryTime:sjTime(this.form1.orderEntryTime),
+          orderType:parseInt(this.form1.orderType),
+        }
+        this.axios.post("/api/v1/oms/updateOrder", obj).then((res) => {
+          if(res.data.code == "200"){
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            this.$router.push("/transportReserveRan");
+            }
         });
-    },
+    }
   },
 };
 </script>
-<style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.contractTitle {
+  display: flex;
+  justify-content: center;
+  margin: 20px;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+      font-size: 14px;
+    }
+    .el-input {
+      width: 250px;
+    }
+  }
+  .btn {
+    margin-left: 20px;
+    padding-top: 105px;
+    .btn1 {
+      margin-bottom: 15px;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .el-button {
+    width: 80px;
+    margin: 10px;
+  }
+}
 </style>

+ 32 - 17
src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -6,30 +6,25 @@
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="284" v-model="form1" ref="from1"></dil-form>
     </div>
-    <div class="select">
+    <div class="select from">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item label="是否自提">
           <el-select v-model="values" placeholder="请选择">
-            <el-option
-              v-for="item in options"
-              :key="item.values"
-              :label="item.label"
-              :value="item.values"
-            >
+            <el-option v-for="item in options" :key="item.values" :label="item.label" :value="item.values">
             </el-option>
           </el-select>
         </el-form-item>
       </el-form>
     </div>
-    <div class="table_form">
+
+    <div class="table_form from">
       <div class="materialId">
         <span class="text"> 物资: </span>
-        <el-button type="primary" class="btn" @click="table = true"
-          >浏览</el-button
-        >
+        <el-button type="primary" class="btn" @click="table = true">浏览</el-button>
       </div>
     </div>
-    <div class="selectionTable">
+
+    <div class="selectionTable from">
       <el-table
         :data="selectionList"
         border
@@ -128,6 +123,7 @@
         </el-table-column>
       </el-table>
     </div>
+
     <el-drawer
       :visible.sync="drawer"
       :direction="direction"
@@ -161,8 +157,9 @@
       size="50%"
       :show-close="false"
     >
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input
-      ><el-button type="primary" class="btn" @click="onclick">
+      <el-input placeholder="请输入内容" v-model="input"  
+      style="margin-top: 10px; margin-left: 20px;width:160px" clearable> </el-input
+      ><el-button type="primary" class="btn" @click="onclick" style="margin-left: 4px;">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button @click="open">取消</el-button>
@@ -423,15 +420,33 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.addSalePlan{
+  width: 100%;
+}
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 .select {
-  margin-left: 33.9rem;
+  margin-left: -10rem;
 }
 .demo-form-inline {
   margin-left: 2rem;
 }
 .table_form {
-  margin-left: 12rem;
+  margin-left: -16rem;
 }
 .textinput {
   width: 50px;

+ 15 - 1
src/views/appoint/components/saleContract/addTransportPrice.vue

@@ -69,5 +69,19 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 16 - 1
src/views/appoint/components/saleContract/addTruckNoDetail.vue

@@ -129,5 +129,20 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 17 - 2
src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -383,8 +383,23 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
 .table_form {
-  margin-left: 4.5rem;
+  margin-left: -16rem;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
 }
-
 </style>

+ 16 - 1
src/views/appoint/components/saleContract/editSaleOrderDetail.vue

@@ -84,5 +84,20 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 19 - 0
src/views/appoint/components/saleContract/editTransportPrice.vue

@@ -93,4 +93,23 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.table_form {
+  margin-left: -16rem;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 16 - 1
src/views/appoint/components/saleContract/editTruckNoDetail.vue

@@ -83,5 +83,20 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 8 - 1
src/views/appoint/components/saleContract/editaddress.vue

@@ -77,5 +77,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
 </style>

+ 6 - 2
src/views/appoint/components/saleContract/saleOrder.vue

@@ -7,7 +7,7 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="btnclick(0)">
-        <i class="el-icon-plus"></i>新增
+        <i class="el-icon-plus"></i>钢材订单新增
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -204,7 +204,11 @@ export default {
 <style lang='scss' scoped>
 .salePlan {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 16 - 1
src/views/appoint/components/saleContract/saleOrderDetail.vue

@@ -141,5 +141,20 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 8 - 1
src/views/appoint/components/saleContract/saleOrderDetailApproved.vue

@@ -48,5 +48,12 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 6 - 2
src/views/appoint/components/saleContract/transportPrice.vue

@@ -116,8 +116,12 @@ export default {
 </script>
 <style lang='scss' scoped>
 .salePlan {
-  .top {
-    padding: 1.25rem 1.875rem;
+  .top{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 3 - 3
src/views/importedIngredients/app.html → src/views/homepage/app.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html style="overflow: hidden;">
+<html>
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta content="工业互联网平台" name="keywords">
     <meta content="工业互联网平台" name="description">
-    <title>首页 - 工业互联网平台 iCore-ICP</title>
+    <title>工业互联网平台</title>
     <link href="../static/css/common.css" rel="stylesheet"/>
     <link href="../static/img/favicon.ico" rel="shortcut icon"/>
     <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>
@@ -14,9 +14,9 @@
     <script src="../static/lib/qrcode.min.js" type="text/javascript"></script>
     <script src='../static/lib/XLSX/xlsx.core.min.js' type='text/javascript'></script>
     <script src="../static/js/common.js" type="text/javascript"></script>
+     
   </head>
   <body>
     <div id="app"></div>
-    <!-- test set app -->
   </body>
 </html>

+ 4 - 4
src/views/importedIngredients/app.js → src/views/homepage/app.js

@@ -15,15 +15,15 @@ import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'
 
-// 注册表格的全局组件
-import DilCommonUI from "@/components/DilCommonUI";
-Vue.use(DilCommonUI);
-
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 
 Vue.use(VueApollo)
 
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
 const apolloProvider = new VueApollo({
     defaultClient: apollo
 })

+ 15 - 0
src/views/homepage/components/homepage.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>首页
+      
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>

+ 33 - 0
src/views/homepage/router/index.js

@@ -0,0 +1,33 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+import routerBefore from '@/config/routerBefore.js'
+
+// 主要
+import main from '@/components/main.vue'
+// 系统配置管理
+import homepage from '../components/homepage.vue'
+Vue.use(Router)
+
+const constantRouterMap = [
+  {
+    path: '/',
+    name: 'main',
+    meta: {title: '首页', code: 'xtpzgl'},
+    component: main,
+    redirect: {name: 'cargoResult'},
+    children: [
+      {path: 'homepage', name: 'homepage', meta: {code: 'xtpzgl-jggl'}, component: homepage},
+    ]
+  }
+];
+
+const router = new Router({
+  routes: constantRouterMap
+})
+//  before
+routerBefore(router, constantRouterMap);
+
+export default router;
+//  constantRouterMap
+export const routes = constantRouterMap;

+ 0 - 262
src/views/importedIngredients/components/transportReserveFu.vue

@@ -1,262 +0,0 @@
-<template>
-  <!-- 采购辅料运输预约 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-button
-        type="primary"
-        @click="insertClick"
-        v-privilege="activeMenu + 'RESERVEFUADD'"
-      >
-        <i class="el-icon-plus"></i>新增
-      </el-button>
-      <el-button
-        type="primary"
-        @click="sendClick(0)"
-        v-privilege="activeMenu + 'SEND'"
-      >
-        <i class="el-icon-bottom"></i>下发
-      </el-button>
-    </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <!-- 未下发 -->
-      <el-tab-pane label="未下发" name="first">
-        <dilTable
-          v-bind.sync="option1"
-          ref="table"
-          @selection-change="selectionChange"
-        >
-          <el-table-column
-            fixed="right"
-            align="center"
-            label="操作"
-            width="120"
-          >
-            <template slot-scope="scope">
-              <el-button
-                @click="sendClick(1, scope.row.orderId)"
-                type="text"
-                size="small"
-                v-privilege="activeMenu + 'SEND'"
-              >
-                下发
-              </el-button>
-              <el-button
-                @click="updateClick(scope.row.orderId)"
-                type="text"
-                size="small"
-                v-privilege="activeMenu + 'UPATE'"
-              >
-                修改
-              </el-button>
-              <el-button
-                @click="
-                  deleteClick(scope.row.orderId, scope.row.capacityNumber)
-                "
-                type="text"
-                size="small"
-                v-privilege="activeMenu + 'DELETE'"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </dilTable>
-      </el-tab-pane>
-      <!-- 已下发 -->
-      <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2">
-          <el-table-column
-            fixed="right"
-            align="center"
-            label="操作"
-            width="120"
-          >
-            <template slot-scope="scope">
-              <el-button
-                @click="CloseClick(scope.row.orderId)"
-                type="text"
-                size="small"
-              >
-                关闭
-              </el-button>
-            </template>
-          </el-table-column>
-        </dilTable>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "inplantTMS",
-  data() {
-    return {
-      activeMenu: "",
-      input: "",
-      Time: "",
-      activeName: "first",
-      option1: {
-        // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5",
-        // 控制显示多选列
-        selectionType: "select",
-      },
-      option2: {
-        // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&orderType=5",
-      },
-      selection: [],
-    };
-  },
-  methods: {
-    //获取选中的订单
-    selectionChange(selection) {
-      this.selection = [];
-      selection.forEach((e) => {
-        this.selection.push({ orderId: e.orderId });
-      });
-    },
-    onclick() {
-      if (this.activeName == "first") {
-        this.option1.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&con=" +
-          this.input;
-      } else {
-        this.option2.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&orderType=5&con=" +
-          this.input;
-      }
-    },
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-    // 下发
-    CloseClick(orderId) {
-      this.$confirm("是否关闭", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      });
-      this.axios
-        .post("/api/v1/oms/CloseOrder", {
-          orderId: orderId,
-        })
-        .then(() => {
-          this.$router.go(0);
-        })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "关闭成功!",
-          });
-          // console.log(this.arr[0].text_prop);
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消关闭!",
-          });
-        });
-    },
-
-    //关闭
-
-    sendClick(index, orderId) {
-      this.$confirm("是否下发", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          let orderList = [];
-          if (index == 0) {
-            if (this.selection.length > 0) {
-              orderList = this.selection;
-            } else {
-              this.$message({
-                type: "warning",
-                message: "请选择要下发的订单!",
-              });
-            }
-          } else if (index == 1) {
-            orderList.push({ orderId: orderId });
-          }
-          this.axios
-            .post("/api/v1/oms/dispatchOrder", {
-              mapList: orderList,
-            })
-            .then(() => {
-              this.option1.requestUrl =
-                "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&i=0";
-            });
-          this.$message({
-            type: "success",
-            message: "下发成功!",
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消下发!",
-          });
-        });
-    },
-    // 删除
-    deleteClick(orderId, capacityNumber) {
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.axios
-            .post("/api/v1/oms/deleteOrder", {
-              orderId: orderId,
-              capacityNumber: capacityNumber,
-            })
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
-    },
-    //新增
-    insertClick() {
-      this.$router.push("/importedIngredients/transportReserveFuAdd/");
-    },
-    //修改
-    updateClick(orderId) {
-      this.$router.push(
-        "/importedIngredients/transportReserveFuEdit/" + orderId
-      );
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

+ 0 - 550
src/views/importedIngredients/components/transportReserveFuAdd.vue

@@ -1,550 +0,0 @@
-<template>
-  <!-- 新增运输作业页面 -->
-  <div id="contractDetails">
-    <page-title>运输预约</page-title>
-
-    <div class="main">
-      <el-divider content-position="left">新增运输预约</el-divider>
-    </div>
-
-    <div class="material from">
-      <span class="text">物资:</span>
-      <el-input v-model="materialName" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
-    </div>
-
-    <div class="forwardingUnit from">
-      <span class="text">发货单位:</span>
-      <el-input v-model="supplierName" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
-    </div>
-    <div class="remark from">
-      <span class="text">船名:</span>
-      <el-input v-model="remark" @blur="onBlur"> </el-input>
-      <span class="span"></span>
-    </div>
-    <div class="forwardingUnit from">
-      <span class="text">卸货点:</span>
-      <el-input v-model="unloadPointName" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
-    </div>
-    <div class="lineId from">
-      <span class="text">选择路线:</span>
-      <el-input v-model="lineName" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
-    </div>
-    <div class="contractTitle from">
-      <dil-form :formId="219" v-model="form1"></dil-form>
-    </div>
-    <div class="truckList1">
-      <div class="truckList from">
-        <span class="text">选择车辆:</span>
-        <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
-          >浏览</el-button
-        >
-      </div>
-    </div>
-    <!-- 车辆表格 -->
-    <div class="switch" v-if="selectionList.length > 0">
-      <el-tooltip placement="top">
-        <div slot="content">下面表格已有数据,不能进行更改!!!</div>
-        <el-switch
-          v-model="value"
-          active-text="重量"
-          inactive-text="件数"
-          disabled
-        >
-        </el-switch>
-      </el-tooltip>
-    </div>
-    <div class="switch" v-else>
-      <el-tooltip placement="top">
-        <div slot="content">当下面表格有数据之后,将不能进行更改!!!</div>
-        <el-switch v-model="value" active-text="重量" inactive-text="件数">
-        </el-switch>
-      </el-tooltip>
-    </div>
-    <div class="truckListTable">
-      <el-table
-        :data="selectionList"
-        border
-        style="width: 100%"
-        highlight-current-row
-      >
-        <el-table-column type="index" width="50" label="序号" align="center">
-        </el-table-column>
-        <el-table-column
-          v-for="(item, i) in tableTop"
-          :key="i"
-          :prop="item.prop"
-          :label="item.label"
-          align="center"
-          show-overflow-tooltip
-        >
-          <template slot="scope" v-if="item.th_name !== '件数'">
-            <span>{{ item.label }}</span>
-          </template>
-          <template slot="scope" v-if="item.th_name !== '重量'">
-            <span>{{ item.label }}</span>
-          </template>
-          <!-- 插入输入框 -->
-          <template slot-scope="scope">
-            <template v-if="item.slot">
-              <template v-if="item.prop == 'orderMaterialNumber'">
-                <el-input
-                  v-model.number="scope.row.orderMaterialNumber"
-                ></el-input>
-              </template>
-              <template v-if="item.prop == 'orderMaterialWeight'">
-                <el-input
-                  v-model.number="scope.row.orderMaterialWeight"
-                ></el-input>
-              </template>
-            </template>
-            <template v-else>
-              <span>{{ scope.row[item.prop] }}</span>
-            </template>
-          </template>
-        </el-table-column>
-
-        <el-table-column fixed="right" label="操作" width="100">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="onClick(scope.$index)"
-              >删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!-- 模态窗口 -->
-    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
-      <el-input
-        placeholder="请输入内容"
-        v-model="input"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
-        clearable
-      ></el-input>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="onclick(a)"
-        style="margin-bottom: 0.9375rem"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <div v-show="a == 1">
-        <dilTable
-          v-bind.sync="frist"
-          @radio-change="currentRadioChange1"
-        ></dilTable>
-      </div>
-      <div v-show="a == 2">
-        <dilTable
-          v-bind.sync="secend"
-          @radio-change="currentRadioChange2"
-        ></dilTable>
-      </div>
-      <div v-show="a == 3">
-        <dilTable
-          v-bind.sync="third"
-          @selection-change="currentRadioChange3"
-        ></dilTable>
-      </div>
-      <div v-show="a == 4">
-        <dilTable
-          v-bind.sync="unloadPoint"
-          @radio-change="currentRadioChange4"
-        ></dilTable>
-      </div>
-      <div v-show="a == 5">
-        <dilTable
-          v-bind.sync="line"
-          @radio-change="currentRadioChange5"
-        ></dilTable>
-      </div>
-    </el-drawer>
-    <div class="button_box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-    </div>
-  </div>
-</template>
-<script>
-import PageTitle from "@/components/Page/Title";
-export default {
-  components: { PageTitle },
-  data() {
-    return {
-      // 线路名称
-      lineName: "",
-      //线路id
-      lineId: null,
-      // 件数与重量的开关
-      value: false,
-      //船名
-      remark: null,
-      // 车辆表格表头
-      tableTop: [
-        {
-          prop: "capacityNumber",
-          label: "车牌号",
-          width: "140",
-        },
-        {
-          prop: "carrierName",
-          label: "承运商",
-          width: "140",
-        },
-        {
-          prop: "orderMaterialNumber",
-          label: "件数",
-          slot: true,
-        },
-      ],
-      //车辆表格数据
-      selectionList: [],
-      // 表单
-      form1: {},
-      //采购订单id
-      purchaseOrderId: "",
-      //物资名称
-      materialName: "",
-      //发货单位名称
-      supplierName: "",
-      //发货单位id
-      supplierId: null,
-      //物资id
-      materialId: null,
-      //是否需要打开模态窗口
-      drawer: false,
-      //卸货点id
-      unloadPointId: "",
-      //卸货点名称
-      unloadPointName: "",
-      a: 1,
-      direction: "rtl",
-      input: "",
-      frist: {
-        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
-        selectionType: "radio",
-        mapList1: [],
-      },
-      secend: {
-        requestUrl:
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
-        selectionType: "radio",
-        mapList2: [],
-      },
-      third: {
-        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
-        selectionType: "select",
-        mapList3: [],
-      },
-      unloadPoint: {
-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
-        selectionType: "radio",
-      },
-      line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
-        selectionType: "radio",
-      },
-    };
-  },
-  watch: {
-    value() {
-      if (this.value) {
-        this.tableTop.splice(this.tableTop.length - 1, 1);
-        this.tableTop.push({
-          prop: "orderMaterialWeight",
-          label: "重量",
-          slot: true,
-        });
-      } else {
-        this.tableTop.splice(this.tableTop.length - 1, 1);
-        this.tableTop.push({
-          prop: "orderMaterialNumber",
-          label: "件数",
-          slot: true,
-        });
-      }
-    },
-  },
-  methods: {
-    onClick(index) {
-      this.selectionList.splice(index, 1);
-    },
-    onBlur() {
-      this.getPurchaseOrderNo();
-    },
-    getPurchaseOrderNo() {
-      let map = {
-        materialId: this.materialId,
-        supplierId: this.supplierId,
-      };
-      if (this.remark) {
-        map.remark = this.remark;
-      }
-      console.log(this.map);
-      if (this.materialId && this.supplierId) {
-        this.$axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
-          console.log(res);
-          if (res.data.code == "200") {
-            if (res.data.data == null) {
-              this.$message({
-                message: "没有匹配的采购订单号!",
-                type: "warning",
-              });
-              this.form1 = [];
-            } else {
-              this.remark = res.data.data.remark;
-              this.purchaseOrderId = res.data.data.purchaseOrderId;
-              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
-            }
-          } else {
-            this.$message.error("请求失败");
-          }
-        });
-      }
-    },
-    onclick(a) {
-      if (a == 1) {
-        this.frist.requestUrl =
-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input;
-      } else if (a == 2) {
-        this.secend.requestUrl =
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
-          this.materialId +
-          "&index=" +
-          this.input;
-      } else if (a == 3) {
-        this.third.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
-          this.input;
-      } else if (a == 4) {
-        this.third.requestUrl =
-          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
-      } else if (a == 5) {
-        this.option.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
-      }
-    },
-    ondrawer(num) {
-      this.drawer = true;
-      this.a = num;
-      if (num == 2) {
-        this.secend.requestUrl =
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
-          this.materialId;
-      }
-    },
-    // 返回
-    onClickCancel() {
-      this.$router.push("/importedIngredients/transportReserveFu");
-    },
-    currentRadioChange1(selection) {
-      this.input = null;
-      this.materialName = selection.materialName;
-      this.materialId = selection.materialId;
-      this.getPurchaseOrderNo();
-    },
-    currentRadioChange2(selection) {
-      this.supplierName = selection.supplierName;
-      this.supplierId = selection.supplierId;
-      this.getPurchaseOrderNo();
-    },
-    currentRadioChange4(selection) {
-      this.unloadPointId = selection.warehouseId;
-      this.unloadPointName = selection.warehouseName;
-    },
-    currentRadioChange5(selection) {
-      this.lineName = selection.lineName;
-      this.lineId = selection.lineId;
-    },
-    currentRadioChange3(selection) {
-      this.selectionList = [];
-      this.selectionList = selection;
-    },
-    // 确认
-    onClickConfirm() {
-      var state = 0;
-      if (
-        this.materialId &&
-        this.supplierId &&
-        this.form1.purchaseOrderId &&
-        this.unloadPointId &&
-        sjTime(this.form1.orderEntryTime) &&
-        this.lineId
-      ) {
-        state = 1;
-      } else {
-        if (!this.materialId) {
-          this.$message({
-            message: "请选择物资!",
-            type: "warning",
-          });
-        } else if (!this.supplierId) {
-          this.$message({
-            message: "请选择发货单位!",
-            type: "warning",
-          });
-        } else if (!this.purchaseOrderId) {
-          this.$message({
-            message: "没有匹配的采购订单号!",
-            type: "warning",
-          });
-        } else if (!this.unloadPointId) {
-          this.$message({
-            message: "请选择卸货地点!",
-            type: "warning",
-          });
-        } else if (!this.lineId) {
-          this.$message({
-            message: "请选择运输路线!",
-            type: "warning",
-          });
-        } else if (!sjTime(this.form1.orderEntryTime)) {
-          this.$message({
-            message: "请选择预估进厂时间!",
-            type: "warning",
-          });
-        }
-      }
-      if (this.selectionList.length == 0) {
-        this.$message({
-          message: "请选择车辆!",
-          type: "warning",
-        });
-        state = 0;
-      } else {
-        this.selectionList.forEach((e) => {
-          if (e.orderMaterialNumber || e.orderMaterialWeight) {
-            if (
-              isNumber(e.orderMaterialNumber) ||
-              isNumber(e.orderMaterialWeight)
-            ) {
-              if (
-                isIntegerNumber(e.orderMaterialNumber) ||
-                isIntegerNumber(e.orderMaterialWeight)
-              ) {
-                state = 1;
-              } else {
-                this.$message({
-                  message: "件数(重量)只能是整数!",
-                  type: "warning",
-                });
-                state = 0;
-              }
-            } else {
-              this.$message({
-                message: "件数(重量)只能是数字!",
-                type: "warning",
-              });
-              state = 0;
-            }
-          } else {
-            this.$message({
-              message: "件数(重量)不能为空!",
-              type: "warning",
-            });
-            state = 0;
-          }
-        });
-      }
-
-      if (state == 1) {
-        let map = {
-          materialId: this.materialId,
-          supplierId: this.supplierId,
-          purchaseOrderId: this.purchaseOrderId,
-          unloadPointId: this.unloadPointId,
-          orderEntryTime: sjTime(this.form1.orderEntryTime),
-          driverCapacityIdList: this.selectionList,
-          orderType: 5,
-          lineId: this.lineId,
-        };
-        console.log(map, map);
-        this.$axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
-          if (res.data.code == "200") {
-            this.$message({
-              message: "添加成功!",
-              type: "success",
-            });
-            this.$router.push("/importedIngredients/transportReserveFu");
-          }
-        });
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" >
-.contractDetails {
-  width: 100%;
-}
-.from {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
-.remark {
-  .text {
-    display: inline-block;
-    width: 5.625rem;
-    text-align: right;
-  }
-}
-.lineId {
-  .text {
-    display: inline-block;
-    width: 10rem;
-    text-align: right;
-  }
-}
-.material {
-  .text {
-    display: inline-block;
-    width: 10rem;
-    text-align: right;
-  }
-}
-.switch {
-  width: 100%;
-  height: 2.5rem;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  padding-right: 6.875rem;
-}
-.forwardingUnit {
-  .text {
-    display: inline-block;
-    width: 10rem;
-    text-align: right;
-  }
-}
-.truckList1 {
-  width: 100%;
-  .truckList {
-    width: 96%;
-    .text {
-      display: inline-block;
-      width: 9.375rem;
-      text-align: right;
-    }
-    .truckBtn {
-      width: 17.5rem;
-    }
-  }
-}
-.button_box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 6.25rem;
-}
-</style>

+ 0 - 98
src/views/importedIngredients/components/transportReserveFuEdit.vue

@@ -1,98 +0,0 @@
-<template>
-  <!-- 修改运输预约页面 -->
-  <div id="contractDetails">
-    <page-title>运输预约</page-title>
-    <div class="main">
-      <span class="text">修改运输预约</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="258" v-model="form1"></dil-form>
-          <div>
-            <div v-if="form1.orderMaterialNumber">
-              <span>物资件数:</span>
-              <el-input placeholder="请输入内容" v-model="orderMaterialNumber" clearable>
-              </el-input>
-            </div>
-             <div v-if="form1.orderMaterialWeight">
-              <span>物资重量:</span>
-              <el-input placeholder="请输入内容" v-model="orderMaterialWeight" clearable>
-              </el-input>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import PageTitle from "@/components/Page/Title";
-export default {
-  components: { PageTitle },
-  data() {
-    return {
-      form1: {},
-      orderMaterialNumber:'',
-      orderMaterialWeight:'',
-    };
-  },
-  mounted() {
-    this.information();
-  },
-  methods: {
-    information() {
-      this.$axios
-        .post("/api/v1/oms/selectOrderByOrderId/" + this.$route.params.orderId)
-        .then((res) => {
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-            if(e.orderMaterialNumber){
-              this.orderMaterialNumber = e.orderMaterialNumber;
-            }else if(e.orderMaterialWeight){
-              this.orderMaterialWeight = e.orderMaterialWeight;
-            }
-          });
-        });
-    },
-    // 返回
-    onClickCancel() {
-      this.$router.go(-1);
-    },
-    // 确认
-    onClickConfirm() {
-      let obj = {
-        orderId: this.$route.params.orderId,
-        orderMaterialNumber: this.form1.orderMaterialNumber,
-        orderEntryTime: sjTime(this.form1.orderEntryTime),
-        unloadPointId: this.form1.unloadPointId,
-        orderType: 5,
-      };
-
-      if (
-        obj.orderId == null ||
-        obj.orderMaterialNumber == null ||
-        obj.orderEntryTime == null ||
-        obj.unloadPointId == null
-      )
-        this.$message.error("存在空值!");
-      else
-        this.$axios.post("/api/v1/oms/updateOrder", obj).then(() => {
-          this.$message({
-            type: "success",
-            message: "修改成功!",
-          });
-          this.$router.go(-1);
-        });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>  

+ 0 - 113
src/views/importedIngredients/components/truckDriverReceiveFu.vue

@@ -1,113 +0,0 @@
-<template>
-  <!-- 运输派单 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <!-- 未接收 -->
-      	<el-tab-pane label="未接收" name="third">
-						<dilTable v-bind.sync="option0">
-              <el-table-column fixed="right" label="操作" width="50">
-        <template slot-scope="scope">
-          <el-button @click="closeOrder(scope.row.orderId)" type="text" size="small">
-            关闭
-          </el-button>
-        </template>
-      </el-table-column>
-						</dilTable>
-					</el-tab-pane>
-      <!-- 未下发 -->
-      <el-tab-pane label="已接收" name="first">
-        <dilTable v-bind.sync="option1" ref="table">
-        </dilTable>
-      </el-tab-pane>
-      <!-- 已下发 -->
-      <el-tab-pane label="已拒绝" name="second">
-        <dilTable v-bind.sync="option2">
-        </dilTable>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "inplantTMS",
-  data() {
-    return {
-      input: "",
-      Time: "",
-      activeName: "first",
-       option0: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4"
-      },
-      option1: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5"
-      },
-      option2: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=6"
-      }
-    };
-  },
-  methods: {
-    closeOrder(orderId) {
-      this.$confirm("是否关闭", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-           this.$axios
-            .post(
-              "/api/v1/oms/closeOmstruckOrde?orderId="+orderId
-            )
-            .then((res) => {
-           if(res.data.code == '200')
-              // if(res.data.code)
-              this.$router.go(0);
-            });
-          this.$message({
-            type: "success",
-            message: "下发成功!",
-          });
-          // console.log(this.arr[0].text_prop);
-         
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消关闭!",
-          });
-        });
-    },
-    onclick() {
-       if(this.activeName == "first"){
-        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&con=" + this.input;
-      }else if(this.activeName == "second"){
-        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=6&con=" + this.input;
-      }else
-      {
-        this.option0.requestUrl="/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con="+this.input;
-      }
-    },
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-   .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

+ 0 - 104
src/views/importedIngredients/components/truckEnfactoryFuResult.vue

@@ -1,104 +0,0 @@
-<template>
-  <!-- 辅料进厂作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" 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/getAllEnFactoryResult?apiId=143&orderType=5",
-      },
-    };
-  },
-  methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
-    },
-    updateClick(resultId) {
-      this.$router.push("/tmsTruck/truckLoadResultEdit/" + resultId);
-    },
-    //新增
-    insertClick() {
-      this.$router.push("/tmsTruck/truckLoadResultAdd/");
-    },
-    // deleteclick(scope) {
-    //   let pathId = scope;
-    //   this.$axios
-    //     .post("/api/v1/tms/operationPath/operationPathDelete?pathId=" + pathId)
-    //     .then((res) => {
-    //       this.$message({
-    //         message: "删除成功",
-    //         type: "success",
-    //       });
-    //       this.$router.go(0);
-    //     });
-    // },
-    deleteClick(resultId) {
-      
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.$axios
-            .post(
-              "/api/v1/tms/deleteLoadResult/" + resultId
-            )
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

+ 0 - 187
src/views/importedIngredients/components/truckJiMaoFuResult.vue

@@ -1,187 +0,0 @@
-<template>
-  <!-- 辅料计毛实绩页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" 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" align="center" label="操作" width="120">
-        <template slot-scope="scope">
-          <el-button
-            @click="sendClick(scope.row.orderId)"
-            type="text"
-            size="small"
-            v-if="scope.row.orderStatus == 5"
-          >
-            退货
-          </el-button>
-          <el-button  
-            type="text"
-            size="small"
-            disabled
-            v-else
-          >
-            退货
-          </el-button>
-        </template>
-      </el-table-column>
-    </dilTable>
-
-    <el-dialog
-      title="提示"
-      :visible.sync="dialogVisible"
-      width="30%"
-      :before-close="handleClose"
-      :modal="true"
-      :close-on-click-modal="false"
-    >
-      <div class="text">
-        <span>请选择退货路线</span>
-      </div>
-      <el-input placeholder="请输入内容" v-model="lineName" disabled>
-      </el-input>
-      <el-button type="primary" @click="onLine">浏览</el-button>
-      <div class="returnResult">
-        <span>退货原因:</span>
-      </div>
-      <el-input placeholder="请输入内容" v-model="returnResult">
-      </el-input>
-      
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handleClose">取 消</el-button>
-        <el-button type="primary" @click="outOrder">确 定</el-button>
-      </span>
-    </el-dialog>
-
-    <!-- 模态窗口 -->
-    <el-drawer :visible.sync="drawer" size="50%">
-      <el-input
-        placeholder="请输入内容"
-        v-model="calculationText"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
-        clearable
-      ></el-input>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="calculation"
-        style="margin-bottom: 0.9375rem"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <div>
-        <!-- 模态框——表格 -->
-        <dilTable
-          v-bind.sync="line"
-          @radio-change="currentRadioChange"
-        ></dilTable>
-      </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      returnResult:'',
-      //路线名称
-      lineName: "",
-      //路线id
-      lineId: null,
-      //模态框框计算文本
-      calculationText: "",
-      //是否需要打开模态窗口
-      drawer: false,
-      //是否打开弹窗
-      dialogVisible: false,
-      //订单id
-      orderId: null,
-      restaurants: [],
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5",
-      },
-      //模态框表格数据
-      line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=4",
-        selectionType: "radio",
-      },
-    };
-  },
-  methods: {
-    //模态框单选触发事件
-    currentRadioChange(selection) {
-      this.lineName = selection.lineName;
-      this.lineId = selection.lineId;
-    },
-    //模态框框计算
-    calculation() {
-      this.option.requestUrl =
-        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=4&con=" +
-        this.calculationText;
-    },
-    //弹窗浏览按钮
-    onLine() {
-      this.drawer = true;
-    },
-    //弹窗的确定按钮
-    outOrder() {
-      if(this.lineId && this.returnResult){
-        let map = {
-        returnResult:this.returnResult,
-        orderId: this.orderId,
-        lineId: this.lineId,
-      };
-      this.$axios.post("/api/v1/oms/returnOrderCloseOrder", map).then((res) => {
-        console.log(res);
-        this.dialogVisible = false;
-          this.option.requestUrl ="/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&i=0";
-      });
-      }else{
-          this.$message({
-          message: '请选择运输路线和退货原因,在确定!',
-          type: 'warning'
-        });
-      }
-    },
-    //弹窗关闭事件
-    handleClose() {
-      this.lineName = null;
-      this.lineId = null;
-      this.orderId = null;
-      this.dialogVisible = false;
-    },
-    //操作列退货按钮
-    sendClick(orderId) {
-      console.log(orderId);
-      this.orderId = orderId;
-      this.dialogVisible = true;
-    },
-    onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&con=" + this.input;
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-  .text {
-    margin-bottom: 0.625rem;
-  }
-  .returnResult {
-    margin-top: 0.625rem;
-    margin-bottom: 0.625rem;
-  }
-}
-</style>

+ 0 - 45
src/views/importedIngredients/components/truckJiPiFuResult.vue

@@ -1,45 +0,0 @@
-<template>
-  <!-- 辅料计皮实绩页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" 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 {
-      //一览表格框计算文本
-      input: "",
-      //一览表格数据
-      option: {
-        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5",
-      },
-    };
-  },
-  methods: {
-    //一览表格框计算
-    onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5&con=" + this.input;
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

+ 0 - 58
src/views/importedIngredients/components/truckLeaveFactoryFuResult.vue

@@ -1,58 +0,0 @@
-<template>
-  <!-- 辅料出厂作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" 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/getLeaveFactoryResult?apiId=147&orderType=5",
-      },
-    };
-  },
-  methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    
-    onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&con=" + this.input;
-    },
-   }
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

+ 0 - 72
src/views/importedIngredients/components/truckQualityFuResult.vue

@@ -1,72 +0,0 @@
-<template>
-  <!-- 辅料质检作业 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" 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=5",
-      },
-    };
-  },
-  methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    onclick() {
-      this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=150&orderType=5&con=" + this.input;
-    },
-    btnclick() {
-      this.$router.push("/trainTMS/approveWagonPleaseAdd/");
-    },
-    updateClick(resultId) {
-      this.$router.push("/fuLiao/truckQualityFuResultEdit/" + resultId);
-    },
-    
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

+ 0 - 95
src/views/importedIngredients/components/truckQualityFuResultEdit.vue

@@ -1,95 +0,0 @@
-<template>
-  <!-- 辅料修改质检作业页面 -->
-  <div id="contractDetails">
-    <page-title>质检作业</page-title>
-
-    <div class="main">
-      <span class="text">修改质检作业</span>
-      <span class="a"></span>
-    </div>
-
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="187" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-
-    
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      
-    </div>
-  </div>
-</template>
-
-<script>
-import PageTitle from "@/components/Page/Title";
-export default {
-  components: { PageTitle },
-  data() {
-    return {
-      // 表单
-      form1: {},
-      // 表格
-      table1: {},
-      contractId: "",
-    };
-  },
-  mounted() {
-    this.information();
-  },
-  methods: {
-  information() {
-      //编辑运输计划
-      this.$axios
-        .post("/api/v1/tms/getQualityResultById/" + this.$route.params.resultId)
-        .then((res) => {
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-          });
-        });
-    },
-
-    handleCheckedCitiesChange(value) {
-      console.log(value);
-    },
-    // 返回
-    onClickCancel() {
-      this.$router.go(-1);
-    },
-    // 确认
-    onClickConfirm() {
-      let QR = {
-        resultId: this.$route.params.resultId,
-        resultIssampling: this.form1.resultIssampling,
-        resultDeduction: this.form1.resultDeduction,
-        resultSamplingPointId: this.form1.resultSamplingPointId,
-        resultDeductionDescription: this.form1.resultDeductionDescription
-      };
-    
-      var val = this.value;
-      if (
-        QR.resultIssampling==null||
-        QR.resultDeduction==null||
-        QR.resultSamplingPointId==null||
-        QR.resultDeductionDescription==null
-      ) this.$message.error("存在空值!");
-      else
-      this.$axios
-        .post("/api/v1/tms/updateQualityResult", QR)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
-          });
-          this.$router.go(-1);
-        });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>

+ 0 - 58
src/views/importedIngredients/components/truckReceiptFuResult.vue

@@ -1,58 +0,0 @@
-<template>
-  <!-- 辅料收货作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" 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/getReceiveResult?apiId=149&orderType=5",
-      },
-    };
-  },
-  methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    
-    onclick() {
-     this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=5&con=" + this.input;
-    },
-   }
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

+ 0 - 58
src/views/importedIngredients/components/truckReturnResult.vue

@@ -1,58 +0,0 @@
-<template>
-  <!-- 辅料退货作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" 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/getAllReturnResult?apiId=377&orderType=5",
-      },
-    };
-  },
-  methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    
-    onclick() {
-     this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=5&con=" + this.input;
-    },
-   }
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

+ 0 - 57
src/views/importedIngredients/components/truckUnloadFuResult.vue

@@ -1,57 +0,0 @@
-<template>
-  <!-- 卸货实绩页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" 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=5",
-      },
-    };
-  },
-  methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    onclick() {
-     this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=5&con=" + this.input;
-    },
-   }
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

+ 0 - 53
src/views/importedIngredients/router/index.js

@@ -1,53 +0,0 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-
-import routerBefore from '@/config/routerBefore.js'
-
-// 主要
-import main from '@/components/main.vue'
-// 系统配置管理
-import transportReserveFu from '../components/transportReserveFu.vue'
-import transportReserveFuAdd from '../components/transportReserveFuAdd.vue'
-import transportReserveFuEdit from '../components/transportReserveFuEdit.vue'
-import truckDriverReceiveFu from '../components/truckDriverReceiveFu.vue'
-import truckEnfactoryFuResult from '../components/truckEnfactoryFuResult.vue'
-import truckJiMaoFuResult from '../components/truckJiMaoFuResult.vue'
-import truckLeaveFactoryFuResult from '../components/truckLeaveFactoryFuResult.vue'
-import truckQualityFuResult from '../components/truckQualityFuResult.vue'
-import truckQualityFuResultEdit from '../components/truckQualityFuResultEdit.vue'
-import truckReturnResult from '../components/truckReturnResult.vue'
-import truckUnloadFuResult from '../components/truckUnloadFuResult.vue'
-Vue.use(Router)
-
-const constantRouterMap = [
-  {
-    path: '/',
-    name: 'main',
-    meta: {title: '首页', code: 'xtpzgl'},
-    component: main,
-    redirect: {name: 'transportReserveFu'},
-    children: [
-      {path: 'transportReserveFu', name: 'transportReserveFu', meta: {code: 'xtpzgl-jggl'}, component: transportReserveFu},
-      {path: 'transportReserveFuAdd', name: 'transportReserveFuAdd', meta: {code: 'xtpzgl-yhgl'}, component: transportReserveFuAdd},
-      {path: 'transportReserveFuEdit', name: 'transportReserveFuEdit', meta: {code: 'xtpzgl-yhgl'}, component: transportReserveFuEdit},
-      {path: 'truckDriverReceiveFu', name: 'truckDriverReceiveFu', meta: {code: 'xtpzgl-yhgl'}, component: truckDriverReceiveFu},
-      {path: 'truckEnfactoryFuResult', name: 'truckEnfactoryFuResult', meta: {code: 'xtpzgl-yhgl'}, component: truckEnfactoryFuResult},
-      {path: 'truckJiMaoFuResult', name: 'truckJiMaoFuResult', meta: {code: 'xtpzgl-yhgl'}, component: truckJiMaoFuResult},
-      {path: 'truckLeaveFactoryFuResult', name: 'truckLeaveFactoryFuResult', meta: {code: 'xtpzgl-yhgl'}, component: truckLeaveFactoryFuResult},
-      {path: 'truckQualityFuResult', name: 'truckQualityFuResult', meta: {code: 'xtpzgl-yhgl'}, component: truckQualityFuResult},
-      {path: 'truckQualityFuResultEdit', name: 'truckQualityFuResultEdit', meta: {code: 'xtpzgl-yhgl'}, component: truckQualityFuResultEdit},
-      {path: 'truckReturnResult', name: 'truckReturnResult', meta: {code: 'xtpzgl-yhgl'}, component: truckReturnResult},
-      {path: 'truckUnloadFuResult', name: 'truckUnloadFuResult', meta: {code: 'xtpzgl-yhgl'}, component: truckUnloadFuResult},
-    ]
-  }
-];
-
-const router = new Router({
-  routes: constantRouterMap
-})
-//  before
-routerBefore(router, constantRouterMap);
-
-export default router;
-//  constantRouterMap
-export const routes = constantRouterMap;

+ 3 - 0
src/views/sale/components/saleSelfMachine/printLading.vue

@@ -127,6 +127,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.title{
+  font-size:25px;
+}
 .tableBody{
   table, th, td
   {

+ 3 - 0
src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -165,6 +165,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.title{
+  font-size:25px;
+}
 .tableBody{
   table, th, td
   {

+ 2 - 1
src/views/sale/components/saleSelfMachine/printScan.vue

@@ -68,12 +68,13 @@ export default {
             overflow: hidden;
         }
         .orderNumberData{
-            width: 101.5%;height: 30%;
+            width: 20%;height: 30%;
             color: #fff;
             position: absolute;
             display: flex;
             justify-content: center;
             align-items: center;
+            margin-left: 27rem;
         }
     }
 </style>

+ 3 - 0
src/views/sale/components/saleSelfMachine/printWarranty.vue

@@ -176,6 +176,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.title{
+  font-size:25px;
+}
 .tableBody{
   table, th, td
   {

+ 16 - 2
src/views/sale/components/transportFreight/saleTrainSettlement/addBmsTrainFreight.vue

@@ -12,7 +12,7 @@
         
       </div>
     </div>
-    <div class="" style="margin-left:40rem">
+    <div class="button-box" style="margin-left:40rem">
       <el-button type="primary" @click="makeSure">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
@@ -71,5 +71,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 5 - 4
src/views/sale/components/transportFreight/saleTrainSettlement/bmsTrainFreight.vue

@@ -98,10 +98,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
   }
 }
 </style>

+ 16 - 2
src/views/sale/components/transportFreight/saleTrainSettlement/updateBmsTrainFreight.vue

@@ -12,7 +12,7 @@
         
       </div>
     </div>
-    <div class="" style="margin-left:40rem">
+    <div class="button-box" style="margin-left:40rem">
       <el-button type="primary" @click="makeSure">确认修改</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
@@ -83,5 +83,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 21 - 2
src/views/sale/components/transportFreight/saleTruckSettlement/addBmsTruckStatement.vue

@@ -16,7 +16,7 @@
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
     </dilTable>
-     <div class="" style="margin-left:40rem">
+     <div class="button-box" style="margin-left:40rem">
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
   </div>
@@ -85,9 +85,28 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 .purchaseOrder {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
   }
 }
 </style>

+ 5 - 4
src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailOrder.vue

@@ -40,10 +40,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
   }
 }
 </style>

+ 5 - 4
src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckInvoice.vue

@@ -43,10 +43,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
   }
 }
 </style>

+ 5 - 4
src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckStatement.vue

@@ -66,10 +66,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
   }
 }
 </style>

+ 5 - 4
src/views/sale/components/transport_appointment/addOpenDistribution.vue

@@ -76,10 +76,11 @@
 <style lang="scss" scode>
 	.steel_inbound {
 		.sache {
-			height: 5rem;
-			display: flex;
-			align-items: center;
-			padding-left: 1.875rem;
+			padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
 		}
 	}
 </style>

+ 5 - 4
src/views/sale/components/transport_appointment/directionalDispatch.vue

@@ -148,10 +148,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound {
   .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 5 - 4
src/views/sale/components/transport_appointment/openDistribution.vue

@@ -177,10 +177,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 5 - 4
src/views/sale/components/transport_appointment/orderGrabbing.vue

@@ -177,10 +177,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 20 - 3
src/views/sale/components/transport_appointment/railPlan/addCokeRailPlan.vue

@@ -32,7 +32,7 @@
       <el-input
         placeholder="请输入内容"
         v-model="input"
-        style="margin-top: 10px; margin-left: 20px"
+        style="margin-top: 10px; margin-left: 20px;width: 200px"
         clearable
       >
       </el-input>
@@ -49,7 +49,7 @@
         @radio-change="currentRadioChange1"
       ></dilTable>
     </el-drawer>
-    <div class="" style="margin-left: 40rem">
+    <div class="button-box">
       <el-button type="primary" @click="makeSure">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
@@ -135,5 +135,22 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.f1{
+  margin-left: 26.5rem;
+}
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 16 - 2
src/views/sale/components/transport_appointment/railPlan/addSlagRailPlan.vue

@@ -12,7 +12,7 @@
         
       </div>
     </div>
-    <div class="" style="margin-left:40rem">
+    <div class="button-box">
       <el-button type="primary" @click="makeSure">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
@@ -70,5 +70,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 18 - 4
src/views/sale/components/transport_appointment/railPlan/addSteelRailPlan.vue

@@ -146,8 +146,8 @@
       size="50%"
       :show-close="false"
     >
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input
-      ><el-button type="primary" class="btn" @click="onclick">
+      <el-input placeholder="请输入内容" v-model="input" style="margin-top: 10px; margin-left: 20px; width: 200px" clearable> </el-input
+      ><el-button type="primary" class="btn" @click="onclick" style="margin-left: 5px;">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button @click="open">取消</el-button>
@@ -340,7 +340,21 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 .select {
   margin-left: 33.9rem;
 }
@@ -348,7 +362,7 @@ export default {
   margin-left: -4.5rem;
 }
 .table_form {
-  margin-left: 5.3rem;
+  margin-left: 21rem;
 }
 .textinput {
   width: 50px;

+ 5 - 4
src/views/sale/components/transport_appointment/railPlan/cokeRailPlan.vue

@@ -184,10 +184,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound {
   .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 5 - 4
src/views/sale/components/transport_appointment/railPlan/slagRailPlan.vue

@@ -182,10 +182,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound {
   .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 5 - 4
src/views/sale/components/transport_appointment/railPlan/steelRailPlan.vue

@@ -104,10 +104,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 17 - 3
src/views/sale/components/transport_appointment/railPlan/updateCokeRailPlan.vue

@@ -3,11 +3,11 @@
   <div id="endMaintenance">
     <page-title>修改汽车发运焦炭日计划</page-title>
     <div>
-      <div class="form-box" style="margin-left: 5rem">
+      <div class="form-box">
         <dil-form :formId="252" v-model="form"></dil-form>
       </div>
     </div>
-    <div class="" style="margin-left:40rem">
+    <div class="button-box">
       <el-button type="primary" @click="makeSure">确认修改</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
@@ -83,5 +83,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 17 - 3
src/views/sale/components/transport_appointment/railPlan/updateSlagRailPlan.vue

@@ -3,11 +3,11 @@
   <div id="endMaintenance">
     <page-title>修改汽车发运水渣日计划</page-title>
     <div>
-      <div class="form-box" style="margin-left: 5rem">
+      <div class="form-box">
         <dil-form :formId="298" v-model="form"></dil-form>
       </div>
     </div>
-    <div class="" style="margin-left:40rem">
+    <div class="button-box">
       <el-button type="primary" @click="makeSure">确认修改</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
@@ -84,5 +84,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 17 - 3
src/views/sale/components/transport_appointment/railPlan/updateSteelRailPlan.vue

@@ -3,11 +3,11 @@
   <div id="endMaintenance">
     <page-title>编辑钢材发运日计划</page-title>
     <div>
-      <div class="form-box" style="margin-left: 5rem">
+      <div class="form-box">
         <dil-form :formId="252" v-model="form"></dil-form>
       </div>
     </div>
-    <div class="" style="margin-left:40rem">
+    <div class="button-box">
       <el-button type="primary" @click="makeSure">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
@@ -64,5 +64,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 5 - 5
src/views/sale/components/transport_excute/dilNotice/Carrier_dilNotice.vue

@@ -36,11 +36,11 @@ export default {
 <style lang="scss" scoped>
 .sale {
   .top {
-    width: 100%;
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 2.5rem;
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
   }
 }
 </style>

+ 5 - 5
src/views/sale/components/transport_excute/dilNotice/sale_dilNotice.vue

@@ -46,11 +46,11 @@ export default {
 <style lang="scss" scoped>
 .sale {
   .top {
-    width: 100%;
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 2.5rem;
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
   }
 }
 </style>

+ 5 - 5
src/views/sale/components/transport_excute/enFactoryResult.vue

@@ -120,11 +120,11 @@ export default {
 <style lang="scss" scoped>
 .sale {
   .top {
-    width: 100%;
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 2.5rem;
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
   }
 }
 </style>

+ 5 - 4
src/views/sale/components/transport_excute/grossWeightResult.vue

@@ -38,10 +38,11 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
-            display: flex;
-            align-items: center;
-            padding-left: 2.5rem;
+            padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
         }
     }
 </style>

+ 5 - 5
src/views/sale/components/transport_excute/loadTruckResult.vue

@@ -38,11 +38,11 @@ export default {
 <style lang="scss" scoped>
 .sale {
   .top {
-    width: 100%;
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 2.5rem;
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
   }
 }
 </style>

+ 5 - 5
src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue

@@ -120,11 +120,11 @@ export default {
 <style lang="scss" scoped>
 .sale {
   .top {
-    width: 100%;
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 2.5rem;
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
   }
 }
 </style>

+ 5 - 4
src/views/sale/components/transport_excute/outFactory/smsResult.vue

@@ -38,10 +38,11 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
-            display: flex;
-            align-items: center;
-            padding-left: 2.5rem;
+            padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
         }
     }
 </style>

+ 5 - 4
src/views/sale/components/transport_excute/qualityResult.vue

@@ -38,10 +38,11 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
-            display: flex;
-            align-items: center;
-            padding-left: 2.5rem;
+            padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
         }
     }
 </style>

+ 5 - 4
src/views/sale/components/transport_excute/returnResult.vue

@@ -38,10 +38,11 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
-            display: flex;
-            align-items: center;
-            padding-left: 2.5rem;
+            padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
         }
     }
 </style>

+ 5 - 4
src/views/sale/components/transport_excute/tareWeightResult.vue

@@ -38,10 +38,11 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
-            display: flex;
-            align-items: center;
-            padding-left: 2.5rem;
+            padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
         }
     }
 </style>

+ 8 - 1
src/views/sale/components/transport_order/disatchSteelSaleOrderAdd.vue

@@ -139,5 +139,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 5 - 1
src/views/sale/components/transport_order/dispatchCokeRailPlan.vue

@@ -87,7 +87,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 15 - 1
src/views/sale/components/transport_order/dispatchCokeRailPlanAdd.vue

@@ -137,5 +137,19 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 20 - 1
src/views/sale/components/transport_order/dispatchCokeRailPlanCheck.vue

@@ -198,9 +198,28 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
   .xhd {
     display: flex;

+ 22 - 5
src/views/sale/components/transport_order/dispatchOrder.vue

@@ -21,7 +21,7 @@
 			<el-drawer title="司机排班信息表" :visible.sync="drawer" :direction="direction" :before-close="handleClose"
 				:modal="false" size="50%" style="margin-top: 6.625rem;">
 				<dilTable v-bind.sync="second" v-model="table1" @radio-change="currentRadioChange"></dilTable>
-				<div style=" margin-left: 25rem;">
+				<div class="button-box">
 					<el-button type="primary" @click="makeSure">确认</el-button>
 					<el-button type="primary" @click="cancel">取消</el-button>
 				</div>
@@ -104,12 +104,29 @@
 </script>
 
 <style lang="scss" scode>
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 	.steel_inbound {
 		.sache {
-			height: 5rem;
-			display: flex;
-			align-items: center;
-			padding-left: 1.875rem;
+			padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
 		}
 	}
+	
 </style>

+ 15 - 1
src/views/sale/components/transport_order/dispatchSlagDayPlanAdd.vue

@@ -129,5 +129,19 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 15 - 0
src/views/sale/components/transport_order/dispatchSlagDayPlanCheck.vue

@@ -194,6 +194,21 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 .homeworkPath {
   .top {
     padding: 1.25rem 1.875rem;

+ 5 - 1
src/views/sale/components/transport_order/dispatchSlagRailPlan.vue

@@ -87,7 +87,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 5 - 1
src/views/sale/components/transport_order/dispatchSteelSaleOrder.vue

@@ -87,7 +87,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

+ 5 - 1
src/views/sale/components/transport_order/dispatchSteelSaleOrderCheck.vue

@@ -158,7 +158,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
   .xhd {
     display: flex;

+ 5 - 4
src/views/sale/components/transport_order/receiveOrder.vue

@@ -67,10 +67,11 @@
 <style lang="scss" scode>
 	.steel_inbound {
 		.sache {
-			height: 5rem;
-			display: flex;
-			align-items: center;
-			padding-left: 1.875rem;
+			padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
 		}
 	}
 </style>

+ 5 - 0
src/views/statisticalReport/app.js

@@ -15,6 +15,11 @@ import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'
 
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 

+ 44 - 0
src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelNewMonitor.vue

@@ -0,0 +1,44 @@
+// 采购燃料新区汽运监控
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=7",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+  }
+}
+</style>

+ 44 - 0
src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelOldMonitor.vue

@@ -0,0 +1,44 @@
+// 采购燃料老区汽运监控
+<template>
+  <div class="purchasFuelOldMonitor">
+    <div class="frameCalculation">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=6",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelOldMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+  }
+}
+</style>

+ 44 - 0
src/views/statisticalReport/components/purchaseAccessoriesMonitor.vue

@@ -0,0 +1,44 @@
+// 采购辅料汽运监控
+<template>
+  <div class="purchaseAccessoriesMonitor">
+    <div class="frameCalculation">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=5",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=5&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchaseAccessoriesMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+  }
+}
+</style>

+ 8 - 6
src/views/statisticalReport/router/index.js

@@ -6,9 +6,10 @@ import routerBefore from '@/config/routerBefore.js'
 // 主要
 import main from '@/components/main.vue'
 // 系统配置管理
-import columnItem from '../components/columnItem.vue'
-import Ship_dynamic_table from '../components/Ship_dynamic_table.vue'
-import tableItem from '../components/tableItem.vue'
+import ShipDynamicTable from '../components/Ship_dynamic_table.vue'
+import purchaseAccessoriesMonitor from '../components/purchaseAccessoriesMonitor.vue'
+import purchasFuelOldMonitor from '../components/purchasFuelMonitor/purchasFuelOldMonitor.vue'
+import purchasFuelNewMonitor from '../components/purchasFuelMonitor/purchasFuelNewMonitor.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -19,9 +20,10 @@ const constantRouterMap = [
     component: main,
     redirect: {name: 'cargoResult'},
     children: [
-      {path: 'columnItem', name: 'columnItem', meta: {code: 'xtpzgl-jggl'}, component: columnItem},
-      {path: 'Ship_dynamic_table', name: 'Ship_dynamic_table', meta: {code: 'xtpzgl-yhgl'}, component: Ship_dynamic_table},
-      {path: 'tableItem', name: 'tableItem', meta: {code: 'xtpzgl-yhgl'}, component: tableItem},
+      {path: 'ShipDynamicTable', name: 'ShipDynamicTable', meta: {code: 'xtpzgl-yhgl'}, component: ShipDynamicTable},
+      {path: 'purchaseAccessoriesMonitor', name: 'purchaseAccessoriesMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchaseAccessoriesMonitor},
+      {path: 'purchasFuelOldMonitor', name: 'purchasFuelOldMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelOldMonitor},
+      {path: 'purchasFuelNewMonitor', name: 'purchasFuelNewMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelNewMonitor},
     ]
   }
 ];

+ 2 - 2
文件目录.md

@@ -10,8 +10,8 @@
   * `config` 配置请求拦截器,同一处理报错方式。
   * `lib` 全局的公用组件存放位置。
   * `store` 是一个全局的共享数据库存储区域,就相当于是一个数据仓库。
-  * `tool` 自己编写的全局js工具文件夹。
-  * ``
+  * `utils` 自己编写的全局js工具文件夹。
+  * `views` 
 * `static` 静态html页面的css/js/img存放地,请勿轻易进行更改。
 * `test` 初始测试目录,本地测试类文件。
 * `.editorconfig` 定义和维护一致的编码样式。