Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

.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/'
 
 # 微服务相关接口配置
 ## 任务消息

src/views/contractManagement/purchaseContract.vue

@@ -517,8 +517,8 @@ export default {
     },
     fujian(row) {
       if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
+        row.addressUrl === null ||
+        row.addressUrl === ''
       ) {
         EventBus.$emit(
           'warning',
@@ -527,7 +527,7 @@ export default {
       } else {
         this.accessoryTFs = true
       }
-      this.appendixIdss = row.receiveAttachmentPath
+      this.appendixIdss = row.addressUrlArray
     },
     handleExamine(row) {
       console.log(row)

src/views/contractManagement/purchaseContractAdd.vue

@@ -1611,4 +1611,7 @@ export default {
 /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
   width: 130px;
 }
+.el-textarea{
+  width: 101%;
+}
 </style>

src/views/contractManagement/purchaseContractEdit.vue

@@ -1544,4 +1544,17 @@ export default {
 /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
   width: 130px;
 }
+.el-textarea{
+  width: 101%;
+}
+/deep/.iconclose:before {
+    display: none;
+}
+/deep/.winsea-card .card__header {
+    font-size: 14px;
+    color: #409eff;
+    padding: 0 0 20px 10px;
+    position: relative;
+    display: none;
+}
 </style>

src/views/contractManagement/salesContract.vue

@@ -538,10 +538,11 @@ export default {
         }
       }
     },
