前端孟祥旭

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -1,30 +1,37 @@
 <!--出入库任务-->
 <template>
-  <div>
-    <BaseHeaderLayout :leftSpan="20">
-      <template slot="right">
-        <ws-button class="but" type="primary" @click="handleAdd()"
-          >添加</ws-button
-        >
-      </template>
-      <template slot="left">
-        <ws-button class="but" type="primary" @click="handlestatus(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" @click="handlestatus('')">全部任务</ws-button>
-      </template>
-      <template slot="left">
+   <div class="container">
+     <!-- <el-buttonclass="butt" type="primary" size="small" @click="add">
+        <img
+          width="22"
+          height="22"
+          @click="add"
+          src="../../../public/img/add.png"
+          alt=""
+        />
+        <div class="spans">添加车厢</div>
+      </el-button> -->
+      <div class="nav">
+        <ws-button class="butt" type="primary" @click="handleAdd()">
+         <img
+            width="20"
+            height="20"
+            @click="handleAdd()"
+           src="../../../public/img/add.png"
+           alt=""
+          />
+           <div class="spans">添加</div>
+          </ws-button
+        
+          >
         <ws-input
           v-model="warehouseName"
           placeholder="可按合同编号或任务编号查找"
           clearable
           maxlength="500"
           type="input"
-          class="findValue"
-        ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <div class="search">
+          class="Value"
+        ></ws-input> 
           <ws-button class="find" type="primary" @click="lookUp()"
             ><img
               width="16"
@@ -37,11 +44,20 @@
               "
               src="../../../public/img/sousuo.png"
               alt=""
-          /></ws-button>
-        </div>
-      </template>
-    </BaseHeaderLayout>
-    <div>
+          /></ws-button> 
+      </div>
+    <div class="nav2" >
+       </div> 
+    <div class="navv">
+        <ws-button class="but"  @click="handlestatus()">
+          待审核</ws-button>
+          <ws-button class="but"  @click="handlestatus()">
+          已驳回</ws-button>
+        <ws-button class="but"  @click="handlestatus(1)">
+          执行中</ws-button
+        >
+        <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
+        <ws-button class="but" type="primary" @click="handlestatus('')">全部任务</ws-button>
       <el-table
         class="wenzi"
         :data="gainList.records"
@@ -128,35 +144,36 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="nocomplete(scope.row)">
+            <div class="record" @click="nocomplete(scope.row)">
               查看
-            </ws-button>
-            <ws-button
+            </div>
+            <div
               v-if="scope.row.taskStatus == '待审核'"
-              class="putstorage"
+              class="adjustment"
               @click="delivery(scope.row)"
             >
               审核
-            </ws-button>
-            <ws-button
+            </div>
+            <div
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
-              class="putstorage"
+              class="record"
               @click="delivery(scope.row)"
             >
               编辑
-            </ws-button>
-            <ws-button
+            </div>
+            <div
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
+              class="adjustment"
               @click="deleteclick(scope.row)"
             >
               删除
