前端孟祥旭

src/api/V2/warehouse/index.js

@@ -53,6 +53,8 @@ export const API_GET_WAREHOUSE_RECORDSS = '/warehouseInOutInfo/selectInfoTempora
 export const API_GET_GOODSNAME_XIALA = '/warehouseInOutInfo/selectTemporaryGoodsNameList'
 //临时仓库待完成
 export const API_GET_WAREHOUSE_LIST = '/warehouseInOutInfo/selectWarehouseInOutInfoTemporary'
+//任务列表
+export const API_GET_WAREHOUSE_TASKLIST = '/inOutWarehouseTask/selectInOutWarehouseTask'
 
 
 

src/lang/zh.js

@@ -501,6 +501,8 @@
     warehouseManagementRecord: '记录',
     warehouseManagementNoComplete: '待完成',
     warehouseManagementPerfectput: '编辑',
+    warehouseManagementPutOut:'任务',
+    warehouseManagementPutOutLook:'查看',
     //运输管理
     tranManagement: '运输管理',
     tranManagementDriver: '司机管理',
@@ -4732,6 +4734,8 @@
     warehouseManagementNoComplete: '待完成',
     warehouseManagementPerfectput: '编辑',
     warehouseManagementPerfectDelivery: '编辑',
+    warehouseManagementPutOut:'任务',
+    warehouseManagementPutOutLook:'查看',
 
   },
   //运输管理

src/model/warehouse/index.js

@@ -25,7 +25,8 @@ import {
     API_GET_STAFF,
     API_GET_WAREHOUSE_RECORDSS,
     API_GET_GOODSNAME_XIALA,
-    API_GET_WAREHOUSE_LIST
+    API_GET_WAREHOUSE_LIST,
+    API_GET_WAREHOUSE_TASKLIST,
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -79,6 +80,8 @@ export const goodsnameXiala = appRx.get(API_GET_GOODSNAME_XIALA, errorCatcher, e
 export const completeList = appRx.get(API_GET_WAREHOUSE_LIST, errorCatcher, errorHandle, filter)
 //临时出入库合同编号下拉
 export const xialaNo = appRx.get(API_GET_WAREHOUSE_NO, errorCatcher, errorHandle, filter)
+//任务列表
+export const taskList = appRx.get(API_GET_WAREHOUSE_TASKLIST,errorCatcher, errorHandle, filter)
 
 
 

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -3,51 +3,38 @@
   <div>
     <BaseHeaderLayout :leftSpan="14">
       <template slot="left">
-        <ws-button
-        class="but"
-          type="primary"
-          @click="handlestatus(1)"
-          >
+        <ws-button class="but" type="primary" @click="statusquery(1)">
           执行中</ws-button
         >
-        <ws-button
-        class="but"
-          @click="handlestatus(1)"
-          
-          >已完成</ws-button
-        >
-        <ws-button
-        class="but"
-          @click="handlestatus('')"
-          
-          >全部任务</ws-button
-        > 
+        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
-      <template slot="left">
-            <el-date-picker
-          v-model="value2"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :picker-options="pickerOptions"
-        >
-        </el-date-picker>
+      <template slot="right">
+        <span style="display: inline-block; width: 290px;color: #8890B1;">接单日期</span>
+        <ws-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="date"
+          placeholder="请选择开始日期"
+          value-format="yyyy-MM-dd"
+        />
+        <span>至</span>
+        <ws-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="date"
+          placeholder="请选择结束日期"
+          value-format="yyyy-MM-dd"
+        />
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
+          placeholder="可按发货人、收货人、任务编号查找"
           clearable
           maxlength="500"
           type="input"
           class="findValue"
         ></ws-input>
-        <ws-button
-          class="find"
-          type="primary"
-          @click="find()"
+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+        <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
             height="16"
@@ -123,7 +110,7 @@
                 </span>
               </template>
           <div>
-              <p style="margin-top: 0; padding-left: 10px"></p>
+              <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
               <div v-for="(item, index) in historyList" class="flex">
                 <div class="vertical-text vertical-text-left">
                   {{ item.updateDate }}
@@ -184,6 +171,7 @@
 <script>
 import {
  shippingList,
+ state,
 } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -256,7 +244,9 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        contractType:this.contractType,
+        contractType: this.contractType,
+        searchType: this.searchType,
+        
       })
         .toPromise()
         .then((response) => {
@@ -266,7 +256,7 @@ export default {
           this.deptBudgetTotal = response.total
         })
     },
-    handlestatus(){
+    statusquery(status){
       this.searchType = status
       this.getList()
     },
@@ -322,8 +312,7 @@ export default {
             id: row.id,
           },
         })
-      }
-        
+      }  
     },
 
     //反馈
