Ver Fonte

前端gjy

gjy há 4 anos atrás
pai
commit
e35b2abbf3

+ 4 - 0
src/api/V2/taskspost/index.js

@@ -18,6 +18,10 @@ export const API_POST_TRAN_DEL = '/tranTaskInfo/api/deleteTranTask'
 export const API_GET_TRAN_EXAMINE = '/tranTaskInfo/getTranTask'
 export const API_GET_TRAN_EXAMINE = '/tranTaskInfo/getTranTask'
 // 运输任务-编辑
 // 运输任务-编辑
 export const API_GET_TRAN_EDIT = '/tranTaskInfo/api/editTranTask'
 export const API_GET_TRAN_EDIT = '/tranTaskInfo/api/editTranTask'
+// 审核通过不通过接口
+export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+// 审核编辑
+export const API_POST_INOUTWAREHOUSETASK = `/inOutWarehouseTask/api/checkOrUpdateInOutTask`
 // 出入库任务-新增(编辑)
 // 出入库任务-新增(编辑)
 export const API_POST_OUT_PUT = '/inOutWarehouseTask/api/insertOrUpdateInOutTask'
 export const API_POST_OUT_PUT = '/inOutWarehouseTask/api/insertOrUpdateInOutTask'
 // 出入库任务-列表
 // 出入库任务-列表

+ 6 - 0
src/model/tasksport/index.js

@@ -8,6 +8,7 @@ import {
     API_POST_TRAN_LOOK,
     API_POST_TRAN_LOOK,
     API_GET_TRAN_TASK_WAREHOUSE,
     API_GET_TRAN_TASK_WAREHOUSE,
     API_GET_WAREHOUSE_NO,
     API_GET_WAREHOUSE_NO,
+    API_POST_WORKFLOW_API_HANDLE,
     API_POST_TRAN_DEL,
     API_POST_TRAN_DEL,
     API_GET_TRAN_EXAMINE,
     API_GET_TRAN_EXAMINE,
     API_GET_TRAN_EDIT,
     API_GET_TRAN_EDIT,
@@ -17,6 +18,7 @@ import {
     API_POST_OUT_DEL,
     API_POST_OUT_DEL,
     API_GET_CONTRACT_GOODSNAME,
     API_GET_CONTRACT_GOODSNAME,
     API_GET_OUT_MOVE,
     API_GET_OUT_MOVE,
+    API_POST_INOUTWAREHOUSETASK,
     API_GET_OUT_MOVELOOK
     API_GET_OUT_MOVELOOK
 } from '@/api/V2/taskspost'
 } from '@/api/V2/taskspost'
 //运输任务列表
 //运输任务列表
@@ -25,6 +27,10 @@ export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filt
 export const addtrantask = appRx.post(API_POST_TRAN_ADD, errorCatcher, errorHandle, filter)
 export const addtrantask = appRx.post(API_POST_TRAN_ADD, errorCatcher, errorHandle, filter)
 // 识别身份证
 // 识别身份证
 export const getidentity = appRx.get(API_POST_PERSON, errorCatcher, errorHandle, filter)
 export const getidentity = appRx.get(API_POST_PERSON, errorCatcher, errorHandle, filter)
+// 审核通过不通过
+export const woekflowhandle = appRx.post(API_POST_WORKFLOW_API_HANDLE, errorCatcher, errorHandle, filter)
+// 审核编辑
+export const warehousetask = appRx.post(API_POST_INOUTWAREHOUSETASK, errorCatcher, errorHandle, filter)
 //运输任务查看
 //运输任务查看
 export const lookTranTask = appRx.get(API_POST_TRAN_LOOK, errorCatcher, errorHandle, filter)
 export const lookTranTask = appRx.get(API_POST_TRAN_LOOK, errorCatcher, errorHandle, filter)
 //运输任务-添加-根据仓库类型选库名
 //运输任务-添加-根据仓库类型选库名

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

@@ -125,7 +125,7 @@ const tranManagementRouter = {
       meta: {
       meta: {
         title: 'inOutWarehouseTaskEdit',
         title: 'inOutWarehouseTaskEdit',
         shortcutEntrance: 'tranManagement',
         shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.view',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
       },
       },
       hidden: true
       hidden: true
     },
     },
@@ -163,7 +163,7 @@ const tranManagementRouter = {
     {
     {
       path: 'tranManagementWarehouseInOutTaskaudit',
       path: 'tranManagementWarehouseInOutTaskaudit',
       component: () =>
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskEdit'),
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskAudit'),
       name: 'tranManagementWarehouseInOutTaskEdit',
       name: 'tranManagementWarehouseInOutTaskEdit',
       meta: {
       meta: {
         title: 'tranManagementWarehouseInOutTaskaudit',
         title: 'tranManagementWarehouseInOutTaskaudit',

+ 18 - 1
src/views/taskManagement/tranManagementTransport.vue

@@ -53,7 +53,7 @@
         class="wenzi"
         class="wenzi"
         :data="gainList.records"
         :data="gainList.records"
         style="width: 100%; "
         style="width: 100%; "
-        height="780"
+        height="680"
       >
       >
         <el-table-column type="index" label="序号">
         <el-table-column type="index" label="序号">
           <template scope="scope">
           <template scope="scope">
@@ -157,6 +157,17 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
+      <div class="block">
+            <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
+        </div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -198,6 +209,7 @@ export default {
       currentPage: 1,
       currentPage: 1,
       primary: 1,
       primary: 1,
       pageSize: 10,
       pageSize: 10,
+      deptBudgetTotal:0,
       searchType: 1,
       searchType: 1,
       start:'',
       start:'',
       end:'',
       end:'',
@@ -267,6 +279,7 @@ export default {
       })
       })
         .toPromise()
         .toPromise()
         .then(response => {
         .then(response => {
+          this.deptBudgetTotal=response.total
           this.gainList = response
           this.gainList = response
         })
         })
     },
     },
@@ -463,6 +476,10 @@ export default {
   background-color: #5878e8;
   background-color: #5878e8;
   border-color: #5878e8;
   border-color: #5878e8;
 }
 }