-            </ws-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -532,13 +549,14 @@ export default {
   background: #e9ecf7;
 }
 .el-row {
-  height: 150px;
+  height: 80px;
 }
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
 .but {
-  margin-top: 150px;
+  margin-left: 55px;
+  margin-top: 30px;
 }
 .findValue {
   width: 0%;
@@ -548,4 +566,64 @@ export default {
 .search {
   margin-left: -250px;
 }
+.butt{
+ margin-left: 60px;
+ margin-top: 20px;
+}
+.Value{
+  width: 300px;
+}
+.el-pagination {
+  margin-bottom: 20px;
+  margin-left: 40%;
+}
+.winseaview-main{
+ background: #E8ECF6;
+box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
+.nav{
+  background: white
+  
+}
+.navv{
+  background: #FFFFFF;
+  border-radius: 4px;
+  margin-top: -8px;
+}
+// .nav2{
+//   width: auto;
+//   height: 5px;
+//   background-color: #e8eaf1;
+// }
+.nav2{
+  height: 25px;
+  background: #E8ECF6;
+  margin-top: 15px;
+}
+.spans {
+  display: table-caption;
+  width: 17px;
+  line-height: 19px;
+}
+//执行样式
+.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;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -22,13 +22,23 @@
       </el-col>
     </el-row>
     <div class="basicInformation">
-      <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-        <el-radio label="1">出库</el-radio>
-        <el-radio label="2">入库</el-radio>
-        <el-radio label="3">移库</el-radio>
-        <el-radio label="4">退库并出库</el-radio>
+      <div class="annu">
+        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
+        <el-radio label="1" class="a">出库</el-radio>
+        <el-radio label="2" class="a">入库</el-radio>
+        <el-radio label="3" class="a">移库</el-radio>
+        <el-radio label="4" class="a">退库并出库</el-radio>
       </el-radio-group>
+      </div>
+      <div class="ding"></div>
       <div v-if="dataList.taskTypeKey != 2" class="center1">
+          <img
+            style="position: relative; top: 40px; left: 128px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
         <!--出库=-->
         <div class="small-title">
           <h3>出库任务({{ inOutTaskNo }})</h3>
@@ -89,11 +99,11 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
+          <el-form-item label="货名" class="huom">
             <el-select
               v-model="dataList.goodsName"
               placeholder="货名"
-              class="typeselect"
+              class="huom"
               @change="selectgoodsName"
             >
               <el-option
@@ -105,12 +115,13 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）">
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px" >
             <el-input
               v-model="dataList.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -135,25 +146,28 @@
               v-model="dataList.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
-              size="small"
+              size="small" 
+              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px" >
             <el-input
               v-model="dataList.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
             <el-input
               v-model="dataList.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -188,17 +202,26 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item label="业务描述">
+          <el-form-item label="业务描述" span="1">
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
               size="small"
+              class="yewu"
+              
             />
           </el-form-item>
         </el-form>
       </div>
       <div v-if="dataList.taskTypeKey != 1" class="center1">
+        <img
+            style="position: relative; top: 40px; left: 128px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
         <div class="small-title">
           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
         </div>
@@ -257,11 +280,11 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
+          <el-form-item label="货名" class="huom">
             <el-select
               v-model="dataList1.goodsName"
               placeholder="货名"
-              class="typeselect"
+              class="huom"
               @change="selectgoodsName1"
             >
               <el-option
@@ -273,12 +296,13 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）">
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px" >
             <el-input
               v-model="dataList1.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
+               class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -304,24 +328,27 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               v-model="dataList1.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
             <el-input
               v-model="dataList1.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -867,7 +894,7 @@ export default {
     .el-form-item__content {
       padding-left: 0px;
       padding-right: 10px;
-      background: #fff;
+      // background: #fff;
       white-space: nowrap;
       height: 40px;
       display: flex;
@@ -980,4 +1007,36 @@ export default {
   position: relative;
   width: 100%;
 }
+.annu{
+  height: 81px;
+  background: #FFFFFF;
+  border-radius: 4px;
+}
+.basicInformation .el-form-item {
+    width: 50.3333%;
+    border: none;
+    margin: 0;
+}
+.huom{
+  width: 100px;
+  
+}
+.el-form{
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890B1;
+  line-height: 16px;
+}
+.a{
+  margin-left: -32px;
+}
+ .el-radio-group {
+    margin-left: 80px;
+}
+.ding{
+  height: 23px;
+  background: #E8ECF6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
 </style>

src/views/warehouse/warehouseManagementList.vue

@@ -17,7 +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>
+        <ws-button @click="handlTask()">任务</ws-button>
       </template>
       <template slot="left">
         <div style="margin-top: 2px">

src/views/warehouse/warehouseManagementPutOut.vue

@@ -1,11 +1,11 @@
 //出入库任务
 <template>
  <div class="container">
-      <el-row>
-      <el-col :span="20">
+    <el-row>
+      <el-col :span="12">
         <h2 class="bg-left title">出入库任务</h2>
       </el-col>
-      <el-col :span="4" class="bg-right">
+      <el-col :span="12" class="bg-right">
         <el-button
           class="bg-bottom"
           type="primary"
@@ -20,26 +20,18 @@
           />返回</el-button
         >
       </el-col>
-    </el-row>
-    <BaseHeaderLayout :leftSpan="12">
-      <template slot="left">
-        <ws-button class="but" type="primary" @click="statusquery(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
-      </template>
-      <!-- 接单开始 -->
-      <template slot="right">
-        <ws-input
+    </el-row>  
+    <!-- <div> -->
+     <div>
+       <ws-input
           v-model="searchKeyWord"
-          placeholder="可按发货人、收货人、任务编号查找"
+          placeholder="可按照合同编号和任务编号进行查找"
           clearable
           maxlength="500"
           type="input"
           class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button class="find" type="primary" @click="find()"
+        <ws-button class="but" type="primary" @click="find()"
           ><img
             width="16"
             height="16"
@@ -52,10 +44,11 @@
             src="../../../public/img/sousuo.png"
             alt=""
         /></ws-button>
-       
-      </template>
-    </BaseHeaderLayout>
-    <div>
+     </div>
+        <ws-button  type="primary" @click="statusquery(1)" >
+          执行中</ws-button
+        >
+        <ws-button  @click="statusquery(2)">已完成</ws-button>
       <el-table
         class="wenzi"
         :data="warehouseList.records"
@@ -90,7 +83,7 @@
         <el-table-column class="table_td" prop="agent" label="经办人" >
           
         </el-table-column>
-      <el-table-column prop="status" label="状态">
+      <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -102,15 +95,15 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待执行'"
+                    v-if="scope.row.taskStatus == '待执行'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.taskStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span v-if="scope.row.taskStatus == '已完成'" class="done"></span
+                  >{{ scope.row.taskStatus }}
                 </span>
               </template>
               <div>
@@ -158,13 +151,13 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize"
+        :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
       >
       </el-pagination>
     </div>
-  </div>
+  <!-- </div> -->
 </template>
 <script>
 import {
@@ -219,7 +212,8 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
-      warehouseName: '',
+      contractNo: '',
+      inOutTaskNo:'',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       warehouseList: [],
@@ -234,9 +228,6 @@ export default {
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
     this.getList()
     this.showType = this.isShow
   },
@@ -250,6 +241,8 @@ export default {
         contractType:this.contractType,
         tranTypeKey: this.tranTypeKey, 
         searchType:this.searchType,
+        contractNo:this.contractNo,
+        inOutTaskNo:this.inOutTaskNo,
 
       })
       .toPromise()
@@ -354,7 +347,7 @@ export default {
     },
     editClick(row) {
       var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
+      if (row.status == '待审核' || row.status == '已完成') {
         status = '执行中'
       } else if (row.status == '执行中') {
         status = '已完成'
@@ -390,26 +383,26 @@ export default {
         }
       }
     },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
+    // fujian(row) {
+    //   if (
+    //     row.receiveAttachmentPath === null ||
+    //     row.receiveAttachmentPath === ''
+    //   ) {
+    //     EventBus.$emit(
+    //       'warning',
+    //       this.$t('system.noticeCircular.NoInformation')
+    //     )
+    //   } else {
+    //     this.accessoryTFs = true
+    //   }
+    //   this.appendixIdss = row.receiveAttachmentPath
+    // },
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
         query: { id: row.id },
       })
-    },
+    }, 
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -421,6 +414,7 @@ export default {
           this.historyList = response
         })
     },