@@ -384,7 +373,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          editstatus({ id: row.id })
+          state({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -549,5 +538,32 @@ export default {
     height: 32px;
     margin-left: -20%;
 }
- 
+//状态样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
+.record, .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -110,7 +110,7 @@
             <ws-info-table>
               <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
              <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
-              <!--司机-->
+              <!--姓名-->
               <ws-form-item
               label="姓名："
               span="1"
@@ -179,9 +179,10 @@
                   @click="fujian(scope.row)"
                   alt=""
                 />
-                <div v-show="item.temporaryDriverFlag == 0">
+                <span v-if="scope.row.loadPoundImgArray.length >0">{{scope.row.loadPoundImgArray.length}}</span>
+                <!-- <div v-show="item.temporaryDriverFlag == 0">
                   {{ item.signStatus }}
-                </div>
+                </div> -->
               </template>
             </ws-form-item>
             </ws-info-table>
@@ -321,21 +322,17 @@ export default {
         this.deptBudgetList.tranCarInfoList.splice(index, 1)
       }
     },
-    // add() {
-    //   console.log(this.deptBudgetList.tranCarInfoList, 'sasasasas')
-    //   this.deptBudgetList.tranCarInfoList.push({
-    //     driverName: '',
-    //     driverPhone: '',
-    //     carLength: 0,
-    //     carLengthKey: '',
-    //     loadWeight: null,
-    //     carModel: '',
-    //     carModelKey: '',
-    //     carNumber: '',
-    //     disabled: false,
-    //     tranType: '1',
-    //   })
-    // },
+    fujian(row){
+      if (row.loadPoundImg === null || row.loadPoundImg ==='') {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      }else{
+        this.accessoryTFs = true
+      }
+      
+    },
     selectwaterContent() {},
     //提交按钮
     submit() {
@@ -417,6 +414,7 @@ export default {
               this.freightspace[i].loadNetWeight = 0
             }
           }
+          
         })
    },
     carchange(val, index) {

src/views/tranManagement/tranManagementShipping.vue

@@ -1,53 +1,40 @@
 //船运调度
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="14">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button
-        class="but"
-          type="primary"
-          @click="handlestatus(1)"
-          >
+        <ws-button class="but" type="primary" @click="statusquery(1)">
           执行中</ws-button
         >
-        <ws-button
-        class="but"
-          @click="handlestatus(2)"
-          
-          >已完成</ws-button
-        >
-        <ws-button
-        class="but"
-          @click="handlestatus('')"
-          
-          >全部任务</ws-button
-        > 
+        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
-      <template slot="left">
-        <el-date-picker
-          v-model="value2"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :picker-options="pickerOptions"
-        >
-        </el-date-picker>
+      <template slot="right">
+        <span style="display: inline-block; width: 290px;color: #8890B1;">接单日期</span>
+        <ws-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="date"
+          placeholder="请选择开始日期"
+          value-format="yyyy-MM-dd"
+        />
+        <span>至</span>
+        <ws-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="date"
+          placeholder="请选择结束日期"
+          value-format="yyyy-MM-dd"
+        />
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
+          placeholder="可按发货人、收货人、任务编号查找"
           clearable
           maxlength="500"
           type="input"
           class="findValue"
         ></ws-input>
-        <ws-button
-          class="find"
-          type="primary"
-          @click="find()"
+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+        <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
             height="16"
@@ -60,6 +47,7 @@
             src="../../../public/img/sousuo.png"
             alt=""
         /></ws-button>
+       
       </template>
     </BaseHeaderLayout>
     <div>
@@ -91,67 +79,67 @@
              </template>
         </el-table-column>
       <el-table-column prop="status" label="状态">
-        <template slot-scope="scope">
-          <el-popover
-          placement="left"
-          :width="285"
-          trigger="click"
-          visible-arrow="false"
-          @show="history(scope.row)"
-          >
-          <template>
-            <span slot="reference">
-              <span
-              v-if="scope.row.status =='待执行'"
-              class="executory"
-              ></span>
-            <span
-            v-if="scope.row.status == '执行中'"
-            class="inExecution"
-            ></span>
-            <span v-if="scope.row.status == '已完成'" class="done"></span
-            >{{scope.row.status}}
-            </span>
-          </template>
-          <div>
-              <p style="margin-top: 0; padding-left: 10px"></p>
-              <div v-for="(item, index) in historyList" class="flex">
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
-                <div>
-                  <div class="vertical-circle"></div>
-                  <div
-                    v-if="index != historyList.length - 1"
-                    class="vertical-line"
-                  ></div>
-                </div>
-                <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+          <template slot-scope="scope">
+            <el-popover
+              placement="left"
+              :width="285"
+              trigger="click"
+              visible-arrow="false"
+              @show="history(scope.row)"
+            >
+              <template>
+                <span slot="reference">
+                  <span
+                    v-if="scope.row.status == '待执行'"
+                    class="executory"
+                  ></span>
+                  <span
+                    v-if="scope.row.status == '执行中'"
+                    class="inExecution"
+                  ></span>
+                  <span v-if="scope.row.status == '已完成'" class="done"></span
+                  >{{ scope.row.status }}
+                </span>
+              </template>
+              <div>
+                <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
+                <div v-for="(item, index) in historyList" class="flex" :key="index">
+                  <div class="vertical-text vertical-text-left">
+                    {{ item.updateDate }}
+                  </div>
+                  <div>
+                    <div class="vertical-circle"></div>
+                    <div
+                      v-if="index != historyList.length - 1"
+                      class="vertical-line"
+                    ></div>
+                  </div>
+                  <div class="vertical-text">
+                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                  </div>
                 </div>
               </div>
-            </div>
-          </el-popover>
-          <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(scope.row)"
-            alt=""
-          />
-        </template>
+            </el-popover>
+            <img
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="editClick(scope.row)"
+              alt=""
+            />
+          </template>
       </el-table-column>
       <el-table-column class="table_td" label="接单日期" prop="receivingDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="handleLook(scope.row)">
+            <div class="record" @click="handleLook(scope.row)">
               查看
-            </ws-button>
-            <ws-button class="putstorage" @click="shipping(scope.row)">
+            </div>
+            <div class="adjustment" @click="shipping(scope.row)">
               船次
-            </ws-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -172,6 +160,7 @@
 import {
   getList,
   shippingList,
+  alsostate,
 } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -252,19 +241,21 @@ export default {
         pageSize:this.pageSize,
         contractType:this.contractType,
         tranTypeKey: this.tranTypeKey, 
+        searchType:this.searchType,
+
       })
       .toPromise()
       .then((response)=>{
         this.warehouseList = response
         this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
+        this.deptCircularPage.pageSize = response.size
+        this.deptBudgetTotal = response.total
         
         
       })
     },
