gjy 4 vuotta sitten
vanhempi
commit
4b271d91ae

+ 1 - 1
.env.production

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

+ 3 - 1
src/api/V2/taskspost/index.js

@@ -29,4 +29,6 @@ export const API_POST_OUT_DEL = '/inOutWarehouseTask/api/deleteInOutWarehouseTas
 // 出入库任务-通过合同获取货名
 export const API_GET_CONTRACT_GOODSNAME = '/contractGoodsInfo/getGoodsName'
 //移库列表
-export const API_GET_OUT_MOVE = '/inOutWarehouseTask/selectInOutWarehouseTaskRelocation'                              
+export const API_GET_OUT_MOVE = '/inOutWarehouseTask/selectInOutWarehouseTaskRelocation'   
+//移库详情                                                         
+export const API_GET_OUT_MOVELOOK = '/inOutWarehouseTask/getInOutWarehouseTaskRelocation'

+ 1 - 1
src/lang/zh.js

@@ -4783,7 +4783,7 @@
   // 任务管理
   taskManagement: '任务管理',
   tranManagementWarehouseInOutTaskEdit:'编辑',
-  moveWarehouseTask :'移库任务',
+  // moveWarehouseTask :'移库任务',
   // 年度培训
   annualTraining: {
     trainingResults: '培训结果',

+ 4 - 1
src/model/tasksport/index.js

@@ -16,7 +16,8 @@ import {
     API_GET_OUT_EXAMINE,
     API_POST_OUT_DEL,
     API_GET_CONTRACT_GOODSNAME,
-    API_GET_OUT_MOVE
+    API_GET_OUT_MOVE,
+    API_GET_OUT_MOVELOOK
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -48,3 +49,5 @@ export const outdelete = appRx.post(API_POST_OUT_DEL, errorCatcher, errorHandle,
 export const getGoodsName = appRx.get(API_GET_CONTRACT_GOODSNAME, errorCatcher, errorHandle, filter)
 //移库列表
 export const moveList = appRx.get(API_GET_OUT_MOVE, errorCatcher, errorHandle, filter)
+//移库详情
+export const moveLook = appRx.get(API_GET_OUT_MOVELOOK, errorCatcher, errorHandle, filter)

+ 3 - 3
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)

+ 3 - 0
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>

+ 13 - 0
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>

+ 4 - 3
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({

+ 8 - 2
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 {

+ 9 - 2
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>

+ 9 - 3
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>

+ 3 - 2
src/views/taskManagement/component/routers/route.js

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

+ 0 - 1
src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -720,7 +720,6 @@ export default {
       return Min + Math.round(Rand * Range)
     },
     getList() {
-      console.log(11111)
       outexamine({ relevanceId: this.$route.query.relevanceId })
         .toPromise()
         .then(response => {

+ 52 - 100
src/views/taskManagement/moveWarehouseTask.vue

@@ -1,12 +1,7 @@
 <!--移库任务-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="20">
-      <template slot="right">
-        <ws-button class="but" type="primary" @click="handleAdd()"
-          >添加</ws-button
-        >
-      </template>
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
         <ws-button class="but" type="primary" @click="handlestatus(1)">
           执行中</ws-button
@@ -14,39 +9,38 @@
         <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
         <ws-button class="but" @click="handlestatus('')">全部任务</ws-button>
       </template>
-      <template slot="left">
+      <template slot="right">
         <ws-input
           v-model="warehouseName"
-          placeholder="可按合同编号或任务编号查找"
+          placeholder="可按移库任务编号、发货库和收货库查找"
           clearable
           maxlength="500"
           type="input"
-          class="findValue"
         ></ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <div class="search">
-          <ws-button class="find" type="primary" @click="lookUp()"
-            ><img
-              width="16"
-              height="16"
-              style="
-                vertical-align: text-top;
-                position: relative;
-                top: 0px;
-                left: -1px;
-              "
-              src="../../../public/img/sousuo.png"
-              alt=""
-          /></ws-button>
-        </div>
+        <!-- <div > -->
+        <ws-button class="find" type="primary" @click="lookUp()"
+          ><img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -1px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+        <!-- </div> -->
       </template>
     </BaseHeaderLayout>
     <div>
       <el-table
         class="wenzi"
         :data="gainList.records"
-        style="width: 100%; margin-top: 20px"
-        height="650"
+        style="width: 100%"
+        height="780"
       >
         <el-table-column type="index" label="序号">
           <template scope="scope">
@@ -54,15 +48,23 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="moveTaskNo" label="移库任务编号" width="120"></el-table-column>
-        <el-table-column prop="sendWarehouse" label="发货库"> </el-table-column>
-        <el-table-column prop="receiveWarehouse" label="收货库"> </el-table-column>
+        <el-table-column
+          prop="moveTaskNo"
+          label="移库任务编号"
+        ></el-table-column>
+        <el-table-column prop="warehouseName" label="发货库"> </el-table-column>
+        <el-table-column prop="warehouseNameIn" label="收货库">
+        </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量(吨)"> </el-table-column>
-        <el-table-column prop="deliveryVolume" label="出库量(吨)"> </el-table-column>
-        <el-table-column prop="storageVolume" label="入库量(吨)"> </el-table-column>
-        <el-table-column prop="stockReturn" label="退库量(吨)"> </el-table-column>
-        <el-table-column prop="transportLoss" label="运输损耗(吨)"> </el-table-column>
+        <el-table-column prop="weight" label="出库量(吨)">
+        </el-table-column>
+        <el-table-column prop="weightIn" label="入库量(吨)">
+        </el-table-column>
+        <el-table-column prop="stockReturn" label="退库量(吨)">
+        </el-table-column>
+        <el-table-column prop="transportLoss" label="运输损耗(吨)">
+        </el-table-column>
         <el-table-column prop="publisher" label="发布者"> </el-table-column>
         <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
@@ -121,7 +123,7 @@
         </el-table-column>
         <el-table-column prop="establishDate" label="发布时间">
         </el-table-column>
-        <el-table-column prop="seller" label="详情" width="300">
+        <el-table-column prop="seller" label="详情" width="200">
           <template slot-scope="scope">
             <ws-button class="completed" @click="see(scope.row)">
               查看
@@ -142,7 +144,7 @@
   </div>
 </template>
 <script>
-import { getoreditoutput, outdelete,moveList } from '@/model/tasksport/index'
+import { outdelete, moveList } from '@/model/tasksport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -178,14 +180,14 @@ export default {
       gainList: [],
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
+      searchType: 3,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
-      taskTypeKey : 3,
-      sendWarehouse : '',
-       receiveWarehouse : '',
-       moveTaskNo:'',
+      taskTypeKey: 3,
+      sendWarehouse: '',
+      receiveWarehouse: '',
+      moveTaskNo: '',
       // 提交类型
       submitType: true,
       size: 10,
@@ -207,11 +209,10 @@ export default {
     this.getList()
     this.showType = this.isShow
   },
-  mounted(){
-    this.getList()
-  },
+  //   mounted(){
+  //     this.getList()
+  //   },
   methods: {
-   
     //查找
     lookUp() {
       this.currentPage = 1
@@ -234,7 +235,6 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          console.log(row)
           outdelete({
             id: row.id,
             relevanceId: row.relevanceId,
@@ -254,16 +254,12 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        // searchType: this.searchType,
-        // moveTaskNo : this.moveTaskNo,
-        taskTypeKey : this.taskTypeKey,
-        // sendWarehouse : this.sendWarehouse,
-        // receiveWarehouse : this.receiveWarehouse,
-
+        taskTypeKey: this.taskTypeKey,
+        searchKeyWord: this.searchKeyWord,
+        id: this.id,
       })
         .toPromise()
         .then((response) => {
-          console.log(response)
           this.gainList = response
           this.currentPage = response.current
           this.pageSize = response.size
@@ -279,7 +275,7 @@ export default {
       this.$router.push({
         path: 'moveWarehouseTaskLook',
         query: {
-          relevanceId: item.relevanceId,
+          moveTaskNo: item.moveTaskNo,
         },
       })
     },
@@ -315,15 +311,6 @@ export default {
         // }
       })
     },
-    //查看//传参
-    nocomplete(row) {
-      this.$router.push({
-        path: 'inOutWarehouseTaskEdit',
-        query: {
-          relevanceId: row.relevanceId,
-        },
-      })
-    },
     dateFormat(fmt, date) {
       let ret
       const opt = {
@@ -418,37 +405,10 @@ export default {
       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>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
 .vertical-text-left {
   width: 62px;
   text-align: right;
@@ -509,20 +469,12 @@ export default {
   background: #e9ecf7;
 }
 .el-row {
-  height: 150px;
+  height: 50px;
 }
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
-.but {
-  margin-top: 150px;
-}
-.findValue {
-  width: 0%;
-  margin-left: 25%;
-}
-
-.search {
-  margin-left: -250px;
+.el-pagination {
+  text-align: center;
 }
 </style>

+ 238 - 400
src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -28,118 +28,153 @@
       :model="deptBudgetList"
     >
       <div class="small-title" style="font-size: 16px">任务详情</div>
-      <h3>移库任务编号</h3>
-      <ws-info-table>
-        <!--出货库-->
-        <div class="line">
-          <ws-form-item label="出货库" span="1" prop="sendWarehouse">
-            {{ deptBudgetList.sendWarehouse }}
+      
+      <span>移库任务编号:  <span style="font-weight: 600;">{{ this.moveTaskNo }}</span></span>
+      <div v-for="(item, index) in moveLookData" :key="index">
+        <ws-info-table class="inout" v-show="item.inOutType == '移库出库'">
+          <!--出货库-->
+          <div class="library">
+            <span style="margin-left: 14px"
+              >出货库:{{ item.sendWarehouse }}</span
+            >
+            <span style="margin-left: 10px">{{ item.taskStatus }}</span>
+          </div>
+          <!--出库经办人-->
+          <ws-form-item label="出库经办人:" span="1" prop="agent">
+            {{ item.agent }}
           </ws-form-item>
-        </div>
-        <!--出库经办人-->
-        <ws-form-item label="出库经办人" span="1" prop="agent">
-          {{ deptBudgetList.agent }}
-        </ws-form-item>
-        <!--出库重量(吨)-->
-        <ws-form-item label="出库重量(吨)" span="1" prop="deliveryVolume">
-          {{ deptBudgetList.deliveryVolume }}
-        </ws-form-item>
-        <!--预计出库日期-->
-        <ws-form-item label="预计出库日期" span="1" prop="predictDate">
-          {{ deptBudgetList.predictDate }}
-        </ws-form-item>
-        <div class="line">
-          <!--入货库-->
-          <ws-form-item label="入货库" span="1" prop="receiveWarehouse">
-            {{ deptBudgetList.receiveWarehouse }}
+          <el-divider direction="vertical" class="line"></el-divider>
+          <!--出库重量(吨)-->
+          <ws-form-item label="出库重量(吨):" span="1" prop="weight">
+            {{ item.weight }}
           </ws-form-item>
-        </div>
-        <!--入库经办人-->
-        <ws-form-item label="入库经办人" span="1" prop="agent">
-          {{ deptBudgetList.agent }}
-        </ws-form-item>
-        <!--入库重量(吨)-->
-        <ws-form-item label="入库重量(吨)" span="1" prop="storageVolume">
-          {{ deptBudgetList.storageVolume }}
-        </ws-form-item>
-        <!--预计入库日期-->
-        <ws-form-item label="预计入库日期" span="1" prop="predictDate">
-          {{ deptBudgetList.predictDate }}
-        </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <!--仓位-->
+          <ws-form-item label="仓位:" span="1" prop="deliveryVolume">
+            {{ item.binNumber == null ? '未指定' : item.binNumber }}
+          </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <!--预计出库日期-->
+          <ws-form-item label="预计出库日期:" span="1" prop="predictDate">
+            {{ item.predictDate }}
+          </ws-form-item>
+        </ws-info-table>
+        <ws-info-table class="inout" v-show="item.inOutType == '移库入库'">
+          <div class="library">
+            <span style="margin-left: 14px">
+              入货库:{{ item.receiveWarehouse }}</span
+            >
+            <span style="margin-left: 10px">{{ item.taskStatus }}</span>
+          </div>
+          <!--入库经办人-->
+          <ws-form-item label="入库经办人:" span="1" prop="agent">
+            {{ item.agent }}
+          </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <!--入库重量(吨)-->
+          <ws-form-item label="入库重量(吨):" span="1" prop="weight">
+            {{ item.weight }}
+          </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <!-- 仓位 -->
+          <ws-form-item label="仓位:" span="1" prop="deliveryVolume">
+            {{ item.binNumber == null ? '未指定' : item.binNumber }}
+          </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <!--预计入库日期-->
+          <ws-form-item label="预计入库日期:" span="1" prop="predictDate">
+            {{ item.predictDate }}
+          </ws-form-item>
+        </ws-info-table>
+      </div>
+      <ws-info-table class="goods">
         <!--货物信息-->
-        
-        <span style="line-height: 50px; text-align: center; color: #8890b1"
-          >货物信息</span
+        <div class="library">
+          <span style="line-height: 50px; color: #323233; margin-left: 14px"
+            >货物信息</span
+          >
+        </div>
+        <el-input
+          placeholder="信息暂无"
+          :disabled="true"
+          v-model="this.moveLookData[0].goodsName"
+        ></el-input>
+        <el-divider direction="vertical" class="line1"></el-divider>
+        <el-input
+          placeholder="信息暂无"
+          :disabled="true"
+          v-model="this.moveLookData[0].grade"
+        ></el-input>
+        <el-divider direction="vertical" class="line1"></el-divider>
+        <el-input
+          placeholder="信息暂无"
+          :disabled="true"
+          v-model="this.moveLookData[0].bulkDensity"
+        >
+        </el-input>
+        <el-divider direction="vertical" class="line1"></el-divider>
+        <el-input
+          placeholder="信息暂无"
+          :disabled="true"
+          v-model="this.moveLookData[0].waterContent"
         >
-        <!-- <ws-form-item label="货物信息" span="1" prop="sendDetailedAddress">
-        </ws-form-item> -->
-        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
-        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
-        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
-        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
-        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
-        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
-        <span style="line-height: 40px; text-align: center; color: #8890b1"
-          >业务描述</span
+        </el-input>
+        <el-divider direction="vertical" class="line1"></el-divider>
+        <el-input
+          placeholder="信息暂无"
+          :disabled="true"
+          v-model="this.moveLookData[0].weight"
         >
-        <!--业务描述-->
-        <ws-input
-          v-model="deptBudgetList.remarks"
-          type="textarea"
-          row="3"
-          placeholder="请输入备注信息,不超过200字"
-          maxlength="200"
-        />
-        
+        </el-input>
+        <el-divider direction="vertical" class="line1"></el-divider>
+        <el-input
+          placeholder="信息暂无"
+          :disabled="true"
+          v-model="this.moveLookData[0].unitPrice"
+        >
+        </el-input>
       </ws-info-table>
-
+      <span style="line-height: 60px; text-align: center; color: #323233"
+        >业务描述:</span
+      >
+      <!--业务描述-->
+      <ws-input
+        v-model="this.moveLookData[0].businessDescribe"
+        type="textarea"
+        row="3"
+        placeholder="请输入备注信息,不超过200字"
+        maxlength="200"
+      />
       <div class="small-title" style="font-size: 16px">实际流转数量</div>
-
-      <ws-info-table>
-        <!--累计出库量(吨)-->
-        <ws-form-item label="累计出库量(吨)" span="1" prop="driver">
-          <ws-input
-            v-model="deptBudgetList.driverPhone"
-            readonly
-            unselectable="on"
-            placeholder="请输入累计出库量"
-            maxlength="20"
-            size="small"
-          />
-        </ws-form-item>
-        <!--累计入库量(吨)-->
-        <ws-form-item label="累计入库量(吨)" span="1" prop="driverPhone">
-          <ws-input
-            v-model="deptBudgetList.driverPhone"
-            readonly
-            unselectable="on"
-            placeholder="请输入累计入库量(吨)"
-            maxlength="20"
-            size="small"
-          />
-        </ws-form-item>
-        <!--累计运输损耗(吨)-->
-        <ws-form-item label="累计运输损耗(吨)" span="1" prop="sendDateStart">
-          <ws-input
-            v-model="deptBudgetList.driverPhone"
-            readonly
-            unselectable="on"
-            placeholder="请输入累计运输损耗(吨)"
-            maxlength="20"
-            size="small"
-          />
-        </ws-form-item>
-        <!--累计退库量(吨)-->
-        <ws-form-item label="累计退库量(吨)" span="1" prop="stockReturnCount">
-          <ws-input
-            v-model="deptBudgetList.stockReturnCount"
-            readonly
-            unselectable="on"
-            placeholder="请输入累计退库量(吨)"
-            maxlength="20"
-            size="small"
-          />
-        </ws-form-item>
+      <ws-info-table class="flow">
+        <el-table :data="moveLookData" height="90" border style="width: 100%">
+          <el-table-column prop="weightOut" label="累计出库量(吨)">
+            <template>
+              <div class="weights">{{ this.weightOut }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="weightIn" label="累计入库量(吨)">
+            <template>
+              <div class="weights">{{ this.weightIn }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="transportLoss" label="累计运输损耗(吨)">
+            <template>
+              <div class="weights">
+                {{ this.transportLoss }}
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </ws-info-table>
+      <ws-info-table class="flow1">
+        <el-table :data="moveLookData" height="90" border style="width: 100%">
+          <el-table-column prop="stockReturnCount" label="累计退库量(吨)">
+            <template>
+              <div class="weights">{{ this.retreat == null ? 0: this.retreat}}</div>
+            </template>
+          </el-table-column>
+        </el-table>
       </ws-info-table>
     </ws-form>
 
@@ -149,16 +184,14 @@
         class="bg-bottom"
         type="primary"
         size="small"
-        @click="submit(deptBudgetList)"
-        >提交</el-button
+        @click="returnsales"
+        >关闭</el-button
       >
     </div>
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, dispatchCat, packList } from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
+import { moveLook } from '@/model/tasksport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -180,19 +213,7 @@ export default {
       deptBudgetList: {
         totalStorage: 0,
       },
-      options_: regionData,
-      heightData: '600px',
-      zoom: 7,
-      selectedOptions: [],
-      center: [116.244694, 39.517344],
-      window: '',
-      radio: 1,
-      personCharge: [],
-      district: null,
-      driverList: [],
       listDate: { country: '中国', level: 'country', city: '' },
-      citylist: [],
-      compId: sessionStorage.getItem('ws-pf_compId'),
       tranType: 2,
       rules: {
         warehouseName: [
@@ -211,69 +232,31 @@ export default {
       },
       appendixIdsAdd: '',
       size: 10,
-      value1: '',
       unitList: [],
-      freightspace: [
-        // {
-        //   trainNo: '',
-        // },
-      ],
       name: '',
-      list: [],
-      staffList: [],
-      options: [],
-      carModel: [],
-      tranCarInfoList: {},
-      arr: [],
+      moveLookData: [],
+      moveTaskNo: '',
+      weightOut: 0,
+      weightIn: 0,
+      transportLoss: 0,
+      retreat: 0,
     }
   },
-  mounted() {
-    this.deptBudgetList.id = this.$route.query.id
+
+  activated() {
+    this.moveTaskNo = this.$route.query.moveTaskNo
     this.getList()
   },
-  computed: {
-    totalStorage: function () {
-      var maxStorage = 0
-      for (var i = 0; i < this.freightspace.length; i++) {
-        maxStorage += Number(this.freightspace[i].maxStorage)
-      }
-      return maxStorage
-    },
+  mounted() {
+    this.moveTaskNo = this.$route.query.moveTaskNo
+    this.getList()
   },
   methods: {
-    dataFilter(val) {
-      this.deptBudgetList.personCharge = val
-      if (val) {
-        this.options = this.staffList.filter((item) => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
-        })
-      } else {
-        this.options = this.staffList
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-          this.deptBudgetList.tranCarInfoList[0].driverPhone =
-            this.staffList[i].staffMobilePhone
-          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
-        }
-      }
-    },
     marker: function (item) {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
     },
-    selectedAddress(e) {
-      this.deptBudgetList.warehousePositioning =
-        e.center.lat + ',' + e.center.lng
-    },
+
     confirmPositioncity() {
       this.listDate.level = 'city'
       this.listDate.country = this.name
@@ -282,186 +265,35 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    add() {
-      this.freightspace.push({
-        trainNo: '',
-      })
-    },
-    del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
-      }
-    },
-    //下拉司机姓名改变事件
-    selectdriver() {},
-    handleChange(value) {
-      this.selectedOptions = value
-    },
     returnsales() {
-      this.deptBudgetList = {}
-      this.freightspace = {}
-      this.selectedOptions = ''
-      this.$router.push({ path: 'tranManagementTransporTationFire' })
+      this.moveLookData = []
+      this.$router.go(-1)
     },
-    // confirmPosition() {
-    //   this.draggable = false
-    // },
+
     // 上传附件
     uploadSuccess(data, files, url) {
       console.log(data, files, url)
     },
-    submit() {
-      for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        if (!this.deptBudgetList.tranCarInfoList[i].driver) {
-          this.$message({
-            message: '姓名不能为空!',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.tranCarInfoList[i].driverPhone) {
-          this.$message({
-            message: '电话不能为空!',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.tranCarInfoList[i].sendDateStart) {
-          this.$message({
-            message: '发车日期不能为空!',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.tranCarInfoList[i].receiveDateEnd) {
-          this.$message({
-            message: '到站日期不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          new Date(
-            this.deptBudgetList.tranCarInfoList[i].sendDateStart
-          ).getTime() >
-          new Date(
-            this.deptBudgetList.tranCarInfoList[i].receiveDateEnd
-          ).getTime()
-        ) {
-          this.$message({
-            message: '发车时间不能大于到站时间!',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.tranCarInfoList[i].carModel) {
-          this.$message({
-            message: '车型不能为空!',
-            type: 'warning',
-          })
-          return
-        }
-      }
-      for (var j = 0; j < this.freightspace.length; j++) {
-        if (!this.freightspace[j].trainNo) {
-          this.$message({
-            message: '车厢号不能为空',
-            type: 'warning',
-          })
-          return
-        }
-      }
-
-      this.$confirm(`提交成功后,任务将下发给相关人员,是否确定提交?`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
-            if (valid) {
-              for (var i = 0; i < this.freightspace.length; i++) {
-                var num = this.freightspace[i].trainNo
-                this.arr.push(num)
-              }
-              this.deptBudgetList.totalStorage = this.totalStorage
-              this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.sendDateStart =
-                this.deptBudgetList.sendDateStart
-              this.tranCarInfoList.receiveDateEnd =
-                this.deptBudgetList.receiveDateEnd
-              this.tranCarInfoList.carModel = this.deptBudgetList.carModel
-              this.tranCarInfoList.id =
-                this.deptBudgetList.tranCarInfoList[0].id
-              this.tranCarInfoList.tranType = this.tranType
-              this.tranCarInfoList.boxNo = this.arr.toString()
-              var tranCarInfo = {}
-              var tranList = [this.tranCarInfoList]
-              tranCarInfo.id = this.deptBudgetList.id
-              tranCarInfo.infoId = this.deptBudgetList.infoId
-              tranCarInfo.tranCarInfoList = tranList
-              // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
-              dispatchCat(tranCarInfo)
-                .toPromise()
-                .then((response) => {
-                  this.$message.success('添加成功')
-                  this.deptBudgetList = {}
-                  this.freightspace = {}
-                  this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementTransporTationFire',
-                  })
-                })
-            } else {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              return false
-            }
-          })
-        })
-        .catch(() => {
-          return false
-        })
-    },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
     },
 
     getList() {
-      seeCat({ id: this.deptBudgetList.id })
+      moveLook({ moveTaskNo: this.moveTaskNo })
         .toPromise()
         .then((response) => {
-          this.deptBudgetList = response
-          if (response.tranCarInfoList[0].boxNo) {
-            this.list = response.tranCarInfoList[0].boxNo.split(',')
-            for (var i = 0; i < this.list.length; i++) {
-              var num = this.list[i]
-              this.freightspace.push({
-                trainNo: num,
-              })
+          this.moveLookData = response
+          for (var i = 0; i < this.moveLookData.length; i++) {
+            if (this.moveLookData[i].inOutType == '移库出库') {
+              this.weightOut = this.moveLookData[i].weight
+              this.retreat = this.moveLookData[i].stockReturnCount
+            } else {
+              this.weightIn = this.moveLookData[i].weight
             }
+            this.transportLoss = this.weightOut - this.weightIn
           }
         })
-      //司机姓名下拉
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.staffList = response
-          //  this.deptBudgetList.tranCarInfoList.driverPhone = response
-        })
-      //车型
-      packList({ constId: 'TRAN5' })
-        .toPromise()
-        .then((response) => {
-          this.carModel = response
-        })
     },
-    handleExamine() {},
-    approve() {},
-    // returnsales() {
-    //   this.$router.push({ path: 'purchaseContract' })
-    // },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
         if (this.ChapterTwoList[i].constValue == e) {
@@ -497,36 +329,6 @@ export default {
         }
       }
     },
-    // 编辑
-    editClick(item, index) {
-      const map = JSON.parse(JSON.stringify(item))
-      if (Object.is(item.id, 1)) {
-        return
-      }
-      if (Object.is(this.unitList[index].flag, 'delete')) {
-        map.flag = 'check'
-        this.$set(this.unitList, index, map)
-      } else {
-        map.flag = 'delete'
-        this.$set(this.unitList, index, map)
-      }
-    },
-    // 删除
-    deleteClick(item, index) {
-      if (Object.is(item.constKey, 1)) {
-        return
-      }
-      if (!item.constValue) {
-        this.unitList.splice(index, 1)
-        return
-      }
-      delxiala({ id: this.unitList[index].id })
-        .toPromise()
-        .then((response) => {
-          this.getUnitList()
-          this.pleaseChoose = ''
-        })
-    },
   },
 }
 </script>
@@ -557,9 +359,7 @@ export default {
   padding: 0 15%;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-  width: 33.333%;
+  width: 23%;
   border: none;
   height: 50px;
 }
@@ -594,20 +394,18 @@ export default {
 .el-col {
   background: #f6f7fc;
 }
+
 /deep/.ws-info-table .el-form-item .el-form-item__content {
-  padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
+  border: none;
+  font-size: 14px;
+  // color: #8890b1;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 100px;
-  text-align: center;
+  text-align: right;
   background: #fff;
   font-size: 14px;
   font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-  width: 30%;
+  width: 40%;
 }
 
 .button-container {
@@ -694,10 +492,7 @@ export default {
   .el-icon-arrow-up {
     display: none;
   }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
-  }
+
   .el-date-editor {
     i {
       display: none;
@@ -754,9 +549,7 @@ export default {
 .readonly:after {
   display: none;
 }
-.el-textarea__inner {
-  display: none;
-}
+
 .el-form {
   margin-top: 50px;
 }
@@ -775,33 +568,78 @@ export default {
   border-top: 0px;
 }
 
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  margin-bottom: 5px;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
 //输入框
 /deep/.el-input {
-  width: 15%;
+  width: 14.555%;
   margin-left: 10px;
 }
 /deep/.is-disabled .el-input__inner {
   height: 40px;
-  background: #f5f7fa;
-  margin-left: 10px;
+  text-align: center;
 }
-.line {
+.library {
   width: 100%;
+  height: 50px;
+  border-bottom: 1px solid #d8dce6;
+  color: #232323;
+  line-height: 50px;
+}
+.line {
+  height: 50px;
+  // left: -80px;
+}
+.line1 {
+  height: 50px;
 }
-
 //业务描述
 /deep/.el-textarea {
   width: 90%;
-  margin-left: 24px;
+  // margin-left: 24px;
+  margin-top: 20px;
+}
+.inout {
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+.goods {
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+.flow,
+.flow1 {
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+/deep/.flow .el-form-item {
+  display: inline-grid;
+  border-bottom: 1px solid #d8dce6;
+  width: 30%;
+  height: 50px;
+  text-align: center;
+}
+.flow .el-col {
+  background: #fff;
+  display: contents;
+}
+.flow1 {
+  width: 33.333%;
+}
+/deep/.el-table th > .cell {
+  text-align: center;
+  border-right: 1px solid #d8dce6;
+  background: #fff;
+}
+.weights {
+  width: 100%;
+  height: 50px;
+  text-align: center;
+  // border-right: 1px solid #d8dce6;
+  line-height: 50px;
+}
+/deep/.el-textarea__inner {
+  border: none;
 }
 </style>

+ 5 - 1
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>

+ 10 - 2
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -259,13 +259,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>
@@ -454,6 +455,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 == '销售出库' ||
@@ -678,7 +686,7 @@ export default {
                     tranType: '汽运',
                     deliveryDateStart: '',
                     deliveryDateEnd: '',
-                    weight: '13',
+                    weight: '',
                     selectedOptions: [],
                     selectedOptions1: [],
                     sendPrivate: '',

+ 1 - 0
src/views/taskManagement/tranManagementTransportEdit.vue

@@ -748,6 +748,7 @@ export default {
 }
 .bg-bottom {
   margin: 15px 0px;
+  background: #5473e8;
 }
 .el-radio,
 .el-radio__input {

+ 5 - 4
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) {

+ 2 - 2
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">
           <!-- 仓库名 -->

+ 1 - 1
src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -138,7 +138,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column class="table_td" label="接单日期" prop="receivingDate">
+      <el-table-column class="table_td" label="接单日期" prop="createDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
             <template slot-scope="scope">

+ 1 - 1
src/views/tranManagement/tranManagementShipping.vue

@@ -131,7 +131,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="接单日期" prop="receivingDate">
+        <el-table-column class="table_td" label="接单日期" prop="createDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">

+ 1 - 1
src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -153,7 +153,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="receivingDate" class="table_td" label="接单日期">
+        <el-table-column prop="createDate" class="table_td" label="接单日期">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">

+ 1 - 1
src/views/tranManagement/tranManagementVehicle.vue

@@ -124,7 +124,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="receivingDate" label="接单时间"> </el-table-column>
+        <el-table-column prop="createDate" label="接单时间"> </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
             <div