Home Verkennen Help
Inloggen
DAL-DAZHOU
/
icore-pass
9
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

huk 3 jaren geleden
bovenliggende
bc5dcb8b7b b30a775a26
commit
6f8a11f703
20 gewijzigde bestanden met toevoegingen van 455 en 169 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 23 8
      build/utils.js
  2. 2 1
      index.html
  3. BIN
      src/assets/download/down.png
  4. BIN
      src/assets/download/image.png
  5. BIN
      src/assets/download/login.png
  6. 4 2
      src/config/routerBefore.js
  7. 47 40
      src/views/RMS/components/addCapacity.vue
  8. 0 1
      src/views/RMS/components/addCarDriver.vue
  9. 0 1
      src/views/RMS/components/addMaterial.vue
  10. 70 6
      src/views/RMS/components/editCapacity.vue
  11. 63 3
      src/views/RMS/components/editCarDriver.vue
  12. 5 2
      src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue
  13. 5 2
      src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue
  14. 82 0
      src/views/index/components/download.vue
  15. 12 1
      src/views/index/router/index.js
  16. 33 15
      src/views/inward/components/truckAppoint/addPlan.vue
  17. 86 72
      src/views/inward/components/truckAppoint/addRequirement.vue
  18. 1 6
      src/views/inward/components/truckAppoint/updateRequirement.vue
  19. 14 2
      src/views/inward/components/truckOrder/decomposePlan.vue
  20. 8 7
      src/views/inward/components/truckOrder/dispatchPlan.vue

+ 23 - 8
build/utils.js
Bestand weergeven 

@@ -3,7 +3,6 @@ const path = require('path')
 
 const config = require('../config')
 
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 
 const packageConfig = require('../package.json')
 
-
 
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 const merge = require('webpack-merge');
 
 const glob = require('glob');
 
@@ -11,13 +10,29 @@ const pathSrc = path.resolve(__dirname, '../src'); // F:\webui\multiple-pages\de
 
 const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应用下
 
 
 // 指定开发模式下需要加载的模块（可以做到只加载当前模块，提高开发效率）
 
-// 登录模块为必须，all 为所有
 
-//   登录      销售    采购  组织机构/系统管理  合同管理    内转     排队  资源管理  仓储管理      统计报表          其他物资物流管理
 
-// ['index', 'sale', 'TMS', 'systemConfig',   'appoint','inward','queue','RMS'   ,'WMS' , 'statisticalReport','SporadicManage']
 
-//加载全部
 
-//let devModules = ['all'];
 
-//加载制定的模块
 
-let devModules = ['index','systemConfig','RMS'];
 
+// index模块（登录）为必须，all 为所有
 
+//   index    销售    采购     规范          质量          生产      车间
 
+// ['index', 'sales', '  ', 'standard', 'qualityControl', 'produce', 'workshop',
 
+//    物流         进程     成本   报表          基础配置        系统配置
 
+//  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 
+// let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 
+// let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 
+// let devModules = ['all'];
 
+// let devModules = ['index','TMS','RMS']
 
+// let devModules = ['index','SporadicManage','TMS']
 
+// let devModules = ['index','SporadicManage'];
 
+// let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 
+// let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 
+ //let devModules = ['all'];
 
+// let devModules = ['index','RMS']
 
+//let devModules = ['index','SporadicManage','TMS']
 
+// let devModules = ['index','SporadicManage'];
 
+// let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 
+// let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 
+// let devModules = ['index','inward','SporadicManage']
 
+let devModules = ['index','RMS']
 
+// let devModules = ['all'];
 