+.el-pagination{
+  padding-top: 20px;
+  text-align: center;
+}
 .el-button--default {
 .el-button--default {
   color: #8890b1;
   color: #8890b1;
   border-color: #e8eaf1;
   border-color: #e8eaf1;

+ 11 - 6
src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -95,8 +95,14 @@
           prop="contractNo"
           prop="contractNo"
           label="合同编号"
           label="合同编号"
           width="80"
           width="80"
-        ></el-table-column>
-        <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
+        >
+         <template scope="scope">
+             <span v-if="scope.row.taskTypeKey!=3">{{ scope.row.contractNo }}</span>
+            <span v-else>{{ scope.row.moveTaskNo }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="inOutTaskNo" label="任务编号">
+        </el-table-column>
         <el-table-column
         <el-table-column
           prop="warehouseName"
           prop="warehouseName"
           class="table_td"
           class="table_td"
@@ -204,7 +210,7 @@
               v-hasPermission="
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
               "
               "
-              v-if="scope.row.taskStatus == '待审核'&&scope.row.taskId!=null"
+              v-if="scope.row.taskStatus == '待审核'"
               class="adjustment"
               class="adjustment"
               @click="delivery(scope.row)"
               @click="delivery(scope.row)"
             >
             >
@@ -228,8 +234,7 @@
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
               "
               "
               v-if="
               v-if="
-                scope.row.taskStatus == '执行中' ||
-                scope.row.taskStatus == '已驳回'
+                scope.row.taskId==null
               "
               "
               class="adjustment"
               class="adjustment"
               @click="deleteclick(scope.row)"
               @click="deleteclick(scope.row)"
@@ -390,7 +395,7 @@ export default {
     //编辑
     //编辑
     delivery(item) {
     delivery(item) {
       this.$router.push({
       this.$router.push({
-        path: 'tranManagementWarehouseInOutTaskEdit',
+        path: 'tranManagementWarehouseInOutTaskaudit',
         query: {
         query: {
           relevanceId: item.relevanceId,
           relevanceId: item.relevanceId,
         },
         },

+ 12 - 27
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -102,7 +102,7 @@
           </el-form-item>
           </el-form-item>
           <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
           <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
             <el-input
             <el-input
-            @change="selectTaskNo"
+            @input="selectTaskNo"
               v-model="dataList.moveTaskNo"
               v-model="dataList.moveTaskNo"
               placeholder="请输入移库任务编号"
               placeholder="请输入移库任务编号"
               class="typeselect"
               class="typeselect"
@@ -223,7 +223,7 @@
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
           <!--业务描述=-->
           <!--业务描述=-->
-          <el-form-item label="业务描述" span="20">
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="业务描述" span="20">
             <el-input
             <el-input
               v-model="dataList.businessDescribe"
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               placeholder="请输入业务描述,不超过150字"
@@ -245,7 +245,7 @@
         <div class="small-title">
         <div class="small-title">
           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
         </div>
         </div>
-        <el-form ref="form" :model="form" label-width="140px">
+        <el-form v-if='!deletetask' ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
           <el-form-item label="仓库名">
             <el-select
             <el-select
@@ -261,7 +261,7 @@
               />
               />
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
-          <!-- 库类型 -->
+          <!-- 库类型 -->
           <el-form-item label="入库类型">
           <el-form-item label="入库类型">
             <el-select
             <el-select
             :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
             :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
@@ -430,7 +430,7 @@
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
           <!--业务描述=-->
           <!--业务描述=-->
-          <el-form-item label="业务描述">
+          <el-form-item v-if='dataList.taskTypeKey != 4' label="业务描述">
             <el-input
             <el-input
               v-model="dataList1.businessDescribe"
               v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               placeholder="请输入业务描述,不超过150字"
@@ -749,6 +749,7 @@ export default {
       warehouseNameList1: [],
       warehouseNameList1: [],
       appendixIdsAdd: '',
       appendixIdsAdd: '',
       uploadSuccess: {},
       uploadSuccess: {},
+      deletetask:false,
       warehouseInOutDetail: {},
       warehouseInOutDetail: {},
       onChange: {},
       onChange: {},
       deptBudgetList1: [],
       deptBudgetList1: [],
@@ -827,7 +828,7 @@ export default {
     },
     },
     selectTaskNo(e){
     selectTaskNo(e){
       if(this.dataList.taskTypeKey==3){
       if(this.dataList.taskTypeKey==3){
-          this.dataList1.moveTaskNo=e
+        this.$set(this.dataList1,'moveTaskNo',e)
       }
       }
     },
     },
     dataFilter(val) {
     dataFilter(val) {
@@ -955,7 +956,11 @@ export default {
       ) {
       ) {
         this.dataList.inOutTaskNo = this.inOutTaskNo
         this.dataList.inOutTaskNo = this.inOutTaskNo
         this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
         this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-
+        if(this.dataList.taskTypeKey == 3){
+          this.dataList.businessDescribe=this.dataList1.businessDescribe
+        }else{
+          this.dataList1.businessDescribe=this.dataList.businessDescribe
+        }
         this.requestadd(this.dataList, 'repetition')
         this.requestadd(this.dataList, 'repetition')
         this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.dataList1.relevanceId = this.dataList.relevanceId
         this.dataList1.relevanceId = this.dataList.relevanceId
@@ -1103,18 +1108,6 @@ export default {
       return Min + Math.round(Rand * Range)
       return Min + Math.round(Rand * Range)
     },
     },
     getList() {
     getList() {
-      if (this.$route.query.relevanceId) {
-        outexamine({ relevanceId: this.$route.query.relevanceId })
-          .toPromise()
-          .then((response) => {
-            if (response.length > 1) {
-              this.dataList = response[0]
-              this.dataList1 = response[1]
-            } else {
-              this.dataList = response[0]
-            }
-          })
-      } else {
         this.tasknumber()
         this.tasknumber()
         this.$set(this.dataList,'inOutType','销售出库')
         this.$set(this.dataList,'inOutType','销售出库')
         this.$set(this.dataList,'inOutTypeKey','1')
         this.$set(this.dataList,'inOutTypeKey','1')
@@ -1126,14 +1119,6 @@ export default {
         this.$set(this.dataList1,'goodsNameKey','1')
         this.$set(this.dataList1,'goodsNameKey','1')
         this.$set(this.dataList1,'grade','一等品')
         this.$set(this.dataList1,'grade','一等品')
         this.$set(this.dataList1,'gradeKey','1')
         this.$set(this.dataList1,'gradeKey','1')
-      }
-      switch(this.dataList.inOutType){
-        case "采购出库": this.flag = 0;break
-        case "采购入库": this.flag = 0;break
-        case "销售出库": this.flag = 1;break
-        case "退库": this.flag = 2;break
-      }
-      
       // 货名
       // 货名
       pullDown({ constId: 'CON2' })
       pullDown({ constId: 'CON2' })
         .toPromise()
         .toPromise()

+ 1515 - 0
src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -0,0 +1,1515 @@
+// 编辑出入库任务
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">编辑出入库任务</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <div class="basicInformation">
+      <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 class="nav">
+        <span class="ziti">
+          任务类型:
+          <h1 class="ziti1">{{dataList.inOutType}}</h1>
+        </span>
+      </div>
+      </div>
+      <div class="ding"></div>
+       <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" 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>出库任务({{ dataList.inOutTaskNo }})</h3>
+        </div>
+        <el-form ref="dataList" :model="dataList" label-width="140px">
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
+            <el-select
+            disabled
+              v-model="dataList.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+              @change="selectwarehouseName"
+            >
+              <el-option
+                v-for="item in warehouseNameList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 出库类型 -->
+          <el-form-item label="出库类型">
+            <el-select
+            disabled       
+              v-model="dataList.inOutType"
+              placeholder="请选择出库类型"
+              class="typeselect"
+              @change="selectstorageType"
+            >
+              <el-option
+                v-for="item in storageType"
+                :key="item.constKey"
+                v-if="
+                  (dataList.taskTypeKey == 1 &&
+                    item.constValue != '移库出库') ||
+                  (dataList.taskTypeKey == 3 &&
+                    item.constValue == '移库出库') ||
+                  (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
+                "
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 合同编号 -->
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="合同编号">
+            <el-select
+            disabled
+            @change='changecontract'
+              v-model="dataList.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
+            <el-select
+            disabled
+            @change="selectTaskNo"
+              v-model="dataList.moveTaskNo"
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item label="货名" class="huom">
+            <el-select
+            disabled
+              v-model="dataList.goodsName"
+              placeholder="货名"
+              class="huom"
+              @change="selectgoodsName"
+            >
+              <el-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--重量(吨)-->
+          <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px" >
+            <el-input
+            disabled
+              v-model="dataList.weight"
+              placeholder="请输入重量"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!-- 品级 -->
+          <el-form-item label="品级">
+            <el-select
+              v-model="dataList.grade"
+              placeholder=""
+              class="typeselect"
+              @change="selectpackingMethod"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
+            <el-input
+            @input='bulkDensitychange'
+              v-model="dataList.bulkDensity"
+              placeholder="请输入容重"
+              maxlength="120"
+              size="small" 
+              class="huom"
+            />
+          </el-form-item>
+          <!--水分(%)<=-->
+          <el-form-item label="水分(%)<=" span="1" style=" margin-left: 350px; margin-top: -40px" >
+            <el-input
+            @input='waterContentchange'
+              v-model="dataList.waterContent"
+              placeholder="请输入水分占比"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--单价(元/吨)-->
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
+            <el-input
+            @input='unitPricechange'
+              v-model="dataList.unitPrice"
+              placeholder="请输入单价"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--预计出库日期-->
+          <el-form-item
+            label="预计出库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
+            <el-date-picker
+            disabled
+              v-model="dataList.predictDate"
+              type="date"
+              placeholder="请选择预计出库日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <!--经办人-->
+          <el-form-item label="出库经办人">
+            <el-select
+            disabled
+              v-model="dataList.agent"
+              placeholder="请选择经办人"
+              filterable
+              :filter-method="dataFilter"
+              @change="selectstaff"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
+          </el-form-item>
+          <!--业务描述=-->
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="业务描述" span="1">
+            <el-input
+              v-model="dataList.businessDescribe"
+              placeholder="请输入业务描述,不超过150字"
+              maxlength="150"
+              size="large"
+              class="yewu"
+              
+            />
+          </el-form-item>
+          <el-form-item label="仓位号(选填)" span="1">
+            <el-input
+              v-model="dataList.binNumber"
+              placeholder="请输入仓位号"
+              maxlength="150"
+              size="large"
+              class="yewu"
+              
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div v-show="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>入库任务({{ dataList1.inOutTaskNo }}) <span v-if='deletetask' style='color:red;'>已删除</span></h3>
+        </div>
+        <el-form v-if='!deletetask' ref="form" :model="form" label-width="140px">
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
+            <el-select
+            disabled
+              v-model="dataList1.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in warehouseNameList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 出库类型 -->
+          <el-form-item label="入库类型">
+            <el-select
+            disabled
+              v-model="dataList1.inOutType"
+              placeholder="请选择入库类型"
+              class="typeselect"
+              @change="selectstorageType1"
+            >
+              <el-option
+                v-for="item in storageType1"
+                :key="item.constKey"
+                v-if="
+                  (dataList1.taskTypeKey == 2 &&
+                    item.constValue != '移库入库') ||
+                  (dataList1.taskTypeKey == 3 &&
+                    item.constValue == '移库入库') ||
+                  (dataList1.taskTypeKey == 4 && item.constValue == '退库')
+                "
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 合同编号 -->
+          <el-form-item v-if='dataList1.taskTypeKey != 3' label="合同编号">
+            <el-select
+            disabled
+            @change='changecontract1'
+              v-model="dataList1.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if='dataList1.taskTypeKey == 3' label="移库任务编号">
+            <el-select
+            disabled
+              v-model="dataList1.moveTaskNo"
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item label="货名" class="huom">
+            <el-select
+            disabled
+              v-model="dataList1.goodsName"
+              placeholder="货名"
+              class="huom"
+              @change="selectgoodsName1"
+            >
+              <el-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--重量(吨)-->
+          <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px"  >
+            <el-input
+            @input='weightchange'
+              v-model="dataList1.weight"
+              placeholder="请输入重量"
+              maxlength="120"
+              size="small"
+              class="huom"
+              
+            />
+          </el-form-item>
+          <!-- 品级 -->
+          <el-form-item label="品级">
+            <el-select
+            :disabled='dataList.taskTypeKey == 3'
+              v-model="dataList1.grade"
+              placeholder=""
+              class="typeselect"
+              @change="selectpackingMethod1"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
+            <el-input
+            @input='bulkDensitychange'
+            :disabled='dataList.taskTypeKey == 3'
+              v-model="dataList1.bulkDensity"
+              placeholder="请输入容重"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--水分(%)<=-->
+          <el-form-item label="水分(%)<="  span="1" style=" margin-left: 350px; margin-top: -40px">
+            <el-input
+            @input='waterContentchange'
+            :disabled='dataList.taskTypeKey == 3'
+              v-model="dataList1.waterContent"
+              placeholder="请输入水分占比"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--单价(元/吨)-->
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
+            <el-input
+            @input='unitPricechange'
+            :disabled='dataList.taskTypeKey == 3'
+              v-model="dataList1.unitPrice"
+              placeholder="请输入单价"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--预计出库日期-->
+          <el-form-item
+            label="预计入库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
+            <el-date-picker
+            disabled
+              v-model="dataList1.predictDate"
+              type="date"
+              placeholder="请选择预计入库日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <!--经办人-->
+          <el-form-item label="入库经办人">
+            <el-select
+            disabled
+              v-model="dataList1.agent"
+              placeholder="请选择经办人"
+              filterable
+              :filter-method="dataFilter"
+              @change="selectstaff1"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
+          </el-form-item>
+          <!--业务描述=-->
+          <el-form-item v-if='dataList.taskTypeKey != 4' label="业务描述">
+            <el-input
+              v-model="dataList1.businessDescribe"
+              placeholder="请输入业务描述,不超过150字"
+              maxlength="150"
+              size="large"
+            />
+          </el-form-item>
+          <el-form-item label="仓位号(选填)" span="1">
+            <el-input
+              v-model="dataList1.binNumber"
+              placeholder="请输入仓位号"
+              maxlength="150"
+              size="large"
+              class="yewu"
+              
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div v-if="dataList.taskTypeKey == 4" class="center1">
+        <!--出库=-->
+        <div class="small-title">
+          <img
+            style="position: relative; top: 40px; left: -22px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
+          <h3>出库任务({{ inOutTaskNo }})</h3>
+        </div>
+        <el-form ref="dataList" :model="dataList" label-width="140px">
+          
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
+            <el-select
+              v-model="dataList.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+              @change="selectwarehouseName"
+            >
+              <el-option
+                v-for="item in warehouseNameList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 出库类型 -->
+          <el-form-item label="出库类型">
+            <el-select              
+            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              v-model="dataList.inOutType"
+              placeholder="请选择出库类型"
+              class="typeselect"
+              @change="selectstorageType"
+            >
+              <el-option
+                v-for="item in storageType"
+                :key="item.constKey"
+                v-if="
+                  (dataList.taskTypeKey == 1 &&
+                    item.constValue != '移库出库') ||
+                  (dataList.taskTypeKey == 3 &&
+                    item.constValue == '移库出库') ||
+                  (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
+                "
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 合同编号 -->
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="合同编号">
+            <el-select
+            @change='changecontract'
+              v-model="dataList.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
+            <el-select
+            @change="selectTaskNo"
+              v-model="dataList.moveTaskNo"
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item label="货名" class="huom" >
+            <el-select
+            :disabled='dataList.taskTypeKey != 3'
+              v-model="dataList.goodsName"
+              placeholder="货名"
+              class="huom"
+              @change="selectgoodsName"
+            >
+              <el-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--重量(吨)-->
+          <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <el-input
+            :disabled='dataList.taskTypeKey == 4'
+              v-model="dataList.weight"
+              placeholder="请输入重量"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!-- 品级 -->
+          <el-form-item label="品级">
+            <el-select
+            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              v-model="dataList.grade"
+              placeholder=""
+              class="typeselect"
+              @change="selectpackingMethod"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
+            <el-input
+            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              v-model="dataList.bulkDensity"
+              placeholder="请输入容重"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--水分(%)<=-->
+          <el-form-item label="水分(%)<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <el-input
+            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              v-model="dataList.waterContent"
+              placeholder="请输入水分占比"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--单价(元/吨)-->
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+            <el-input
+            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              v-model="dataList.unitPrice"
+              placeholder="请输入单价"
+              maxlength="120"
+              size="small"
+               class="huom"
+            />
+          </el-form-item>
+          <!--预计出库日期-->
+          <el-form-item
+            label="预计出库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
+            <el-date-picker
+              v-model="dataList.predictDate"
+              type="date"
+              placeholder="请选择预计出库日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <!--经办人-->
+          <el-form-item label="出库经办人">
+            <el-select
+              v-model="dataList.agent"
+              placeholder="请选择经办人"
+              filterable
+              :filter-method="dataFilter"
+              @change="selectstaff"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
+          </el-form-item>
+          <!--业务描述=-->
+          <el-form-item label="业务描述">
+            <el-input
+              v-model="dataList.businessDescribe"
+              placeholder="请输入业务描述,不超过150字"
+              maxlength="150"
+              size="large"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <!-- 提交 -->
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button class="bg-bottom" type="primary" size="small" @click="reject()"
+        >驳回</el-button>
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+        >通过</el-button
+      >
+    </div>
+    <WinseaContentModal
+      v-model="outerVisible"
+      title="驳回原因"
+      @on-cancel="handleClose"
+    >
+      <el-input
+        type="textarea"
+        :rows="2"
+        maxlength="30"
+        placeholder="请输入驳回原因,1~30个字"
+        v-model="disableReason"
+      >
+      </el-input>
+      <div class="dialog-footer">
+        <el-button @click="outerVisible = false">取 消</el-button>
+        <el-button type="primary" @click="disableReasons">确定</el-button>
+      </div>
+    </WinseaContentModal>
+  </div>
+  
+</template>
+<script>
+import {
+  getwarehousename,
+  xialaNo,
+  addoreditoutput,
+  outexamine,
+  getGoodsName,
+  warehousetask,
+  woekflowhandle
+} from '@/model/tasksport/index'
+import { packList } from '@/model/contarct/index'
+import { pullDown, getstaff } from '@/model/warehouse/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import { mapActions, mapGetters, mapState } from 'vuex'
+import WsUpload from '@/components/WsUpload'
+// import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import { dayjs, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    // vesselId(val) {
+    //   this.getList()
+    // },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  computed: {
+    ...mapGetters(['deptBudgetList']),
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      disabled:false,
+      // 年
+      year: '',
+      disableReason:'',
+      contractNoList: [],
+      deptBudgetTotal: 0,
+      readonly: true,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      radio: '1',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      goodnameList: [],
+      checked: true,
+      form: {},
+      outerVisible:false,
+      staffList: [],
+      options: [],
+      storageType: [],
+      storageType1: [],
+      outContractNo: [],
+      // 提交类型
+      submitType: true,
+      status: [],
+      deletetask:false,
+      warehouseNameList: [],
+      warehouseNameList1: [],
+      appendixIdsAdd: '',
+      uploadSuccess: {},
+      warehouseInOutDetail: {},
+      onChange: {},
+      deptBudgetList1: [],
+      gradeList: [],
+      rules: {
+        netWeight: [
+          {
+            required: true,
+            type: 'number',
+            message: '请输入活动名称',
+            trigger: 'blur',
+          },
+        ],
+      },
+      size: 10,
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      packtypeList: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      contractList: [],
+      inOutTaskNo: '',
+      inOutTaskNo1: '',
+      dataList: { taskTypeKey: '1' },
+      dataList1: { taskTypeKey: '1' },
+      historyList: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+    }
+  },
+  activated() {
+    console.log(1111)
+    this.getList()
+  },
+  methods: {
+    //返回按钮
+    revert() {
+      this.$router.go(-1)
+    },
+    returnsales() {
+      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+    },
+    // 获取当前年月日
+    getdate() {
+      var date = new Date()
+      var year = date.getFullYear() //获取完整的年份(4位)
+      var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+      var datetime = date.getDate() //获取当前日(1-31)
+      if (mouth < 10) {
+        mouth = '0' + mouth
+      }
+      if (datetime < 10) {
+        datetime = '0' + datetime
+      }
+      return year + mouth + datetime
+    },
+    reject(){
+      this.outerVisible=true
+    },
+    // 随机验证码
+    verifyinit() {
+      var arr = []
+      for (var i = 48; i < 123; i++) {
+        if (i > 57 && i < 65) continue
+        if (i > 90 && i < 97) continue
+        arr.push(String.fromCharCode(i))
+      }
+      arr.sort(function () {
+        return Math.random() - 0.5
+      })
+      arr.length = 4
+
+      return arr.join('')
+    },
+    selectTaskNo(e){
+      if(this.dataList.taskTypeKey==3){
+          this.dataList1.moveTaskNo=e
+      }
+    },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.deptBudgetList.staffList = val
+      if (val) {
+        //val存在
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时,还原数组
+        this.options = this.staffList
+      }
+    },
+    weightchange(e){
+      if(this.dataList.taskTypeKey==4){
+        this.$set(this.dataList,'weight',e)
+      }
+    },
+    bulkDensitychange(e){
+      if(this.dataList.taskTypeKey==4){
+        this.$set(this.dataList,'bulkDensity',e)
+      }else if(this.dataList1.taskTypeKey==3){
+        this.$set(this.dataList1,'bulkDensity',e)
+      }
+    },
+    waterContentchange(e){
+      if(this.dataList.taskTypeKey==4){
+        this.$set(this.dataList,'waterContent',e)
+      }else if(this.dataList1.taskTypeKey==3){
+        this.$set(this.dataList1,'waterContent',e)
+      }
+    },
+    unitPricechange(e){
+      if(this.dataList.taskTypeKey==4){
+        this.$set(this.dataList,'unitPrice',e)
+      }else if(this.dataList1.taskTypeKey==3){
+        this.$set(this.dataList1,'unitPrice',e)
+      }
+    },
+    changecontract(e){
+      if(this.dataList.taskTypeKey!=3){
+        for (let i = 0; i < this.contractNoList.length; i++) {
+          if(this.contractNoList[i].contractNo==e){
+            getGoodsName({ contractId:this.contractNoList[i].id,contractNo:this.contractNoList[i].contractNo}) .toPromise()
+            .then((response) => {
+              this.$set(this.dataList,'goodsName',response.goodsName)
+              this.$set(this.dataList,'goodsNameKey',response.goodsNameKey)
+              this.$set(this.dataList,'grade',response.grade)
+              this.$set(this.dataList,'gradeKey',response.gradeKey)
+              this.$set(this.dataList,'waterContent',response.waterContent)
+              this.$set(this.dataList,'bulkDensity',response.bulkDensity)
+              this.$set(this.dataList,'weight',response.weight)
+              this.$set(this.dataList,'unitPrice',response.unitContractPrice)
+            })
+          } 
+        }
+      }
+    },
+    changecontract1(e){
+      if(this.dataList1.taskTypeKey!=3){
+        for (let i = 0; i < this.contractNoList.length; i++) {
+          if(this.contractNoList[i].contractNo==e){
+            getGoodsName({ contractId:this.contractNoList[i].id,contractNo:this.contractNoList[i].contractNo}) .toPromise()
+            .then((response) => {
+              this.$set(this.dataList1,'goodsName',response.goodsName)
+              this.$set(this.dataList1,'goodsNameKey',response.goodsNameKey)
+              this.$set(this.dataList1,'grade',response.grade)
+              this.$set(this.dataList1,'gradeKey',response.gradeKey)
+              this.$set(this.dataList1,'waterContent',response.waterContent)
+              this.$set(this.dataList1,'bulkDensity',response.bulkDensity)
+              this.$set(this.dataList1,'weight',response.weight)
+              this.$set(this.dataList1,'unitPrice',response.unitContractPrice)
+            })
+          } 
+        }
+      }
+    },
+    selectstaff(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.dataList.agentKey = this.staffList[i].staffId
+        }
+      }
+    },
+    selectstaff1(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.dataList1.agentKey = this.staffList[i].staffId
+        }
+      }
+    },
+    requestadd(list, status) {
+          list.compId = sessionStorage.getItem('ws-pf_compId')
+          list.publisher =
+            sessionStorage.getItem('ws-pf_roleName') +
+            sessionStorage.getItem('ws-pf_staffName')
+          warehousetask(list)
+            .toPromise()
+            .then((response) => {
+              // woekflowhandle
+              // this.$message.success('添加成功')
+              // this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+            })
+    },
+    //提交按钮
+    submit() {
+      this.dataList.inOutFlag=1
+      this.dataList1.inOutFlag=2
+      if (this.dataList.taskTypeKey == 1) {
+        
+        this.dataList.inOutTaskNo = this.inOutTaskNo
+        this.requestadd(this.dataList)
+      } else if (this.dataList1.taskTypeKey == 2) {
+        this.dataList1.inOutTaskNo = this.inOutTaskNo1
+        this.requestadd(this.dataList1)
+      } 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
+        if(!this.deletetask){
+          this.requestadd(this.dataList1, 'repetition')
+        }
+      }
+    },
+    disableReasons(){
+
+    },
+    selectwarehouseName() {},
+    tarechange(e) {
+      if (this.dataList.grossWeight && this.dataList.tare) {
+        this.dataList.netWeight = Number(
+          this.dataList.grossWeight - this.dataList.tare
+        )
+      }
+    },
+    grossWeightchange(e) {
+      if (this.dataList.grossWeight && this.dataList.tare) {
+        this.dataList.netWeight = Number(
+          this.dataList.grossWeight - this.dataList.tare
+        )
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.dataList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectgoodsName1(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.dataList1.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.dataList.gradeKey = this.gradeList[i].constKey
+          if(this.dataList.taskTypeKey==3){
+            this.$set(this.dataList1,'grade',e)
+            this.$set(this.dataList1,'gradeKey',this.gradeList[i].constKey)
+          }
+        }
+      }
+    },
+    selectpackingMethod1(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.dataList1.packingMethodKey = this.gradeList[i].constKey
+          if(this.dataList1.taskTypeKey==4){
+            this.$set(this.dataList,'grade',e)
+            this.$set(this.dataList,'gradeKey',this.gradeList[i].constKey)
+          }
+        }
+      }
+    },
+    selectstorageType(e) {
+      for (var i = 0; i < this.storageType.length; i++) {
+        if (this.storageType[i].constValue == e) {
+          this.dataList.inOutTypeKey = this.storageType[i].constKey
+        }
+      }
+    },
+    selectstorageType1(e) {
+      for (var i = 0; i < this.storageType1.length; i++) {
+        if (this.storageType1[i].constValue == e) {
+          this.dataList1.inOutTypeKey = this.storageType1[i].constKey
+        }
+      }
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    businessDescriptionchange(e) {
+      console.log(e)
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    tasknumber() {
+      if (this.dataList.taskTypeKey == 1) {
+        this.inOutTaskNo = 'CK' + this.getdate() + this.verifyinit()
+      } else if (this.dataList.taskTypeKey == 2) {
+        this.inOutTaskNo1 = 'RK' + this.getdate() + this.verifyinit()
+      } else if (this.dataList.taskTypeKey == 3) {
+        var random=this.getdate() + this.verifyinit()
+        this.inOutTaskNo = 'YKC' + random
+        this.inOutTaskNo1 = 'YKR' + random
+      } else if (this.dataList.taskTypeKey == 4) {
+        var random=this.getdate() + this.verifyinit()
+        this.inOutTaskNo = 'TCC' + random
+        this.inOutTaskNo1 = 'TCR' + random
+      }
+    },
+    tasktypechange(e) {
+      if (!this.$route.query.relevanceId) {
+        this.tasknumber()
+      }
+      this.dataList1.taskTypeKey = e
+      if(this.dataList.taskTypeKey==1){
+        this.dataList.inOutType='销售出库'
+        this.dataList.inOutTypeKey='1'
+      }
+      if(this.dataList1.taskTypeKey==2){
+        this.dataList1.inOutType='采购入库'
+        this.dataList1.inOutTypeKey='1'
+      }
+      else if(this.dataList1.taskTypeKey==3){
+        this.disabled=true
+        this.dataList1.inOutType='移库入库'
+        this.dataList1.inOutTypeKey='3'
+        this.dataList.inOutType='移库出库'
+        this.dataList.inOutTypeKey='3'
+      }else if(this.dataList1.taskTypeKey==4){
+        this.disabled=true
+        this.dataList1.inOutType='退库'
+        this.dataList1.inOutTypeKey='6'
+        this.dataList.inOutType='销售出库'
+        this.dataList.inOutTypeKey='1'
+      }
+    },
+    GetRandomNum(Min, Max) {
+      var Range = Max - Min
+      var Rand = Math.random()
+      return Min + Math.round(Rand * Range)
+    },
+    getList() {
+      if (this.$route.query.relevanceId) {
+        outexamine({ relevanceId: this.$route.query.relevanceId })
+          .toPromise()
+          .then((response) => {
+            if (response.length > 1) {
+              this.dataList = response[0]
+              this.dataList1 = response[1]
+            } else {
+              if(response[0].taskTypeKey==3){
+                this.deletetask=true
+                this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf("C") + 1,response[0].inOutTaskNo.length)
+              }
+              this.dataList = response[0]
+            }
+          })
+      } else {
+        this.tasknumber()
+        this.$set(this.dataList,'inOutType','销售出库')
+        this.$set(this.dataList,'inOutTypeKey','1')
+        this.$set(this.dataList,'goodsName','玉米')
+        this.$set(this.dataList,'goodsNameKey','1')
+        this.$set(this.dataList,'grade','一等品')
+        this.$set(this.dataList,'gradeKey','1')
+        this.$set(this.dataList1,'goodsName','玉米')
+        this.$set(this.dataList1,'goodsNameKey','1')
+        this.$set(this.dataList1,'grade','一等品')
+        this.$set(this.dataList1,'gradeKey','1')
+      }
+      
+      // 货名
+      pullDown({ constId: 'CON2' })
+        .toPromise()
+        .then((response) => {
+          this.goodnameList = response
+        })
+      // 品级
+      pullDown({ constId: 'CON3' })
+        .toPromise()
+        .then((response) => {
+          this.gradeList = response
+        })
+      pullDown({ constId: 'CON6' })
+        .toPromise()
+        .then((response) => {
+          this.storageType = response
+        })
+      pullDown({ constId: 'CON5' })
+        .toPromise()
+        .then((response) => {
+          this.storageType1 = response
+        })
+      xialaNo({
+        compId: this.compId,
+      })
+        .toPromise()
+        .then((response) => {
+          this.contractNoList = response
+        })
+      // //临时仓库入库类型
+      // pullDown({ constId: 'WARE1' })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.storageType = respons
+      //   })
+      // //临时仓库出库类型
+      // pullDown({ constId: 'WARE2' })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.deliveryType = response
+      //   })
+      //仓库名
+      getwarehousename({
+        compId: this.compId,
+        warehouseType: 1,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseNameList = response
+        })
+      getwarehousename({
+        compId: this.compId,
+        warehouseType: 2,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseNameList1 = response
+        })
+      //经办人
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+          //  this.agent = response
+        })
+    },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
+    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
+    },
+    history(row) {
+      console.log(row)
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
+
+    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',
+      })
+    },
+
+    // deletecontract(){},
+    //删除
+    approve() {},
+    listQuery() {},
+    total() {},
+    clearfiltQuery() {},
+    selectCrtDuty() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+/deep/.basicInformation {
+  .el-info-table {
+    border: none;
+    position: relative;
+   
+  }
+  .el-form-item {
+    width: 33.3333%;
+    border: none;
+    margin: 0;
+    .el-form-item__label {
+      text-align: left;
+      font-size: 14px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #8890b1;
+    }
+    .el-form-item__content {
+      padding-left: 0px;
+      padding-right: 10px;
+      // background: #fff;
+      white-space: nowrap;
+      height: 40px;
+      display: flex;
+      -webkit-box-align: center;
+      align-items: center;
+      text-align: left;
+      overflow: hidden;
+    }
+  }
+}
+/deep/.el-radio {
+  color: #606266;
+  font-weight: 500;
+  line-height: 1;
+  cursor: pointer;
+  white-space: nowrap;
+  outline: 0;
+  margin-right: 30px;
+  margin-top: 15px;
+}
+/deep/.el-radio__inner {
+  border: 1px solid #dcdfe6;
+  border-radius: 100%;
+  width: 14px;
+  height: 14px;
+  background-color: #fff;
+  cursor: pointer;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  margin-left: 100px;
+}
+/deep/.el-radio__input {
+  white-space: nowrap;
+  cursor: pointer;
+  outline: 0;
+  line-height: 1;
+  vertical-align: middle;
+  margin-top: -1px;
+}
+.title {
+  position: relative;
+  padding-left: 10px;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-form {
+  padding: 0 15%;
+  display: flex;
+  flex-wrap: wrap;
+  margin-left: -50px;
+  margin-top: 15px;
+  width: 110%;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.bg-right {
+  text-align: right;
+  padding: 16px 20px;
+}
+.center {
+  position: relative;
+  top: 50px;
+  width: 40%;
+  height: 2000px;
+  margin: 0 auto;
+  margin-right: 180px;
+}
+/deep/.el-form-item__label {
+  width: 160px;
+}
+.inspector {
+  width: 50%;
+}
+/deep/.el-form-item--small .el-form-item__label,
+.el-form-item--small .el-form-item__content {
+  text-align: left;
+}
+/deep/.el-input--small {
+  font-size: 13px;
+  position: relative;
+  display: inline-block;
+}
+.center1 .small-title {
+  margin-left: 150px;
+}
+.center1 {
+  width: 90%;
+  margin: 0 auto;
+  margin-left: 10px;
+  margin-top: 25px;
+}
+/deep/.el-input--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+}
+/deep/.el-select {
+  display: inline-block;
+  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);
+}
+.ziti {
+  width: 72px;
+  height: 20px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 20px;
+  margin-left: 130px;
+  /* margin-top: 112px; */
+}
+.ziti1 {
+    width: 100px;
+    font-size: 16px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #262626;
+    line-height: 22px;
+    margin-left: 197px;
+    margin-top: -22px;
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.nav {
+  width: 200px;
+  height: 20px;
+}
+</style>

+ 17 - 6
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -229,7 +229,7 @@
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
           <!--业务描述=-->
           <!--业务描述=-->
-          <el-form-item label="业务描述" span="1">
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="业务描述" span="1">
             <el-input
             <el-input
               v-model="dataList.businessDescribe"
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               placeholder="请输入业务描述,不超过150字"
@@ -250,9 +250,9 @@
             alt=""
             alt=""
           />
           />
         <div class="small-title">
         <div class="small-title">
-          <h3>入库任务({{ dataList1.inOutTaskNo }} )</h3>
+          <h3>入库任务({{ dataList1.inOutTaskNo }}) <span v-if='deletetask' style='color:red;'>已删除</span></h3>
         </div>
         </div>
-        <el-form ref="form" :model="form" label-width="140px">
+        <el-form v-if='!deletetask' ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
           <el-form-item label="仓库名">
             <el-select
             <el-select
@@ -437,7 +437,7 @@
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
           <!--业务描述=-->
           <!--业务描述=-->
-          <el-form-item label="业务描述">
+          <el-form-item v-if='dataList.taskTypeKey != 4' label="业务描述">
             <el-input
             <el-input
               v-model="dataList1.businessDescribe"
               v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               placeholder="请输入业务描述,不超过150字"
@@ -740,6 +740,7 @@ export default {
       onChange: {},
       onChange: {},
       deptBudgetList1: [],
       deptBudgetList1: [],
       gradeList: [],
       gradeList: [],
+      deletetask:false,
       rules: {
       rules: {
         netWeight: [
         netWeight: [
           {
           {
@@ -942,11 +943,17 @@ export default {
       ) {
       ) {
         this.dataList.inOutTaskNo = this.inOutTaskNo
         this.dataList.inOutTaskNo = this.inOutTaskNo
         this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
         this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-
+        if(this.dataList.taskTypeKey == 3){
+          this.dataList.businessDescribe=this.dataList1.businessDescribe
+        }else{
+          this.dataList1.businessDescribe=this.dataList.businessDescribe
+        }
         this.requestadd(this.dataList, 'repetition')
         this.requestadd(this.dataList, 'repetition')
         this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.dataList1.relevanceId = this.dataList.relevanceId
         this.dataList1.relevanceId = this.dataList.relevanceId
-        this.requestadd(this.dataList1, 'repetition')
+        if(!this.deletetask){
+          this.requestadd(this.dataList1, 'repetition')
+        }
       }
       }
     },
     },
     selectwarehouseName() {},
     selectwarehouseName() {},
@@ -1086,6 +1093,10 @@ export default {
               this.dataList = response[0]
               this.dataList = response[0]
               this.dataList1 = response[1]
               this.dataList1 = response[1]
             } else {
             } else {
+               if(response[0].taskTypeKey==3){
+                this.deletetask=true
+                this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf("C") + 1,response[0].inOutTaskNo.length)
+              }
               this.dataList = response[0]
               this.dataList = response[0]
             }
             }
           })
           })