+    //查找
     find() {
       this.currentPage = 1
       this.getList()
@@ -492,6 +486,7 @@ export default {
 /deep/.findValue .el-input__inner {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
+  width: 385px;
 }
 .completed.el-button--default {
   border-color: #5878e8;
@@ -530,15 +525,12 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-.el-row{
-    height: 150px;
-}
+// .el-row{
+//     height: 150px;
+// }
 .base_header_layout .grid-content{
     margin-top: 80px;
 }
-.but{
-    margin-top: 150px;
-}
 .el-input--small .el-input__inner{
     margin-left: 20px;
 }
@@ -576,5 +568,87 @@ export default {
 }
 .container {
   overflow: scroll;
+  height: 93vh;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.bg-left {
+  padding-left: 30px;
 }
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+    // margin-left: 85%;
+    margin-top: 20px;
+}
+//导航条样式
+.el-col-12 {
+    width: 50%;
+    height: 60px;
+    background: #F6F7FC;
+    border-radius: 4px 4px 1px 1px;
+}
+.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 385px;
+    margin-top: 10px;
+}
+.bg-bottom{
+ margin-left: 85%;
+}
+.but {
+    margin-left: 30%;
+    /* margin-top: -32px; */
+    overflow: auto;
+    /* float: left; */
+    /* margin-left: 1px; */
+    margin-left: -10px;
+}
+.el-input--small {
+    font-size: 13px;
+    width: 390px;
+}
+
 </style>

src/views/warehouse/warehouseManagementPutOutLook.vue

@@ -27,9 +27,9 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 任务编号 -->
           <el-form-item label="任务编号">
-            <el-select
+            <el-input
               disabled
-              v-model="dataList.warehouseName"
+              v-model="dataList.inOutTaskNo"
               class="typeselect"
             >
               <el-option
@@ -38,15 +38,13 @@
                 :label="item.warehouseName"
                 :value="item.warehouseName"
               />
-            </el-select>
+            </el-input>
           </el-form-item>
-          
           <!-- 合同编号 -->
           <el-form-item label="合同编号">
-            <el-select
+            <el-input
               disabled
               v-model="dataList.contractNo"
-              placeholder="请输入合同编号"
               class="typeselect"
             >
               <el-option
@@ -55,14 +53,13 @@
                 :label="item.contractNo"
                 :value="item.contractNo"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 库房名 -->
           <el-form-item label="库房名">
-            <el-select
+            <el-input
               disabled
-              v-model="dataList.goodsName"
-              placeholder="货名"
+              v-model="dataList.warehouseName"
               class="typeselect"
             >
               <el-option
@@ -71,14 +68,13 @@
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 类型-->
           <el-form-item label="类型">
-            <el-select
+            <el-input
               disabled
-              v-model="dataList.goodsName"
-              placeholder="货名"
+              v-model="dataList. inOutType"
               class="typeselect"
             >
               <el-option
@@ -87,11 +83,11 @@
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名">
-            <el-select
+            <el-input
               disabled
               v-model="dataList.goodsName"
               placeholder="货名"
@@ -103,14 +99,13 @@
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）">
             <el-input
               disabled
               v-model="dataList.weight"
-              placeholder="请输入重量"
               maxlength="120"
               size="small"
             />
@@ -126,16 +121,14 @@
               disabled
               v-model="dataList.predictDate"
               type="date"
-              placeholder="请选择预计出库日期"
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
           <!--经办人-->
           <el-form-item label="经办人">
-            <el-select
+            <el-input
               disabled
               v-model="dataList.agent"
-              placeholder="请选择经办人"
               filterable
               :filter-method="dataFilter"
             >
@@ -145,13 +138,12 @@
                 :label="item.staffName"
                 :value="item.staffName"
               />
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
+            <el-input
               v-model="dataList.grade"
-              placeholder=""
               class="typeselect"
               disabled
             >
@@ -161,14 +153,13 @@
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+            </el-input>
           </el-form-item>
           <!--容重（克/升）>=-->
           <el-form-item label="容重（克/升）>=">
             <el-input
               disabled
               v-model="dataList.bulkDensity"
-              placeholder="请输入容重"
               maxlength="120"
               size="small"
             />
@@ -178,7 +169,6 @@
             <el-input
               disabled
               v-model="dataList.waterContent"
-              placeholder="请输入水分占比"
               maxlength="120"
               size="small"
             />
@@ -188,7 +178,6 @@
             <el-input
               disabled
               v-model="dataList.unitPrice"
-              placeholder="请输入单价"
               maxlength="120"
               size="small"
             />
@@ -197,7 +186,7 @@
           <el-form-item label="发布人">
             <el-input
               disabled
-              v-model="dataList.unitPrice"
+              v-model="dataList.publisher"
               maxlength="120"
               size="small"
             />
@@ -215,7 +204,7 @@
           <el-form-item label="仓位">
             <el-input
               disabled
-              v-model="dataList.unitPrice"
+              v-model="dataList.positionId"
               maxlength="120"
               size="small"
             />
@@ -233,19 +222,19 @@
         </el-form>
       </div>
       
-    <!-- 提交 -->
+    <!-- 关闭 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
-        >提交</el-button
+      <el-button class="bg-bottom" type="primary" size="small" @click="close()"
+        >关闭</el-button
       >
     </div>
   </div>
 </template>
 <script>
 import {
-  getwarehousename,
-  xialaNo,
-  addoreditoutput,
+  // getwarehousename,
+  // xialaNo,
+  // addoreditoutput,
   outexamine,
 } from '@/model/tasksport/index'
 import { packList } from '@/model/contarct/index'
@@ -358,10 +347,12 @@ export default {
     //返回按钮
     revert() {
       this.$router.go(-1)
+      
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+      this.$router.push({ path: 'warehouseManagementPutOut' })
     },
+
     // 获取当前年月日
     getdate() {
       var date = new Date()
@@ -442,26 +433,32 @@ export default {
         }
       })
     },
-    //提交按钮
-    submit() {
-      if (this.dataList.taskTypeKey == 1) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.requestadd(this.dataList)
-      } else if (this.dataList.taskTypeKey == 2) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo1
-        this.requestadd(this.dataList)
-      } else if (
-        this.dataList.taskTypeKey == 3 ||
-        this.dataList.taskTypeKey == 4
-      ) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-        this.requestadd(this.dataList, 'repetition')
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
-        this.dataList1.relevanceId = this.dataList.relevanceId
-        this.requestadd(this.dataList1, 'repetition')
-      }
+    // 关闭
+    close(){
+        this.$router.push({ 
+        path: 'warehouseManagementPutOut',
+        })
     },
+    //提交按钮
+    // submit() {
+    //   if (this.dataList.taskTypeKey == 1) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo
+    //     this.requestadd(this.dataList)
+    //   } else if (this.dataList.taskTypeKey == 2) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo1
+    //     this.requestadd(this.dataList)
+    //   } else if (
+    //     this.dataList.taskTypeKey == 3 ||
+    //     this.dataList.taskTypeKey == 4
+    //   ) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo
+    //     this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
+    //     this.requestadd(this.dataList, 'repetition')
+    //     this.dataList1.inOutTaskNo = this.inOutTaskNo1
+    //     this.dataList1.relevanceId = this.dataList.relevanceId
+    //     this.requestadd(this.dataList1, 'repetition')
+    //   }
+    // },
     selectwarehouseName() {},
     tarechange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {
@@ -531,7 +528,6 @@ export default {
       return Min + Math.round(Rand * Range)
     },
     getList() {
-      console.log(11111)
       outexamine({ relevanceId: this.$route.query.relevanceId })
         .toPromise()
         .then((response) => {
@@ -542,8 +538,8 @@ export default {
             this.dataList = response[0]
           }
         })
-    },
 
+    },
     // deletecontract(){},
     //删除
     approve() {},