+// let devModules = ['index','inward','appoint','sale']
 
 
 if (pathSrc.indexOf('node_modules') > -1) {
 
     devModules = require('../../../cors.js').devModules;

+ 2 - 1
index.html
Bestand weergeven 

@@ -5,7 +5,8 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <title>工业互联网平台 iCore-ICP</title>
 
     <script>
 
-      window.location.href='./views/index.html';
 
+     
+      window.location.href='./views/download.html';
 
     </script>
 
   </head>
 
   <body>

BIN
src/assets/download/down.png
Bestand weergeven


BIN
src/assets/download/image.png
Bestand weergeven


BIN
src/assets/download/login.png
Bestand weergeven


+ 4 - 2
src/config/routerBefore.js
Bestand weergeven 

@@ -16,7 +16,7 @@ import {
 
 } from '@/config/config.js';
 
 
 // 免登录白名单
 
-const whiteList = ['/', '/login', '/page404', '/dingtalkTaskMobileEnd', '/dingtalkWorkFlowMobileEnd'];
 
+const whiteList = ['/', '/login', '/download', '/page404', '/dingtalkTaskMobileEnd', '/dingtalkWorkFlowMobileEnd'];
 
 
 /**
 
  * 当前路由取标题
 
@@ -96,9 +96,9 @@ const breadcrumbFn = function (to, menu) {
 
 //  路由前置操作
 
 const routerBefore = function (router, constantRouterMap) {
 
   let flag = false
 
+  console.log('开始了')
 
   router.beforeEach((to, from, next) => {
 
     //  面包屑
 
-    console.log('进入路由', to)
 
     if (document.domain.indexOf('steerinfo.com') > -1) {
 
       document.domain = 'steerinfo.com';
 
     }
 
@@ -110,6 +110,7 @@ const routerBefore = function (router, constantRouterMap) {
 
       document.title = to.meta.title + ' ' + document.title.substr(document.title.indexOf('-'));
 
     }
 
     if (to.query.ticket) {
 
+      console.log('开始了2')
 
       setCookie('ticket', to.query.ticket, '', '/');
 
       let res = axios.get('pass/auth/ticket', {
 
         params: {
 
@@ -125,6 +126,7 @@ const routerBefore = function (router, constantRouterMap) {
 
           Message('登陆账户异常, 请联系管理员')
 
         });
 
     } else {
 
+      console.log('开始了3')
 
       DoneCookie(to, from, next, to.query.accessToken, flag)
 
     }
 
   });

+ 47 - 40
src/views/RMS/components/addCapacity.vue
Bestand weergeven 

@@ -7,7 +7,7 @@
 
         <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
 
       </div>
 
       <div class="inputBox">
 
-    <span class="text">所属单位类型</span>
 
+    <span class="text">所属承运商</span>
 
       <el-autocomplete
 
         class="input"
 
         v-model="state"
 
@@ -27,7 +27,8 @@
 
 
 <script>
 
 import PageTitle from "@/components/Page/Title";
 
-
 
+import { getCookie } from "@/utils/util.js";
 
+let _this ;
 
 export default {
 
   components: { PageTitle },
 
   data() {
 
@@ -37,8 +38,14 @@ export default {
 
       carrierIds: "",
 
       state: "",
 
       restaurants: [],
 
+      accessToken:null,
 
     };
 
   },
 
+  created(){
 
+        _this = this;
 
+        _this.accessToken = getCookie("accessToken");
 
+       console.log(this.accessToken ,'cookie1')
 
+  },
 
   mounted() {},
 
   methods: {
 
      onInput() {
 
@@ -72,44 +79,44 @@ export default {
 
       this.carrierIds=item.carrierIds;
 
       console.log(item)
 
     },
 
-   
-     makeSure() {
 
-      //  console.log(this.form1)
 
-       let RmsCapacity={
 
-         capacityTypeId:this.form1.capacityTypeId,
 
-         capacityNumber:this.form1.capacityNumber.toUpperCase(),
 
-         number:this.capacityNumber,
 
-         capacityCorlor:this.form1.capacityCorlor,
 
-         capacityOwneris:this.form1.capacityOwneris,
 
-         capacityVip:this.form1.capacityVip,
 
-         capacityBlacklist:this.form1.capacityBlacklist,
 
-        // carrierId:this.form1.carrierId,
 
-        state:this.state,
 
-        carrierName:this.state,
 
-        carrierIds: this.carrierIds,
 
-       };
 
-      //  console.log("RmsCapacity",RmsCapacity)
 
-       if(
 
-         RmsCapacity.capacityNumber==null ||
 
-         RmsCapacity.capacityCorlor==null ||
 
-         RmsCapacity.capacityOwneris==null ||
 
-         RmsCapacity.capacityVip==null ||
 
-         RmsCapacity.capacityBlacklist==null ||
 
-         RmsCapacity.carrierIds==null
 
-       )this.$message.error("存在空值！");
 
-       else
 
-        this.axios
 
-        .post("/api/v1/rms/getCarrierName?state=" + this.state)
 
-        .then((res) => {
 
-          if (res.data.code == "200") {
 
-            res.data.data.forEach((element) => {
 
-              this.restaurants.push({
 
-                value: element.carrierName,
 
-                carrierIds: element.carrierId,
 
-              });
 
-            });
 
-          }
 
-        });
 
+    makeSure() {
 
+       console.log(_this ,'cookie1')
 
+
 
+//        let RmsCapacity={
 
+//          capacityTypeId:this.form1.capacityTypeId,
 
+//          capacityNumber:this.form1.capacityNumber.toUpperCase(),
 
+//          number:this.capacityNumber,
 
+//          capacityCorlor:this.form1.capacityCorlor,
 
+//          capacityOwneris:this.form1.capacityOwneris,
 
+//          capacityVip:this.form1.capacityVip,
 
+//          capacityBlacklist:this.form1.capacityBlacklist,
 
+//         // carrierId:this.form1.carrierId,
 
+//         state:this.state,
 
+//         carrierName:this.state,
 
+//         carrierIds: this.carrierIds,
 
+//        };
 
+//        console.log("RmsCapacity",RmsCapacity)
 
+//        if(
 
+//          RmsCapacity.capacityNumber==null ||
 
+//          RmsCapacity.capacityCorlor==null ||
 
+//          RmsCapacity.capacityOwneris==null ||
 
+//          RmsCapacity.capacityVip==null ||
 
+//          RmsCapacity.capacityBlacklist==null ||
 
+//          RmsCapacity.carrierIds==null
 
+//        )this.$message.error("存在空值！");
 
+//        else
 
+//         this.axios
 
+//         .post("/api/v1/rms/getCarrierName?state=" + this.state)
 
+//         .then((res) => {
 
+//           if (res.data.code == "200") {
 
+//             res.data.data.forEach((element) => {
 
+//               this.restaurants.push({
 
+//                 value: element.carrierName,
 
+//                 carrierIds: element.carrierId,
 
+//               });
 
+//             });
 
+//           }
 
+//         });
 
     },
 
     querySearch(queryString, cb) {
 
       var restaurants = this.restaurants;

+ 0 - 1
src/views/RMS/components/addCarDriver.vue
Bestand weergeven 

@@ -79,7 +79,6 @@
 
     </div>
 
 
     <div class="button_box">
 
->>>>>>> 1807a4cbfb1e0a088bdcd174f97fd48986f268f8
 
       <el-button @click="cancel">取消</el-button>
 
       <el-button type="primary" @click="makeSure">确定</el-button>
 
     </div>

+ 0 - 1
src/views/RMS/components/addMaterial.vue
Bestand weergeven 

@@ -4,7 +4,6 @@
 
     <PageTitle>返回</PageTitle>
 
      <div class="form-box" style="margin-right: 10rem">
 
         <dil-form :formId="326" v-model="form1" ref="from1"></dil-form>
 
-
 
       </div>
 
         <div class="form-box f1">
 
           <el-form :inline="true" :model="formInline" class="demo-form-inline">

+ 70 - 6
src/views/RMS/components/editCapacity.vue
Bestand weergeven 

@@ -10,12 +10,42 @@
 
           <dil-form :formId="310" v-model="form1"></dil-form>
 
       </div>
 
     </div>
 
-    <div class="button-box">
 
-      <el-button @click="onClickCancel">返回</el-button>
 
+</div>
 
+        <div class="form-box f1">
 
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
 
+<div class="disableBox">
 
+  <el-form-item>
 
+     <el-input
 
+        placeholder=""
 
+        v-model="carrierName"
 
+        :disabled="true">
 
+    </el-input>
 
+  </el-form-item>
 
+  <el-form-item>
 
+    <el-button type="primary" @click="drawer = true">所属承运商</el-button>
 
+  </el-form-item>
 
+  </div>
 
+   </el-form>
 
+    </div>
 
+  <el-drawer
 
+      :visible.sync="drawer"
 
+      :direction="direction"
 
+      :before-close="handleClose">
 
+        <el-input
 
+            placeholder="请输入内容"
 
+            v-model="inputText"
 
+            clearable>
 
+          </el-input>
 
+          <el-button type="primary" class="btn" @click="onclick">
 
+            <i class="el-icon-search"></i>查询
 
+          </el-button>
 
+            <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
 
+</el-drawer>
 
+    <div class="button_box">
 
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
 
     </div>
 
   </div>
 
-</div>
 
+
 
 </template>
 
 
 <script>
 
@@ -25,7 +55,16 @@ export default {
 
   components: { PageTitle },
 
   data() {
 
     return {
 
+      drawer: false,
 
+      direction: 'rtl',
 
+      inputText:"",
 
       form1: {},
 
+      carrierName:"",
 
+    options:{
 
+        requestUrl:"/api/v1/rms/getCarrierList?apiId=417",
 
+        selectionType:"radio",
 
+        mapList:[]
 
+      }
 
     };
 
   },
 
   mounted() {
 
@@ -33,10 +72,18 @@ export default {
 
     this.information();
 
   },
 
   methods: {
 
+    currentRadioChange(selection){
 
+      this.mapList=selection,
 
+      console.log(this.mapList)
 
+      this.carrierName=this.mapList.carrierName
 
+    },
 
+    onclick(){
 
+      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
 
+    },
 
     information() {
 
       //编辑 
 console.log(this.$route.params)            
-
 
+     
       this.axios
 
         .post(
 
           "/api/v1/rms/getCapacityById/" +
 
@@ -51,7 +98,16 @@ console.log(this.$route.params)
 
             console.log(e);
 
             console.log(this.form1);
 
             console.log( this.$route.params.capacityId);
 
-          });
 
+          }); 
+ this.axios
 
+        .post(
 
+          "/api/v1/rms/getCarrierNameById/" +
 
+          this.$route.params.capacityId
 
+        )
 
+        .then((res) => {
 
+          this.carrierName=res.data.data.carrierName
 
+          console.log("carrierName",this.carrierName);
 
+        }); 
         });
 
     },
 
     // 返回
 
@@ -69,7 +125,7 @@ console.log(this.$route.params)
 
          capacityOwneris:this.form1.capacityOwneris,
 
          capacityVip:this.form1.capacityVip,
 
          capacityBlacklist:this.form1.capacityBlacklist,
 
-         carrierId:this.form1.carrierId,
 
+         carrierId:this.mapList.carrierId,
 
        };if(
 
          RmsCapacity.capacityNumber==null ||
 
          RmsCapacity.capacityCorlor==null ||
 
@@ -125,4 +181,12 @@ console.log(this.$route.params)
 
       margin-right: 10px;
 
     }
 
  }
 
+ .disableBox{
 
+  display: flex;
 
+  text-align: center;
 
+  align-items: center;
 
+  justify-content: center;
 
+  margin-top: 1.5rem;
 
+  margin-bottom: 1.25rem;
 
+}
 
 </style>

+ 63 - 3
src/views/RMS/components/editCarDriver.vue
Bestand weergeven 

@@ -9,8 +9,34 @@
 
           <dil-form :formId="340" v-model="form1"></dil-form>
 
       </div>
 
     </div>
 
-    <div class="button-box">
 
-      <el-button @click="onClickCancel">返回</el-button>
 
+     <div class="form-box f1">
 
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
 
+<div class="disableBox">
 
+  <el-form-item>
 
+    <el-input v-model="carrierName" disabled>  
+    </el-input>
 
+  </el-form-item>
 
+  <el-form-item>
 
+    <el-button type="primary" @click="drawer = true">所属承运商</el-button>
 
+  </el-form-item>
 
+  </div>
 
+   </el-form>
 
+    </div>
 
+  <el-drawer
 
+      :visible.sync="drawer"
 
+      :direction="direction"
 
+      :before-close="handleClose">
 
+        <el-input
 
+            placeholder="请输入内容"
 
+            v-model="inputText"
 
+            clearable>
 
+          </el-input>
 
+          <el-button type="primary" class="btn" @click="onclick">
 
+            <i class="el-icon-search"></i>查询
 
+          </el-button>
 
+            <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
 
+</el-drawer>
 
+    <div class="button_box">
 
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
 
     </div>
 
   </div>
 
@@ -23,7 +49,16 @@ export default {
 
   components: { PageTitle },
 
   data() {
 
     return {
 
+      drawer: false,
 
+      direction: 'rtl',
 
+      inputText:"",
 
       form1: {},
 
+     carrierName:"",
 
+ options:{
 
+        requestUrl:"/api/v1/rms/getCarrierList?apiId=417",
 
+        selectionType:"radio",
 
+        mapList:[]
 
+      }
 
     };
 
   },
 
   mounted() {
 
@@ -31,6 +66,14 @@ export default {
 
     this.information();
 
   },
 
   methods: {
 
+    currentRadioChange(selection){
 
+      this.mapList=selection,
 
+      console.log(this.mapList)
 
+      this.carrierName=this.mapList.carrierName
 
+    },
 
+    onclick(){
 
+      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
 
+    },
 
     information() {
 
       //编辑
 
       this.axios
 
@@ -47,6 +90,15 @@ export default {
 
             console.log(this.$route.params.driverId);
 
           });
 
         });
 
+    this.axios
 
+        .post(
 
+          "/api/v1/rms/getCarrierNameByDriverId/" +
 
+          this.$route.params.driverId
 
+        )
 
+        .then((res) => {
 
+          this.carrierName=res.data.data.carrierName
 
+          console.log("carrierName",this.carrierName);
 
+        }); 
     },
 
     // 返回
 
     onClickCancel() {
 
@@ -63,7 +115,7 @@ export default {
 
        driverIdentityCard:this.form1.driverIdentityCard,
 
        driverPhone:this.form1.driverPhone,
 
        transportTypeId:this.form1.transportTypeId,
 
-       carrierId:this.form1.carrierId,
 
+       carrierId:this.mapList.carrierId,
 
        driverPermitNo:this.form1.driverPermitNo,
 
        driverLicence:this.form1.driverLicence,
 
        driverLicence:this.form1.driverLicence,
 
@@ -137,4 +189,12 @@ export default {
 
       margin-right: 10px;
 
     }
 
   }
 
+  .disableBox{
 
+  display: flex;
 
+  text-align: center;
 
+  align-items: center;
 
+  justify-content: center;
 
+  margin-top: 1.5rem;
 
+  margin-bottom: 1.25rem;
 
+}
 
 </style>

+ 5 - 2
src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue
Bestand weergeven 

@@ -3,11 +3,13 @@
 
   <!-- 新增运输作业页面 -->
 
   <div id="contractDetails">
 
     <page-title>运输预约</page-title>
 
-    <div class="forwardingUnit from">
 
+    <div class="truckList1">
 
+      <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>
 
     <div class="forwardingUnit from">
 
       <span class="text">收货单位：</span>
 
       <el-input v-model="receiveName" disabled> </el-input>
 
@@ -467,7 +469,7 @@ export default {
 
     },
 
     currentRadioChange5(selection) {
 
       console.log(selection)
 
-      this.lineName = selection.lineName+selection.lineDesk 
+      this.lineName = selection.lineName+'  '+selection.lineDesk 
       this.lineId = selection.lineId;
 
     },
 
     currentRadioChange3(selection) {
 
@@ -506,6 +508,7 @@ export default {
 
   display: flex;
 
   align-items: center;
 
   justify-content: center;
 
+  width: 40%;
 
   margin-top: 5px;
 
   margin-bottom: 20px;
 
 }

+ 5 - 2
src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue
Bestand weergeven 

@@ -101,7 +101,8 @@ export default {
 
         .then((res) => {
 
           if (res.data.code == "200") {
 
             this.option1.requestUrl =
 
-              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1";
 
+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1"
 
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&test=1"
 
             this.$message({
 
               type: "success",
 
               message: "下发成功!",
 
@@ -120,7 +121,9 @@ export default {
 
         .then((res) => {
 
           if (res.data.code == "200") {
 
             this.option1.requestUrl =
 
-              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12";
 
+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1";
 
+            this.option2.requestUrl =
 
+            "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&test=1"
 
             this.$message({
 
               type: "success",
 
               message: "删除成功!",

+ 82 - 0
src/views/index/components/download.vue
Bestand weergeven 

@@ -0,0 +1,82 @@
 
+<template>
 
+     <div class="content" v-bind:style="{backgroundImage:'url(' + bg + ')'}" iud="body">
 
+        <img v-show="show_wx" :src="wx"   width="100%"  /> 
+        <!-- <img  :src="logo" style="margin:100px auto auto 150px;text-align:center; height:100px; width:85px;"  />  -->
 
+        <img   style="margin:90% auto auto 25%; height:8%; width:50%;"  :src="btn" id="btn_img" @click="download()"/>
 
+    </div> 
+</template> 
+
 
+<script>
 
+
 
+export default {
 
+    data() {
 
+        return {
 
+            type : "android",
 
+            // logo:require('@/assets/img/logoApp.png'),
 
+            wx:require('@/assets/download/image.png'),
 
+            btn:require('@/assets/download/down.png'),
 
+            show_wx :false,
 
+             bg: require('@/assets/download/login.png'),
 
+        };
 
+    },
 
+    created() {
 
+
 
+        let ua = navigator.userAgent.toLowerCase();
 
+
 
+        if (/iphone|ipad|ipod/.test(ua)) {
 
+
 
+            this.type = "ios";
 
+
 
+        } else if (/android/.test(ua)) {
 
+            this.type = "android";
 
+        }
 
+
 
+        if(isWeixinBrowser()){
 
+            this.show_wx = true;
 
+        }
 
+        function isWeixinBrowser() {
 
+            return (/micromessenger/.test(ua)) ? true : false;
 
+        }
 
+    },
 
+
 
+    methods: {
 
+
 
+        download() {
 
+
 
+            const that = this;
 
+
 
+            if(that.type == 'android') {
 
+
 
+                window.location.href = 'https://wl.dasteel.cn:32322 /%E6%95%B0%E8%A3%81%E7%89%A9%E6%B5%81.apk';
 
+                
+
 
+            } else {
 
+
 
+                window.location.href = 'IOS下载地址';
 
+
 
+            }
 
+
 
+        },
 
+
 
+    }
 
+
 
+};
 
+
 
+</script>
 
+<style>
 
+    .content {
 
+        position:relative;
 
+        margin:0px auto;
 
+        background-size: cover;
 
+        width: 100%;
 
+        height: 100%;
 
+ }
 
+
 
+
 
+
 
+
 
+div img:first-of-type { 
+    position: absolute; 
+   
+} 
+</style>

+ 12 - 1
src/views/index/router/index.js
Bestand weergeven 

@@ -6,7 +6,9 @@ import routerBefore from '@/config/routerBefore.js'
 
 import main from '@/components/main.vue'
 
 
 // 登录
 
-import login from '@/views/index/components/login.vue'
 
+import login from '@/views/index/components/login.vue'// 登录
 
+import download from '@/views/index/components/download.vue'
 
+
 
 
 // 网页登录不可访问
 
 import page404 from '@/views/index/components/page404.vue'
 
@@ -23,6 +25,15 @@ export const constantRouterMap = [{
 
         },
 
         component: login
 
     },
 
+    
+    {
 
+        path: '/download',
 
+        name: 'download',
 
+        meta: {
 
+            'title': '下载'
 
+        },
 
+        component: download
 
+    },
 
     {
 
         path: '/login',
 
         name: 'login',

+ 33 - 15
src/views/inward/components/truckAppoint/addPlan.vue
Bestand weergeven 

@@ -2,11 +2,9 @@
 
 <template>
 
   <div id="endMaintenance">
 
     <page-title>新增计划</page-title>
 
-    <div>
 
-      <div class="truckList1">
 
-      <div class="truckList from">
 
-        <span class="text">选择承运商：</span>
 
-       <el-autocomplete
 
+  <el-form  label-width="80px">
 
+  <el-form-item label="承运商">
 
+    <el-autocomplete
 
       class="inline-input"
 
       v-model="state2"
 
       :fetch-suggestions="querySearch"
 
@@ -19,12 +17,11 @@
 
     <div class="name">{{ item.value }}</div>
 
   </template>
 
     </el-autocomplete>
 
-      </div>
 
-    </div>
 
-      <div class="form-box">
 
-        <dil-form :formId="305" v-model="form"></dil-form>       
-      </div>
 
-    </div>
 
+  </el-form-item>
 
+  <el-form-item label="车数" >
 
+    <el-input   v-model="planTruckNumber" placeholder="必填" ></el-input>
 
+  </el-form-item>
 
+</el-form>
 
     <template>
 
 			<div>		
 						<dilTable v-bind.sync="first" @radio-change="currentRadioChange">
 
@@ -46,13 +43,17 @@ export default {
 
     return {
 
       restaurants: [],
 
       state2:null,
 
+      planTruckNumber:null,
 
       carrierId:null,
 
       form: {},
 
       first:{
 
         requestUrl:"/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2",
 
         selectionType: "radio",
 
 				mapList: [],
 
-      }
 
+      },
 
+      numberValidateForm: {
 
+          planTruckNumber: ''
 
+        }
 
     };
 
   },
 
   methods: {
 
@@ -87,13 +88,24 @@ export default {
 
     },
 
     // 新增
 
     makeSure() {
 
-      console.log(this.form)
 
+      console.log(this.planTruckNumber)
 
+      console.log(typeof(this.planTruckNumber))  
+      if(this.carrierId == null){
 
+        this.$alert('请输入承运商！')
 
+        return
 
+      }else if(this.planTruckNumber == null){
 
+        this.$alert('请输入车数！')
 
+        return
 
+      }else if(typeof(this.mapList.requirementId) == 'undefined'){
 
+        this.$alert('请选择需要制定计划的需求！')
 
+        return
 
+      }
 
       let plan = {
 
         requirementId : this.mapList.requirementId,
 
-        planTruckNumber: this.form.planTruckNumber,
 
+        planTruckNumber: this.planTruckNumber,
 
         carrierId: this.carrierId
 
       };
 
-          
+      console.log(plan)  
       this.axios
 
         .post(
 
           "/api/v1/ams/addTruckPlan",
 
@@ -121,6 +133,9 @@ export default {
 
 </script>
 
 
 <style lang="scss">
 
+.el-form{
 
+  margin-left: 30%;
 
+}
 
 .el-form-item{
 
   display: flex;
 
 }
 
@@ -139,6 +154,9 @@ export default {
 
   width: 100%;
 
   .truckList {
 
     width: 96%;
 
+    .el-input{
 
+     width:128%
 
+    }
 
     .text {
 
       display: inline-block;
 
       width: 120px;

+ 86 - 72
src/views/inward/components/truckAppoint/addRequirement.vue
Bestand weergeven 

@@ -4,78 +4,51 @@
 
     <page-title>新增需求</page-title>
 
     <div>
 
       <div class="form-box f2">
 
-        <el-form :inline="true" class="demo-form-inline">
 
+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
 
           <el-form-item label="采购订单号">
 
-            <el-input v-model="purchaseOrder" disabled> </el-input>
 
+            <el-input v-model="purchaseOrder" placeholder="必填" disabled > </el-input>
 
           </el-form-item>
 
           <el-form-item>
 
             <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
 
           </el-form-item>
 
         </el-form>
 
-      </div>
 
-      <div class="form-box f3">
 
-        <el-form :inline="true" class="demo-form-inline">
 
+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
 
           <el-form-item label="外轮船名">
 
             <el-input v-model="foreignShipName" disabled>浏览</el-input>
 
           </el-form-item>
 
-           <el-form-item>
 
-            <el-button type="primary" disabled>船名</el-button>
 
-          </el-form-item>
 
         </el-form>
 
-      </div>
 
-      <div class="form-box f2">
 
-        <el-form :inline="true" class="demo-form-inline">
 
+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
 
           <el-form-item label="发货单位">
 
             <el-input v-model="supplierName" disabled> </el-input>
 
           </el-form-item>
 
-          <el-form-item>
 
-            <el-button type="primary" disabled>发货单位</el-button>
 
-          </el-form-item>
 
         </el-form>
 
-      </div>
 
-      <div class="form-box f2">
 
-        <el-form :inline="true" class="demo-form-inline">
 
+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
 
           <el-form-item label="收货单位">
 
             <el-input v-model="shipperName" disabled> </el-input>
 
-          </el-form-item>
 
-          <el-form-item>
 
-            <el-button type="primary" disabled>收货单位</el-button>
 
-          </el-form-item>
 
+          </el-form-item>        
         </el-form>
 
-      </div>
 
-      <div class="form-box f4">
 
-        <el-form :inline="true" class="demo-form-inline">
 
+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
 
           <el-form-item label="物资名称">
 
             <el-input v-model="materialName" disabled> </el-input>
 
           </el-form-item>
 
-           <el-form-item>
 
-            <el-button type="primary" disabled>物资</el-button>
 
-          </el-form-item>
 
         </el-form>
 
-      </div>
 
-      <div class="form-box f5">
 
-        <el-form :inline="true" class="demo-form-inline">
 
+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
 
           <el-form-item label="装车点">
 
-            <el-input v-model="truckPoint" disabled> </el-input>
 
+            <el-input v-model="truckPoint" placeholder="必填" disabled> </el-input>
 
           </el-form-item>
 
           <el-form-item>
 
             <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
 
           </el-form-item>
 
         </el-form>
 
-      </div>
 
-      <div class="form-box f5">
 
-        <el-form :inline="true" class="demo-form-inline">
 
+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
 
           <el-form-item label="卸车点">
 
-            <el-input v-model="truckPoint1" disabled> </el-input>
 
+            <el-input v-model="truckPoint1" placeholder="必填" disabled> </el-input>
 
           </el-form-item>
 
           <el-form-item>
 
             <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
 
           </el-form-item>
 
         </el-form>
 
       </div>
 
-      <div class="form-box">
 
-        <dil-form :formId="300" v-model="form"></dil-form>
 
-      </div>
 
       <el-drawer
 
         :visible.sync="drawer"
 
         :direction="direction"
 
@@ -123,6 +96,9 @@
 
         </div>
 
       </el-drawer>
 
     </div>
 
+    <div class="box-form">
 
+        <dil-form :formId="300" v-model="form"></dil-form>
 
+    </div>
 
     <div class="button-box">
 
       <el-button type="primary" @click="makeSure">确认新增</el-button>
 
       <el-button type="primary" @click="cancel">返回</el-button>
 
@@ -175,7 +151,6 @@ export default {
 
     ondrawer(num) {
 
       this.drawer = true;
 
       this.a = num;
 
-      console.log(this.a)
 
     },
 
     handleClose(done) {
 
       done();
 
@@ -186,8 +161,13 @@ export default {
 
         this.second.requestUrl =
 
           "/api/v1/ams/getPurchaseIdByBatch?apiId=252&con=" + this.input;
 
       } else {
 
-        this.second1.requestUrl =
 
-          "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input;
 
+        if(this.input == ""){
 
+          this.second1.requestUrl =
 
+          "/api/v1/ams/getWareHouse?apiId=251"
 
+        }else{
 
+            this.second1.requestUrl =
 
+          "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input
 
+        }     
       }
 
     },
 
     currentRadioChange1(selection) {
 
@@ -200,37 +180,66 @@ export default {
 
     },
 
     currentRadioChange2(selection) {
 
       this.mapList2 = selection
 
-      console.log(this.mapList2)
 
-      var s1 = "";
 
-      this.truckPoint= s1.concat(this.mapList2.companyBranchName,this.mapList2.companyBranchName,this.mapList2.wareHouseName)
 
-       this.mapList2.companyBranchName+' '+this.mapList2.companyBranchName+this.mapList2.wareHouseName
 
+      console.log(this.mapList2)     
+      if(this.mapList2.companyBranchName == null){
 
+          this.mapList2.companyBranchName = ''
 
+      }
 
+      if(this.mapList2.branchFactory == null){
 
+          this.mapList2.branchFactory = ''
 
+      }
 
+      if(this.mapList2.wareHouseName ==null){
 
+          this.mapList2.wareHouseName = ''
 
+      }
 
+      this.truckPoint= this.mapList2.companyBranchName+this.mapList2.branchFactory+this.mapList2.wareHouseName
 
     },
 
     currentRadioChange3(selection) {
 
       this.mapList3 = selection
 
-      this.truckPoint1 = this.mapList3.companyBranchName+this.mapList3.companyBranchName+this.mapList3.wareHouseName
 
-    },
 
+      console.log(selection)
 
+        if(this.mapList3.companyBranchName == null){
 
+          this.mapList3.companyBranchName = ''
 
+      }
 
+      if(this.mapList3.branchFactory == null){
 
+          this.mapList3.branchFactory = ''
 
+      }
 
+      if(this.mapList3.wareHouseName ==null){
 
+          this.mapList3.wareHouseName = ''
 
+      }
 
+      this.truckPoint1 = this.mapList3.companyBranchName+this.mapList3.branchFactory+this.mapList3.wareHouseName
 
     },
 
     // 新增
 
     makeSure() {
 
-      console.log(this.form.materialNumber)
 
-      console.log(this.form.materialWeight);
 
-      console.log(typeof(this.form.materialNumber));
 
       if(this.purchaseOrder == null){
 
-          this.$alert('没有选择采购订单，请点击浏览选择采购订单')         
+          this.$alert('没有选择采购订单，请点击浏览选择采购订单！')
 
+          return         
       }else if(this.truckPoint == null){
 
-          this.$alert('没有选择用车地点，请点击浏览选择用车地点')
 
+          this.$alert('没有选择装车点，请点击浏览选择装车点！')
 
+          return
 
       }else if(this.truckPoint1 == null){
 
-          this.$alert('没有选择卸货点，请点击浏览选择卸货点')
 
+          this.$alert('没有选择卸货点，请点击浏览选择卸货点！')
 
+          return
 
+      }else if(typeof(this.form.materialWeight)=='undefined'){
 
+          this.$alert('没有输入物资重量，请输入！')
 
+          return
 
+      }else if(typeof(this.form.requirementType)=='undefined'){
 
+          this.$alert('没有选择需求类型，请选择！')
 
+          return
 
+      }else if(typeof(this.form.requirementTruckTime)=='undefined'){
 
+          this.$alert('没有选择用车时间，请选择！')
 
+          return
 
+      }else if(typeof(this.form.requirementShipperId)=='undefined'){
 
+          this.$alert('没有选择用车单位，请选择！')
 
+          return
 
+      }else if(typeof(this.form.requirementWorkType)=='undefined'){
 
+          this.$alert('没有选择费用类别，请选择！')
 
+          return
 
+      }else if(typeof(this.form.requirementEstimatedDuration)=='undefined'){
 
+          this.$alert('没有输入预计作业时长，请输入！')
 
+          return
 
       }
 
-      // }else if(typeof(this.form.materialNumber) =="undefined"&typeof(this.form.materialWeight) =="undefined"){
 
-      //     this.$alert('请输入物资数量或者物资重量')
 
-      // }
 
       let requiremnet = {
 
         purchaseOrderId: this.mapList1.purchaseOrderId,
 
         requiremntUnitId: this.mapList2.wareHouseId,
 
-        capacityTypeId: this.form.capacityTypeId,
 
         materialWeight: this.form.materialWeight,
 
-        materialNumber: this.form.materialNumber,
 
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
 
         requirementOverlimit: this.form.requirementOverlimit,
 
         requirementShipperId: this.form.requirementShipperId,
 
@@ -241,7 +250,6 @@ export default {
 
         requirementWorkType: this.form.requirementWorkType,
 
         requirementUnloadUnitId:this.mapList3.wareHouseId
 
       };
 
-      console.log(requiremnet);
 
       this.axios
 
         .post("/api/v1/ams/addTruckRequirement", requiremnet)
 
         .then((res) => {
 
@@ -259,23 +267,29 @@ export default {
 
     // 返回
 
     cancel() {
 
       this.$router.go(-1);
 
-    },
 
-  
-};
 
+    }, 
+}};
 
 </script>
 
 
 <style lang="scss">
 
-.el-form-item{
 
-  display: flex;
 
+.form-box{
 
+  display: inline-block;
 
+  margin-left: 38%;
 
+  .el-input{
 
+    width:288px
 
+  }
 
+  .el-form{
 
+    padding: 10px;
 
+  }
 
 }
 
-.form-box,
 
-.button-box
 
-{
 
+.box-form{
 
+  display: flex;
 
+  .el-form-item{
 
   display: flex;
 
-  text-align: center;
 
-  align-items: center;
 
-  justify-content: center;
 
-  margin-top: 0.3125rem;
 
-  margin-bottom: 1.25rem;
 
+  }
 
+}
 
+.button-box{
 
+  margin-left: 38%;
 
+  
 }
 
 </style>

+ 1 - 6
src/views/inward/components/truckAppoint/updateRequirement.vue
Bestand weergeven 

@@ -2,10 +2,6 @@
 
 <template>
 
   <div id="endMaintenance">
 
     <page-title>修改需求</page-title>
 
-    <div class="main">
 
-      <span class="text">修改</span>
 
-      <span class="a"></span>
 
-    </div>
 
     <div>
 
 <div class="form-box f2">
 
 <el-form :inline="true"  class="demo-form-inline">
 
@@ -109,7 +105,6 @@ export default {
 
         .then((res) => {
 
           console.log(res.data.data)
 
           const list = res.data.data;
 
-
 
           this.foreignShipName = list[0].resultForeignShipName,
 
           this.purchaseOrder = list[0].purchaseOrderNo,
 
           this.truckPoint = list[0].wareHouseName,
 
@@ -121,8 +116,8 @@ export default {
 
           res.data.data.forEach((e) => {
 
             this.form= e;
 
             console.log(e);
 
+            console.log(e);
 
             console.log(this.form1);
 
-            console.log(this.$route.params.resultId);
 
           });
 
         });
 
     },

+ 14 - 2
src/views/inward/components/truckOrder/decomposePlan.vue
Bestand weergeven 

@@ -213,8 +213,20 @@ export default {
 
             },
 
     // 修改
 
     makeSure() {
 
-      console.log(this.$refs.xTable.getInsertRecords())
 
-      console.log(this.form)
 
+      if(this.mapList0.lineId == null){
 
+        this.$alert('没有选择运输路线，请选择！')
 
+        console.log(this.lineId)
 
+        return
 
+      }else if(typeof(this.form.orderType) == 'undefined'){
 
+        this.$alert('没有选择订单类型，请选择')
 
+        return
 
+      }
 
+      for(var i=0;i<this.$refs.xTable.getInsertRecords().length;i++){
 
+        if(this.$refs.xTable.getInsertRecords()[i].capacityNumber == null){
 
+          this.$alert('未选择车牌，请选择车牌')
 
+          return
 
+        }     
+      }
 
       let BmsTrainFreight = {
 
           planId:this.$route.params.planId,
 
           lineId:this.mapList0.lineId,

+ 8 - 7
src/views/inward/components/truckOrder/dispatchPlan.vue
Bestand weergeven 

@@ -52,14 +52,14 @@ export default {
 
     };
 
   },
 
   methods: {
 
-    selectionChange(selection) {
 
-      console.log("-----");
 
-      this.first.mapList = selection;
 
-      console.log(this.first.mapList);
 
-      console.log("------");
 
+    selectionChange(selection) { 
+      this.first.mapList = selection
 
     },
 
     dispatch() {
 
-      console.log(this.first.mapList);
 
+      if(this.first.mapList.length == 0){
 
+          this.$alert('请选择订单')
 
+          return
 
+      }
 
       this.$confirm("是否分派", "提示", {
 
         confirmButtonText: "确定",
 
         cancelButtonText: "取消",
 
@@ -76,8 +76,9 @@ export default {
 
                   message: "分派成功!",
 
                 });
 
                 this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=40&test=1"
 
-                this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=40&carrierId=1&test=1"
 
+                this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=40&test=1"
 
                 this.activeName = 'second'
 
+                this.first.mapList = []
 
               } else {
 
                 this.$message({
 
                   message: "分派失败",