前端gjy

.env.production

@@ -4,7 +4,7 @@
 
 NODE_ENV = 'production'
 # base api
-VUE_APP_BASE_API = 'http://127.0.0.1:9100/'
+VUE_APP_BASE_API = 'http://api.eliangeyun.com/'
 
 # 微服务相关接口配置
 ## 任务消息

public/index.html

@@ -16,6 +16,9 @@
   <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
   <link rel="manifest" href="<%= BASE_URL %>/manifest.json" />
   <link rel="icon" href="<%= BASE_URL %>/logo.ico">
+  <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV]) { %>
+      <link href="<%= htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV][i] %>" rel="stylesheet">
+  <% } %>
   <title>易粮易运</title>
   <link rel="icon" href="<%= BASE_URL %>/logo.ico">
   <% if (process.env.NODE_ENV === 'production') { %>
@@ -104,7 +107,10 @@
       </div>
     </div>
   </div>
-
+  <!-- built files will be auto injected -->
+  <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.js[process.env.VUE_APP_PACKAGE_ENV]) { %>
+      <script src="<%= htmlWebpackPlugin.options.cdn.js[process.env.VUE_APP_PACKAGE_ENV][i] %>" charset="utf-8"></script>
+  <% } %>
 </body>
 
 </html>

src/lang/zh.js

@@ -4781,8 +4781,9 @@
 
   },
   // 任务管理
-  tranManagement: '任务管理',
+  taskManagement: '任务管理',
   tranManagementWarehouseInOutTaskEdit:'编辑',
+  moveWarehouseTask :'移库任务',
   // 年度培训
   annualTraining: {
     trainingResults: '培训结果',

src/views/taskManagement/component/routers/route.js

@@ -84,8 +84,10 @@ const tranManagementRouter = {
       meta: {
         title: 'moveWarehouseTask',
         shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask',
-      }
+        module: 'tranManagement.tranManagementDriver.moveWarehouseTask',
+        permissicon: [],
+        keepAlive: true
+      },
     },
     //移库查看 
     {
@@ -98,7 +100,6 @@ const tranManagementRouter = {
         shortcutEntrance: 'tranManagement',
         module: 'warehouseManagement.warehouse.warehouseInfoTask.view',
       },
-      hidden: true
     },
     //出入库任务
     {

src/views/taskManagement/tranManagementLook.vue

@@ -29,7 +29,7 @@
             {{ deptBudgetList.taskNo }}
           </ws-form-item>
           <!--合同编号-->
-          <ws-form-item label="合同编号" span="1" prop="contractNo">
+          <ws-form-item label="合同编号/移库任务编号" span="1" prop="contractNo">
             {{ deptBudgetList.contractNo }}
           </ws-form-item>
           <!--货名-->
@@ -429,4 +429,8 @@ export default {
   font-size: 16px;
   color: #69708c;
 }
+.el-form{
+      height: 73vh;
+    overflow: scroll;
+}
 </style>

src/views/taskManagement/tranManagementTransport.vue

@@ -17,11 +17,11 @@
       </template>
       <template slot="right">
         <span style="width: 134px; display: inline-block">起点：</span>
-        <el-input label="起点" placeholder="请输入起点" clearable maxlength="200" type="input"></el-input>
+        <el-input label="起点" v-model="start" placeholder="请输入起点" clearable maxlength="200" type="input"></el-input>
         <span style="width: 134px; display: inline-block">终点：</span>
-        <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input"></el-input>
+        <el-input label="终点" v-model="end" placeholder="请输入终点" clearable maxlength="200" type="input"></el-input>
         <el-input
-          v-model="warehouseName"
+          v-model="searchKeyWord"
           placeholder="可按合同编号或运输任务编号查找"
           clearable
           maxlength="500"
@@ -199,6 +199,8 @@ export default {
       primary: 1,
       pageSize: 10,
       searchType: 1,
+      start:'',
+      end:'',
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
@@ -259,6 +261,8 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
+        start:this.start,
+        end:this.end,
         searchKeyWord: this.searchKeyWord
       })
         .toPromise()