-    handlestatus(status){
-      this.searchType = status
+    statusquery(state){
+      this.searchType = state
       this.getList()
     },
     delivery(item) {
@@ -403,7 +394,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          editstatus({ id: row.id })
+          alsostate({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -583,4 +574,32 @@ export default {
     height: 32px;
     margin-left: -20%;
 }
+//执行样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
+.record, .adjustment{
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
 </style>

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -706,7 +706,7 @@ export default {
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
   border-radius: 4px;
-  border: 1px solid #d8dce6;
+
   font-family: PingFangSC-Regular, PingFang SC;
   margin-bottom: 5px;
   // background-color: #fff;
@@ -829,5 +829,15 @@ export default {
     border-block-color:  #F6F7FC;
     background: #F6F7FC;
 }
-
+// .ws-info-table .el-form-item .el-form-item__content {
+//     background: #f5f7fa;
+//     border-radius: 4px;
+//     /* border: 1px solid #d8dce6; */
+//     font-family: PingFangSC-Regular, PingFang SC;
+//     margin-bottom: 5px;
+//     font-size: 14px;
+//     font-weight: 400;
+//     color: #8890b1;
+//     line-height: 16px;
+// }
 </style>

src/views/warehouse/component/router/index.js

@@ -212,7 +212,39 @@ const warehouseManagementRouter = {
         // module: 'procurement.sparepart.applDetail'
       },
       hidden: true
-    },      
+    },
+    // 出入库任务
+    {
+      path: 'warehouseManagementPutOut',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementPutOut'),
+      name: 'warehouseManagementPutOut',
+      meta: {
+        title: 'warehouseManagementPutOut',
+        shortcutEntrance: 'warehouseManagementPutOut',
+        module: 'warehouse.warehouseManagementPutOut',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
+    // 出入库任务查看
+    {
+      path: 'warehouseManagementPutOutLook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementPutOutLook'),
+      name: 'warehouseManagementPutOutLook',
+      meta: {
+        title: 'warehouseManagementPutOutLook',
+        shortcutEntrance: 'warehouseManagementPutOutLook',
+        module: 'warehouse.warehouseManagementPutOutLook',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },                        
   ],
 };
 export default warehouseManagementRouter;

src/views/warehouse/warehouseManagementList.vue

@@ -17,6 +17,7 @@
         <ws-button @click="handleLook()">查看</ws-button>
         <ws-button @click="handleEdit()">编辑</ws-button>
         <ws-button @click="handleDelete()">删除</ws-button>
+        <ws-button @click="handlTask()">任务{{}}</ws-button>
       </template>
       <template slot="left">
         <div style="margin-top: 2px">
@@ -468,6 +469,10 @@ export default {
     handleDelete() {
       this.$router.push({ path: 'warehouseManagementDelete' })
     },
+    //任务
+    handlTask(){
+      this.$router.push({path:'warehouseManagementPutOut'})
+    },
     dateFormat(fmt, date) {
       let ret
       const opt = {

vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.115: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/',