+    // receiveAttachmentPath
     fujian(row) {
       if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
+        row.addressUrl === null ||
+        row.addressUrl === ''
       ) {
         EventBus.$emit(
           'warning',
@@ -550,7 +551,7 @@ export default {
       } else {
         this.accessoryTFs = true
       }
-      this.appendixIdss = row.receiveAttachmentPath
+      this.appendixIdss = row.addressUrl
     },
     handleExamine(row) {
       this.$router.push({

src/views/contractManagement/salesContractAdd.vue

@@ -10,7 +10,13 @@
           type="primary"
           size="small"
           @click="returnsales()"
-          >返回</el-button
+          ><img
+            width="6"
+            height="10"
+            style="vertion-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
       </el-col>
     </el-row>
@@ -1594,7 +1600,7 @@ export default {
   font-size: 13px;
 }
 /deep/.el-textarea {
-  width: 900px;
+  width: 101%;
   margin: 0px;
 }
 /deep/el-date-editor--date {

src/views/contractManagement/salesContractEdit.vue

@@ -10,7 +10,13 @@
           type="primary"
           size="small"
           @click="returnsales()"
-          >返回</el-button
+          ><img
+            width="6"
+            height="10"
+            style="vertion-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
       </el-col>
     </el-row>
@@ -1572,7 +1578,7 @@ export default {
   font-size: 13px;
 }
 /deep/.el-textarea {
-  width: 900px;
+  width: 101%;
   margin: 0px;
 }
 /deep/el-date-editor--date {
@@ -1592,4 +1598,5 @@ export default {
   height: 32px;
   line-height: 32px;
 }
+
 </style>

src/views/contractManagement/salesContractExamine.vue

@@ -14,7 +14,13 @@
           type="primary"
           size="small"
           @click="returnsales()"
-          >返回</el-button
+          ><img
+            width="6"
+            height="10"
+            style="vertion-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
       </el-col>
     </el-row>
@@ -165,9 +171,9 @@
             </div>
           </ws-form-item>
           
-          <ws-form-item label="最终实际交易量 (吨)" span="1" prop="TradingVolume">
+          <ws-form-item label="最终实际交易量 (吨)" span="1" prop="finalTradingVolume">
             <div class="unchanged">
-              {{deptBudgetList.TradingVolume}}
+              {{deptBudgetList.finalTradingVolume}}
             </div>
           </ws-form-item>
         </ws-info-table>

src/views/taskManagement/tranManagementLook.vue

@@ -71,7 +71,7 @@
         :key="index"
         class="datafor"
       >
-        <div class="driver">运输阶段({{ item.processNo }}{{ index + 1 }})</div>
+        <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }}-{{index +1}})</div>
         <!-- <div class="neifor"> -->
         <ws-info-table class="el-table">
           <!--运输方式-->
@@ -86,6 +86,9 @@
           <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
             {{ item.deliveryDateEnd }}
           </ws-form-item>
+          <ws-form-item label="本阶段运输重量（吨）" span="1" prop="weight">
+            {{ item.weight }}
+          </ws-form-item>
         </ws-info-table>
         <!-- </div>-->
         <ws-info-table>
@@ -134,6 +137,7 @@
           <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
             {{ item.receiverPhone }}
           </ws-form-item>
+           
         </ws-info-table>
         <!-- </div> -->
       </div>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -266,13 +266,14 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
+          <!-- 本阶段重量 -->
           <el-form-item
             label="本阶段运输重量（吨）"
             span="1"
             prop="bulkDensity"
           >
             <el-input
-              v-model="item.weight"
+              v-model="deptBudgetList.weight"
               placeholder="请输入本阶段运输重量"
               size="small"
             ></el-input>
@@ -411,7 +412,7 @@ export default {
             tranTypeKey: '1',
             deliveryDateStart: '',
             deliveryDateEnd: '',
-            weight: '13',
+            weight: '',
             selectedOptions: [],
             selectedOptions1: [],
             sendPrivate: '',
@@ -460,6 +461,13 @@ export default {
     this.showType = this.isShow
   },
   computed: {
+  weight:function(){
+      var maxStorage = 0
+      for(var i =0 ; i<this.deptBudgetList.tranProcessInfoList.length;i++){
+        maxStorage += Number(this.deptBudgetList.tranProcessInfoList[i].weight)
+      }
+      return maxStorage
+    },
     warehouse: function () {
       if (
         this.deptBudgetList.taskType == '销售出库' ||
@@ -553,7 +561,7 @@ export default {
         tranTypeKey: '1',
         deliveryDateStart: '',
         deliveryDateEnd: '',
-        weight: '13',
+        weight: '',
         selectedOptions: [],
         selectedOptions1: [],
         sendPrivate: '',
@@ -665,7 +673,7 @@ export default {
                     tranType: '汽运',
                     deliveryDateStart: '',
                     deliveryDateEnd: '',
-                    weight: '13',
+                    weight: '',
                     selectedOptions: [],
                     selectedOptions1: [],
                     sendPrivate: '',
@@ -845,5 +853,8 @@ export default {
 .el-cascader {
   width: 100%;
 }
-
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
 </style>

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -199,7 +199,7 @@
         v-for="(item, index) in deptBudgetList.tranProcessInfoList"
       >
         <div class="driver">
-          运输阶段{{ index + 1 }} {{ item.processNo }}
+         运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }})
           <img
             width="22"
             height="22"
@@ -715,6 +715,7 @@ export default {
 }
 .bg-bottom {
   margin: 15px 0px;
+  background: #5473e8;
 }
 .el-radio,
 .el-radio__input {

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -101,7 +101,7 @@
             </el-select>
           </el-form-item>
           <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
-            <el-select
+            <el-input
             @change="selectTaskNo"
               v-model="dataList.moveTaskNo"
               placeholder="请输入移库任务编号"
@@ -113,7 +113,7 @@
                 :label="item.contractNo"
                 :value="item.contractNo"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -302,7 +302,7 @@
             </el-select>
           </el-form-item>
           <el-form-item v-if='dataList1.taskTypeKey == 3' label="移库任务编号">
-            <el-select
+            <el-input
             disabled
               v-model="dataList1.moveTaskNo"
               placeholder="请输入移库任务编号"
@@ -314,7 +314,7 @@
                 :label="item.contractNo"
                 :value="item.contractNo"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -941,6 +941,7 @@ export default {
         this.dataList1.relevanceId = this.dataList.relevanceId
         this.requestadd(this.dataList1, 'repetition')
       }
+      
     },
     selectwarehouseName() {},
     tarechange(e) {

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -47,7 +47,7 @@
           />
         <!--出库=-->
         <div class="small-title">
-          <h3>出库任务({{ inOutTaskNo }})</h3>
+          <h3>出库任务({{ dataList.inOutTaskNo }})</h3>
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 仓库名 -->
@@ -250,7 +250,7 @@
             alt=""
           />
         <div class="small-title">
-          <h3>入库任务({{ inOutTaskNo1 }} )</h3>
+          <h3>入库任务({{ dataList1.inOutTaskNo }} )</h3>
         </div>
         <el-form ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->

vue.config.js

@@ -143,7 +143,8 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.116:8090/',
+
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',