@@ -438,39 +442,11 @@ export default {
     handleCloe() {
       this.dialogViewSpareMoney = false
     },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then(response => {
-          this.historyList = response
-        })
-    },
+
     find() {
       this.currentPage = 1
       this.getList()
     },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${this.date.year +
-          (this.date.month ? `-${this.date.month}` : '')}_采购合同`,
-        type: 'xls'
-      })
-    }
   }
 }
 </script>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -39,7 +39,6 @@
           <el-select
             v-model="deptBudgetList.taskType"
             placeholder="请输入任务类型"
-            class="typeselect"
             @change="selecttaskType"
           >
             <el-option
@@ -50,11 +49,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="contractNo" label="合同编号" span="1">
+        <el-form-item prop="contractNo" label="合同编号/移库任务编号" span="1">
           <el-select
             v-model="deptBudgetList.contractNo"
-            placeholder="请输入合同编号"
-            class="typeselect"
+            placeholder="请选择编号"
           >
             <el-option
               v-for="item in contractNoList"
@@ -68,7 +66,6 @@
           <el-select
             v-model="deptBudgetList.goodsName"
             placeholder="请输入货名"
-            class="typeselect"
             @change="selectgoodsname"
           >
             <el-option
@@ -91,12 +88,14 @@
       </ws-info-table>
       <ws-info-table class="el-table">
         <div class="start-address" style="width : 36%">
-          <el-radio v-model="deptBudgetList.warehouseType" label="1"
+          <el-radio-group @change='warehouseTypechange' v-model="deptBudgetList.warehouseType">
+          <el-radio label="1"
             >常用仓库发货</el-radio
           >
-          <el-radio v-model="deptBudgetList.warehouseType" label="2"
+          <el-radio label="2"
             >临时仓库发货</el-radio
           >
+          </el-radio-group>
           <el-select
             v-model="deptBudgetList.sendWarehouse"
             placeholder="选择仓库"
@@ -144,7 +143,6 @@
             v-model="deptBudgetList.receiveWarehouse"
             :disabled="warehouse"
             placeholder="请输入收货库点"
-            class="typeselect"
             style="width: 100%"
           >
             <el-option
@@ -231,7 +229,6 @@
             <el-select
               v-model="item.tranType"
               placeholder="运输方式"
-              class="typeselect"
               @change="
                 (val) => {
                   selecttaskwayList(val, index)
@@ -470,6 +467,16 @@ export default {
     },
   },
   methods: {
+    warehouseTypechange(){
+        getwarehousename({
+        compId: this.compId,
+        warehouseType: this.deptBudgetList.warehouseType,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = response
+        })
+    },
     weightchange(e){
       this.deptBudgetList.tranProcessInfoList[0].weight=e
     },
@@ -655,7 +662,6 @@ export default {
           }
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.tranType = this.checkList.toString()
-          console.log(this.deptBudgetList)
           addtrantask(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -728,6 +734,10 @@ export default {
   font-size: 14px;
   color: #8890b1;
 }
+.typeselect{
+  width:42%;
+  margin-left:32px;
+}
 .del,
 .add {
   cursor: pointer;
@@ -825,6 +835,9 @@ export default {
     }
   }
 }
+/deep/.el-table--border:after, /deep/.el-table--group:after, /deep/.el-table:before {
+  background:transparent;
+}
 //输入框标题
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background: #ffffff;
@@ -854,5 +867,8 @@ export default {
 .el-cascader {
   width: 100%;
 }
-
+.el-form{
+      height: 73vh;
+    overflow: scroll;
+}
 </style>

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -38,8 +38,7 @@
         <el-form-item prop="taskType" label="任务类型" span="1">
           <el-select
             v-model="deptBudgetList.taskType"
-            placeholder=""
-            class="typeselect"
+            placeholder="请输入任务类型"
             @change="selecttaskType"
           >
             <el-option
@@ -50,11 +49,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="contractNo" label="合同编号" span="1">
+        <el-form-item prop="contractNo" label="合同编号/移库任务编号" span="1">
           <el-select
             v-model="deptBudgetList.contractNo"
-            placeholder="请输入合同编号"
-            class="typeselect"
+            placeholder="请选择编号"
           >
             <el-option
               v-for="item in contractNoList"
@@ -67,8 +65,7 @@
         <el-form-item prop="goodsName" label="货名" span="1">
           <el-select
             v-model="deptBudgetList.goodsName"
-            placeholder="货名"
-            class="typeselect"
+            placeholder="请输入货名"
             @change="selectgoodsname"
           >
             <el-option
@@ -81,6 +78,7 @@
         </el-form-item>
         <el-form-item label="重量（吨）" span="1" prop="weight">
           <el-input
+          @input='weightchange'
             v-model="deptBudgetList.weight"
             placeholder="请输入重量"
             maxlength="20"
@@ -89,13 +87,15 @@
         </el-form-item>
       </ws-info-table>
       <ws-info-table class="el-table">
-        <div class="start-address">
-          <el-radio v-model="deptBudgetList.warehouseType" label="1"
+        <div class="start-address" style="width : 36%">
+          <el-radio-group @change='warehouseTypechange' v-model="deptBudgetList.warehouseType">
+          <el-radio label="1"
             >常用仓库发货</el-radio
           >
-          <el-radio v-model="deptBudgetList.warehouseType" label="2"
+          <el-radio label="2"
             >临时仓库发货</el-radio
           >
+          </el-radio-group>
           <el-select
             v-model="deptBudgetList.sendWarehouse"
             placeholder="选择仓库"
@@ -116,7 +116,6 @@
             clearable
             size="large"
             placeholder="请选择始发地"
-            style="width: 200%"
             @change="handleChange"
           />
         </el-form-item>
@@ -138,12 +137,12 @@
           span="1"
           prop="contractNo"
           class="start-address"
-          style="width: 33.333%"
+          style="width: 36%"
         >
           <el-select
             v-model="deptBudgetList.receiveWarehouse"
+            :disabled="warehouse"
             placeholder="请输入收货库点"
-            class="typeselect"
             style="width: 100%"
           >
             <el-option
@@ -166,7 +165,6 @@
             clearable
             size="large"
             placeholder="请选择终到地"
-            style="width: 200%"
             @change="handleChange1"
           />
         </el-form-item>
@@ -197,14 +195,15 @@
         style="width: 100%"
         class="position"
         v-for="(item, index) in deptBudgetList.tranProcessInfoList"
+        :key="index"
       >
         <div class="driver">
-          运输阶段{{ index + 1 }} {{ item.processNo }}
-          <img
+          <span style='vertical-align: top;'>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
+          <img v-if='!endflag'
             width="22"
             height="22"
             class="add"
-            @click="add"
+            @click="add(index)"
             src="../../../public/img/add.png"
             alt=""
           />
@@ -216,13 +215,20 @@
             src="../../../public/img/del.png"
             alt=""
           />
+          <el-checkbox
+          @change='engflagchange'
+           class='endflag'
+            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
+            v-model="item.endFlag"
+            :label="1"
+            >最终阶段</el-checkbox
+          >     
         </div>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
             <el-select
               v-model="item.tranType"
               placeholder="运输方式"
-              class="typeselect"
               @change="
                 (val) => {
                   selecttaskwayList(val, index)
@@ -350,9 +356,12 @@
       </div>
     </el-form>
     <!-- 提交 -->
-    <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
         >提交</el-button
       >
     </div>
@@ -389,6 +398,7 @@ export default {
       checkList: [],
       deptBudgetList: {},
       radio: '1',
+      endflag:false,
       carModelList: [],
       carLengthList: [],
       warehouseType: '1',
@@ -427,6 +437,22 @@ export default {
     },
   },
   methods: {
+    warehouseTypechange(){
+        getwarehousename({
+        compId: this.compId,
+        warehouseType: this.deptBudgetList.warehouseType,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = response
+        })
+    },
+    weightchange(e){
+      this.deptBudgetList.tranProcessInfoList[0].weight=e
+    },
+    engflagchange(e){
+      this.endflag=e
+    },
     loaddata() {
       examinetran({ id: this.$route.query.id })
         .toPromise()
@@ -496,7 +522,7 @@ export default {
         })
       getwarehousename({
         compId: this.compId,
-        warehouseType: this.warehouseType,
+        warehouseType: this.deptBudgetList.warehouseType,
       })
         .toPromise()
         .then((response) => {
@@ -640,6 +666,10 @@ export default {
 .position .ws-info-table .el-form-item {
   width: 25%;
 }
+.typeselect{
+  width:42%;
+  margin-left:32px;
+}
 /deep/.position .ws-info-table .el-form-item .el-form-item__label,
 /deep/.position .ws-info-table .el-form-item .el-form-item__content {
   background: #f6f7fc;
@@ -661,12 +691,18 @@ export default {
 /deep/.el-checkbox__label {
   color: #8890b1;
 }
+.el-form-item.start-address.el-form-item--small {
+  width: 31.9%;
+}
 .check-box {
   margin-top: 10px;
   margin-left: 16px;
   color: #8890b1;
   font-size: 14px;
 }
+/deep/.el-table--border:after, /deep/.el-table--group:after, /deep/.el-table:before {
+  background:transparent;
+}
 .el-form {
   padding: 0 10%;
 }
@@ -700,9 +736,6 @@ export default {
 .el-form {
   margin-top: 50px;
 }
-.el-form-item.start-address.el-form-item--small {
-  width: 33.3%;
-}
 .el-col {
   background: #f6f7fc;
 }
@@ -767,4 +800,8 @@ export default {
   font-size: 16px;
   color: #5473e8;
 }
+.el-form{
+      height: 73vh;
+    overflow: scroll;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -155,12 +155,12 @@
                     alt=""
                   />
                 </el-upload>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+                <!-- <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未上传'" class="signStatus">
                   {{ item.signStatus }}
                 </div>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
+                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已上传'" class="signStatus1">
                   {{ item.signStatus }}
-                </div>
+                </div> -->
               </template>
             </ws-form-item>
             </ws-info-table>
@@ -241,6 +241,7 @@ export default {
     }
   },
   activated() {
+    this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
   computed: {
@@ -623,4 +624,8 @@ export default {
   height: 20px;
   line-height: 18px;
 }
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -137,9 +137,9 @@
                   @click="fujian(scope.row)"
                   alt=""
                 />
-                <div v-show="item.temporaryDriverFlag == 0">
+                <!-- <div v-show="item.temporaryDriverFlag == 0">
                   {{ item.signStatus }}
-                </div>
+                </div> -->
               </template>
             </ws-form-item>
            
@@ -257,11 +257,14 @@ export default {
       arr: [],
     }
   },
-  mounted() {
-    this.deptBudgetList.id = this.$route.query.id
-    this.getList()
-  },
-
+  // mounted() {
+   
+  //   this.getList()
+  // },
+activated(){
+   this.deptBudgetList.id = this.$route.query.id
+  this.getList()
+},
   computed: {
     totalStorage: function () {
       var maxStorage = 0

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -62,47 +62,54 @@
             :key="index"
           >
             <div class="zhong">
-                <ws-form-item label="姓名" span="1" prop="driver" class="ys">
+                <ws-form-item label="姓名" span="1" prop="driver" >
                   <el-select
                     v-model="item.driver"
                     placeholder="请选择姓名"
                     filterable
                     :filter-method="dataFilter"
                     @change="selectstaff"
-                    class="ys"
+                    class="small"
                   >
                     <el-option
                       v-for="item in options"
                       :key="item.value"
                       :label="item.staffName"
                       :value="item.staffName"
+                       
                     />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="电话" span="1" prop="driverPhone" class="zz">
+                <ws-form-item label="电话" span="1" prop="driverPhone" class="biao">
                   <ws-input
                     :readonly="true"
                     v-model="item.driverPhone"
                     placeholder="请输入电话"
                     maxlength="20"
                     size="small"
+                    class="ys"
                   />
                 </ws-form-item>
-                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="">
+                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="biao2">
                   <ws-date-picker
                     v-model="item.sendDateStart"
                     type="date"
                     placeholder="请选择发货日期"
                     value-format="yyyy-MM-dd"
+                    class="small"
                   />
                 </ws-form-item>
-                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="">
+                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="biao3">
                   <ws-date-picker
                     v-model="item.receiveDateEnd"
                     type="date"
                     placeholder="请选择发货日期"
                     value-format="yyyy-MM-dd"
+                    class="small"
                   />
+                </ws-form-item>
+                 <ws-form-item label="航次" span="1" prop="shipNo" class="biao4">
+                  <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small" class="ys"></ws-input>
                 </ws-form-item>
                 <ws-form-item label="船名" span="1" prop="shipName" class="">
                   <ws-input
@@ -110,18 +117,17 @@
                     placeholder="请输入船名"
                     maxlength="100"
                     size="small"
+                    class="ys"
                   ></ws-input>
                 </ws-form-item>
-                <ws-form-item label="航次" span="1" prop="shipNo" class="">
-                  <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small"></ws-input>
-                </ws-form-item>
-                <ws-form-item label="类型" span="1" prop="shipType" class="">
-                  <ws-select v-model="item.shipType" placeholder="请输入" class="typeselect">
+                <ws-form-item label="类型" span="1" prop="shipType" class="biao5">
+                  <ws-select v-model="item.shipType" placeholder="请输入" class="ys">
                     <ws-option
                       v-for="items in shipType"
                       :key="items.constKey"
                       :label="items.constValue"
                       :value="items.constValue"
+                       
                     />
                   </ws-select>
                 </ws-form-item>
@@ -129,10 +135,10 @@
                   label="数量"
                   span="1"
                   prop="boxNumber"
-                  class="siji"
+                  class="biao6"
                   v-show="item.shipType=='集装箱'"
                 >
-                  <ws-input v-model="item.boxNumber" placeholder="请输入数量" size="small"></ws-input>
+                  <ws-input v-model="item.boxNumber" placeholder="请输入数量" class="ys"></ws-input>
                 </ws-form-item>
               </ws-info-table>
             </div>
@@ -340,18 +346,18 @@ export default {
         .toPromise()
         .then(response => {
           this.deptBudgetList = response
-          // for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-          //   var num = this.deptBudgetList.tranCarInfoList[
-          //     i
-          //   ].positionWeight.split(',')
-          //   for (var j = 0; j < num.length; j++) {
-          //     var num2 = num[j].split('/')
-          //     this.freightspace.push({
-          //       impurity: num2[i],
-          //       positionWeight: num2[num2.length - 1]
-          //     })
-          //   }
-          // }
+          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+            var num = this.deptBudgetList.tranCarInfoList[
+              i
+            ].positionWeight.split(',')
+            for (var j = 0; j < num.length; j++) {
+              var num2 = num[j].split('/')
+              this.freightspace.push({
+                impurity: num2[i],
+                positionWeight: num2[num2.length - 1]
+              })
+            }
+          }
         })
     },
     //返回按钮
@@ -775,10 +781,20 @@ export default {
   border: none;
   width: 1000px;
 }
-.el-input--small .el-input__inner {
-  border-block-color: #f6f7fc;
-  background: #f6f7fc;
-}
+/deep/.el-select .el-input__inner {
+    border: 1px solid #ccc !important;
+    padding: 0 15px !important;
+    font-size: 12px !important;
+    width: 150px;
+}
+// .el-input--small .el-input__inner {
+//   height: 32px;
+//     line-height: 32px;
+//     width: 150px;
+//   border-block-color: #f6f7fc;
+//   background: #f6f7fc;
+  
+// }
 .zhong {
   background: #f6f7fc;
   border: 1px solid #d8dce6;
@@ -786,9 +802,40 @@ export default {
 .bg-left {
   padding-left: 30px;
 }
+/deep/.el-icon-arrow-up:before {
+    margin-left: 116px;
+}
+/deep/.el-input--prefix .el-input__inner {
+    padding-left: 30px;
+    width: 150px;
+}
 .ys{
   // margin-left: 300px;
-  width: 230px;
-  background: #5878e8;
+  width: 100px;
+
+}
+.biao{
+  margin-left: 200px;
+  margin-top: -57px;
+}
+.biao2{
+  margin-left: 350px;
+  margin-top: -57px;
+}
+.biao3{
+   margin-left: 580px;
+  margin-top: -57px;
+}
+.biao4{
+  margin-left: 850px;
+  margin-top: -57px;
+}
+.biao5{
+  margin-left: 200px;
+  margin-top: -57px;
+}
+.biao6{
+  margin-left: 400px;
+  margin-top: -57px;
 }
 </style>